From 194ae0f4206d0de00dea44553ac8a679cd771ea4 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 13 Jun 2020 10:50:44 +1200
Subject: [PATCH 001/834] PropertyBag - add cardNumber to getters

As https://github.com/civicrm/civicrm-core/pull/17594 demonstrates, existing processors require
this parameter
---
 Civi/Payment/PropertyBag.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/Civi/Payment/PropertyBag.php b/Civi/Payment/PropertyBag.php
index a97c8d113f86..fe1f239da633 100644
--- a/Civi/Payment/PropertyBag.php
+++ b/Civi/Payment/PropertyBag.php
@@ -38,12 +38,14 @@ class PropertyBag implements \ArrayAccess {
     'billingPostalCode'           => TRUE,
     'billingCounty'               => TRUE,
     'billingCountry'              => TRUE,
+    'cardNumber'                  => TRUE,
     'contactID'                   => TRUE,
     'contact_id'                  => 'contactID',
     'contributionID'              => TRUE,
     'contribution_id'             => 'contributionID',
     'contributionRecurID'         => TRUE,
     'contribution_recur_id'       => 'contributionRecurID',
+    'credit_card_number'          => 'cardNumber',
     'currency'                    => TRUE,
     'currencyID'                  => 'currency',
     'description'                 => TRUE,
@@ -555,6 +557,29 @@ public function setBillingCountry($input, $label = 'default') {
   }
 
   /**
+   * Get the (generally credit) card number.
+   *
+   * @param string $label
+   *
+   * @return string
+   */
+  public function getCardNumber($label = 'default'): string {
+    return $this->get('cardNumber', $label);
+  }
+
+  /**
+   * @param string $cardNumber
+   * @param string $label
+   *
+   * @return \Civi\Payment\PropertyBag
+   */
+  public function setCardNumber($cardNumber, $label = 'default'): PropertyBag {
+    return $this->set('cardNumber', $label, (string) $cardNumber);
+  }
+
+  /**
+   * @param string $label
+   *
    * @return int
    */
   public function getContactID($label = 'default'): int {
@@ -564,6 +589,8 @@ public function getContactID($label = 'default'): int {
   /**
    * @param int $contactID
    * @param string $label
+   *
+   * @return \Civi\Payment\PropertyBag
    */
   public function setContactID($contactID, $label = 'default') {
     // We don't use this because it counts zero as positive: CRM_Utils_Type::validate($contactID, 'Positive');

From 25f128c302a724c4ed4194ed57e87b6871bf38be Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Fri, 3 Jul 2020 01:31:06 +0100
Subject: [PATCH 002/834] dev/core#1854: Fix Status Calculation of Overridden
 Membership Types

---
 CRM/Member/BAO/Membership.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index c927be1aff4a..f035c74289c4 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1429,9 +1429,14 @@ public static function createRelatedMemberships(&$params, &$dao, $reset = FALSE)
         $relMembership = new CRM_Member_DAO_Membership();
         $relMembership->contact_id = $contactId;
         $relMembership->owner_membership_id = $membership->id;
+
         if ($relMembership->find(TRUE)) {
           $params['id'] = $relMembership->id;
         }
+        else {
+          unset($params['id']);
+        }
+
         $params['contact_id'] = $contactId;
         $params['owner_membership_id'] = $membership->id;
 

From eec58f8a91308cff16614b5a2bdf2a4e043c7d8e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 28 Jul 2020 12:21:05 +1200
Subject: [PATCH 003/834] Move function to delete merged contacts to the Merger
 class and include all instances of the pair

The PrevNextCache class is a bit of a mess. It has 2 roles
1) be a cache
2) provide functionality specific to the Merger class

I am working to move this second functionality to the merger class and also to remove the cacheKey
filter on it. The cacheKey pertains to a particular search set. However if 2 people are deduping different search
sets and one person merges a contact pair they should not remain available in the other person's result set.

(Likewise, and to follow, if 2 contacts have a conflict we should update all search sets with that information,
not just the one that was actively being deduped)
---
 CRM/Core/BAO/PrevNextCache.php | 26 --------------------------
 CRM/Dedupe/Merger.php          | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/CRM/Core/BAO/PrevNextCache.php b/CRM/Core/BAO/PrevNextCache.php
index 4eae51e91a13..f84454ae72ed 100644
--- a/CRM/Core/BAO/PrevNextCache.php
+++ b/CRM/Core/BAO/PrevNextCache.php
@@ -121,32 +121,6 @@ public static function deleteItem($id = NULL, $cacheKey = NULL, $entityTable = '
     CRM_Core_DAO::executeQuery($sql, $params);
   }
 
-  /**
-   * Delete pair from the previous next cache table to remove it from further merge consideration.
-   *
-   * The pair may have been flipped, so make sure we delete using both orders
-   *
-   * @param int $id1
-   * @param int $id2
-   * @param string $cacheKey
-   */
-  public static function deletePair($id1, $id2, $cacheKey = NULL) {
-    $sql = "DELETE FROM civicrm_prevnext_cache WHERE  entity_table = 'civicrm_contact'";
-
-    $pair = "(entity_id1 = %2 AND entity_id2 = %3) OR (entity_id1 = %3 AND entity_id2 = %2)";
-    $sql .= " AND ( {$pair} )";
-    $params[2] = [$id1, 'Integer'];
-    $params[3] = [$id2, 'Integer'];
-
-    if (isset($cacheKey)) {
-      $sql .= " AND cachekey LIKE %4";
-      // used % to address any row with conflict-cacheKey e.g "merge Individual_8_0_conflicts"
-      $params[4] = ["{$cacheKey}%", 'String'];
-    }
-
-    CRM_Core_DAO::executeQuery($sql, $params);
-  }
-
   /**
    * Mark contacts as being in conflict.
    *
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 1a918695103c..bcf68cca719e 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1911,12 +1911,31 @@ protected static function dedupePair($dupes, $mode = 'safe', $checkPermissions =
       CRM_Core_BAO_PrevNextCache::markConflict($mainId, $otherId, $cacheKeyString, $conflicts, $mode);
     }
     else {
-      CRM_Core_BAO_PrevNextCache::deletePair($mainId, $otherId, $cacheKeyString);
+      self::deletePairFromPrevNextCache((int) $mainId, (int) $otherId);
     }
     self::releaseLocks($locks);
     return $resultStats;
   }
 
+  /**
+   * Delete merged pair from the previous next cache table as the are no longer a merge candidate.
+   *
+   * It's possible there may be more than one set of merge results cached, with different cache keys.
+   * Once we have merged a pair these should all go (even from a different merge search) as they
+   * can only be merged once.
+   *
+   * @param int $contactID1
+   * @param int $contactID2
+   */
+  protected static function deletePairFromPrevNextCache(int $contactID1, int $contactID2) {
+    CRM_Core_DAO::executeQuery("
+      DELETE FROM civicrm_prevnext_cache
+      WHERE  entity_table = 'civicrm_contact'
+        AND (entity_id1 = %1 AND entity_id2 = %2) OR (entity_id1 = %2 AND entity_id2 = %1)",
+      [1 => [$contactID1, 'Integer'], 2 => [$contactID2, 'Integer']]
+    );
+  }
+
   /**
    * Replace the pseudo QFKey with zero if it is present.
    *

From a3ca6fe36ec7e8c077497a6da2b71bbf88d24fe0 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Fri, 14 Aug 2020 16:33:28 +0100
Subject: [PATCH 004/834] Move add/submit membership buttons to PHP level on
 membership tab

---
 CRM/Member/Page/Tab.php           | 22 ++++++++++++++++++----
 templates/CRM/Member/Page/Tab.tpl | 25 +++++++------------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php
index ec2300d0ba5d..ef4d4551d510 100644
--- a/CRM/Member/Page/Tab.php
+++ b/CRM/Member/Page/Tab.php
@@ -48,6 +48,23 @@ public function browse() {
     $permissions = [CRM_Core_Permission::VIEW];
     if (CRM_Core_Permission::check('edit memberships')) {
       $permissions[] = CRM_Core_Permission::EDIT;
+      $linkButtons['add_membership'] = [
+        'title' => ts('Add Membership'),
+        'url' => 'civicrm/contact/view/membership',
+        'qs' => "reset=1&action=add&cid={$this->_contactId}&context=membership",
+        'icon' => 'fa-plus-circle',
+        'accessKey' => 'N',
+      ];
+      if ($this->_accessContribution && CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
+        $linkButtons['creditcard_membership'] = [
+          'title' => ts('Submit Credit Card Membership'),
+          'url' => 'civicrm/contact/view/membership',
+          'qs' => "reset=1&action=add&cid={$this->_contactId}&context=membership&mode=live",
+          'icon' => 'fa-credit-card',
+          'accessKey' => 'C',
+        ];
+      }
+      $this->assign('linkButtons', $linkButtons ?? []);
     }
     if (CRM_Core_Permission::check('delete in CiviMember')) {
       $permissions[] = CRM_Core_Permission::DELETE;
@@ -317,10 +334,7 @@ public function run() {
     $this->preProcess();
 
     // check if we can process credit card membership
-    $newCredit = CRM_Core_Config::isEnabledBackOfficeCreditCardPayments();
-    $this->assign('newCredit', $newCredit);
-
-    if ($newCredit) {
+    if (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
       $this->_isPaymentProcessor = TRUE;
     }
     else {
diff --git a/templates/CRM/Member/Page/Tab.tpl b/templates/CRM/Member/Page/Tab.tpl
index 249634931c3a..7e807c94822b 100644
--- a/templates/CRM/Member/Page/Tab.tpl
+++ b/templates/CRM/Member/Page/Tab.tpl
@@ -15,31 +15,20 @@
 {elseif $action eq 32768}  {* renew *}
     {include file="CRM/Member/Form/MembershipRenewal.tpl"}
 {elseif $action eq 16} {* Browse memberships for a contact *}
-    {if $permission EQ 'edit'}
-      {capture assign=newURL}{crmURL p="civicrm/contact/view/membership" q="reset=1&action=add&cid=`$contactId`&context=membership"}{/capture}{/if}
-
     {if $action ne 1 and $action ne 2 and $permission EQ 'edit'}
         <div class="help">
-            {if $permission EQ 'edit'}
-              {capture assign="link"}class="action-item" href="{$newURL}"{/capture}
-              {ts 1=$link}Click <a %1>Add Membership</a> to record a new membership.{/ts}
-              {if $newCredit}
-                {capture assign=newCreditURL}{crmURL p="civicrm/contact/view/membership" q="reset=1&action=add&cid=`$contactId`&context=membership&mode=live"}{/capture}
-                {capture assign="link"}class="action-item" href="{$newCreditURL}"{/capture}
-                {ts 1=$link}Click <a %1>Submit Credit Card Membership</a> to process a Membership on behalf of the member using their credit card.{/ts}
-                {/if}
+            {if $linkButtons.add_membership}
+              {ts}Click <em>Add Membership</em> to record a new membership.{/ts}
             {else}
-                {ts 1=$displayName}Current and inactive memberships for %1 are listed below.{/ts}
+              {ts 1=$displayName}Current and inactive memberships for %1 are listed below.{/ts}
+            {/if}
+            {if $linkButtons.creditcard_membership}
+              {ts}Click <em>Submit Credit Card Membership</em> to process a Membership on behalf of the member using their credit card.{/ts}
             {/if}
         </div>
 
         <div class="action-link">
-            <a accesskey="N" href="{$newURL}" class="button"><span><i class="crm-i fa-plus-circle" aria-hidden="true"></i> {ts}Add Membership{/ts}</span></a>
-            {if $accessContribution and $newCredit}
-                <a accesskey="N" href="{$newCreditURL}" class="button"><span><i class="crm-i fa-credit-card" aria-hidden="true"></i> {ts}Submit Credit Card Membership{/ts}</span></a><br /><br />
-            {else}
-                <br/ ><br/ >
-            {/if}
+          {include file="CRM/common/formButtons.tpl" location="top"}
         </div>
     {/if}
     {if NOT ($activeMembers or $inActiveMembers) and $action ne 2 and $action ne 1 and $action ne 8 and $action ne 4 and $action ne 32768}

From 04b1abad5dcf19ec18dc9bca9e04af2e2c618d59 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sun, 9 Aug 2020 13:19:32 -0400
Subject: [PATCH 005/834] allow mysql SSL connection for civicrm-setup

---
 Civi/Install/Requirements.php                 | 19 +++++-
 .../CheckDbWellFormed.civi-setup.php          | 19 +++---
 .../CoreRequirementsAdapter.civi-setup.php    |  1 +
 .../InstallSettingsFile.civi-setup.php        |  7 +++
 setup/src/Setup/DbUtil.php                    | 51 +++++++++++++++-
 .../CRM/common/civicrm.settings.php.template  |  2 +-
 tests/phpunit/Civi/Setup/DbUtilTest.php       | 59 +++++++++++++++++++
 7 files changed, 147 insertions(+), 11 deletions(-)
 create mode 100644 tests/phpunit/Civi/Setup/DbUtilTest.php

diff --git a/Civi/Install/Requirements.php b/Civi/Install/Requirements.php
index da7b2cc76597..7d30855076b7 100644
--- a/Civi/Install/Requirements.php
+++ b/Civi/Install/Requirements.php
@@ -132,7 +132,24 @@ protected function connect($db_config) {
     elseif (!empty($db_config['server'])) {
       $host = $db_config['server'];
     }
-    $conn = @mysqli_connect($host, $db_config['username'], $db_config['password'], $db_config['database'], !empty($db_config['port']) ? $db_config['port'] : NULL);
+    if (empty($db_config['ssl_params'])) {
+      $conn = @mysqli_connect($host, $db_config['username'], $db_config['password'], $db_config['database'], !empty($db_config['port']) ? $db_config['port'] : NULL);
+    }
+    else {
+      $conn = NULL;
+      $init = mysqli_init();
+      mysqli_ssl_set(
+        $init,
+        $db_config['ssl_params']['key'] ?? NULL,
+        $db_config['ssl_params']['cert'] ?? NULL,
+        $db_config['ssl_params']['ca'] ?? NULL,
+        $db_config['ssl_params']['capath'] ?? NULL,
+        $db_config['ssl_params']['cipher'] ?? NULL
+      );
+      if (@mysqli_real_connect($init, $host, $db_config['username'], $db_config['password'], $db_config['database'], (!empty($db_config['port']) ? $db_config['port'] : NULL), NULL, MYSQLI_CLIENT_SSL)) {
+        $conn = $init;
+      }
+    }
     return $conn;
   }
 
diff --git a/setup/plugins/checkRequirements/CheckDbWellFormed.civi-setup.php b/setup/plugins/checkRequirements/CheckDbWellFormed.civi-setup.php
index d48925c3de92..4f09d7c8328a 100644
--- a/setup/plugins/checkRequirements/CheckDbWellFormed.civi-setup.php
+++ b/setup/plugins/checkRequirements/CheckDbWellFormed.civi-setup.php
@@ -23,19 +23,24 @@
       $expectedKeys = array('server', 'username', 'password', 'database');
       sort($expectedKeys);
       if ($keys !== $expectedKeys) {
-        $e->addError('database', $dbField, sprintf("The database credentials for \"%s\" should be specified as (%s) not (%s)",
-          $dbField,
-          implode(',', $expectedKeys),
-          implode(',', $keys)
-        ));
-        $errors++;
+        // if it failed it might be because of the optional ssl parameters
+        $expectedKeys[] = 'ssl_params';
+        sort($expectedKeys);
+        if ($keys !== $expectedKeys) {
+          $e->addError('database', $dbField, sprintf("The database credentials for \"%s\" should be specified as (%s) not (%s)",
+            $dbField,
+            implode(',', $expectedKeys),
+            implode(',', $keys)
+          ));
+          $errors++;
+        }
       }
 
       foreach ($db as $k => $v) {
         if ($k === 'password' && empty($v)) {
           $e->addWarning('database', "$dbField.$k", "The property \"$dbField.$k\" is blank. This may be correct in some controlled environments; it could also be a mistake or a symptom of an insecure configuration.");
         }
-        elseif (!is_scalar($v)) {
+        elseif ($k !== 'ssl_params' && !is_scalar($v)) {
           $e->addError('database', "$dbField.$k", "The property \"$dbField.$k\" is not well-formed.");
           $errors++;
         }
diff --git a/setup/plugins/checkRequirements/CoreRequirementsAdapter.civi-setup.php b/setup/plugins/checkRequirements/CoreRequirementsAdapter.civi-setup.php
index f0d15507c3fe..4e4e051f31a7 100644
--- a/setup/plugins/checkRequirements/CoreRequirementsAdapter.civi-setup.php
+++ b/setup/plugins/checkRequirements/CoreRequirementsAdapter.civi-setup.php
@@ -29,6 +29,7 @@
       'username' => $model->db['username'],
       'password' => $model->db['password'],
       'database' => $model->db['database'],
+      'ssl_params' => $model->db['ssl_params'] ?? NULL,
     ));
     _corereqadapter_addMessages($e, 'database', $dbMsgs);
   });
diff --git a/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php b/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
index 3581eb3bed8e..29aedb2b073b 100644
--- a/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
+++ b/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
@@ -59,6 +59,13 @@
     $params['dbPass'] = addslashes($m->db['password']);
     $params['dbHost'] = addslashes($m->db['server']);
     $params['dbName'] = addslashes($m->db['database']);
+    // The '&' prefix is awkward, but we don't know what's already in the file.
+    // At the time of writing, it has ?new_link=true. If that is removed,
+    // then need to update this.
+    // The PHP_QUERY_RFC3986 is important because PEAR::DB will interpret plus
+    // signs as a reference to its old DSN format and mangle the DSN, so we
+    // need to use %20 for spaces.
+    $params['dbSSL'] = empty($m->db['ssl_params']) ? '' : addslashes('&' . http_build_query($m->db['ssl_params'], '', '&', PHP_QUERY_RFC3986));
     $params['cms'] = addslashes($m->cms);
     $params['CMSdbUser'] = addslashes($m->cmsDb['username']);
     $params['CMSdbPass'] = addslashes($m->cmsDb['password']);
diff --git a/setup/src/Setup/DbUtil.php b/setup/src/Setup/DbUtil.php
index 054fe8d731b0..87849057c6d8 100644
--- a/setup/src/Setup/DbUtil.php
+++ b/setup/src/Setup/DbUtil.php
@@ -12,14 +12,16 @@ class DbUtil {
   public static function parseDsn($dsn) {
     $parsed = parse_url($dsn);
     return array(
-      'server' => self::encodeHostPort($parsed['host'], $parsed['port']),
+      'server' => self::encodeHostPort($parsed['host'], $parsed['port'] ?? NULL),
       'username' => $parsed['user'] ?: NULL,
       'password' => $parsed['pass'] ?: NULL,
       'database' => $parsed['path'] ? ltrim($parsed['path'], '/') : NULL,
+      'ssl_params' => self::parseSSL($parsed['query'] ?? NULL),
     );
   }
 
   /**
+   * @todo Is this used anywhere? It doesn't support SSL as-is.
    * Convert an datasource from array notation to URL notation.
    *
    * @param array $db
@@ -40,7 +42,25 @@ public static function encodeDsn($db) {
    */
   public static function softConnect($db) {
     list($host, $port) = self::decodeHostPort($db['server']);
-    $conn = @mysqli_connect($host, $db['username'], $db['password'], $db['database'], $port);
+    if (empty($db['ssl_params'])) {
+      $conn = @mysqli_connect($host, $db['username'], $db['password'], $db['database'], $port);
+    }
+    else {
+      $conn = NULL;
+      $init = mysqli_init();
+      mysqli_ssl_set(
+        $init,
+        $db['ssl_params']['key'] ?? NULL,
+        $db['ssl_params']['cert'] ?? NULL,
+        $db['ssl_params']['ca'] ?? NULL,
+        $db['ssl_params']['capath'] ?? NULL,
+        $db['ssl_params']['cipher'] ?? NULL
+      );
+      // @todo socket parameter, but if you're using sockets do you need SSL?
+      if (@mysqli_real_connect($init, $host, $db['username'], $db['password'], $db['database'], $port, NULL, MYSQLI_CLIENT_SSL)) {
+        $conn = $init;
+      }
+    }
     return $conn;
   }
 
@@ -94,6 +114,33 @@ public static function encodeHostPort($host, $port) {
     return $host . ($port ? (':' . $port) : '');
   }
 
+  /**
+   * For SSL you can have client certificates, which has some required and
+   * optional parameters, or you can have anonymous SSL, which just requires
+   * some indication that you want that.
+   *
+   * @param string $query_string
+   * @return array
+   */
+  public static function parseSSL($query_string) {
+    if (empty($query_string)) {
+      return [];
+    }
+    parse_str($query_string, $parsed_query);
+    $sensible_parameters = [
+      // ssl=1 alone means no client certificate - it's not a real mysqli option
+      'ssl' => NULL,
+      'key' => NULL,
+      'cert' => NULL,
+      'ca' => NULL,
+      'capath' => NULL,
+      'cipher' => NULL,
+    ];
+    // Only want to include a param if it's in our list of sensibles, e.g.
+    // we don't want new_link=true.
+    return array_intersect_key($parsed_query, $sensible_parameters);
+  }
+
   /**
    * @param array $db
    * @param string $SQLcontent
diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template
index e36756840f30..3d0575569fb8 100644
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -106,7 +106,7 @@ if (!defined('CIVICRM_DSN')) {
     define('CIVICRM_DSN', $GLOBALS['_CV']['TEST_DB_DSN']);
   }
   else {
-    define('CIVICRM_DSN', 'mysql://%%dbUser%%:%%dbPass%%@%%dbHost%%/%%dbName%%?new_link=true');
+    define('CIVICRM_DSN', 'mysql://%%dbUser%%:%%dbPass%%@%%dbHost%%/%%dbName%%?new_link=true%%dbSSL%%');
   }
 }
 
diff --git a/tests/phpunit/Civi/Setup/DbUtilTest.php b/tests/phpunit/Civi/Setup/DbUtilTest.php
new file mode 100644
index 000000000000..7c42ff7551d1
--- /dev/null
+++ b/tests/phpunit/Civi/Setup/DbUtilTest.php
@@ -0,0 +1,59 @@
+<?php
+namespace Civi\Setup;
+
+/**
+ * Class DbUtilTest
+ * @package Civi\Setup
+ * @group headless
+ */
+class DbUtilTest extends \CiviUnitTestCase {
+
+  /**
+   * Test parseSSL
+   * @dataProvider queryStringProvider
+   * @param string $input
+   * @param array $expected
+   */
+  public function testParseSSL(string $input, array $expected) {
+    $this->assertSame($expected, \Civi\Setup\DbUtil::parseSSL($input));
+  }
+
+  /**
+   * Data provider for testParseSSL
+   * @return array
+   */
+  public function queryStringProvider():array {
+    return [
+      ['', []],
+      ['new_link=true', []],
+      ['ssl=1', ['ssl' => '1']],
+      ['new_link=true&ssl=1', ['ssl' => '1']],
+      ['ca=%2Ftmp%2Fcacert.crt', ['ca' => '/tmp/cacert.crt']],
+      [
+        'ca=%2Ftmp%2Fcacert.crt&cert=%2Ftmp%2Fcert.crt&key=%2Ftmp%2Fmy.key',
+        [
+          'ca' => '/tmp/cacert.crt',
+          'cert' => '/tmp/cert.crt',
+          'key' => '/tmp/my.key',
+        ],
+      ],
+      [
+        'ca=%2Fpath%20with%20spaces%2Fcacert.crt',
+        [
+          'ca' => '/path with spaces/cacert.crt',
+        ],
+      ],
+      ['cipher=aes', ['cipher' => 'aes']],
+      ['capath=%2Ftmp', ['capath' => '/tmp']],
+      [
+        'cipher=aes&capath=%2Ftmp&food=banana',
+        [
+          'cipher' => 'aes',
+          'capath' => '/tmp',
+        ],
+      ],
+      ['food=banana&cipher=aes', ['cipher' => 'aes']],
+    ];
+  }
+
+}

From 209fd988c4186e74464e4b2dbaec96fcda38bb52 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Fri, 21 Aug 2020 16:37:33 +0100
Subject: [PATCH 006/834] Fix setAmount should not return localized amount

---
 Civi/Payment/PropertyBag.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Civi/Payment/PropertyBag.php b/Civi/Payment/PropertyBag.php
index 49a4ea4e8c99..f8817b8c4ecb 100644
--- a/Civi/Payment/PropertyBag.php
+++ b/Civi/Payment/PropertyBag.php
@@ -423,8 +423,7 @@ public function setAmount($value, $label = 'default') {
     if (!is_numeric($value)) {
       throw new \InvalidArgumentException("setAmount requires a numeric amount value");
     }
-
-    return $this->set('amount', $label, \CRM_Utils_Money::format($value, NULL, NULL, TRUE));
+    return $this->set('amount', $label, filter_var($value, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
   }
 
   /**

From e64435f1646d80e760e688f961c139f69ae2da14 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 15 Aug 2020 11:04:31 +1200
Subject: [PATCH 007/834] Improve consistency of metadata type declarations

---
 CRM/Contact/BAO/Contact.php                 |  4 ++
 CRM/Export/BAO/ExportProcessor.php          | 65 +++++++++------------
 tests/phpunit/CRM/Export/BAO/ExportTest.php | 36 ++++++------
 3 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 29c82bd90095..96e847a12074 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -1543,14 +1543,17 @@ public static function &exportableFields($contactType = 'Individual', $status =
             [
               'name' => 'organization_name',
               'title' => ts('Current Employer'),
+              'type' => CRM_Utils_Type::T_STRING,
             ],
         ]);
 
+        // This probably would be added anyway by appendPseudoConstantsToFields.
         $locationType = [
           'location_type' => [
             'name' => 'location_type',
             'where' => 'civicrm_location_type.name',
             'title' => ts('Location Type'),
+            'type' => CRM_Utils_Type::T_STRING,
           ],
         ];
 
@@ -1559,6 +1562,7 @@ public static function &exportableFields($contactType = 'Individual', $status =
             'name' => 'im_provider',
             'where' => 'civicrm_im.provider_id',
             'title' => ts('IM Provider'),
+            'type' => CRM_Utils_Type::T_STRING,
           ],
         ];
 
diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index c1231fecb714..7c2fbb859217 100644
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -639,6 +639,9 @@ public function setQueryFields($queryFields) {
     $queryFields['world_region']['context'] = 'country';
     $queryFields['state_province']['context'] = 'province';
     $queryFields['contact_id'] = ['title' => ts('Contact ID'), 'type' => CRM_Utils_Type::T_INT];
+    $queryFields['tags']['type'] = CRM_Utils_Type::T_LONGTEXT;
+    $queryFields['groups']['type'] = CRM_Utils_Type::T_LONGTEXT;
+    $queryFields['notes']['type'] = CRM_Utils_Type::T_LONGTEXT;
     // Set the label to gender for gender_id as we it's ... magic (not in a good way).
     // In other places the query object offers e.g contribution_status & contribution_status_id
     $queryFields['gender_id']['title'] = ts('Gender');
@@ -803,7 +806,7 @@ public function runQuery($params, $order) {
 
     // CRM-13982 - check if is deleted
     foreach ($params as $value) {
-      if ($value[0] == 'contact_is_deleted') {
+      if ($value[0] === 'contact_is_deleted') {
         unset($whereClauses['trash_clause']);
       }
     }
@@ -825,10 +828,10 @@ public function runQuery($params, $order) {
     }
 
     if (empty($where)) {
-      $where = "WHERE " . implode(' AND ', $whereClauses);
+      $where = 'WHERE ' . implode(' AND ', $whereClauses);
     }
     else {
-      $where .= " AND " . implode(' AND ', $whereClauses);
+      $where .= ' AND ' . implode(' AND ', $whereClauses);
     }
 
     $groupBy = $this->getGroupBy($query);
@@ -1431,21 +1434,20 @@ public function getValidLocationFields() {
   public function getSqlColumnDefinition($fieldName, $columnName) {
 
     // 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 ($columnName == 'master_id' || $columnName == 'current_employer') {
+    // in the DB it is an ID, but in the export, we retrieve the display_name of the master record
+    if ($columnName === 'master_id') {
       return "`$fieldName` varchar(128)";
     }
 
     $queryFields = $this->getQueryFields();
-    // @todo remove the enotice avoidance here, ensure all columns are declared.
+    // @todo remove the e-notice avoidance here, ensure all columns are declared.
     // tests will fail on the enotices until they all are & then all the 'else'
     // below can go.
     $fieldSpec = $queryFields[$columnName] ?? [];
-
+    $type = $fieldSpec['type'] ?? ($fieldSpec['data_type'] ?? '');
     // set the sql columns
-    if (isset($fieldSpec['type'])) {
-      switch ($fieldSpec['type']) {
+    if ($type) {
+      switch ($type) {
         case CRM_Utils_Type::T_INT:
         case CRM_Utils_Type::T_BOOLEAN:
           if (in_array(CRM_Utils_Array::value('data_type', $fieldSpec), ['Country', 'StateProvince', 'ContactReference'])) {
@@ -1488,39 +1490,28 @@ public function getSqlColumnDefinition($fieldName, $columnName) {
         return "`$fieldName` text";
       }
       else {
-        $changeFields = [
-          'groups',
-          'tags',
-          'notes',
-        ];
+        // set the sql columns for custom data
+        if (isset($queryFields[$columnName]['data_type'])) {
 
-        if (in_array($fieldName, $changeFields)) {
-          return "`$fieldName` text";
-        }
-        else {
-          // set the sql columns for custom data
-          if (isset($queryFields[$columnName]['data_type'])) {
+          switch ($queryFields[$columnName]['data_type']) {
+            case 'String':
+              // May be option labels, which could be up to 512 characters
+              $length = max(512, CRM_Utils_Array::value('text_length', $queryFields[$columnName]));
+              return "`$fieldName` varchar($length)";
 
-            switch ($queryFields[$columnName]['data_type']) {
-              case 'String':
-                // May be option labels, which could be up to 512 characters
-                $length = max(512, CRM_Utils_Array::value('text_length', $queryFields[$columnName]));
-                return "`$fieldName` varchar($length)";
+            case 'Link':
+              return "`$fieldName` varchar(255)";
 
-              case 'Link':
-                return "`$fieldName` varchar(255)";
+            case 'Memo':
+              return "`$fieldName` text";
 
-              case 'Memo':
-                return "`$fieldName` text";
-
-              default:
-                return "`$fieldName` varchar(255)";
-            }
-          }
-          else {
-            return "`$fieldName` text";
+            default:
+              return "`$fieldName` varchar(255)";
           }
         }
+        else {
+          return "`$fieldName` text";
+        }
       }
     }
   }
diff --git a/tests/phpunit/CRM/Export/BAO/ExportTest.php b/tests/phpunit/CRM/Export/BAO/ExportTest.php
index b2359ed4f080..deb43c526f16 100644
--- a/tests/phpunit/CRM/Export/BAO/ExportTest.php
+++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php
@@ -1807,7 +1807,7 @@ public function testGetSQLColumnsAndHeaders($exportMode, $expected, $expectedHea
     // We need some data so that we can get to the end of the export
     // function. Hopefully one day that won't be required to get metadata info out.
     // eventually aspire to call $provider->getSQLColumns straight after it
-    // is intiated.
+    // is initiated.
     $this->setupBaseExportData($exportMode);
     $this->doExportTest(['selectAll' => TRUE, 'exportMode' => $exportMode, 'ids' => [1]]);
     $this->assertEquals($expected, $this->processor->getSQLColumns());
@@ -1913,7 +1913,7 @@ public function getAllSpecifiableParticipantReturnColumns() {
       'participant_fee_level' => '`participant_fee_level` longtext',
       'participant_is_pay_later' => '`participant_is_pay_later` varchar(16)',
       'participant_id' => '`participant_id` varchar(16)',
-      'participant_note' => '`participant_note` text',
+      'participant_note' => '`participant_note` longtext',
       'participant_role_id' => '`participant_role_id` varchar(128)',
       'participant_role' => '`participant_role` varchar(255)',
       'participant_source' => '`participant_source` varchar(128)',
@@ -2508,8 +2508,8 @@ protected function getBasicSqlColumnDefinition($isContactExport) {
       'addressee' => '`addressee` varchar(255)',
       'email_greeting' => '`email_greeting` varchar(255)',
       'postal_greeting' => '`postal_greeting` varchar(255)',
-      'current_employer' => '`current_employer` varchar(128)',
-      'location_type' => '`location_type` text',
+      'current_employer' => '`current_employer` varchar(255)',
+      'location_type' => '`location_type` varchar(255)',
       'address_id' => '`address_id` varchar(16)',
       'street_address' => '`street_address` varchar(96)',
       'street_number' => '`street_number` varchar(16)',
@@ -2538,14 +2538,14 @@ protected function getBasicSqlColumnDefinition($isContactExport) {
       'is_bulkmail' => '`is_bulkmail` varchar(16)',
       'signature_text' => '`signature_text` longtext',
       'signature_html' => '`signature_html` longtext',
-      'im_provider' => '`im_provider` text',
+      'im_provider' => '`im_provider` varchar(255)',
       'im' => '`im` varchar(64)',
       'openid' => '`openid` varchar(255)',
       'world_region' => '`world_region` varchar(128)',
       'url' => '`url` varchar(128)',
-      'groups' => '`groups` text',
-      'tags' => '`tags` text',
-      'notes' => '`notes` text',
+      'groups' => '`groups` longtext',
+      'tags' => '`tags` longtext',
+      'notes' => '`notes` longtext',
       'phone_type' => '`phone_type` varchar(255)',
     ];
     if (!$isContactExport) {
@@ -2628,7 +2628,7 @@ protected function getParticipantSqlColumns() {
       'participant_status_id' => '`participant_status_id` varchar(16)',
       'participant_role' => '`participant_role` varchar(255)',
       'participant_role_id' => '`participant_role_id` varchar(128)',
-      'participant_note' => '`participant_note` text',
+      'participant_note' => '`participant_note` longtext',
       'participant_register_date' => '`participant_register_date` varchar(32)',
       'participant_source' => '`participant_source` varchar(128)',
       'participant_fee_level' => '`participant_fee_level` longtext',
@@ -2696,8 +2696,8 @@ public function getContributionSqlColumns() {
       'addressee' => '`addressee` varchar(255)',
       'email_greeting' => '`email_greeting` varchar(255)',
       'postal_greeting' => '`postal_greeting` varchar(255)',
-      'current_employer' => '`current_employer` varchar(128)',
-      'location_type' => '`location_type` text',
+      'current_employer' => '`current_employer` varchar(255)',
+      'location_type' => '`location_type` varchar(255)',
       'street_address' => '`street_address` varchar(96)',
       'street_number' => '`street_number` varchar(16)',
       'street_number_suffix' => '`street_number_suffix` varchar(8)',
@@ -2723,7 +2723,7 @@ public function getContributionSqlColumns() {
       'is_bulkmail' => '`is_bulkmail` varchar(16)',
       'signature_text' => '`signature_text` longtext',
       'signature_html' => '`signature_html` longtext',
-      'im_provider' => '`im_provider` text',
+      'im_provider' => '`im_provider` varchar(255)',
       'im' => '`im` varchar(64)',
       'openid' => '`openid` varchar(255)',
       'world_region' => '`world_region` varchar(128)',
@@ -2753,15 +2753,15 @@ public function getContributionSqlColumns() {
       'contribution_status' => '`contribution_status` varchar(255)',
       'contribution_recur_id' => '`contribution_recur_id` varchar(16)',
       'amount_level' => '`amount_level` longtext',
-      'contribution_note' => '`contribution_note` text',
+      'contribution_note' => '`contribution_note` longtext',
       'contribution_batch' => '`contribution_batch` text',
       'contribution_campaign_title' => '`contribution_campaign_title` varchar(255)',
       'contribution_campaign_id' => '`contribution_campaign_id` varchar(16)',
       'contribution_soft_credit_name' => '`contribution_soft_credit_name` varchar(255)',
-      'contribution_soft_credit_amount' => '`contribution_soft_credit_amount` varchar(255)',
+      'contribution_soft_credit_amount' => '`contribution_soft_credit_amount` varchar(32)',
       'contribution_soft_credit_type' => '`contribution_soft_credit_type` varchar(255)',
-      'contribution_soft_credit_contact_id' => '`contribution_soft_credit_contact_id` varchar(255)',
-      'contribution_soft_credit_contribution_id' => '`contribution_soft_credit_contribution_id` varchar(255)',
+      'contribution_soft_credit_contact_id' => '`contribution_soft_credit_contact_id` varchar(16)',
+      'contribution_soft_credit_contribution_id' => '`contribution_soft_credit_contribution_id` varchar(16)',
     ];
   }
 
@@ -2781,9 +2781,9 @@ public function getPledgeSqlColumns() {
       'pledge_next_pay_amount' => '`pledge_next_pay_amount` text',
       'pledge_status' => '`pledge_status` varchar(255)',
       'pledge_is_test' => '`pledge_is_test` varchar(16)',
-      'pledge_contribution_page_id' => '`pledge_contribution_page_id` varchar(255)',
+      'pledge_contribution_page_id' => '`pledge_contribution_page_id` varchar(16)',
       'pledge_financial_type' => '`pledge_financial_type` text',
-      'pledge_frequency_interval' => '`pledge_frequency_interval` varchar(255)',
+      'pledge_frequency_interval' => '`pledge_frequency_interval` varchar(16)',
       'pledge_frequency_unit' => '`pledge_frequency_unit` varchar(255)',
       'pledge_currency' => '`pledge_currency` text',
       'pledge_campaign_id' => '`pledge_campaign_id` varchar(16)',

From 4c54e0bd41f31c5bf40855ff23e55e77d3d35115 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 29 Jul 2020 18:53:51 +1200
Subject: [PATCH 008/834] [REF] Extract function to get locations to merge,
 rename 'operation' to is_replace'

This is a preliminary refactor. I have a bug to fix in this code but cannot yet make sense of it. The mergeHandler class
is simply an object to refactor the functions onto. Much of this code is hard to work with as the use of static functions
necessitates a lot of compilation and compiling so the process of cleaning it up involves extracting functionns to this
new class (which may one day replace the Merger class). As it is a refactoring process the functions reflect the old code
more than the ideal code. However, it provides the change to give some documentation regarding the locBlock array
and also to rename the confusing field 'operation' to 'is_replace'
---
 CRM/Dedupe/MergeHandler.php          | 61 ++++++++++++++++++++++++++++
 CRM/Dedupe/Merger.php                | 49 ++++++----------------
 tests/phpunit/api/v3/ContactTest.php | 14 ++-----
 3 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/CRM/Dedupe/MergeHandler.php b/CRM/Dedupe/MergeHandler.php
index 891bc96c90e1..6b86b2f9b91d 100644
--- a/CRM/Dedupe/MergeHandler.php
+++ b/CRM/Dedupe/MergeHandler.php
@@ -33,6 +33,30 @@ class CRM_Dedupe_MergeHandler {
    */
   protected $toRemoveID;
 
+  /**
+   * Migration info array.
+   *
+   * This is a nasty bunch of data used in mysterious ways. We want to work to make it more
+   * sensible but for now we store it.
+   *
+   * @var array
+   */
+  protected $migrationInfo = [];
+
+  /**
+   * @return array
+   */
+  public function getMigrationInfo(): array {
+    return $this->migrationInfo;
+  }
+
+  /**
+   * @param array $migrationInfo
+   */
+  public function setMigrationInfo(array $migrationInfo) {
+    $this->migrationInfo = $migrationInfo;
+  }
+
   /**
    * @return mixed
    */
@@ -129,4 +153,41 @@ public function getTablesDynamicallyRelatedToContactTable() {
     return \Civi::$statics[__CLASS__]['dynamic'];
   }
 
+  /**
+   * Get the location blocks designated to be moved during the merge.
+   *
+   * Note this is a refactoring step and future refactors should develop a more coherent array
+   *
+   * @return array
+   *   The format is ['address' => [0 => ['is_replace' => TRUE]], 'email' => [0...],[1....]
+   *   where the entity is address, the internal indexing for the addresses on both contact is 1
+   *   and the intent to replace the existing address is TRUE.
+   */
+  public function getLocationBlocksToMerge(): array {
+    $locBlocks = [];
+    foreach ($this->getMigrationInfo() as $key => $value) {
+      $isLocationField = (substr($key, 0, 14) === 'move_location_' and $value != NULL);
+      if (!$isLocationField) {
+        continue;
+      }
+      $locField = explode('_', $key);
+      $fieldName = $locField[2];
+      $fieldCount = $locField[3];
+
+      // Set up the operation type (add/overwrite)
+      // Ignore operation for websites
+      // @todo Tidy this up
+      $operation = 0;
+      if ($fieldName !== 'website') {
+        $operation = $this->getMigrationInfo()['location_blocks'][$fieldName][$fieldCount]['operation'] ?? NULL;
+      }
+      // default operation is overwrite.
+      if (!$operation) {
+        $operation = 2;
+      }
+      $locBlocks[$fieldName][$fieldCount]['is_replace'] = $operation === 2;
+    }
+    return $locBlocks;
+  }
+
 }
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 2300680614fa..d6b1c7bb7ce0 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1388,7 +1388,9 @@ public static function moveAllBelongings($mainId, $otherId, $migrationInfo, $che
         $removeTables = array_merge($moveTables, $relTables[substr($key, 5)]['tables']);
       }
     }
-    self::mergeLocations($mainId, $otherId, $migrationInfo);
+    $mergeHandler = new CRM_Dedupe_MergeHandler((int) $mainId, (int) $otherId);
+    $mergeHandler->setMigrationInfo($migrationInfo);
+    self::mergeLocations($mergeHandler);
 
     // **** Do contact related migrations
     // @todo - move all custom field processing to the move class & eventually have an
@@ -1396,7 +1398,7 @@ public static function moveAllBelongings($mainId, $otherId, $migrationInfo, $che
     $customFieldBAO = new CRM_Core_BAO_CustomField();
     $customFieldBAO->move($otherId, $mainId, $submittedCustomFields);
     // add the related tables and unset the ones that don't sport any of the duplicate contact's info
-    $mergeHandler = new CRM_Dedupe_MergeHandler((int) $mainId, (int) $otherId);
+
     CRM_Dedupe_Merger::moveContactBelongings($mergeHandler, $moveTables, $tableOperations);
     unset($moveTables, $tableOperations);
 
@@ -1775,43 +1777,19 @@ public static function getMergeContactDetails($contact_id) {
    * The use of the new hook is tested, including the fact it is called before contributions are merged, as this
    * is likely to be significant data in merge hooks.
    *
-   * @param int $mainId
-   * @param int $otherId
-   *
-   * @param array $migrationInfo
-   *   Migration info for the merge. This is passed to the hook as informational only.
+   * @param \CRM_Dedupe_MergeHandler $mergeHandler
    */
-  public static function mergeLocations($mainId, $otherId, $migrationInfo) {
-    foreach ($migrationInfo as $key => $value) {
-      $isLocationField = (substr($key, 0, 14) === 'move_location_' and $value != NULL);
-      if (!$isLocationField) {
-        continue;
-      }
-      $locField = explode('_', $key);
-      $fieldName = $locField[2];
-      $fieldCount = $locField[3];
-
-      // Set up the operation type (add/overwrite)
-      // Ignore operation for websites
-      // @todo Tidy this up
-      $operation = 0;
-      if ($fieldName !== 'website') {
-        $operation = $migrationInfo['location_blocks'][$fieldName][$fieldCount]['operation'] ?? NULL;
-      }
-      // default operation is overwrite.
-      if (!$operation) {
-        $operation = 2;
-      }
-      $locBlocks[$fieldName][$fieldCount]['operation'] = $operation;
-    }
+  public static function mergeLocations($mergeHandler) {
+    $locBlocks = $mergeHandler->getLocationBlocksToMerge();
     $blocksDAO = [];
+    $migrationInfo = $mergeHandler->getMigrationInfo();
 
     // @todo Handle OpenID (not currently in API).
     if (!empty($locBlocks)) {
       $locationBlocks = self::getLocationBlockInfo();
 
-      $primaryBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mainId, ['is_primary' => 1]);
-      $billingBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mainId, ['is_billing' => 1]);
+      $primaryBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mergeHandler->getToKeepID(), ['is_primary' => 1]);
+      $billingBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mergeHandler->getToKeepID(), ['is_billing' => 1]);
 
       foreach ($locBlocks as $name => $block) {
         $blocksDAO[$name] = ['delete' => [], 'update' => []];
@@ -1832,7 +1810,7 @@ public static function mergeLocations($mainId, $otherId, $migrationInfo) {
 
           // For the block which belongs to other-contact, link the location block to main-contact
           $otherBlockDAO = new $daoName();
-          $otherBlockDAO->contact_id = $mainId;
+          $otherBlockDAO->contact_id = $mergeHandler->getToKeepID();
 
           // Get the ID of this block on the 'other' contact, otherwise skip
           $otherBlockDAO->id = $otherBlockId;
@@ -1871,9 +1849,8 @@ public static function mergeLocations($mainId, $otherId, $migrationInfo) {
             $otherBlockDAO->is_billing = 0;
           }
 
-          $operation = CRM_Utils_Array::value('operation', $values, 2);
           // overwrite - need to delete block which belongs to main-contact.
-          if (!empty($mainBlockId) && ($operation == 2)) {
+          if (!empty($mainBlockId) && $values['is_replace']) {
             $deleteDAO = new $daoName();
             $deleteDAO->id = $mainBlockId;
             $deleteDAO->find(TRUE);
@@ -1893,7 +1870,7 @@ public static function mergeLocations($mainId, $otherId, $migrationInfo) {
       }
     }
 
-    CRM_Utils_Hook::alterLocationMergeData($blocksDAO, $mainId, $otherId, $migrationInfo);
+    CRM_Utils_Hook::alterLocationMergeData($blocksDAO, $mergeHandler->getToKeepID(), $mergeHandler->getToRemoveID(), $migrationInfo);
     foreach ($blocksDAO as $blockDAOs) {
       if (!empty($blockDAOs['update'])) {
         foreach ($blockDAOs['update'] as $blockDAO) {
diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index 62c1ff50e584..4d99ff2562ec 100644
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -3968,23 +3968,17 @@ public function testMergeBizzareOldParams() {
    */
   public function testMerge() {
     $this->createLoggedInUser();
-    $otherContact = $this->callAPISuccess('contact', 'create', $this->_params);
-    $retainedContact = $this->callAPISuccess('contact', 'create', $this->_params);
-    $this->callAPISuccess('contact', 'merge', [
-      'to_keep_id' => $retainedContact['id'],
-      'to_remove_id' => $otherContact['id'],
-      'auto_flip' => FALSE,
-    ]);
+    $this->ids['contact'][0] = $this->callAPISuccess('Contact', 'create', $this->_params)['id'];
+    $this->ids['contact'][1] = $this->callAPISuccess('Contact', 'create', $this->_params)['id'];
+    $retainedContact = $this->doMerge();
 
-    $contacts = $this->callAPISuccess('contact', 'get', $this->_params);
-    $this->assertEquals($retainedContact['id'], $contacts['id']);
     $activity = $this->callAPISuccess('Activity', 'getsingle', [
       'target_contact_id' => $retainedContact['id'],
       'activity_type_id' => 'Contact Merged',
     ]);
     $this->assertEquals(date('Y-m-d'), date('Y-m-d', strtotime($activity['activity_date_time'])));
     $activity2 = $this->callAPISuccess('Activity', 'getsingle', [
-      'target_contact_id' => $otherContact['id'],
+      'target_contact_id' => $this->ids['contact'][1],
       'activity_type_id' => 'Contact Deleted by Merge',
     ]);
     $this->assertEquals($activity['id'], $activity2['parent_id']);

From 6e948f0d2d1661b0d98cc3b73b400135383b1fff Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Sat, 22 Aug 2020 16:26:47 +0530
Subject: [PATCH 009/834] dev/core#1942 handle multiple membership of same
 membership type to update status

---
 CRM/Contribute/BAO/Contribution.php     | 11 +--
 tests/phpunit/api/v3/MembershipTest.php | 98 +++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 5 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 849daf7a4e5d..76281bcd768f 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -3185,10 +3185,10 @@ public function _gatherMessageValues($input, &$values, $ids = []) {
           foreach ($lineItems as &$eachItem) {
             if (isset($this->_relatedObjects['membership'])
               && is_array($this->_relatedObjects['membership'])
-              && array_key_exists($eachItem['membership_type_id'], $this->_relatedObjects['membership'])) {
-              $eachItem['join_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['membership_type_id']]->join_date);
-              $eachItem['start_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['membership_type_id']]->start_date);
-              $eachItem['end_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['membership_type_id']]->end_date);
+              && array_key_exists($eachItem['entity_id'] . '_' . $eachItem['membership_type_id'], $this->_relatedObjects['membership'])) {
+              $eachItem['join_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['entity_id'] . '_' . $eachItem['membership_type_id']]->join_date);
+              $eachItem['start_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['entity_id'] . '_' . $eachItem['membership_type_id']]->start_date);
+              $eachItem['end_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['entity_id'] . '_' . $eachItem['membership_type_id']]->end_date);
             }
             // This is actually used in conjunction with is_quick_config in the template & we should deprecate it.
             // However, that does create upgrade pain so would be better to be phased in.
@@ -4706,7 +4706,8 @@ public function loadRelatedMembershipObjects($ids = []) {
           $membership->join_date = CRM_Utils_Date::isoToMysql($membership->join_date);
           $membership->start_date = CRM_Utils_Date::isoToMysql($membership->start_date);
           $membership->end_date = CRM_Utils_Date::isoToMysql($membership->end_date);
-          $this->_relatedObjects['membership'][$membership->membership_type_id] = $membership;
+          $this->_relatedObjects['membership'][$membership->id . '_' . $membership->membership_type_id] = $membership;
+
         }
       }
     }
diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php
index 7e03eee9a3e5..4a7486df121c 100644
--- a/tests/phpunit/api/v3/MembershipTest.php
+++ b/tests/phpunit/api/v3/MembershipTest.php
@@ -173,6 +173,104 @@ public function testActivityForCancelledContribution() {
     ]);
   }
 
+  /**
+   * Test Multiple Membership Status for same contribution id.
+   */
+  public function testMultipleMembershipsContribution() {
+    // Main contact
+    $memStatus = CRM_Member_PseudoConstant::membershipStatus();
+    // Pending Membership Status
+    $pendingMembershipId = array_search('Pending', $memStatus);
+    // New Membership Status
+    $newMembershipId = array_search('test status', $memStatus);
+
+    $membershipParam = [
+      'membership_type_id' => $this->_membershipTypeID,
+      'source' => 'Webform Payment',
+      'status_id' => $pendingMembershipId,
+      'is_pay_later' => 1,
+      'skipStatusCal' => 1,
+    ];
+
+    // Contact 1
+    $contactId1 = $this->individualCreate();
+    $membershipParam['contact_id'] = $contactId1;
+    $membershipID1 = $this->contactMembershipCreate($membershipParam);
+
+    // Pending Payment Status
+    $ContributionCreate = $this->callAPISuccess('Contribution', 'create', [
+      'financial_type_id' => '1',
+      'total_amount' => 100,
+      'contact_id' => $contactId1,
+      'payment_instrument_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id', 'Check'),
+      'contribution_status_id' => 2,
+      'is_pay_later' => 1,
+      'receive_date' => date('Ymd'),
+    ]);
+    $this->callAPISuccess('MembershipPayment', 'create', [
+      'sequential' => 1,
+      'contribution_id' => $ContributionCreate['id'],
+      'membership_id' => $membershipID1,
+    ]);
+
+    // Contact 2
+    $contactId2 = $this->individualCreate();
+    $membershipParam['contact_id'] = $contactId2;
+    $membershipID2 = $this->contactMembershipCreate($membershipParam);
+    $this->callAPISuccess('MembershipPayment', 'create', [
+      'sequential' => 1,
+      'contribution_id' => $ContributionCreate['id'],
+      'membership_id' => $membershipID2,
+    ]);
+
+    // Contact 3
+    $contactId3 = $this->individualCreate();
+    $membershipParam['contact_id'] = $contactId3;
+    $membershipID3 = $this->contactMembershipCreate($membershipParam);
+    $this->callAPISuccess('MembershipPayment', 'create', [
+      'sequential' => 1,
+      'contribution_id' => $ContributionCreate['id'],
+      'membership_id' => $membershipID3,
+    ]);
+
+    // Change Payment Status to Completed
+    $form = new CRM_Contribute_Form_Contribution();
+    $form->_id = $ContributionCreate['id'];
+    $params = ['id' => $ContributionCreate['id']];
+    $values = $ids = [];
+    CRM_Contribute_BAO_Contribution::getValues($params, $values, $ids);
+    $form->_values = $values;
+    $form->testSubmit([
+      'total_amount' => 100,
+      'financial_type_id' => '1',
+      'contact_id' => $contactId1,
+      'payment_instrument_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id', 'Check'),
+      'contribution_status_id' => 1,
+    ],
+      CRM_Core_Action::UPDATE);
+
+    // check for Membership 1
+    $params = ['id' => $membershipID1];
+    $membership1 = $this->callAPISuccess('membership', 'get', $params);
+    $result1 = $membership1['values'][$membershipID1];
+    $this->assertEquals($result1['contact_id'], $contactId1);
+    $this->assertEquals($result1['status_id'], $newMembershipId);
+
+    // check for Membership 2
+    $params = ['id' => $membershipID2];
+    $membership2 = $this->callAPISuccess('membership', 'get', $params);
+    $result2 = $membership2['values'][$membershipID2];
+    $this->assertEquals($result2['contact_id'], $contactId2);
+    $this->assertEquals($result2['status_id'], $newMembershipId);
+
+    // check for Membership 3
+    $params = ['id' => $membershipID3];
+    $membership3 = $this->callAPISuccess('membership', 'get', $params);
+    $result3 = $membership3['values'][$membershipID3];
+    $this->assertEquals($result3['contact_id'], $contactId3);
+    $this->assertEquals($result3['status_id'], $newMembershipId);
+  }
+
   /**
    * Test membership get.
    */

From bbe2bc5301d38adacf2506993006cf16eb0c8bbc Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Sat, 22 Aug 2020 22:54:59 +0100
Subject: [PATCH 010/834] Remove 'hack' that overwrites result of searchColumns
 hook in mailings list

---
 CRM/Mailing/Page/Browse.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CRM/Mailing/Page/Browse.php b/CRM/Mailing/Page/Browse.php
index 9982bd1a79b5..a02b6adcbb70 100644
--- a/CRM/Mailing/Page/Browse.php
+++ b/CRM/Mailing/Page/Browse.php
@@ -243,11 +243,6 @@ public function run() {
     $controller->setEmbedded(TRUE);
     $controller->run();
 
-    // hack to display results as per search
-    $rows = $controller->getRows($controller);
-
-    $this->assign('rows', $rows);
-
     $urlParams = 'reset=1';
     $urlString = 'civicrm/mailing/browse';
     if ($this->get('sms')) {

From 4917a4fdaeba8e81e8271534061e1ae0fcb67ed9 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Mon, 24 Aug 2020 08:25:43 +0530
Subject: [PATCH 011/834] dev/core#1942 , correct IPN Test for related
 membership object key name correction

---
 tests/phpunit/CRM/Core/Payment/BaseIPNTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
index acc4eb5433ee..d2d777f9faf3 100644
--- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
@@ -104,8 +104,8 @@ public function testLoadMembershipObjects() {
     $this->_setUpRecurringContribution();
     $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
     $this->assertNotEmpty($this->objects['membership']);
-    $this->assertArrayHasKey($this->_membershipTypeID, $this->objects['membership']);
-    $this->assertTrue(is_a($this->objects['membership'][$this->_membershipTypeID], 'CRM_Member_BAO_Membership'));
+    $this->assertArrayHasKey($this->_membershipId . '_' . $this->_membershipTypeID, $this->objects['membership']);
+    $this->assertTrue(is_a($this->objects['membership'][$this->_membershipId . '_' . $this->_membershipTypeID], 'CRM_Member_BAO_Membership'));
     $this->assertTrue(is_a($this->objects['financialType'], 'CRM_Financial_BAO_FinancialType'));
     $this->assertNotEmpty($this->objects['contributionRecur']);
     $this->assertNotEmpty($this->objects['paymentProcessor']);
@@ -145,8 +145,8 @@ public function testLoadMembershipObjectsLoadAll() {
     $contribution->find(TRUE);
     $contribution->loadRelatedObjects($this->input, $this->ids, TRUE);
     $this->assertNotEmpty($contribution->_relatedObjects['membership']);
-    $this->assertArrayHasKey($this->_membershipTypeID, $contribution->_relatedObjects['membership']);
-    $this->assertTrue(is_a($contribution->_relatedObjects['membership'][$this->_membershipTypeID], 'CRM_Member_BAO_Membership'));
+    $this->assertArrayHasKey($this->_membershipId . '_' . $this->_membershipTypeID, $contribution->_relatedObjects['membership']);
+    $this->assertTrue(is_a($contribution->_relatedObjects['membership'][$this->_membershipId . '_' . $this->_membershipTypeID], 'CRM_Member_BAO_Membership'));
     $this->assertTrue(is_a($contribution->_relatedObjects['financialType'], 'CRM_Financial_BAO_FinancialType'));
     $this->assertFalse(empty($contribution->_relatedObjects['contributionRecur']));
     $this->assertFalse(empty($contribution->_relatedObjects['paymentProcessor']));

From 1f7272b128156e8f948d8a0a86838aee57c4e021 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 23 Aug 2020 23:16:32 -0400
Subject: [PATCH 012/834] Remove old dropped items from the schema xml

Removes unused fields and indexes which were dropped prior to 4.4.7
which is currently the min upgradable version.
---
 xml/schema/Activity/Activity.xml              | 84 -------------------
 xml/schema/Activity/ActivityAssignment.xml    | 53 ------------
 xml/schema/Batch/Batch.xml                    |  9 --
 xml/schema/Case/Case.xml                      | 62 --------------
 xml/schema/Case/CaseActivity.xml              | 27 ------
 xml/schema/Contact/Contact.xml                | 62 --------------
 xml/schema/Contact/Individual.xml             | 34 --------
 xml/schema/Contact/SavedSearch.xml            | 17 ----
 xml/schema/Contribute/Contribution.xml        | 43 ----------
 xml/schema/Contribute/ContributionPage.xml    | 14 ----
 xml/schema/Contribute/ContributionProduct.xml | 11 ---
 xml/schema/Contribute/ContributionRecur.xml   | 24 ------
 xml/schema/Contribute/PremiumsProduct.xml     |  8 --
 xml/schema/Core/Cache.xml                     |  8 --
 xml/schema/Core/CustomField.xml               |  8 --
 xml/schema/Core/CustomGroup.xml               |  8 --
 xml/schema/Core/Dashboard.xml                 | 15 ----
 xml/schema/Core/Discount.xml                  | 19 -----
 xml/schema/Core/Domain.xml                    | 47 -----------
 xml/schema/Core/EntityTag.xml                 | 23 -----
 xml/schema/Core/Job.xml                       |  9 --
 xml/schema/Core/Mapping.xml                   | 10 ---
 xml/schema/Core/MappingField.xml              |  8 --
 xml/schema/Core/Phone.xml                     | 10 ---
 xml/schema/Core/UFField.xml                   | 32 -------
 xml/schema/Core/UFGroup.xml                   | 28 -------
 xml/schema/Core/UFMatch.xml                   | 17 ----
 xml/schema/Dedupe/RuleGroup.xml               | 17 ----
 xml/schema/Event/Event.xml                    | 21 -----
 xml/schema/Financial/EntityFinancialTrxn.xml  |  9 --
 xml/schema/Financial/FinancialAccount.xml     |  7 --
 xml/schema/Financial/FinancialTrxn.xml        | 46 ----------
 xml/schema/Financial/FinancialType.xml        | 10 ---
 xml/schema/Financial/PaymentProcessor.xml     |  8 --
 xml/schema/Grant/Grant.xml                    |  9 --
 xml/schema/Member/MembershipType.xml          | 22 -----
 xml/schema/PCP/PCP.xml                        | 23 -----
 xml/schema/PCP/PCPBlock.xml                   |  7 --
 xml/schema/Pledge/Pledge.xml                  | 17 ----
 xml/schema/Price/LineItem.xml                 |  9 --
 xml/schema/Price/PriceField.xml               |  8 --
 xml/schema/Price/PriceSet.xml                 | 17 ----
 42 files changed, 920 deletions(-)

diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 8a37ea3d7615..4f329c1929dc 100644
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -21,30 +21,6 @@
     <name>id</name>
     <autoincrement>true</autoincrement>
   </primaryKey>
-  <field>
-    <name>source_contact_id</name>
-    <type>int unsigned</type>
-    <title>Source Contact</title>
-    <import>true</import>
-    <headerPattern>/(activity.)?source(.contact(.id)?)?/i</headerPattern>
-    <comment>Contact ID of the person scheduling or logging this Activity. Usually the authenticated user.</comment>
-    <add>1.1</add>
-    <drop>4.4</drop>
-  </field>
-  <foreignKey>
-    <name>source_contact_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>1.1</add>
-    <drop>4.4</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
-  <index>
-    <name>UI_source_contact_id</name>
-    <fieldName>source_contact_id</fieldName>
-    <add>2.0</add>
-    <drop>3.2</drop>
-  </index>
   <field>
     <name>source_record_id</name>
     <type>int unsigned</type>
@@ -80,23 +56,6 @@
     <fieldName>activity_type_id</fieldName>
     <add>1.6</add>
   </index>
-  <field>
-    <name>target_entity_table</name>
-    <type>varchar</type>
-    <length>64</length>
-    <required>true</required>
-    <comment>Name of table where item being referenced is stored.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
-  <field>
-    <name>target_entity_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>Foreign key to the referenced item.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>subject</name>
     <uniqueName>activity_subject</uniqueName>
@@ -112,13 +71,6 @@
     <add>1.1</add>
     <change>2.0</change>
   </field>
-  <field>
-    <name>scheduled_date</name>
-    <type>datetime</type>
-    <comment>Date and time meeting is scheduled to occur.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>activity_date_time</name>
     <import>true</import>
@@ -140,27 +92,6 @@
     <fieldName>activity_date_time</fieldName>
     <add>4.7</add>
   </index>
-  <field>
-    <name>due_date_time</name>
-    <type>datetime</type>
-    <comment>Date and time this activity is due.</comment>
-    <add>2.0</add>
-    <drop>3.0</drop>
-  </field>
-  <field>
-    <name>duration_hours</name>
-    <type>int unsigned</type>
-    <comment>Planned or actual duration of meeting - hours.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
-  <field>
-    <name>duration_minutes</name>
-    <type>int unsigned</type>
-    <comment>Planned or actual duration of meeting - minutes.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>duration</name>
     <uniqueName>activity_duration</uniqueName>
@@ -231,15 +162,6 @@
     </html>
     <add>1.1</add>
   </field>
-  <field>
-    <name>status</name>
-    <type>enum</type>
-    <title>Status</title>
-    <values>Scheduled, Completed</values>
-    <comment>What is the status of this meeting? Completed meeting status results in activity history entry.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>status_id</name>
     <uniqueName>activity_status_id</uniqueName>
@@ -374,12 +296,6 @@
     <add>2.2</add>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <index>
-    <name>UI_original_id</name>
-    <fieldName>original_id</fieldName>
-    <add>2.2</add>
-    <drop>3.2</drop>
-  </index>
   <field>
     <name>result</name>
     <uniqueName>activity_result</uniqueName>
diff --git a/xml/schema/Activity/ActivityAssignment.xml b/xml/schema/Activity/ActivityAssignment.xml
index f3df06bb54ab..192af7dc8aa7 100644
--- a/xml/schema/Activity/ActivityAssignment.xml
+++ b/xml/schema/Activity/ActivityAssignment.xml
@@ -18,59 +18,6 @@
     <name>id</name>
     <autoincrement>true</autoincrement>
   </primaryKey>
-
-  <field>
-    <name>activity_entity_table</name>
-    <type>varchar</type>
-    <length>64</length>
-    <required>true</required>
-    <comment>Name of table where item being referenced is stored (activity, phonecall or meeting).</comment>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </field>
-
-  <field>
-    <name>activity_entity_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>Entity (activity, phonecall or meeting) id for which the assigment is created</comment>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </field>
-
-  <dynamicForeignKey>
-    <idColumn>activity_entity_id</idColumn>
-    <typeColumn>activity_entity_table</typeColumn>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </dynamicForeignKey>
-
-  <field>
-    <name>target_entity_table</name>
-    <type>varchar</type>
-    <length>64</length>
-    <required>true</required>
-    <comment>Name of table where item being referenced is stored (contact assigned to given activity).</comment>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </field>
-
-  <field>
-    <name>target_entity_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>Foreign key to the referenced item.</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
-
-  <dynamicForeignKey>
-    <idColumn>target_entity_id</idColumn>
-    <typeColumn>target_entity_table</typeColumn>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </dynamicForeignKey>
-
   <field>
     <name>activity_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Batch/Batch.xml b/xml/schema/Batch/Batch.xml
index 3bcbc4440921..811ecf4f219f 100644
--- a/xml/schema/Batch/Batch.xml
+++ b/xml/schema/Batch/Batch.xml
@@ -35,15 +35,6 @@
     <unique>true</unique>
     <add>4.2</add>
   </index>
-  <field>
-    <name>label</name>
-    <type>varchar</type>
-    <length>64</length>
-    <localizable>true</localizable>
-    <comment>Friendly Name.</comment>
-    <add>3.3</add>
-    <drop>4.2</drop>
-  </field>
   <field>
     <name>title</name>
     <title>Batch Title</title>
diff --git a/xml/schema/Case/Case.xml b/xml/schema/Case/Case.xml
index a91e955a55eb..492a1df43d46 100644
--- a/xml/schema/Case/Case.xml
+++ b/xml/schema/Case/Case.xml
@@ -24,23 +24,6 @@
     <name>id</name>
     <autoincrement>true</autoincrement>
   </primaryKey>
-  <field>
-    <name>contact_id</name>
-    <type>int unsigned</type>
-    <uniqueName>case_contact_id</uniqueName>
-    <required>true</required>
-    <comment>Contact ID of contact record given case belongs to.</comment>
-    <add>1.8</add>
-    <drop>2.1</drop>
-  </field>
-  <foreignKey>
-    <name>contact_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>1.8</add>
-    <drop>2.1</drop>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
   <field>
     <name>case_type_id</name>
     <type>int unsigned</type>
@@ -70,51 +53,6 @@
     <key>id</key>
     <add>4.5</add>
   </foreignKey>
-  <field>
-    <name>casetag1_id</name>
-    <type>varchar</type>
-    <length>128</length>
-    <required>true</required>
-    <comment>Id of first case category.</comment>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </field>
-  <index>
-    <name>index_casetag1_id</name>
-    <fieldName>casetag1_id</fieldName>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </index>
-  <field>
-    <name>casetag2_id</name>
-    <type>varchar</type>
-    <length>128</length>
-    <required>true</required>
-    <comment>Id of second case category.</comment>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </field>
-  <index>
-    <name>index_casetag2_id</name>
-    <fieldName>casetag2_id</fieldName>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </index>
-  <field>
-    <name>casetag3_id</name>
-    <type>varchar</type>
-    <length>128</length>
-    <required>true</required>
-    <comment>Id of third case category.</comment>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </field>
-  <index>
-    <name>index_casetag3_id</name>
-    <fieldName>casetag3_id</fieldName>
-    <add>1.8</add>
-    <drop>2.0</drop>
-  </index>
   <field>
     <name>subject</name>
     <type>varchar</type>
diff --git a/xml/schema/Case/CaseActivity.xml b/xml/schema/Case/CaseActivity.xml
index 0ae6710e4d74..daa0a895d216 100644
--- a/xml/schema/Case/CaseActivity.xml
+++ b/xml/schema/Case/CaseActivity.xml
@@ -54,31 +54,4 @@
     <fieldName>activity_id</fieldName>
     <add>2.0</add>
   </index>
-
-  <field>
-   <name>activity_entity_table</name>
-   <type>varchar</type>
-   <length>64</length>
-   <required>true</required>
-   <comment>Name of table where item being referenced is stored (activity, phonecall or meeting).</comment>
-   <add>1.8</add>
-   <drop>2.0</drop>
-  </field>
-
-  <field>
-   <name>activity_entity_id</name>
-   <type>int unsigned</type>
-   <required>true</required>
-   <comment>Entity (activity, phonecall or meeting) id for which the assigment is created</comment>
-   <add>1.8</add>
-   <drop>2.0</drop>
-  </field>
-
-  <dynamicForeignKey>
-   <idColumn>activity_entity_id</idColumn>
-   <typeColumn>activity_entity_table</typeColumn>
-   <add>1.8</add>
-   <drop>2.0</drop>
-  </dynamicForeignKey>
-
 </table>
diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml
index f904c09cff1e..b3721ab2b85e 100644
--- a/xml/schema/Contact/Contact.xml
+++ b/xml/schema/Contact/Contact.xml
@@ -246,19 +246,6 @@
     <fulltext/>
     <add>1.1</add>
   </field>
-  <field>
-    <name>home_URL</name>
-    <rule>url</rule>
-    <title>Website</title>
-    <type>varchar</type>
-    <length>128</length>
-    <import>true</import>
-    <headerPattern>/^(home\sURL)|URL|web|site/i</headerPattern>
-    <dataPattern>/^[\w\/\:\.]+$/</dataPattern>
-    <comment>optional "home page" URL for this contact.</comment>
-    <add>1.1</add>
-    <drop>3.2</drop>
-  </field>
   <field>
     <name>image_URL</name>
     <type>text</type>
@@ -509,32 +496,6 @@
     <fieldName>communication_style_id</fieldName>
     <add>4.4</add>
   </index>
-  <field>
-    <name>greeting_type</name>
-    <type>varchar</type>
-    <length>128</length>
-    <import>true</import>
-    <comment>Preferred greeting format.</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
-  <field>
-    <name>greeting_type_id</name>
-    <title>Greeting Type</title>
-    <type>int unsigned</type>
-    <comment>FK to civicrm_option_value.id, that has to be valid, registered Greeting type.</comment>
-    <add>2.2</add>
-    <drop>3.0</drop>
-  </field>
-  <field>
-    <name>custom_greeting</name>
-    <type>varchar</type>
-    <length>128</length>
-    <import>true</import>
-    <comment>Custom greeting message.</comment>
-    <add>1.1</add>
-    <drop>3.0</drop>
-  </field>
   <field>
     <name>email_greeting_id</name>
     <type>int unsigned</type>
@@ -722,23 +683,6 @@
     </html>
     <contactType>Individual</contactType>
   </field>
-  <field>
-    <name>mail_to_household_id</name>
-    <title>Mail to Household ID</title>
-    <type>int unsigned</type>
-    <comment>OPTIONAL FK to civicrm_contact_household record. If NOT NULL, direct mail communications to household rather than individual location. </comment>
-    <export>true</export>
-    <add>1.1</add>
-    <drop>3.3</drop>
-  </field>
-  <foreignKey>
-    <name>mail_to_household_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>2.1</add>
-    <onDelete>SET NULL</onDelete>
-    <drop>3.3</drop>
-  </foreignKey>
   <field>
     <name>household_name</name>
     <type>varchar</type>
@@ -858,12 +802,6 @@
     </html>
     <permission>access deleted contacts</permission>
   </field>
-  <index>
-    <name>index_is_deleted</name>
-    <fieldName>is_deleted</fieldName>
-    <add>3.2</add>
-    <drop>4.4</drop>
-  </index>
   <index>
     <name>index_is_deleted_sort_name</name>
     <fieldName>is_deleted</fieldName>
diff --git a/xml/schema/Contact/Individual.xml b/xml/schema/Contact/Individual.xml
index 45f272067786..9956f17bebaf 100644
--- a/xml/schema/Contact/Individual.xml
+++ b/xml/schema/Contact/Individual.xml
@@ -74,14 +74,6 @@
     <fieldName>last_name</fieldName>
     <add>1.8</add>
   </index>
-  <field>
-    <name>gender</name>
-    <type>enum</type>
-    <import>true</import>
-    <values>Female, Male, Other</values>
-    <add>1.1</add>
-    <drop>1.2</drop>
-  </field>
   <field>
     <name>prefix_id</name>
     <type>int unsigned</type>
@@ -108,32 +100,6 @@
     <fieldName>suffix_id</fieldName>
     <add>1.6</add>
   </index>
-  <field>
-    <name>prefix</name>
-    <type>varchar</type>
-    <length>64</length>
-    <import>true</import>
-    <comment>Prefix to Name.</comment>
-    <add>1.1</add>
-    <drop>1.2</drop>
-  </field>
-  <field>
-    <name>suffix</name>
-    <type>varchar</type>
-    <length>64</length>
-    <import>true</import>
-    <comment>Suffix to Name.</comment>
-    <add>1.1</add>
-    <drop>1.2</drop>
-  </field>
-  <field>
-    <name>greeting_type</name>
-    <type>varchar</type>
-    <length>128</length>
-    <comment>Preferred greeting format.</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>greeting_type_id</name>
     <title>Greeting Type</title>
diff --git a/xml/schema/Contact/SavedSearch.xml b/xml/schema/Contact/SavedSearch.xml
index 89f578084b33..2d73182ac5c5 100644
--- a/xml/schema/Contact/SavedSearch.xml
+++ b/xml/schema/Contact/SavedSearch.xml
@@ -18,15 +18,6 @@
     <name>id</name>
     <autoincrement>false</autoincrement>
   </primaryKey>
-  <field>
-    <name>query</name>
-    <title>SQL Query</title>
-    <type>text</type>
-    <import>true</import>
-    <comment>SQL query for this search</comment>
-    <add>1.1</add>
-    <drop>1.5</drop>
-  </field>
   <field>
     <name>form_values</name>
     <title>Submitted Form Values</title>
@@ -36,14 +27,6 @@
     <serialize>PHP</serialize>
     <add>1.1</add>
   </field>
-  <field>
-    <name>is_active</name>
-    <type>boolean</type>
-    <title>Saved Search Enabled</title>
-    <comment>Is this entry active?</comment>
-    <add>1.1</add>
-    <drop>1.5</drop>
-  </field>
   <field>
     <name>mapping_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index e98363baa93b..5edebe7bc3d3 100644
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -46,39 +46,6 @@
     <add>1.3</add>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field>
-    <name>solicitor_id</name>
-    <title>Solicitor ID</title>
-    <type>int unsigned</type>
-    <comment>FK to Solicitor ID</comment>
-    <add>1.4</add>
-    <drop>2.2</drop>
-  </field>
-  <foreignKey>
-    <name>solicitor_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>1.4</add>
-    <drop>2.2</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
-  <field>
-    <name>contribution_type_id</name>
-    <title>Contribution Type</title>
-    <export>false</export>
-    <type>int unsigned</type>
-    <comment>FK to Contribution Type</comment>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>1.3</add>
-    <drop>4.3</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Financial Type</title>
@@ -360,16 +327,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>note</name>
-    <type>text</type>
-    <comment>Note and/or Comment.</comment>
-    <import>true</import>
-    <headerPattern>/Note|Comment/i</headerPattern>
-    <dataPattern>//</dataPattern>
-    <add>1.4</add>
-    <drop>1.7</drop>
-  </field>
   <index>
     <name>UI_contrib_trxn_id</name>
     <fieldName>trxn_id</fieldName>
diff --git a/xml/schema/Contribute/ContributionPage.xml b/xml/schema/Contribute/ContributionPage.xml
index 15bd5218edaa..fb93703f7476 100644
--- a/xml/schema/Contribute/ContributionPage.xml
+++ b/xml/schema/Contribute/ContributionPage.xml
@@ -41,20 +41,6 @@
     <comment>Text and html allowed. Displayed below title.</comment>
     <add>1.3</add>
   </field>
-  <field>
-    <name>contribution_type_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>default Contribution type assigned to contributions submitted via this page, e.g. Contribution, Campaign Contribution</comment>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <drop>4.3</drop>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Financial Type</title>
diff --git a/xml/schema/Contribute/ContributionProduct.xml b/xml/schema/Contribute/ContributionProduct.xml
index d5ff804a1009..1e3526d27c5a 100644
--- a/xml/schema/Contribute/ContributionProduct.xml
+++ b/xml/schema/Contribute/ContributionProduct.xml
@@ -55,17 +55,6 @@
     <comment></comment>
     <add>1.4</add>
   </field>
-  <field>
-    <name>total_cost</name>
-    <type>decimal</type>
-    <required>true</required>
-    <import>true</import>
-    <headerPattern>/^total|(.?^am(ou)?nt)/i</headerPattern>
-    <dataPattern>/^\d+(\.\d{2})?$/</dataPattern>
-    <comment>quantity X civicrm_product.cost.</comment>
-    <add>1.3</add>
-    <drop>4.1</drop>
-  </field>
   <field>
     <name>fulfilled_date</name>
     <type>date</type>
diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index eddc342d9c5a..11e70b6afc49 100644
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -286,13 +286,6 @@
     <html>
       <type>Text</type>
     </html>
-  </field>
-  <field>
-    <name>next_sched_contribution</name>
-    <type>datetime</type>
-    <comment>At Groundspring this was used by the cron job which triggered payments. If we''re not doing that but we know about payments, it might still be useful to store for display to org andor contributors.</comment>
-    <add>1.6</add>
-    <drop>4.4</drop>
   </field>
     <field>
     <name>next_sched_contribution_date</name>
@@ -366,23 +359,6 @@
     <add>3.3</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>contribution_type_id</name>
-    <title>Contribution Type</title>
-    <export>false</export>
-    <type>int unsigned</type>
-    <comment>FK to Contribution Type</comment>
-    <add>4.1</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>4.1</add>
-    <drop>4.3</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Financial Type</title>
diff --git a/xml/schema/Contribute/PremiumsProduct.xml b/xml/schema/Contribute/PremiumsProduct.xml
index 7f9b86604767..6ed7ca1ce617 100644
--- a/xml/schema/Contribute/PremiumsProduct.xml
+++ b/xml/schema/Contribute/PremiumsProduct.xml
@@ -47,14 +47,6 @@
     <key>id</key>
     <add>1.4</add>
   </foreignKey>
-  <field>
-    <name>sort_position</name>
-    <title>Sort Position</title>
-    <type>int unsigned</type>
-    <required>true</required>
-    <add>1.4</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>weight</name>
     <title>Order</title>
diff --git a/xml/schema/Core/Cache.xml b/xml/schema/Core/Cache.xml
index 564a2773292b..1e8d9a389ff7 100644
--- a/xml/schema/Core/Cache.xml
+++ b/xml/schema/Core/Cache.xml
@@ -35,14 +35,6 @@
     <comment>Unique path name for cache element</comment>
     <add>2.1</add>
   </field>
-  <index>
-    <name>UI_group_path</name>
-    <fieldName>group_name</fieldName>
-    <fieldName>path</fieldName>
-    <unique>true</unique>
-    <add>2.1</add>
-    <drop>4.2</drop>
-  </index>
   <index>
     <name>UI_group_path_date</name>
     <fieldName>group_name</fieldName>
diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml
index 2bfd28999a9e..8d49adce76d0 100644
--- a/xml/schema/Core/CustomField.xml
+++ b/xml/schema/Core/CustomField.xml
@@ -211,14 +211,6 @@
     <comment>Date may be up to end_date_years years after the current date.</comment>
     <add>1.4</add>
   </field>
-  <field>
-    <name>date_parts</name>
-    <type>varchar</type>
-    <length>255</length>
-    <comment>which date part included in display </comment>
-    <add>1.4</add>
-    <drop>3.1</drop>
-  </field>
   <field>
     <name>date_format</name>
     <type>varchar</type>
diff --git a/xml/schema/Core/CustomGroup.xml b/xml/schema/Core/CustomGroup.xml
index e0f424ddfc49..e21458ecbafa 100644
--- a/xml/schema/Core/CustomGroup.xml
+++ b/xml/schema/Core/CustomGroup.xml
@@ -47,14 +47,6 @@
     <comment>Type of object this group extends (can add other options later e.g. contact_address, etc.).</comment>
     <add>1.1</add>
   </field>
-  <field>
-    <name>extends_entity_column_name</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>linking custom group for dynamic object</comment>
-    <add>1.6</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>extends_entity_column_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Core/Dashboard.xml b/xml/schema/Core/Dashboard.xml
index 00500943a8da..6b34614dbcc2 100644
--- a/xml/schema/Core/Dashboard.xml
+++ b/xml/schema/Core/Dashboard.xml
@@ -62,13 +62,6 @@
     <comment>url in case of external dashlet</comment>
     <add>3.1</add>
   </field>
-  <field>
-    <name>content</name>
-    <type>text</type>
-    <comment>dashlet content</comment>
-    <add>3.1</add>
-    <drop>3.3</drop>
-  </field>
   <field>
     <name>permission</name>
     <type>varchar</type>
@@ -155,12 +148,4 @@
     <required>true</required>
     <add>4.7</add>
   </field>
-  <field>
-    <name>created_date</name>
-    <type>datetime</type>
-    <title>Dashlet Created Date</title>
-    <comment>When was content populated</comment>
-    <add>3.1</add>
-    <drop>3.3</drop>
-  </field>
 </table>
diff --git a/xml/schema/Core/Discount.xml b/xml/schema/Core/Discount.xml
index 01edced71da3..54535e485764 100644
--- a/xml/schema/Core/Discount.xml
+++ b/xml/schema/Core/Discount.xml
@@ -46,25 +46,6 @@
     <fieldName>entity_id</fieldName>
     <add>2.1</add>
   </index>
-  <field>
-    <name>option_group_id</name>
-    <uniqueName>participant_discount_name</uniqueName>
-    <title>Discount Name</title>
-    <type>int unsigned</type>
-    <required>true</required>
-    <export>true</export>
-    <comment>FK to civicrm_price_set</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>option_group_id</name>
-    <table>civicrm_price_set</table>
-    <key>id</key>
-    <add>2.1</add>
-    <onDelete>CASCADE</onDelete>
-    <drop>4.3</drop>
-  </foreignKey>
   <field>
     <name>price_set_id</name>
     <uniqueName>participant_discount_name</uniqueName>
diff --git a/xml/schema/Core/Domain.xml b/xml/schema/Core/Domain.xml
index ddb2a0dc6a2f..8e4e119a7f31 100644
--- a/xml/schema/Core/Domain.xml
+++ b/xml/schema/Core/Domain.xml
@@ -46,46 +46,6 @@
     <unique>true</unique>
     <add>1.1</add>
   </index>
-  <field>
-    <name>contact_name</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Name of the person responsible for this domain</comment>
-    <add>1.1</add>
-    <drop>1.9</drop>
-  </field>
-  <field>
-    <name>email_name</name>
-    <type>varchar</type>
-    <length>255</length>
-    <comment>The default email name that is used in the from address for all outgoing emails</comment>
-    <add>1.9</add>
-    <drop>2.2</drop>
-  </field>
-  <field>
-    <name>email_address</name>
-    <type>varchar</type>
-    <length>255</length>
-    <comment>The default email address that is used as the from address for all outgoing emails</comment>
-    <add>1.9</add>
-    <drop>2.2</drop>
-  </field>
-  <field>
-    <name>email_domain</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>The domain from which outgoing email for this domain will appear to originate</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
-  <field>
-    <name>email_return_path</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>The domain from which outgoing email for this domain will appear to originate</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>config_backend</name>
     <type>text</type>
@@ -103,13 +63,6 @@
     <comment>The civicrm version this instance is running</comment>
     <add>2.0</add>
   </field>
-  <field>
-    <name>loc_block_id</name>
-    <type>int unsigned</type>
-    <comment>FK to Location Block ID. This is specifically not an FK to avoid circular constraints</comment>
-    <add>2.0</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>contact_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Core/EntityTag.xml b/xml/schema/Core/EntityTag.xml
index 0fed7e7cf9ac..301706a42b4d 100644
--- a/xml/schema/Core/EntityTag.xml
+++ b/xml/schema/Core/EntityTag.xml
@@ -19,22 +19,6 @@
     <name>id</name>
     <autoincrement>true</autoincrement>
   </primaryKey>
-  <field>
-    <name>contact_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>FK to contact table.</comment>
-    <add>2.0</add>
-    <drop>3.2</drop>
-  </field>
-  <foreignKey>
-    <name>contact_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>2.0</add>
-    <drop>3.2</drop>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
   <field>
     <name>entity_table</name>
     <type>varchar</type>
@@ -59,13 +43,6 @@
     <typeColumn>entity_table</typeColumn>
     <add>3.2</add>
   </dynamicForeignKey>
-  <index>
-    <name>index_entity</name>
-    <fieldName>entity_table</fieldName>
-    <fieldName>entity_id</fieldName>
-    <add>3.2</add>
-    <drop>3.4</drop>
-  </index>
   <field>
     <name>tag_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Core/Job.xml b/xml/schema/Core/Job.xml
index 45429a4afff9..a135360f051b 100644
--- a/xml/schema/Core/Job.xml
+++ b/xml/schema/Core/Job.xml
@@ -85,15 +85,6 @@
     <comment>Description of the job</comment>
     <add>4.1</add>
   </field>
-  <field>
-    <name>api_prefix</name>
-    <type>varchar</type>
-    <length>255</length>
-    <default>"civicrm_api3"</default>
-    <comment>Prefix of the job api call</comment>
-    <add>4.1</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>api_entity</name>
     <title>API Entity</title>
diff --git a/xml/schema/Core/Mapping.xml b/xml/schema/Core/Mapping.xml
index 54ab26d3d0be..bd5420ea2715 100644
--- a/xml/schema/Core/Mapping.xml
+++ b/xml/schema/Core/Mapping.xml
@@ -35,16 +35,6 @@
     <comment>Description of Mapping.</comment>
     <add>1.2</add>
   </field>
-  <field>
-    <name>mapping_type</name>
-    <type>enum</type>
-    <values>Export, Import, Export Contributions, Import Contributions, Import Activity, Search Builder, Import
-      Memberships, Import Participants
-    </values>
-    <comment>Type of Mapping.</comment>
-    <add>1.2</add>
-    <drop>2.1</drop>
-  </field>
   <field>
     <name>mapping_type_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index d28b69b30c94..0c444143756a 100644
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -78,14 +78,6 @@
     <key>id</key>
     <add>1.2</add>
   </foreignKey>
-  <field>
-    <name>phone_type</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Phone type, if required</comment>
-    <add>1.2</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>phone_type_id</name>
     <title>Phone Type</title>
diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml
index 91ab823d39ff..eb0ad8e1f6a9 100644
--- a/xml/schema/Core/Phone.xml
+++ b/xml/schema/Core/Phone.xml
@@ -137,16 +137,6 @@
     <fieldName>phone_numeric</fieldName>
     <add>4.3</add>
   </index>
-  <field>
-    <name>phone_type</name>
-    <type>enum</type>
-    <values>Phone, Mobile, Fax, Pager</values>
-    <headerPattern>/phone\s+type/i</headerPattern>
-    <dataPattern>/phone|mobile|fax|pager/i</dataPattern>
-    <comment>What type of telecom device is this.</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>phone_type_id</name>
     <title>Phone Type ID</title>
diff --git a/xml/schema/Core/UFField.xml b/xml/schema/Core/UFField.xml
index fdcdcf83b3f3..9b012ab4c837 100644
--- a/xml/schema/Core/UFField.xml
+++ b/xml/schema/Core/UFField.xml
@@ -103,22 +103,6 @@
     <comment>Description and/or help text to display before this field.</comment>
     <add>3.2</add>
   </field>
-  <field>
-    <name>is_registration</name>
-    <type>boolean</type>
-    <default>0</default>
-    <comment>Is this field included in new user registration forms?</comment>
-    <add>1.1</add>
-    <drop>1.3</drop>
-  </field>
-  <field>
-    <name>is_match</name>
-    <type>boolean</type>
-    <default>0</default>
-    <comment>Is this field part of the key for matching users to contacts?</comment>
-    <add>1.1</add>
-    <drop>1.3</drop>
-  </field>
   <field>
     <name>visibility</name>
     <title>Profile Field Visibility</title>
@@ -134,14 +118,6 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>listings_title</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Page title for listings page (users who share a common value for this property).</comment>
-    <add>1.1</add>
-    <drop>1.2</drop>
-  </field>
   <field>
     <name>in_selector</name>
     <title>Profile Field Is a Filter</title>
@@ -172,14 +148,6 @@
     <add>1.3</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>phone_type</name>
-    <type>varchar</type>
-    <length>64</length>
-    <comment>Phone type, if required</comment>
-    <add>1.3</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>phone_type_id</name>
     <title>Profile Field Phone Type</title>
diff --git a/xml/schema/Core/UFGroup.xml b/xml/schema/Core/UFGroup.xml
index cafe160ac631..37d5d0a8aa8d 100644
--- a/xml/schema/Core/UFGroup.xml
+++ b/xml/schema/Core/UFGroup.xml
@@ -37,13 +37,6 @@
     <serialize>COMMA</serialize>
     <add>2.1</add>
   </field>
-  <field>
-    <name>form_type</name>
-    <type>enum</type>
-    <values>CiviCRM Profile</values>
-    <comment>Type of form.</comment>
-    <drop>2.1</drop>
-  </field>
   <field>
     <name>title</name>
     <title>Profile Name</title>
@@ -81,14 +74,6 @@
     <comment>Optional verbose description of the profile.</comment>
     <add>4.4</add>
   </field>
-  <field>
-    <name>collapse_display</name>
-    <type>int unsigned</type>
-    <default>0</default>
-    <comment>Will this group be in collapsed or expanded mode on initial display ?</comment>
-    <add>1.1</add>
-    <drop>2.2</drop>
-  </field>
   <field>
     <name>help_pre</name>
     <type>text</type>
@@ -114,19 +99,6 @@
     </html>
     <add>1.2</add>
   </field>
-  <field>
-    <name>weight</name>
-    <title>Profile Weight</title>
-    <type>int</type>
-    <required>true</required>
-    <default>1</default>
-    <html>
-      <type>Text</type>
-    </html>
-    <comment>Controls display order when multiple user framework groups are setup for concurrent display.</comment>
-    <add>1.2</add>
-    <drop>1.3</drop>
-  </field>
   <field>
     <name>limit_listings_group_id</name>
     <title>Profile Search Limit Group</title>
diff --git a/xml/schema/Core/UFMatch.xml b/xml/schema/Core/UFMatch.xml
index fb3a05425dfb..9e573a5a79df 100644
--- a/xml/schema/Core/UFMatch.xml
+++ b/xml/schema/Core/UFMatch.xml
@@ -73,15 +73,6 @@
     <add>1.1</add>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field>
-    <name>email</name>
-    <type>varchar</type>
-    <length>64</length>
-    <rule>email</rule>
-    <comment>Email address</comment>
-    <add>1.1</add>
-    <drop>2.0</drop>
-  </field>
   <field>
     <name>language</name>
     <title>Preferred Language</title>
@@ -90,14 +81,6 @@
     <comment>UI language preferred by the given user/contact</comment>
     <add>2.1</add>
   </field>
-  <index>
-    <name>UI_uf_id_domain_id</name>
-    <fieldName>uf_id</fieldName>
-    <fieldName>domain_id</fieldName>
-    <unique>true</unique>
-    <add>1.5</add>
-    <drop>1.7</drop>
-  </index>
   <index>
     <name>UI_uf_name_domain_id</name>
     <fieldName>uf_name</fieldName>
diff --git a/xml/schema/Dedupe/RuleGroup.xml b/xml/schema/Dedupe/RuleGroup.xml
index 6adbe3dba41e..09a587362838 100644
--- a/xml/schema/Dedupe/RuleGroup.xml
+++ b/xml/schema/Dedupe/RuleGroup.xml
@@ -45,15 +45,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>level</name>
-    <title>Level</title>
-    <type>enum</type>
-    <values>Strict, Fuzzy</values>
-    <comment>Whether the rule should be used for cases where strict matching of the given contact type is required or a fuzzy one</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>used</name>
     <type>varchar</type>
@@ -69,14 +60,6 @@
       <type>Radio</type>
     </html>
   </field>
-  <field>
-    <name>is_default</name>
-    <title>Default></title>
-    <type>boolean</type>
-    <comment>Is this a default rule (one rule for every contact type + level combination should be default)</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>name</name>
     <title>Name</title>
diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index 4c7e51143f85..4593c92d4e56 100644
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -218,14 +218,6 @@
       <type>CheckBox</type>
     </html>
   </field>
-  <field>
-    <name>contribution_type_id</name>
-    <type>int unsigned</type>
-    <default>0</default>
-    <comment>Contribution type assigned to paid event registrations for this event. Required if is_monetary is true.</comment>
-    <add>1.7</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>financial_type_id</name>
     <type>int unsigned</type>
@@ -318,19 +310,6 @@
     <onDelete>SET NULL</onDelete>
     <add>2.0</add>
   </foreignKey>
-  <field>
-    <name>receipt_text</name>
-    <type>varchar</type>
-    <html>
-      <type>TextArea</type>
-      <rows>6</rows>
-      <cols>50</cols>
-    </html>
-    <length>255</length>
-    <comment>Receipt Text for off-line event participation</comment>
-    <add>2.0</add>
-    <drop>2.1</drop>
-  </field>
   <field>
     <name>default_role_id</name>
     <uniqueName>default_role_id</uniqueName>
diff --git a/xml/schema/Financial/EntityFinancialTrxn.xml b/xml/schema/Financial/EntityFinancialTrxn.xml
index 653fc792d5d6..f48a3f3c6574 100644
--- a/xml/schema/Financial/EntityFinancialTrxn.xml
+++ b/xml/schema/Financial/EntityFinancialTrxn.xml
@@ -63,15 +63,6 @@
     <comment>allocated amount of transaction to this entity</comment>
     <add>3.2</add>
   </field>
-  <field>
-    <name>currency</name>
-    <type>varchar</type>
-    <length>3</length>
-    <default>NULL</default>
-    <comment>3 character string, value from config setting or input via user.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
   <index>
     <name>UI_entity_financial_trxn_entity_table</name>
     <fieldName>entity_table</fieldName>
diff --git a/xml/schema/Financial/FinancialAccount.xml b/xml/schema/Financial/FinancialAccount.xml
index eedf5c621069..3188e5847e31 100644
--- a/xml/schema/Financial/FinancialAccount.xml
+++ b/xml/schema/Financial/FinancialAccount.xml
@@ -42,13 +42,6 @@
     <add>4.3</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>account_type_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>financial_account_type_id</name>
     <type>int unsigned</type>
diff --git a/xml/schema/Financial/FinancialTrxn.xml b/xml/schema/Financial/FinancialTrxn.xml
index 94a2e3f023e5..e34d9b91123c 100644
--- a/xml/schema/Financial/FinancialTrxn.xml
+++ b/xml/schema/Financial/FinancialTrxn.xml
@@ -17,34 +17,6 @@
     <name>id</name>
     <autoincrement>true</autoincrement>
   </primaryKey>
-  <field>
-    <name>from_account_id</name>
-    <type>int unsigned</type>
-    <comment>FK to financial_account table.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>from_account_id</name>
-    <table>civicrm_financial_account</table>
-    <key>id</key>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </foreignKey>
-  <field>
-    <name>to_account_id</name>
-    <type>int unsigned</type>
-    <comment>FK to financial_account table.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>to_account_id</name>
-    <table>civicrm_financial_account</table>
-    <key>id</key>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </foreignKey>
   <field>
     <name>from_financial_account_id</name>
     <type>int unsigned</type>
@@ -99,15 +71,6 @@
       <formatType>activityDateTime</formatType>
     </html>
   </field>
-  <field>
-    <name>trxn_type</name>
-    <title>Financial Transaction Type</title>
-    <type>enum</type>
-    <values>Debit,Credit</values>
-    <required>true</required>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>total_amount</name>
     <title>Financial Total Amount</title>
@@ -161,15 +124,6 @@
     <comment>Is this entry either a payment or a reversal of a payment?</comment>
     <add>4.7</add>
   </field>
-  <field>
-    <name>payment_processor</name>
-    <type>varchar</type>
-    <length>64</length>
-    <required>true</required>
-    <comment>derived from Processor setting in civicrm.settings.php.</comment>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>trxn_id</name>
     <title>Transaction ID</title>
diff --git a/xml/schema/Financial/FinancialType.xml b/xml/schema/Financial/FinancialType.xml
index bbdca886dae8..3d02bf8b0991 100644
--- a/xml/schema/Financial/FinancialType.xml
+++ b/xml/schema/Financial/FinancialType.xml
@@ -37,16 +37,6 @@
     </html>
     <add>1.3</add>
   </field>
-  <field>
-    <name>accounting_code</name>
-    <title>Accounting Code</title>
-    <type>varchar</type>
-    <length>64</length>
-    <export>true</export>
-    <comment>Optional value for mapping contributions to accounting system codes for each type/category of contribution.</comment>
-    <add>1.3</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>description</name>
     <type>varchar</type>
diff --git a/xml/schema/Financial/PaymentProcessor.xml b/xml/schema/Financial/PaymentProcessor.xml
index e1aac7cab331..a363ce878467 100644
--- a/xml/schema/Financial/PaymentProcessor.xml
+++ b/xml/schema/Financial/PaymentProcessor.xml
@@ -70,14 +70,6 @@
     <comment>Payment Processor Description.</comment>
     <add>1.8</add>
   </field>
-  <field>
-    <name>payment_processor_type</name>
-    <type>varchar</type>
-    <length>255</length>
-    <comment>Payment Processor Type.</comment>
-    <add>1.8</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>payment_processor_type_id</name>
     <title>Payment Processor Type ID</title>
diff --git a/xml/schema/Grant/Grant.xml b/xml/schema/Grant/Grant.xml
index 6e222f8e0d69..b6c2c8923519 100644
--- a/xml/schema/Grant/Grant.xml
+++ b/xml/schema/Grant/Grant.xml
@@ -179,15 +179,6 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>currency</name>
-    <type>varchar</type>
-    <length>8</length>
-    <default>NULL</default>
-    <comment>3 character string, value from config setting or input via user.</comment>
-    <add>3.2</add>
-    <drop>4.3</drop>
-  </field>
   <field>
     <name>rationale</name>
     <type>text</type>
diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index 0007eefaf2fe..cd528adaf26f 100644
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -84,21 +84,6 @@
     <add>1.5</add>
     <onDelete>RESTRICT</onDelete>
   </foreignKey>
-  <field>
-    <name>contribution_type_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>If membership is paid by a contribution - what contribution type should be used. FK to Contribution Type ID</comment>
-    <add>1.5</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>1.5</add>
-    <drop>4.3</drop>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Membership Financial Type</title>
@@ -192,13 +177,6 @@
     <add>1.5</add>
     <serialize>SEPARATOR_TRIMMED</serialize>
   </field>
-  <foreignKey>
-    <name>relationship_type_id</name>
-    <table>civicrm_relationship_type</table>
-    <key>id</key>
-    <add>1.5</add>
-    <drop>3.3</drop>
-  </foreignKey>
   <index>
     <name>index_relationship_type_id</name>
     <fieldName>relationship_type_id</fieldName>
diff --git a/xml/schema/PCP/PCP.xml b/xml/schema/PCP/PCP.xml
index dfb8a13f8c74..0ef29ee2563c 100644
--- a/xml/schema/PCP/PCP.xml
+++ b/xml/schema/PCP/PCP.xml
@@ -91,20 +91,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>contribution_page_id</name>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>The Contribution Page which triggered this pcp</comment>
-    <add>2.2</add>
-    <drop>4.1</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_page_id</name>
-    <table>civicrm_contribution_page</table>
-    <key>id</key>
-    <drop>4.1</drop>
-  </foreignKey>
   <field>
     <name>page_id</name>
     <title>Contribution Page</title>
@@ -182,15 +168,6 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>referer</name>
-    <title>Referer</title>
-    <type>varchar</type>
-    <length>255</length>
-    <default>NULL</default>
-    <add>2.2</add>
-    <drop>4.1</drop>
-  </field>
   <field>
     <name>is_active</name>
     <title>Enabled?</title>
diff --git a/xml/schema/PCP/PCPBlock.xml b/xml/schema/PCP/PCPBlock.xml
index b07bc5b03555..d25b6eb7c221 100644
--- a/xml/schema/PCP/PCPBlock.xml
+++ b/xml/schema/PCP/PCPBlock.xml
@@ -39,13 +39,6 @@
     <typeColumn>entity_table</typeColumn>
     <add>2.2</add>
   </dynamicForeignKey>
-  <foreignKey>
-    <name>entity_id</name>
-    <table>civicrm_contribution_page</table>
-    <key>id</key>
-    <add>2.2</add>
-    <drop>4.1</drop>
-  </foreignKey>
   <field>
     <name>target_entity_type</name>
     <title>Target Entity</title>
diff --git a/xml/schema/Pledge/Pledge.xml b/xml/schema/Pledge/Pledge.xml
index 39943c58efa9..32b806f39f52 100644
--- a/xml/schema/Pledge/Pledge.xml
+++ b/xml/schema/Pledge/Pledge.xml
@@ -40,23 +40,6 @@
     <add>2.1</add>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
-  <field>
-    <name>contribution_type_id</name>
-    <uniqueName>pledge_contribution_type_id</uniqueName>
-    <export>false</export>
-    <type>int unsigned</type>
-    <comment>FK to Contribution Type. This is propagated to contribution record when pledge payments are made.</comment>
-    <add>2.1</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>2.1</add>
-    <drop>4.3</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Type</title>
diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml
index a1f006c9b535..82b9c9a7cc56 100644
--- a/xml/schema/Price/LineItem.xml
+++ b/xml/schema/Price/LineItem.xml
@@ -67,15 +67,6 @@
     <key>id</key>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
-  <field>
-    <name>option_group_id</name>
-    <title>Line Item Option Group</title>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>FK to option group</comment>
-    <add>1.7</add>
-    <drop>3.3</drop>
-  </field>
   <field>
     <name>label</name>
     <title>Line Item Label</title>
diff --git a/xml/schema/Price/PriceField.xml b/xml/schema/Price/PriceField.xml
index 0c2c1af3c1a8..ce61ecc87c4f 100644
--- a/xml/schema/Price/PriceField.xml
+++ b/xml/schema/Price/PriceField.xml
@@ -221,12 +221,4 @@
       <type>Select</type>
     </html>
   </field>
-  <field>
-    <name>count</name>
-    <type>int unsigned</type>
-    <default>NULL</default>
-    <comment>Number of Participants Per field</comment>
-    <add>3.2</add>
-    <drop>3.3</drop>
-  </field>
 </table>
diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index 25266f1dbfc4..d84ac533927c 100644
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -137,23 +137,6 @@
       <type>Text</type>
     </html>
   </field>
-  <field>
-    <name>contribution_type_id</name>
-    <title>Price Set Contribution Type</title>
-    <type>int unsigned</type>
-    <default>NULL</default>
-    <comment>FK to Contribution Type(for membership price sets only).</comment>
-    <add>3.4</add>
-    <drop>4.3</drop>
-  </field>
-  <foreignKey>
-    <name>contribution_type_id</name>
-    <table>civicrm_contribution_type</table>
-    <key>id</key>
-    <add>3.4</add>
-    <drop>4.3</drop>
-    <onDelete>SET NULL</onDelete>
-  </foreignKey>
   <field>
     <name>financial_type_id</name>
     <title>Financial Type</title>

From effbcf8507b70128d3bc0b4a33428180f5a6682a Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Mon, 24 Aug 2020 16:44:23 +0530
Subject: [PATCH 013/834] report#45 Ability Search Smart or Normal Group using
 additional filter on Manage Group page

---
 CRM/Contact/BAO/Group.php           | 8 ++++++++
 CRM/Group/Form/Search.php           | 8 ++++++++
 CRM/Group/Page/AJAX.php             | 1 +
 templates/CRM/Group/Form/Search.tpl | 8 ++++++++
 4 files changed, 25 insertions(+)

diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
index fae22f03b844..cff225818282 100644
--- a/CRM/Contact/BAO/Group.php
+++ b/CRM/Contact/BAO/Group.php
@@ -1223,6 +1223,14 @@ public static function whereClause(&$params, $sortBy = TRUE, $excludeHidden = TR
       $clauses[] = '`groups`.parents IS NULL';
     }
 
+    $savedSearch = CRM_Utils_Array::value('savedSearch', $params);
+    if ($savedSearch == 1) {
+      $clauses[] = 'groups.saved_search_id IS NOT NULL';
+    }
+    else if ($savedSearch == 2) {
+      $clauses[] = 'groups.saved_search_id IS NULL';
+    }
+
     // only show child groups of a specific parent group
     $parent_id = $params['parent_id'] ?? NULL;
     if ($parent_id) {
diff --git a/CRM/Group/Form/Search.php b/CRM/Group/Form/Search.php
index 819b061f21d6..a56623fefc01 100644
--- a/CRM/Group/Form/Search.php
+++ b/CRM/Group/Form/Search.php
@@ -40,6 +40,14 @@ public function buildQuickForm() {
       CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Group', 'title')
     );
 
+    $optionTypes = [
+      '1' => ts('Smart Group'),
+      '2' => ts('Normal Group'),
+    ];
+    $this->add('select', 'saved_search', ts('Group Type'),
+      ['' => ts('- any -')] + $optionTypes
+    );
+
     $groupTypes = CRM_Core_OptionGroup::values('group_type', TRUE);
     $config = CRM_Core_Config::singleton();
     if ($config->userFramework == 'Joomla') {
diff --git a/CRM/Group/Page/AJAX.php b/CRM/Group/Page/AJAX.php
index b314d5cb6168..9e6d809f3730 100644
--- a/CRM/Group/Page/AJAX.php
+++ b/CRM/Group/Page/AJAX.php
@@ -42,6 +42,7 @@ public static function getGroupList() {
         'status' => 'Integer',
         'parentsOnly' => 'Integer',
         'showOrgInfo' => 'Boolean',
+        'savedSearch' => 'Integer',
         // Ignore 'parent_id' as that case is handled above
       ];
       $params = CRM_Core_Page_AJAX::defaultSortAndPagerParams();
diff --git a/templates/CRM/Group/Form/Search.tpl b/templates/CRM/Group/Form/Search.tpl
index a2019f4d1c2c..e01ece5d192b 100644
--- a/templates/CRM/Group/Form/Search.tpl
+++ b/templates/CRM/Group/Form/Search.tpl
@@ -55,6 +55,13 @@
               {$form.component_mode.html}
             </td>
           </tr>
+          <tr>
+            <td>
+              {$form.saved_search.label} <br/>{$form.saved_search.html}
+            </td>
+            <td colspan="2">
+            </td>
+          </tr>
         </table>
       </div>
     </div>
@@ -116,6 +123,7 @@
           d.group_type = groupTypes,
           d.visibility = $(".crm-group-search-form-block select#visibility").val(),
           d.status = groupStatus,
+          d.savedSearch = $('.crm-group-search-form-block select#saved_search').val(),
           d.component_mode = $(".crm-group-search-form-block select#component_mode").val(),
           d.showOrgInfo = {/literal}"{$showOrgInfo}"{literal},
           d.parentsOnly = parentsOnly

From 637368b5efbb8aa007a8fa35b514421371bc2c5c Mon Sep 17 00:00:00 2001
From: Monish Deb <deb.monish@gmail.com>
Date: Mon, 24 Aug 2020 17:48:25 +0530
Subject: [PATCH 014/834] Optimise proximity custom search, by reducing
 addGeocodingData fn call

---
 CRM/Contact/Form/Search/Custom/Proximity.php | 22 ++++----------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/CRM/Contact/Form/Search/Custom/Proximity.php b/CRM/Contact/Form/Search/Custom/Proximity.php
index 34026c06de81..8d211aafcf7b 100644
--- a/CRM/Contact/Form/Search/Custom/Proximity.php
+++ b/CRM/Contact/Form/Search/Custom/Proximity.php
@@ -19,9 +19,6 @@
  */
 class CRM_Contact_Form_Search_Custom_Proximity extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
 
-  protected $_latitude = NULL;
-  protected $_longitude = NULL;
-  protected $_distance = NULL;
   protected $_aclFrom = NULL;
   protected $_aclWhere = NULL;
 
@@ -39,21 +36,6 @@ public function __construct(&$formValues) {
     unset($this->_formValues['uf_group_id']);
     unset($this->_formValues['component_mode']);
     unset($this->_formValues['operator']);
-
-    if (!empty($this->_formValues)) {
-      // add the country and state
-      self::addGeocodingData($this->_formValues);
-      $this->_latitude = $this->_formValues['geo_code_1'];
-      $this->_longitude = $this->_formValues['geo_code_2'];
-
-      if ($this->_formValues['prox_distance_unit'] == "miles") {
-        $conversionFactor = 1609.344;
-      }
-      else {
-        $conversionFactor = 1000;
-      }
-      $this->_distance = $this->_formValues['distance'] * $conversionFactor;
-    }
     $this->_group = $this->_formValues['group'] ?? NULL;
 
     $this->_tag = $this->_formValues['tag'] ?? NULL;
@@ -192,6 +174,10 @@ public function sql(
       $isCountOnly = TRUE;
     }
 
+    if (empty($this->_formValues['geo_code_1']) ||  empty($this->_formValues['geo_code_2'])) {
+      self::addGeocodingData($this->_formValues);
+    }
+
     $searchParams = [
       ['prox_distance_unit', '=', $this->_formValues['prox_distance_unit'], 0, 0],
       ['prox_distance', '=', $this->_formValues['distance'], 0, 0],

From ff1767f31187a0ae47c834e24ca60292300c7fec Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Mon, 24 Aug 2020 18:19:13 +0530
Subject: [PATCH 015/834] Test case , look for smart group only

---
 tests/phpunit/CRM/Group/Page/AjaxTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/phpunit/CRM/Group/Page/AjaxTest.php b/tests/phpunit/CRM/Group/Page/AjaxTest.php
index 8a88946e4d34..686e16fc9f3c 100644
--- a/tests/phpunit/CRM/Group/Page/AjaxTest.php
+++ b/tests/phpunit/CRM/Group/Page/AjaxTest.php
@@ -553,6 +553,8 @@ public function testGroupDontRegenerateSmartGroups() {
     // Load the Manage Group page code and we should get a count from our
     // group because the cache is fresh.
     $_GET = $this->_params;
+    // look for Smart Group only
+    $_GET['savedSearch'] = 1;
     try {
       CRM_Group_Page_AJAX::getGroupList();
     }

From f33893fdebd2c077404e8cd0ee14943a91160880 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Mon, 24 Aug 2020 18:22:26 +0530
Subject: [PATCH 016/834] Small Correction

---
 CRM/Contact/BAO/Group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
index cff225818282..5fe886756d20 100644
--- a/CRM/Contact/BAO/Group.php
+++ b/CRM/Contact/BAO/Group.php
@@ -1227,7 +1227,7 @@ public static function whereClause(&$params, $sortBy = TRUE, $excludeHidden = TR
     if ($savedSearch == 1) {
       $clauses[] = 'groups.saved_search_id IS NOT NULL';
     }
-    else if ($savedSearch == 2) {
+    elseif ($savedSearch == 2) {
       $clauses[] = 'groups.saved_search_id IS NULL';
     }
 

From e066681dfad3025f9edb1681ceb4a263b913b1c2 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 25 Aug 2020 17:57:32 +1000
Subject: [PATCH 017/834] [REF] Ensure that the form param _id is set when
 adding a new group with the newly created group id so that consumers of the
 hook_civicrm_postProcess can access the id

---
 CRM/Group/Form/Edit.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php
index d9be20cdfb86..e384dc36cc7f 100644
--- a/CRM/Group/Form/Edit.php
+++ b/CRM/Group/Form/Edit.php
@@ -371,7 +371,8 @@ public function postProcess() {
       );
 
       $group = CRM_Contact_BAO_Group::create($params);
-
+      // Set the entity id so it is available to postProcess hook consumers
+      $this->setEntityId($group->id);
       //Remove any parent groups requested to be removed
       if (!empty($this->_groupValues['parents'])) {
         $parentGroupIds = explode(',', $this->_groupValues['parents']);

From d07e605a2d32249f23c32608e85442a466dae471 Mon Sep 17 00:00:00 2001
From: John Kingsnorth <john@johnkingsnorth.co.uk>
Date: Tue, 25 Aug 2020 11:26:30 +0100
Subject: [PATCH 018/834] dev/core#1971 Test for domain-specific option values

---
 tests/phpunit/CRM/Core/OptionGroupTest.php | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/phpunit/CRM/Core/OptionGroupTest.php b/tests/phpunit/CRM/Core/OptionGroupTest.php
index 863daff7d816..d09af84302c9 100644
--- a/tests/phpunit/CRM/Core/OptionGroupTest.php
+++ b/tests/phpunit/CRM/Core/OptionGroupTest.php
@@ -91,4 +91,52 @@ public function testSanitizeFromEmailAddress($dirty, $clean) {
     $this->assertEquals($actual, $clean);
   }
 
+  public function testDomainSpecificValueCache() {
+    $original_domain = \CRM_Core_Config::domainID();
+    $domainIDs = [];
+    $optionValues = [];
+
+    // Create domains
+    $domainIDs[] = $this->callAPISuccess('Domain', 'create', [
+      'name' => "Test extra domain 1",
+      'domain_version' => CRM_Utils_System::version(),
+    ])['id'];
+    $domainIDs[] = $this->callAPISuccess('Domain', 'create', [
+      'name' => "Test extra domain 2",
+      'domain_version' => CRM_Utils_System::version(),
+    ])['id'];
+
+    // Create 'from' email addresses
+    foreach ($domainIDs as $domainID) {
+      $result = $this->callAPISuccess('option_value', 'create', [
+        'option_group_id' => 'from_email_address',
+        'name' => '"Test ' . $domainID . '" <test@example.com>',
+        'label' => '"Test ' . $domainID . '" <test@example.com>',
+        'value' => 'test' . $domainID,
+        'is_active' => 1,
+        'domain_id' => $domainID,
+      ]);
+      $optionValues[] = $result['id'];
+    }
+
+    // Check values are as expected for each domain
+    foreach ($domainIDs as $domainID) {
+      \CRM_Core_Config::domainID($domainID);
+      $result = CRM_Core_OptionGroup::values('from_email_address');
+      $this->assertEquals(array_keys($result)[0], 'test' . $domainID);
+    }
+
+    // Clean up
+    \CRM_Core_Config::domainID($original_domain);
+    foreach ($optionValues as $id) {
+      $this->callAPISuccess('option_value', 'delete', ['id' => $id]);
+    }
+    // @todo There is no domain delete API
+    foreach ($domainIDs as $domainID) {
+      CRM_Core_DAO::executeQuery('DELETE FROM civicrm_domain where id = %1', [1 => [$domainID, 'Int']]);
+    }
+    unset($original_domain, $domainIDs, $optionValues);
+
+  }
+
 }

From aedfc3ed14e5a999a2c7c284a3478229841e9342 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Wed, 22 Apr 2020 10:48:36 +0100
Subject: [PATCH 019/834] Support more table names for utf8mb4 conversions and
 database name

---
 CRM/Core/BAO/SchemaHandler.php | 52 +++++++++++++++++++++++-----------
 api/v3/System.php              | 18 +++++++++++-
 2 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php
index 5523858d6ac9..519b152cfd5b 100644
--- a/CRM/Core/BAO/SchemaHandler.php
+++ b/CRM/Core/BAO/SchemaHandler.php
@@ -796,30 +796,50 @@ public static function getFieldAlterSQL($params, $indexExist) {
    *
    * @param bool $revert
    *   Being able to revert if primarily for unit testing.
+   * @param array $patterns
+   *   Defaults to ['civicrm\_%'] but can be overridden to specify any pattern. eg ['civicrm\_%', 'civi%\_%', 'veda%\_%'].
+   * @param array $databaseList
+   *   Allows you to specify an alternative database to the configured CiviCRM database.
    *
    * @return bool
    */
-  public static function migrateUtf8mb4($revert = FALSE) {
+  public static function migrateUtf8mb4($revert = FALSE, $patterns = ['civicrm\_%'], $databaseList = NULL) {
     $newCharSet = $revert ? 'utf8' : 'utf8mb4';
     $newCollation = $revert ? 'utf8_unicode_ci' : 'utf8mb4_unicode_ci';
     $newBinaryCollation = $revert ? 'utf8_bin' : 'utf8mb4_bin';
     $tables = [];
     $dao = new CRM_Core_DAO();
-    $database = $dao->_database;
-    CRM_Core_DAO::executeQuery("ALTER DATABASE $database CHARACTER SET = $newCharSet COLLATE = $newCollation");
-    $dao = CRM_Core_DAO::executeQuery("SHOW TABLE STATUS WHERE Engine = 'InnoDB' AND Name LIKE 'civicrm\_%'");
-    while ($dao->fetch()) {
-      $tables[$dao->Name] = [
-        'Engine' => $dao->Engine,
-      ];
-    }
-    $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
-    $logging_database = $dsn['database'];
-    $dao = CRM_Core_DAO::executeQuery("SHOW TABLE STATUS FROM `$logging_database` WHERE Engine <> 'MyISAM' AND Name LIKE 'log\_civicrm\_%'");
-    while ($dao->fetch()) {
-      $tables["$logging_database.{$dao->Name}"] = [
-        'Engine' => $dao->Engine,
-      ];
+    $databases = $databaseList ?? [$dao->_database];
+
+    $tableNameLikePatterns = [];
+    $logTableNameLikePatterns = [];
+
+    foreach ($patterns as $pattern) {
+      $pattern = CRM_Utils_Type::escape($pattern, 'String');
+      $tableNameLikePatterns[] = "Name LIKE '{$pattern}'";
+      $logTableNameLikePatterns[] = "Name LIKE 'log\_{$pattern}'";
+    }
+
+    foreach ($databases as $database) {
+      CRM_Core_DAO::executeQuery("ALTER DATABASE $database CHARACTER SET = $newCharSet COLLATE = $newCollation");
+      $dao = CRM_Core_DAO::executeQuery("SHOW TABLE STATUS FROM `{$database}` WHERE Engine = 'InnoDB' AND (" . implode(' OR ', $tableNameLikePatterns) . ")");
+      while ($dao->fetch()) {
+        $tables["{$database}.{$dao->Name}"] = [
+          'Engine' => $dao->Engine,
+        ];
+      }
+    }
+    // If we specified a list of databases assume the user knows what they are doing.
+    // If they specify the database they should also specify the pattern.
+    if (!$databaseList) {
+      $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
+      $logging_database = $dsn['database'];
+      $dao = CRM_Core_DAO::executeQuery("SHOW TABLE STATUS FROM `{$logging_database}` WHERE Engine <> 'MyISAM' AND (" . implode(' OR ', $logTableNameLikePatterns) . ")");
+      while ($dao->fetch()) {
+        $tables["{$logging_database}.{$dao->Name}"] = [
+          'Engine' => $dao->Engine,
+        ];
+      }
     }
     foreach ($tables as $table => $param) {
       $query = "ALTER TABLE $table";
diff --git a/api/v3/System.php b/api/v3/System.php
index b597c48793fc..c207ac9e13e5 100644
--- a/api/v3/System.php
+++ b/api/v3/System.php
@@ -397,7 +397,14 @@ function civicrm_api3_system_updatelogtables($params) {
  * @throws \API_Exception
  */
 function civicrm_api3_system_utf8conversion($params) {
-  if (CRM_Core_BAO_SchemaHandler::migrateUtf8mb4($params['is_revert'])) {
+  $params['patterns'] = explode(',', $params['patterns']);
+  $params['databases'] = empty($params['databases']) ? NULL : explode(',', $params['databases']);
+  if (CRM_Core_BAO_SchemaHandler::migrateUtf8mb4(
+    $params['is_revert'],
+    $params['patterns'],
+    $params['databases']
+    )
+  ) {
     return civicrm_api3_create_success(1);
   }
   throw new API_Exception('Conversion failed');
@@ -414,6 +421,15 @@ function _civicrm_api3_system_utf8conversion_spec(&$params) {
     'type' => CRM_Utils_Type::T_BOOLEAN,
     'api.default' => FALSE,
   ];
+  $params['patterns'] = [
+    'title' => ts('CSV list of table patterns (defaults to "civicrm\_%")'),
+    'type' => CRM_Utils_Type::T_STRING,
+    'api.default' => 'civicrm\_%',
+  ];
+  $params['databases'] = [
+    'title' => ts('CSV list of database names (defaults to CiviCRM database)'),
+    'type' => CRM_Utils_Type::T_STRING,
+  ];
 }
 
 /**

From aed025fbd6fee78376f2ccac45a0650d1eaef57d Mon Sep 17 00:00:00 2001
From: John Kingsnorth <john@johnkingsnorth.co.uk>
Date: Tue, 25 Aug 2020 11:35:57 +0100
Subject: [PATCH 020/834] dev/core#1971 Domain-specific option value caching

---
 CRM/Core/OptionGroup.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 89018c1a21cf..727f2b22141b 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -106,7 +106,12 @@ public static function &values(
     $orderBy = 'weight'
   ) {
     $cache = CRM_Utils_Cache::singleton();
-    $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy);
+    if (in_array($name, self::$_domainIDGroups)) {
+      $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy, CRM_Core_Config::domainID());
+    }
+    else {
+      $cacheKey = self::createCacheKey($name, $flip, $grouping, $localize, $condition, $labelColumnName, $onlyActive, $keyColumnName, $orderBy);
+    }
 
     if (!$fresh) {
       // Fetch from static var
@@ -186,8 +191,7 @@ protected static function flushValues($name, $flip, $grouping, $localize, $condi
    * @return string
    */
   protected static function createCacheKey($id) {
-    $cacheKey = "CRM_OG_" . preg_replace('/[^a-zA-Z0-9]/', '', $id) . '_' . md5(serialize(func_get_args()));
-    return $cacheKey;
+    return "CRM_OG_" . preg_replace('/[^a-zA-Z0-9]/', '', $id) . '_' . md5(serialize(func_get_args()));
   }
 
   /**

From baebe8d6ac2632357c094f3fbeecfef0786e6693 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 25 Aug 2020 15:39:33 +0100
Subject: [PATCH 021/834] Fix js for case type status change on load

---
 templates/CRM/Case/Form/Activity/OpenCase.tpl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/Case/Form/Activity/OpenCase.tpl b/templates/CRM/Case/Form/Activity/OpenCase.tpl
index 4627f81de3a2..c1a955771e23 100644
--- a/templates/CRM/Case/Form/Activity/OpenCase.tpl
+++ b/templates/CRM/Case/Form/Activity/OpenCase.tpl
@@ -42,15 +42,17 @@
       var caseStatusLabels = {/literal}{$caseStatusLabels.values|@json_encode}{literal};
       var caseStatusNames = {/literal}{$caseStatusNames.values|@json_encode}{literal};
       if ($('#case_type_id, #status_id', $form).length === 2) {
-        $('#case_type_id', $form).change(function() {
-          if ($(this).val()) {
-            var definition = caseTypes[$(this).val()].definition;
+        updateCaseStatusOptions();
+        $('#case_type_id', $form).change(updateCaseStatusOptions);
+        function updateCaseStatusOptions() {
+          if ($('#case_type_id', $form).val()) {
+            var definition = caseTypes[$('#case_type_id', $form).val()].definition;
             var newOptions = CRM._.filter(caseStatusLabels, function(opt) {
               return !definition.statuses || !definition.statuses.length || definition.statuses.indexOf(caseStatusNames[opt.key]) > -1;
             });
             CRM.utils.setOptions($('#status_id', $form), newOptions);
           }
-        })
+        }
       }
     });
   </script>

From b6b6cb2d4f3f386ded0a44930756deba18574e2b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Aug 2020 11:33:09 -0400
Subject: [PATCH 022/834] Expose field label to APIv4 and Search creaor

---
 Civi/Api4/Generic/BasicGetFieldsAction.php   |  9 ++++++++
 Civi/Api4/Service/Spec/FieldSpec.php         | 23 ++++++++++++++++++++
 Civi/Api4/Service/Spec/SpecFormatter.php     |  1 +
 ext/search/CRM/Search/Page/Ang.php           |  4 ++--
 ext/search/ang/search/crmSearch.component.js |  4 ++--
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Civi/Api4/Generic/BasicGetFieldsAction.php b/Civi/Api4/Generic/BasicGetFieldsAction.php
index ec58714fe46d..5f5d25ef3ded 100644
--- a/Civi/Api4/Generic/BasicGetFieldsAction.php
+++ b/Civi/Api4/Generic/BasicGetFieldsAction.php
@@ -129,6 +129,7 @@ protected function formatResults(&$values) {
         'data_type' => \CRM_Utils_Array::value('type', $field, 'String'),
       ], array_flip($fields));
       $field += $defaults;
+      $field['label'] = $field['label'] ?? $field['title'];
       if (isset($defaults['options'])) {
         $field['options'] = $this->formatOptionList($field['options']);
       }
@@ -217,14 +218,22 @@ public function fields() {
       [
         'name' => 'name',
         'data_type' => 'String',
+        'description' => ts('Unique field identifier'),
       ],
       [
         'name' => 'title',
         'data_type' => 'String',
+        'description' => ts('Technical name of field, shown in API and exports'),
+      ],
+      [
+        'name' => 'label',
+        'data_type' => 'String',
+        'description' => ts('User-facing label, shown on most forms and displays'),
       ],
       [
         'name' => 'description',
         'data_type' => 'String',
+        'description' => ts('Explanation of the purpose of the field'),
       ],
       [
         'name' => 'default_value',
diff --git a/Civi/Api4/Service/Spec/FieldSpec.php b/Civi/Api4/Service/Spec/FieldSpec.php
index 8b9ba5ca2405..eb35cf1d3082 100644
--- a/Civi/Api4/Service/Spec/FieldSpec.php
+++ b/Civi/Api4/Service/Spec/FieldSpec.php
@@ -32,6 +32,11 @@ class FieldSpec {
    */
   protected $name;
 
+  /**
+   * @var string
+   */
+  protected $label;
+
   /**
    * @var string
    */
@@ -165,6 +170,24 @@ public function setName($name) {
     return $this;
   }
 
+  /**
+   * @return string
+   */
+  public function getLabel() {
+    return $this->label;
+  }
+
+  /**
+   * @param string $label
+   *
+   * @return $this
+   */
+  public function setLabel($label) {
+    $this->label = $label;
+
+    return $this;
+  }
+
   /**
    * @return string
    */
diff --git a/Civi/Api4/Service/Spec/SpecFormatter.php b/Civi/Api4/Service/Spec/SpecFormatter.php
index 1da26d1520a9..23209a4e242c 100644
--- a/Civi/Api4/Service/Spec/SpecFormatter.php
+++ b/Civi/Api4/Service/Spec/SpecFormatter.php
@@ -73,6 +73,7 @@ public static function arrayToField(array $data, $entity) {
       $field = new FieldSpec($name, $entity, $dataTypeName);
       $field->setRequired(!empty($data['required']));
       $field->setTitle($data['title'] ?? NULL);
+      $field->setLabel($data['html']['label'] ?? NULL);
       $field->setOptions(!empty($data['pseudoconstant']));
     }
     $field->setSerialize($data['serialize'] ?? NULL);
diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index a13d8297b59c..069dc0ee973f 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -66,7 +66,7 @@ private function getSchema() {
       ->setChain([
         'get' => ['$name', 'getActions', ['where' => [['name', '=', 'get']]], ['params']],
       ])->execute();
-    $getFields = ['name', 'title', 'description', 'options', 'input_type', 'input_attrs', 'data_type', 'serialize'];
+    $getFields = ['name', 'label', 'description', 'options', 'input_type', 'input_attrs', 'data_type', 'serialize'];
     foreach ($schema as $entity) {
       // Skip if entity doesn't have a 'get' action or the user doesn't have permission to use get
       if ($entity['get']) {
@@ -78,7 +78,7 @@ private function getSchema() {
         $entity['fields'] = civicrm_api4($entity['name'], 'getFields', [
           'select' => $getFields,
           'where' => [['permission', 'IS NULL']],
-          'orderBy' => ['title'],
+          'orderBy' => ['label'],
           'loadOptions' => $loadOptions,
         ]);
         // Get the names of params this entity supports (minus some obvious ones)
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 1695f95701d8..e2d8c564d15e 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -297,7 +297,7 @@
 
       this.getFieldLabel = function(col) {
         var info = searchMeta.parseExpr(col),
-          label = info.field.title;
+          label = info.field.label;
         if (info.fn) {
           label = '(' + info.fn.title + ') ' + label;
         }
@@ -393,7 +393,7 @@
           return _.transform(searchMeta.getEntity(entityName).fields, function(result, field) {
             var item = {
               id: prefix + field.name + (field.options ? suffix : ''),
-              text: field.title,
+              text: field.label,
               description: field.description
             };
             if (disabledIf(item.id)) {

From a1d226d6655afebbb63b14032180f217ee68b762 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Aug 2020 14:20:51 -0400
Subject: [PATCH 023/834] Separate titles from labels in exportable fields

Follow-up to #18255 and #18114 - this separates field titles (used in export) from labels (used in forms and other displays).
The previous approach was to try to use the title for both, and if that didn't work, override it somewhere.
---
 CRM/Activity/BAO/Activity.php          | 1 -
 CRM/Activity/DAO/Activity.php          | 8 +++++---
 CRM/Contact/BAO/Contact.php            | 1 -
 CRM/Contact/DAO/Contact.php            | 5 +++--
 CRM/Contribute/BAO/Contribution.php    | 2 --
 CRM/Contribute/DAO/Contribution.php    | 5 +++--
 xml/schema/Activity/Activity.xml       | 6 ++++--
 xml/schema/Contact/Contact.xml         | 3 ++-
 xml/schema/Contribute/Contribution.xml | 3 ++-
 9 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 3c8a0eb1551f..40f6fdc90665 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2164,7 +2164,6 @@ public static function exportableFields($name = 'Activity') {
       ],
     ];
     $fields = array_merge($activityFields, $exportableFields);
-    $fields['activity_type_id']['title'] = ts('Activity Type ID');
     $fields['activity_priority_id'] = $fields['priority_id'];
 
     if ($name === 'Case') {
diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
index 3221932f12ea..03ad751cd6b7 100644
--- a/CRM/Activity/DAO/Activity.php
+++ b/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:acbed5c46fa2f00de06493210358c684)
+ * (GenCodeChecksum:cbcbcbb6720f015deae4097b01196c9a)
  */
 
 /**
@@ -288,7 +288,7 @@ public static function &fields() {
         'activity_type_id' => [
           'name' => 'activity_type_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Activity Type'),
+          'title' => ts('Activity Type ID'),
           'description' => ts('FK to civicrm_option_value.id, that has to be valid, registered activity type.'),
           'required' => TRUE,
           'import' => TRUE,
@@ -302,6 +302,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Activity Type"),
           ],
           'pseudoconstant' => [
             'optionGroupName' => 'activity_type',
@@ -391,7 +392,7 @@ public static function &fields() {
         'phone_id' => [
           'name' => 'phone_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Phone (called)'),
+          'title' => ts('Phone (called) ID'),
           'description' => ts('Phone ID of the number called (optional - used if an existing phone number is selected).'),
           'where' => 'civicrm_activity.phone_id',
           'table_name' => 'civicrm_activity',
@@ -401,6 +402,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Core_DAO_Phone',
           'html' => [
             'type' => 'EntityRef',
+            'label' => ts("Phone (called)"),
           ],
           'add' => '2.0',
         ],
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 29c82bd90095..5f42dce4faa5 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -1609,7 +1609,6 @@ public static function &exportableFields($contactType = 'Individual', $status =
             );
           }
         }
-        $fields['current_employer_id']['title'] = ts('Current Employer ID');
         //fix for CRM-791
         if ($export) {
           $fields = array_merge($fields, [
diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php
index 18129eecc974..f91dc3264b1e 100644
--- a/CRM/Contact/DAO/Contact.php
+++ b/CRM/Contact/DAO/Contact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7f796d14a0de2afa9ec1d5b658ab9329)
+ * (GenCodeChecksum:f58884560d4f49764182cd97f1bbbcdf)
  */
 
 /**
@@ -1402,7 +1402,7 @@ public static function &fields() {
         'current_employer_id' => [
           'name' => 'employer_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Current Employer'),
+          'title' => ts('Current Employer ID'),
           'description' => ts('OPTIONAL FK to civicrm_contact record.'),
           'where' => 'civicrm_contact.employer_id',
           'export' => TRUE,
@@ -1414,6 +1414,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Contact_DAO_Contact',
           'html' => [
             'type' => 'EntityRef',
+            'label' => ts("Current Employer"),
           ],
           'add' => '2.1',
         ],
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 849daf7a4e5d..1bc7aa5b401a 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -847,8 +847,6 @@ public static function &exportableFields($checkPermission = TRUE) {
         CRM_Core_BAO_CustomField::getFieldsForImport('Contribution', FALSE, FALSE, FALSE, $checkPermission)
       );
 
-      $fields['financial_type_id']['title'] = ts('Financial Type ID');
-
       self::$_exportableFields = $fields;
     }
 
diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php
index d40a175b96d7..45f51b756cad 100644
--- a/CRM/Contribute/DAO/Contribution.php
+++ b/CRM/Contribute/DAO/Contribution.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Contribution.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:534963bc67ddc36a182ff4767f223531)
+ * (GenCodeChecksum:cc3bcdbce84066823084f71e30f6990b)
  */
 
 /**
@@ -327,7 +327,7 @@ public static function &fields() {
         'financial_type_id' => [
           'name' => 'financial_type_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Financial Type'),
+          'title' => ts('Financial Type ID'),
           'description' => ts('FK to Financial Type for (total_amount - non_deductible_amount).'),
           'where' => 'civicrm_contribution.financial_type_id',
           'export' => TRUE,
@@ -338,6 +338,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Financial_DAO_FinancialType',
           'html' => [
             'type' => 'Select',
+            'label' => ts("Financial Type"),
           ],
           'pseudoconstant' => [
             'table' => 'civicrm_financial_type',
diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml
index 8a37ea3d7615..47fa64230103 100644
--- a/xml/schema/Activity/Activity.xml
+++ b/xml/schema/Activity/Activity.xml
@@ -59,7 +59,7 @@
   </index>
   <field>
     <name>activity_type_id</name>
-    <title>Activity Type</title>
+    <title>Activity Type ID</title>
     <import>true</import>
     <type>int unsigned</type>
     <required>true</required>
@@ -73,6 +73,7 @@
     </pseudoconstant>
     <html>
       <type>Select</type>
+      <label>Activity Type</label>
     </html>
   </field>
   <index>
@@ -191,11 +192,12 @@
   <field>
     <name>phone_id</name>
     <type>int unsigned</type>
-    <title>Phone (called)</title>
+    <title>Phone (called) ID</title>
     <comment>Phone ID of the number called (optional - used if an existing phone number is selected).</comment>
     <add>2.0</add>
     <html>
       <type>EntityRef</type>
+      <label>Phone (called)</label>
     </html>
   </field>
   <foreignKey>
diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml
index f904c09cff1e..58456425fda7 100644
--- a/xml/schema/Contact/Contact.xml
+++ b/xml/schema/Contact/Contact.xml
@@ -826,7 +826,7 @@
   </field>
   <field>
     <name>employer_id</name>
-    <title>Current Employer</title>
+    <title>Current Employer ID</title>
     <uniqueName>current_employer_id</uniqueName>
     <type>int unsigned</type>
     <comment>OPTIONAL FK to civicrm_contact record.</comment>
@@ -834,6 +834,7 @@
     <add>2.1</add>
     <html>
       <type>EntityRef</type>
+      <label>Current Employer</label>
     </html>
     <contactType>Individual</contactType>
   </field>
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index e98363baa93b..c7ed79e140cc 100644
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -81,7 +81,7 @@
   </foreignKey>
   <field>
     <name>financial_type_id</name>
-    <title>Financial Type</title>
+    <title>Financial Type ID</title>
     <type>int unsigned</type>
     <comment>FK to Financial Type for (total_amount - non_deductible_amount).</comment>
     <pseudoconstant>
@@ -92,6 +92,7 @@
     <export>true</export>
     <html>
       <type>Select</type>
+      <label>Financial Type</label>
     </html>
     <add>4.3</add>
   </field>

From c74976533ef772af916059fd1d8f7a2365b06ac0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 26 Aug 2020 08:48:12 +1200
Subject: [PATCH 024/834] Remove last pass-by-reference in completeOrder
 signature

ids is now only referred to once in the function & never altered. I have assigned that value to
a param & unset ids after that to make that clear
---
 CRM/Contribute/BAO/Contribution.php | 12 +++++++++---
 CRM/Core/Payment/BaseIPN.php        |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index a74d99bc5736..3494b5ee3d70 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4452,9 +4452,15 @@ public static function isSingleLineItem($id) {
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function completeOrder($input, &$ids, $objects, $isPostPaymentCreate = FALSE) {
+  public static function completeOrder($input, $ids, $objects, $isPostPaymentCreate = FALSE) {
     $transaction = new CRM_Core_Transaction();
     $contribution = $objects['contribution'];
+    // @todo see if we even need this - it's used further down to create an activity
+    // but the BAO layer should create that - we just need to add a test to cover it & can
+    // maybe remove $ids altogether.
+    $contributionContactID = $ids['related_contact'] ?? NULL;
+    // Unset ids just to make it clear it's not used again.
+    unset($ids);
     // The previous details are used when calculating line items so keep it before any code that 'does something'
     if (!empty($contribution->id)) {
       $input['prevContribution'] = CRM_Contribute_BAO_Contribution::getValues(['id' => $contribution->id]);
@@ -4565,9 +4571,9 @@ public static function completeOrder($input, &$ids, $objects, $isPostPaymentCrea
     if ($input['component'] == 'contribute') {
       //CRM-4027
       $targetContactID = NULL;
-      if (!empty($ids['related_contact'])) {
+      if ($contributionContactID) {
         $targetContactID = $contribution->contact_id;
-        $contribution->contact_id = $ids['related_contact'];
+        $contribution->contact_id = $contributionContactID;
       }
       CRM_Activity_BAO_Activity::addActivity($contribution, NULL, $targetContactID);
     }
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 930baec01633..e4312a5fd797 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -467,7 +467,7 @@ private function cancelMembership($membership, $membershipStatusID, $onlyCancelP
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public function completeTransaction(&$input, &$ids, &$objects) {
+  public function completeTransaction($input, $ids, $objects) {
     CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects);
   }
 

From 8283d4a965eceb24724016b5730ae1823da7e1ca Mon Sep 17 00:00:00 2001
From: John Kingsnorth <john@johnkingsnorth.co.uk>
Date: Tue, 25 Aug 2020 22:38:23 +0100
Subject: [PATCH 025/834] dev/core#1971 Fix test breaking subsequent tests when
 it fails

---
 tests/phpunit/CRM/Core/OptionGroupTest.php | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/tests/phpunit/CRM/Core/OptionGroupTest.php b/tests/phpunit/CRM/Core/OptionGroupTest.php
index d09af84302c9..81778ef2d7a7 100644
--- a/tests/phpunit/CRM/Core/OptionGroupTest.php
+++ b/tests/phpunit/CRM/Core/OptionGroupTest.php
@@ -96,38 +96,36 @@ public function testDomainSpecificValueCache() {
     $domainIDs = [];
     $optionValues = [];
 
-    // Create domains
-    $domainIDs[] = $this->callAPISuccess('Domain', 'create', [
-      'name' => "Test extra domain 1",
-      'domain_version' => CRM_Utils_System::version(),
-    ])['id'];
-    $domainIDs[] = $this->callAPISuccess('Domain', 'create', [
-      'name' => "Test extra domain 2",
-      'domain_version' => CRM_Utils_System::version(),
-    ])['id'];
-
-    // Create 'from' email addresses
-    foreach ($domainIDs as $domainID) {
-      $result = $this->callAPISuccess('option_value', 'create', [
+    // Create domain and from_email_address
+    for ($i = 1; $i < 3; $i++) {
+      $domainID = $this->callAPISuccess('Domain', 'create', [
+        'name' => "Test extra domain " . $i,
+        'domain_version' => CRM_Utils_System::version(),
+      ])['id'];
+      $optionValues[] = $this->callAPISuccess('option_value', 'create', [
         'option_group_id' => 'from_email_address',
         'name' => '"Test ' . $domainID . '" <test@example.com>',
         'label' => '"Test ' . $domainID . '" <test@example.com>',
         'value' => 'test' . $domainID,
         'is_active' => 1,
         'domain_id' => $domainID,
-      ]);
-      $optionValues[] = $result['id'];
+      ])['id'];
+      $domainIDs[] = $domainID;
     }
 
-    // Check values are as expected for each domain
+    // Check expected values for each domain
     foreach ($domainIDs as $domainID) {
       \CRM_Core_Config::domainID($domainID);
       $result = CRM_Core_OptionGroup::values('from_email_address');
+
+      // Reset the domain, so we don't break future tests if this fails
+      \CRM_Core_Config::domainID($original_domain);
+
+      // Assert
       $this->assertEquals(array_keys($result)[0], 'test' . $domainID);
     }
 
     // Clean up
-    \CRM_Core_Config::domainID($original_domain);
     foreach ($optionValues as $id) {
       $this->callAPISuccess('option_value', 'delete', ['id' => $id]);
     }
@@ -136,7 +134,6 @@ public function testDomainSpecificValueCache() {
       CRM_Core_DAO::executeQuery('DELETE FROM civicrm_domain where id = %1', [1 => [$domainID, 'Int']]);
     }
     unset($original_domain, $domainIDs, $optionValues);
-
   }
 
 }

From 7da8a388e41789ea1b131b81f4f6731702aaa8e8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 26 Aug 2020 09:23:41 -0400
Subject: [PATCH 026/834] Take the guesswork out of rendering clientside CRM
 variables

The window.CRM object needs to be either created or updated depending on whether it already exists.

Before: Guess whether it exists based on the region and mode.
After: Actually check if it exists.
---
 CRM/Core/Resources.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 0fdc57cf21de..265112d8f994 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -354,14 +354,10 @@ protected function mergeSettings($settings, $additions) {
    * @return string
    */
   public function renderSetting($region = NULL) {
-    // On a standard page request we construct the CRM object from scratch
-    if (($region === 'html-header') || !self::isAjaxMode()) {
-      $js = 'var CRM = ' . json_encode($this->getSettings()) . ';';
-    }
-    // For an ajax request we append to it
-    else {
-      $js = 'CRM.$.extend(true, CRM, ' . json_encode($this->getSettings()) . ');';
-    }
+    $vars = json_encode($this->getSettings(), JSON_UNESCAPED_SLASHES);
+    $js = "(function(vars) {
+  if (window.CRM) CRM.$.extend(true, CRM, vars); else window.CRM = vars;
+})($vars)";
     return sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $js);
   }
 

From c4c5eb90d76d99d9e7e676802ca47a3a81f78b71 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 26 Aug 2020 08:00:01 +1200
Subject: [PATCH 027/834] Remove 1 or 2 remaining places where relatedObjects
 is called in completeOrder

If we remove this & the other place we no longer need to call loadRelatedObjects before this
function and only message related places call it

In this case the lines can go as

1) trxn_id should always be used if provided. Casting to isoDate has not been required for a few
years as the DAO now handles
---
 CRM/Contribute/BAO/Contribution.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index a74d99bc5736..989090a8acb9 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4545,12 +4545,6 @@ public static function completeOrder($input, &$ids, $objects, $isPostPaymentCrea
       CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($objects['contributionRecur']->id, $contribution->id);
     }
 
-    if (empty($contribution->_relatedObjects['participant']) && !empty($contribution->_relatedObjects['membership'])) {
-      // @fixme Can we remove this if altogether? - we removed the participant if / else and left relatedObjects['participant'] to ensure behaviour didn't change but it is probably not required.
-      // @todo - use getRelatedMemberships instead
-      $contribution->trxn_id = $input['trxn_id'] ?? NULL;
-      $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);
-    }
     $contribution->contribution_status_id = $contributionParams['contribution_status_id'];
 
     CRM_Core_Error::debug_log_message('Contribution record updated successfully');

From 696737b5b83f5986edf19b7208e43cde253f2bdb Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 24 Aug 2020 15:22:19 +1200
Subject: [PATCH 028/834] Fix for ongoing issues with static upsetting the
 apple cart

This is an alternate to https://github.com/civicrm/civicrm-core/pull/18218

I managed to replicate the bug in https://issues.civicrm.org/jira/browse/CRM-4213 that the static
was added to cover. This takes an alternate approach of loading the memberships & checking them
rather than a static. I think it might mean more queries but they shouldn't be expensive queries & the
code is just too hard-going to skip straight from hacked but still intermittantly buggy to also having no additional
queries
---
 CRM/Contribute/BAO/Contribution.php           |  5 --
 CRM/Member/BAO/Membership.php                 | 81 ++++++++++++++-----
 .../CRM/Member/Form/MembershipTest.php        |  4 +-
 tests/phpunit/api/v3/JobTest.php              |  5 --
 tests/phpunit/api/v3/MembershipTest.php       | 74 ++++++++++++++++-
 5 files changed, 137 insertions(+), 32 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index a74d99bc5736..9b68859709a2 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -5261,11 +5261,6 @@ public static function updateMembershipBasedOnCompletionOfContribution($contribu
       //so make status override false.
       $membershipParams['is_override'] = FALSE;
       $membershipParams['status_override_end_date'] = 'null';
-
-      //CRM-17723 - reset static $relatedContactIds array()
-      // @todo move it to Civi Statics.
-      $var = TRUE;
-      CRM_Member_BAO_Membership::createRelatedMemberships($var, $var, TRUE);
       civicrm_api3('Membership', 'create', $membershipParams);
     }
   }
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 1030eaae1c9b..3ccda33cf0a3 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1316,25 +1316,10 @@ public static function sortName($id) {
    * @param CRM_Core_DAO $dao
    *   Membership object.
    *
-   * @param bool $reset
-   *
-   * @return array|null
-   *   Membership details, if created.
-   *
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function createRelatedMemberships($params, $dao, $reset = FALSE) {
-    // CRM-4213 check for loops, using static variable to record contacts already processed.
-    if (!isset(\Civi::$statics[__CLASS__]['related_contacts'])) {
-      \Civi::$statics[__CLASS__]['related_contacts'] = [];
-    }
-    if ($reset) {
-      // CRM-17723.
-      unset(\Civi::$statics[__CLASS__]['related_contacts']);
-      return FALSE;
-    }
-    $relatedContactIds = &\Civi::$statics[__CLASS__]['related_contacts'];
+  public static function createRelatedMemberships($params, $dao) {
 
     $membership = new CRM_Member_DAO_Membership();
     $membership->id = $dao->id;
@@ -1371,9 +1356,9 @@ public static function createRelatedMemberships($params, $dao, $reset = FALSE) {
     );
 
     // CRM-4213, CRM-19735 check for loops, using static variable to record contacts already processed.
-    // Remove repeated related contacts, which already inherited membership of this type.
-    $relatedContactIds[$membership->contact_id][$membership->membership_type_id] = TRUE;
+    // Remove repeated related contacts, which already inherited membership of this type$relatedContactIds[$membership->contact_id][$membership->membership_type_id] = TRUE;
     foreach ($allRelatedContacts as $cid => $status) {
+      // relatedContactIDs is always empty now - will remove next roud because of whitespace readability.
       if (empty($relatedContactIds[$cid]) || empty($relatedContactIds[$cid][$membership->membership_type_id])) {
         $relatedContactIds[$cid][$membership->membership_type_id] = TRUE;
 
@@ -1470,7 +1455,9 @@ public static function createRelatedMemberships($params, $dao, $reset = FALSE) {
         $ids = [];
         if (($params['status_id'] == $deceasedStatusId) || ($params['status_id'] == $expiredStatusId)) {
           // related membership is not active so does not count towards maximum
-          CRM_Member_BAO_Membership::create($params);
+          if (!self::hasExistingInheritedMembership($params)) {
+            CRM_Member_BAO_Membership::create($params);
+          }
         }
         else {
           // related membership already exists, so this is just an update
@@ -1495,7 +1482,9 @@ public static function createRelatedMemberships($params, $dao, $reset = FALSE) {
         if ($numRelatedAvailable <= 0) {
           break;
         }
-        CRM_Member_BAO_Membership::create($params);
+        if (!self::hasExistingInheritedMembership($params)) {
+          CRM_Member_BAO_Membership::create($params);
+        }
         $numRelatedAvailable--;
       }
     }
@@ -2092,6 +2081,58 @@ protected static function updateDeceasedMembersStatuses() {
     return $count;
   }
 
+  /**
+   * Does the existing membership match the required membership.
+   *
+   * Check before updating that the params are not a match - this is part of avoiding
+   * a loop if we have already updated.
+   *
+   * https://issues.civicrm.org/jira/browse/CRM-4213
+   * @param array $params
+   *
+   * @param array $membership
+   *
+   * @return bool
+   */
+  protected static function matchesRequiredMembership($params, $membership) {
+    foreach (['start_date', 'end_date'] as $date) {
+      if (strtotime($params[$date]) !== strtotime($membership[$date])) {
+        return FALSE;
+      }
+      if ((int) $params['status_id'] !== (int) $membership['status_id']) {
+        return FALSE;
+      }
+      if ((int) $params['membership_type_id'] !== (int) $membership['membership_type_id']) {
+        return FALSE;
+      }
+    }
+    return TRUE;
+  }
+
+  /**
+   * Params of new membership.
+   *
+   * @param array $params
+   *
+   * @return bool
+   * @throws \CiviCRM_API3_Exception
+   */
+  protected static function hasExistingInheritedMembership($params) {
+    foreach (civicrm_api3('Membership', 'get', ['contact_id' => $params['contact_id']])['values'] as $membership) {
+      if (!empty($membership['owner_membership_id'])
+        && $membership['membership_type_id'] === $params['membership_type_id']
+        && (int) $params['owner_membership_id'] !== (int) $membership['owner_membership_id']
+      ) {
+        // Inheriting it from another contact, don't update here.
+        return TRUE;
+      }
+      if (self::matchesRequiredMembership($params, $membership)) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+
   /**
    * Process price set and line items.
    *
diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index ef0d0e99bda8..79730e5b9210 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -1023,6 +1023,7 @@ public function testFormWithFailedContribution() {
    * Uses some data from tests/phpunit/CRM/Member/Form/dataset/data.xml .
    *
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function testTwoInheritedMembershipsViaPriceSetInBackend() {
     // Create an organization and give it a "Member of" relationship to $this->_individualId.
@@ -1045,7 +1046,7 @@ public function testTwoInheritedMembershipsViaPriceSetInBackend() {
     $primaryMembershipIds = [];
     foreach ($orgMembershipResult['values'] as $membership) {
       $primaryMembershipIds[] = $membership['id'];
-      $this->assertTrue(empty($membership['owner_membership_id']), "Membership on the organization has owner_membership_id so is inherited.");
+      $this->assertTrue(empty($membership['owner_membership_id']), 'Membership on the organization has owner_membership_id so is inherited.');
     }
 
     // CRM-20955: check that correct inherited memberships were created for the individual,
@@ -1100,6 +1101,7 @@ public function testTwoInheritedMembershipsViaPriceSetInBackend() {
    * checking that the line items have correct amounts.
    *
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function testTwoMembershipsViaPriceSetInBackendWithDiscount() {
     // Register buildAmount hook to apply discount.
diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php
index f042fa9585ec..6e30be943c0c 100644
--- a/tests/phpunit/api/v3/JobTest.php
+++ b/tests/phpunit/api/v3/JobTest.php
@@ -1990,7 +1990,6 @@ public function testProcessMembershipNoDeceasedStatus() {
    * and left alone when it shouldn't.
    *
    * @throws \CRM_Core_Exception
-   * @throws \CiviCRM_API3_Exception
    */
   public function testProcessMembershipUpdateStatus() {
     $this->ids['MembershipType'] = $this->membershipTypeCreate();
@@ -2107,10 +2106,6 @@ public function testProcessMembershipUpdateStatus() {
     $this->assertEquals($organizationMembershipID, $expiredInheritedRelationship['owner_membership_id']);
     $this->assertMembershipStatus('Grace', (int) $expiredInheritedRelationship['status_id']);
 
-    // Reset static $relatedContactIds array in createRelatedMemberships(),
-    // to avoid bug where inherited membership gets deleted.
-    $var = TRUE;
-    CRM_Member_BAO_Membership::createRelatedMemberships($var, $var, TRUE);
     // Check that after running process_membership job, statuses are correct.
     $this->callAPISuccess('Job', 'process_membership', []);
 
diff --git a/tests/phpunit/api/v3/MembershipTest.php b/tests/phpunit/api/v3/MembershipTest.php
index 7e03eee9a3e5..8f6171d49c7d 100644
--- a/tests/phpunit/api/v3/MembershipTest.php
+++ b/tests/phpunit/api/v3/MembershipTest.php
@@ -9,6 +9,10 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\MembershipType;
+use Civi\Api4\Relationship;
+use Civi\Api4\RelationshipType;
+
 /**
  *  Test APIv3 civicrm_membership functions
  *
@@ -495,7 +499,6 @@ public function testGetWithRelationship() {
    * and max_related property for Membership_Type and Membership entities
    *
    * @throws \CRM_Core_Exception
-   * @throws \CiviCRM_API3_Exception
    */
   public function testCreateWithRelationship() {
     // Create membership type: inherited through employment, max_related = 2
@@ -667,6 +670,75 @@ public function testCreateWithRelationship() {
     $this->contactDelete($membershipOrgId);
   }
 
+  /**
+   * Test that loops are not created when adding spouse relationships.
+   *
+   * This add a test for https://issues.civicrm.org/jira/browse/CRM-4213 in the hope of removing
+   * the buggy fix for that without a resurgence.
+   *
+   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  public function testCreateWithSpouseRelationship() {
+    $relationshipTypeID = RelationshipType::get()->addSelect('id')->addWhere('name_a_b', '=', 'Spouse of')->execute()->first()['id'];
+    MembershipType::update()->setValues([
+      'relationship_direction' => ['b_a', 'a_b'],
+      'relationship_type_id' => [$relationshipTypeID, $relationshipTypeID],
+    ])
+      ->addWhere('name', '=', 'General')
+      ->execute()->first()['id'];
+
+    $spouse1ID = $this->individualCreate(['first_name' => 'him']);
+    $spouse2ID = $this->individualCreate(['first_name' => 'her']);
+    $spouse3ID = $this->individualCreate(['first_name' => 'they']);
+    $spouse4ID = $this->individualCreate(['first_name' => 'them']);
+    Relationship::create()->setValues([
+      'contact_id_a' => $spouse1ID,
+      'contact_id_b' => $spouse2ID,
+      'relationship_type_id' => $relationshipTypeID,
+    ])->execute();
+
+    $this->contactMembershipCreate([
+      'contact_id' => $spouse1ID,
+      'start_date' => date('Y-m-d'),
+      'end_date' => '+1 year',
+    ]);
+
+    $this->callAPISuccessGetSingle('Membership', [
+      'contact_id' => $spouse2ID,
+      'membership_type_id' => 'General',
+    ]);
+
+    $this->callAPISuccessGetSingle('Membership', [
+      'contact_id' => $spouse1ID,
+      'membership_type_id' => 'General',
+    ]);
+    // Add another Spouse
+    Relationship::create()->setValues([
+      'contact_id_a' => $spouse3ID,
+      'contact_id_b' => $spouse1ID,
+      'relationship_type_id' => $relationshipTypeID,
+    ])->execute();
+    $this->callAPISuccessGetSingle('Membership', [
+      'contact_id' => $spouse3ID,
+      'membership_type_id' => 'General',
+    ]);
+    $this->callAPISuccessGetCount('Membership', [], 3);
+    Relationship::create()->setValues([
+      'contact_id_a' => $spouse1ID,
+      'contact_id_b' => $spouse4ID,
+      'relationship_type_id' => $relationshipTypeID,
+    ])->execute();
+
+    $this->callAPISuccessGetSingle('Membership', [
+      'contact_id' => $spouse4ID,
+      'membership_type_id' => 'General',
+    ]);
+
+    $this->callAPISuccessGetCount('Membership', [], 4);
+  }
+
   /**
    * We are checking for no e-notices + only id & end_date returned
    *

From ac6b9668d8bcb60e58896d33960fc0876f017629 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 27 Aug 2020 10:05:04 +1200
Subject: [PATCH 029/834] Use already detemined value for contributionRecurid

---
 CRM/Contribute/BAO/Contribution.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index d69c94fbac02..0e8ba3d61c1a 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4545,8 +4545,8 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     }
 
     // Add new soft credit against current $contribution.
-    if (!empty($objects['contributionRecur']) && $objects['contributionRecur']->id) {
-      CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($objects['contributionRecur']->id, $contribution->id);
+    if ($recurringContributionID) {
+      CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($recurringContributionID, $contribution->id);
     }
 
     $contribution->contribution_status_id = $contributionParams['contribution_status_id'];

From d0b559aa6aee52306c44645605f5b7424822beeb Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Thu, 27 Aug 2020 11:56:25 +0530
Subject: [PATCH 030/834] dev/core#912 update payment instrument of main
 contribution record

---
 CRM/Financial/BAO/Payment.php             |  1 +
 api/v3/Contribution.php                   |  3 ++
 tests/phpunit/api/v3/ContributionTest.php | 50 +++++++++++++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/CRM/Financial/BAO/Payment.php b/CRM/Financial/BAO/Payment.php
index f841363f141f..e13837e996c0 100644
--- a/CRM/Financial/BAO/Payment.php
+++ b/CRM/Financial/BAO/Payment.php
@@ -157,6 +157,7 @@ public static function create($params) {
           'is_post_payment_create' => TRUE,
           'is_email_receipt' => $params['is_send_contribution_notification'],
           'trxn_date' => $params['trxn_date'],
+          'payment_instrument_id' => $paymentTrxnParams['payment_instrument_id'],
         ]);
         // Get the trxn
         $trxnId = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($contribution['id'], 'DESC');
diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index a1b06305e959..7a5e94dcb57c 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -678,6 +678,9 @@ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstC
   }
   $input['card_type_id'] = $params['card_type_id'] ?? NULL;
   $input['pan_truncation'] = $params['pan_truncation'] ?? NULL;
+  if (!empty($params['payment_instrument_id'])) {
+    $input['payment_instrument_id'] = $params['payment_instrument_id'];
+  }
   return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects,
     $params['is_post_payment_create'] ?? NULL);
 }
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 8de1a75b8960..8b673eb9e370 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -4899,4 +4899,54 @@ public function testPaymentDontChangeReceiveDate() {
     $this->assertEquals('2020-02-02 00:00:00', $contribution['receive_date']);
   }
 
+  /**
+   * Make sure that recording a payment with Different Payment Instrument update main contribution record payment
+   * instrument too. If multiple Payment Recorded, last payment record payment (when No more due) instrument set to main
+   * payment
+   */
+  public function testPaymentVerifyPaymentInstrumentChange() {
+    // Create Pending contribution with pay later mode, with payment instrument Check
+    $params = [
+      'contact_id' => $this->_individualId,
+      'total_amount' => 100,
+      'receive_date' => '2020-02-02',
+      'contribution_status_id' => 'Pending',
+      'is_pay_later' => 1,
+      'payment_instrument_id' => 'Check',
+    ];
+    $contributionID = $this->contributionCreate($params);
+
+
+    // Record the the Payment with instrument other than Check, e.g EFT
+    $paymentParams = [
+      'contribution_id' => $contributionID,
+      'total_amount' => 50,
+      'trxn_date' => '2020-03-04',
+      'payment_instrument_id' => 'EFT'
+    ];
+    $this->callAPISuccess('payment', 'create', $paymentParams);
+
+    $contribution = $this->callAPISuccess('Contribution', 'getSingle', [
+      'id' => $contributionID,
+    ]);
+    // payment status should be 'Partially paid'
+    $this->assertEquals('Partially paid', $contribution['contribution_status']);
+
+    // Record the the Payment with instrument other than Check, e.g Cash (pay all remaining amount)
+    $paymentParams = [
+      'contribution_id' => $contributionID,
+      'total_amount' => 50,
+      'trxn_date' => '2020-03-04',
+      'payment_instrument_id' => 'Cash'
+    ];
+    $this->callAPISuccess('payment', 'create', $paymentParams);
+
+    //check if contribution Payment Instrument (Payment Method) is is set to "Cash".
+    $contribution = $this->callAPISuccess('Contribution', 'getSingle', [
+      'id' => $contributionID,
+    ]);
+    $this->assertEquals('Cash', $contribution['payment_instrument']);
+    $this->assertEquals('Completed', $contribution['contribution_status']);
+  }
+
 }

From f7299b67c3991d53b4c4366f54beb07693ae4961 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Thu, 27 Aug 2020 11:59:54 +0530
Subject: [PATCH 031/834] Remove additional line

---
 tests/phpunit/api/v3/ContributionTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 8b673eb9e370..b865f99e8382 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -4916,7 +4916,6 @@ public function testPaymentVerifyPaymentInstrumentChange() {
     ];
     $contributionID = $this->contributionCreate($params);
 
-
     // Record the the Payment with instrument other than Check, e.g EFT
     $paymentParams = [
       'contribution_id' => $contributionID,

From d0d6dd4087746816aa2eed2a120c33877770b9da Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Thu, 27 Aug 2020 12:27:51 +0530
Subject: [PATCH 032/834] fix test case warning

---
 tests/phpunit/api/v3/ContributionTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index b865f99e8382..bf24317b8868 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -4921,7 +4921,7 @@ public function testPaymentVerifyPaymentInstrumentChange() {
       'contribution_id' => $contributionID,
       'total_amount' => 50,
       'trxn_date' => '2020-03-04',
-      'payment_instrument_id' => 'EFT'
+      'payment_instrument_id' => 'EFT',
     ];
     $this->callAPISuccess('payment', 'create', $paymentParams);
 
@@ -4936,7 +4936,7 @@ public function testPaymentVerifyPaymentInstrumentChange() {
       'contribution_id' => $contributionID,
       'total_amount' => 50,
       'trxn_date' => '2020-03-04',
-      'payment_instrument_id' => 'Cash'
+      'payment_instrument_id' => 'Cash',
     ];
     $this->callAPISuccess('payment', 'create', $paymentParams);
 

From fc2b5ff83b4bc6f19b102d2be0504db51161870f Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Wed, 26 Aug 2020 17:26:54 -0400
Subject: [PATCH 033/834] autodetect ssl

---
 setup/plugins/init/Backdrop.civi-setup.php    |   2 +
 setup/plugins/init/Drupal.civi-setup.php      |   2 +
 setup/plugins/init/Drupal8.civi-setup.php     |   2 +
 .../InstallSettingsFile.civi-setup.php        |   7 +
 setup/src/Setup/DrupalUtil.php                |  54 +++++++
 .../CRM/common/civicrm.settings.php.template  |   2 +-
 tests/phpunit/Civi/Setup/DrupalUtilTest.php   | 133 ++++++++++++++++++
 7 files changed, 201 insertions(+), 1 deletion(-)
 create mode 100644 tests/phpunit/Civi/Setup/DrupalUtilTest.php

diff --git a/setup/plugins/init/Backdrop.civi-setup.php b/setup/plugins/init/Backdrop.civi-setup.php
index 57e867f90c36..2320b88dace6 100644
--- a/setup/plugins/init/Backdrop.civi-setup.php
+++ b/setup/plugins/init/Backdrop.civi-setup.php
@@ -39,11 +39,13 @@
 
     // Compute DSN.
     global $databases;
+    $ssl_params = \Civi\Setup\DrupalUtil::guessSslParams($databases['default']['default']);
     $model->db = $model->cmsDb = array(
       'server' => \Civi\Setup\DbUtil::encodeHostPort($databases['default']['default']['host'], $databases['default']['default']['port'] ?: NULL),
       'username' => $databases['default']['default']['username'],
       'password' => $databases['default']['default']['password'],
       'database' => $databases['default']['default']['database'],
+      'ssl_params' => empty($ssl_params) ? NULL : $ssl_params,
     );
 
     // Compute URLs
diff --git a/setup/plugins/init/Drupal.civi-setup.php b/setup/plugins/init/Drupal.civi-setup.php
index b24d7c164cba..d57ff432c21c 100644
--- a/setup/plugins/init/Drupal.civi-setup.php
+++ b/setup/plugins/init/Drupal.civi-setup.php
@@ -37,11 +37,13 @@
 
     // Compute DSN.
     global $databases;
+    $ssl_params = \Civi\Setup\DrupalUtil::guessSslParams($databases['default']['default']);
     $model->db = $model->cmsDb = array(
       'server' => \Civi\Setup\DbUtil::encodeHostPort($databases['default']['default']['host'], $databases['default']['default']['port'] ?: NULL),
       'username' => $databases['default']['default']['username'],
       'password' => $databases['default']['default']['password'],
       'database' => $databases['default']['default']['database'],
+      'ssl_params' => empty($ssl_params) ? NULL : $ssl_params,
     );
 
     // Compute cmsBaseUrl.
diff --git a/setup/plugins/init/Drupal8.civi-setup.php b/setup/plugins/init/Drupal8.civi-setup.php
index a693cba92c4c..22034e908954 100644
--- a/setup/plugins/init/Drupal8.civi-setup.php
+++ b/setup/plugins/init/Drupal8.civi-setup.php
@@ -40,11 +40,13 @@
 
     // Compute DSN.
     $connectionOptions = \Drupal::database()->getConnectionOptions();
+    $ssl_params = \Civi\Setup\DrupalUtil::guessSslParams($connectionOptions);
     $model->db = $model->cmsDb = array(
       'server' => \Civi\Setup\DbUtil::encodeHostPort($connectionOptions['host'], $connectionOptions['port'] ?: NULL),
       'username' => $connectionOptions['username'],
       'password' => $connectionOptions['password'],
       'database' => $connectionOptions['database'],
+      'ssl_params' => empty($ssl_params) ? NULL : $ssl_params,
     );
 
     // Compute cmsBaseUrl.
diff --git a/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php b/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
index 29aedb2b073b..5422292f32a5 100644
--- a/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
+++ b/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
@@ -71,6 +71,13 @@
     $params['CMSdbPass'] = addslashes($m->cmsDb['password']);
     $params['CMSdbHost'] = addslashes($m->cmsDb['server']);
     $params['CMSdbName'] = addslashes($m->cmsDb['database']);
+    // The '&' prefix is awkward, but we don't know what's already in the file.
+    // At the time of writing, it has ?new_link=true. If that is removed,
+    // then need to update this.
+    // The PHP_QUERY_RFC3986 is important because PEAR::DB will interpret plus
+    // signs as a reference to its old DSN format and mangle the DSN, so we
+    // need to use %20 for spaces.
+    $params['CMSdbSSL'] = empty($m->cmsDb['ssl_params']) ? '' : addslashes('&' . http_build_query($m->cmsDb['ssl_params'], '', '&', PHP_QUERY_RFC3986));
     $params['siteKey'] = addslashes($m->siteKey);
 
     $extraSettings = array();
diff --git a/setup/src/Setup/DrupalUtil.php b/setup/src/Setup/DrupalUtil.php
index 0f5ab95205b0..8d1e95bc2e72 100644
--- a/setup/src/Setup/DrupalUtil.php
+++ b/setup/src/Setup/DrupalUtil.php
@@ -71,4 +71,58 @@ public static function getDrupalSiteDir($cmsPath) {
      */
   }
 
+  /**
+   * Guess if the CMS is using SSL for MySQL and what the corresponding
+   * parameters should be for PEAR::DB.
+   *
+   * Not all combinations will work. See the install docs for a list of known
+   * configurations that do. We don't enforce that here since we're just
+   * trying to guess a default based on what they already have.
+   *
+   * @param array $cmsDatabaseParams
+   *   The contents of the section from drupal's settings.php where it defines
+   *   the $database array, usually under 'default'.
+   * @return array
+   *   The corresponding guessed params for PEAR::DB.
+   */
+  public static function guessSslParams(array $cmsDatabaseParams):array {
+    // If the pdo-mysql extension isn't loaded or they have nothing in drupal
+    // config for pdo, then we're done. PDO isn't required for Civi, but note
+    // the references to PDO constants below would fail and they obviously
+    // wouldn't have them in drupal config then.
+    if (empty($cmsDatabaseParams['pdo']) || !extension_loaded('pdo_mysql')) {
+      return [];
+    }
+
+    $pdo = $cmsDatabaseParams['pdo'];
+
+    $pdo_map = [
+      \PDO::MYSQL_ATTR_SSL_CA => 'ca',
+      \PDO::MYSQL_ATTR_SSL_KEY => 'key',
+      \PDO::MYSQL_ATTR_SSL_CERT => 'cert',
+      \PDO::MYSQL_ATTR_SSL_CAPATH => 'capath',
+      \PDO::MYSQL_ATTR_SSL_CIPHER => 'cipher',
+    ];
+
+    $ssl_params = [];
+
+    // If they have one set in drupal config and it's a string, then copy
+    // it over verbatim.
+    foreach ($pdo_map as $pdo_name => $ssl_name) {
+      if (!empty($pdo[$pdo_name]) && is_string($pdo[$pdo_name])) {
+        $ssl_params[$ssl_name] = $pdo[$pdo_name];
+      }
+    }
+
+    // No client certificate or server verification, but want SSL. Return our
+    // made-up indicator ssl=1 that isn't a real mysqli option but which we
+    // recognize. It's possible they have other params set too which we pass
+    // along from above, but that may not be compatible but it's up to them.
+    if (($pdo[\PDO::MYSQL_ATTR_SSL_CA] ?? NULL) === TRUE && ($pdo[\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] ?? NULL) === FALSE) {
+      $ssl_params['ssl'] = 1;
+    }
+
+    return $ssl_params;
+  }
+
 }
diff --git a/templates/CRM/common/civicrm.settings.php.template b/templates/CRM/common/civicrm.settings.php.template
index 3d0575569fb8..d66a63d632ec 100644
--- a/templates/CRM/common/civicrm.settings.php.template
+++ b/templates/CRM/common/civicrm.settings.php.template
@@ -73,7 +73,7 @@ if (!defined('CIVICRM_UF')) {
  *      define( 'CIVICRM_UF_DSN', 'mysql://cms_db_username:cms_db_password@db_server/cms_database?new_link=true');
  */
 if (!defined('CIVICRM_UF_DSN') && CIVICRM_UF !== 'UnitTests') {
-  define( 'CIVICRM_UF_DSN'           , 'mysql://%%CMSdbUser%%:%%CMSdbPass%%@%%CMSdbHost%%/%%CMSdbName%%?new_link=true');
+  define( 'CIVICRM_UF_DSN'           , 'mysql://%%CMSdbUser%%:%%CMSdbPass%%@%%CMSdbHost%%/%%CMSdbName%%?new_link=true%%CMSdbSSL%%');
 }
 
 // %%extraSettings%%
diff --git a/tests/phpunit/Civi/Setup/DrupalUtilTest.php b/tests/phpunit/Civi/Setup/DrupalUtilTest.php
new file mode 100644
index 000000000000..adf606b04fc0
--- /dev/null
+++ b/tests/phpunit/Civi/Setup/DrupalUtilTest.php
@@ -0,0 +1,133 @@
+<?php
+namespace Civi\Setup;
+
+/**
+ * Class DrupalUtilTest
+ * @package Civi\Setup
+ * @group headless
+ */
+class DrupalUtilTest extends \CiviUnitTestCase {
+
+  /**
+   * Test guessSslParams
+   * @dataProvider pdoParamsProvider
+   * @param array $input
+   * @param array $expected
+   */
+  public function testGuessSslParams(array $input, array $expected) {
+    $this->assertSame($expected, \Civi\Setup\DrupalUtil::guessSslParams($input));
+  }
+
+  /**
+   * Data provider for testGuessSslParams
+   * @return array
+   */
+  public function pdoParamsProvider():array {
+    return [
+      'empty' => [[], []],
+      'empty2' => [['pdo' => []], []],
+      'no client certificate, no server verification' => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_CA => TRUE,
+            \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => FALSE,
+          ],
+        ],
+        ['ssl' => 1],
+      ],
+      'typical client certificate with server verification' => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_CA => '/tmp/cacert.crt',
+            \PDO::MYSQL_ATTR_SSL_KEY => '/tmp/my.key',
+            \PDO::MYSQL_ATTR_SSL_CERT => '/tmp/cert.crt',
+          ],
+        ],
+        [
+          'ca' => '/tmp/cacert.crt',
+          'key' => '/tmp/my.key',
+          'cert' => '/tmp/cert.crt',
+        ],
+      ],
+      'client certificate, no server verification' => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => FALSE,
+            \PDO::MYSQL_ATTR_SSL_KEY => '/tmp/my.key',
+            \PDO::MYSQL_ATTR_SSL_CERT => '/tmp/cert.crt',
+          ],
+        ],
+        [
+          'key' => '/tmp/my.key',
+          'cert' => '/tmp/cert.crt',
+        ],
+      ],
+      'self-signed client certificate with server verification' => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_CA => '/tmp/cert.crt',
+            \PDO::MYSQL_ATTR_SSL_KEY => '/tmp/my.key',
+            \PDO::MYSQL_ATTR_SSL_CERT => '/tmp/cert.crt',
+          ],
+        ],
+        [
+          'ca' => '/tmp/cert.crt',
+          'key' => '/tmp/my.key',
+          'cert' => '/tmp/cert.crt',
+        ],
+      ],
+      'Not sure what would happen in practice but is all the string params' => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_CA => '/tmp/cacert.crt',
+            \PDO::MYSQL_ATTR_SSL_KEY => '/tmp/my.key',
+            \PDO::MYSQL_ATTR_SSL_CERT => '/tmp/cert.crt',
+            \PDO::MYSQL_ATTR_SSL_CAPATH => '/tmp/cacert_folder',
+            \PDO::MYSQL_ATTR_SSL_CIPHER => 'aes',
+          ],
+        ],
+        [
+          'ca' => '/tmp/cacert.crt',
+          'key' => '/tmp/my.key',
+          'cert' => '/tmp/cert.crt',
+          'capath' => '/tmp/cacert_folder',
+          'cipher' => 'aes',
+        ],
+      ],
+      'Ditto, but showing extra ones should get ignored' => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_CA => '/tmp/cacert.crt',
+            \PDO::MYSQL_ATTR_SSL_KEY => '/tmp/my.key',
+            \PDO::MYSQL_ATTR_SSL_CERT => '/tmp/cert.crt',
+            \PDO::MYSQL_ATTR_SSL_CAPATH => '/tmp/cacert_folder',
+            \PDO::MYSQL_ATTR_SSL_CIPHER => 'aes',
+            'fourteen' => 'the number fourteen',
+          ],
+        ],
+        [
+          'ca' => '/tmp/cacert.crt',
+          'key' => '/tmp/my.key',
+          'cert' => '/tmp/cert.crt',
+          'capath' => '/tmp/cacert_folder',
+          'cipher' => 'aes',
+        ],
+      ],
+      "some windows paths shouldn't get mangled" => [
+        [
+          'pdo' => [
+            \PDO::MYSQL_ATTR_SSL_CA => 'C:/Program Files/MariaDB 10.3/data/cacert.crt',
+            \PDO::MYSQL_ATTR_SSL_KEY => 'C:/Program Files/MariaDB 10.3/data/my.key',
+            \PDO::MYSQL_ATTR_SSL_CERT => 'C:\\Program Files\\MariaDB 10.3\\data\\cert.crt',
+          ],
+        ],
+        [
+          'ca' => 'C:/Program Files/MariaDB 10.3/data/cacert.crt',
+          'key' => 'C:/Program Files/MariaDB 10.3/data/my.key',
+          'cert' => 'C:\\Program Files\\MariaDB 10.3\\data\\cert.crt',
+        ],
+      ],
+    ];
+  }
+
+}

From 7adea59a09e5f8ca4f20619ad506b734855e3f74 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Thu, 27 Aug 2020 22:44:31 +0530
Subject: [PATCH 034/834] report#47 Report Bookkeeping add time field for date
 filter.

---
 CRM/Report/Form/Contribute/Bookkeeping.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index f70c7d29d190..70c7a4d857ce 100644
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -300,8 +300,7 @@ public function __construct() {
             'operatorType' => CRM_Report_Form::OP_INT,
             'type' => CRM_Utils_Type::T_INT,
           ],
-          'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
-          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATE],
+          'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATETIME],
           'contribution_source' => [
             'title' => ts('Source'),
             'name' => 'source',
@@ -317,6 +316,7 @@ public function __construct() {
         'order_bys' => [
           'contribution_id' => ['title' => ts('Contribution #')],
           'contribution_status_id' => ['title' => ts('Contribution Status')],
+          'receive_date'  => ['title' => ts('Date Received')],
         ],
         'grouping' => 'contri-fields',
       ],
@@ -364,7 +364,7 @@ public function __construct() {
           ],
           'trxn_date' => [
             'title' => ts('Transaction Date'),
-            'operatorType' => CRM_Report_Form::OP_DATE,
+            'operatorType' => CRM_Report_Form::OP_DATETIME,
             'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
           ],
           'status_id' => [
@@ -383,6 +383,7 @@ public function __construct() {
         ],
         'order_bys' => [
           'payment_instrument_id' => ['title' => ts('Payment Method')],
+          'trxn_date' => ['title' => ts('Transaction Date')],
         ],
       ],
       'civicrm_entity_financial_trxn' => [
@@ -536,8 +537,10 @@ public function where() {
             $relative = $this->_params["{$fieldName}_relative"] ?? NULL;
             $from = $this->_params["{$fieldName}_from"] ?? NULL;
             $to = $this->_params["{$fieldName}_to"] ?? NULL;
+            $fromTime = $this->_params["{$fieldName}_from_time"] ?? NULL;
+            $toTime = $this->_params["{$fieldName}_to_time"] ?? NULL;
 
-            $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type']);
+            $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type'], $fromTime, $toTime);
           }
           else {
             $op = $this->_params["{$fieldName}_op"] ?? NULL;

From e7339d592be523cb2a591bc5d0a413b6f1b9836b Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 28 Aug 2020 10:49:32 +1200
Subject: [PATCH 035/834] Shell Financial ACLs extension

This is intended as a hidden extension while we work through the process of migrating core functionality into it.

I'm expected there to be a bit of work to unravel this into hook interactions - but the core extension mechanism gives us that space
---
 .gitignore                                 |   1 +
 CRM/Upgrade/Incremental/php/FiveThirty.php |  42 ++
 bin/regen.sh                               |   2 +-
 distmaker/dists/common.sh                  |   1 +
 ext/financialacls/LICENSE.txt              | 667 +++++++++++++++++++++
 ext/financialacls/README.md                |  44 ++
 ext/financialacls/financialacls.civix.php  | 477 +++++++++++++++
 ext/financialacls/financialacls.php        | 172 ++++++
 ext/financialacls/images/screenshot.png    | Bin 0 -> 11775 bytes
 ext/financialacls/info.xml                 |  33 +
 xml/templates/civicrm_data.tpl             |   1 +
 11 files changed, 1439 insertions(+), 1 deletion(-)
 create mode 100644 ext/financialacls/LICENSE.txt
 create mode 100644 ext/financialacls/README.md
 create mode 100644 ext/financialacls/financialacls.civix.php
 create mode 100644 ext/financialacls/financialacls.php
 create mode 100644 ext/financialacls/images/screenshot.png
 create mode 100644 ext/financialacls/info.xml

diff --git a/.gitignore b/.gitignore
index 390c2a04945c..0070fbb42c66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 !/ext/flexmailer
 !/ext/eventcart
 !/ext/search
+!/ext/financialacls
 backdrop/
 bower_components
 CRM/Case/xml/configuration
diff --git a/CRM/Upgrade/Incremental/php/FiveThirty.php b/CRM/Upgrade/Incremental/php/FiveThirty.php
index 1f8367d24867..8ccaf073f383 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirty.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirty.php
@@ -65,8 +65,50 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
   //    // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
   //  }
 
+  /**
+   * Upgrade function.
+   *
+   * @param string $rev
+   */
+  public function upgrade_5_30_alpha1($rev) {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addTask('Add core (required) extension Financial ACLs', 'installFinancialAcls');
+  }
+
   // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) {
   //   return TRUE;
   // }
 
+  /**
+   * Install financialacls extension.
+   *
+   * This feature is restructured as a core extension - which is primarily a code cleanup step.
+   *
+   * @param \CRM_Queue_TaskContext $ctx
+   *
+   * @return bool
+   *
+   * @throws \CiviCRM_API3_Exception
+   * @throws \CRM_Core_Exception
+   */
+  public static function installFinancialAcls(CRM_Queue_TaskContext $ctx) {
+    // Install via direct SQL manipulation. Note that:
+    // (1) This extension has no activation logic.
+    // (2) On new installs, the extension is activated purely via default SQL INSERT.
+    // (3) Caches are flushed at the end of the upgrade.
+    // ($) Over long term, upgrade steps are more reliable in SQL. API/BAO sometimes don't work mid-upgrade.
+    $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([
+      'type' => 'module',
+      'full_name' => 'financialacls',
+      'name' => 'financialacls',
+      'label' => 'Financial ACLs',
+      'file' => 'financialacls',
+      'schema_version' => NULL,
+      'is_active' => 1,
+    ]);
+    CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL());
+
+    return TRUE;
+  }
+
 }
diff --git a/bin/regen.sh b/bin/regen.sh
index f7451a23fc02..e7525399ebdc 100755
--- a/bin/regen.sh
+++ b/bin/regen.sh
@@ -47,7 +47,7 @@ php GenerateData.php
 
 ## Prune local data
 $MYSQLCMD -e "DROP TABLE IF EXISTS civicrm_install_canary; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
-$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'search', 'flexmailer');"
+$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'search', 'flexmailer', 'financialacls);"
 TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs )
 
 cd $CIVISOURCEDIR/sql
diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index ad93400ce3e3..522bcc0c2ec2 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -109,6 +109,7 @@ function dm_core_exts() {
   echo ext/sequentialcreditnotes
   echo ext/flexmailer
   echo ext/eventcart
+  echo ext/financialacls
 }
 
 ## Copy all packages
diff --git a/ext/financialacls/LICENSE.txt b/ext/financialacls/LICENSE.txt
new file mode 100644
index 000000000000..96bc3698ee01
--- /dev/null
+++ b/ext/financialacls/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: financialacls
+Copyright (C) 2020, eileen <emcnaughton@wikimedia.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/financialacls/README.md b/ext/financialacls/README.md
new file mode 100644
index 000000000000..531f9bea768b
--- /dev/null
+++ b/ext/financialacls/README.md
@@ -0,0 +1,44 @@
+# financialacls
+
+![Screenshot](/images/screenshot.png)
+
+(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+
+The extension is licensed under [AGPL-3.0](LICENSE.txt).
+
+## Requirements
+
+* PHP v7.0+
+* CiviCRM (*FIXME: Version number*)
+
+## Installation (Web UI)
+
+This extension has not yet been published for installation via the web UI.
+
+## Installation (CLI, Zip)
+
+Sysadmins and developers may download the `.zip` file for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+cd <extension-dir>
+cv dl financialacls@https://github.com/FIXME/financialacls/archive/master.zip
+```
+
+## Installation (CLI, Git)
+
+Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+git clone https://github.com/FIXME/financialacls.git
+cv en financialacls
+```
+
+## Usage
+
+(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+
+## Known Issues
+
+(* FIXME *)
diff --git a/ext/financialacls/financialacls.civix.php b/ext/financialacls/financialacls.civix.php
new file mode 100644
index 000000000000..2f5da6596187
--- /dev/null
+++ b/ext/financialacls/financialacls.civix.php
@@ -0,0 +1,477 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_Financialacls_ExtensionUtil {
+  const SHORT_NAME = "financialacls";
+  const LONG_NAME = "financialacls";
+  const CLASS_PREFIX = "CRM_Financialacls";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = []) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = [self::LONG_NAME, NULL];
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_Financialacls_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
+ */
+function _financialacls_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = [$extDir, $template->template_dir];
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+ */
+function _financialacls_civix_civicrm_xmlMenu(&$files) {
+  foreach (_financialacls_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function _financialacls_civix_civicrm_install() {
+  _financialacls_civix_civicrm_config();
+  if ($upgrader = _financialacls_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+function _financialacls_civix_civicrm_postInstall() {
+  _financialacls_civix_civicrm_config();
+  if ($upgrader = _financialacls_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+function _financialacls_civix_civicrm_uninstall() {
+  _financialacls_civix_civicrm_config();
+  if ($upgrader = _financialacls_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function _financialacls_civix_civicrm_enable() {
+  _financialacls_civix_civicrm_config();
+  if ($upgrader = _financialacls_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onEnable'])) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ * @return mixed
+ */
+function _financialacls_civix_civicrm_disable() {
+  _financialacls_civix_civicrm_config();
+  if ($upgrader = _financialacls_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onDisable'])) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
+ */
+function _financialacls_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _financialacls_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_Financialacls_Upgrader
+ */
+function _financialacls_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/Financialacls/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_Financialacls_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern.
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
+ * @return array
+ */
+function _financialacls_civix_find_files($dir, $pattern) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = [$dir];
+  $result = [];
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_financialacls_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry[0] == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
+ */
+function _financialacls_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _financialacls_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
+ */
+function _financialacls_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_financialacls_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = [
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    ];
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+ */
+function _financialacls_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _financialacls_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _financialacls_civix_civicrm_themes(&$themes) {
+  $files = _financialacls_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ *
+ * @return array
+ */
+function _financialacls_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : [];
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ *
+ * @return bool
+ */
+function _financialacls_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = [
+      'attributes' => array_merge([
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ], $item),
+    ];
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = [];
+        }
+        $found = _financialacls_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _financialacls_civix_navigationMenu(&$nodes) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
+    _financialacls_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _financialacls_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _financialacls_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _financialacls_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _financialacls_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
+ */
+function _financialacls_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+ */
+function _financialacls_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, []);
+}
diff --git a/ext/financialacls/financialacls.php b/ext/financialacls/financialacls.php
new file mode 100644
index 000000000000..e6c39a0ab068
--- /dev/null
+++ b/ext/financialacls/financialacls.php
@@ -0,0 +1,172 @@
+<?php
+
+require_once 'financialacls.civix.php';
+// phpcs:disable
+use CRM_Financialacls_ExtensionUtil as E;
+// phpcs:enable
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
+ */
+function financialacls_civicrm_config(&$config) {
+  _financialacls_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+ */
+function financialacls_civicrm_xmlMenu(&$files) {
+  _financialacls_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function financialacls_civicrm_install() {
+  _financialacls_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+function financialacls_civicrm_postInstall() {
+  _financialacls_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+function financialacls_civicrm_uninstall() {
+  _financialacls_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function financialacls_civicrm_enable() {
+  _financialacls_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ */
+function financialacls_civicrm_disable() {
+  _financialacls_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
+ */
+function financialacls_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _financialacls_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
+ */
+function financialacls_civicrm_managed(&$entities) {
+  _financialacls_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
+ */
+function financialacls_civicrm_caseTypes(&$caseTypes) {
+  _financialacls_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+ */
+function financialacls_civicrm_angularModules(&$angularModules) {
+  _financialacls_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
+ */
+function financialacls_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _financialacls_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+ */
+function financialacls_civicrm_entityTypes(&$entityTypes) {
+  _financialacls_civix_civicrm_entityTypes($entityTypes);
+}
+
+/**
+ * Implements hook_civicrm_thems().
+ */
+function financialacls_civicrm_themes(&$themes) {
+  _financialacls_civix_civicrm_themes($themes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_preProcess
+ */
+//function financialacls_civicrm_preProcess($formName, &$form) {
+//
+//}
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_navigationMenu
+ */
+//function financialacls_civicrm_navigationMenu(&$menu) {
+//  _financialacls_civix_insert_navigation_menu($menu, 'Mailings', array(
+//    'label' => E::ts('New subliminal message'),
+//    'name' => 'mailing_subliminal_message',
+//    'url' => 'civicrm/mailing/subliminal',
+//    'permission' => 'access CiviMail',
+//    'operator' => 'OR',
+//    'separator' => 0,
+//  ));
+//  _financialacls_civix_navigationMenu($menu);
+//}
diff --git a/ext/financialacls/images/screenshot.png b/ext/financialacls/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6765b696fa03249ac2cd605d5f0e4aa000ad6dad
GIT binary patch
literal 11775
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
IrTdTn0|#irRsaA1

literal 0
HcmV?d00001

diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml
new file mode 100644
index 000000000000..8539355b3256
--- /dev/null
+++ b/ext/financialacls/info.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<extension key="financialacls" type="module">
+  <file>financialacls</file>
+  <name>Financial ACLs</name>
+  <description>Implements financial ACLS - may not be disabled without risk of site breakage while in progress</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>CiviCRM</author>
+    <email>info@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://FIXME</url>
+    <url desc="Documentation">http://FIXME</url>
+    <url desc="Support">http://FIXME</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2020-08-27</releaseDate>
+  <version>1.0</version>
+  <develStage>stable</develStage>
+  <compatibility>
+    <ver>5.30</ver>
+  </compatibility>
+  <tags>
+    <tag>mgmt:hidden</tag>
+  </tags>
+  <comments>Financial acls - working towards moving this code to the extension from core</comments>
+  <classloader>
+    <psr4 prefix="Civi\" path="Civi"/>
+  </classloader>
+  <civix>
+    <namespace>CRM/Financialacls</namespace>
+  </civix>
+</extension>
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index dc9967e4fec5..d9891d3e1c96 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1781,3 +1781,4 @@ VALUES
 -- do not try this at home folks.
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'sequentialcreditnotes', 'Sequential credit notes', 'Sequential credit notes', 'sequentialcreditnotes', 1);
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'eventcart', 'Event cart', 'Event cart', 'eventcart', 1);
+INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'financialacls', 'Financial ACLs', 'Financial ACLs', 'financialacls', 1);

From 58d1e21e44d0392974b0cf596d69e735c7fe9d2b Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 28 Aug 2020 09:59:22 +1000
Subject: [PATCH 036/834] [REF] Move Auto DSN Switching into a core function

---
 CRM/Admin/Form/Setting/UF.php                  |  3 ++-
 CRM/Core/BAO/SchemaHandler.php                 |  6 ++++--
 CRM/Core/DAO.php                               |  1 +
 CRM/Core/Lock.php                              |  3 ++-
 CRM/Logging/Differ.php                         |  3 ++-
 CRM/Logging/ReportDetail.php                   |  3 ++-
 CRM/Logging/Reverter.php                       |  3 ++-
 CRM/Logging/Schema.php                         |  6 ++++--
 CRM/Upgrade/Incremental/php/FourFive.php       |  3 ++-
 CRM/Utils/File.php                             |  1 +
 CRM/Utils/SQL.php                              | 18 ++++++++++++++++++
 CRM/Utils/System/Backdrop.php                  |  5 +++--
 CRM/Utils/System/Drupal.php                    |  5 +++--
 CRM/Utils/System/Drupal6.php                   |  5 +++--
 Civi/Test.php                                  |  3 ++-
 tests/phpunit/CiviTest/CiviUnitTestCase.php    |  3 ++-
 tests/phpunit/api/v3/SyntaxConformanceTest.php |  3 ++-
 17 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/CRM/Admin/Form/Setting/UF.php b/CRM/Admin/Form/Setting/UF.php
index 62c12870f974..208b2f3cf16a 100644
--- a/CRM/Admin/Form/Setting/UF.php
+++ b/CRM/Admin/Form/Setting/UF.php
@@ -61,7 +61,8 @@ public function buildQuickForm() {
         $config->dsn != $config->userFrameworkDSN || !empty($drupal_prefix)
       )
     ) {
-      $dsnArray = DB::parseDSN($config->dsn);
+      $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn);
+      $dsnArray = DB::parseDSN($dsn);
       $tableNames = CRM_Core_DAO::getTableNames();
       asort($tableNames);
       $tablePrefixes = '$databases[\'default\'][\'default\'][\'prefix\']= array(';
diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php
index 519b152cfd5b..a6c9845a224d 100644
--- a/CRM/Core/BAO/SchemaHandler.php
+++ b/CRM/Core/BAO/SchemaHandler.php
@@ -592,7 +592,8 @@ public static function checkIfFieldExists($tableName, $columnName, $i18nRewrite
    */
   public static function checkFKExists($table_name, $constraint_name) {
     $config = CRM_Core_Config::singleton();
-    $dbUf = DB::parseDSN($config->dsn);
+    $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn);
+    $dbUf = DB::parseDSN($dsn);
     $query = "
       SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
       WHERE TABLE_SCHEMA = %1
@@ -832,7 +833,8 @@ public static function migrateUtf8mb4($revert = FALSE, $patterns = ['civicrm\_%'
     // If we specified a list of databases assume the user knows what they are doing.
     // If they specify the database they should also specify the pattern.
     if (!$databaseList) {
-      $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
+      $dsn = defined('CIVICRM_LOGGING_DSN') ? CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN) : CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+      $dsn = DB::parseDSN($dsn);
       $logging_database = $dsn['database'];
       $dao = CRM_Core_DAO::executeQuery("SHOW TABLE STATUS FROM `{$logging_database}` WHERE Engine <> 'MyISAM' AND (" . implode(' OR ', $logTableNameLikePatterns) . ")");
       while ($dao->fetch()) {
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 2d3ce654cec8..4c33f8002ec3 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -161,6 +161,7 @@ public static function getTableName() {
   public static function init($dsn) {
     Civi::$statics[__CLASS__]['init'] = 1;
     $options = &PEAR::getStaticProperty('DB_DataObject', 'options');
+    $dsn = CRM_Utils_SQL::autoSwitchDSN($dsn);
     $options['database'] = $dsn;
     $options['quote_identifiers'] = TRUE;
     if (CRM_Utils_SQL::isSSLDSN($dsn)) {
diff --git a/CRM/Core/Lock.php b/CRM/Core/Lock.php
index da1366b4243a..894b913ab2d6 100644
--- a/CRM/Core/Lock.php
+++ b/CRM/Core/Lock.php
@@ -111,7 +111,8 @@ public static function createCivimailLock($name) {
    */
   public function __construct($name, $timeout = NULL, $serverWideLock = FALSE) {
     $config = CRM_Core_Config::singleton();
-    $dsnArray = DB::parseDSN($config->dsn);
+    $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn);
+    $dsnArray = DB::parseDSN($dsn);
     $database = $dsnArray['database'];
     $domainID = CRM_Core_Config::domainID();
     if ($serverWideLock) {
diff --git a/CRM/Logging/Differ.php b/CRM/Logging/Differ.php
index a124a4006956..863322bb2aae 100644
--- a/CRM/Logging/Differ.php
+++ b/CRM/Logging/Differ.php
@@ -28,7 +28,8 @@ class CRM_Logging_Differ {
    * @param string $interval
    */
   public function __construct($log_conn_id, $log_date, $interval = '10 SECOND') {
-    $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
+    $dsn = defined('CIVICRM_LOGGING_DSN') ? CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN) : CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+    $dsn = DB::parseDSN($dsn);
     $this->db = $dsn['database'];
     $this->log_conn_id = $log_conn_id;
     $this->log_date = $log_date;
diff --git a/CRM/Logging/ReportDetail.php b/CRM/Logging/ReportDetail.php
index d5822b183d51..fdbd92216a89 100644
--- a/CRM/Logging/ReportDetail.php
+++ b/CRM/Logging/ReportDetail.php
@@ -257,7 +257,8 @@ public function buildQuickForm() {
    * Store the dsn for the logging database in $this->db.
    */
   protected function storeDB() {
-    $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
+    $dsn = defined('CIVICRM_LOGGING_DSN') ? CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN) : CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+    $dsn = DB::parseDSN($dsn);
     $this->db = $dsn['database'];
   }
 
diff --git a/CRM/Logging/Reverter.php b/CRM/Logging/Reverter.php
index 72d729d03af6..eb1c9dedc16c 100644
--- a/CRM/Logging/Reverter.php
+++ b/CRM/Logging/Reverter.php
@@ -33,7 +33,8 @@ class CRM_Logging_Reverter {
    * @param $log_date
    */
   public function __construct($log_conn_id, $log_date) {
-    $dsn = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
+    $dsn = defined('CIVICRM_LOGGING_DSN') ? CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN) : CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+    $dsn = DB::parseDSN($dsn);
     $this->db = $dsn['database'];
     $this->log_conn_id = $log_conn_id;
     $this->log_date = $log_date;
diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index e9160bbdefe1..25b63413d254 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -158,11 +158,13 @@ public function __construct() {
     $nonStandardTableNameString = $this->getNonStandardTableNameFilterString();
 
     if (defined('CIVICRM_LOGGING_DSN')) {
-      $dsn = DB::parseDSN(CIVICRM_LOGGING_DSN);
+      $dsn = CRM_Utils_SQL::autoSwitchDSN(CIVICRM_LOGGING_DSN);
+      $dsn = DB::parseDSN($dsn);
       $this->useDBPrefix = (CIVICRM_LOGGING_DSN != CIVICRM_DSN);
     }
     else {
-      $dsn = DB::parseDSN(CIVICRM_DSN);
+      $dsn = CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+      $dsn = DB::parseDSN($dsn);
       $this->useDBPrefix = FALSE;
     }
     $this->db = $dsn['database'];
diff --git a/CRM/Upgrade/Incremental/php/FourFive.php b/CRM/Upgrade/Incremental/php/FourFive.php
index d905ea536b06..0f27a0be48ed 100644
--- a/CRM/Upgrade/Incremental/php/FourFive.php
+++ b/CRM/Upgrade/Incremental/php/FourFive.php
@@ -52,7 +52,8 @@ public function upgrade_4_5_alpha1($rev) {
     // if DB is been into upgrade for 3.4.2 version, it would have pdf_format_id name for FK
     // else FK_civicrm_msg_template_pdf_format_id
     $config = CRM_Core_Config::singleton();
-    $dbUf = DB::parseDSN($config->dsn);
+    $dsn = CRM_Utils_SQL::autoSwitchDSN($config->dsn);
+    $dbUf = DB::parseDSN($dsn);
     $query = "
 SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
 WHERE TABLE_NAME = 'civicrm_msg_template'
diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 67da4b10a665..c196b3dd7126 100644
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -325,6 +325,7 @@ public static function runSqlQuery($dsn, $queryString, $prefix = NULL, $dieOnErr
     }
     else {
       require_once 'DB.php';
+      $dsn = CRM_Utils_SQL::autoSwitchDSN($dsn);
       $db = DB::connect($dsn);
     }
 
diff --git a/CRM/Utils/SQL.php b/CRM/Utils/SQL.php
index 1cd1dc02b6e7..3b9167e6265f 100644
--- a/CRM/Utils/SQL.php
+++ b/CRM/Utils/SQL.php
@@ -185,4 +185,22 @@ public static function isSSLDSN(string $dsn):bool {
     return (bool) preg_match('/[\?&](key|cert|ca|capath|cipher|ssl)=/', $dsn);
   }
 
+  /**
+   * If DB_DSN_MODE is auto then we should replace mysql with mysqli if mysqli is available or the other way around as appropriate
+   * @param string $dsn
+   *
+   * @return string
+   */
+  public static function autoSwitchDSN($dsn) {
+    if (defined('DB_DSN_MODE') && DB_DSN_MODE === 'auto') {
+      if (extension_loaded('mysqli')) {
+        $dsn = preg_replace('/^mysql:/', 'mysqli:', $dsn);
+      }
+      else {
+        $dsn = preg_replace('/^mysqli:/', 'mysql:', $dsn);
+      }
+    }
+    return $dsn;
+  }
+
 }
diff --git a/CRM/Utils/System/Backdrop.php b/CRM/Utils/System/Backdrop.php
index d46e56146ce8..83b66078cd1c 100644
--- a/CRM/Utils/System/Backdrop.php
+++ b/CRM/Utils/System/Backdrop.php
@@ -291,9 +291,10 @@ protected function getUsersTableName() {
   public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realPath = NULL) {
     $config = CRM_Core_Config::singleton();
 
-    $dbBackdrop = DB::connect($config->userFrameworkDSN);
+    $ufDSN = CRM_Utils_SQL::autoSwitchDSN($config->userFrameworkDSN);
+    $dbBackdrop = DB::connect($ufDSN);
     if (DB::isError($dbBackdrop)) {
-      throw new CRM_Core_Exception("Cannot connect to Backdrop database via $config->userFrameworkDSN, " . $dbBackdrop->getMessage());
+      throw new CRM_Core_Exception("Cannot connect to Backdrop database via $ufDSN, " . $dbBackdrop->getMessage());
     }
 
     $account = $userUid = $userMail = NULL;
diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index bf4f8693cf5c..710e17835585 100644
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -317,9 +317,10 @@ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realP
 
     $config = CRM_Core_Config::singleton();
 
-    $dbDrupal = DB::connect($config->userFrameworkDSN);
+    $ufDSN = CRM_Utils_SQL::autoSwitchDSN($config->userFrameworkDSN);
+    $dbDrupal = DB::connect($ufDSN);
     if (DB::isError($dbDrupal)) {
-      throw new CRM_Core_Exception("Cannot connect to drupal db via $config->userFrameworkDSN, " . $dbDrupal->getMessage());
+      throw new CRM_Core_Exception("Cannot connect to drupal db via $ufDSN, " . $dbDrupal->getMessage());
     }
 
     $account = $userUid = $userMail = NULL;
diff --git a/CRM/Utils/System/Drupal6.php b/CRM/Utils/System/Drupal6.php
index 0ac291164ef0..343ec7fe74e3 100644
--- a/CRM/Utils/System/Drupal6.php
+++ b/CRM/Utils/System/Drupal6.php
@@ -300,9 +300,10 @@ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realP
 
     $config = CRM_Core_Config::singleton();
 
-    $dbDrupal = DB::connect($config->userFrameworkDSN);
+    $ufDSN = CRM_Utils_SQL::autoSwitchDSN($config->userFrameworkDSN);
+    $dbDrupal = DB::connect($ufDSN);
     if (DB::isError($dbDrupal)) {
-      throw new CRM_Core_Exception("Cannot connect to drupal db via $config->userFrameworkDSN, " . $dbDrupal->getMessage());
+      throw new CRM_Core_Exception("Cannot connect to drupal db via $ufDSN, " . $dbDrupal->getMessage());
     }
 
     $strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
diff --git a/Civi/Test.php b/Civi/Test.php
index 1d9db1207952..cf9c841ab798 100644
--- a/Civi/Test.php
+++ b/Civi/Test.php
@@ -59,7 +59,8 @@ public static function asPreInstall($callback) {
   public static function dsn($part = NULL) {
     if (!isset(self::$singletons['dsn'])) {
       require_once "DB.php";
-      self::$singletons['dsn'] = \DB::parseDSN(CIVICRM_DSN);
+      $dsn = \CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+      self::$singletons['dsn'] = \DB::parseDSN($dsn);
     }
 
     if ($part === NULL) {
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 7d05958487b2..8f4550ec4401 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -228,7 +228,8 @@ public static function getDBName() {
     static $dbName = NULL;
     if ($dbName === NULL) {
       require_once "DB.php";
-      $dsninfo = DB::parseDSN(CIVICRM_DSN);
+      $dsn = CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+      $dsninfo = DB::parseDSN($dsn);
       $dbName = $dsninfo['database'];
     }
     return $dbName;
diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 05819b0d2ff9..0f0e4003ac0c 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -578,7 +578,8 @@ public static function toBeSkipped_getSqlOperators() {
     // Re:^^^ => the failure was probably correct behavior, and test is now fixed, but yeah 5.5 is deprecated, and don't care enough to verify.
     // Test data providers should be able to run in pre-boot environment, so we connect directly to SQL server.
     require_once 'DB.php';
-    $db = DB::connect(CIVICRM_DSN);
+    $dsn = CRM_Utils_SQL::autoSwitchDSN(CIVICRM_DSN);
+    $db = DB::connect($dsn);
     if ($db->connection instanceof mysqli && $db->connection->server_version < 50600) {
       $entitiesWithout[] = 'Dedupe';
     }

From dd118b15122acb052f4edd1a5b104aaba20f154c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 28 Aug 2020 12:52:42 +1200
Subject: [PATCH 037/834] dev/core#1972 Fix tax_amount calclation on renewal
 form

---
 CRM/Financial/BAO/Order.php                   | 20 ++++++++++++++++---
 .../CRM/Member/Form/MembershipRenewalTest.php |  4 ++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CRM/Financial/BAO/Order.php b/CRM/Financial/BAO/Order.php
index 528cdcefb143..43fa9cd2d72a 100644
--- a/CRM/Financial/BAO/Order.php
+++ b/CRM/Financial/BAO/Order.php
@@ -236,18 +236,17 @@ protected function calculateLineItems(): array {
       $lineItems[$valueID] = CRM_Price_BAO_PriceSet::getLine($params, $throwAwayArray, $this->getPriceSetID(), $this->getPriceFieldSpec($fieldID), $fieldID, 0)[1][$valueID];
     }
 
-    $taxRates = CRM_Core_PseudoConstant::getTaxRates();
     foreach ($lineItems as &$lineItem) {
       // Set any pre-calculation to zero as we will calculate.
       $lineItem['tax_amount'] = 0;
       if ($this->getOverrideFinancialTypeID() !== FALSE) {
         $lineItem['financial_type_id'] = $this->getOverrideFinancialTypeID();
       }
-      $taxRate = $taxRates[$lineItem['financial_type_id']] ?? 0;
+      $taxRate = $this->getTaxRate((int) $lineItem['financial_type_id']);
       if ($this->getOverrideTotalAmount() !== FALSE) {
         if ($taxRate) {
           // Total is tax inclusive.
-          $lineItem['tax_amount'] = ($taxRate / 100) * $this->getOverrideTotalAmount();
+          $lineItem['tax_amount'] = ($taxRate / 100) * $this->getOverrideTotalAmount() / (1 + ($taxRate / 100));
           $lineItem['line_total'] = $lineItem['unit_price'] = $this->getOverrideTotalAmount() - $lineItem['tax_amount'];
         }
         else {
@@ -276,4 +275,19 @@ public function getTotalTaxAmount() :float {
     return $amount;
   }
 
+  /**
+   * Get the tax rate for the given financial type.
+   *
+   * @param int $financialTypeID
+   *
+   * @return float
+   */
+  public function getTaxRate(int $financialTypeID) {
+    $taxRates = CRM_Core_PseudoConstant::getTaxRates();
+    if (!isset($taxRates[$financialTypeID])) {
+      return 0;
+    }
+    return $taxRates[$financialTypeID];
+  }
+
 }
diff --git a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
index c990c6318f90..d70f497c2f1d 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
@@ -241,7 +241,7 @@ public function testSubmitWithTax() {
       ],
       'credit_card_type' => 'Visa',
       'billing_first_name' => 'Test',
-      'billing_middlename' => 'Last',
+      'billing_middle_name' => 'Last',
       'billing_street_address-5' => '10 Test St',
       'billing_city-5' => 'Test',
       'billing_state_province_id-5' => '1003',
@@ -250,7 +250,7 @@ public function testSubmitWithTax() {
     ]);
     $contribution = $this->callAPISuccessGetSingle('Contribution', ['contact_id' => $this->_individualId, 'is_test' => TRUE, 'return' => ['total_amount', 'tax_amount']]);
     $this->assertEquals(50, $contribution['total_amount']);
-    $this->assertEquals(5, $contribution['tax_amount']);
+    $this->assertEquals(4.55, $contribution['tax_amount']);
   }
 
   /**

From 7e59b8450ef51a53f5487e7bb967fb77c1c9d05e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 28 Aug 2020 14:06:57 +1200
Subject: [PATCH 038/834] dev/core#1974 Fix incorrect handling of serialize key
 when changing custom field type

See https://lab.civicrm.org/dev/core/-/issues/1974
---
 CRM/Custom/Form/ChangeFieldType.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php
index a47e75c4cdf7..24650919ae6c 100644
--- a/CRM/Custom/Form/ChangeFieldType.php
+++ b/CRM/Custom/Form/ChangeFieldType.php
@@ -146,13 +146,14 @@ public function postProcess() {
     $customField = new CRM_Core_DAO_CustomField();
     $customField->id = $this->_id;
     $customField->find(TRUE);
+    $customField->serialize = in_array($dstHtmlType, $mutliValueOps, TRUE);
 
     if ($dstHtmlType == 'Text' && in_array($srcHtmlType, [
       'Select',
       'Radio',
       'Autocomplete-Select',
     ])) {
-      $customField->option_group_id = "NULL";
+      $customField->option_group_id = 'NULL';
       CRM_Core_BAO_CustomField::checkOptionGroup($this->_values['option_group_id']);
     }
 
@@ -165,7 +166,7 @@ public function postProcess() {
       $this->firstValueToFlatten($tableName, $this->_values['column_name']);
     }
 
-    $customField->html_type = $dstHtmlType;
+    $customField->html_type = ($dstHtmlType === 'Multi-Select') ? 'Select' : $dstHtmlType;
     $customField->save();
 
     // Reset cache for custom fields

From 7b06299006eca9e130391362ef0e393a550aee34 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 28 Aug 2020 12:44:15 +1000
Subject: [PATCH 039/834] Fix regen and update civicrm_generated

---
 bin/regen.sh                | 2 +-
 sql/civicrm_generated.mysql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/regen.sh b/bin/regen.sh
index e7525399ebdc..6cf3eb54c643 100755
--- a/bin/regen.sh
+++ b/bin/regen.sh
@@ -47,7 +47,7 @@ php GenerateData.php
 
 ## Prune local data
 $MYSQLCMD -e "DROP TABLE IF EXISTS civicrm_install_canary; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
-$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'search', 'flexmailer', 'financialacls);"
+$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'search', 'flexmailer', 'financialacls');"
 TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs )
 
 cd $CIVISOURCEDIR/sql
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 111014800d61..cdb7b1a269d9 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -495,7 +495,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_extension` WRITE;
 /*!40000 ALTER TABLE `civicrm_extension` DISABLE KEYS */;
-INSERT INTO `civicrm_extension` (`id`, `type`, `full_name`, `name`, `label`, `file`, `schema_version`, `is_active`) VALUES (1,'module','sequentialcreditnotes','Sequential credit notes','Sequential credit notes','sequentialcreditnotes',NULL,1),(2,'module','eventcart','Event cart','Event cart','eventcart',NULL,1);
+INSERT INTO `civicrm_extension` (`id`, `type`, `full_name`, `name`, `label`, `file`, `schema_version`, `is_active`) VALUES (1,'module','sequentialcreditnotes','Sequential credit notes','Sequential credit notes','sequentialcreditnotes',NULL,1),(2,'module','eventcart','Event cart','Event cart','eventcart',NULL,1),(3,'module','financialacls','Financial ACLs','Financial ACLs','financialacls',NULL,1);
 /*!40000 ALTER TABLE `civicrm_extension` ENABLE KEYS */;
 UNLOCK TABLES;
 

From 2aaedeaae3b0b7b0c99d7ed04bcf83ae837a30b3 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Fri, 28 Aug 2020 09:38:52 +0530
Subject: [PATCH 040/834] added custom clause under whereClause and removed
 where function from bookkeeping, re-added receipt_date

---
 CRM/Report/Form.php                        |  4 +-
 CRM/Report/Form/Contribute/Bookkeeping.php | 64 +++++++---------------
 2 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index d202b845611e..aaf8bb15fd2f 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -5937,7 +5937,9 @@ protected function generateFilterClause($field, $fieldName) {
         $relative = $this->_params["{$fieldName}_relative"] ?? NULL;
         $from = $this->_params["{$fieldName}_from"] ?? NULL;
         $to = $this->_params["{$fieldName}_to"] ?? NULL;
-        return $this->dateClause($field['dbAlias'], $relative, $from, $to, $field['type']);
+        $fromTime = $this->_params["{$fieldName}_from_time"] ?? NULL;
+        $toTime = $this->_params["{$fieldName}_to_time"] ?? NULL;
+        return $this->dateClause($field['dbAlias'], $relative, $from, $to, $field['type'], $fromTime, $toTime);
       }
     }
     else {
diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php
index 70c7a4d857ce..06f89ab8c959 100644
--- a/CRM/Report/Form/Contribute/Bookkeeping.php
+++ b/CRM/Report/Form/Contribute/Bookkeeping.php
@@ -301,6 +301,7 @@ public function __construct() {
             'type' => CRM_Utils_Type::T_INT,
           ],
           'receive_date' => ['operatorType' => CRM_Report_Form::OP_DATETIME],
+          'receipt_date' => ['operatorType' => CRM_Report_Form::OP_DATETIME],
           'contribution_source' => [
             'title' => ts('Source'),
             'name' => 'source',
@@ -517,54 +518,31 @@ public function orderBy() {
     }
   }
 
-  public function where() {
-    foreach ($this->_columns as $tableName => $table) {
-      if (array_key_exists('filters', $table)) {
-        foreach ($table['filters'] as $fieldName => $field) {
-          $clause = NULL;
-          if (in_array($fieldName, [
-            'credit_accounting_code',
-            'credit_name',
-            'credit_contact_id',
-          ])) {
-            $field['dbAlias'] = "CASE
+  /**
+   * overriding to modify dbAlias for few fields.
+   *
+   * @param array $field Field specifications
+   * @param string $op Query operator (not an exact match to sql)
+   * @param mixed $value
+   * @param float $min
+   * @param float $max
+   *
+   * @return null|string
+   */
+  public function whereClause(&$field, $op, $value, $min, $max) {
+    if ($field['alias'] == 'financial_account_civireport_credit' &&
+      in_array($field['name'], ['accounting_code', 'id', 'contact_id'])
+    ) {
+      $field['dbAlias'] = "CASE
               WHEN financial_trxn_civireport.from_financial_account_id IS NOT NULL
               THEN  financial_account_civireport_credit_1.{$field['name']}
               ELSE  financial_account_civireport_credit_2.{$field['name']}
               END";
-          }
-          if (CRM_Utils_Array::value('type', $field) & CRM_Utils_Type::T_DATE) {
-            $relative = $this->_params["{$fieldName}_relative"] ?? NULL;
-            $from = $this->_params["{$fieldName}_from"] ?? NULL;
-            $to = $this->_params["{$fieldName}_to"] ?? NULL;
-            $fromTime = $this->_params["{$fieldName}_from_time"] ?? NULL;
-            $toTime = $this->_params["{$fieldName}_to_time"] ?? NULL;
-
-            $clause = $this->dateClause($field['name'], $relative, $from, $to, $field['type'], $fromTime, $toTime);
-          }
-          else {
-            $op = $this->_params["{$fieldName}_op"] ?? NULL;
-            if ($op) {
-              $clause = $this->whereClause($field,
-                $op,
-                CRM_Utils_Array::value("{$fieldName}_value", $this->_params),
-                CRM_Utils_Array::value("{$fieldName}_min", $this->_params),
-                CRM_Utils_Array::value("{$fieldName}_max", $this->_params)
-              );
-            }
-          }
-          if (!empty($clause)) {
-            $clauses[] = $clause;
-          }
-        }
-      }
-    }
-    if (empty($clauses)) {
-      $this->_where = 'WHERE ( 1 )';
-    }
-    else {
-      $this->_where = 'WHERE ' . implode(' AND ', $clauses);
     }
+
+    $clause = parent::whereClause($field, $op, $value, $min, $max);
+
+    return $clause;
   }
 
   public function postProcess() {

From 38019b927b0ee8ebfba11165e860146853c1161d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 28 Aug 2020 15:49:22 +1200
Subject: [PATCH 041/834] Add line item acl tests

---
 ext/financialacls/phpunit.xml.dist            |  18 +++
 .../tests/phpunit/LineItemTest.php            | 114 ++++++++++++++++++
 ext/financialacls/tests/phpunit/bootstrap.php |  63 ++++++++++
 3 files changed, 195 insertions(+)
 create mode 100644 ext/financialacls/phpunit.xml.dist
 create mode 100644 ext/financialacls/tests/phpunit/LineItemTest.php
 create mode 100644 ext/financialacls/tests/phpunit/bootstrap.php

diff --git a/ext/financialacls/phpunit.xml.dist b/ext/financialacls/phpunit.xml.dist
new file mode 100644
index 000000000000..fc8f870b723b
--- /dev/null
+++ b/ext/financialacls/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/phpunit/bootstrap.php">
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <directory>./tests/phpunit</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./</directory>
+    </whitelist>
+  </filter>
+  <listeners>
+    <listener class="Civi\Test\CiviTestListener">
+      <arguments/>
+    </listener>
+  </listeners>
+</phpunit>
diff --git a/ext/financialacls/tests/phpunit/LineItemTest.php b/ext/financialacls/tests/phpunit/LineItemTest.php
new file mode 100644
index 000000000000..71eb6380c4d0
--- /dev/null
+++ b/ext/financialacls/tests/phpunit/LineItemTest.php
@@ -0,0 +1,114 @@
+<?php
+
+use CRM_Financialacls_ExtensionUtil as E;
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+use Civi\Test\TransactionalInterface;
+use Civi\Api4\PriceField;
+
+/**
+ * FIXME - Add test description.
+ *
+ * Tips:
+ *  - With HookInterface, you may implement CiviCRM hooks directly in the test class.
+ *    Simply create corresponding functions (e.g. "hook_civicrm_post(...)" or similar).
+ *  - With TransactionalInterface, any data changes made by setUp() or test****() functions will
+ *    rollback automatically -- as long as you don't manipulate schema or truncate tables.
+ *    If this test needs to manipulate schema or truncate tables, then either:
+ *       a. Do all that using setupHeadless() and Civi\Test.
+ *       b. Disable TransactionalInterface, and handle all setup/teardown yourself.
+ *
+ * @group headless
+ */
+class LineItemTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
+
+  use Civi\Test\ContactTestTrait;
+  use Civi\Test\Api3TestTrait;
+
+  /**
+   * @return \Civi\Test\CiviEnvBuilder
+   * @throws \CRM_Extension_Exception_ParseException
+   */
+  public function setUpHeadless() {
+    // Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+    // See: https://docs.civicrm.org/dev/en/latest/testing/phpunit/#civitest
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->apply();
+  }
+
+  /**
+   * Test api applies permissions on line item actions (delete & get).
+   */
+  public function testLineItemApiPermissions() {
+    $contact1 = $this->individualCreate();
+    $defaultPriceFieldID = $this->getDefaultPriceFieldID();
+    $this->callAPISuccess('Order', 'create', [
+      'financial_type_id' => 'Donation',
+      'contact_id' => $contact1,
+      'line_items' => [
+        [
+          'line_item' => [
+            [
+              'financial_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'financial_type_id', 'Donation'),
+              'line_total' => 40,
+              'price_field_id' => $defaultPriceFieldID,
+              'qty' => 1,
+            ],
+            [
+              'financial_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'financial_type_id', 'Member Dues'),
+              'line_total' => 50,
+              'price_field_id' => $defaultPriceFieldID,
+              'qty' => 1,
+            ],
+          ],
+        ],
+      ],
+    ]);
+
+    $this->setPermissions([
+      'access CiviCRM',
+      'access CiviContribute',
+      'edit contributions',
+      'delete in CiviContribute',
+      'view contributions of type Donation',
+      'delete contributions of type Donation',
+    ]);
+    Civi::settings()->set('acl_financial_type', TRUE);
+    $this->createLoggedInUser();
+
+    $lineItems = $this->callAPISuccess('LineItem', 'get', ['sequential' => TRUE])['values'];
+    $this->assertCount(2, $lineItems);
+    $this->callAPISuccessGetCount('LineItem', ['check_permissions' => TRUE], 1);
+
+    $this->callAPISuccess('LineItem', 'Delete', ['check_permissions' => TRUE, 'id' => $lineItems[0]['id']]);
+    $this->callAPIFailure('LineItem', 'Delete', ['check_permissions' => TRUE, 'id' => $lineItems[1]['id']]);
+  }
+
+  /**
+   * Set ACL permissions, overwriting any existing ones.
+   *
+   * @param array $permissions
+   *   Array of permissions e.g ['access CiviCRM','access CiviContribute'],
+   */
+  protected function setPermissions($permissions) {
+    CRM_Core_Config::singleton()->userPermissionClass->permissions = $permissions;
+    if (isset(\Civi::$statics['CRM_Financial_BAO_FinancialType'])) {
+      unset(\Civi::$statics['CRM_Financial_BAO_FinancialType']);
+    }
+  }
+
+  /**
+   * @return mixed
+   * @throws \API_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  protected function getDefaultPriceFieldID(): int {
+    return PriceField::get()
+      ->addWhere('price_set_id:name', '=', 'default_contribution_amount')
+      ->addWhere('name', '=', 'contribution_amount')
+      ->addWhere('html_type', '=', 'Text')
+      ->addSelect('id')->execute()->first()['id'];
+  }
+
+}
diff --git a/ext/financialacls/tests/phpunit/bootstrap.php b/ext/financialacls/tests/phpunit/bootstrap.php
new file mode 100644
index 000000000000..a5b49253c819
--- /dev/null
+++ b/ext/financialacls/tests/phpunit/bootstrap.php
@@ -0,0 +1,63 @@
+<?php
+
+ini_set('memory_limit', '2G');
+ini_set('safe_mode', 0);
+// phpcs:disable
+eval(cv('php:boot --level=classloader', 'phpcode'));
+// phpcs:enable
+// Allow autoloading of PHPUnit helper classes in this extension.
+$loader = new \Composer\Autoload\ClassLoader();
+$loader->add('CRM_', __DIR__);
+$loader->add('Civi\\', __DIR__);
+$loader->add('api_', __DIR__);
+$loader->add('api\\', __DIR__);
+$loader->register();
+
+/**
+ * Call the "cv" command.
+ *
+ * @param string $cmd
+ *   The rest of the command to send.
+ * @param string $decode
+ *   Ex: 'json' or 'phpcode'.
+ * @return string
+ *   Response output (if the command executed normally).
+ * @throws \RuntimeException
+ *   If the command terminates abnormally.
+ */
+function cv($cmd, $decode = 'json') {
+  $cmd = 'cv ' . $cmd;
+  $descriptorSpec = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => STDERR);
+  $oldOutput = getenv('CV_OUTPUT');
+  putenv("CV_OUTPUT=json");
+
+  // Execute `cv` in the original folder. This is a work-around for
+  // phpunit/codeception, which seem to manipulate PWD.
+  $cmd = sprintf('cd %s; %s', escapeshellarg(getenv('PWD')), $cmd);
+
+  $process = proc_open($cmd, $descriptorSpec, $pipes, __DIR__);
+  putenv("CV_OUTPUT=$oldOutput");
+  fclose($pipes[0]);
+  $result = stream_get_contents($pipes[1]);
+  fclose($pipes[1]);
+  if (proc_close($process) !== 0) {
+    throw new RuntimeException("Command failed ($cmd):\n$result");
+  }
+  switch ($decode) {
+    case 'raw':
+      return $result;
+
+    case 'phpcode':
+      // If the last output is /*PHPCODE*/, then we managed to complete execution.
+      if (substr(trim($result), 0, 12) !== "/*BEGINPHP*/" || substr(trim($result), -10) !== "/*ENDPHP*/") {
+        throw new \RuntimeException("Command failed ($cmd):\n$result");
+      }
+      return $result;
+
+    case 'json':
+      return json_decode($result, 1);
+
+    default:
+      throw new RuntimeException("Bad decoder format ($decode)");
+  }
+}

From caa0781633b1d5969dad176d0682b8e735589690 Mon Sep 17 00:00:00 2001
From: yashodha <yashodha@cividesk.com>
Date: Fri, 28 Aug 2020 17:13:56 +0530
Subject: [PATCH 042/834] remove dropped tables for activity target and
 assignment

---
 xml/schema/Activity/ActivityAssignment.xml | 62 ----------------------
 xml/schema/Activity/ActivityTarget.xml     | 61 ---------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 xml/schema/Activity/ActivityAssignment.xml
 delete mode 100644 xml/schema/Activity/ActivityTarget.xml

diff --git a/xml/schema/Activity/ActivityAssignment.xml b/xml/schema/Activity/ActivityAssignment.xml
deleted file mode 100644
index 192af7dc8aa7..000000000000
--- a/xml/schema/Activity/ActivityAssignment.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<table>
-  <base>CRM/Activity</base>
-  <class>ActivityAssignment</class>
-  <name>civicrm_activity_assignment</name>
-  <comment>Activity assignments</comment>
-  <add>1.8</add>
-  <log>true</log>
-  <field>
-    <name>id</name>
-    <type>int unsigned</type>
-    <title>Activity Assignment ID</title>
-    <required>true</required>
-    <comment>Activity assignment id</comment>
-    <add>1.8</add>
-  </field>
-  <primaryKey>
-    <name>id</name>
-    <autoincrement>true</autoincrement>
-  </primaryKey>
-  <field>
-    <name>activity_id</name>
-    <type>int unsigned</type>
-    <title>Activity ID</title>
-    <required>true</required>
-    <comment>Foreign key to the activity for this assignment.</comment>
-    <add>2.0</add>
-  </field>
-  <foreignKey>
-    <name>activity_id</name>
-    <table>civicrm_activity</table>
-    <key>id</key>
-    <add>2.0</add>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
-
-  <field>
-    <name>assignee_contact_id</name>
-    <type>int unsigned</type>
-    <title>Assignee Contact ID</title>
-    <required>true</required>
-    <comment>Foreign key to the contact for this assignment.</comment>
-    <add>2.0</add>
-  </field>
-  <foreignKey>
-    <name>assignee_contact_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>2.0</add>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
-
-  <index>
-    <name>UI_activity_assignee_contact_id</name>
-    <fieldName>assignee_contact_id</fieldName>
-    <fieldName>activity_id</fieldName>
-    <unique>true</unique>
-    <add>2.0</add>
-  </index>
-
-
-</table>
diff --git a/xml/schema/Activity/ActivityTarget.xml b/xml/schema/Activity/ActivityTarget.xml
deleted file mode 100644
index 6b5cba7867d1..000000000000
--- a/xml/schema/Activity/ActivityTarget.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<table>
-  <base>CRM/Activity</base>
-  <class>ActivityTarget</class>
-  <name>civicrm_activity_target</name>
-  <comment>Activity targets</comment>
-  <add>2.0</add>
-  <log>true</log>
-  <field>
-    <name>id</name>
-    <type>int unsigned</type>
-    <title>Activity Target ID</title>
-    <required>true</required>
-    <comment>Activity target id</comment>
-    <add>2.0</add>
-  </field>
-  <primaryKey>
-    <name>id</name>
-    <autoincrement>true</autoincrement>
-  </primaryKey>
-   <field>
-    <name>activity_id</name>
-    <type>int unsigned</type>
-    <title>Activity ID</title>
-    <required>true</required>
-    <comment>Foreign key to the activity for this target.</comment>
-    <add>2.0</add>
-   </field>
-   <foreignKey>
-    <name>activity_id</name>
-    <table>civicrm_activity</table>
-    <key>id</key>
-    <add>2.0</add>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
-
-   <field>
-    <name>target_contact_id</name>
-    <title>Contact ID (match to contact)</title>
-    <import>true</import>
-    <type>int unsigned</type>
-    <required>true</required>
-    <comment>Foreign key to the contact for this target.</comment>
-    <add>2.0</add>
-   </field>
-   <foreignKey>
-    <name>target_contact_id</name>
-    <table>civicrm_contact</table>
-    <key>id</key>
-    <add>2.0</add>
-    <onDelete>CASCADE</onDelete>
-  </foreignKey>
-
-  <index>
-       <name>UI_activity_target_contact_id</name>
-       <fieldName>target_contact_id</fieldName>
-       <fieldName>activity_id</fieldName>
-       <unique>true</unique>
-       <add>2.0</add>
-  </index>
-</table>

From e7afe635e1779db6038e9bcb4ba6806f2bca2554 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Fri, 28 Aug 2020 19:59:56 +0530
Subject: [PATCH 043/834] report#48 View Payment owned by Different contact on
 Membership and Participant View

---
 CRM/Contribute/Form/Search.php | 8 +++++---
 CRM/Event/Page/Tab.php         | 2 +-
 CRM/Member/Page/Tab.php        | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index 4f1009b41a07..341c54c868d4 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -386,12 +386,14 @@ public function fixFormValues() {
 
     $cid = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
 
-    if ($cid) {
+    // skip cid (contact id of membership/participant record) to get associated payments for membership/participant record,
+    // contribution record may be on different contact id.
+    $skip_cid = CRM_Utils_Request::retrieve('skip_cid', 'Boolean', $this, FALSE, FALSE);
+
+    if ($cid && !$skip_cid) {
       $cid = CRM_Utils_Type::escape($cid, 'Integer');
       if ($cid > 0) {
         $this->_formValues['contact_id'] = $cid;
-        // @todo - why do we retrieve these when they are not used?
-        list($display, $image) = CRM_Contact_BAO_Contact::getDisplayAndImage($cid);
         $this->_defaults['sort_name'] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $cid,
           'sort_name'
         );
diff --git a/CRM/Event/Page/Tab.php b/CRM/Event/Page/Tab.php
index ab29c9ce3577..0ecd0f80631e 100644
--- a/CRM/Event/Page/Tab.php
+++ b/CRM/Event/Page/Tab.php
@@ -287,7 +287,7 @@ public function associatedContribution() {
       );
       $controller->setEmbedded(TRUE);
       $controller->set('force', 1);
-      $controller->set('cid', $this->_contactId);
+      $controller->set('skip_cid', TRUE);
       $controller->set('participantId', $this->_id);
       $controller->set('context', 'contribution');
       $controller->process();
diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php
index ec2300d0ba5d..123f1ce953c4 100644
--- a/CRM/Member/Page/Tab.php
+++ b/CRM/Member/Page/Tab.php
@@ -590,7 +590,7 @@ public static function associatedContribution($contactId = NULL, $membershipId =
     $controller->setEmbedded(TRUE);
     $controller->reset();
     $controller->set('force', 1);
-    $controller->set('cid', $contactId);
+    $controller->set('skip_cid', TRUE);
     $controller->set('memberId', $membershipId);
     $controller->set('context', 'contribution');
     $controller->process();

From 36cf2d7eecbc466b5725e7de164397a012107af2 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Fri, 28 Aug 2020 15:45:59 +0100
Subject: [PATCH 044/834] Use !empty() instead of isset() in constructor so
 that empty strings don't confuse the logic Update array syntax in comments
 Add test for class.api.php

---
 api/class.api.php                     | 24 +++++++-------
 tests/phpunit/api/v3/ClassAPITest.php | 48 +++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 tests/phpunit/api/v3/ClassAPITest.php

diff --git a/api/class.api.php b/api/class.api.php
index 4ba61dd30bde..df6ef1283f4c 100644
--- a/api/class.api.php
+++ b/api/class.api.php
@@ -14,15 +14,15 @@
  * ```
  *   require_once('/your/civi/folder/api/class.api.php');
  *   // the path to civicrm.settings.php
- *   $api = new civicrm_api3 (array('conf_path'=> '/your/path/to/your/civicrm/or/joomla/site));
+ *   $api = new civicrm_api3 (['conf_path'=> '/your/path/to/your/civicrm/or/joomla/site']);
  * ```
  *
  * or to query a remote server via the rest api
  *
  * ```
- *   $api = new civicrm_api3 (array ('server' => 'http://example.org',
- *                                   'api_key'=>'theusersecretkey',
- *                                   'key'=>'thesitesecretkey'));
+ *   $api = new civicrm_api3 (['server' => 'http://example.org',
+ *                             'api_key'=>'theusersecretkey',
+ *                             'key'=>'thesitesecretkey']);
  * ```
  *
  * No matter how initialised and if civicrm is local or remote, you use the class the same way.
@@ -34,7 +34,7 @@
  * So, to get the individual contacts:
  *
  * ```
- *   if ($api->Contact->Get(array('contact_type'=>'Individual','return'=>'sort_name,current_employer')) {
+ *   if ($api->Contact->Get(['contact_type'=>'Individual','return'=>'sort_name,current_employer']) {
  *     // each key of the result array is an attribute of the api
  *     echo "\n contacts found " . $api->count;
  *     foreach ($api->values as $c) {
@@ -49,7 +49,7 @@
  * Or, to create an event:
  *
  * ```
- *   if ($api->Event->Create(array('title'=>'Test','event_type_id' => 1,'is_public' => 1,'start_date' => 19430429))) {
+ *   if ($api->Event->Create(['title'=>'Test','event_type_id' => 1,'is_public' => 1,'start_date' => 19430429])) {
  *     echo "created event id:". $api->id;
  *   } else {
  *     echo $api->errorMsg();
@@ -62,7 +62,7 @@
  *
  * ```
  *   $api->Activity->Get (42);
- *   $api->Activity->Get (array('id'=>42));
+ *   $api->Activity->Get (['id'=>42]);
  * ```
  *
  *
@@ -87,23 +87,23 @@ public function __construct($config = NULL) {
     $this->local      = TRUE;
     $this->input      = [];
     $this->lastResult = [];
-    if (isset($config) && isset($config['server'])) {
+    if (!empty($config) && !empty($config['server'])) {
       // we are calling a remote server via REST
       $this->local = FALSE;
       $this->uri = $config['server'];
-      if (isset($config['path'])) {
+      if (!empty($config['path'])) {
         $this->uri .= "/" . $config['path'];
       }
       else {
         $this->uri .= '/sites/all/modules/civicrm/extern/rest.php';
       }
-      if (isset($config['key'])) {
+      if (!empty($config['key'])) {
         $this->key = $config['key'];
       }
       else {
         die("\nFATAL:param['key] missing\n");
       }
-      if (isset($config['api_key'])) {
+      if (!empty($config['api_key'])) {
         $this->api_key = $config['api_key'];
       }
       else {
@@ -111,7 +111,7 @@ public function __construct($config = NULL) {
       }
       return;
     }
-    if (isset($config) && isset($config['conf_path'])) {
+    if (!empty($config) && !empty($config['conf_path'])) {
       if (!defined('CIVICRM_SETTINGS_PATH')) {
         define('CIVICRM_SETTINGS_PATH', $config['conf_path'] . '/civicrm.settings.php');
       }
diff --git a/tests/phpunit/api/v3/ClassAPITest.php b/tests/phpunit/api/v3/ClassAPITest.php
new file mode 100644
index 000000000000..0bd35bb7661d
--- /dev/null
+++ b/tests/phpunit/api/v3/ClassAPITest.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Test class for class.api.php
+ *
+ * @package CiviCRM_APIv3
+ * @group headless
+ */
+class class_api_test extends CiviUnitTestCase {
+
+  /**
+   * Test that error doesn't occur for non-existent file.
+   */
+  public function testConstructor() {
+    require_once 'api/class.api.php';
+
+    // Check no params is local
+    $api = new civicrm_api3();
+    $this->assertEquals(TRUE, $api->local);
+
+    // Be sure to include keys otherwise these calls die()
+    $keys = ['key' => 'my_site_key', 'api_key' => 'my_api_key'];
+
+    // Check empty server string is local
+    $api = new civicrm_api3(['server' => ''] + $keys);
+    $this->assertEquals(TRUE, $api->local);
+
+    // Check non-empty server string is remote, check default uri
+    $api = new civicrm_api3(['server' => 'http://my_server'] + $keys);
+    $this->assertEquals(FALSE, $api->local);
+    $this->assertEquals('http://my_server/sites/all/modules/civicrm/extern/rest.php', $api->uri);
+
+    // Check path in uri
+    $api = new civicrm_api3(['server' => 'http://my_server', 'path' => 'wibble'] + $keys);
+    $this->assertEquals('http://my_server/wibble', $api->uri);
+
+  }
+
+}

From 9d2afe25e2566c1fede83ba9e61fd74f49cd86dc Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 28 Aug 2020 13:07:08 -0400
Subject: [PATCH 045/834] APIv4 - Move list of accepted query operators to
 CoreUtil

---
 CRM/Api4/Page/Api4Explorer.php            | 3 ++-
 CRM/Core/DAO.php                          | 2 +-
 Civi/Api4/Generic/AbstractQueryAction.php | 6 ++++--
 Civi/Api4/Generic/DAOGetAction.php        | 3 ++-
 Civi/Api4/Query/Api4SelectQuery.php       | 2 +-
 Civi/Api4/Utils/CoreUtil.php              | 7 +++++++
 ext/search/CRM/Search/Page/Ang.php        | 2 +-
 7 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CRM/Api4/Page/Api4Explorer.php b/CRM/Api4/Page/Api4Explorer.php
index 3daba0733836..6de079bb8f15 100644
--- a/CRM/Api4/Page/Api4Explorer.php
+++ b/CRM/Api4/Page/Api4Explorer.php
@@ -11,6 +11,7 @@
  */
 
 use Civi\Api4\Service\Schema\Joinable\Joinable;
+use Civi\Api4\Utils\CoreUtil;
 
 /**
  *
@@ -30,7 +31,7 @@ public function run() {
       });
     }
     $vars = [
-      'operators' => \CRM_Core_DAO::acceptedSQLOperators(),
+      'operators' => CoreUtil::getOperators(),
       'basePath' => Civi::resources()->getUrl('civicrm'),
       'schema' => (array) \Civi\Api4\Entity::get()->setChain(['fields' => ['$name', 'getFields']])->execute(),
       'links' => $entityLinks,
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 4c33f8002ec3..d62fba1401e7 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -2830,7 +2830,7 @@ public static function createSQLFilter($fieldName, $filter, $type = NULL, $alias
   /**
    * @see http://issues.civicrm.org/jira/browse/CRM-9150
    * support for other syntaxes is discussed in ticket but being put off for now
-   * @return array
+   * @return string[]
    */
   public static function acceptedSQLOperators() {
     return [
diff --git a/Civi/Api4/Generic/AbstractQueryAction.php b/Civi/Api4/Generic/AbstractQueryAction.php
index ed7ac9bf374d..85ebcfb5edd5 100644
--- a/Civi/Api4/Generic/AbstractQueryAction.php
+++ b/Civi/Api4/Generic/AbstractQueryAction.php
@@ -19,6 +19,8 @@
 
 namespace Civi\Api4\Generic;
 
+use Civi\Api4\Utils\CoreUtil;
+
 /**
  * Base class for all actions that need to fetch records (`Get`, `Update`, `Delete`, etc.).
  *
@@ -86,7 +88,7 @@ abstract class AbstractQueryAction extends AbstractAction {
    * @throws \API_Exception
    */
   public function addWhere(string $fieldName, string $op, $value = NULL) {
-    if (!in_array($op, \CRM_Core_DAO::acceptedSQLOperators())) {
+    if (!in_array($op, CoreUtil::getOperators())) {
       throw new \API_Exception('Unsupported operator');
     }
     $this->where[] = [$fieldName, $op, $value];
@@ -145,7 +147,7 @@ protected function whereClauseToString($whereClause = NULL, $op = 'AND') {
       }
       return $output . '(' . $this->whereClauseToString($whereClause, $op) . ')';
     }
-    elseif (isset($whereClause[1]) && in_array($whereClause[1], \CRM_Core_DAO::acceptedSQLOperators())) {
+    elseif (isset($whereClause[1]) && in_array($whereClause[1], CoreUtil::getOperators())) {
       $output = $whereClause[0] . ' ' . $whereClause[1] . ' ';
       if (isset($whereClause[2])) {
         $output .= is_array($whereClause[2]) ? '[' . implode(', ', $whereClause[2]) . ']' : $whereClause[2];
diff --git a/Civi/Api4/Generic/DAOGetAction.php b/Civi/Api4/Generic/DAOGetAction.php
index d6a3f10eea2a..852a333ccff0 100644
--- a/Civi/Api4/Generic/DAOGetAction.php
+++ b/Civi/Api4/Generic/DAOGetAction.php
@@ -20,6 +20,7 @@
 namespace Civi\Api4\Generic;
 
 use Civi\Api4\Query\Api4SelectQuery;
+use Civi\Api4\Utils\CoreUtil;
 
 /**
  * Retrieve $ENTITIES based on criteria specified in the `where` parameter.
@@ -154,7 +155,7 @@ public function addGroupBy(string $field) {
    * @throws \API_Exception
    */
   public function addHaving(string $expr, string $op, $value = NULL) {
-    if (!in_array($op, \CRM_Core_DAO::acceptedSQLOperators())) {
+    if (!in_array($op, CoreUtil::getOperators())) {
       throw new \API_Exception('Unsupported operator');
     }
     $this->having[] = [$expr, $op, $value];
diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php
index 5721e919688e..6198b93603c2 100644
--- a/Civi/Api4/Query/Api4SelectQuery.php
+++ b/Civi/Api4/Query/Api4SelectQuery.php
@@ -362,7 +362,7 @@ protected function treeWalkClauses($clause, $type) {
   protected function composeClause(array $clause, string $type) {
     // Pad array for unary operators
     list($expr, $operator, $value) = array_pad($clause, 3, NULL);
-    if (!in_array($operator, \CRM_Core_DAO::acceptedSQLOperators(), TRUE)) {
+    if (!in_array($operator, CoreUtil::getOperators(), TRUE)) {
       throw new \API_Exception('Illegal operator');
     }
 
diff --git a/Civi/Api4/Utils/CoreUtil.php b/Civi/Api4/Utils/CoreUtil.php
index 8d06ce96789b..9bc7ec9b6a42 100644
--- a/Civi/Api4/Utils/CoreUtil.php
+++ b/Civi/Api4/Utils/CoreUtil.php
@@ -71,4 +71,11 @@ public static function getApiNameFromTableName($tableName) {
     return $entityName;
   }
 
+  /**
+   * @return string[]
+   */
+  public static function getOperators() {
+    return \CRM_Core_DAO::acceptedSQLOperators();
+  }
+
 }
diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index 069dc0ee973f..936f92edd619 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -32,7 +32,7 @@ public function run() {
 
     // Add client-side vars for the search UI
     $vars = [
-      'operators' => \CRM_Core_DAO::acceptedSQLOperators(),
+      'operators' => \Civi\Api4\Utils\CoreUtil::getOperators(),
       'schema' => $this->schema,
       'links' => $this->getLinks(),
       'loadOptions' => $this->loadOptions,

From b82fb202e3d9e75563e45e22df7429fbf6793eae Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 28 Aug 2020 16:08:56 +1200
Subject: [PATCH 046/834] Move (now tested) delete acl check from v3 api to pre
 delete hook

---
 api/v3/LineItem.php                 | 11 ++---------
 ext/financialacls/financialacls.php | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/api/v3/LineItem.php b/api/v3/LineItem.php
index a5e5f34ff37d..f5b47a5e86f9 100644
--- a/api/v3/LineItem.php
+++ b/api/v3/LineItem.php
@@ -75,18 +75,11 @@ function civicrm_api3_line_item_get($params) {
  *
  * @param array $params
  *   Array containing id of the group to be deleted.
+ *
  * @return array API result array
  * @throws API_Exception
+ * @throws \CiviCRM_API3_Exception
  */
 function civicrm_api3_line_item_delete($params) {
-  if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus() && !empty($params['check_permissions'])) {
-    CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, CRM_Core_Action::DELETE);
-    if (empty($params['financial_type_id'])) {
-      $params['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_LineItem', $params['id'], 'financial_type_id');
-    }
-    if (!in_array($params['financial_type_id'], array_keys($types))) {
-      throw new API_Exception('You do not have permission to delete this line item');
-    }
-  }
   return _civicrm_api3_basic_delete(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
diff --git a/ext/financialacls/financialacls.php b/ext/financialacls/financialacls.php
index e6c39a0ab068..dda05b28f659 100644
--- a/ext/financialacls/financialacls.php
+++ b/ext/financialacls/financialacls.php
@@ -143,6 +143,31 @@ function financialacls_civicrm_themes(&$themes) {
   _financialacls_civix_civicrm_themes($themes);
 }
 
+/**
+ * Intervene to prevent deletion, where permissions block it.
+ *
+ * @param \CRM_Core_DAO $op
+ * @param string $objectName
+ * @param int|null $id
+ * @param array $params
+ *
+ * @throws \API_Exception
+ * @throws \CRM_Core_Exception
+ */
+function financialacls_civicrm_pre($op, $objectName, $id, &$params) {
+  if ($objectName === 'LineItem' && $op === 'delete' && !empty($params['check_permissions'])) {
+    if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
+      CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, CRM_Core_Action::DELETE);
+      if (empty($params['financial_type_id'])) {
+        $params['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_LineItem', $params['id'], 'financial_type_id');
+      }
+      if (!in_array($params['financial_type_id'], array_keys($types))) {
+        throw new API_Exception('You do not have permission to delete this line item');
+      }
+    }
+  }
+}
+
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**

From 39deabd60329563c9808673f3c30d25883960f2e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 28 Aug 2020 20:56:16 -0400
Subject: [PATCH 047/834] APIv4 - Add CONTAINS operator and add to search
 extension

---
 .../Generic/Traits/ArrayQueryActionTrait.php  |  9 ++++
 Civi/Api4/Query/Api4SelectQuery.php           | 34 ++++++++++++---
 Civi/Api4/Utils/CoreUtil.php                  |  4 +-
 ext/search/ang/search/crmSearch.component.js  |  3 ++
 .../ang/search/crmSearchValue.directive.js    |  2 +-
 .../api/v4/Action/BasicActionsTest.php        | 43 +++++++++++++++++++
 .../api/v4/Action/PseudoconstantTest.php      | 26 +++++++++++
 7 files changed, 114 insertions(+), 7 deletions(-)

diff --git a/Civi/Api4/Generic/Traits/ArrayQueryActionTrait.php b/Civi/Api4/Generic/Traits/ArrayQueryActionTrait.php
index 4ae6096c5039..fd515b9a4b71 100644
--- a/Civi/Api4/Generic/Traits/ArrayQueryActionTrait.php
+++ b/Civi/Api4/Generic/Traits/ArrayQueryActionTrait.php
@@ -158,6 +158,15 @@ private function filterCompare($row, $condition) {
       case 'NOT IN':
         return !in_array($value, $expected);
 
+      case 'CONTAINS':
+        if (is_array($value)) {
+          return in_array($expected, $value);
+        }
+        elseif (is_string($value) || is_numeric($value)) {
+          return strpos((string) $value, (string) $expected) !== FALSE;
+        }
+        return $value == $expected;
+
       default:
         throw new NotImplementedException("Unsupported operator: '$operator' cannot be used with array data");
     }
diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php
index 6198b93603c2..e4f8ceb187fc 100644
--- a/Civi/Api4/Query/Api4SelectQuery.php
+++ b/Civi/Api4/Query/Api4SelectQuery.php
@@ -26,8 +26,8 @@
  * Leaf operators are one of:
  *
  * * '=', '<=', '>=', '>', '<', 'LIKE', "<>", "!=",
- * * "NOT LIKE", 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN',
- * * 'IS NOT NULL', or 'IS NULL'.
+ * * 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN',
+ * * 'IS NOT NULL', or 'IS NULL', 'CONTAINS'.
  */
 class Api4SelectQuery {
 
@@ -379,7 +379,8 @@ protected function composeClause(array $clause, string $type) {
         $fieldAlias = $expr;
         // Attempt to format if this is a real field
         if (isset($this->apiFieldSpec[$expr])) {
-          FormattingUtil::formatInputValue($value, $expr, $this->apiFieldSpec[$expr]);
+          $field = $this->getField($expr);
+          FormattingUtil::formatInputValue($value, $expr, $field);
         }
       }
       // Expr references a non-field expression like a function; convert to alias
@@ -392,7 +393,8 @@ protected function composeClause(array $clause, string $type) {
         foreach ($this->selectAliases as $selectAlias => $selectExpr) {
           list($selectField) = explode(':', $selectAlias);
           if ($selectAlias === $selectExpr && $fieldName === $selectField && isset($this->apiFieldSpec[$fieldName])) {
-            FormattingUtil::formatInputValue($value, $expr, $this->apiFieldSpec[$fieldName]);
+            $field = $this->getField($fieldName);
+            FormattingUtil::formatInputValue($value, $expr, $field);
             $fieldAlias = $selectAlias;
             break;
           }
@@ -415,7 +417,29 @@ protected function composeClause(array $clause, string $type) {
         return sprintf('%s %s %s', $fieldAlias, $operator, $valExpr->render($this->apiFieldSpec));
       }
       elseif ($fieldName) {
-        FormattingUtil::formatInputValue($value, $fieldName, $this->apiFieldSpec[$fieldName]);
+        $field = $this->getField($fieldName);
+        FormattingUtil::formatInputValue($value, $fieldName, $field);
+      }
+    }
+
+    if ($operator === 'CONTAINS') {
+      switch ($field['serialize'] ?? NULL) {
+        case \CRM_Core_DAO::SERIALIZE_JSON:
+          $operator = 'LIKE';
+          $value = '%"' . $value . '"%';
+          // FIXME: Use this instead of the above hack once MIN_INSTALL_MYSQL_VER is bumped to 5.7.
+          // return sprintf('JSON_SEARCH(%s, "one", "%s") IS NOT NULL', $fieldAlias, \CRM_Core_DAO::escapeString($value));
+          break;
+
+        case \CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND:
+          $operator = 'LIKE';
+          $value = '%' . \CRM_Core_DAO::VALUE_SEPARATOR . $value . \CRM_Core_DAO::VALUE_SEPARATOR . '%';
+          break;
+
+        default:
+          $operator = 'LIKE';
+          $value = '%' . $value . '%';
+          break;
       }
     }
 
diff --git a/Civi/Api4/Utils/CoreUtil.php b/Civi/Api4/Utils/CoreUtil.php
index 9bc7ec9b6a42..b9090c97dec2 100644
--- a/Civi/Api4/Utils/CoreUtil.php
+++ b/Civi/Api4/Utils/CoreUtil.php
@@ -75,7 +75,9 @@ public static function getApiNameFromTableName($tableName) {
    * @return string[]
    */
   public static function getOperators() {
-    return \CRM_Core_DAO::acceptedSQLOperators();
+    $operators = \CRM_Core_DAO::acceptedSQLOperators();
+    $operators[] = 'CONTAINS';
+    return $operators;
   }
 
 }
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index e2d8c564d15e..51f2532bc49a 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -340,6 +340,9 @@
         else if (type === 'Money') {
           return CRM.formatMoney(value);
         }
+        if (_.isArray(value)) {
+          return value.join(', ');
+        }
         return value;
       }
 
diff --git a/ext/search/ang/search/crmSearchValue.directive.js b/ext/search/ang/search/crmSearchValue.directive.js
index 0fb160088402..ad93d2b8788c 100644
--- a/ext/search/ang/search/crmSearchValue.directive.js
+++ b/ext/search/ang/search/crmSearchValue.directive.js
@@ -39,7 +39,7 @@
             if (_.includes(['=', '!=', '<>', '>', '>=', '<', '<='], op)) {
               $el.crmDatepicker({time: (field.input_attrs && field.input_attrs.time) || false});
             }
-          } else if (_.includes(['=', '!=', '<>', 'IN', 'NOT IN'], op) && (field.fk_entity || field.options || dataType === 'Boolean')) {
+          } else if (_.includes(['=', '!=', '<>', 'IN', 'NOT IN', 'CONTAINS'], op) && (field.fk_entity || field.options || dataType === 'Boolean')) {
             if (field.options) {
               if (field.options === true) {
                 $el.addClass('loading');
diff --git a/tests/phpunit/api/v4/Action/BasicActionsTest.php b/tests/phpunit/api/v4/Action/BasicActionsTest.php
index 99d704a18f99..8df90eb87782 100644
--- a/tests/phpunit/api/v4/Action/BasicActionsTest.php
+++ b/tests/phpunit/api/v4/Action/BasicActionsTest.php
@@ -255,6 +255,49 @@ public function testWildcardSelect() {
     $this->assertEquals(['shape', 'size', 'weight'], array_keys($result));
   }
 
+  public function testContainsOperator() {
+    MockBasicEntity::delete()->addWhere('id', '>', 0)->execute();
+
+    $records = [
+      ['group' => 'one', 'fruit:name' => ['apple', 'pear'], 'weight' => 11],
+      ['group' => 'two', 'fruit:name' => ['pear', 'banana'], 'weight' => 12],
+    ];
+    MockBasicEntity::save()->setRecords($records)->execute();
+
+    $result = MockBasicEntity::get()
+      ->addWhere('fruit:name', 'CONTAINS', 'apple')
+      ->execute();
+    $this->assertCount(1, $result);
+    $this->assertEquals('one', $result->first()['group']);
+
+    $result = MockBasicEntity::get()
+      ->addWhere('fruit:name', 'CONTAINS', 'pear')
+      ->execute();
+    $this->assertCount(2, $result);
+
+    $result = MockBasicEntity::get()
+      ->addWhere('group', 'CONTAINS', 'o')
+      ->execute();
+    $this->assertCount(2, $result);
+
+    $result = MockBasicEntity::get()
+      ->addWhere('weight', 'CONTAINS', 1)
+      ->execute();
+    $this->assertCount(2, $result);
+
+    $result = MockBasicEntity::get()
+      ->addWhere('fruit:label', 'CONTAINS', 'Banana')
+      ->execute();
+    $this->assertCount(1, $result);
+    $this->assertEquals('two', $result->first()['group']);
+
+    $result = MockBasicEntity::get()
+      ->addWhere('weight', 'CONTAINS', 2)
+      ->execute();
+    $this->assertCount(1, $result);
+    $this->assertEquals('two', $result->first()['group']);
+  }
+
   public function testPseudoconstantMatch() {
     MockBasicEntity::delete()->addWhere('id', '>', 0)->execute();
 
diff --git a/tests/phpunit/api/v4/Action/PseudoconstantTest.php b/tests/phpunit/api/v4/Action/PseudoconstantTest.php
index 9f7e363941de..248073ab8d42 100644
--- a/tests/phpunit/api/v4/Action/PseudoconstantTest.php
+++ b/tests/phpunit/api/v4/Action/PseudoconstantTest.php
@@ -27,6 +27,7 @@
 use Civi\Api4\Email;
 use Civi\Api4\EntityTag;
 use Civi\Api4\OptionValue;
+use Civi\Api4\Participant;
 use Civi\Api4\Tag;
 
 /**
@@ -273,4 +274,29 @@ public function testTagOptions() {
     $this->assertEquals($tag, $options[$tag]['label']);
   }
 
+  public function testParticipantRole() {
+    $event = $this->createEntity(['type' => 'Event']);
+    $contact = $this->createEntity(['type' => 'Individual']);
+    $participant = Participant::create()
+      ->addValue('contact_id', $contact['id'])
+      ->addValue('event_id', $event['id'])
+      ->addValue('role_id:label', ['Attendee', 'Volunteer'])
+      ->execute()->first();
+
+    $search1 = Participant::get()
+      ->addSelect('role_id', 'role_id:label')
+      ->addWhere('role_id:label', 'CONTAINS', 'Volunteer')
+      ->addOrderBy('id')
+      ->execute()->last();
+
+    $this->assertEquals(['Attendee', 'Volunteer'], $search1['role_id:label']);
+    $this->assertEquals(['1', '2'], $search1['role_id']);
+
+    $search2 = Participant::get()
+      ->addWhere('role_id:label', 'CONTAINS', 'Host')
+      ->execute()->indexBy('id');
+
+    $this->assertArrayNotHasKey($participant['id'], (array) $search2);
+  }
+
 }

From c8025280ade6c1dd6d6f78380c992d3621311a31 Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Sat, 29 Aug 2020 08:22:30 +0530
Subject: [PATCH 048/834] user-interface#30 Ability to Send Invoice with
 modified subject and CC

---
 CRM/Contribute/Form/Task/Invoice.php           | 11 +++++++++++
 CRM/Core/BAO/MessageTemplate.php               |  5 +++++
 templates/CRM/Contribute/Form/Task/Invoice.tpl | 12 ++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index b2087a647462..419cf483eb05 100644
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -143,6 +143,9 @@ public function buildQuickForm() {
       $this->addRule('from_email_address', ts('From Email Address is required'), 'required');
     }
 
+    $attributes = ['class' => 'huge'];
+    $this->add('text', 'cc_id', ts('CC'), $attributes);
+    $this->add('text', 'subject', ts('Subject'), $attributes + ['placeholder' => ts('Optional')]);
     $this->add('wysiwyg', 'email_comment', ts('If you would like to add personal message to email please add it here. (If sending to more then one receipient the same message will be sent to each contact.)'), [
       'rows' => 2,
       'cols' => 40,
@@ -413,6 +416,14 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
 
       // from email address
       $fromEmailAddress = $params['from_email_address'] ?? NULL;
+      if (!empty($params['cc_id'])) {
+        $values['cc_receipt'] = $params['cc_id'];
+      }
+
+      // get subject from UI
+      if (!empty($params['subject'])) {
+        $sendTemplateParams['subject'] = $values['subject'] = $params['subject'];
+      }
 
       // condition to check for download PDF Invoice or email Invoice
       if ($invoiceElements['createPdf']) {
diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php
index 4dedb8c66e7d..bc683a8ec047 100644
--- a/CRM/Core/BAO/MessageTemplate.php
+++ b/CRM/Core/BAO/MessageTemplate.php
@@ -464,6 +464,11 @@ public static function sendTemplate($params) {
       $mailContent['html'] = preg_replace('/<body(.*)$/im', "<body\\1\n{$testDao->html}", $mailContent['html']);
     }
 
+    // Overwrite subject from form field
+    if (!empty($params['subject'])) {
+      $mailContent['subject'] = $params['subject'];
+    }
+
     // replace tokens in the three elements (in subject as if it was the text body)
     $domain = CRM_Core_BAO_Domain::getDomain();
     $hookTokens = [];
diff --git a/templates/CRM/Contribute/Form/Task/Invoice.tpl b/templates/CRM/Contribute/Form/Task/Invoice.tpl
index 9f3dde88890e..777354f29f06 100644
--- a/templates/CRM/Contribute/Form/Task/Invoice.tpl
+++ b/templates/CRM/Contribute/Form/Task/Invoice.tpl
@@ -28,6 +28,18 @@
     <td class="label">{$form.from_email_address.label}</td>
     <td>{$form.from_email_address.html} {help id="id-from_email" file="CRM/Contact/Form/Task/Email.hlp" isAdmin=$isAdmin}</td>
   </tr>
+  <tr class="crm-email-element crm-contactEmail-form-block-cc_id">
+    <td class="label">{$form.cc_id.label}</td>
+    <td>
+        {$form.cc_id.html}
+    </td>
+  </tr>
+  <tr class="crm-email-element crm-contactEmail-form-block-subject">
+    <td class="label">{$form.subject.label}</td>
+    <td>
+        {$form.subject.html}
+    </td>
+  </tr>
   <tr class="crm-email-element">
     <td class="label">{$form.email_comment.label}</td>
     <td>{$form.email_comment.html}</td>

From 5d4c1098fef46f9515c1f583974b69071cacf465 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 28 Aug 2020 17:18:00 +1200
Subject: [PATCH 049/834] Fix test set up to call Order.create to create the
 correct line items

This test is not creating valid line items - so when we expect them to be correct - they aren't
---
 tests/phpunit/api/v3/ContributionTest.php | 49 +++++++++++++----------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index bf24317b8868..7b2f64bf7b24 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -179,7 +179,7 @@ public function testGetContribution() {
     $contribution2 = $this->callAPISuccess('contribution', 'create', $p);
 
     // Now we have 2 - test getcount.
-    $contribution = $this->callAPISuccess('contribution', 'getcount', []);
+    $contribution = $this->callAPISuccess('contribution', 'getcount');
     $this->assertEquals(2, $contribution);
     // Test id only format.
     $contribution = $this->callAPISuccess('contribution', 'get', [
@@ -3562,17 +3562,12 @@ public function cleanUpAfterPriceSets() {
    *
    * @param int $priceFieldValueID
    * @param array $contriParams
+   *
+   * @throws \CRM_Core_Exception
    */
   public function setUpPendingContribution($priceFieldValueID, $contriParams = []) {
     $contactID = $this->individualCreate();
-    $membership = $this->callAPISuccess('membership', 'create', [
-      'contact_id' => $contactID,
-      'membership_type_id' => $this->_ids['membership_type'],
-      'start_date' => 'yesterday - 1 year',
-      'end_date' => 'yesterday',
-      'join_date' => 'yesterday - 1 year',
-    ]);
-    $contribution = $this->callAPISuccess('contribution', 'create', array_merge([
+    $contribution = $this->callAPISuccess('Order', 'create', array_merge([
       'domain_id' => 1,
       'contact_id' => $contactID,
       'receive_date' => date('Ymd'),
@@ -3585,23 +3580,33 @@ public function setUpPendingContribution($priceFieldValueID, $contriParams = [])
       'source' => 'SSF',
       'contribution_status_id' => 2,
       'contribution_page_id' => $this->_ids['contribution_page'],
-      'api.membership_payment.create' => ['membership_id' => $membership['id']],
+      'line_items' => [
+        [
+          'line_item' => [
+            [
+              'price_field_id' => $this->_ids['price_field'][0],
+              'qty' => 1,
+              'entity_table' => 'civicrm_membership',
+              'unit_price' => 20,
+              'line_total' => 20,
+              'financial_type_id' => 1,
+              'price_field_value_id' => $priceFieldValueID,
+            ],
+          ],
+          'params' => [
+            'contact_id' => $contactID,
+            'membership_type_id' => $this->_ids['membership_type'],
+            'start_date' => 'yesterday - 1 year',
+            'end_date' => 'yesterday',
+            'join_date' => 'yesterday - 1 year',
+          ],
+        ],
+      ],
     ], $contriParams));
 
-    $this->callAPISuccess('line_item', 'create', [
-      'entity_id' => $contribution['id'],
-      'entity_table' => 'civicrm_contribution',
-      'contribution_id' => $contribution['id'],
-      'price_field_id' => $this->_ids['price_field'][0],
-      'qty' => 1,
-      'unit_price' => 20,
-      'line_total' => 20,
-      'financial_type_id' => 1,
-      'price_field_value_id' => $priceFieldValueID,
-    ]);
     $this->_ids['contact'] = $contactID;
     $this->_ids['contribution'] = $contribution['id'];
-    $this->_ids['membership'] = $membership['id'];
+    $this->_ids['membership'] = $this->callAPISuccessGetValue('MembershipPayment', ['return' => 'membership_id', 'contribution_id' => $contribution['id']]);
   }
 
   /**

From 7156e4b0e8ca27491dce7784b55c0dc39a4f1d25 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 29 Aug 2020 19:19:06 -0400
Subject: [PATCH 050/834] Search ext - Show translated labels for operators

---
 ext/search/CRM/Search/Page/Ang.php            | 25 ++++++++++++++++++-
 ext/search/ang/search/crmSearchClause.html    |  2 +-
 .../ang/search/crmSearchValue.directive.js    |  4 +--
 ext/search/css/search.css                     |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index 936f92edd619..b6a03e2bbf76 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -32,7 +32,7 @@ public function run() {
 
     // Add client-side vars for the search UI
     $vars = [
-      'operators' => \Civi\Api4\Utils\CoreUtil::getOperators(),
+      'operators' => CRM_Utils_Array::makeNonAssociative($this->getOperators()),
       'schema' => $this->schema,
       'links' => $this->getLinks(),
       'loadOptions' => $this->loadOptions,
@@ -55,6 +55,29 @@ public function run() {
     parent::run();
   }
 
+  /**
+   * @return string[]
+   */
+  private function getOperators() {
+    return [
+      '=' => '=',
+      '!=' => '≠',
+      '>' => '>',
+      '<' => '<',
+      '>=' => '≥',
+      '<=' => '≤',
+      'CONTAINS' => ts('Contains'),
+      'IN' => ts('Is In'),
+      'NOT IN' => ts('Not In'),
+      'LIKE' => ts('Is Like'),
+      'NOT LIKE' => ts('Not Like'),
+      'BETWEEN' => ts('Is Between'),
+      'NOT BETWEEN' => ts('Not Between'),
+      'IS NULL' => ts('Is Null'),
+      'IS NOT NULL' => ts('Not Null'),
+    ];
+  }
+
   /**
    * Populates $this->schema & $this->allowedEntities
    */
diff --git a/ext/search/ang/search/crmSearchClause.html b/ext/search/ang/search/crmSearchClause.html
index 1a0567f9cf76..97ef49621fad 100644
--- a/ext/search/ang/search/crmSearchClause.html
+++ b/ext/search/ang/search/crmSearchClause.html
@@ -16,7 +16,7 @@
       </div>
       <div ng-if="!$ctrl.conjunctions[clause[0]]" class="api4-input-group">
         <input class="form-control" ng-model="clause[0]" crm-ui-select="{data: data.fields, allowClear: true, placeholder: 'Field'}" />
-        <select class="form-control api4-operator" ng-model="clause[1]" ng-options="o for o in $ctrl.operators" ></select>
+        <select class="form-control api4-operator" ng-model="clause[1]" ng-options="o.key as o.value for o in $ctrl.operators" ></select>
         <input class="form-control" ng-model="clause[2]" crm-search-value="{field: clause[0], op: clause[1], format: data.format}" />
       </div>
       <fieldset class="clearfix" ng-if="$ctrl.conjunctions[clause[0]]" crm-search-clause="{format: data.format, clauses: clause[1], op: clause[0], fields: data.fields, groupParent: data.clauses, groupIndex: index}">
diff --git a/ext/search/ang/search/crmSearchValue.directive.js b/ext/search/ang/search/crmSearchValue.directive.js
index ad93d2b8788c..9e39cf1585b5 100644
--- a/ext/search/ang/search/crmSearchValue.directive.js
+++ b/ext/search/ang/search/crmSearchValue.directive.js
@@ -36,10 +36,10 @@
             return;
           }
           if (inputType === 'Date') {
-            if (_.includes(['=', '!=', '<>', '>', '>=', '<', '<='], op)) {
+            if (_.includes(['=', '!=', '>', '>=', '<', '<='], op)) {
               $el.crmDatepicker({time: (field.input_attrs && field.input_attrs.time) || false});
             }
-          } else if (_.includes(['=', '!=', '<>', 'IN', 'NOT IN', 'CONTAINS'], op) && (field.fk_entity || field.options || dataType === 'Boolean')) {
+          } else if (_.includes(['=', '!=', 'IN', 'NOT IN', 'CONTAINS'], op) && (field.fk_entity || field.options || dataType === 'Boolean')) {
             if (field.options) {
               if (field.options === true) {
                 $el.addClass('loading');
diff --git a/ext/search/css/search.css b/ext/search/css/search.css
index 70b329b56324..554f1f724b6e 100644
--- a/ext/search/css/search.css
+++ b/ext/search/css/search.css
@@ -133,7 +133,7 @@
 }
 
 #bootstrap-theme.crm-search .api4-operator {
-  width: 90px;
+  width: 110px;
 }
 
 #bootstrap-theme.crm-search .api4-add-where-group-menu {

From a54cf42b6d32866d1a13219079d4748c9f5317b0 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Thu, 27 Aug 2020 22:00:09 -0400
Subject: [PATCH 051/834] allow negative self-service hours

event #34 message improvement

fixes to message template

fixes
---
 CRM/Event/BAO/Event.php                                |  2 ++
 CRM/Event/BAO/Participant.php                          |  8 ++++++--
 CRM/Upgrade/Incremental/MessageTemplates.php           | 10 ++++++++++
 CRM/Upgrade/Incremental/sql/5.30.alpha1.mysql.tpl      |  3 +++
 templates/CRM/Event/Form/ManageEvent/Registration.hlp  |  2 +-
 tests/phpunit/CRM/Event/BAO/ParticipantTest.php        |  9 +++++++++
 xml/schema/Event/Event.xml                             |  2 +-
 .../message_templates/event_online_receipt_html.tpl    |  2 +-
 .../message_templates/event_online_receipt_text.tpl    |  2 +-
 .../message_templates/participant_confirm_html.tpl     |  2 +-
 .../message_templates/participant_confirm_text.tpl     |  2 +-
 11 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index 794e5d14e5a4..b583fdd09926 100644
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -1158,6 +1158,8 @@ public static function sendMail($contactID, $values, $participantId, $isTest = F
           'conference_sessions' => $sessions,
           'credit_card_number' => CRM_Utils_System::mungeCreditCard(CRM_Utils_Array::value('credit_card_number', $participantParams)),
           'credit_card_exp_date' => CRM_Utils_Date::mysqlToIso(CRM_Utils_Date::format(CRM_Utils_Array::value('credit_card_exp_date', $participantParams))),
+          'selfcancelxfer_time' => abs($values['event']['selfcancelxfer_time']),
+          'selfservice_preposition' => $values['event']['selfcancelxfer_time'] < 0 ? 'after' : 'before',
         ]);
 
         // CRM-13890 : NOTE wait list condition need to be given so that
diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
index 1f19c32f74b4..f18198b20961 100644
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -1877,7 +1877,6 @@ public static function formatFieldsAndSetProfileDefaults($contactId, &$form) {
    * Evaluate whether a participant record is eligible for self-service transfer/cancellation.  If so,
    * return additional participant/event details.
    *
-   * TODO: This function fails when the "hours until self-service" is less than zero.
    * @param int $participantId
    * @param string $url
    * @param bool $isBackOffice
@@ -1930,7 +1929,12 @@ public static function getSelfServiceEligibility(int $participantId, string $url
       $cancelDeadline = (new Datetime($start_date))->sub($cancelInterval);
       if ($timenow > $cancelDeadline) {
         $details['eligible'] = FALSE;
-        $details['ineligible_message'] = ts("Registration for this event cannot be cancelled or transferred less than %1 hours prior to the event's start time. Contact the event organizer if you have questions.", [1 => $time_limit]);
+        // Change the language of the status message based on whether the waitlist time limit is positive or negative.
+        $afterOrPrior = $time_limit < 0 ? 'after' : 'prior';
+        $moreOrLess = $time_limit < 0 ? 'more' : 'less';
+        $details['ineligible_message'] = ts("Registration for this event cannot be cancelled or transferred %1 than %2 hours %3 to the event's start time. Contact the event organizer if you have questions.",
+        [1 => $moreOrLess, 2 => $cancelHours, 3 => $afterOrPrior]);
+
       }
     }
     return $details;
diff --git a/CRM/Upgrade/Incremental/MessageTemplates.php b/CRM/Upgrade/Incremental/MessageTemplates.php
index 0b86bc6a6dce..94f932a96e50 100644
--- a/CRM/Upgrade/Incremental/MessageTemplates.php
+++ b/CRM/Upgrade/Incremental/MessageTemplates.php
@@ -215,6 +215,16 @@ protected function getTemplateUpdates() {
           ['name' => 'contribution_invoice_receipt', 'type' => 'html'],
         ],
       ],
+      [
+        'version' => '5.30.alpha1',
+        'upgrade_descriptor' => ts('Support negative hours for cancellation/transfer'),
+        'templates' => [
+          ['name' => 'participant_confirm', 'type' => 'html'],
+          ['name' => 'participant_confirm', 'type' => 'text'],
+          ['name' => 'event_online_receipt', 'type' => 'html'],
+          ['name' => 'event_online_receipt', 'type' => 'text'],
+        ],
+      ],
 
     ];
   }
diff --git a/CRM/Upgrade/Incremental/sql/5.30.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.30.alpha1.mysql.tpl
index 4f70e19a59d0..3b0804b3c3fc 100644
--- a/CRM/Upgrade/Incremental/sql/5.30.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.30.alpha1.mysql.tpl
@@ -1 +1,4 @@
 {* file to handle db changes in 5.30.alpha1 during upgrade *}
+-- Allow self-service/transfer to have a negative time.
+ALTER TABLE civicrm_event MODIFY COLUMN selfcancelxfer_time INT;
+
diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.hlp b/templates/CRM/Event/Form/ManageEvent/Registration.hlp
index 2aa4f62db7de..8fba9c56a980 100644
--- a/templates/CRM/Event/Form/ManageEvent/Registration.hlp
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.hlp
@@ -89,5 +89,5 @@
   {ts}Cancellation or Transfer Time Limit{/ts}
 {/htxt}
 {htxt id="id-selfcancelxfer_time"}
-  {ts}Number of hours prior to event start date to allow self-service cancellation or transfer. Enter 0 (or leave empty) to allow cancellation or transfer up until the event has started.{/ts}
+  {ts}Number of hours prior to event start date to allow self-service cancellation or transfer. Enter a negative number of hours to allow cancellation after the event starts. Enter 0 (or leave empty) to allow cancellation or transfer up until the event has started.{/ts}
 {/htxt}
diff --git a/tests/phpunit/CRM/Event/BAO/ParticipantTest.php b/tests/phpunit/CRM/Event/BAO/ParticipantTest.php
index eb8dc5700842..4dc15134dc0a 100644
--- a/tests/phpunit/CRM/Event/BAO/ParticipantTest.php
+++ b/tests/phpunit/CRM/Event/BAO/ParticipantTest.php
@@ -493,6 +493,15 @@ public function selfServiceScenarios() {
       'isBackOffice' => FALSE,
       'successExpected' => FALSE,
     ];
+    // Cancellation deadline is < 0 hours
+    $scenarios[] = [
+      'selfSvcEnabled' => 1,
+      'selfSvcHours' => -12,
+      'hoursToEvent' => 4,
+      'participantStatusId' => 1,
+      'isBackOffice' => FALSE,
+      'successExpected' => TRUE,
+    ];
     return $scenarios;
   }
 
diff --git a/xml/schema/Event/Event.xml b/xml/schema/Event/Event.xml
index 4593c92d4e56..979a84df4de4 100644
--- a/xml/schema/Event/Event.xml
+++ b/xml/schema/Event/Event.xml
@@ -659,7 +659,7 @@
   </field>
   <field>
     <name>selfcancelxfer_time</name>
-    <type>int unsigned</type>
+    <type>int</type>
     <default>0</default>
     <title>Self-service Cancellation or Transfer Time</title>
     <comment>Number of hours prior to event start date to allow self-service cancellation or transfer.</comment>
diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl
index c9e080625675..b9fdec15b443 100644
--- a/xml/templates/message_templates/event_online_receipt_html.tpl
+++ b/xml/templates/message_templates/event_online_receipt_html.tpl
@@ -497,7 +497,7 @@
     {if $event.allow_selfcancelxfer }
      <tr>
       <td colspan="2" {$valueStyle}>
-        {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />
+        {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />
         {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
         <a href="{$selfService}">{ts}Click here to transfer or cancel your registration.{/ts}</a>
       </td>
diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl
index dbd5f1ba8803..05be6dff34a7 100644
--- a/xml/templates/message_templates/event_online_receipt_text.tpl
+++ b/xml/templates/message_templates/event_online_receipt_text.tpl
@@ -291,7 +291,7 @@ You were registered by: {$payer.name}
 {/if}
 
 {if $event.allow_selfcancelxfer }
-{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
+{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
    {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
 {ts}Transfer or cancel your registration:{/ts} {$selfService}
 {/if}
diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl
index ed1d2b7b0db9..c4075a04bbb6 100644
--- a/xml/templates/message_templates/participant_confirm_html.tpl
+++ b/xml/templates/message_templates/participant_confirm_html.tpl
@@ -165,7 +165,7 @@
   {if $event.allow_selfcancelxfer }
    <tr>
      <td colspan="2" {$valueStyle}>
-       {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />
+       {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />
          {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
        <a href="{$selfService}">{ts}Click here to transfer or cancel your registration.{/ts}</a>
      </td>
diff --git a/xml/templates/message_templates/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl
index 6296b4594d76..2c459e66e29f 100644
--- a/xml/templates/message_templates/participant_confirm_text.tpl
+++ b/xml/templates/message_templates/participant_confirm_text.tpl
@@ -13,7 +13,7 @@ Click this link to go to a web page where you can confirm your registration onli
 {$confirmUrl}
 {/if}
 {if $event.allow_selfcancelxfer }
-{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
+{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
    {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}"  h=0 a=1 fe=1}{/capture}
 {ts}Transfer or cancel your registration:{/ts} {$selfService}
 {/if}

From d5851cf27fba01ba700f8804996979188586f6cb Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Sun, 30 Aug 2020 16:58:32 -0400
Subject: [PATCH 052/834] add serialize data to actionschedule

---
 CRM/Core/DAO/ActionSchedule.php    | 5 ++++-
 xml/schema/Core/ActionSchedule.xml | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php
index 2762cb3f8885..666f773ba859 100644
--- a/CRM/Core/DAO/ActionSchedule.php
+++ b/CRM/Core/DAO/ActionSchedule.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionSchedule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:caf8b2cabbe06570dcf6cb93144004d2)
+ * (GenCodeChecksum:d05639de89f460efbb3474dcaf5acd27)
  */
 
 /**
@@ -409,6 +409,7 @@ public static function &fields() {
           'entity' => 'ActionSchedule',
           'bao' => 'CRM_Core_BAO_ActionSchedule',
           'localizable' => 0,
+          'serialize' => self::SERIALIZE_SEPARATOR_TRIMMED,
           'add' => '3.4',
         ],
         'entity_status' => [
@@ -423,6 +424,7 @@ public static function &fields() {
           'entity' => 'ActionSchedule',
           'bao' => 'CRM_Core_BAO_ActionSchedule',
           'localizable' => 0,
+          'serialize' => self::SERIALIZE_SEPARATOR_TRIMMED,
           'add' => '3.4',
         ],
         'start_action_offset' => [
@@ -617,6 +619,7 @@ public static function &fields() {
           'entity' => 'ActionSchedule',
           'bao' => 'CRM_Core_BAO_ActionSchedule',
           'localizable' => 0,
+          'serialize' => self::SERIALIZE_COMMA,
           'add' => '3.4',
         ],
         'recipient_listing' => [
diff --git a/xml/schema/Core/ActionSchedule.xml b/xml/schema/Core/ActionSchedule.xml
index 4c7d78c219bf..536f174cfbc6 100644
--- a/xml/schema/Core/ActionSchedule.xml
+++ b/xml/schema/Core/ActionSchedule.xml
@@ -51,6 +51,7 @@
     <type>varchar</type>
     <length>255</length>
     <comment>Entity value</comment>
+    <serialize>SEPARATOR_TRIMMED</serialize>
     <add>3.4</add>
   </field>
   <field>
@@ -58,6 +59,7 @@
     <type>varchar</type>
     <length>64</length>
     <comment>Entity status</comment>
+    <serialize>SEPARATOR_TRIMMED</serialize>
     <add>3.4</add>
   </field>
   <field>
@@ -169,6 +171,7 @@
     <type>varchar</type>
     <length>128</length>
     <comment>Contact IDs to which reminder should be sent.</comment>
+    <serialize>COMMA</serialize>
     <add>3.4</add>
   </field>
   <field>

From dbb17d48689b6033d365d1b9297456a3e0668ab1 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 11:21:51 +1200
Subject: [PATCH 053/834] Slight increase in test cover & make functions more
 re-usable

Just preliminary to increasing cover in another test class
---
 .../CRM/Core/Payment/AuthorizeNetTrait.php    | 28 +++++++++++++++++++
 .../CRM/Financial/Form/PaymentFormsTest.php   |  8 ++----
 tests/phpunit/CiviTest/CiviUnitTestCase.php   |  2 +-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/CRM/Core/Payment/AuthorizeNetTrait.php b/tests/phpunit/CRM/Core/Payment/AuthorizeNetTrait.php
index 87ff897d413d..38871fa041a5 100644
--- a/tests/phpunit/CRM/Core/Payment/AuthorizeNetTrait.php
+++ b/tests/phpunit/CRM/Core/Payment/AuthorizeNetTrait.php
@@ -72,4 +72,32 @@ public function getExpectedRecurResponse() {
     return '<?xml version="1.0" encoding="utf-8"?><ARBCreateSubscriptionResponse xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"><refId>8d468ca1b1dd5c2b56c7</refId><messages><resultCode>Ok</resultCode><message><code>I00001</code><text>Successful.</text></message></messages><subscriptionId>6632052</subscriptionId><profile><customerProfileId>1512023280</customerProfileId><customerPaymentProfileId>1512027350</customerPaymentProfileId></profile></ARBCreateSubscriptionResponse>';
   }
 
+  /**
+   * Create an AuthorizeNet processors with a configured mock handler.
+   *
+   * @throws \CiviCRM_API3_Exception
+   */
+  protected function createAuthorizeNetProcessor() {
+    $processorID = $this->paymentProcessorAuthorizeNetCreate(['is_test' => FALSE]);
+    $this->setupMockHandler($processorID);
+    $this->ids['PaymentProcessor']['anet'] = $processorID;
+  }
+
+  /**
+   * Assert the request sent to Authorize.net contains the expected values.
+   *
+   * @param array $expected
+   */
+  protected function assertRequestValid($expected = []) {
+    $expected = array_merge([
+      'x_card_num' => '4111111111111111',
+      'x_card_code' => 123,
+    ], $expected);
+    $request = explode('&', $this->getRequestBodies()[0]);
+    // This is stand in for now just to check a request happened. We can improve later.
+    foreach ($expected as $key => $value) {
+      $this->assertContains($key . '=' . $value, $request);
+    }
+  }
+
 }
diff --git a/tests/phpunit/CRM/Financial/Form/PaymentFormsTest.php b/tests/phpunit/CRM/Financial/Form/PaymentFormsTest.php
index 29b271cadbb3..f012856aa8fc 100644
--- a/tests/phpunit/CRM/Financial/Form/PaymentFormsTest.php
+++ b/tests/phpunit/CRM/Financial/Form/PaymentFormsTest.php
@@ -38,8 +38,8 @@ class CRM_Financial_Form_PaymentFormsTest extends CiviUnitTestCase {
    * @throws \CiviCRM_API3_Exception
    */
   public function testEventPaymentForms() {
-    $processors = [$this->paymentProcessorAuthorizeNetCreate(['is_test' => FALSE])];
-    $this->setupMockHandler($processors[0]);
+    $this->createAuthorizeNetProcessor();
+    $processors = [$this->ids['PaymentProcessor']['anet']];
     $eventID = $this->eventCreatePaid([
       'end_date' => '+ 1 month',
       'registration_end_date' => '+ 1 month',
@@ -93,9 +93,7 @@ public function testEventPaymentForms() {
         $qfKey = $form->controller->_key;
       }
       $this->callAPISuccessGetSingle('Participant', ['participant_status_id' => 'Registered']);
-      $request = explode('&', $this->getRequestBodies()[0]);
-      // This is stand in for now just to check a request happened. We can improve later.
-      $this->assertContains('x_card_num=4111111111111111', $request);
+      $this->assertRequestValid(['x_city' => 'The+Shire', 'x_state' => 'IL', 'x_amount' => 1.0]);
     }
   }
 
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 8f4550ec4401..229650a46bc4 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -749,7 +749,7 @@ public function paymentProcessorAuthorizeNetCreate($params = []) {
     ], $params);
 
     $result = $this->callAPISuccess('PaymentProcessor', 'create', $params);
-    return $result['id'];
+    return (int) $result['id'];
   }
 
   /**

From 67dd58e4152f6f04e458872cf1fb20f19832098c Mon Sep 17 00:00:00 2001
From: KarinG <karin@semper-it.com>
Date: Sun, 30 Aug 2020 19:01:41 -0600
Subject: [PATCH 054/834] extend_testSubmitContributionPageWithPriceSetQuantity

---
 tests/phpunit/api/v3/ContributionPageTest.php | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index 25eb05e65f4d..689694a72a46 100644
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -1957,6 +1957,7 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
       'label' => 'Printing Rights',
       'html_type' => 'Text',
     ]);
+
     $this->callAPISuccess('price_field_value', 'create', [
       'price_set_id' => $priceSetID,
       'price_field_id' => $priceField['id'],
@@ -1969,10 +1970,28 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
     // Set quantity for our test
     $submitParams['price_' . $priceFieldId] = 180;
 
+    $priceField = $this->callAPISuccess('price_field', 'create', [
+      'price_set_id' => $priceSetID,
+      'label' => 'Another Line Item',
+      'html_type' => 'Text',
+    ]);
+
+    $this->callAPISuccess('price_field_value', 'create', [
+      'price_set_id' => $priceSetID,
+      'price_field_id' => $priceField['id'],
+      'label' => 'Another Line Item',
+      'financial_type_id' => $financialTypeId,
+      'amount' => '2.95',
+    ]);
+    $priceFieldId = $priceField['id'];
+
+    // Set quantity for our test
+    $submitParams['price_' . $priceFieldId] = 110;
+
     // contribution_page submit requires amount and tax_amount - and that's ok we're not testing that - we're testing at the LineItem level
-    $submitParams['amount'] = $this->formatMoneyInput(180 * 16.95);
+    $submitParams['amount'] = $this->formatMoneyInput(180 * 16.95 + 110 * 2.95);
     // This is the correct Tax Amount - use it later to compare to what the CiviCRM Core came up with at the LineItem level
-    $submitParams['tax_amount'] = $this->formatMoneyInput(180 * 16.95 * 0.10);
+    $submitParams['tax_amount'] = (180 * 16.95 * 0.10 + 110 * 2.95 * 0.10);
 
     $this->callAPISuccess('contribution_page', 'submit', $submitParams);
     $contribution = $this->callAPISuccessGetSingle('contribution', [
@@ -1980,15 +1999,25 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
     ]);
 
     // Retrieve the lineItem that belongs to the Printing Rights and check the tax_amount CiviCRM Core calculated for it
-    $lineItem = $this->callAPISuccessGetSingle('LineItem', [
+    $lineItem1 = $this->callAPISuccessGetSingle('LineItem', [
       'contribution_id' => $contribution['id'],
       'label' => 'Printing Rights',
     ]);
 
-    $lineItem_TaxAmount = round($lineItem['tax_amount'], 2);
+    // Retrieve the lineItem that belongs to the Another Line Item and check the tax_amount CiviCRM Core calculated for it
+    $lineItem2 = $this->callAPISuccessGetSingle('LineItem', [
+      'contribution_id' => $contribution['id'],
+      'label' => 'Another Line Item',
+    ]);
+
+    $finalContribution = $this->callAPISuccess('Contribution', 'getsingle', ['id' => $contribution['id'], 'return' => ['tax_amount', 'total_amount']]);
+
+    $this->assertEquals($lineItem1['line_total'] + $lineItem2['line_total'], round(180 * 16.95 + 110 * 2.95, 2), 'Line Item Total is incorrect.');
+    $this->assertEquals($lineItem1['line_total'] + $lineItem2['line_total'], $finalContribution['total_amount'], 'Contribution total should match line item totals');
+
+    $this->assertEquals(round($lineItem1['tax_amount'] + $lineItem2['tax_amount'], 2), round(180 * 16.95 * 0.10 + 110 * 2.95 * 0.10, 2), 'Wrong Sales Tax Amount is calculated and stored.');
+    $this->assertEquals(round($lineItem1['tax_amount'] + $lineItem2['tax_amount'], 2), $finalContribution['tax_amount'], 'Sales Tax Amount on Contribution does not match sum of Sales Tax Amount across the Line Items.');
 
-    $this->assertEquals($lineItem['line_total'], $contribution['total_amount'], 'Contribution total should match line total');
-    $this->assertEquals($lineItem_TaxAmount, round(180 * 16.95 * 0.10, 2), 'Wrong Sales Tax Amount is calculated and stored.');
   }
 
   /**

From dfdee38776797b83b6d970fd4042740bde1186eb Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 10:10:35 +1200
Subject: [PATCH 055/834] dev/core#1983 Fix to tax calculation on
 multi-line-item

This is similar to https://github.com/civicrm/civicrm-core/pull/18284 - it differs in that the totals are calculated by iterating
through the line item array afterwards, rather than expecting the 'getLine' function to calculate totals. Some
obvious follow ups suggest themselves but I will look against master.

This is difficult to test (Karin gave it a really good shot) because of the weird way it's calculated in Main and thenn
used in Confirm. Cleanup should resolve the testability issue too
---
 CRM/Price/BAO/LineItem.php                             | 3 ++-
 CRM/Price/BAO/PriceSet.php                             | 6 ++++--
 tests/phpunit/CRM/Event/BAO/ChangeFeeSelectionTest.php | 2 +-
 tests/phpunit/CRM/Member/Form/MembershipTest.php       | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php
index f381e971fd64..b94b20755af5 100644
--- a/CRM/Price/BAO/LineItem.php
+++ b/CRM/Price/BAO/LineItem.php
@@ -654,8 +654,9 @@ public static function changeFeeSelections(
     $lineItems
   ) {
     $entityTable = "civicrm_" . $entity;
+    $newLineItems = [];
     CRM_Price_BAO_PriceSet::processAmount($feeBlock,
-      $params, $lineItems
+      $params, $newLineItems
     );
     // initialize empty Lineitem instance to call protected helper functions
     $lineItemObj = new CRM_Price_BAO_LineItem();
diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php
index bc87b6e9fe53..d2c1643071a2 100644
--- a/CRM/Price/BAO/PriceSet.php
+++ b/CRM/Price/BAO/PriceSet.php
@@ -673,13 +673,15 @@ public static function processAmount($fields, &$params, &$lineItem, $priceSetID
         continue;
       }
 
-      list($params, $lineItem, $totalTax, $totalPrice) = self::getLine($params, $lineItem, $priceSetID, $field, $id, $totalPrice);
+      list($params, $lineItem) = self::getLine($params, $lineItem, $priceSetID, $field, $id, $totalPrice);
     }
 
     $amount_level = [];
     $totalParticipant = 0;
     if (is_array($lineItem)) {
       foreach ($lineItem as $values) {
+        $totalPrice += $values['line_total'] + $values['tax_amount'];
+        $totalTax += $values['tax_amount'];
         $totalParticipant += $values['participant_count'];
         // This is a bit nasty. The logic of 'quick config' was because price set configuration was
         // (and still is) too difficult to replace the 'quick config' price set configuration on the contribution
@@ -1767,7 +1769,7 @@ public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id, $
         }
         break;
     }
-    return [$params, $lineItem, $totalTax, $totalPrice];
+    return [$params, $lineItem];
   }
 
 }
diff --git a/tests/phpunit/CRM/Event/BAO/ChangeFeeSelectionTest.php b/tests/phpunit/CRM/Event/BAO/ChangeFeeSelectionTest.php
index 3a618e512ed7..329850de106d 100644
--- a/tests/phpunit/CRM/Event/BAO/ChangeFeeSelectionTest.php
+++ b/tests/phpunit/CRM/Event/BAO/ChangeFeeSelectionTest.php
@@ -490,7 +490,7 @@ public function testCRM17151() {
     $lineItem = CRM_Price_BAO_LineItem::getLineItems($this->_participantId, 'participant');
     $this->assertEquals($this->_expensiveFee, $lineItem[1]['line_total']);
     CRM_Price_BAO_LineItem::changeFeeSelections($priceSetParams, $this->_participantId, 'participant', $this->_contributionId, $this->_feeBlock, $lineItem);
-    $this->assertDBCompareValue('CRM_Contribute_BAO_Contribution', $this->_contributionId, 'total_amount', 'id', $this->_cheapFee, "Total Amount equals " . $this->_expensiveFee);
+    $this->assertDBCompareValue('CRM_Contribute_BAO_Contribution', $this->_contributionId, 'total_amount', 'id', $this->_cheapFee, 'Total Amount equals ' . $this->_expensiveFee);
     $this->assertDBCompareValue('CRM_Contribute_BAO_Contribution', $this->_contributionId, 'contribution_status_id', 'id', $pendingRefundStatusId, 'Contribution must be refunding');
     $priceSetParams['price_' . $this->priceSetFieldID] = $this->expensiveFeeValueID;
     $lineItem = CRM_Price_BAO_LineItem::getLineItems($this->_participantId, 'participant');
diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index ef0d0e99bda8..6ac5753209f4 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -536,6 +536,7 @@ public function testSubmit($thousandSeparator) {
    *  Check if the related contribuion is also updated if the minimum_fee didn't match
    *
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function testContributionUpdateOnMembershipTypeChange() {
     // Step 1: Create a Membership via backoffice whose with 50.00 payment

From 28188a1ed392891faadb0176385571538622edb9 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 13:51:03 +1200
Subject: [PATCH 056/834] Move LineItem acl handling from v3 api to
 financialacls extension

This makes it available for the v4 api
---
 CRM/Price/BAO/LineItem.php          | 28 ----------------------------
 api/v3/LineItem.php                 |  3 ---
 ext/financialacls/financialacls.php | 21 +++++++++++++++++++++
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php
index b299fc7ad58c..286c12679d3d 100644
--- a/CRM/Price/BAO/LineItem.php
+++ b/CRM/Price/BAO/LineItem.php
@@ -116,34 +116,6 @@ public static function retrieve(&$params = [], &$defaults = []) {
     return NULL;
   }
 
-  /**
-   * Modifies $params array for filtering financial types.
-   *
-   * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
-   *
-   */
-  public static function getAPILineItemParams(&$params) {
-    CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types);
-    if ($types && empty($params['financial_type_id'])) {
-      $params['financial_type_id'] = ['IN' => array_keys($types)];
-    }
-    elseif ($types) {
-      if (is_array($params['financial_type_id'])) {
-        $invalidFts = array_diff($params['financial_type_id'], array_keys($types));
-      }
-      elseif (!in_array($params['financial_type_id'], array_keys($types))) {
-        $invalidFts = $params['financial_type_id'];
-      }
-      if ($invalidFts) {
-        $params['financial_type_id'] = ['NOT IN' => $invalidFts];
-      }
-    }
-    else {
-      $params['financial_type_id'] = 0;
-    }
-  }
-
   /**
    * @param int $contributionId
    *
diff --git a/api/v3/LineItem.php b/api/v3/LineItem.php
index f5b47a5e86f9..35de20acd3ee 100644
--- a/api/v3/LineItem.php
+++ b/api/v3/LineItem.php
@@ -62,9 +62,6 @@ function _civicrm_api3_line_item_create_spec(&$params) {
  *   Array of matching line_items
  */
 function civicrm_api3_line_item_get($params) {
-  if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus() && !empty($params['check_permissions'])) {
-    CRM_Price_BAO_LineItem::getAPILineItemParams($params);
-  }
   return _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 }
 
diff --git a/ext/financialacls/financialacls.php b/ext/financialacls/financialacls.php
index dda05b28f659..b079114d9f6f 100644
--- a/ext/financialacls/financialacls.php
+++ b/ext/financialacls/financialacls.php
@@ -168,6 +168,27 @@ function financialacls_civicrm_pre($op, $objectName, $id, &$params) {
   }
 }
 
+/**
+ * Implements hook_civicrm_selectWhereClause().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_selectWhereClause
+ */
+function financialacls_civicrm_selectWhereClause($entity, &$clauses) {
+  if ($entity === 'LineItem') {
+    if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
+      $types = [];
+      CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types);
+      if ($types) {
+        $clauses['financial_type_id'] = 'IN (' . implode(',', array_keys($types)) . ')';
+      }
+      else {
+        $clauses['financial_type_id'] = '= 0';
+      }
+    }
+  }
+
+}
+
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**

From a5bf8a53ba596071e21d1069504edd22e055445a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 14:14:32 +1200
Subject: [PATCH 057/834] [REF] Separate and move line-item specific portion of
 checkTaxAmount to LineItem

This is not intended to be the final place but making sense of checkTaxAmount is hard so I wanted to keep this simple and
iterate.

checkTaxAmount is called from 2 places - once from v3 LineItem.create with isLineItem = TRUE
and once from Contribution.create with isLineItem = FALSE

Most of the function is accessible dependent on isLineItem - meaning it's 2 separate functions.
However, the first chuck is called 'whenever id is set'. BUT it makes no sense for line items. It
uses the 'id' - regardless of whether it is a line item id or a contribution id - to get the previous
contribution. It then sets tax amount based on a comparison - but
that really makes zero sense. I'm pretty sure it was never intended to be used for LineItems
---
 CRM/Contribute/BAO/Contribution.php |  9 +--------
 api/v3/LineItem.php                 | 10 +++++++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 0e8ba3d61c1a..de2271b3b0fb 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4284,14 +4284,7 @@ public static function checkTaxAmount($params, $isLineItem = FALSE) {
       $params['tax_amount'] = array_sum($taxAmountArray);
       $params['total_amount'] = $params['total_amount'] + $params['tax_amount'];
     }
-    else {
-      // update line item of contrbution
-      if (isset($params['financial_type_id']) && array_key_exists($params['financial_type_id'], $taxRates) && $isLineItem) {
-        $taxRate = $taxRates[$params['financial_type_id']];
-        $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($params['line_total'], $taxRate);
-        $params['tax_amount'] = round($taxAmount['tax_amount'], 2);
-      }
-    }
+
     return $params;
   }
 
diff --git a/api/v3/LineItem.php b/api/v3/LineItem.php
index f5b47a5e86f9..4b9bf30bfc7b 100644
--- a/api/v3/LineItem.php
+++ b/api/v3/LineItem.php
@@ -29,9 +29,13 @@
  */
 function civicrm_api3_line_item_create($params) {
   // @todo the following line is not really appropriate for the api. The BAO should
-  // do the work, and it should be in a tighter function. The below function is  not really
-  // readable because it is handling contribution and line item together.
-  $params = CRM_Contribute_BAO_Contribution::checkTaxAmount($params, TRUE);
+  // do the work.
+  $taxRates = CRM_Core_PseudoConstant::getTaxRates();
+  if (isset($params['financial_type_id']) && array_key_exists($params['financial_type_id'], $taxRates)) {
+    $taxRate = $taxRates[$params['financial_type_id']];
+    $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($params['line_total'], $taxRate);
+    $params['tax_amount'] = round($taxAmount['tax_amount'], 2);
+  }
   return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'LineItem');
 }
 

From f4d22986701224ea83e0f667ea892704b8858761 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 16:15:37 +1200
Subject: [PATCH 058/834] Test & remove handling for max_related in renewal
 form

max_related is not a field on the renewal form - the handling appears to exist purely because
at some stage the BAO was not able to calculate it - however, as the test demonstrates that is
no longer the case
---
 CRM/Member/Form/MembershipRenewal.php                |  2 --
 .../CRM/Member/Form/MembershipRenewalTest.php        | 12 ++++--------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 17b3dfc6f66a..65105c13666d 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -748,7 +748,6 @@ protected function sendReceipt($membership) {
    */
   public function processMembership($contactID, $membershipTypeID, $is_test, $changeToday, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $isPayLater) {
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
-    $membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($membershipTypeID);
     $ids = [];
 
     // CRM-7297 - allow membership type to be be changed during renewal so long as the parent org of new membershipType
@@ -773,7 +772,6 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
         'end_date' => $currentMembership['end_date'],
         'join_date' => $currentMembership['join_date'],
         'membership_type_id' => $membershipTypeID,
-        'max_related' => !empty($membershipTypeDetails['max_related']) ? $membershipTypeDetails['max_related'] : NULL,
         'membership_activity_status' => ($pending || $isPayLater) ? 'Scheduled' : 'Completed',
       ];
       if ($contributionRecurID) {
diff --git a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
index d70f497c2f1d..1b8fe6b3ce3e 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
@@ -91,6 +91,7 @@ public function setUp() {
       'relationship_type_id' => 20,
       'min_fee' => 100,
       'financial_type_id' => $this->financialTypeID,
+      'max_related' => 10,
     ])['id'];
 
     $this->_membershipID = $this->callAPISuccess('Membership', 'create', [
@@ -144,7 +145,6 @@ public function testSubmit() {
       // This format reflects the 23 being the organisation & the 25 being the type.
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
-      'max_related' => '',
       'num_terms' => '1',
       'source' => '',
       'total_amount' => '50.00',
@@ -225,7 +225,6 @@ public function testSubmitWithTax() {
       // This format reflects the 23 being the organisation & the 25 being the type.
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
-      'max_related' => '',
       'num_terms' => '1',
       'source' => '',
       'total_amount' => '50.00',
@@ -281,7 +280,6 @@ public function testSubmitRecur() {
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '1',
       'is_recur' => 1,
-      'max_related' => 0,
       'num_terms' => '1',
       'source' => '',
       'total_amount' => '77.00',
@@ -493,7 +491,6 @@ public function testSubmitPayLater() {
       // This format reflects the 23 being the organisation & the 25 being the type.
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
-      'max_related' => '',
       'num_terms' => '2',
       'total_amount' => '50.00',
       //Member dues, see data.xml
@@ -546,7 +543,6 @@ public function testSubmitPayLaterWithBilling() {
       // This format reflects the 23 being the organisation & the 25 being the type.
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
-      'max_related' => '',
       'num_terms' => '2',
       'total_amount' => '50.00',
       //Member dues, see data.xml
@@ -561,7 +557,7 @@ public function testSubmitPayLaterWithBilling() {
       'trxn_id' => 777,
       'contribution_status_id' => 2,
       'billing_first_name' => 'Test',
-      'billing_middlename' => 'Last',
+      'billing_middle_name' => 'Last',
       'billing_street_address-5' => '10 Test St',
       'billing_city-5' => 'Test',
       'billing_state_province_id-5' => '1003',
@@ -573,6 +569,8 @@ public function testSubmitPayLaterWithBilling() {
     $form->testSubmit($params);
     $membership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $this->_individualId]);
     $this->assertEquals(strtotime($membership['end_date']), strtotime($originalMembership['end_date']));
+    $this->assertEquals(10, $membership['max_related']);
+
     $contribution = $this->callAPISuccessGetSingle('Contribution', [
       'contact_id' => $this->_individualId,
       'contribution_status_id' => 2,
@@ -609,7 +607,6 @@ public function testSubmitComplete() {
       // This format reflects the 23 being the organisation & the 25 being the type.
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
-      'max_related' => '',
       'num_terms' => '2',
       'total_amount' => '50.00',
       //Member dues, see data.xml
@@ -685,7 +682,6 @@ protected function getBaseSubmitParams() {
       'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
       'auto_renew' => '1',
       'is_recur' => 1,
-      'max_related' => 0,
       'num_terms' => '1',
       'total_amount' => $this->formatMoneyInput('7800.90'),
       //Member dues, see data.xml

From d7d9f7b6621fefc1f4e53787933d870f4e37c4da Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 16:42:15 +1200
Subject: [PATCH 059/834] [REF] simplify retrieval of existing membership on
 membership renewal form

After stepping through the code I determined that if membershipID is passed into getContactMembership then it either
1) returns the membership id much like membership.get but with is_current_member calculated or
2) returns the owner membership in a similar format

However, the renewal form is not visible for a non-owner membership so getting the owner membership is cruft
from another form & only 1 applies. Calling the api is much more transparent
---
 CRM/Member/Form/MembershipRenewal.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 17b3dfc6f66a..83bc8106cb51 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -750,12 +750,7 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
     $membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($membershipTypeID);
     $ids = [];
-
-    // CRM-7297 - allow membership type to be be changed during renewal so long as the parent org of new membershipType
-    // is the same as the parent org of an existing membership of the contact
-    $currentMembership = CRM_Member_BAO_Membership::getContactMembership($contactID, $membershipTypeID,
-      $is_test, $membershipID, TRUE
-    );
+    $currentMembership = civicrm_api3('Membership', 'getsingle', ['id' => $membershipID]);
 
     // Do NOT do anything.
     //1. membership with status : PENDING/CANCELLED (CRM-2395)
@@ -765,7 +760,6 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
       // CRM-15475
       array_search('Cancelled', CRM_Member_PseudoConstant::membershipStatus(NULL, " name = 'Cancelled' ", 'name', FALSE, TRUE)),
     ])) {
-
       $memParams = [
         'id' => $currentMembership['id'],
         'status_id' => $currentMembership['status_id'],
@@ -785,7 +779,7 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
     // Check and fix the membership if it is STALE
     CRM_Member_BAO_Membership::fixMembershipStatusBeforeRenew($currentMembership, $changeToday);
 
-    $isMembershipCurrent = $currentMembership['is_current_member'];
+    $isMembershipCurrent = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipStatus', $currentMembership['status_id'], 'is_current_member');
 
     // CRM-7297 Membership Upsell - calculate dates based on new membership type
     $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($currentMembership['id'],

From f816b68fc866414c929a90d4c67b8df6e3862fec Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 13:00:14 +1200
Subject: [PATCH 060/834] Add test to check, remove unnecessary lines

Per the code comment it was likely the removed lines were not needed but tests were required to confirm.

This does that
---
 CRM/Contribute/BAO/Contribution.php           |  4 ---
 .../Event/Form/Registration/ConfirmTest.php   |  6 ++--
 tests/phpunit/CiviTest/CiviMailUtils.php      | 10 ++++++
 tests/phpunit/CiviTest/CiviUnitTestCase.php   |  1 +
 tests/phpunit/api/v3/PaymentTest.php          | 33 +++++++++++++++----
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 0e8ba3d61c1a..7fa1f8dcb528 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4527,10 +4527,6 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     }
     else {
       if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) {
-        if ($event->is_email_confirm) {
-          // @todo this should be set by the function that sends the mail after sending.
-          $contributionParams['receipt_date'] = $changeDate;
-        }
         $participantParams['id'] = $participant->id;
         $participantParams['status_id'] = 'Registered';
         civicrm_api3('Participant', 'create', $participantParams);
diff --git a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
index f37ae9d2da8a..030228424165 100644
--- a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
+++ b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
@@ -92,9 +92,10 @@ public function testSubmit() {
    *
    * @param string $thousandSeparator
    *
-   * @dataProvider getThousandSeparators
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    *
-   * @throws \Exception
+   * @dataProvider getThousandSeparators
    */
   public function testPaidSubmit($thousandSeparator) {
     $this->setCurrencySeparators($thousandSeparator);
@@ -165,6 +166,7 @@ public function testPaidSubmit($thousandSeparator) {
     $this->assertEquals(8000.67, $contribution['total_amount']);
     $this->assertEquals(1.67, $contribution['fee_amount']);
     $this->assertEquals(7999, $contribution['net_amount']);
+    $this->assertNotEmpty($contribution['receipt_date']);
     $this->assertNotContains(' (multiple participants)', $contribution['amount_level']);
     $lastFinancialTrxnId = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($contribution['id'], 'DESC');
     $financialTrxn = $this->callAPISuccessGetSingle(
diff --git a/tests/phpunit/CiviTest/CiviMailUtils.php b/tests/phpunit/CiviTest/CiviMailUtils.php
index d7836fc8ab5e..b502273e8373 100644
--- a/tests/phpunit/CiviTest/CiviMailUtils.php
+++ b/tests/phpunit/CiviTest/CiviMailUtils.php
@@ -62,6 +62,16 @@ public function __construct(&$unit_test, $startImmediately = TRUE) {
     }
   }
 
+  /**
+   * Clean up after test.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function __destruct() {
+    $this->stop();
+    $this->clearMessages();
+  }
+
   /**
    * Start writing emails to db instead of current option.
    */
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 8f4550ec4401..decd2f21fce1 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -729,6 +729,7 @@ public function paymentProcessorTypeCreate($params = NULL) {
    * @param array $params
    *
    * @return mixed
+   * @throws \CRM_Core_Exception
    */
   public function paymentProcessorAuthorizeNetCreate($params = []) {
     $params = array_merge([
diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php
index 046f1f6058df..4ae47f92003d 100644
--- a/tests/phpunit/api/v3/PaymentTest.php
+++ b/tests/phpunit/api/v3/PaymentTest.php
@@ -186,6 +186,33 @@ public function testGetPaymentWithTrxnID() {
     $this->validateAllPayments();
   }
 
+  /**
+   * Test contribution receipts triggered by Payment.create with is_send_contribution_notification = TRUE.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function testPaymentSendContributionReceipt() {
+    $mut = new CiviMailUtils($this);
+    $contribution = $this->createPartiallyPaidParticipantOrder();
+    $event = $this->callAPISuccess('Event', 'get', []);
+    $this->addLocationToEvent($event['id']);
+    $params = [
+      'contribution_id' => $contribution['id'],
+      'total_amount' => 150,
+      'check_number' => '345',
+      'trxn_date' => '2018-08-13 17:57:56',
+      'is_send_contribution_notification' => TRUE,
+    ];
+    $this->callAPISuccess('Payment', 'create', $params);
+    $contribution = $this->callAPISuccessGetSingle('Contribution', ['id' => $contribution['id']]);
+    $this->assertNotEmpty($contribution['receipt_date']);
+    $mut->checkMailLog([
+      'Price Field - Price Field 1        1   $ 100.00    $ 100.00',
+      'event place',
+      'streety street',
+    ]);
+  }
+
   /**
    * Test email receipt for partial payment.
    *
@@ -229,8 +256,6 @@ public function testPaymentEmailReceipt() {
       'event place',
       'streety street',
     ]);
-    $mut->stop();
-    $mut->clearMessages();
     $this->validateAllPayments();
   }
 
@@ -263,8 +288,6 @@ public function testPaymentEmailReceiptFullyPaid() {
       'Balance Owed: $ 0.00',
       'Thank you for completing this payment.',
     ]);
-    $mut->stop();
-    $mut->clearMessages();
     $this->validateAllPayments();
   }
 
@@ -319,8 +342,6 @@ public function testRefundEmailReceipt($thousandSeparator) {
       'Transaction Date: November 13th, 2018 12:01 PM',
       'Total Paid: $ 170' . $decimalSeparator . '00',
     ]);
-    $mut->stop();
-    $mut->clearMessages();
     $this->validateAllPayments();
   }
 

From bb35c5f3477a97b937cf083fa1b66e315ae53507 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Sat, 29 Aug 2020 11:48:11 -0400
Subject: [PATCH 061/834] Clean money for non-deductible amount

tests
---
 api/v3/Contribution.php                   |  2 +-
 tests/phpunit/api/v3/ContributionTest.php | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 7a5e94dcb57c..63036179825e 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -32,7 +32,7 @@ function civicrm_api3_contribution_create($params) {
   // The BAO should not clean money - it should be done in the form layer & api wrapper
   // (although arguably the api should expect pre-cleaned it seems to do some cleaning.)
   if (empty($params['skipCleanMoney'])) {
-    foreach (['total_amount', 'net_amount', 'fee_amount'] as $field) {
+    foreach (['total_amount', 'net_amount', 'fee_amount', 'non_deductible_amount'] as $field) {
       if (isset($params[$field])) {
         $params[$field] = CRM_Utils_Rule::cleanMoney($params[$field]);
       }
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index bf24317b8868..0e088557b036 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -4948,4 +4948,26 @@ public function testPaymentVerifyPaymentInstrumentChange() {
     $this->assertEquals('Completed', $contribution['contribution_status']);
   }
 
+  /**
+   * Test the "clean money" functionality.
+   */
+  public function testCleanMoney() {
+    $params = [
+      'contact_id' => $this->_individualId,
+      'financial_type_id' => 1,
+      'total_amount' => '$100',
+      'fee_amount' => '$20',
+      'net_amount' => '$80',
+      'non_deductible_amount' => '$80',
+      'sequential' => 1,
+    ];
+    $id = $this->callAPISuccess('Contribution', 'create', $params)['id'];
+    // Reading the return values of the API isn't reliable here; get the data from the db.
+    $contribution = $this->callAPISuccess('Contribution', 'getsingle', ['id' => $id]);
+    $this->assertEquals('100.00', $contribution['total_amount']);
+    $this->assertEquals('20.00', $contribution['fee_amount']);
+    $this->assertEquals('80.00', $contribution['net_amount']);
+    $this->assertEquals('80.00', $contribution['non_deductible_amount']);
+  }
+
 }

From 3df62a62128fcdfa84957768c8e327af01302063 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Mon, 31 Aug 2020 17:58:56 -0400
Subject: [PATCH 062/834] faulty check for simplexml node value - see also PR
 18282

---
 CRM/Case/XMLProcessor/Process.php | 10 ++++++--
 tests/phpunit/api/v3/CaseTest.php | 42 +++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/CRM/Case/XMLProcessor/Process.php b/CRM/Case/XMLProcessor/Process.php
index d010a47c6835..3a75649f0bfd 100644
--- a/CRM/Case/XMLProcessor/Process.php
+++ b/CRM/Case/XMLProcessor/Process.php
@@ -85,7 +85,13 @@ public function process($xml, &$params) {
       // create relationships for the ones that are required
       foreach ($xml->CaseRoles as $caseRoleXML) {
         foreach ($caseRoleXML->RelationshipType as $relationshipTypeXML) {
-          if ($relationshipTypeXML->creator) {
+          // simplexml treats node values differently than you'd expect,
+          // e.g. as an array
+          // Just using `if ($relationshipTypeXML->creator)` ends up always
+          // being true, so you have to cast to int or somehow force evaluation
+          // of the actual value. And casting to (bool) seems to behave
+          // differently on these objects than casting to (int).
+          if (!empty($relationshipTypeXML->creator)) {
             if (!$this->createRelationships($relationshipTypeXML,
               $params
             )
@@ -105,7 +111,7 @@ public function process($xml, &$params) {
     foreach ($xml->ActivitySets as $activitySetsXML) {
       foreach ($activitySetsXML->ActivitySet as $activitySetXML) {
         if ($standardTimeline) {
-          if ($activitySetXML->timeline) {
+          if (!empty($activitySetXML->timeline)) {
             return $this->processStandardTimeline($activitySetXML, $params);
           }
         }
diff --git a/tests/phpunit/api/v3/CaseTest.php b/tests/phpunit/api/v3/CaseTest.php
index 470117269217..efd080234293 100644
--- a/tests/phpunit/api/v3/CaseTest.php
+++ b/tests/phpunit/api/v3/CaseTest.php
@@ -666,6 +666,48 @@ public function testCaseGetWithRoles() {
     $this->assertTrue($foundManager);
   }
 
+  /**
+   * Test that case role is not assigned to logged in user if you've unchecked
+   * the assign to creator in the case type definition.
+   */
+  public function testCaseGetWithRolesNoCreator() {
+    // Copy and adjust stock case type so that assign role to creator is not checked
+    $caseType = $this->callAPISuccess('CaseType', 'get', ['id' => $this->caseTypeId]);
+    $newCaseType = $caseType['values'][$this->caseTypeId];
+    // Sanity check that we're changing what we think we're changing.
+    $this->assertEquals('Homeless Services Coordinator', $newCaseType['definition']['caseRoles'][0]['name']);
+    // string '0' to match what actually happens when you do it in UI
+    $newCaseType['definition']['caseRoles'][0]['creator'] = '0';
+    unset($newCaseType['id']);
+    $newCaseType['name'] = 'tree_climbing';
+    $newCaseType['title'] = 'Tree Climbing';
+    $newCaseType = $this->callAPISuccess('CaseType', 'create', $newCaseType);
+
+    $case1 = $this->callAPISuccess('Case', 'create', [
+      'contact_id' => 17,
+      'subject' => "Test case with roles no creator",
+      'case_type_id' => $newCaseType['id'],
+      'status_id' => "Open",
+    ]);
+    $result = $this->callAPISuccessGetSingle('Case', [
+      'id' => $case1['id'],
+      'status_id' => "Open",
+      'return' => ['contacts'],
+    ]);
+
+    // There should only be the client role.
+    $this->assertCount(1, $result['contacts']);
+    $contact = $result['contacts'][0];
+    $this->assertEquals('Client', $contact['role']);
+    // For good measure
+    $this->assertNotEquals(1, $contact['creator'] ?? NULL);
+    $this->assertNotEquals(1, $contact['manager'] ?? NULL);
+
+    // clean up
+    $this->callAPISuccess('Case', 'create', ['id' => $case1['id'], 'case_type_id' => $this->caseTypeId]);
+    $this->callAPISuccess('CaseType', 'delete', ['id' => $newCaseType['id']]);
+  }
+
   public function testCaseGetWithDefinition() {
     $case1 = $this->callAPISuccess('Case', 'create', [
       'contact_id' => 17,

From a0e872f12e7b1bf855a1e4d645ba68d12af4fb83 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 13 Jul 2020 14:38:20 +1000
Subject: [PATCH 063/834] [REF] permit negative payments to be made against
 completed payments

Add in unit test for adding additional refund payment to contribution already refunded and also adding a negative payment to a contribution that is negative already
---
 CRM/Financial/BAO/Payment.php        | 11 ++++++++--
 tests/phpunit/api/v3/PaymentTest.php | 32 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/CRM/Financial/BAO/Payment.php b/CRM/Financial/BAO/Payment.php
index e13837e996c0..2b93c545e1ff 100644
--- a/CRM/Financial/BAO/Payment.php
+++ b/CRM/Financial/BAO/Payment.php
@@ -487,6 +487,9 @@ protected static function getPayableLineItems($params): array {
     if ($outstandingBalance !== 0.0) {
       $ratio = $params['total_amount'] / $outstandingBalance;
     }
+    elseif ($params['total_amount'] < 0) {
+      $ratio = $params['total_amount'] / (float) CRM_Core_BAO_FinancialTrxn::getTotalPayments($params['contribution_id'], TRUE);
+    }
     else {
       // Help we are making a payment but no money is owed. We won't allocate the overpayment to any line item.
       $ratio = 0;
@@ -496,12 +499,16 @@ protected static function getPayableLineItems($params): array {
       $lineItems[$lineItemID]['id'] = $lineItemID;
       $lineItems[$lineItemID]['paid'] = self::getAmountOfLineItemPaid($lineItemID);
       $lineItems[$lineItemID]['balance'] = $lineItem['subTotal'] - $lineItems[$lineItemID]['paid'];
-
       if (!empty($lineItemOverrides)) {
         $lineItems[$lineItemID]['allocation'] = $lineItemOverrides[$lineItemID] ?? NULL;
       }
       else {
-        $lineItems[$lineItemID]['allocation'] = $lineItems[$lineItemID]['balance'] * $ratio;
+        if (empty($lineItems[$lineItemID]['balance']) && !empty($ratio) && $params['total_amount'] < 0) {
+          $lineItems[$lineItemID]['allocation'] = $lineItem['subTotal'] * $ratio;
+        }
+        else {
+          $lineItems[$lineItemID]['allocation'] = $lineItems[$lineItemID]['balance'] * $ratio;
+        }
       }
     }
     return $lineItems;
diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php
index 4ae47f92003d..5c36bde5d2c9 100644
--- a/tests/phpunit/api/v3/PaymentTest.php
+++ b/tests/phpunit/api/v3/PaymentTest.php
@@ -183,6 +183,7 @@ public function testGetPaymentWithTrxnID() {
       ],
     ];
     $this->checkPaymentResult($payment, $expectedResult);
+    $this->callAPISuccess('Payment', 'create', ['total_amount' => '-20', 'contribution_id' => $contributionID2]);
     $this->validateAllPayments();
   }
 
@@ -213,6 +214,37 @@ public function testPaymentSendContributionReceipt() {
     ]);
   }
 
+  /**
+   * Test full refund when no payment has actually been record.
+   */
+  public function testFullRefundWithPaymentAlreadyRefunded() {
+    $params1 = [
+      'contact_id' => $this->_individualId,
+      'trxn_id' => 111111,
+      'total_amount' => 10,
+    ];
+    $contributionID1 = $this->contributionCreate($params1);
+    $paymentParams = ['contribution_id' => $contributionID1];
+    $this->callAPISuccess('Payment', 'create', ['total_amount' => '-10', 'contribution_id' => $contributionID1]);
+    $payment = $this->callAPISuccess('payment', 'get', $paymentParams);
+    $this->callAPISuccess('Payment', 'create', ['total_amount' => '-10', 'contribution_id' => $contributionID1]);
+    $payment = $this->callAPISuccess('payment', 'get', $paymentParams);
+    $this->validateAllPayments();
+  }
+
+  public function testNegativePaymentWithNegativeContribution() {
+    $params1 = [
+      'contact_id' => $this->_individualId,
+      'trxn_id' => 111111,
+      'total_amount' => -10,
+    ];
+    $contributionID1 = $this->contributionCreate($params1);
+    $this->callAPISuccess('Payment', 'create', ['total_amount' => '-20', 'contribution_id' => $contributionID1]);
+    $paymentParams = ['contribution_id' => $contributionID1];
+    $payment = $this->callAPISuccess('payment', 'get', $paymentParams);
+    $this->validateAllPayments();
+  }
+
   /**
    * Test email receipt for partial payment.
    *

From 65b0b7c2d8bcf27a77113d5ee93692ce9b9d39d7 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 1 Sep 2020 15:21:50 +1200
Subject: [PATCH 064/834] [REF] Clean up return variables on
 updateContributionStatus, updatePendingOnlineContribution

The return variable from updatePendingOnlineContribution is never used - ergo don't return it. This means
the return value from updateContributionStatus is also never used - ergo - you get it. In addition don't call the function
with empty variables - I've moved the check as to whether they are empty into the calling function - although likely
in a second pass the checks will be removed or change again
---
 CRM/Event/Form/Task/Batch.php | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index f39d72ac20d7..16d8752bde39 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -260,14 +260,10 @@ public function postProcess() {
    * @param int $participantId
    * @param int $statusId
    *
-   * @return mixed
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
   public static function updatePendingOnlineContribution($participantId, $statusId) {
-    if (!$participantId || !$statusId) {
-      return NULL;
-    }
 
     $contributionId = CRM_Contribute_BAO_Contribution::checkOnlinePendingContribution($participantId,
       'Event'
@@ -292,7 +288,7 @@ public static function updatePendingOnlineContribution($participantId, $statusId
       $contributionStatusId = array_search('Cancelled', $contributionStatuses);
     }
 
-    if (!$contributionStatusId) {
+    if (!$contributionStatusId || !$participantId || !$contributionId) {
       return;
     }
 
@@ -305,9 +301,7 @@ public static function updatePendingOnlineContribution($participantId, $statusId
     ];
 
     //change related contribution status.
-    $updatedStatusId = self::updateContributionStatus($params);
-
-    return $updatedStatusId;
+    self::updateContributionStatus($params);
   }
 
   /**
@@ -315,7 +309,6 @@ public static function updatePendingOnlineContribution($participantId, $statusId
    *
    * @param array $params
    *
-   * @return NULL|int
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    * @throws \Exception
@@ -332,10 +325,6 @@ public static function updateContributionStatus($params) {
     $componentName = $params['componentName'] ?? NULL;
     $contributionId = $params['contribution_id'] ?? NULL;
 
-    if (!$contributionId || !$componentId || !$componentName || !$statusId) {
-      return NULL;
-    }
-
     $input = $ids = $objects = [];
 
     //get the required ids.
@@ -389,13 +378,13 @@ public static function updateContributionStatus($params) {
       $transaction = new CRM_Core_Transaction();
       $baseIPN->cancelled($objects, $transaction, $input);
       $transaction->commit();
-      return $statusId;
+      return;
     }
-    elseif ($statusId == $contributionStatuses['Failed']) {
+    if ($statusId == $contributionStatuses['Failed']) {
       $transaction = new CRM_Core_Transaction();
       $baseIPN->failed($objects, $transaction, $input);
       $transaction->commit();
-      return $statusId;
+      return;
     }
 
     // status is not pending
@@ -432,8 +421,6 @@ public static function updateContributionStatus($params) {
 
     // reset template values before processing next transactions
     $template->clearTemplateVars();
-
-    return $statusId;
   }
 
   /**
@@ -513,7 +500,7 @@ public function submit($params) {
         if ($statusChange) {
           CRM_Event_BAO_Participant::transitionParticipants([$key], $value['status_id'], $fromStatusId);
         }
-        if ($relatedStatusChange) {
+        if ($relatedStatusChange && $key && $value['status_id']) {
           //update related contribution status, CRM-4395
           self::updatePendingOnlineContribution($key, $value['status_id']);
         }

From 8e0eed0307118c6ed1cf19f5da3ba0930cb296e3 Mon Sep 17 00:00:00 2001
From: Noah Miller <nm@lemnisc.us>
Date: Mon, 31 Aug 2020 23:38:30 -0700
Subject: [PATCH 065/834] Custom field create/edit form: replace dysfunctional
 checkbox with static label in edit mode

---
 templates/CRM/Custom/Form/Field.tpl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index c50080cef884..fe0d6914825e 100644
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -21,6 +21,9 @@
     <tr class="crm-custom-field-form-block-data_type">
       <td class="label">{$form.data_type.label}</td>
       <td class="html-adjust">{$form.data_type.html}
+        {if $action neq 1 && $form.data_type.value[1][0] eq "Select" && $form.serialize.value}
+          <span>({ts}Multi-Select{/ts})</span>
+        {/if}
         {if $action neq 4 and $action neq 2}
           <br /><span class="description">{ts}Select the type of data you want to collect and store for this contact. Then select from the available HTML input field types (choices are based on the type of data being collected).{/ts}</span>
         {/if}
@@ -34,10 +37,12 @@
         {/if}
       </td>
     </tr>
-    <tr class="crm-custom-field-form-block-serialize">
-      <td class="label">{$form.serialize.label}</td>
-      <td class="html-adjust">{$form.serialize.html}</td>
-    </tr>
+    {if $action eq 1}
+      <tr class="crm-custom-field-form-block-serialize">
+        <td class="label">{$form.serialize.label}</td>
+        <td class="html-adjust">{$form.serialize.html}</td>
+      </tr>
+    {/if}
     {if $form.in_selector}
       <tr class='crm-custom-field-form-block-in_selector'>
         <td class='label'>{$form.in_selector.label}</td>

From 6f2bdb765f90c1c10a0ee6c123efd557788d6159 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 1 Sep 2020 11:08:02 -0400
Subject: [PATCH 066/834] 5.29.0 release notes: raw from script

---
 release-notes/5.29.0.md | 663 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 663 insertions(+)
 create mode 100644 release-notes/5.29.0.md

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
new file mode 100644
index 000000000000..359cb80c51f6
--- /dev/null
+++ b/release-notes/5.29.0.md
@@ -0,0 +1,663 @@
+# CiviCRM 5.29.0
+
+Released September 2, 2020;
+
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+
+## <a name="features"></a>Features
+
+### Core CiviCRM
+
+- **crm- Missing Summary ([17809](https://github.com/civicrm/civicrm-core/pull/17809))**
+
+- **CRM- Missing Summary ([17749](https://github.com/civicrm/civicrm-core/pull/17749))**
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **dev/core#1983 Fix to tax calculation on multi-line-item ([18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+
+- **dev/core#1982 - 5.29 version of PR 18282 ([18301](https://github.com/civicrm/civicrm-core/pull/18301))**
+
+- **dev/core#1972 Fix tax_amount calclation on renewal form ([18271](https://github.com/civicrm/civicrm-core/pull/18271))**
+
+- **Update contributor key for Andrew ([18230](https://github.com/civicrm/civicrm-core/pull/18230))**
+
+- **5.28.2 & 5.29.3 Release Notes ([18228](https://github.com/civicrm/civicrm-core/pull/18228))**
+
+- **dev/core#1964 Fix regression bug on deduping contacts with dedupe_exception matches ([18223](https://github.com/civicrm/civicrm-core/pull/18223))**
+
+- **Fix dedupe regression whereby deleted contacts are found ([18214](https://github.com/civicrm/civicrm-core/pull/18214))**
+
+- **dev/core#1959 Brick\Math\Exception\RoundingNecessaryException ([18206](https://github.com/civicrm/civicrm-core/pull/18206))**
+
+- **Fix regression whereby deleted contacts are in quicksearch results ([18213](https://github.com/civicrm/civicrm-core/pull/18213))**
+
+- **dev/core#1963 - Expanded icon on manage groups appears as unknown icon ([18205](https://github.com/civicrm/civicrm-core/pull/18205))**
+
+- **dev/core#1961 Fix regression - cancel button not working on recurring contributions ([18204](https://github.com/civicrm/civicrm-core/pull/18204))**
+
+- **(dev/core#1846) Container, ClassLoader Caches - Separate caches by ve… ([18200](https://github.com/civicrm/civicrm-core/pull/18200))**
+
+- **dev/core#1945 Fix recur access regression ([18180](https://github.com/civicrm/civicrm-core/pull/18180))**
+
+- **dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings ([18174](https://github.com/civicrm/civicrm-core/pull/18174))**
+
+- **Revert "Swap out button/submit inputs for button elements" ([18185](https://github.com/civicrm/civicrm-core/pull/18185))**
+
+- **Installation doclinks not getting url-rewritten ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
+
+- **cvv required html attribute should depend on backoffice setting ([18166](https://github.com/civicrm/civicrm-core/pull/18166))**
+
+- **[REF] Remove unnecessary comma ([18163](https://github.com/civicrm/civicrm-core/pull/18163))**
+
+- **Fix 5.29 (unreleased) regression using temp tables ([18133](https://github.com/civicrm/civicrm-core/pull/18133))**
+
+- **dev/core#1952 Remove uncessary component checking when exporting all … ([18149](https://github.com/civicrm/civicrm-core/pull/18149))**
+
+- **dev/core#1953 Ensure that Contribution pages do not fail validation o… ([18144](https://github.com/civicrm/civicrm-core/pull/18144))**
+
+- **dev/core#1934 fix regression on merging contacts with settings using contact_id ([18126](https://github.com/civicrm/civicrm-core/pull/18126))**
+
+- **dev/core#1936 Make the price field value label field not required ([18123](https://github.com/civicrm/civicrm-core/pull/18123))**
+
+- **Swap out button/submit inputs for button elements ([18091](https://github.com/civicrm/civicrm-core/pull/18091))**
+
+- **dev/event#40 - EventCart - Check legacy setting until extension is public ([18101](https://github.com/civicrm/civicrm-core/pull/18101))**
+
+- **dev/wordpress#66 Re-instate newer variables but with more support for… ([18068](https://github.com/civicrm/civicrm-core/pull/18068))**
+
+- **[REF] Fix jquery validation for on behalf of fields when combined wit… ([18092](https://github.com/civicrm/civicrm-core/pull/18092))**
+
+- **dev/core#1895 fix first/last name adv search ([17950](https://github.com/civicrm/civicrm-core/pull/17950))**
+
+- **dev/core#1905 force backend links for new "configure" buttons ([18088](https://github.com/civicrm/civicrm-core/pull/18088))**
+
+- **dev/core#1932 - Make status-checks more polite during upgrade ([18085](https://github.com/civicrm/civicrm-core/pull/18085))**
+
+- **dev/core#1928 Fix HTML5 error due to required attribute being set swi… ([18080](https://github.com/civicrm/civicrm-core/pull/18080))**
+
+- **5.28 ([18084](https://github.com/civicrm/civicrm-core/pull/18084))**
+
+- **5.28 ([18082](https://github.com/civicrm/civicrm-core/pull/18082))**
+
+- **dev/financial#135 Remove stub function from payflowPro ([18078](https://github.com/civicrm/civicrm-core/pull/18078))**
+
+- **5.28 ([18077](https://github.com/civicrm/civicrm-core/pull/18077))**
+
+- **Fix button name on updated form ([18000](https://github.com/civicrm/civicrm-core/pull/18000))**
+
+- **[NFC] Fix provider unit test on PHP7.4 ([18073](https://github.com/civicrm/civicrm-core/pull/18073))**
+
+- **[REF] Move handling of form elements back to the Form ([17981](https://github.com/civicrm/civicrm-core/pull/17981))**
+
+- **Do not pass-by-reference to recur function ([18071](https://github.com/civicrm/civicrm-core/pull/18071))**
+
+- **dev/financial#135 Remove unreachable doDirectPayment from manual processor ([18072](https://github.com/civicrm/civicrm-core/pull/18072))**
+
+- **Refactor "applyLocale" and remove references to "language" column in UFMatch table ([18049](https://github.com/civicrm/civicrm-core/pull/18049))**
+
+- **Show cron warning on Scheduled Jobs admin page ([18065](https://github.com/civicrm/civicrm-core/pull/18065))**
+
+- **5.28 ([18069](https://github.com/civicrm/civicrm-core/pull/18069))**
+
+- **Use correct pdf package to generate pdf file on invoice download/email activity ([18056](https://github.com/civicrm/civicrm-core/pull/18056))**
+
+- **Fix buggy placement of icons on buttons ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
+
+- **[REF] Even less variable variables ([18058](https://github.com/civicrm/civicrm-core/pull/18058))**
+
+- **dev/core#1905 rework #17942 with simpler ts strings ([18064](https://github.com/civicrm/civicrm-core/pull/18064))**
+
+- **Extract code to set isEmailReceipt in Contribution.completeOrder ([18039](https://github.com/civicrm/civicrm-core/pull/18039))**
+
+- **[REF] remove first attempt to set currency in repeattransaction flow ([18055](https://github.com/civicrm/civicrm-core/pull/18055))**
+
+- **5.28 ([18063](https://github.com/civicrm/civicrm-core/pull/18063))**
+
+- **dev/core#1905 Add configure icons on public pages ([17942](https://github.com/civicrm/civicrm-core/pull/17942))**
+
+- **CRM_Utils_Hook: deprecation warning and short array syntax ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
+
+- **event#35: move statusBounce out of BAO layer; don't allow self-service when dis… ([18040](https://github.com/civicrm/civicrm-core/pull/18040))**
+
+- **Why not make the buttons flat? ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
+
+- **[REF] Simplify location metadata handling in Export class ([17951](https://github.com/civicrm/civicrm-core/pull/17951))**
+
+- **5.28 ([18059](https://github.com/civicrm/civicrm-core/pull/18059))**
+
+- **[REF] Do not pass by reference to the recur function ([18057](https://github.com/civicrm/civicrm-core/pull/18057))**
+
+- **[REF] Simplify getMembershipStatusByDate more ([18051](https://github.com/civicrm/civicrm-core/pull/18051))**
+
+- **Fix obscure dedupe scenario where 'bad' location data can overwrite good data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
+
+- **dev/drupal#127 - require email for the Useradd task and errors not showing ([17915](https://github.com/civicrm/civicrm-core/pull/17915))**
+
+- **dev/core#1921 [Ref] remove isoToMysql ([18025](https://github.com/civicrm/civicrm-core/pull/18025))**
+
+- **dev/core#1665 Remove the having clause as well as having needs a group by ([18052](https://github.com/civicrm/civicrm-core/pull/18052))**
+
+- **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
+
+- **Fix JQuery Validation for radios ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
+
+- **[REF] Simplify membership status date handling ([18030](https://github.com/civicrm/civicrm-core/pull/18030))**
+
+- **Fix PaypalIPN single function to not receive-by-reference ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
+
+- **Remove requirement to pass 'contribution_status_id' => Pending from order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
+
+- **[REF] Clean up handling of financial_type_id override ([18032](https://github.com/civicrm/civicrm-core/pull/18032))**
+
+- **Use saved contribution's line items rather than the primaryContributionID ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
+
+- **[REF] Remove transaction from completeOrder signature ([18046](https://github.com/civicrm/civicrm-core/pull/18046))**
+
+- **Wrap multi record custom field inside a div ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
+
+- **[Test fix] We might need this to ensure really quick test runs don't fail ([18045](https://github.com/civicrm/civicrm-core/pull/18045))**
+
+- **dev/core#1137 - Allow ssl connection to mysql by specifying in DSN ([17706](https://github.com/civicrm/civicrm-core/pull/17706))**
+
+- **Test - attempt to replicate #17852 ([18038](https://github.com/civicrm/civicrm-core/pull/18038))**
+
+- **[REF] Remove transaction from BaseIPN completeTransaction call ([18042](https://github.com/civicrm/civicrm-core/pull/18042))**
+
+- **Remove url-tracking in mass sms. dev/core#1843 ([17700](https://github.com/civicrm/civicrm-core/pull/17700))**
+
+- **Do not overwrite values saved from the repeatContribution routine ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
+
+- **dev/core#1916 - Fix naming of case export fields / remove ones that aren't true ([18043](https://github.com/civicrm/civicrm-core/pull/18043))**
+
+- **SystemCheck: add ability to efficiently run only specified checks ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
+
+- **Add testing to Authorize.net and remove the lines that are repeated ([18028](https://github.com/civicrm/civicrm-core/pull/18028))**
+
+- **Add test on status calculation ([18037](https://github.com/civicrm/civicrm-core/pull/18037))**
+
+- **Fix qill typo ([18041](https://github.com/civicrm/civicrm-core/pull/18041))**
+
+- **dev/core#1919 - Missing resubscribe url in text/plain version of unsubscribe confirmation email ([18015](https://github.com/civicrm/civicrm-core/pull/18015))**
+
+- **[Ref] Simplify is_email_receipt in sendMail ([18029](https://github.com/civicrm/civicrm-core/pull/18029))**
+
+- **Update flexmailer release information ([17912](https://github.com/civicrm/civicrm-core/pull/17912))**
+
+- **[REF] [Test] Minor simplification on test ([18019](https://github.com/civicrm/civicrm-core/pull/18019))**
+
+- **dev/core#1906 - Allow payment create api to record payment on Failed … ([17943](https://github.com/civicrm/civicrm-core/pull/17943))**
+
+- **Fix for failing test ([18036](https://github.com/civicrm/civicrm-core/pull/18036))**
+
+- **Remove invalid use of crmMoney formatter ([18031](https://github.com/civicrm/civicrm-core/pull/18031))**
+
+- **Remove main PaymentExpress class ([18010](https://github.com/civicrm/civicrm-core/pull/18010))**
+
+- **[Ref] Remove transaction instantiation in PaypalPro ([18026](https://github.com/civicrm/civicrm-core/pull/18026))**
+
+- **[REF] Stop instantiating transaction in PaypalIPN ([18020](https://github.com/civicrm/civicrm-core/pull/18020))**
+
+- **Remove unused parameter ids['billing'] ([18021](https://github.com/civicrm/civicrm-core/pull/18021))**
+
+- **5.28 to master ([18023](https://github.com/civicrm/civicrm-core/pull/18023))**
+
+- **Cache loader - remove legacy handling, handle null result from setting ([17999](https://github.com/civicrm/civicrm-core/pull/17999))**
+
+- **Change inform-icon to fa-info-circle ([18001](https://github.com/civicrm/civicrm-core/pull/18001))**
+
+- **[REF] Remove pass-by-reference & always empty param ([17984](https://github.com/civicrm/civicrm-core/pull/17984))**
+
+- **CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option ([17990](https://github.com/civicrm/civicrm-core/pull/17990))**
+
+- **SQL temp table not using utf8mb4 if server default already set to utf8mb4 ([18012](https://github.com/civicrm/civicrm-core/pull/18012))**
+
+- **Wrong link to admin page in error message about FROM address on PCP page ([17996](https://github.com/civicrm/civicrm-core/pull/17996))**
+
+- **[REF] Tighten up function signature for dedupePair ([17923](https://github.com/civicrm/civicrm-core/pull/17923))**
+
+- **[Ref] Move noisily deprecate  BaseIPN->sendMail, call api from it rather than BAO function ([17982](https://github.com/civicrm/civicrm-core/pull/17982))**
+
+- **[REF] Use CRM_Utils_Mail::send for sending emails for confirming unsu… ([17396](https://github.com/civicrm/civicrm-core/pull/17396))**
+
+- **CRM_Core_BAO_Cache - Remove functions deprecated a year ago ([17989](https://github.com/civicrm/civicrm-core/pull/17989))**
+
+- **[Test framework] re-re-fix test and add test for test ([18013](https://github.com/civicrm/civicrm-core/pull/18013))**
+
+- **Re-fix test ([18009](https://github.com/civicrm/civicrm-core/pull/18009))**
+
+- **[NFC] Improve docs for APIv4 Save action ([18004](https://github.com/civicrm/civicrm-core/pull/18004))**
+
+- **dev/core#1909 - E_NOTICE on contribution edit ([18006](https://github.com/civicrm/civicrm-core/pull/18006))**
+
+- **dev/core#1918 - Remove dubious qfkey checking code that never runs ([18007](https://github.com/civicrm/civicrm-core/pull/18007))**
+
+- **5.28 ([18008](https://github.com/civicrm/civicrm-core/pull/18008))**
+
+- **[REF] Reduce calls to CRM_Member_PseudoConstant::membershipType ([17987](https://github.com/civicrm/civicrm-core/pull/17987))**
+
+- **dev/core#1915 - E_NOTICE when making pcp contribution ([18002](https://github.com/civicrm/civicrm-core/pull/18002))**
+
+- **[Test framework] - Update failing test ([18003](https://github.com/civicrm/civicrm-core/pull/18003))**
+
+- **Fix repeattransaction api to use custom data from the template contribution ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
+
+- **dev/financial#139 contribution receive_date shouldn't change when payments come in ([17777](https://github.com/civicrm/civicrm-core/pull/17777))**
+
+- **5.28 ([17997](https://github.com/civicrm/civicrm-core/pull/17997))**
+
+- **Fix case activity field set to allow long details to be exported ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
+
+- **dev/core#1913 Allow for schemas to be added by extensions if they are… ([17986](https://github.com/civicrm/civicrm-core/pull/17986))**
+
+- **[REF] Use Standard function cacheClause to re-use contact acl cache t… ([17707](https://github.com/civicrm/civicrm-core/pull/17707))**
+
+- **Fixed filling default values for tagssets in the advanced search form ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
+
+- **dev/core#1909 - Avoid E_Notice on SMS provider form when no default url ([17985](https://github.com/civicrm/civicrm-core/pull/17985))**
+
+- **Remove duplicate cache flush ([17988](https://github.com/civicrm/civicrm-core/pull/17988))**
+
+- **[REF] Extract setUserContext on contribution form & cleanup on backend add membership form ([17968](https://github.com/civicrm/civicrm-core/pull/17968))**
+
+- **dev/core#1755 Fix reCaptcha on Mailing Subscribe ([17305](https://github.com/civicrm/civicrm-core/pull/17305))**
+
+- **[REF] Make explicit what we are doing with 'values' in this code ([17979](https://github.com/civicrm/civicrm-core/pull/17979))**
+
+- **Simplify caching of status checks ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
+
+- **[REF] Reduce interaction between dedupe code and createProfileContact ([17920](https://github.com/civicrm/civicrm-core/pull/17920))**
+
+- **ensure custom field checkboxes are populated in profiles ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
+
+- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([17927](https://github.com/civicrm/civicrm-core/pull/17927))**
+
+- **[REF] Minor code clean up ([17974](https://github.com/civicrm/civicrm-core/pull/17974))**
+
+- **5.28 to master ([17976](https://github.com/civicrm/civicrm-core/pull/17976))**
+
+- **[REF] Grant cleanup ([17967](https://github.com/civicrm/civicrm-core/pull/17967))**
+
+- **[NFC] Add in a unit test of calling the contribution page widget endp… ([17965](https://github.com/civicrm/civicrm-core/pull/17965))**
+
+- **5.28 ([17963](https://github.com/civicrm/civicrm-core/pull/17963))**
+
+- **dev/core#1909 Fix E-notice when adding a field on a profile ([17962](https://github.com/civicrm/civicrm-core/pull/17962))**
+
+- **dev/core#1909 Fix e-notice when adding a payment processor ([17964](https://github.com/civicrm/civicrm-core/pull/17964))**
+
+- **dev/core#1909 - E_NOTICE opening file-on-case ([17959](https://github.com/civicrm/civicrm-core/pull/17959))**
+
+- **[Ref] Simplify field reference ([17941](https://github.com/civicrm/civicrm-core/pull/17941))**
+
+- **[Test framework] - Combine triplicate createCase functions ([17957](https://github.com/civicrm/civicrm-core/pull/17957))**
+
+- **[REF] Refactor to use the standard CRM_Core_Form::addRadio function f… ([17932](https://github.com/civicrm/civicrm-core/pull/17932))**
+
+- **Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer ([17948](https://github.com/civicrm/civicrm-core/pull/17948))**
+
+- **[REF] Fix the default to_financial_account_id for generated transactions ([17938](https://github.com/civicrm/civicrm-core/pull/17938))**
+
+- **APIv4 - Add keyword to select all custom fields ([17955](https://github.com/civicrm/civicrm-core/pull/17955))**
+
+- **[REF] Upgrade dompdf version to be more compatible with PHP7.4 ([17946](https://github.com/civicrm/civicrm-core/pull/17946))**
+
+- **[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements ([17939](https://github.com/civicrm/civicrm-core/pull/17939))**
+
+- **dev/drupal#127 - CRM_Core_Session::setStatus() gets ignored sometimes ([17914](https://github.com/civicrm/civicrm-core/pull/17914))**
+
+- **5.28 to master ([17953](https://github.com/civicrm/civicrm-core/pull/17953))**
+
+- **[REF] Remove unnecessary complexity on im export ([17949](https://github.com/civicrm/civicrm-core/pull/17949))**
+
+- **NFC - Docblock cleanup ([17945](https://github.com/civicrm/civicrm-core/pull/17945))**
+
+- **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
+
+- **Remove error checking by-pass in tests ([17940](https://github.com/civicrm/civicrm-core/pull/17940))**
+
+- **Remove extraneous opportunistic cache flush. ([17936](https://github.com/civicrm/civicrm-core/pull/17936))**
+
+- **dev/core#1902: "Contribution Source" profile field has no effect ([17930](https://github.com/civicrm/civicrm-core/pull/17930))**
+
+- **[REF] GroupContact BAO - Minor code cleanup ([17928](https://github.com/civicrm/civicrm-core/pull/17928))**
+
+- **5.28 to master ([17931](https://github.com/civicrm/civicrm-core/pull/17931))**
+
+- **[REF] Minor function signuture cleanup ([17922](https://github.com/civicrm/civicrm-core/pull/17922))**
+
+- **[REF] Do not pass variable by reference ([17921](https://github.com/civicrm/civicrm-core/pull/17921))**
+
+- **5.28 ([17926](https://github.com/civicrm/civicrm-core/pull/17926))**
+
+- **[NFC] Update a few doc/wiki links in code comments ([17918](https://github.com/civicrm/civicrm-core/pull/17918))**
+
+- **Improve caching of current domain ([17916](https://github.com/civicrm/civicrm-core/pull/17916))**
+
+- **Setup UI - Validate that at least one "Component" is enabled ([17778](https://github.com/civicrm/civicrm-core/pull/17778))**
+
+- **Member detail report: nest "in" options in parentheses ([17911](https://github.com/civicrm/civicrm-core/pull/17911))**
+
+- **Fix sticky table header on "Find Activities" page ([17917](https://github.com/civicrm/civicrm-core/pull/17917))**
+
+- **5.28 ([17908](https://github.com/civicrm/civicrm-core/pull/17908))**
+
+- **[REF] remove unnecessary variable variables ([17903](https://github.com/civicrm/civicrm-core/pull/17903))**
+
+- **dev/core#1855 - Allow different output formats for CiviReport results and untangle code ([17901](https://github.com/civicrm/civicrm-core/pull/17901))**
+
+- **[REF] - Add helper function for the repetitive task of fetching multilingual ([17650](https://github.com/civicrm/civicrm-core/pull/17650))**
+
+- **[unreleased regression] Dummy processor now is ID 7 on buildkit sites ([17905](https://github.com/civicrm/civicrm-core/pull/17905))**
+
+- **Remove unused "ufUniqID" session variable ([17904](https://github.com/civicrm/civicrm-core/pull/17904))**
+
+- **Replace a load of references to the wiki with docs links ([17900](https://github.com/civicrm/civicrm-core/pull/17900))**
+
+- **dev/core#1894 - Make CRM_Activity_Form_SearchTest::testQill less time-sensitive ([17902](https://github.com/civicrm/civicrm-core/pull/17902))**
+
+- **dev/core#183 Use TempTable builder to generate table for import ([17827](https://github.com/civicrm/civicrm-core/pull/17827))**
+
+- **Remove check for valid email in synchronizeUFMatch ([17771](https://github.com/civicrm/civicrm-core/pull/17771))**
+
+- **Call apiv4 from Contribution create rather than fugly addActivity function ([17881](https://github.com/civicrm/civicrm-core/pull/17881))**
+
+- **APIv4 - Add BasicEntity helper class ([17899](https://github.com/civicrm/civicrm-core/pull/17899))**
+
+- **mailing#70 Don't create users for test mail if user doesn't have permission ([17867](https://github.com/civicrm/civicrm-core/pull/17867))**
+
+- **Add APIv4 and pseudoconstants for RelationshipCache ([17879](https://github.com/civicrm/civicrm-core/pull/17879))**
+
+- **dev/core#1670 copy custom fields from master to shared address ([17580](https://github.com/civicrm/civicrm-core/pull/17580))**
+
+- **[Ref] Unit test attempt to create reported bugs , minor cleanup ([17560](https://github.com/civicrm/civicrm-core/pull/17560))**
+
+- **Update version in the test_data_second_domain file and also update th… ([17897](https://github.com/civicrm/civicrm-core/pull/17897))**
+
+- **dev/core#1888 - Fix one line in PR 17888  ([17898](https://github.com/civicrm/civicrm-core/pull/17898))**
+
+- **Be a little less supportive to cvs ([17896](https://github.com/civicrm/civicrm-core/pull/17896))**
+
+- **dev/core#1888 and dev/core#1885 - Fatal error on advanced search and warnings and missing group display on contact form ([17888](https://github.com/civicrm/civicrm-core/pull/17888))**
+
+- **APIv4 - Specify BridgeEntities to assist with joins ([17808](https://github.com/civicrm/civicrm-core/pull/17808))**
+
+- **Contribution Summary Report: Taking the currency filtered in the "gen… ([16736](https://github.com/civicrm/civicrm-core/pull/16736))**
+
+- **Event Cart ext: Move menu entries to extension ([17891](https://github.com/civicrm/civicrm-core/pull/17891))**
+
+- **5.28 ([17895](https://github.com/civicrm/civicrm-core/pull/17895))**
+
+- **[Test Framework] - Tests for report downloads ([17892](https://github.com/civicrm/civicrm-core/pull/17892))**
+
+- **dev/core#1578 - Fix APIv4 chaining with custom fields ([17866](https://github.com/civicrm/civicrm-core/pull/17866))**
+
+- **Unit test for #17361 ([17882](https://github.com/civicrm/civicrm-core/pull/17882))**
+
+- **EventCart ext: Cleanup and move form components to ext ([17885](https://github.com/civicrm/civicrm-core/pull/17885))**
+
+- **EventCart ext: Fix autogenerated code, remove unused hooks, update readme ([17884](https://github.com/civicrm/civicrm-core/pull/17884))**
+
+- **Load contribution page if live payment processor is disabled but test is available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
+
+- **Search debug ([17887](https://github.com/civicrm/civicrm-core/pull/17887))**
+
+- **dev/core#1767 Fix phone key parsing in CRM_Dedupe_Finder ([17361](https://github.com/civicrm/civicrm-core/pull/17361))**
+
+- **[NFC] Fix nonstandard header comments ([17880](https://github.com/civicrm/civicrm-core/pull/17880))**
+
+- **dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates ([17480](https://github.com/civicrm/civicrm-core/pull/17480))**
+
+- **Use new checkPermissions shorthand in api calls ([17874](https://github.com/civicrm/civicrm-core/pull/17874))**
+
+- **5.28 ([17878](https://github.com/civicrm/civicrm-core/pull/17878))**
+
+- **Simplify flushing group contact cache query to reduce table locking and improve performance ([17846](https://github.com/civicrm/civicrm-core/pull/17846))**
+
+- **dev/core#1869 - Include BOM in attachment when sending CSV CiviReport via mail_report job ([17806](https://github.com/civicrm/civicrm-core/pull/17806))**
+
+- **dev/core#1280 Fix ContributionPage soft_credit translation ([16838](https://github.com/civicrm/civicrm-core/pull/16838))**
+
+- **[NFC] Comment block cleanup ([17872](https://github.com/civicrm/civicrm-core/pull/17872))**
+
+- **REF Extract addToRecentItems from membership create ([17524](https://github.com/civicrm/civicrm-core/pull/17524))**
+
+- **Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
+
+- **dev/membership#18 Enhance parameters for Job.process_membership ([16298](https://github.com/civicrm/civicrm-core/pull/16298))**
+
+- **Fix currency symbol for Total Amount on contribution page ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
+
+- **RelationshipCache - Add a high-level index to facilitate relationship queries (more fields) ([17781](https://github.com/civicrm/civicrm-core/pull/17781))**
+
+- **[REF] Fix a couple of jQuery errors that have cropped up ([17871](https://github.com/civicrm/civicrm-core/pull/17871))**
+
+- **Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks ([17831](https://github.com/civicrm/civicrm-core/pull/17831))**
+
+- **APIv4 - Add shorthand for setCheckPermissions() ([17834](https://github.com/civicrm/civicrm-core/pull/17834))**
+
+- **Use PrematureExit exception instead of weird hack in tests ([17870](https://github.com/civicrm/civicrm-core/pull/17870))**
+
+- **dev/core#1113 - Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing a membership ([16429](https://github.com/civicrm/civicrm-core/pull/16429))**
+
+- **(REF) regen.sh - Remove unusual handling of `zipcodes.mysql` ([17869](https://github.com/civicrm/civicrm-core/pull/17869))**
+
+- **dev/report#43 - Icon after saving a civireport instance is misleading ([17863](https://github.com/civicrm/civicrm-core/pull/17863))**
+
+- **Remove unnecessary try/catch per #17729 ([17823](https://github.com/civicrm/civicrm-core/pull/17823))**
+
+- **dev/core#1725 Only export primary address fields ([17458](https://github.com/civicrm/civicrm-core/pull/17458))**
+
+- **api_v3_TaxContributionPageTest fix - remove hard coded processor id ([17860](https://github.com/civicrm/civicrm-core/pull/17860))**
+
+- **Fixed DB Error: syntax error if line item refers to civicrm_case ([16626](https://github.com/civicrm/civicrm-core/pull/16626))**
+
+- **Fix potential js error on summary screen when reloading blocks ([17865](https://github.com/civicrm/civicrm-core/pull/17865))**
+
+- **Search Ext: fix loading options and parsing custom field names ([17864](https://github.com/civicrm/civicrm-core/pull/17864))**
+
+- **EventCart - Resolve BAO identity and uncommitted DAO changes ([17861](https://github.com/civicrm/civicrm-core/pull/17861))**
+
+- **[REF] ScheduledJob cleanup, remove unused var ([17862](https://github.com/civicrm/civicrm-core/pull/17862))**
+
+- **dev/core#1090 Update extendedSerializeData to use the Backbone namesp… ([17855](https://github.com/civicrm/civicrm-core/pull/17855))**
+
+- **dev/core#1874 - Failing test for new Individual form ([17835](https://github.com/civicrm/civicrm-core/pull/17835))**
+
+- **Bump lodash from 4.17.15 to 4.17.19 ([17858](https://github.com/civicrm/civicrm-core/pull/17858))**
+
+- **5.28 ([17859](https://github.com/civicrm/civicrm-core/pull/17859))**
+
+- **[REF] Migrate Event Cart Setting into the Extension ([17841](https://github.com/civicrm/civicrm-core/pull/17841))**
+
+- **5.28 ([17856](https://github.com/civicrm/civicrm-core/pull/17856))**
+
+- **handlePaymentNotification() should not be declared as a static method ([17849](https://github.com/civicrm/civicrm-core/pull/17849))**
+
+- **[REF] Only printOnly once ([17850](https://github.com/civicrm/civicrm-core/pull/17850))**
+
+- **API tests - label versions in dataprovider versionThreeAndFour ([17847](https://github.com/civicrm/civicrm-core/pull/17847))**
+
+- **dev/core#1880 add backticks to custom field insertions ([17848](https://github.com/civicrm/civicrm-core/pull/17848))**
+
+- **(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests ([17845](https://github.com/civicrm/civicrm-core/pull/17845))**
+
+- **dev/core#1872 - Packages and vendor path calculation used in system check is outdated ([17844](https://github.com/civicrm/civicrm-core/pull/17844))**
+
+- **[NFC] Re run regen after recent merges ([17842](https://github.com/civicrm/civicrm-core/pull/17842))**
+
+- **5.28 ([17843](https://github.com/civicrm/civicrm-core/pull/17843))**
+
+- **Move BAO and template files into event cart ([17743](https://github.com/civicrm/civicrm-core/pull/17743))**
+
+- **Update regen.sh with new & upcoming core extensions ([17839](https://github.com/civicrm/civicrm-core/pull/17839))**
+
+- **MembershipRenewalTest - Fix failure ([17830](https://github.com/civicrm/civicrm-core/pull/17830))**
+
+- **Remove hard coded charset. ([17826](https://github.com/civicrm/civicrm-core/pull/17826))**
+
+- **(REF) WebsiteTest - Mitigate flaky failures ([17833](https://github.com/civicrm/civicrm-core/pull/17833))**
+
+- **dev/core#1812 Missing view when logging set in a non-US English instance ([17815](https://github.com/civicrm/civicrm-core/pull/17815))**
+
+- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([13958](https://github.com/civicrm/civicrm-core/pull/13958))**
+
+- **APIv4 - Add activity contacts to APIv4 field spec ([17766](https://github.com/civicrm/civicrm-core/pull/17766))**
+
+- **Adjust mysql SET NAMES in remaining places as we agreed this was the go ([17825](https://github.com/civicrm/civicrm-core/pull/17825))**
+
+- **core#1805: Autocomplete-select custom field is not searchable ([17569](https://github.com/civicrm/civicrm-core/pull/17569))**
+
+- **event#38 fix wording on event reg page ([17695](https://github.com/civicrm/civicrm-core/pull/17695))**
+
+- **core#1795: Searchable Parent tags ([17513](https://github.com/civicrm/civicrm-core/pull/17513))**
+
+- **dev/core#1768 - Add CiviMail synchronisation frequency setting. ([17709](https://github.com/civicrm/civicrm-core/pull/17709))**
+
+- **Make new email open and url routes 'public' ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
+
+- **dev/core#1871 - require_once's that include "packages/" in the path don't work on drupal 8 ([17822](https://github.com/civicrm/civicrm-core/pull/17822))**
+
+- **Make api get upgrade-safe ([17729](https://github.com/civicrm/civicrm-core/pull/17729))**
+
+- **5.28 ([17799](https://github.com/civicrm/civicrm-core/pull/17799))**
+
+- **CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers ([17780](https://github.com/civicrm/civicrm-core/pull/17780))**
+
+- **CheckEnv - Give new installs a grace period before 'Cron Not Running' msg ([17800](https://github.com/civicrm/civicrm-core/pull/17800))**
+
+- **Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()' ([17816](https://github.com/civicrm/civicrm-core/pull/17816))**
+
+- **dev/core#1861 fix failure to unset location_type_id when saving uffield ([17812](https://github.com/civicrm/civicrm-core/pull/17812))**
+
+- **dev/core#1863 Downgrade checkEnvironment level and skip non-prod checks ([17807](https://github.com/civicrm/civicrm-core/pull/17807))**
+
+- **reporting#21 - don't multiple contribution details when a 1-to-many r… ([15435](https://github.com/civicrm/civicrm-core/pull/15435))**
+
+- **Add hidden tag to search extension ([17789](https://github.com/civicrm/civicrm-core/pull/17789))**
+
+- **[REF] Follow up cleanup ([17788](https://github.com/civicrm/civicrm-core/pull/17788))**
+
+- **[REF] Remove ACL join on temp table creation in Member ContributionDe… ([17723](https://github.com/civicrm/civicrm-core/pull/17723))**
+
+- **dev/core#1858 Prevent Duplicate contact records being created and har… ([17769](https://github.com/civicrm/civicrm-core/pull/17769))**
+
+- **REF - Cleanup StatusPreference BAO to be more standard ([17801](https://github.com/civicrm/civicrm-core/pull/17801))**
+
+- **Sort permittedActivityTypes ([17794](https://github.com/civicrm/civicrm-core/pull/17794))**
+
+- **[REF] Do or do not - there is no try ([17795](https://github.com/civicrm/civicrm-core/pull/17795))**
+
+- **Add auto-renew status to membership detail report ([17683](https://github.com/civicrm/civicrm-core/pull/17683))**
+
+- **APIv4 - Fix saving custom fields with same name ([17791](https://github.com/civicrm/civicrm-core/pull/17791))**
+
+- **Add system check to ensure WP base page exists ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
+
+- **dev/core#1868 - Regression - Description field is always blank on profiles admin page and slew of E_NOTICES ([17786](https://github.com/civicrm/civicrm-core/pull/17786))**
+
+- **Fixed notice error on Relationships report ([17787](https://github.com/civicrm/civicrm-core/pull/17787))**
+
+- **getLoggedInContactID() is a static function ([17783](https://github.com/civicrm/civicrm-core/pull/17783))**
+
+- **5.28 ([17782](https://github.com/civicrm/civicrm-core/pull/17782))**
+
+- **dev/core#1679: Ensure Paypal IPN always updates the next scheduled payment date ([17744](https://github.com/civicrm/civicrm-core/pull/17744))**
+
+- **5.28 ([17774](https://github.com/civicrm/civicrm-core/pull/17774))**
+
+- **dev/core#1853 - Fix validation errors when removing contact subtype ([17765](https://github.com/civicrm/civicrm-core/pull/17765))**
+
+- **Add search extension ([17775](https://github.com/civicrm/civicrm-core/pull/17775))**
+
+- **[dev/core#750] Don't check server variables if we're running in CLI ([17636](https://github.com/civicrm/civicrm-core/pull/17636))**
+
+- **Remove PaymentExpress ipn class ([17763](https://github.com/civicrm/civicrm-core/pull/17763))**
+
+- **Status Checks - Use more specific label regarding "Domain"/"Organization" check ([17776](https://github.com/civicrm/civicrm-core/pull/17776))**
+
+- **5.28 to master ([17770](https://github.com/civicrm/civicrm-core/pull/17770))**
+
+- **dev/drupal#114 and dev/core#1647 - Remove resource url status check ([17754](https://github.com/civicrm/civicrm-core/pull/17754))**
+
+- **Bump minimum upgradable version to 4.4.7 ([17750](https://github.com/civicrm/civicrm-core/pull/17750))**
+
+- **[REF] Unused interface CRM_Report_Interface ([17767](https://github.com/civicrm/civicrm-core/pull/17767))**
+
+- **[TEST] Failing test for PR 16559 ([17256](https://github.com/civicrm/civicrm-core/pull/17256))**
+
+- **update to pr 16559 ([17764](https://github.com/civicrm/civicrm-core/pull/17764))**
+
+- **Remove unused, deprecated functions ([17761](https://github.com/civicrm/civicrm-core/pull/17761))**
+
+- **Improve efficiency of findFiles ([17745](https://github.com/civicrm/civicrm-core/pull/17745))**
+
+- **APIv4 Explorer: Improve selection of fields for HAVING ([17746](https://github.com/civicrm/civicrm-core/pull/17746))**
+
+- **More unused functions in GenCode ([17756](https://github.com/civicrm/civicrm-core/pull/17756))**
+
+- **Fix PHP notice on wordpress permissions form ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
+
+- **core#1826: Ignore location_type_id when deduping postal address ([17645](https://github.com/civicrm/civicrm-core/pull/17645))**
+
+- **[Unit Test] dev/core#1173 and dev/core#1827 - Test for activity tag search - PR 17655 ([17755](https://github.com/civicrm/civicrm-core/pull/17755))**
+
+- **Convert CRM.utils.formatDate tests to karma ([17757](https://github.com/civicrm/civicrm-core/pull/17757))**
+
+- **dev/core#1827 activity search - fixing search by tags ([17655](https://github.com/civicrm/civicrm-core/pull/17655))**
+
+- **Unused functions in GenCode ([17753](https://github.com/civicrm/civicrm-core/pull/17753))**
+
+- **5.28 ([17751](https://github.com/civicrm/civicrm-core/pull/17751))**
+
+- **Teach CRM.utils.formatDate to also show time ([17684](https://github.com/civicrm/civicrm-core/pull/17684))**
+
+- **Fix typo in templates/CRM/Report/Form/Tabs/GroupBy.tpl ([17747](https://github.com/civicrm/civicrm-core/pull/17747))**
+
+- **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
+
+- **dev/core#1966 Fix Output for StateProvince and Country Fields ([620](https://github.com/civicrm/civicrm-drupal/pull/620))**
+
+- **Fixed for multi-select filter ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
+
+- **fix url for file field ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
+
+- **[Test] Update hook signature in test ([609](https://github.com/civicrm/civicrm-drupal/pull/609))**
+
+- **NFC - Docblock cleanup ([610](https://github.com/civicrm/civicrm-drupal/pull/610))**
+
+- **Installation - Support "activate first" w/setup UI ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
+
+- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin ([214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
+
+- **Remove unused "ufUniqID" session variable ([213](https://github.com/civicrm/civicrm-wordpress/pull/213))**
+
+- **5.28 to master ([212](https://github.com/civicrm/civicrm-wordpress/pull/212))**
+
+- **Installation - Support "activate first" w/setup UI ([121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
+
+- **[NFC] Update versions file to remove reference to Mail_mime and Mail ([301](https://github.com/civicrm/civicrm-packages/pull/301))**
+
+- **[REF] Remove mail_mime package as now supplied by composer ([300](https://github.com/civicrm/civicrm-packages/pull/300))**
+
+- **Remove Net packages Net_Curl Net_DIME as they do not appear to be used ([294](https://github.com/civicrm/civicrm-packages/pull/294))**
+
+- **[REF] Remove some deprecated size function calls replaced with length ([299](https://github.com/civicrm/civicrm-packages/pull/299))**
+
+## <a name="misc"></a>Miscellany
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman; Christian Wach; Circle Interactive - Pradeep Nayak; CiviCoop - Jaap Jansma, Klaas Eikelboom; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; dependabot[bot]; Fuzion - Jitendra Purohit; iXiam - César Ramos; JMA Consulting - Monish Deb, Seamus Lee; John Kingsnorth; Joinery - Allen Shaw; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; muniodiego; Progressive Technology Project - Jamie McClelland; Squiffle Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Timbsoft Technologies - Tunbola Ogunwande; Wikimedia Foundation - Eileen McNaughton
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian Greens - Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions - Alan Dixon; Christian Wach; Circle Interactive - Pradeep Nayak; civibot[bot]; CiviCoop - Jaap Jansma, Klaas Eikelboom; civicrm-builder; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; CompuCorp - Jamie Novick; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; DevApp - Adam Kwiatkowski; elcapo; Francesc Bassas i Bullich; Freeform Solutions - Herb van den Dool; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; irenemeisel; iXiam - César Ramos; JMA Consulting - Joe Murray, Monish Deb, Seamus Lee; Joinery - Allen Shaw; Korlon - Stuart Gaston; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Nicol Wistreich; Progressive Technology Project - Jamie McClelland; Rar9; Ray Wright; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Third Sector Design - Michael McAndrew; Wikimedia Foundation - Eileen McNaughton
\ No newline at end of file

From cb42725f8ea77ae0e6484fdb8340c2de8dc79317 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 1 Sep 2020 11:18:07 -0400
Subject: [PATCH 067/834] 5.29.0 release notes: added boilerplate

---
 release-notes.md        | 11 +++++++++++
 release-notes/5.29.0.md | 24 ++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/release-notes.md b/release-notes.md
index 4baa73d92bd1..31038359517f 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -15,6 +15,17 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
+## CiviCRM 5.29.0
+
+Released September 2, 2020
+
+- **[Synopsis](release-notes/5.29.0.md#synopsis)**
+- **[Features](release-notes/5.29.0.md#features)**
+- **[Bugs resolved](release-notes/5.29.0.md#bugs)**
+- **[Miscellany](release-notes/5.29.0.md#misc)**
+- **[Credits](release-notes/5.29.0.md#credits)**
+- **[Feedback](release-notes/5.29.0.md#feedback)**
+
 ## CiviCRM 5.28.3
 
 Released August 22, 2020
diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index 359cb80c51f6..305ac734d59f 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -1,11 +1,25 @@
 # CiviCRM 5.29.0
 
-Released September 2, 2020;
+Released September 2, 2020
 
+- **[Synopsis](#synopsis)**
 - **[Features](#features)**
 - **[Bugs resolved](#bugs)**
 - **[Miscellany](#misc)**
 - **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities?                                   |         |
+| Change the database schema?                                     |         |
+| Alter the API?                                                  |         |
+| Require attention to configuration options?                     |         |
+| Fix problems installing or upgrading to a previous version?     |         |
+| Introduce features?                                             |         |
+| Fix bugs?                                                       |         |
 
 ## <a name="features"></a>Features
 
@@ -660,4 +674,10 @@ AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman; Christia
 Most authors also reviewed code for this release; in addition, the following
 reviewers contributed their comments:
 
-AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian Greens - Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions - Alan Dixon; Christian Wach; Circle Interactive - Pradeep Nayak; civibot[bot]; CiviCoop - Jaap Jansma, Klaas Eikelboom; civicrm-builder; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; CompuCorp - Jamie Novick; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; DevApp - Adam Kwiatkowski; elcapo; Francesc Bassas i Bullich; Freeform Solutions - Herb van den Dool; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; irenemeisel; iXiam - César Ramos; JMA Consulting - Joe Murray, Monish Deb, Seamus Lee; Joinery - Allen Shaw; Korlon - Stuart Gaston; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Nicol Wistreich; Progressive Technology Project - Jamie McClelland; Rar9; Ray Wright; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Third Sector Design - Michael McAndrew; Wikimedia Foundation - Eileen McNaughton
\ No newline at end of file
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian Greens - Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions - Alan Dixon; Christian Wach; Circle Interactive - Pradeep Nayak; civibot[bot]; CiviCoop - Jaap Jansma, Klaas Eikelboom; civicrm-builder; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; CompuCorp - Jamie Novick; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; DevApp - Adam Kwiatkowski; elcapo; Francesc Bassas i Bullich; Freeform Solutions - Herb van den Dool; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; irenemeisel; iXiam - César Ramos; JMA Consulting - Joe Murray, Monish Deb, Seamus Lee; Joinery - Allen Shaw; Korlon - Stuart Gaston; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Nicol Wistreich; Progressive Technology Project - Jamie McClelland; Rar9; Ray Wright; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Third Sector Design - Michael McAndrew; Wikimedia Foundation - Eileen McNaughton
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andrew Hunt.  If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.

From b1f9364c354720dc9133f42981b0ba00cf032fa5 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 1 Sep 2020 11:18:38 -0400
Subject: [PATCH 068/834] 5.29.0 release notes: yank changes already in 5.8.x

---
 release-notes/5.29.0.md | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index 305ac734d59f..edc783189cb3 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -43,50 +43,20 @@ Released September 2, 2020
 
 - **5.28.2 & 5.29.3 Release Notes ([18228](https://github.com/civicrm/civicrm-core/pull/18228))**
 
-- **dev/core#1964 Fix regression bug on deduping contacts with dedupe_exception matches ([18223](https://github.com/civicrm/civicrm-core/pull/18223))**
-
-- **Fix dedupe regression whereby deleted contacts are found ([18214](https://github.com/civicrm/civicrm-core/pull/18214))**
-
-- **dev/core#1959 Brick\Math\Exception\RoundingNecessaryException ([18206](https://github.com/civicrm/civicrm-core/pull/18206))**
-
-- **Fix regression whereby deleted contacts are in quicksearch results ([18213](https://github.com/civicrm/civicrm-core/pull/18213))**
-
-- **dev/core#1963 - Expanded icon on manage groups appears as unknown icon ([18205](https://github.com/civicrm/civicrm-core/pull/18205))**
-
-- **dev/core#1961 Fix regression - cancel button not working on recurring contributions ([18204](https://github.com/civicrm/civicrm-core/pull/18204))**
-
-- **(dev/core#1846) Container, ClassLoader Caches - Separate caches by ve… ([18200](https://github.com/civicrm/civicrm-core/pull/18200))**
-
-- **dev/core#1945 Fix recur access regression ([18180](https://github.com/civicrm/civicrm-core/pull/18180))**
-
 - **dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings ([18174](https://github.com/civicrm/civicrm-core/pull/18174))**
 
 - **Revert "Swap out button/submit inputs for button elements" ([18185](https://github.com/civicrm/civicrm-core/pull/18185))**
 
 - **Installation doclinks not getting url-rewritten ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
 
-- **cvv required html attribute should depend on backoffice setting ([18166](https://github.com/civicrm/civicrm-core/pull/18166))**
-
-- **[REF] Remove unnecessary comma ([18163](https://github.com/civicrm/civicrm-core/pull/18163))**
-
 - **Fix 5.29 (unreleased) regression using temp tables ([18133](https://github.com/civicrm/civicrm-core/pull/18133))**
 
-- **dev/core#1952 Remove uncessary component checking when exporting all … ([18149](https://github.com/civicrm/civicrm-core/pull/18149))**
-
-- **dev/core#1953 Ensure that Contribution pages do not fail validation o… ([18144](https://github.com/civicrm/civicrm-core/pull/18144))**
-
-- **dev/core#1934 fix regression on merging contacts with settings using contact_id ([18126](https://github.com/civicrm/civicrm-core/pull/18126))**
-
-- **dev/core#1936 Make the price field value label field not required ([18123](https://github.com/civicrm/civicrm-core/pull/18123))**
-
 - **Swap out button/submit inputs for button elements ([18091](https://github.com/civicrm/civicrm-core/pull/18091))**
 
 - **dev/event#40 - EventCart - Check legacy setting until extension is public ([18101](https://github.com/civicrm/civicrm-core/pull/18101))**
 
 - **dev/wordpress#66 Re-instate newer variables but with more support for… ([18068](https://github.com/civicrm/civicrm-core/pull/18068))**
 
-- **[REF] Fix jquery validation for on behalf of fields when combined wit… ([18092](https://github.com/civicrm/civicrm-core/pull/18092))**
-
 - **dev/core#1895 fix first/last name adv search ([17950](https://github.com/civicrm/civicrm-core/pull/17950))**
 
 - **dev/core#1905 force backend links for new "configure" buttons ([18088](https://github.com/civicrm/civicrm-core/pull/18088))**
@@ -635,8 +605,6 @@ Released September 2, 2020
 
 - **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
 
-- **dev/core#1966 Fix Output for StateProvince and Country Fields ([620](https://github.com/civicrm/civicrm-drupal/pull/620))**
-
 - **Fixed for multi-select filter ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
 
 - **fix url for file field ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**

From 50a15c9b8c53ed2373290f2e2dec73fb0c9d2df0 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Tue, 1 Sep 2020 15:55:16 -0400
Subject: [PATCH 069/834] status_id not available when needed

---
 CRM/Case/BAO/Case.php                   |  1 +
 tests/phpunit/CRM/Case/BAO/CaseTest.php | 79 +++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index 5a3f0b81061b..e78e55923653 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -1890,6 +1890,7 @@ public static function getRelatedCases($caseId, $excludeDeleted = TRUE) {
         'case_id' => $dao->id,
         'case_type' => $dao->case_type,
         'client_name' => $clientView,
+        'status_id' => $dao->status_id,
         'case_status' => $statuses[$dao->status_id],
         'links' => $caseView,
       ];
diff --git a/tests/phpunit/CRM/Case/BAO/CaseTest.php b/tests/phpunit/CRM/Case/BAO/CaseTest.php
index 444d1c67c5f6..515257070695 100644
--- a/tests/phpunit/CRM/Case/BAO/CaseTest.php
+++ b/tests/phpunit/CRM/Case/BAO/CaseTest.php
@@ -723,4 +723,83 @@ public function testCreateCaseWithChangedManagerLabel() {
     $this->callAPISuccess('RelationshipType', 'create', $changeParams);
   }
 
+  /**
+   * Test change case status with linked cases choosing the option to
+   * update the linked cases.
+   */
+  public function testChangeCaseStatusLinkedCases() {
+    $loggedInUser = $this->createLoggedInUser();
+    $clientId1 = $this->individualCreate();
+    $clientId2 = $this->individualCreate();
+    $case1 = $this->createCase($clientId1, $loggedInUser);
+    $case2 = $this->createCase($clientId2, $loggedInUser);
+    $linkActivity = $this->callAPISuccess('Activity', 'create', [
+      'case_id' => $case1->id,
+      'source_contact_id' => $loggedInUser,
+      'target_contact' => $clientId1,
+      'activity_type_id' => 'Link Cases',
+      'subject' => 'Test Link Cases',
+      'status_id' => 'Completed',
+    ]);
+
+    // Put it in the format needed for endPostProcess
+    $activity = new StdClass();
+    $activity->id = $linkActivity['id'];
+    $params = ['link_to_case_id' => $case2->id];
+    CRM_Case_Form_Activity_LinkCases::endPostProcess(NULL, $params, $activity);
+
+    // Get the option_value.value for case status Closed
+    $closedStatusResult = $this->callAPISuccess('OptionValue', 'get', [
+      'option_group_id' => 'case_status',
+      'name' => 'Closed',
+      'return' => ['value'],
+    ]);
+    $closedStatus = $closedStatusResult['values'][$closedStatusResult['id']]['value'];
+
+    // Go thru the motions to change case status
+    $form = new CRM_Case_Form_Activity_ChangeCaseStatus();
+    $form->_caseId = [$case1->id];
+    $form->_oldCaseStatus = [$case1->status_id];
+    $params = [
+      'id' => $case1->id,
+      'case_status_id' => $closedStatus,
+      'updateLinkedCases' => '1',
+    ];
+
+    CRM_Case_Form_Activity_ChangeCaseStatus::beginPostProcess($form, $params);
+    // Check that the second case is now also in the form member.
+    $this->assertEquals([$case1->id, $case2->id], $form->_caseId);
+
+    // We need to pass in an actual activity later
+    $result = $this->callAPISuccess('Activity', 'create', [
+      'case_id' => $case1->id,
+      'source_contact_id' => $loggedInUser,
+      'target_contact' => $clientId1,
+      'activity_type_id' => 'Change Case Status',
+      'subject' => 'Status changed',
+      'status_id' => 'Completed',
+    ]);
+    $changeStatusActivity = new CRM_Activity_DAO_Activity();
+    $changeStatusActivity->id = $result['id'];
+    $changeStatusActivity->find(TRUE);
+
+    $params = [
+      'case_id' => $case1->id,
+      'target_contact_id' => [$clientId1],
+      'case_status_id' => $closedStatus,
+      'activity_date_time' => $changeStatusActivity->activity_date_time,
+    ];
+
+    CRM_Case_Form_Activity_ChangeCaseStatus::endPostProcess($form, $params, $changeStatusActivity);
+
+    // @todo Check other case got closed.
+    /*
+     * We can't do this here because it doesn't happen until the parent
+     * activity does its thing.
+    $linkedCase = $this->callAPISuccess('Case', 'get', ['id' => $case2->id]);
+    $this->assertEquals($closedStatus, $linkedCase['values'][$linkedCase['id']]['status_id']);
+    $this->assertEquals(date('Y-m-d', strtotime($changeStatusActivity->activity_date_time)), $linkedCase['values'][$linkedCase['id']]['end_date']);
+     */
+  }
+
 }

From 353282c5b079c879af998149dcdb9e994edaec87 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 1 Sep 2020 16:48:57 -0400
Subject: [PATCH 070/834] Revert #18005 Fix buggy placement of icons

---
 CRM/Core/Controller.php                       |  4 +-
 CRM/Core/Smarty/plugins/block.crmButton.php   |  2 +-
 ang/crmMailingAB/EditCtrl/report.html         |  2 +-
 ang/crmUi.js                                  |  2 +-
 css/civicrm.css                               | 73 ++++++++++++++-----
 js/crm.ajax.js                                |  2 +-
 .../CRM/Admin/Form/Preferences/Display.tpl    |  4 +-
 templates/CRM/Admin/Page/APIExplorer.tpl      |  4 +-
 .../Contact/Form/Search/Custom/FullText.tpl   | 14 ++--
 .../Event/Form/ParticipantFeeSelection.tpl    |  2 +-
 templates/CRM/Event/Page/DashBoard.tpl        |  2 +-
 templates/CRM/Report/Form/Actions.tpl         |  2 +-
 templates/CRM/Tag/Page/Tag.tpl                | 20 ++---
 templates/CRM/common/formButtons.tpl          |  6 +-
 14 files changed, 91 insertions(+), 48 deletions(-)

diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php
index 68c653185855..4a4254c25505 100644
--- a/CRM/Core/Controller.php
+++ b/CRM/Core/Controller.php
@@ -568,8 +568,8 @@ public function wizardHeader($currentPageName) {
   public function addWizardStyle(&$wizard) {
     $wizard['style'] = [
       'barClass' => '',
-      'stepPrefixCurrent' => '<i class="crm-i fa-chevron-right" aria-hidden="true"></i> ',
-      'stepPrefixPast' => '<i class="crm-i fa-check" aria-hidden="true"></i> ',
+      'stepPrefixCurrent' => '<i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;',
+      'stepPrefixPast' => '<i class="crm-i fa-check" aria-hidden="true"></i>&nbsp;',
       'stepPrefixFuture' => ' ',
       'subStepPrefixCurrent' => '&nbsp;&nbsp;',
       'subStepPrefixPast' => '&nbsp;&nbsp;',
diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php
index 64543d595768..390a8e73030e 100644
--- a/CRM/Core/Smarty/plugins/block.crmButton.php
+++ b/CRM/Core/Smarty/plugins/block.crmButton.php
@@ -47,7 +47,7 @@ function smarty_block_crmButton($params, $text, &$smarty) {
     if (strpos($icon, 'fa-') !== 0) {
       $icon = "fa-$icon";
     }
-    $iconMarkup = "<i class='crm-i $icon' aria-hidden=\"true\"></i> ";
+    $iconMarkup = "<i class='crm-i $icon' aria-hidden=\"true\"></i>&nbsp; ";
   }
   // All other params are treated as html attributes
   CRM_Utils_Array::remove($params, 'icon', 'p', 'q', 'a', 'f', 'h', 'fb', 'fe');
diff --git a/ang/crmMailingAB/EditCtrl/report.html b/ang/crmMailingAB/EditCtrl/report.html
index 5e97ae964a5b..18380923c1ee 100644
--- a/ang/crmMailingAB/EditCtrl/report.html
+++ b/ang/crmMailingAB/EditCtrl/report.html
@@ -83,7 +83,7 @@
           class="crm-hover-button action-item"
           ng-href="{{statUrl(am.mailing, statType, 'report')}}"
           title="{{ts('Reports for \'%1\'', {1: statType.title})}}"
-          crm-icon="fa-clipboard"
+          crm-icon="clipboard"
           ></a>
       </td>
       <td ng-show="abtest.ab.status == 'Testing'"></td>
diff --git a/ang/crmUi.js b/ang/crmUi.js
index 355939c2dcf7..c6ba58b1464e 100644
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -908,7 +908,7 @@
     })
 
     // Example for Font Awesome: <button crm-icon="fa-check">Save</button>
-    // Example for jQuery UI (deprecated): <button crm-icon="fa-check">Save</button>
+    // Example for jQuery UI (deprecated): <button crm-icon="check">Save</button>
     .directive('crmIcon', function() {
       return {
         restrict: 'EA',
diff --git a/css/civicrm.css b/css/civicrm.css
index 70e5a0ef01dd..a3264938b0ae 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1835,6 +1835,8 @@ input.crm-form-entityref {
 
 .crm-container .crm-button input {
   background: none;
+  _background: #6C6C6C;
+  /* IE6 only */
   border: medium none;
   color: #FFF;
   cursor: pointer;
@@ -1849,12 +1851,6 @@ input.crm-form-entityref {
   margin-left: 20px;
 }
 
-/* Reset WP backend min-height for buttons */
-
-.wp-core-ui .crm-container .button {
-  min-height: 0;
-}
-
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
@@ -1874,19 +1870,11 @@ input.crm-form-entityref {
   border: 1px solid #3e3e3e;
 }
 
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container a.button:visited,
 .crm-container span.crm-button {
   display: block;
-  float: left;
-  overflow: hidden;
-  line-height: 135%;
-}
-
-/* Preserving the important but not sure why */
-.crm-container span.crm-button {
   float: left !important;
+  overflow: hidden;
+  padding: 1px;
 }
 
 .crm-container button.crm-button {
@@ -1904,12 +1892,22 @@ input.crm-form-entityref {
 
 .crm-container .crm-button input[type=button],
 .crm-container .crm-button input.crm-form-submit {
-  padding: 0;
+  padding: 3px 5px 2px;
   margin: 0;
   background: none;
+  _background: #6C6C6C;
+  /* IE6 only */
   border: none;
 }
 
+.crm-container a.button,
+.crm-container a.button:link,
+.crm-container a.button:visited {
+  display: block;
+  float: left;
+  line-height: 135%;
+}
+
 .crm-container .crm-button:hover,
 .crm-container .crm-button:focus,
 .crm-container input[type=submit]:hover,
@@ -2048,6 +2046,31 @@ input.crm-form-entityref {
   margin-left: 3px;
 }
 
+.crm-container .crm-button.crm-icon-button {
+  padding: 2px 2px 1px 4px;
+}
+
+.crm-container .crm-button.crm-icon-button input {
+  padding-left: 18px;
+}
+
+.crm-container .crm-button.button-crm-i {
+  padding: 2px 0 1px 5px;
+}
+
+.crm-container .crm-button.button-crm-i input {
+  padding-left: 0;
+}
+
+.crm-container .crm-button-icon {
+  background-image: url("../i/icons/jquery-ui-FFFFFF.png");
+  height: 16px;
+  width: 16px;
+  display: block;
+  position: absolute;
+  pointer-events: none;
+}
+
 .crm-container .delete-icon {
   background-position: -176px -96px;
 }
@@ -2094,6 +2117,22 @@ a.crm-i:hover {
   color: #86c661;
 }
 
+.crm-i-button {
+  position: relative;
+}
+
+.crm-i-button>.crm-i {
+  position: absolute;
+  pointer-events: none;
+  top: .4em;
+  left: .4em;
+}
+
+.crm-container .crm-button.crm-i-button input[type="button"],
+.crm-container .crm-button.crm-i-button input.crm-form-submit {
+  padding-left: 1.6em;
+}
+
 .crm-container a.helpicon {
   opacity: .8;
 }
diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index e65bd7b2a22c..9a3c3f1ce572 100644
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -517,7 +517,7 @@
             added.push(identifier);
           }
           // display:none causes the form to not submit when pressing "enter"
-          $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'});
+          $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'}).find('.crm-button-icon').hide();
         });
         $el.dialog('option', 'buttons', buttons);
       }
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 44ff0ba7aabb..049a5ebf9975 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -161,8 +161,8 @@
       <td>
         {$form.editor_id.html}
         &nbsp;
-        <span class="crm-button" style="display:inline-block;vertical-align:middle;float:none!important;">
-          <i class="crm-i fa-wrench" aria-hidden="true"></i>
+        <span class="crm-button crm-icon-button" style="display:inline-block;vertical-align:middle;float:none!important;">
+          <i class="crm-i fa-wrench" style="margin: 0 -18px 0 2px;" aria-hidden="true"></i>
           {$form.ckeditor_config.html}
         </span>
       </td>
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 9c127fcb6fca..1e1b8eb497da 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -285,8 +285,8 @@
         </table>
       </div>
       <div class="crm-submit-buttons">
-        <span class="crm-button">
-          <i class="crm-i fa-bolt" aria-hidden="true"></i> <input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
+        <span class="crm-button crm-i-button">
+          <i class="crm-i fa-bolt" aria-hidden="true"></i><input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
         </span>
       </div>
 
diff --git a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
index 51a3c91956d8..6a7d8b516a80 100644
--- a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
@@ -62,7 +62,7 @@
     {if !$table and $summary.addShowAllLink.Contact}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Contact&text=$text"}"
-        title="{ts}View all results for contacts{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for contacts{/ts}</a>
+        title="{ts}View all results for contacts{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for contacts{/ts}</a>
       </div>{/if}
     {* note we using location="below" because we don't want to use rows per page for now. And therefore don't put location="bottom" for now. *}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -125,7 +125,7 @@
     {if !$table and $summary.addShowAllLink.Activity}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Activity&text=$text"}"
-        title="{ts}View all results for activities{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for activities{/ts}</a>
+        title="{ts}View all results for activities{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for activities{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -182,7 +182,7 @@
     {if !$table and $summary.addShowAllLink.Case}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Case&text=$text"}"
-        title="{ts}View all results for cases{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for cases{/ts}</a>
+        title="{ts}View all results for cases{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for cases{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -236,7 +236,7 @@
     {if !$table and $summary.addShowAllLink.Contribution}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Contribution&text=$text"}"
-        title="{ts}View all results for contributions{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for contributions{/ts}</a>
+        title="{ts}View all results for contributions{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for contributions{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -293,7 +293,7 @@
     {if !$table and $summary.addShowAllLink.Participant}
       <div class="crm-section full-text-view-all-section"><a
         href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Participant&text=$text"}"
-        title="{ts}View all results for participants{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for participants{/ts}</a>
+        title="{ts}View all results for participants{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for participants{/ts}</a>
       </div>{/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
     {* END Actions/Results section *}
@@ -349,7 +349,7 @@
     {if !$table and $summary.addShowAllLink.Membership}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Membership&text=$text"}"
-        title="{ts}View all results for memberships{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for memberships{/ts}</a>
+        title="{ts}View all results for memberships{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for memberships{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -395,7 +395,7 @@
   {if !$table and $summary.addShowAllLink.File}
   <div class="crm-section full-text-view-all-section">
     <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=File&text=$text"}"
-          title="{ts}View all results for files{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for files{/ts}</a>
+          title="{ts}View all results for files{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for files{/ts}</a>
   </div>{/if}
   {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
 {* END Actions/Results section *}
diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index f9d3364dae5a..02246d54cba6 100644
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -87,7 +87,7 @@ CRM.$(function($) {
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
   {if !$email}
   <div class="messages status no-popup">
-    <i class="crm-i fa-info-circle" aria-hidden="true"></i> {ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
+    <i class="crm-i fa-info-circle" aria-hidden="true"></i>&nbsp;{ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
   </div>
   {/if}
   <table class="form-layout">
diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl
index d01250ee681b..3ca364f09329 100644
--- a/templates/CRM/Event/Page/DashBoard.tpl
+++ b/templates/CRM/Event/Page/DashBoard.tpl
@@ -87,7 +87,7 @@
       {if $actionColumn}
         <td class="crm-event-isMap">
           {if $values.isMap}
-            <a href="{$values.isMap}" title="{ts}Map event location{/ts}"><i class="crm-i fa-map-marker" aria-hidden="true"></i> {ts}Map{/ts}</a>
+            <a href="{$values.isMap}" title="{ts}Map event location{/ts}"><i class="crm-i fa-map-marker" aria-hidden="true"></i>&nbsp;{ts}Map{/ts}</a>
             &nbsp;|&nbsp;
           {/if}
           {if $values.configure}
diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl
index 34690c1d916d..9aee8f669585 100644
--- a/templates/CRM/Report/Form/Actions.tpl
+++ b/templates/CRM/Report/Form/Actions.tpl
@@ -20,7 +20,7 @@
               <tr>
                 {include file="CRM/common/tasks.tpl" location="botton"}
                 {if $instanceUrl}
-                  <td>&nbsp;&nbsp;<i class="crm-i fa-chevron-right" aria-hidden="true"></i> <a href="{$instanceUrl}">{ts}Existing report(s) from this template{/ts}</a></td>
+                  <td>&nbsp;&nbsp;<i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;<a href="{$instanceUrl}">{ts}Existing report(s) from this template{/ts}</a></td>
                 {/if}
               </tr>
             </table>
diff --git a/templates/CRM/Tag/Page/Tag.tpl b/templates/CRM/Tag/Page/Tag.tpl
index e0ded1e4bcb4..e59f24246a76 100644
--- a/templates/CRM/Tag/Page/Tag.tpl
+++ b/templates/CRM/Tag/Page/Tag.tpl
@@ -463,16 +463,16 @@
   <% {rdelim} %>
   <div class="crm-submit-buttons">
     <a href="{crmURL p="civicrm/tag/edit" q="action=add&parent_id="}<%= tagset || '' %>" class="button crm-popup">
-      <span><i class="crm-i fa-plus" aria-hidden="true"></i> {ts}Add Tag{/ts}</span>
+      <span><i class="crm-i fa-plus" aria-hidden="true"></i>&nbsp; {ts}Add Tag{/ts}</span>
     </a>
     <% if(tagset && adminTagsets) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/edit" q="action=update&id="}<%= tagset %>" class="button crm-popup tagset-action-update">
-        <span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit Set{/ts}</span>
+        <span><i class="crm-i fa-pencil" aria-hidden="true"></i>&nbsp; {ts}Edit Set{/ts}</span>
       </a>
     <% {rdelim} %>
     <% if(tagset && !length && adminTagsets && (!is_reserved || adminReserved)) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/edit" q="action=delete&id="}<%= tagset %>" class="button crm-popup small-popup tagset-action-delete">
-        <span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete Set{/ts}</span>
+        <span><i class="crm-i fa-trash" aria-hidden="true"></i>&nbsp; {ts}Delete Set{/ts}</span>
       </a>
     <% {rdelim} %>
   </div>
@@ -519,21 +519,21 @@
   <div class="crm-submit-buttons">
     <% if(!tagset) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/edit" q="action=add&parent_id="}<%= id %>" class="button crm-popup" title="{ts}Create new tag under this one{/ts}">
-        <span><i class="crm-i fa-plus" aria-hidden="true"></i> {ts}Add Child{/ts}</span>
+        <span><i class="crm-i fa-plus" aria-hidden="true"></i>&nbsp; {ts}Add Child{/ts}</span>
       </a>
     <% {rdelim} %>
     <a href="{crmURL p="civicrm/tag/edit" q="action=add&clone_from="}<%= id %>" class="button crm-popup" title="{ts}Duplicate this tag{/ts}">
-      <span><i class="crm-i fa-copy" aria-hidden="true"></i> {ts}Clone Tag{/ts}</span>
+      <span><i class="crm-i fa-copy" aria-hidden="true"></i>&nbsp; {ts}Clone Tag{/ts}</span>
     </a>
     <% if(!data.is_reserved || adminReserved) {ldelim} %>
       <% if(tagsetCount) {ldelim} %>
         <a href="#move" class="button move-tag-button" title="{ts}Move to a different tagset{/ts}">
-          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i> {ts}Move Tag{/ts}</span>
+          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i>&nbsp; {ts}Move Tag{/ts}</span>
         </a>
       <% {rdelim} %>
       <% if(!hasChildren) {ldelim} %>
         <a href="{crmURL p="civicrm/tag/edit" q="action=delete&id="}<%= id %>" class="button crm-popup small-popup">
-          <span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span>
+          <span><i class="crm-i fa-trash" aria-hidden="true"></i>&nbsp; {ts}Delete{/ts}</span>
         </a>
       <% {rdelim} %>
     <% {rdelim} %>
@@ -551,16 +551,16 @@
   <div class="crm-submit-buttons">
     <% if(!reserved || adminReserved) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/merge" q="id="}<%= items.join() %>" class="button crm-popup small-popup" title="{ts}Combine tags into one{/ts}">
-        <span><i class="crm-i fa-compress" aria-hidden="true"></i> {ts}Merge Tags{/ts}</span>
+        <span><i class="crm-i fa-compress" aria-hidden="true"></i>&nbsp; {ts}Merge Tags{/ts}</span>
       </a>
       <% if(tagsetCount) {ldelim} %>
         <a href="#move" class="button move-tag-button" title="{ts}Move to a different tagset{/ts}">
-          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i> {ts}Move Tags{/ts}</span>
+          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i>&nbsp; {ts}Move Tags{/ts}</span>
         </a>
       <% {rdelim} %>
       <% if(!hasChildren) {ldelim} %>
         <a href="{crmURL p="civicrm/tag/edit" q="action=delete&id="}<%= items.join() %>" class="button crm-popup small-popup">
-          <span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete All{/ts}</span>
+          <span><i class="crm-i fa-trash" aria-hidden="true"></i>&nbsp; {ts}Delete All{/ts}</span>
         </a>
       <% {rdelim} %>
     <% {rdelim} %>
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 7af01e646bec..92b41f4dff0d 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -41,10 +41,14 @@
     {crmGetAttribute html=$html attr='crm-icon' assign='icon'}
     {capture assign=iconPrefix}{$icon|truncate:3:"":true}{/capture}
     {if $icon && $iconPrefix eq 'fa-'}
+      {assign var='buttonClass' value=' crm-i-button'}
       {capture assign=iconDisp}<i class="crm-i {$icon}" aria-hidden="true"></i>{/capture}
+    {elseif $icon}
+      {assign var='buttonClass' value=' crm-icon-button'}
+      {capture assign=iconDisp}<span class="crm-button-icon ui-icon-{$icon}"> </span>{/capture}
     {/if}
     {crmGetAttribute html=$html attr='disabled' assign='disabled'}
-    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
+    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{$buttonClass}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
       {$iconDisp}
       {$html}
     </span>

From f19d0e356d5de15686880d4adb84075d8dbb6053 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Tue, 1 Sep 2020 22:41:21 +0100
Subject: [PATCH 071/834] Remove unused passbyreference and var from
 ipn_process_transaction

---
 api/v3/Contribution.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 63036179825e..aa3d7f156cb8 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -602,7 +602,6 @@ function civicrm_api3_contribution_repeattransaction($params) {
     );
   }
 
-  $original_contribution = clone $contribution;
   $input['payment_processor_id'] = civicrm_api3('contributionRecur', 'getvalue', [
     'return' => 'payment_processor_id',
     'id' => $contribution->contribution_recur_id,
@@ -626,7 +625,7 @@ function civicrm_api3_contribution_repeattransaction($params) {
     ];
     $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 
-    return _ipn_process_transaction($params, $contribution, $input, $ids, $original_contribution);
+    return _ipn_process_transaction($params, $contribution, $input, $ids);
   }
   catch (Exception $e) {
     throw new API_Exception('failed to load related objects' . $e->getMessage() . "\n" . $e->getTraceAsString());
@@ -645,13 +644,11 @@ function civicrm_api3_contribution_repeattransaction($params) {
  *
  * @param array $ids
  *
- * @param CRM_Contribute_BAO_Contribution $firstContribution
- *
  * @return mixed
  * @throws \CRM_Core_Exception
  * @throws \CiviCRM_API3_Exception
  */
-function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstContribution = NULL) {
+function _ipn_process_transaction($params, $contribution, $input, $ids) {
   $objects = $contribution->_relatedObjects;
   $objects['contribution'] = &$contribution;
   $input['component'] = $contribution->_component;

From f708b86917999b76e537b0e5cfed6c93ae0be2b6 Mon Sep 17 00:00:00 2001
From: Noah Miller <nm@lemnisc.us>
Date: Tue, 1 Sep 2020 15:23:25 -0700
Subject: [PATCH 072/834] dev/core#1974 - ChangeFieldType - "Select
 (w/serialize)" field should be treated like older "Multi-Select" fields

---
 CRM/Custom/Form/ChangeFieldType.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php
index 24650919ae6c..8ba794c5cc56 100644
--- a/CRM/Custom/Form/ChangeFieldType.php
+++ b/CRM/Custom/Form/ChangeFieldType.php
@@ -54,6 +54,9 @@ public function preProcess() {
     $params = ['id' => $this->_id];
     CRM_Core_BAO_CustomField::retrieve($params, $this->_values);
 
+    if ($this->_values['html_type'] == 'Select' && $this->_values['serialize']) {
+      $this->_values['html_type'] = 'Multi-Select';
+    }
     $this->_htmlTypeTransitions = self::fieldTypeTransitions(CRM_Utils_Array::value('data_type', $this->_values),
       CRM_Utils_Array::value('html_type', $this->_values)
     );

From adb4fb9615269dd72e001ca583eddd5854742046 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 2 Sep 2020 11:54:40 +1200
Subject: [PATCH 073/834] [REF] Remove most interaction with

With this change we are only looking up
1) objects['paymentProcessor'] - we should probably just pass in the id
2) objects['contribution'] - we could make this a param in it's own right & remove objects
3) objects['event'] - just used to get event title - we could do a query off participant
---
 CRM/Contribute/BAO/Contribution.php | 10 +++++-----
 CRM/Core/Payment/BaseIPN.php        |  6 +++++-
 CRM/Event/Form/Task/Batch.php       |  6 +++++-
 api/v3/Contribution.php             |  6 +++++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index bc56e48995f8..238c4f196d3c 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4449,7 +4449,10 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     // @todo see if we even need this - it's used further down to create an activity
     // but the BAO layer should create that - we just need to add a test to cover it & can
     // maybe remove $ids altogether.
-    $contributionContactID = $ids['related_contact'] ?? NULL;
+    $contributionContactID = $ids['related_contact'];
+    $participantID = $ids['participant'];
+    $recurringContributionID = $ids['contributionRecur'];
+
     // Unset ids just to make it clear it's not used again.
     unset($ids);
     // The previous details are used when calculating line items so keep it before any code that 'does something'
@@ -4472,9 +4475,6 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
       'financial_type_id',
     ];
 
-    $participant = $objects['participant'] ?? NULL;
-    $recurContrib = $objects['contributionRecur'] ?? NULL;
-    $recurringContributionID = (empty($recurContrib->id)) ? NULL : $recurContrib->id;
     $event = $objects['event'] ?? NULL;
 
     $paymentProcessorId = '';
@@ -4520,7 +4520,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     }
     else {
       if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) {
-        $participantParams['id'] = $participant->id;
+        $participantParams['id'] = $participantID;
         $participantParams['status_id'] = 'Registered';
         civicrm_api3('Participant', 'create', $participantParams);
       }
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index e4312a5fd797..fdfce40a0f58 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -468,7 +468,11 @@ private function cancelMembership($membership, $membershipStatusID, $onlyCancelP
    * @throws \CiviCRM_API3_Exception
    */
   public function completeTransaction($input, $ids, $objects) {
-    CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, [
+      'related_contact' => $ids['related_contact'] ?? NULL,
+      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+    ], $objects);
   }
 
   /**
diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index 16d8752bde39..bc00eccc68d1 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -417,7 +417,11 @@ public static function updateContributionStatus($params) {
     //complete the contribution.
     // @todo use the api - ie civicrm_api3('Contribution', 'completetransaction', $input);
     // as this method is not preferred / supported.
-    CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, [
+      'related_contact' => $ids['related_contact'] ?? NULL,
+      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'contributionRecur' => NULL,
+    ], $objects);
 
     // reset template values before processing next transactions
     $template->clearTemplateVars();
diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 63036179825e..e011ab5b1c02 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -681,7 +681,11 @@ function _ipn_process_transaction(&$params, $contribution, $input, $ids, $firstC
   if (!empty($params['payment_instrument_id'])) {
     $input['payment_instrument_id'] = $params['payment_instrument_id'];
   }
-  return CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects,
+  return CRM_Contribute_BAO_Contribution::completeOrder($input, [
+    'related_contact' => $ids['related_contact'] ?? NULL,
+    'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+    'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+  ], $objects,
     $params['is_post_payment_create'] ?? NULL);
 }
 

From 4eba8926824dac77b94659cd1a25ea4c57b5fd53 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 2 Sep 2020 18:43:08 +1200
Subject: [PATCH 074/834] [REF] Add test for existing Participant batch update
 cancel and fix to not call BaseIPN->cancelled

I dug into what is 'achieved' by calling BaseIPN->cancelled here and everything except the bit where the contribution
is updated to cancelled is actually bypassed so a simple api call suffices.

I also discovered the cancellation of the contribution is highly conditional and arguably illogical. I will separately
log a gitlab to discuss whether it still makes sense, but I wouldn't want that discussion to derail this
no-change cleanup
---
 CRM/Core/Payment/BaseIPN.php                  | 17 ++++++------
 CRM/Event/Form/Task/Batch.php                 |  9 ++-----
 .../phpunit/CRM/Event/Form/Task/BatchTest.php | 26 ++++++++++++++++---
 .../CRMTraits/Financial/OrderTrait.php        | 12 +++++++++
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index e4312a5fd797..594718780986 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -324,19 +324,18 @@ public function cancelled(&$objects, $transaction = NULL, $input = []) {
       CRM_Contribute_BAO_ContributionRecur::copyCustomValues($objects['contributionRecur']->id, $contribution->id);
     }
 
-    if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) {
-      if (!empty($memberships)) {
-        foreach ($memberships as $membership) {
-          if ($membership) {
-            $this->cancelMembership($membership, $membership->status_id);
-          }
+    if (!empty($memberships)) {
+      foreach ($memberships as $membership) {
+        if ($membership) {
+          $this->cancelMembership($membership, $membership->status_id);
         }
       }
+    }
 
-      if ($participant) {
-        $this->cancelParticipant($participant->id);
-      }
+    if ($participant) {
+      $this->cancelParticipant($participant->id);
     }
+
     if ($transaction) {
       $transaction->commit();
     }
diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index 16d8752bde39..31f690d3633a 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -285,7 +285,8 @@ public static function updatePendingOnlineContribution($participantId, $statusId
       $contributionStatusId = array_search('Completed', $contributionStatuses);
     }
     if (array_key_exists($statusId, $negativeStatuses)) {
-      $contributionStatusId = array_search('Cancelled', $contributionStatuses);
+      civicrm_api3('Contribution', 'create', ['id' => $contributionId, 'contribution_status_id' => 'Cancelled']);
+      return;
     }
 
     if (!$contributionStatusId || !$participantId || !$contributionId) {
@@ -374,12 +375,6 @@ public static function updateContributionStatus($params) {
       'flip' => 1,
     ]);
     $input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'] = $params['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'] ?? NULL;
-    if ($statusId == $contributionStatuses['Cancelled']) {
-      $transaction = new CRM_Core_Transaction();
-      $baseIPN->cancelled($objects, $transaction, $input);
-      $transaction->commit();
-      return;
-    }
     if ($statusId == $contributionStatuses['Failed']) {
       $transaction = new CRM_Core_Transaction();
       $baseIPN->failed($objects, $transaction, $input);
diff --git a/tests/phpunit/CRM/Event/Form/Task/BatchTest.php b/tests/phpunit/CRM/Event/Form/Task/BatchTest.php
index 15f24a48bf0e..d9e590cfbd5c 100644
--- a/tests/phpunit/CRM/Event/Form/Task/BatchTest.php
+++ b/tests/phpunit/CRM/Event/Form/Task/BatchTest.php
@@ -7,19 +7,19 @@
  * @group headless
  */
 class CRM_Event_Form_Task_BatchTest extends CiviUnitTestCase {
+  use CRMTraits_Financial_OrderTrait;
 
   /**
    * Test the the submit function on the event participant submit function.
-   *
-   * @todo extract submit functions on other Batch update classes, use dataprovider to test on all.
    */
   public function testSubmit() {
-    $group = $this->CustomGroupCreate(['extends' => 'Participant', 'title' => 'Participant']);
+    $group = $this->customGroupCreate(['extends' => 'Participant', 'title' => 'Participant']);
     $field = $this->customFieldCreate(['custom_group_id' => $group['id'], 'html_type' => 'CheckBox', 'option_values' => ['two' => 'A couple', 'three' => 'A few', 'four' => 'Too Many']]);
     $participantID = $this->participantCreate();
     $participant = $this->callAPISuccessGetSingle('Participant', ['id' => $participantID]);
     $this->assertEquals(2, $participant['participant_status_id']);
 
+    /* @var CRM_Event_Form_Task_Batch $form */
     $form = $this->getFormObject('CRM_Event_Form_Task_Batch');
     $form->submit(['field' => [$participantID => ['participant_status_id' => 1, 'custom_' . $field['id'] => ['two' => 1, 'four' => 1]]]]);
 
@@ -27,4 +27,24 @@ public function testSubmit() {
     $this->assertEquals(1, $participant['participant_status_id']);
   }
 
+  /**
+   * Test the the submit function on the event participant submit function.
+   *
+   * Test is to establish existing behaviour prior to code cleanup. It turns out the existing
+   * code ONLY cancels the contribution as well as the participant record if is_pay_later is true
+   * AND the source is 'Online Event Registration'.
+   */
+  public function testSubmitCancel() {
+    $this->createEventOrder(['source' => 'Online Event Registration', 'is_pay_later' => 1]);
+    $participantCancelledStatusID = CRM_Core_PseudoConstant::getKey('CRM_Event_BAO_Participant', 'status_id', 'Cancelled');
+
+    /* @var CRM_Event_Form_Task_Batch $form */
+    $form = $this->getFormObject('CRM_Event_Form_Task_Batch');
+    $form->submit(['field' => [$this->ids['Participant'][0] => ['participant_status' => $participantCancelledStatusID]]]);
+
+    $participant = $this->callAPISuccessGetSingle('Participant', ['id' => $this->ids['Participant'][0]]);
+    $this->assertEquals($participantCancelledStatusID, $participant['participant_status_id']);
+    $this->callAPISuccessGetSingle('Contribution', ['id' => $this->ids['Contribution'][0], 'contribution_status_id' => 'Cancelled']);
+  }
+
 }
diff --git a/tests/phpunit/CRMTraits/Financial/OrderTrait.php b/tests/phpunit/CRMTraits/Financial/OrderTrait.php
index 5bd1292a5665..c927e7185747 100644
--- a/tests/phpunit/CRMTraits/Financial/OrderTrait.php
+++ b/tests/phpunit/CRMTraits/Financial/OrderTrait.php
@@ -162,6 +162,18 @@ protected function createMultipleMembershipOrder() {
     $this->ids['Contribution'][0] = $orderID;
   }
 
+  /**
+   * Create an order for an event.
+   *
+   * @param array $orderParams
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function createEventOrder($orderParams = []) {
+    $this->ids['Contribution'][0] = $this->callAPISuccess('Order', 'create', array_merge($this->getParticipantOrderParams(), $orderParams))['id'];
+    $this->ids['Participant'][0] = $this->callAPISuccessGetValue('ParticipantPayment', ['return' => 'participant_id', 'contribution_id' => $this->ids['Contribution'][0]]);
+  }
+
   /**
    * Create an extraneous contribution to throw off any 'number one bugs'.
    *

From 642fc9b1936c72d15e74941b1ee3c54036058ea4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 1 Sep 2020 16:08:39 -0700
Subject: [PATCH 075/834] Add release-notes/5.28.4.md

---
 release-notes.md        |  9 +++++++++
 release-notes/5.28.4.md | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 release-notes/5.28.4.md

diff --git a/release-notes.md b/release-notes.md
index 31038359517f..d2d501d26a72 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -26,6 +26,15 @@ Released September 2, 2020
 - **[Credits](release-notes/5.29.0.md#credits)**
 - **[Feedback](release-notes/5.29.0.md#feedback)**
 
+## CiviCRM 5.28.4
+
+Released September 1, 2020
+
+- **[Synopsis](release-notes/5.28.4.md#synopsis)**
+- **[Bugs resolved](release-notes/5.28.4.md#bugs)**
+- **[Credits](release-notes/5.28.4.md#credits)**
+- **[Feedback](release-notes/5.28.4.md#feedback)**
+
 ## CiviCRM 5.28.3
 
 Released August 22, 2020
diff --git a/release-notes/5.28.4.md b/release-notes/5.28.4.md
new file mode 100644
index 000000000000..6851eba8aed5
--- /dev/null
+++ b/release-notes/5.28.4.md
@@ -0,0 +1,40 @@
+# CiviCRM 5.28.4
+
+Released September 1, 2020
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |          |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema?                                     | no       |
+| Alter the API?                                                  | no       |
+| Require attention to configuration options?                     | no       |
+| Fix problems installing or upgrading to a previous version?     | no       |
+| Introduce features?                                             | no       |
+| **Fix bugs?**                                                   | **yes**  |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_CiviCase_: Fix interpretation of "Assign to Creator" option (when disabled) ([dev/core#1982](https://lab.civicrm.org/dev/core/-/issues/1982): [#18301](https://github.com/civicrm/civicrm-core/pull/18301))**
+* **_CiviContribute_: Fix tax calculation for multiline transactions ([dev/core#1983](https://lab.civicrm.org/dev/core/-/issues/1983): [#18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+* **_CiviContribute_: Fix tax calculation for offline membership renewals ([dev/core#1972](https://lab.civicrm.org/dev/core/-/issues/1972): [#18271](https://github.com/civicrm/civicrm-core/pull/18271))**
+* **_Custom Fields_: Fix conversion from "Multi-Select" to "Select" ([dev/core#1974](https://lab.civicrm.org/dev/core/-/issues/1974): [#18304](https://github.com/civicrm/civicrm-core/pull/18304), [#18272](https://github.com/civicrm/civicrm-core/pull/18272))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Semper IT - Karin Gerritsen; Lighthouse Consulting and
+Design - Brian Shaughnessy; Lemniscus - Noah Miller; JMA Consulting - Seamus Lee; Dave D; CiviCRM -
+Tim Otten; Circle Interactive - Pradeep Nayak
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.

From d3082f177b95c02101a0282593b644208f85e82d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 1 Sep 2020 16:19:19 -0700
Subject: [PATCH 076/834] Fix anchors in release-notes/5.28.3.md

---
 release-notes/5.28.3.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release-notes/5.28.3.md b/release-notes/5.28.3.md
index 3d89063f2dc7..4f83984cdae7 100644
--- a/release-notes/5.28.3.md
+++ b/release-notes/5.28.3.md
@@ -7,7 +7,7 @@ Released August 22, 2020
 - **[Credits](#credits)**
 - **[Feedback](#feedback)**
 
-## <a href="synopsis"></a>Synopsis
+## <a name="synopsis"></a>Synopsis
 
 | *Does this version...?*                                         |          |
 | --------------------------------------------------------------- | -------- |
@@ -18,7 +18,7 @@ Released August 22, 2020
 | Introduce features?                                             | no       |
 | **Fix bugs?**                                                   | **yes**  |
 
-## <a href="bugs"></a>Bugs resolved
+## <a name="bugs"></a>Bugs resolved
 
 * **_CiviContribute_: Re-enable "Cancel" button in backend UI for recurring contributions ([dev/core#1961](https://lab.civicrm.org/dev/core/-/issues/1961): [#18204](https://github.com/civicrm/civicrm-core/pull/18204))**
 * **_CiviContribute_: Contributions sometimes display "RoundingNecessaryException" ([dev/core#1959](https://lab.civicrm.org/dev/core/-/issues/1959): [#18206](https://github.com/civicrm/civicrm-core/pull/18206))**
@@ -28,7 +28,7 @@ Released August 22, 2020
 * **_Quick Search_: Deleted contacts are incorrectly displayed ([#18213](https://github.com/civicrm/civicrm-core/pull/18213))**
 * **_Styling_: Collapse icon is incorrect ([dev/core#1963](https://lab.civicrm.org/dev/core/-/issues/1963): [#18205](https://github.com/civicrm/civicrm-core/pull/18205))**
 
-## <a href="credits"></a>Credits
+## <a name="credits"></a>Credits
 
 This release was developed by the following authors and reviewers:
 
@@ -36,7 +36,7 @@ Wikimedia Foundation - Eileen McNaughton; MillerTech - Chamil Wijesooriya; MJW C
 Wire; JMA Consulting - Seamus Lee; Dave D; CiviCoop - Jaap Jansma; CiviCRM - Tim Otten; Circle
 Interactive - Pradeep Nayak; Australian Greens - Andrew Cormick-Dockery
 
-## <a href="feedback"></a>Feedback
+## <a name="feedback"></a>Feedback
 
 These release notes are edited by Tim Otten and Andrew Hunt.  If you'd like to
 provide feedback on them, please login to https://chat.civicrm.org/civicrm and

From 97887960bd0f2a4755efbce61d34109f9441210a Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Tue, 1 Sep 2020 22:55:05 +0100
Subject: [PATCH 077/834] Filter params in completetransaction

---
 api/v3/Contribution.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 1e70afa7ecbf..286eb8770843 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -472,28 +472,32 @@ function _civicrm_api3_contribution_sendconfirmation_spec(&$params) {
  */
 function civicrm_api3_contribution_completetransaction($params) {
   $input = $ids = [];
-  if (isset($params['payment_processor_id'])) {
-    $input['payment_processor_id'] = $params['payment_processor_id'];
-  }
+
   $contribution = new CRM_Contribute_BAO_Contribution();
   $contribution->id = $params['id'];
   if (!$contribution->find(TRUE)) {
     throw new API_Exception('A valid contribution ID is required', 'invalid_data');
   }
 
+  if (isset($params['payment_processor_id'])) {
+    $input['payment_processor_id'] = $params['payment_processor_id'];
+  }
   if (!$contribution->loadRelatedObjects($input, $ids, TRUE)) {
     throw new API_Exception('failed to load related objects');
   }
   elseif ($contribution->contribution_status_id == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')) {
     throw new API_Exception(ts('Contribution already completed'), 'contribution_completed');
   }
-  $input['trxn_id'] = $params['trxn_id'] ?? $contribution->trxn_id;
+  $params['trxn_id'] = $params['trxn_id'] ?? $contribution->trxn_id;
 
-  if (!empty($params['fee_amount'])) {
-    $input['fee_amount'] = $params['fee_amount'];
-  }
-  return _ipn_process_transaction($params, $contribution, $input, $ids);
+  $passThroughParams = [
+    'fee_amount',
+    'payment_processor_id',
+    'trxn_id',
+  ];
+  $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 
+  return _ipn_process_transaction($params, $contribution, $input, $ids);
 }
 
 /**

From c6fe32d7f76413db0210c7669fa5bcc83baaa022 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Wed, 2 Sep 2020 10:35:18 -0400
Subject: [PATCH 078/834] typo in call to nestedGroup

---
 CRM/Admin/Form/ScheduleReminders.php        |  2 +-
 CRM/Core/PseudoConstant.php                 |  2 +-
 tests/phpunit/CRM/Contact/BAO/GroupTest.php | 49 +++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php
index c881ef779387..f9ab1c98a6a2 100644
--- a/CRM/Admin/Form/ScheduleReminders.php
+++ b/CRM/Admin/Form/ScheduleReminders.php
@@ -250,7 +250,7 @@ public function buildQuickForm() {
     $this->addEntityRef('recipient_manual_id', ts('Manual Recipients'), ['multiple' => TRUE, 'create' => TRUE]);
 
     $this->add('select', 'group_id', ts('Group'),
-      CRM_Core_PseudoConstant::nestedGroup('Mailing'), FALSE, ['class' => 'crm-select2 huge']
+      CRM_Core_PseudoConstant::nestedGroup(), FALSE, ['class' => 'crm-select2 huge']
     );
 
     // multilingual only options
diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 758db214acba..c1f5af9e77f3 100644
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -857,7 +857,7 @@ public static function group($groupType = NULL, $excludeHidden = TRUE) {
    * @param bool $excludeHidden
    * @return array
    */
-  public static function nestedGroup($checkPermissions = TRUE, $groupType = NULL, $excludeHidden = TRUE) {
+  public static function nestedGroup(bool $checkPermissions = TRUE, $groupType = NULL, bool $excludeHidden = TRUE) {
     $groups = $checkPermissions ? self::group($groupType, $excludeHidden) : self::allGroup($groupType, $excludeHidden);
     return CRM_Contact_BAO_Group::getGroupsHierarchy($groups, NULL, '&nbsp;&nbsp;', TRUE);
   }
diff --git a/tests/phpunit/CRM/Contact/BAO/GroupTest.php b/tests/phpunit/CRM/Contact/BAO/GroupTest.php
index 3ab280ae7111..1b50f79b52e7 100644
--- a/tests/phpunit/CRM/Contact/BAO/GroupTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/GroupTest.php
@@ -109,6 +109,55 @@ public function testGroupHirearchy() {
     $this->assertFalse(array_key_exists($group3->id, $groupsHierarchy));
   }
 
+  /**
+   * Test nestedGroup pseudoconstant
+   */
+  public function testNestedGroup() {
+    $params = [
+      'name' => 'groupa',
+      'title' => 'Parent Group A',
+      'description' => 'Parent Group One',
+      'visibility' => 'User and User Admin Only',
+      'is_active' => 1,
+      // mailing group
+      'group_type' => ['2' => 1],
+    ];
+    $group1 = CRM_Contact_BAO_Group::create($params);
+
+    $params = [
+      'name' => 'groupb',
+      'title' => 'Parent Group B',
+      'description' => 'Parent Group Two',
+      'visibility' => 'User and User Admin Only',
+      'is_active' => 1,
+    ];
+    $group2 = CRM_Contact_BAO_Group::create($params);
+
+    $params = [
+      'name' => 'groupc',
+      'title' => 'Child Group C',
+      'description' => 'Child Group C',
+      'visibility' => 'User and User Admin Only',
+      'is_active' => 1,
+      'parents' => [
+        $group2->id => 1,
+      ],
+    ];
+    $group3 = CRM_Contact_BAO_Group::create($params);
+
+    // Check with no group type restriction
+    $nestedGroup = CRM_Core_PseudoConstant::nestedGroup();
+    $this->assertEquals([
+      $group1->id => 'Parent Group A',
+      $group2->id => 'Parent Group B',
+      $group3->id => '&nbsp;&nbsp;Child Group C',
+    ], $nestedGroup);
+
+    // Check restrict to mailing groups
+    $nestedGroup = CRM_Core_PseudoConstant::nestedGroup(TRUE, 'Mailing');
+    $this->assertSame([$group1->id => 'Parent Group A'], $nestedGroup);
+  }
+
   /**
    * Test adding a smart group.
    */

From 973aefd508538b0d31174fcf7e3d2125410c9002 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Wed, 2 Sep 2020 19:54:53 +0100
Subject: [PATCH 079/834] Fix spec labels - see dev/mail#24, item 1

---
 api/v3/MailingEventSubscribe.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/v3/MailingEventSubscribe.php b/api/v3/MailingEventSubscribe.php
index 92a8795bdb20..7046fe166efc 100644
--- a/api/v3/MailingEventSubscribe.php
+++ b/api/v3/MailingEventSubscribe.php
@@ -66,12 +66,12 @@ function civicrm_api3_mailing_event_subscribe_create($params) {
 function _civicrm_api3_mailing_event_subscribe_create_spec(&$params) {
   $params['email'] = [
     'api.required' => 1,
-    'title' => 'Unsubscribe Email',
+    'title' => 'Subscribe Email',
     'type' => CRM_Utils_Type::T_STRING,
   ];
   $params['group_id'] = [
     'api.required' => 1,
-    'title' => 'Unsubscribe From Group',
+    'title' => 'Subscribe To Group',
     'type' => CRM_Utils_Type::T_INT,
   ];
 }

From 8bd48a0fb0a615fc56536e4a4cd62e002fb74308 Mon Sep 17 00:00:00 2001
From: Alice Frumin <alice@aghstrategies.com>
Date: Tue, 1 Sep 2020 13:16:51 -0400
Subject: [PATCH 080/834] 5.29 Release Notes first pass

---
 contributor-key.yml     |  12 +
 release-notes/5.29.0.md | 689 ++++++++++++++++++++++------------------
 2 files changed, 386 insertions(+), 315 deletions(-)

diff --git a/contributor-key.yml b/contributor-key.yml
index e594d3db88c1..fe7abc511963 100644
--- a/contributor-key.yml
+++ b/contributor-key.yml
@@ -449,6 +449,9 @@
   organization: Wikimedia Foundation
   jira        : ejegg
 
+- github      : elcapo
+  name        : Carlos Capote
+
 - github      : elisseck
   name        : Eli Lisseck
   organization: AGH Strategies
@@ -596,6 +599,9 @@
 
 - github      : GValFr35
 
+- github      : irenemeisel
+  name        : Irene Meisel
+
 - github      : kewljuice
   name        : Wouter Hechtermans
   organization: Calibrate
@@ -1116,8 +1122,12 @@
   organization: CompuCorp
   jira        : mukesh
 
+- github      : muniodiego
+  name        : Diego Muñio
+
 - github      : mwestergaard
   name        : Mark Westergaard
+  organization: iXiam
 
 - github      : nbrettell
   name        : Nathan Brettell
@@ -1271,6 +1281,8 @@
 - name        : Rareș Pamfil
   jira        : rares
 
+- github      : Rar9
+
 - github      : ray-wright
   name        : Ray Wright
 
diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index edc783189cb3..5d2a66308d8a 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -31,618 +31,677 @@ Released September 2, 2020
 
 ## <a name="bugs"></a>Bugs resolved
 
-### Core CiviCRM
-
-- **dev/core#1983 Fix to tax calculation on multi-line-item ([18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+### CiviCase
 
-- **dev/core#1982 - 5.29 version of PR 18282 ([18301](https://github.com/civicrm/civicrm-core/pull/18301))**
+- **Use case id to get relationship for activity creation ([17256](https://github.com/civicrm/civicrm-core/pull/17256) and [17764](https://github.com/civicrm/civicrm-core/pull/17764))**
 
-- **dev/core#1972 Fix tax_amount calclation on renewal form ([18271](https://github.com/civicrm/civicrm-core/pull/18271))**
-
-- **Update contributor key for Andrew ([18230](https://github.com/civicrm/civicrm-core/pull/18230))**
+### Core CiviCRM
 
-- **5.28.2 & 5.29.3 Release Notes ([18228](https://github.com/civicrm/civicrm-core/pull/18228))**
+- **reporting#21 - don't multiple contribution details when a 1-to-many r… ([15435](https://github.com/civicrm/civicrm-core/pull/15435))**
 
-- **dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings ([18174](https://github.com/civicrm/civicrm-core/pull/18174))**
+- **Contribution Summary Report: Taking the currency filtered in the "general total" row. Implements dev/report#27 ([16736](https://github.com/civicrm/civicrm-core/pull/16736))**
 
-- **Revert "Swap out button/submit inputs for button elements" ([18185](https://github.com/civicrm/civicrm-core/pull/18185))**
+- **dev/report#43 - Icon after saving a civireport instance is misleading ([17863](https://github.com/civicrm/civicrm-core/pull/17863))**
 
-- **Installation doclinks not getting url-rewritten ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
 
-- **Fix 5.29 (unreleased) regression using temp tables ([18133](https://github.com/civicrm/civicrm-core/pull/18133))**
 
-- **Swap out button/submit inputs for button elements ([18091](https://github.com/civicrm/civicrm-core/pull/18091))**
+- **dev/membership#18 Enhance parameters for Job.process_membership ([16298](https://github.com/civicrm/civicrm-core/pull/16298))**
 
-- **dev/event#40 - EventCart - Check legacy setting until extension is public ([18101](https://github.com/civicrm/civicrm-core/pull/18101))**
 
-- **dev/wordpress#66 Re-instate newer variables but with more support for… ([18068](https://github.com/civicrm/civicrm-core/pull/18068))**
+- **mailing#70 Don't create users for test mail if user doesn't have permission ([17867](https://github.com/civicrm/civicrm-core/pull/17867))**
 
-- **dev/core#1895 fix first/last name adv search ([17950](https://github.com/civicrm/civicrm-core/pull/17950))**
 
-- **dev/core#1905 force backend links for new "configure" buttons ([18088](https://github.com/civicrm/civicrm-core/pull/18088))**
 
-- **dev/core#1932 - Make status-checks more polite during upgrade ([18085](https://github.com/civicrm/civicrm-core/pull/18085))**
+- **dev/drupal#114 and dev/core#1647 - Remove resource url status check ([17754](https://github.com/civicrm/civicrm-core/pull/17754))**
 
-- **dev/core#1928 Fix HTML5 error due to required attribute being set swi… ([18080](https://github.com/civicrm/civicrm-core/pull/18080))**
+- **dev/drupal#127 - require email for the Useradd task and errors not showing ([17915](https://github.com/civicrm/civicrm-core/pull/17915))**
 
-- **5.28 ([18084](https://github.com/civicrm/civicrm-core/pull/18084))**
+- **dev/drupal#127 - CRM_Core_Session::setStatus() gets ignored sometimes ([17914](https://github.com/civicrm/civicrm-core/pull/17914))**
 
-- **5.28 ([18082](https://github.com/civicrm/civicrm-core/pull/18082))**
 
 - **dev/financial#135 Remove stub function from payflowPro ([18078](https://github.com/civicrm/civicrm-core/pull/18078))**
 
-- **5.28 ([18077](https://github.com/civicrm/civicrm-core/pull/18077))**
-
-- **Fix button name on updated form ([18000](https://github.com/civicrm/civicrm-core/pull/18000))**
-
-- **[NFC] Fix provider unit test on PHP7.4 ([18073](https://github.com/civicrm/civicrm-core/pull/18073))**
-
-- **[REF] Move handling of form elements back to the Form ([17981](https://github.com/civicrm/civicrm-core/pull/17981))**
-
-- **Do not pass-by-reference to recur function ([18071](https://github.com/civicrm/civicrm-core/pull/18071))**
-
 - **dev/financial#135 Remove unreachable doDirectPayment from manual processor ([18072](https://github.com/civicrm/civicrm-core/pull/18072))**
 
-- **Refactor "applyLocale" and remove references to "language" column in UFMatch table ([18049](https://github.com/civicrm/civicrm-core/pull/18049))**
-
-- **Show cron warning on Scheduled Jobs admin page ([18065](https://github.com/civicrm/civicrm-core/pull/18065))**
+- **dev/financial#139 contribution receive_date shouldn't change when payments come in ([17777](https://github.com/civicrm/civicrm-core/pull/17777))**
 
-- **5.28 ([18069](https://github.com/civicrm/civicrm-core/pull/18069))**
 
-- **Use correct pdf package to generate pdf file on invoice download/email activity ([18056](https://github.com/civicrm/civicrm-core/pull/18056))**
+- **event#35: move statusBounce out of BAO layer; don't allow self-service when dis… ([18040](https://github.com/civicrm/civicrm-core/pull/18040))**
 
-- **Fix buggy placement of icons on buttons ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
+- **event#38 fix wording on event reg page ([17695](https://github.com/civicrm/civicrm-core/pull/17695))**
 
-- **[REF] Even less variable variables ([18058](https://github.com/civicrm/civicrm-core/pull/18058))**
+- **dev/event#40 - EventCart - Check legacy setting until extension is public ([18101](https://github.com/civicrm/civicrm-core/pull/18101))**
 
-- **dev/core#1905 rework #17942 with simpler ts strings ([18064](https://github.com/civicrm/civicrm-core/pull/18064))**
 
-- **Extract code to set isEmailReceipt in Contribution.completeOrder ([18039](https://github.com/civicrm/civicrm-core/pull/18039))**
 
-- **[REF] remove first attempt to set currency in repeattransaction flow ([18055](https://github.com/civicrm/civicrm-core/pull/18055))**
+- **dev/wordpress#66 Re-instate newer variables but with more support for… ([18068](https://github.com/civicrm/civicrm-core/pull/18068))**
 
-- **5.28 ([18063](https://github.com/civicrm/civicrm-core/pull/18063))**
 
-- **dev/core#1905 Add configure icons on public pages ([17942](https://github.com/civicrm/civicrm-core/pull/17942))**
+- **dev/core#183 Use TempTable builder to generate table for import ([17827](https://github.com/civicrm/civicrm-core/pull/17827))**
 
-- **CRM_Utils_Hook: deprecation warning and short array syntax ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
+- **[dev/core#750] Don't check server variables if we're running in CLI ([17636](https://github.com/civicrm/civicrm-core/pull/17636))**
 
-- **event#35: move statusBounce out of BAO layer; don't allow self-service when dis… ([18040](https://github.com/civicrm/civicrm-core/pull/18040))**
+- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([17927](https://github.com/civicrm/civicrm-core/pull/17927))**
 
-- **Why not make the buttons flat? ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
+- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([13958](https://github.com/civicrm/civicrm-core/pull/13958))**
 
-- **[REF] Simplify location metadata handling in Export class ([17951](https://github.com/civicrm/civicrm-core/pull/17951))**
+- **dev/core#1090 Update extendedSerializeData to use the Backbone namesp… ([17855](https://github.com/civicrm/civicrm-core/pull/17855))**
 
-- **5.28 ([18059](https://github.com/civicrm/civicrm-core/pull/18059))**
+- **dev/core#1113 - Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing a membership ([16429](https://github.com/civicrm/civicrm-core/pull/16429))**
 
-- **[REF] Do not pass by reference to the recur function ([18057](https://github.com/civicrm/civicrm-core/pull/18057))**
+- **dev/core#1137 - Allow ssl connection to mysql by specifying in DSN ([17706](https://github.com/civicrm/civicrm-core/pull/17706))**
 
-- **[REF] Simplify getMembershipStatusByDate more ([18051](https://github.com/civicrm/civicrm-core/pull/18051))**
+- **dev/core#1280 Fix ContributionPage soft_credit translation ([16838](https://github.com/civicrm/civicrm-core/pull/16838))**
 
-- **Fix obscure dedupe scenario where 'bad' location data can overwrite good data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
+- **dev/core#1578 - Fix APIv4 chaining with custom fields ([17866](https://github.com/civicrm/civicrm-core/pull/17866))**
 
-- **dev/drupal#127 - require email for the Useradd task and errors not showing ([17915](https://github.com/civicrm/civicrm-core/pull/17915))**
+- **dev/core#1665 Remove the having clause as well as having needs a group by ([18052](https://github.com/civicrm/civicrm-core/pull/18052))**
 
-- **dev/core#1921 [Ref] remove isoToMysql ([18025](https://github.com/civicrm/civicrm-core/pull/18025))**
+- **dev/core#1670 copy custom fields from master to shared address ([17580](https://github.com/civicrm/civicrm-core/pull/17580))**
 
-- **dev/core#1665 Remove the having clause as well as having needs a group by ([18052](https://github.com/civicrm/civicrm-core/pull/18052))**
+- **dev/core#1679: Ensure Paypal IPN always updates the next scheduled payment date ([17744](https://github.com/civicrm/civicrm-core/pull/17744))**
 
-- **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
+- **dev/core#1725 Only export primary address fields ([17458](https://github.com/civicrm/civicrm-core/pull/17458))**
 
-- **Fix JQuery Validation for radios ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
+- **dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates ([17480](https://github.com/civicrm/civicrm-core/pull/17480))**
 
-- **[REF] Simplify membership status date handling ([18030](https://github.com/civicrm/civicrm-core/pull/18030))**
+- **dev/core#1755 Fix reCaptcha on Mailing Subscribe ([17305](https://github.com/civicrm/civicrm-core/pull/17305))**
 
-- **Fix PaypalIPN single function to not receive-by-reference ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
+- **dev/core#1767 Fix phone key parsing in CRM_Dedupe_Finder ([17361](https://github.com/civicrm/civicrm-core/pull/17361) and [17882](https://github.com/civicrm/civicrm-core/pull/17882))**
 
-- **Remove requirement to pass 'contribution_status_id' => Pending from order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
+- **dev/core#1768 - Add CiviMail synchronisation frequency setting. ([17709](https://github.com/civicrm/civicrm-core/pull/17709))**
 
-- **[REF] Clean up handling of financial_type_id override ([18032](https://github.com/civicrm/civicrm-core/pull/18032))**
+- **core#1795: Searchable Parent tags ([17513](https://github.com/civicrm/civicrm-core/pull/17513))**
 
-- **Use saved contribution's line items rather than the primaryContributionID ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
+- **core#1805: Autocomplete-select custom field is not searchable ([17569](https://github.com/civicrm/civicrm-core/pull/17569))**
 
-- **[REF] Remove transaction from completeOrder signature ([18046](https://github.com/civicrm/civicrm-core/pull/18046))**
+- **dev/core#1812 Missing view when logging set in a non-US English instance ([17815](https://github.com/civicrm/civicrm-core/pull/17815))**
 
-- **Wrap multi record custom field inside a div ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
+- **core#1826: Ignore location_type_id when deduping postal address ([17645](https://github.com/civicrm/civicrm-core/pull/17645))**
 
-- **[Test fix] We might need this to ensure really quick test runs don't fail ([18045](https://github.com/civicrm/civicrm-core/pull/18045))**
+- **dev/core#1827 activity search - fixing search by tags ([17655](https://github.com/civicrm/civicrm-core/pull/17655) and [17755](https://github.com/civicrm/civicrm-core/pull/17755))**
 
-- **dev/core#1137 - Allow ssl connection to mysql by specifying in DSN ([17706](https://github.com/civicrm/civicrm-core/pull/17706))**
+- **dev/core#1853 - Fix validation errors when removing contact subtype ([17765](https://github.com/civicrm/civicrm-core/pull/17765))**
 
-- **Test - attempt to replicate #17852 ([18038](https://github.com/civicrm/civicrm-core/pull/18038))**
+- **dev/core#1855 - Allow different output formats for CiviReport results and untangle code ([17901](https://github.com/civicrm/civicrm-core/pull/17901))**
 
-- **[REF] Remove transaction from BaseIPN completeTransaction call ([18042](https://github.com/civicrm/civicrm-core/pull/18042))**
+- **dev/core#1858 Prevent Duplicate contact records being created and har… ([17769](https://github.com/civicrm/civicrm-core/pull/17769))**
 
-- **Remove url-tracking in mass sms. dev/core#1843 ([17700](https://github.com/civicrm/civicrm-core/pull/17700))**
+- **dev/core#1861 fix failure to unset location_type_id when saving uffield ([17812](https://github.com/civicrm/civicrm-core/pull/17812))**
 
-- **Do not overwrite values saved from the repeatContribution routine ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
+- **dev/core#1863 Downgrade checkEnvironment level and skip non-prod checks ([17807](https://github.com/civicrm/civicrm-core/pull/17807))**
 
-- **dev/core#1916 - Fix naming of case export fields / remove ones that aren't true ([18043](https://github.com/civicrm/civicrm-core/pull/18043))**
+- **dev/core#1868 - Regression - Description field is always blank on profiles admin page and slew of E_NOTICES ([17786](https://github.com/civicrm/civicrm-core/pull/17786))**
 
-- **SystemCheck: add ability to efficiently run only specified checks ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
+- **dev/core#1869 - Include BOM in attachment when sending CSV CiviReport via mail_report job ([17806](https://github.com/civicrm/civicrm-core/pull/17806))**
 
-- **Add testing to Authorize.net and remove the lines that are repeated ([18028](https://github.com/civicrm/civicrm-core/pull/18028))**
+- **dev/core#1871 - require_once's that include "packages/" in the path don't work on drupal 8 ([17822](https://github.com/civicrm/civicrm-core/pull/17822))**
 
-- **Add test on status calculation ([18037](https://github.com/civicrm/civicrm-core/pull/18037))**
+- **dev/core#1872 - Packages and vendor path calculation used in system check is outdated ([17844](https://github.com/civicrm/civicrm-core/pull/17844))**
 
-- **Fix qill typo ([18041](https://github.com/civicrm/civicrm-core/pull/18041))**
+- **dev/core#1874 - Failing test for new Individual form ([17835](https://github.com/civicrm/civicrm-core/pull/17835))**
 
-- **dev/core#1919 - Missing resubscribe url in text/plain version of unsubscribe confirmation email ([18015](https://github.com/civicrm/civicrm-core/pull/18015))**
+- **dev/core#1880 add backticks to custom field insertions ([17848](https://github.com/civicrm/civicrm-core/pull/17848))**
 
-- **[Ref] Simplify is_email_receipt in sendMail ([18029](https://github.com/civicrm/civicrm-core/pull/18029))**
+- **dev/core#1888 - Fix one line in PR 17888  ([17898](https://github.com/civicrm/civicrm-core/pull/17898))**
 
-- **Update flexmailer release information ([17912](https://github.com/civicrm/civicrm-core/pull/17912))**
+- **dev/core#1888 and dev/core#1885 - Fatal error on advanced search and warnings and missing group display on contact form ([17888](https://github.com/civicrm/civicrm-core/pull/17888))**
 
-- **[REF] [Test] Minor simplification on test ([18019](https://github.com/civicrm/civicrm-core/pull/18019))**
+- **dev/core#1894 - Make CRM_Activity_Form_SearchTest::testQill less time-sensitive ([17902](https://github.com/civicrm/civicrm-core/pull/17902))**
 
-- **dev/core#1906 - Allow payment create api to record payment on Failed … ([17943](https://github.com/civicrm/civicrm-core/pull/17943))**
+- **dev/core#1895 fix first/last name adv search ([17950](https://github.com/civicrm/civicrm-core/pull/17950))**
 
-- **Fix for failing test ([18036](https://github.com/civicrm/civicrm-core/pull/18036))**
+- **dev/core#1902: "Contribution Source" profile field has no effect ([17930](https://github.com/civicrm/civicrm-core/pull/17930))**
 
-- **Remove invalid use of crmMoney formatter ([18031](https://github.com/civicrm/civicrm-core/pull/18031))**
+- **dev/core#1905 force backend links for new "configure" buttons ([18088](https://github.com/civicrm/civicrm-core/pull/18088))**
 
-- **Remove main PaymentExpress class ([18010](https://github.com/civicrm/civicrm-core/pull/18010))**
+- **dev/core#1905 rework #17942 with simpler ts strings ([18064](https://github.com/civicrm/civicrm-core/pull/18064))**
 
-- **[Ref] Remove transaction instantiation in PaypalPro ([18026](https://github.com/civicrm/civicrm-core/pull/18026))**
+- **dev/core#1905 Add configure icons on public pages ([17942](https://github.com/civicrm/civicrm-core/pull/17942))**
 
-- **[REF] Stop instantiating transaction in PaypalIPN ([18020](https://github.com/civicrm/civicrm-core/pull/18020))**
+- **dev/core#1906 - Allow payment create api to record payment on Failed … ([17943](https://github.com/civicrm/civicrm-core/pull/17943))**
 
-- **Remove unused parameter ids['billing'] ([18021](https://github.com/civicrm/civicrm-core/pull/18021))**
+- **dev/core#1909 Fix E-notice when adding a field on a profile ([17962](https://github.com/civicrm/civicrm-core/pull/17962))**
 
-- **5.28 to master ([18023](https://github.com/civicrm/civicrm-core/pull/18023))**
+- **dev/core#1909 Fix e-notice when adding a payment processor ([17964](https://github.com/civicrm/civicrm-core/pull/17964))**
 
-- **Cache loader - remove legacy handling, handle null result from setting ([17999](https://github.com/civicrm/civicrm-core/pull/17999))**
+- **dev/core#1909 - E_NOTICE opening file-on-case ([17959](https://github.com/civicrm/civicrm-core/pull/17959))**
 
-- **Change inform-icon to fa-info-circle ([18001](https://github.com/civicrm/civicrm-core/pull/18001))**
+- **dev/core#1909 - E_NOTICE on contribution edit ([18006](https://github.com/civicrm/civicrm-core/pull/18006))**
 
-- **[REF] Remove pass-by-reference & always empty param ([17984](https://github.com/civicrm/civicrm-core/pull/17984))**
+- **dev/core#1909 - Avoid E_Notice on SMS provider form when no default url ([17985](https://github.com/civicrm/civicrm-core/pull/17985))**
 
-- **CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option ([17990](https://github.com/civicrm/civicrm-core/pull/17990))**
+- **dev/core#1913 Allow for schemas to be added by extensions if they are… ([17986](https://github.com/civicrm/civicrm-core/pull/17986))**
 
-- **SQL temp table not using utf8mb4 if server default already set to utf8mb4 ([18012](https://github.com/civicrm/civicrm-core/pull/18012))**
+- **dev/core#1915 - E_NOTICE when making pcp contribution ([18002](https://github.com/civicrm/civicrm-core/pull/18002))**
 
-- **Wrong link to admin page in error message about FROM address on PCP page ([17996](https://github.com/civicrm/civicrm-core/pull/17996))**
+- **dev/core#1916 - Fix naming of case export fields / remove ones that aren't true ([18043](https://github.com/civicrm/civicrm-core/pull/18043))**
 
-- **[REF] Tighten up function signature for dedupePair ([17923](https://github.com/civicrm/civicrm-core/pull/17923))**
+- **dev/core#1918 - Remove dubious qfkey checking code that never runs ([18007](https://github.com/civicrm/civicrm-core/pull/18007))**
 
-- **[Ref] Move noisily deprecate  BaseIPN->sendMail, call api from it rather than BAO function ([17982](https://github.com/civicrm/civicrm-core/pull/17982))**
+- **dev/core#1919 - Missing resubscribe url in text/plain version of unsubscribe confirmation email ([18015](https://github.com/civicrm/civicrm-core/pull/18015))**
 
-- **[REF] Use CRM_Utils_Mail::send for sending emails for confirming unsu… ([17396](https://github.com/civicrm/civicrm-core/pull/17396))**
+- **dev/core#1921 [Ref] remove isoToMysql ([18025](https://github.com/civicrm/civicrm-core/pull/18025))**
 
-- **CRM_Core_BAO_Cache - Remove functions deprecated a year ago ([17989](https://github.com/civicrm/civicrm-core/pull/17989))**
+- **dev/core#1928 Fix HTML5 error due to required attribute being set swi… ([18080](https://github.com/civicrm/civicrm-core/pull/18080))**
 
-- **[Test framework] re-re-fix test and add test for test ([18013](https://github.com/civicrm/civicrm-core/pull/18013))**
+- **dev/core#1932 - Make status-checks more polite during upgrade ([18085](https://github.com/civicrm/civicrm-core/pull/18085))**
 
-- **Re-fix test ([18009](https://github.com/civicrm/civicrm-core/pull/18009))**
+- **dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings ([18174](https://github.com/civicrm/civicrm-core/pull/18174))**
 
-- **[NFC] Improve docs for APIv4 Save action ([18004](https://github.com/civicrm/civicrm-core/pull/18004))**
+- **dev/core#1983 Fix to tax calculation on multi-line-item ([18290](https://github.com/civicrm/civicrm-core/pull/18290))**
 
-- **dev/core#1909 - E_NOTICE on contribution edit ([18006](https://github.com/civicrm/civicrm-core/pull/18006))**
+- **dev/core#1972 Fix tax_amount calclation on renewal form ([18271](https://github.com/civicrm/civicrm-core/pull/18271))**
 
-- **dev/core#1918 - Remove dubious qfkey checking code that never runs ([18007](https://github.com/civicrm/civicrm-core/pull/18007))**
 
-- **5.28 ([18008](https://github.com/civicrm/civicrm-core/pull/18008))**
+- **Revert "Swap out button/submit inputs for button elements" ([18185](https://github.com/civicrm/civicrm-core/pull/18185))**
 
-- **[REF] Reduce calls to CRM_Member_PseudoConstant::membershipType ([17987](https://github.com/civicrm/civicrm-core/pull/17987))**
+- **Swap out button/submit inputs for button elements ([18091](https://github.com/civicrm/civicrm-core/pull/18091))**
 
-- **dev/core#1915 - E_NOTICE when making pcp contribution ([18002](https://github.com/civicrm/civicrm-core/pull/18002))**
+- **Installation doclinks not getting url-rewritten ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
 
-- **[Test framework] - Update failing test ([18003](https://github.com/civicrm/civicrm-core/pull/18003))**
+- **Fix button name on updated form ([18000](https://github.com/civicrm/civicrm-core/pull/18000))**
 
-- **Fix repeattransaction api to use custom data from the template contribution ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
+- **Refactor "applyLocale" and remove references to "language" column in UFMatch table ([18049](https://github.com/civicrm/civicrm-core/pull/18049))**
 
-- **dev/financial#139 contribution receive_date shouldn't change when payments come in ([17777](https://github.com/civicrm/civicrm-core/pull/17777))**
+- **Show cron warning on Scheduled Jobs admin page ([18065](https://github.com/civicrm/civicrm-core/pull/18065))**
 
-- **5.28 ([17997](https://github.com/civicrm/civicrm-core/pull/17997))**
+- **Use correct pdf package to generate pdf file on invoice download/email activity ([18056](https://github.com/civicrm/civicrm-core/pull/18056))**
 
-- **Fix case activity field set to allow long details to be exported ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
+- **Fix buggy placement of icons on buttons ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
 
-- **dev/core#1913 Allow for schemas to be added by extensions if they are… ([17986](https://github.com/civicrm/civicrm-core/pull/17986))**
+- **CRM_Utils_Hook: deprecation warning and short array syntax ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
 
-- **[REF] Use Standard function cacheClause to re-use contact acl cache t… ([17707](https://github.com/civicrm/civicrm-core/pull/17707))**
+- **Why not make the buttons flat? ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
 
-- **Fixed filling default values for tagssets in the advanced search form ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
+- **Fix obscure dedupe scenario where 'bad' location data can overwrite good data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
 
-- **dev/core#1909 - Avoid E_Notice on SMS provider form when no default url ([17985](https://github.com/civicrm/civicrm-core/pull/17985))**
+- **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
 
-- **Remove duplicate cache flush ([17988](https://github.com/civicrm/civicrm-core/pull/17988))**
+- **Fix JQuery Validation for radios ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
 
-- **[REF] Extract setUserContext on contribution form & cleanup on backend add membership form ([17968](https://github.com/civicrm/civicrm-core/pull/17968))**
+- **Fix PaypalIPN single function to not receive-by-reference ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
 
-- **dev/core#1755 Fix reCaptcha on Mailing Subscribe ([17305](https://github.com/civicrm/civicrm-core/pull/17305))**
+- **Remove requirement to pass 'contribution_status_id' => Pending from order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
 
-- **[REF] Make explicit what we are doing with 'values' in this code ([17979](https://github.com/civicrm/civicrm-core/pull/17979))**
+- **Use saved contribution's line items rather than the primaryContributionID ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
 
-- **Simplify caching of status checks ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
+- **Wrap multi record custom field inside a div ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
 
-- **[REF] Reduce interaction between dedupe code and createProfileContact ([17920](https://github.com/civicrm/civicrm-core/pull/17920))**
+- **Remove url-tracking in mass sms. dev/core#1843 ([17700](https://github.com/civicrm/civicrm-core/pull/17700))**
 
-- **ensure custom field checkboxes are populated in profiles ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
+- **Do not overwrite values saved from the repeatContribution routine ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
 
-- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([17927](https://github.com/civicrm/civicrm-core/pull/17927))**
+- **SystemCheck: add ability to efficiently run only specified checks ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
 
-- **[REF] Minor code clean up ([17974](https://github.com/civicrm/civicrm-core/pull/17974))**
+- **Change inform-icon to fa-info-circle ([18001](https://github.com/civicrm/civicrm-core/pull/18001))**
 
-- **5.28 to master ([17976](https://github.com/civicrm/civicrm-core/pull/17976))**
+- **CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option ([17990](https://github.com/civicrm/civicrm-core/pull/17990))**
 
-- **[REF] Grant cleanup ([17967](https://github.com/civicrm/civicrm-core/pull/17967))**
+- **SQL temp table not using utf8mb4 if server default already set to utf8mb4 ([18012](https://github.com/civicrm/civicrm-core/pull/18012))**
 
-- **[NFC] Add in a unit test of calling the contribution page widget endp… ([17965](https://github.com/civicrm/civicrm-core/pull/17965))**
+- **Wrong link to admin page in error message about FROM address on PCP page ([17996](https://github.com/civicrm/civicrm-core/pull/17996))**
 
-- **5.28 ([17963](https://github.com/civicrm/civicrm-core/pull/17963))**
+- **CRM_Core_BAO_Cache - Remove functions deprecated a year ago ([17989](https://github.com/civicrm/civicrm-core/pull/17989))**
 
-- **dev/core#1909 Fix E-notice when adding a field on a profile ([17962](https://github.com/civicrm/civicrm-core/pull/17962))**
+- **Fix repeattransaction api to use custom data from the template contribution ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
 
-- **dev/core#1909 Fix e-notice when adding a payment processor ([17964](https://github.com/civicrm/civicrm-core/pull/17964))**
+- **Fix case activity field set to allow long details to be exported ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
 
-- **dev/core#1909 - E_NOTICE opening file-on-case ([17959](https://github.com/civicrm/civicrm-core/pull/17959))**
+- **Fixed filling default values for tagssets in the advanced search form ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
 
-- **[Ref] Simplify field reference ([17941](https://github.com/civicrm/civicrm-core/pull/17941))**
+- **Remove duplicate cache flush ([17988](https://github.com/civicrm/civicrm-core/pull/17988))**
 
-- **[Test framework] - Combine triplicate createCase functions ([17957](https://github.com/civicrm/civicrm-core/pull/17957))**
+- **Simplify caching of status checks ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
 
-- **[REF] Refactor to use the standard CRM_Core_Form::addRadio function f… ([17932](https://github.com/civicrm/civicrm-core/pull/17932))**
+- **ensure custom field checkboxes are populated in profiles ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
 
 - **Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer ([17948](https://github.com/civicrm/civicrm-core/pull/17948))**
 
-- **[REF] Fix the default to_financial_account_id for generated transactions ([17938](https://github.com/civicrm/civicrm-core/pull/17938))**
-
 - **APIv4 - Add keyword to select all custom fields ([17955](https://github.com/civicrm/civicrm-core/pull/17955))**
 
-- **[REF] Upgrade dompdf version to be more compatible with PHP7.4 ([17946](https://github.com/civicrm/civicrm-core/pull/17946))**
-
-- **[REF] [Tests] Cleanup test declaration to take advantage of mapping improvements ([17939](https://github.com/civicrm/civicrm-core/pull/17939))**
-
-- **dev/drupal#127 - CRM_Core_Session::setStatus() gets ignored sometimes ([17914](https://github.com/civicrm/civicrm-core/pull/17914))**
-
-- **5.28 to master ([17953](https://github.com/civicrm/civicrm-core/pull/17953))**
-
-- **[REF] Remove unnecessary complexity on im export ([17949](https://github.com/civicrm/civicrm-core/pull/17949))**
-
-- **NFC - Docblock cleanup ([17945](https://github.com/civicrm/civicrm-core/pull/17945))**
-
 - **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
 
-- **Remove error checking by-pass in tests ([17940](https://github.com/civicrm/civicrm-core/pull/17940))**
-
 - **Remove extraneous opportunistic cache flush. ([17936](https://github.com/civicrm/civicrm-core/pull/17936))**
 
-- **dev/core#1902: "Contribution Source" profile field has no effect ([17930](https://github.com/civicrm/civicrm-core/pull/17930))**
-
-- **[REF] GroupContact BAO - Minor code cleanup ([17928](https://github.com/civicrm/civicrm-core/pull/17928))**
-
-- **5.28 to master ([17931](https://github.com/civicrm/civicrm-core/pull/17931))**
+- **Improve caching of current domain ([17916](https://github.com/civicrm/civicrm-core/pull/17916))**
 
-- **[REF] Minor function signuture cleanup ([17922](https://github.com/civicrm/civicrm-core/pull/17922))**
+- **Setup UI - Validate that at least one "Component" is enabled ([17778](https://github.com/civicrm/civicrm-core/pull/17778))**
 
-- **[REF] Do not pass variable by reference ([17921](https://github.com/civicrm/civicrm-core/pull/17921))**
+- **Member detail report: nest "in" options in parentheses ([17911](https://github.com/civicrm/civicrm-core/pull/17911))**
 
-- **5.28 ([17926](https://github.com/civicrm/civicrm-core/pull/17926))**
+- **Fix sticky table header on "Find Activities" page ([17917](https://github.com/civicrm/civicrm-core/pull/17917))**
 
-- **[NFC] Update a few doc/wiki links in code comments ([17918](https://github.com/civicrm/civicrm-core/pull/17918))**
+- **Remove unused "ufUniqID" session variable ([17904](https://github.com/civicrm/civicrm-core/pull/17904))**
 
-- **Improve caching of current domain ([17916](https://github.com/civicrm/civicrm-core/pull/17916))**
+- **Replace a load of references to the wiki with docs links ([17900](https://github.com/civicrm/civicrm-core/pull/17900))**
 
-- **Setup UI - Validate that at least one "Component" is enabled ([17778](https://github.com/civicrm/civicrm-core/pull/17778))**
+- **Remove check for valid email in synchronizeUFMatch ([17771](https://github.com/civicrm/civicrm-core/pull/17771))**
 
-- **Member detail report: nest "in" options in parentheses ([17911](https://github.com/civicrm/civicrm-core/pull/17911))**
+- **Call apiv4 from Contribution create rather than fugly addActivity function ([17881](https://github.com/civicrm/civicrm-core/pull/17881))**
 
-- **Fix sticky table header on "Find Activities" page ([17917](https://github.com/civicrm/civicrm-core/pull/17917))**
+- **APIv4 - Add BasicEntity helper class ([17899](https://github.com/civicrm/civicrm-core/pull/17899))**
 
-- **5.28 ([17908](https://github.com/civicrm/civicrm-core/pull/17908))**
+- **Add APIv4 and pseudoconstants for RelationshipCache ([17879](https://github.com/civicrm/civicrm-core/pull/17879))**
 
-- **[REF] remove unnecessary variable variables ([17903](https://github.com/civicrm/civicrm-core/pull/17903))**
+- **Update version in the test_data_second_domain file and also update the setVersion script to update the file version as necessary ([17897](https://github.com/civicrm/civicrm-core/pull/17897))**
 
-- **dev/core#1855 - Allow different output formats for CiviReport results and untangle code ([17901](https://github.com/civicrm/civicrm-core/pull/17901))**
+- **Be a little less supportive to cvs ([17896](https://github.com/civicrm/civicrm-core/pull/17896))**
 
-- **[REF] - Add helper function for the repetitive task of fetching multilingual ([17650](https://github.com/civicrm/civicrm-core/pull/17650))**
+- **APIv4 - Specify BridgeEntities to assist with joins ([17808](https://github.com/civicrm/civicrm-core/pull/17808))**
 
-- **[unreleased regression] Dummy processor now is ID 7 on buildkit sites ([17905](https://github.com/civicrm/civicrm-core/pull/17905))**
+- **Event Cart ext: Move menu entries to extension ([17891](https://github.com/civicrm/civicrm-core/pull/17891))**
 
-- **Remove unused "ufUniqID" session variable ([17904](https://github.com/civicrm/civicrm-core/pull/17904))**
+- **EventCart ext: Cleanup and move form components to ext ([17885](https://github.com/civicrm/civicrm-core/pull/17885))**
 
-- **Replace a load of references to the wiki with docs links ([17900](https://github.com/civicrm/civicrm-core/pull/17900))**
+- **EventCart ext: Fix autogenerated code, remove unused hooks, update readme ([17884](https://github.com/civicrm/civicrm-core/pull/17884))**
 
-- **dev/core#1894 - Make CRM_Activity_Form_SearchTest::testQill less time-sensitive ([17902](https://github.com/civicrm/civicrm-core/pull/17902))**
+- **Load contribution page if live payment processor is disabled but test is available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
 
-- **dev/core#183 Use TempTable builder to generate table for import ([17827](https://github.com/civicrm/civicrm-core/pull/17827))**
+- **Search debug ([17887](https://github.com/civicrm/civicrm-core/pull/17887))**
 
-- **Remove check for valid email in synchronizeUFMatch ([17771](https://github.com/civicrm/civicrm-core/pull/17771))**
+- **Use new checkPermissions shorthand in api calls ([17874](https://github.com/civicrm/civicrm-core/pull/17874))**
 
-- **Call apiv4 from Contribution create rather than fugly addActivity function ([17881](https://github.com/civicrm/civicrm-core/pull/17881))**
+- **Simplify flushing group contact cache query to reduce table locking and improve performance ([17846](https://github.com/civicrm/civicrm-core/pull/17846))**
 
-- **APIv4 - Add BasicEntity helper class ([17899](https://github.com/civicrm/civicrm-core/pull/17899))**
 
-- **mailing#70 Don't create users for test mail if user doesn't have permission ([17867](https://github.com/civicrm/civicrm-core/pull/17867))**
 
-- **Add APIv4 and pseudoconstants for RelationshipCache ([17879](https://github.com/civicrm/civicrm-core/pull/17879))**
+- **Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
 
-- **dev/core#1670 copy custom fields from master to shared address ([17580](https://github.com/civicrm/civicrm-core/pull/17580))**
+- **Fix currency symbol for Total Amount on contribution page ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
 
-- **[Ref] Unit test attempt to create reported bugs , minor cleanup ([17560](https://github.com/civicrm/civicrm-core/pull/17560))**
+- **RelationshipCache - Add a high-level index to facilitate relationship queries (more fields) ([17781](https://github.com/civicrm/civicrm-core/pull/17781))**
 
-- **Update version in the test_data_second_domain file and also update th… ([17897](https://github.com/civicrm/civicrm-core/pull/17897))**
+- **Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks ([17831](https://github.com/civicrm/civicrm-core/pull/17831))**
 
-- **dev/core#1888 - Fix one line in PR 17888  ([17898](https://github.com/civicrm/civicrm-core/pull/17898))**
+- **APIv4 - Add shorthand for setCheckPermissions() ([17834](https://github.com/civicrm/civicrm-core/pull/17834))**
 
-- **Be a little less supportive to cvs ([17896](https://github.com/civicrm/civicrm-core/pull/17896))**
+- **Use PrematureExit exception instead of weird hack in tests ([17870](https://github.com/civicrm/civicrm-core/pull/17870))**
 
-- **dev/core#1888 and dev/core#1885 - Fatal error on advanced search and warnings and missing group display on contact form ([17888](https://github.com/civicrm/civicrm-core/pull/17888))**
+- **Remove unnecessary try/catch per #17729 ([17823](https://github.com/civicrm/civicrm-core/pull/17823))**
 
-- **APIv4 - Specify BridgeEntities to assist with joins ([17808](https://github.com/civicrm/civicrm-core/pull/17808))**
+- **Fixed DB Error: syntax error if line item refers to civicrm_case ([16626](https://github.com/civicrm/civicrm-core/pull/16626))**
 
-- **Contribution Summary Report: Taking the currency filtered in the "gen… ([16736](https://github.com/civicrm/civicrm-core/pull/16736))**
+- **Fix potential js error on summary screen when reloading blocks ([17865](https://github.com/civicrm/civicrm-core/pull/17865))**
 
-- **Event Cart ext: Move menu entries to extension ([17891](https://github.com/civicrm/civicrm-core/pull/17891))**
+- **Search Ext: fix loading options and parsing custom field names ([17864](https://github.com/civicrm/civicrm-core/pull/17864))**
 
-- **5.28 ([17895](https://github.com/civicrm/civicrm-core/pull/17895))**
+- **EventCart - Resolve BAO identity and uncommitted DAO changes ([17861](https://github.com/civicrm/civicrm-core/pull/17861))**
 
-- **[Test Framework] - Tests for report downloads ([17892](https://github.com/civicrm/civicrm-core/pull/17892))**
+- **Bump lodash from 4.17.15 to 4.17.19 ([17858](https://github.com/civicrm/civicrm-core/pull/17858))**
 
-- **dev/core#1578 - Fix APIv4 chaining with custom fields ([17866](https://github.com/civicrm/civicrm-core/pull/17866))**
+- **handlePaymentNotification() should not be declared as a static method ([17849](https://github.com/civicrm/civicrm-core/pull/17849))**
 
-- **Unit test for #17361 ([17882](https://github.com/civicrm/civicrm-core/pull/17882))**
+- **Move BAO and template files into event cart ([17743](https://github.com/civicrm/civicrm-core/pull/17743))**
 
-- **EventCart ext: Cleanup and move form components to ext ([17885](https://github.com/civicrm/civicrm-core/pull/17885))**
+- **Update regen.sh with new & upcoming core extensions ([17839](https://github.com/civicrm/civicrm-core/pull/17839))**
 
-- **EventCart ext: Fix autogenerated code, remove unused hooks, update readme ([17884](https://github.com/civicrm/civicrm-core/pull/17884))**
+- **MembershipRenewalTest - Fix failure ([17830](https://github.com/civicrm/civicrm-core/pull/17830))**
 
-- **Load contribution page if live payment processor is disabled but test is available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
+- **Remove hard coded charset. ([17826](https://github.com/civicrm/civicrm-core/pull/17826))**
 
-- **Search debug ([17887](https://github.com/civicrm/civicrm-core/pull/17887))**
+- **APIv4 - Add activity contacts to APIv4 field spec ([17766](https://github.com/civicrm/civicrm-core/pull/17766))**
 
-- **dev/core#1767 Fix phone key parsing in CRM_Dedupe_Finder ([17361](https://github.com/civicrm/civicrm-core/pull/17361))**
+- **Adjust mysql SET NAMES in remaining places as we agreed this was the go ([17825](https://github.com/civicrm/civicrm-core/pull/17825))**
 
-- **[NFC] Fix nonstandard header comments ([17880](https://github.com/civicrm/civicrm-core/pull/17880))**
+- **Make new email open and url routes 'public' ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
 
-- **dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates ([17480](https://github.com/civicrm/civicrm-core/pull/17480))**
+- **Make api get upgrade-safe ([17729](https://github.com/civicrm/civicrm-core/pull/17729))**
 
-- **Use new checkPermissions shorthand in api calls ([17874](https://github.com/civicrm/civicrm-core/pull/17874))**
+- **CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers ([17780](https://github.com/civicrm/civicrm-core/pull/17780))**
 
-- **5.28 ([17878](https://github.com/civicrm/civicrm-core/pull/17878))**
+- **CheckEnv - Give new installs a grace period before 'Cron Not Running' msg ([17800](https://github.com/civicrm/civicrm-core/pull/17800))**
 
-- **Simplify flushing group contact cache query to reduce table locking and improve performance ([17846](https://github.com/civicrm/civicrm-core/pull/17846))**
+- **Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()' ([17816](https://github.com/civicrm/civicrm-core/pull/17816))**
 
-- **dev/core#1869 - Include BOM in attachment when sending CSV CiviReport via mail_report job ([17806](https://github.com/civicrm/civicrm-core/pull/17806))**
 
-- **dev/core#1280 Fix ContributionPage soft_credit translation ([16838](https://github.com/civicrm/civicrm-core/pull/16838))**
 
-- **[NFC] Comment block cleanup ([17872](https://github.com/civicrm/civicrm-core/pull/17872))**
+- **Add hidden tag to search extension ([17789](https://github.com/civicrm/civicrm-core/pull/17789))**
 
-- **REF Extract addToRecentItems from membership create ([17524](https://github.com/civicrm/civicrm-core/pull/17524))**
+- **Sort permittedActivityTypes ([17794](https://github.com/civicrm/civicrm-core/pull/17794))**
 
-- **Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
+- **Add auto-renew status to membership detail report ([17683](https://github.com/civicrm/civicrm-core/pull/17683))**
 
-- **dev/membership#18 Enhance parameters for Job.process_membership ([16298](https://github.com/civicrm/civicrm-core/pull/16298))**
+- **APIv4 - Fix saving custom fields with same name ([17791](https://github.com/civicrm/civicrm-core/pull/17791))**
 
-- **Fix currency symbol for Total Amount on contribution page ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
+- **Add system check to ensure WP base page exists ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
 
-- **RelationshipCache - Add a high-level index to facilitate relationship queries (more fields) ([17781](https://github.com/civicrm/civicrm-core/pull/17781))**
+- **Fixed notice error on Relationships report ([17787](https://github.com/civicrm/civicrm-core/pull/17787))**
 
-- **[REF] Fix a couple of jQuery errors that have cropped up ([17871](https://github.com/civicrm/civicrm-core/pull/17871))**
+- **getLoggedInContactID() is a static function ([17783](https://github.com/civicrm/civicrm-core/pull/17783))**
 
-- **Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks ([17831](https://github.com/civicrm/civicrm-core/pull/17831))**
+- **Add search extension ([17775](https://github.com/civicrm/civicrm-core/pull/17775))**
 
-- **APIv4 - Add shorthand for setCheckPermissions() ([17834](https://github.com/civicrm/civicrm-core/pull/17834))**
+- **Remove PaymentExpress ipn class ([17763](https://github.com/civicrm/civicrm-core/pull/17763))**
 
-- **Use PrematureExit exception instead of weird hack in tests ([17870](https://github.com/civicrm/civicrm-core/pull/17870))**
+- **Status Checks - Use more specific label regarding "Domain"/"Organization" check ([17776](https://github.com/civicrm/civicrm-core/pull/17776))**
 
-- **dev/core#1113 - Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing a membership ([16429](https://github.com/civicrm/civicrm-core/pull/16429))**
+- **Bump minimum upgradable version to 4.4.7 ([17750](https://github.com/civicrm/civicrm-core/pull/17750))**
 
-- **(REF) regen.sh - Remove unusual handling of `zipcodes.mysql` ([17869](https://github.com/civicrm/civicrm-core/pull/17869))**
+- **Remove unused, deprecated functions ([17761](https://github.com/civicrm/civicrm-core/pull/17761))**
 
-- **dev/report#43 - Icon after saving a civireport instance is misleading ([17863](https://github.com/civicrm/civicrm-core/pull/17863))**
+- **Improve efficiency of findFiles ([17745](https://github.com/civicrm/civicrm-core/pull/17745))**
 
-- **Remove unnecessary try/catch per #17729 ([17823](https://github.com/civicrm/civicrm-core/pull/17823))**
+- **APIv4 Explorer: Improve selection of fields for HAVING ([17746](https://github.com/civicrm/civicrm-core/pull/17746))**
 
-- **dev/core#1725 Only export primary address fields ([17458](https://github.com/civicrm/civicrm-core/pull/17458))**
+- **More unused functions in GenCode ([17756](https://github.com/civicrm/civicrm-core/pull/17756))**
 
-- **api_v3_TaxContributionPageTest fix - remove hard coded processor id ([17860](https://github.com/civicrm/civicrm-core/pull/17860))**
+- **Fix PHP notice on wordpress permissions form ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
 
-- **Fixed DB Error: syntax error if line item refers to civicrm_case ([16626](https://github.com/civicrm/civicrm-core/pull/16626))**
+- **Convert CRM.utils.formatDate tests to karma ([17757](https://github.com/civicrm/civicrm-core/pull/17757))**
 
-- **Fix potential js error on summary screen when reloading blocks ([17865](https://github.com/civicrm/civicrm-core/pull/17865))**
+- **Teach CRM.utils.formatDate to also show time ([17684](https://github.com/civicrm/civicrm-core/pull/17684))**
 
-- **Search Ext: fix loading options and parsing custom field names ([17864](https://github.com/civicrm/civicrm-core/pull/17864))**
+- **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
 
-- **EventCart - Resolve BAO identity and uncommitted DAO changes ([17861](https://github.com/civicrm/civicrm-core/pull/17861))**
+- **Fixed for multi-select filter ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
 
-- **[REF] ScheduledJob cleanup, remove unused var ([17862](https://github.com/civicrm/civicrm-core/pull/17862))**
+- **fix url for file field ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
 
-- **dev/core#1090 Update extendedSerializeData to use the Backbone namesp… ([17855](https://github.com/civicrm/civicrm-core/pull/17855))**
+- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin ([214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
 
-- **dev/core#1874 - Failing test for new Individual form ([17835](https://github.com/civicrm/civicrm-core/pull/17835))**
+- **Installation - Support "activate first" w/setup UI ([121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
+- **Installation - Support "activate first" w/setup UI ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
 
-- **Bump lodash from 4.17.15 to 4.17.19 ([17858](https://github.com/civicrm/civicrm-core/pull/17858))**
+## <a name="misc"></a>Miscellany
 
-- **5.28 ([17859](https://github.com/civicrm/civicrm-core/pull/17859))**
+- **[REF] Extract setUserContext on contribution form & cleanup on backend add
+  membership form
+  ([17968](https://github.com/civicrm/civicrm-core/pull/17968))**
 
-- **[REF] Migrate Event Cart Setting into the Extension ([17841](https://github.com/civicrm/civicrm-core/pull/17841))**
+- **[REF] remove unnecessary variable variables
+  ([17903](https://github.com/civicrm/civicrm-core/pull/17903))**
 
-- **5.28 ([17856](https://github.com/civicrm/civicrm-core/pull/17856))**
+- **[REF] - Add helper function for the repetitive task of fetching multilingual
+  ([17650](https://github.com/civicrm/civicrm-core/pull/17650))**
 
-- **handlePaymentNotification() should not be declared as a static method ([17849](https://github.com/civicrm/civicrm-core/pull/17849))**
+- **[Ref] Unit test attempt to create reported bugs , minor cleanup
+  ([17560](https://github.com/civicrm/civicrm-core/pull/17560))**
 
-- **[REF] Only printOnly once ([17850](https://github.com/civicrm/civicrm-core/pull/17850))**
+- **REF Extract addToRecentItems from membership create
+  ([17524](https://github.com/civicrm/civicrm-core/pull/17524))**
 
-- **API tests - label versions in dataprovider versionThreeAndFour ([17847](https://github.com/civicrm/civicrm-core/pull/17847))**
+- **[REF] Fix a couple of jQuery errors that have cropped up
+  ([17871](https://github.com/civicrm/civicrm-core/pull/17871))**
 
-- **dev/core#1880 add backticks to custom field insertions ([17848](https://github.com/civicrm/civicrm-core/pull/17848))**
+- **(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`
+  ([17869](https://github.com/civicrm/civicrm-core/pull/17869))**
 
-- **(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests ([17845](https://github.com/civicrm/civicrm-core/pull/17845))**
+- **[REF] ScheduledJob cleanup, remove unused var
+  ([17862](https://github.com/civicrm/civicrm-core/pull/17862))**
 
-- **dev/core#1872 - Packages and vendor path calculation used in system check is outdated ([17844](https://github.com/civicrm/civicrm-core/pull/17844))**
+- **[REF] Migrate Event Cart Setting into the Extension
+  ([17841](https://github.com/civicrm/civicrm-core/pull/17841))**
 
-- **[NFC] Re run regen after recent merges ([17842](https://github.com/civicrm/civicrm-core/pull/17842))**
+- **[REF] Only printOnly once
+  ([17850](https://github.com/civicrm/civicrm-core/pull/17850))**
 
-- **5.28 ([17843](https://github.com/civicrm/civicrm-core/pull/17843))**
+- **(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests
+  ([17845](https://github.com/civicrm/civicrm-core/pull/17845))**
 
-- **Move BAO and template files into event cart ([17743](https://github.com/civicrm/civicrm-core/pull/17743))**
+- **(REF) WebsiteTest - Mitigate flaky failures
+  ([17833](https://github.com/civicrm/civicrm-core/pull/17833))**
 
-- **Update regen.sh with new & upcoming core extensions ([17839](https://github.com/civicrm/civicrm-core/pull/17839))**
+- **[REF] Follow up cleanup
+  ([17788](https://github.com/civicrm/civicrm-core/pull/17788))**
 
-- **MembershipRenewalTest - Fix failure ([17830](https://github.com/civicrm/civicrm-core/pull/17830))**
+- **[REF] Remove ACL join on temp table creation in Member ContributionDetail
+  report ([17723](https://github.com/civicrm/civicrm-core/pull/17723))**
 
-- **Remove hard coded charset. ([17826](https://github.com/civicrm/civicrm-core/pull/17826))**
+- **[REF] Do or do not - there is no try
+  ([17795](https://github.com/civicrm/civicrm-core/pull/17795))**
 
-- **(REF) WebsiteTest - Mitigate flaky failures ([17833](https://github.com/civicrm/civicrm-core/pull/17833))**
+- **[REF] Unused interface CRM_Report_Interface
+  ([17767](https://github.com/civicrm/civicrm-core/pull/17767))**
 
-- **dev/core#1812 Missing view when logging set in a non-US English instance ([17815](https://github.com/civicrm/civicrm-core/pull/17815))**
+- **REF - Cleanup StatusPreference BAO to be more standard
+  ([17801](https://github.com/civicrm/civicrm-core/pull/17801))**
 
-- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([13958](https://github.com/civicrm/civicrm-core/pull/13958))**
+- **[REF] Reduce interaction between dedupe code and createProfileContact
+  ([17920](https://github.com/civicrm/civicrm-core/pull/17920))**
 
-- **APIv4 - Add activity contacts to APIv4 field spec ([17766](https://github.com/civicrm/civicrm-core/pull/17766))**
+- **[Ref] Simplify field reference
+  ([17941](https://github.com/civicrm/civicrm-core/pull/17941))**
 
-- **Adjust mysql SET NAMES in remaining places as we agreed this was the go ([17825](https://github.com/civicrm/civicrm-core/pull/17825))**
+- **[REF] [Test] Minor simplification on test
+  ([18019](https://github.com/civicrm/civicrm-core/pull/18019))**
 
-- **core#1805: Autocomplete-select custom field is not searchable ([17569](https://github.com/civicrm/civicrm-core/pull/17569))**
+- **[Ref] Simplify is_email_receipt in sendMail
+  ([18029](https://github.com/civicrm/civicrm-core/pull/18029))**
 
-- **event#38 fix wording on event reg page ([17695](https://github.com/civicrm/civicrm-core/pull/17695))**
+- **[REF] Remove transaction from BaseIPN completeTransaction call
+  ([18042](https://github.com/civicrm/civicrm-core/pull/18042))**
 
-- **core#1795: Searchable Parent tags ([17513](https://github.com/civicrm/civicrm-core/pull/17513))**
+- **[REF] Simplify membership status date handling
+  ([18030](https://github.com/civicrm/civicrm-core/pull/18030))**
 
-- **dev/core#1768 - Add CiviMail synchronisation frequency setting. ([17709](https://github.com/civicrm/civicrm-core/pull/17709))**
+- **[REF] Clean up handling of financial_type_id override
+  ([18032](https://github.com/civicrm/civicrm-core/pull/18032))**
 
-- **Make new email open and url routes 'public' ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
+- **[REF] Remove transaction from completeOrder signature
+  ([18046](https://github.com/civicrm/civicrm-core/pull/18046))**
 
-- **dev/core#1871 - require_once's that include "packages/" in the path don't work on drupal 8 ([17822](https://github.com/civicrm/civicrm-core/pull/17822))**
+- **[Ref] Remove transaction instantiation in PaypalPro
+  ([18026](https://github.com/civicrm/civicrm-core/pull/18026))**
 
-- **Make api get upgrade-safe ([17729](https://github.com/civicrm/civicrm-core/pull/17729))**
+- **[REF] Stop instantiating transaction in PaypalIPN
+  ([18020](https://github.com/civicrm/civicrm-core/pull/18020))**
 
-- **5.28 ([17799](https://github.com/civicrm/civicrm-core/pull/17799))**
+- **[REF] Remove pass-by-reference & always empty param
+  ([17984](https://github.com/civicrm/civicrm-core/pull/17984))**
 
-- **CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers ([17780](https://github.com/civicrm/civicrm-core/pull/17780))**
+- **[REF] Tighten up function signature for dedupePair
+  ([17923](https://github.com/civicrm/civicrm-core/pull/17923))**
 
-- **CheckEnv - Give new installs a grace period before 'Cron Not Running' msg ([17800](https://github.com/civicrm/civicrm-core/pull/17800))**
+- **[Ref] Move noisily deprecate  BaseIPN->sendMail, call api from it rather
+  than BAO function
+  ([17982](https://github.com/civicrm/civicrm-core/pull/17982))**
 
-- **Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()' ([17816](https://github.com/civicrm/civicrm-core/pull/17816))**
+- **[REF] Use CRM_Utils_Mail::send for sending emails for confirming unsubscribe
+  resubscribe auto replies and subscribing
+  ([17396](https://github.com/civicrm/civicrm-core/pull/17396))**
 
-- **dev/core#1861 fix failure to unset location_type_id when saving uffield ([17812](https://github.com/civicrm/civicrm-core/pull/17812))**
+- **[REF] Reduce calls to CRM_Member_PseudoConstant::membershipType
+  ([17987](https://github.com/civicrm/civicrm-core/pull/17987))**
 
-- **dev/core#1863 Downgrade checkEnvironment level and skip non-prod checks ([17807](https://github.com/civicrm/civicrm-core/pull/17807))**
+- **[REF] Use Standard function cacheClause to re-use contact acl cache table
+  ([17707](https://github.com/civicrm/civicrm-core/pull/17707))**
 
-- **reporting#21 - don't multiple contribution details when a 1-to-many r… ([15435](https://github.com/civicrm/civicrm-core/pull/15435))**
+- **[REF] Make explicit what we are doing with 'values' in this code
+  ([17979](https://github.com/civicrm/civicrm-core/pull/17979))**
 
-- **Add hidden tag to search extension ([17789](https://github.com/civicrm/civicrm-core/pull/17789))**
+- **[REF] Minor code clean up
+  ([17974](https://github.com/civicrm/civicrm-core/pull/17974))**
 
-- **[REF] Follow up cleanup ([17788](https://github.com/civicrm/civicrm-core/pull/17788))**
+- **[REF] Grant cleanup
+  ([17967](https://github.com/civicrm/civicrm-core/pull/17967))**
 
-- **[REF] Remove ACL join on temp table creation in Member ContributionDe… ([17723](https://github.com/civicrm/civicrm-core/pull/17723))**
+- **[REF] Refactor to use the standard CRM_Core_Form::addRadio function for a
+  number of radio elements
+  ([17932](https://github.com/civicrm/civicrm-core/pull/17932))**
 
-- **dev/core#1858 Prevent Duplicate contact records being created and har… ([17769](https://github.com/civicrm/civicrm-core/pull/17769))**
+- **[REF] Fix the default to_financial_account_id for generated transactions
+  ([17938](https://github.com/civicrm/civicrm-core/pull/17938))**
 
-- **REF - Cleanup StatusPreference BAO to be more standard ([17801](https://github.com/civicrm/civicrm-core/pull/17801))**
+- **[REF] Upgrade dompdf version to be more compatible with PHP7.4
+  ([17946](https://github.com/civicrm/civicrm-core/pull/17946))**
 
-- **Sort permittedActivityTypes ([17794](https://github.com/civicrm/civicrm-core/pull/17794))**
+- **[REF] [Tests] Cleanup test declaration to take advantage of mapping
+  improvements ([17939](https://github.com/civicrm/civicrm-core/pull/17939))**
 
-- **[REF] Do or do not - there is no try ([17795](https://github.com/civicrm/civicrm-core/pull/17795))**
+- **[REF] Remove unnecessary complexity on im export
+  ([17949](https://github.com/civicrm/civicrm-core/pull/17949))**
 
-- **Add auto-renew status to membership detail report ([17683](https://github.com/civicrm/civicrm-core/pull/17683))**
+- **[REF] GroupContact BAO - Minor code cleanup
+  ([17928](https://github.com/civicrm/civicrm-core/pull/17928))**
 
-- **APIv4 - Fix saving custom fields with same name ([17791](https://github.com/civicrm/civicrm-core/pull/17791))**
+- **[REF] Minor function signuture cleanup
+  ([17922](https://github.com/civicrm/civicrm-core/pull/17922))**
 
-- **Add system check to ensure WP base page exists ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
+- **[REF] Do not pass variable by reference
+  ([17921](https://github.com/civicrm/civicrm-core/pull/17921))**
 
-- **dev/core#1868 - Regression - Description field is always blank on profiles admin page and slew of E_NOTICES ([17786](https://github.com/civicrm/civicrm-core/pull/17786))**
+- **[REF] remove first attempt to set currency in repeattransaction flow
+  ([18055](https://github.com/civicrm/civicrm-core/pull/18055))**
 
-- **Fixed notice error on Relationships report ([17787](https://github.com/civicrm/civicrm-core/pull/17787))**
+- **[REF] Even less variable variables
+  ([18058](https://github.com/civicrm/civicrm-core/pull/18058))**
 
-- **getLoggedInContactID() is a static function ([17783](https://github.com/civicrm/civicrm-core/pull/17783))**
+- **[REF] Move handling of form elements back to the Form
+  ([17981](https://github.com/civicrm/civicrm-core/pull/17981))**
 
-- **5.28 ([17782](https://github.com/civicrm/civicrm-core/pull/17782))**
+- **[REF] Simplify location metadata handling in Export class
+  ([17951](https://github.com/civicrm/civicrm-core/pull/17951))**
 
-- **dev/core#1679: Ensure Paypal IPN always updates the next scheduled payment date ([17744](https://github.com/civicrm/civicrm-core/pull/17744))**
+- **[REF] Do not pass by reference to the recur function
+  ([18057](https://github.com/civicrm/civicrm-core/pull/18057))**
 
-- **5.28 ([17774](https://github.com/civicrm/civicrm-core/pull/17774))**
+- **[REF] Simplify getMembershipStatusByDate more
+  ([18051](https://github.com/civicrm/civicrm-core/pull/18051))**
 
-- **dev/core#1853 - Fix validation errors when removing contact subtype ([17765](https://github.com/civicrm/civicrm-core/pull/17765))**
+- **[REF] Remove mail_mime package as now supplied by composer
+  ([300](https://github.com/civicrm/civicrm-packages/pull/300))**
 
-- **Add search extension ([17775](https://github.com/civicrm/civicrm-core/pull/17775))**
+- **[REF] Remove some deprecated size function calls replaced with length
+  ([299](https://github.com/civicrm/civicrm-packages/pull/299))**
 
-- **[dev/core#750] Don't check server variables if we're running in CLI ([17636](https://github.com/civicrm/civicrm-core/pull/17636))**
+- **[NFC] Fix provider unit test on PHP7.4
+  ([18073](https://github.com/civicrm/civicrm-core/pull/18073))**
 
-- **Remove PaymentExpress ipn class ([17763](https://github.com/civicrm/civicrm-core/pull/17763))**
+- **NFC - Docblock cleanup
+  ([610](https://github.com/civicrm/civicrm-drupal/pull/610))**
 
-- **Status Checks - Use more specific label regarding "Domain"/"Organization" check ([17776](https://github.com/civicrm/civicrm-core/pull/17776))**
+- **[NFC] Update versions file to remove reference to Mail_mime and Mail
+  ([301](https://github.com/civicrm/civicrm-packages/pull/301))**
 
-- **5.28 to master ([17770](https://github.com/civicrm/civicrm-core/pull/17770))**
+- **[NFC] Re run regen after recent merges
+  ([17842](https://github.com/civicrm/civicrm-core/pull/17842))**
 
-- **dev/drupal#114 and dev/core#1647 - Remove resource url status check ([17754](https://github.com/civicrm/civicrm-core/pull/17754))**
+- **[NFC] Fix nonstandard header comments
+  ([17880](https://github.com/civicrm/civicrm-core/pull/17880))**
 
-- **Bump minimum upgradable version to 4.4.7 ([17750](https://github.com/civicrm/civicrm-core/pull/17750))**
+- **[NFC] Add in a unit test of calling the contribution page widget endpoint
+  and remove unneeded file
+  ([17965](https://github.com/civicrm/civicrm-core/pull/17965))**
 
-- **[REF] Unused interface CRM_Report_Interface ([17767](https://github.com/civicrm/civicrm-core/pull/17767))**
+- **[NFC] Improve docs for APIv4 Save action
+  ([18004](https://github.com/civicrm/civicrm-core/pull/18004))**
 
-- **[TEST] Failing test for PR 16559 ([17256](https://github.com/civicrm/civicrm-core/pull/17256))**
+- **NFC - Docblock cleanup
+  ([17945](https://github.com/civicrm/civicrm-core/pull/17945))**
 
-- **update to pr 16559 ([17764](https://github.com/civicrm/civicrm-core/pull/17764))**
+- **[NFC] Update a few doc/wiki links in code comments
+  ([17918](https://github.com/civicrm/civicrm-core/pull/17918))**
 
-- **Remove unused, deprecated functions ([17761](https://github.com/civicrm/civicrm-core/pull/17761))**
+- **[NFC] Comment block cleanup
+  ([17872](https://github.com/civicrm/civicrm-core/pull/17872))**
 
-- **Improve efficiency of findFiles ([17745](https://github.com/civicrm/civicrm-core/pull/17745))**
+- **[Test] Update hook signature in test
+  ([609](https://github.com/civicrm/civicrm-drupal/pull/609))**
 
-- **APIv4 Explorer: Improve selection of fields for HAVING ([17746](https://github.com/civicrm/civicrm-core/pull/17746))**
+- **Test - attempt to replicate #17852
+  ([18038](https://github.com/civicrm/civicrm-core/pull/18038))**
 
-- **More unused functions in GenCode ([17756](https://github.com/civicrm/civicrm-core/pull/17756))**
+- **[Test fix] We might need this to ensure really quick test runs don't fail
+  ([18045](https://github.com/civicrm/civicrm-core/pull/18045))**
 
-- **Fix PHP notice on wordpress permissions form ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
+- **Add testing to Authorize.net and remove the lines that are repeated
+  ([18028](https://github.com/civicrm/civicrm-core/pull/18028))**
 
-- **core#1826: Ignore location_type_id when deduping postal address ([17645](https://github.com/civicrm/civicrm-core/pull/17645))**
+- **Add test on status calculation
+  ([18037](https://github.com/civicrm/civicrm-core/pull/18037))**
 
-- **[Unit Test] dev/core#1173 and dev/core#1827 - Test for activity tag search - PR 17655 ([17755](https://github.com/civicrm/civicrm-core/pull/17755))**
+- **Fix for failing test
+  ([18036](https://github.com/civicrm/civicrm-core/pull/18036))**
 
-- **Convert CRM.utils.formatDate tests to karma ([17757](https://github.com/civicrm/civicrm-core/pull/17757))**
+- **[Test framework] re-re-fix test and add test for test
+  ([18013](https://github.com/civicrm/civicrm-core/pull/18013))**
 
-- **dev/core#1827 activity search - fixing search by tags ([17655](https://github.com/civicrm/civicrm-core/pull/17655))**
+- **Re-fix test ([18009](https://github.com/civicrm/civicrm-core/pull/18009))**
 
-- **Unused functions in GenCode ([17753](https://github.com/civicrm/civicrm-core/pull/17753))**
+- **[Test framework] - Update failing test
+  ([18003](https://github.com/civicrm/civicrm-core/pull/18003))**
 
-- **5.28 ([17751](https://github.com/civicrm/civicrm-core/pull/17751))**
+- **[Test framework] - Combine triplicate createCase functions
+  ([17957](https://github.com/civicrm/civicrm-core/pull/17957))**
 
-- **Teach CRM.utils.formatDate to also show time ([17684](https://github.com/civicrm/civicrm-core/pull/17684))**
+- **Remove error checking by-pass in tests
+  ([17940](https://github.com/civicrm/civicrm-core/pull/17940))**
 
-- **Fix typo in templates/CRM/Report/Form/Tabs/GroupBy.tpl ([17747](https://github.com/civicrm/civicrm-core/pull/17747))**
+- **[Test Framework] - Tests for report downloads
+  ([17892](https://github.com/civicrm/civicrm-core/pull/17892))**
 
-- **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
+- **api_v3_TaxContributionPageTest fix - remove hard coded processor id
+  ([17860](https://github.com/civicrm/civicrm-core/pull/17860))**
 
-- **Fixed for multi-select filter ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
+- **API tests - label versions in dataprovider versionThreeAndFour
+  ([17847](https://github.com/civicrm/civicrm-core/pull/17847))**
 
-- **fix url for file field ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
+- **Extract code to set isEmailReceipt in Contribution.completeOrder
+  ([18039](https://github.com/civicrm/civicrm-core/pull/18039))**
 
-- **[Test] Update hook signature in test ([609](https://github.com/civicrm/civicrm-drupal/pull/609))**
+- **Do not pass-by-reference to recur function
+  ([18071](https://github.com/civicrm/civicrm-core/pull/18071))**
 
-- **NFC - Docblock cleanup ([610](https://github.com/civicrm/civicrm-drupal/pull/610))**
+- **Unused functions in GenCode
+  ([17753](https://github.com/civicrm/civicrm-core/pull/17753))**
 
-- **Installation - Support "activate first" w/setup UI ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
+- **Fix typo in templates/CRM/Report/Form/Tabs/GroupBy.tpl
+  ([17747](https://github.com/civicrm/civicrm-core/pull/17747))**
 
-- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin ([214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
+- **Remove unused "ufUniqID" session variable
+  ([213](https://github.com/civicrm/civicrm-wordpress/pull/213))**
 
-- **Remove unused "ufUniqID" session variable ([213](https://github.com/civicrm/civicrm-wordpress/pull/213))**
+- **Remove Net packages Net_Curl Net_DIME as they do not appear to be used
+  ([294](https://github.com/civicrm/civicrm-packages/pull/294))**
 
-- **5.28 to master ([212](https://github.com/civicrm/civicrm-wordpress/pull/212))**
+- **Update contributor key for Andrew
+  ([18230](https://github.com/civicrm/civicrm-core/pull/18230))**
 
-- **Installation - Support "activate first" w/setup UI ([121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
+- **Fix qill typo
+  ([18041](https://github.com/civicrm/civicrm-core/pull/18041))**
 
-- **[NFC] Update versions file to remove reference to Mail_mime and Mail ([301](https://github.com/civicrm/civicrm-packages/pull/301))**
+- **Update flexmailer release information
+  ([17912](https://github.com/civicrm/civicrm-core/pull/17912))**
 
-- **[REF] Remove mail_mime package as now supplied by composer ([300](https://github.com/civicrm/civicrm-packages/pull/300))**
+- **Remove invalid use of crmMoney formatter
+  ([18031](https://github.com/civicrm/civicrm-core/pull/18031))**
 
-- **Remove Net packages Net_Curl Net_DIME as they do not appear to be used ([294](https://github.com/civicrm/civicrm-packages/pull/294))**
+- **Remove main PaymentExpress class
+  ([18010](https://github.com/civicrm/civicrm-core/pull/18010))**
 
-- **[REF] Remove some deprecated size function calls replaced with length ([299](https://github.com/civicrm/civicrm-packages/pull/299))**
+- **Remove unused parameter ids['billing']
+  ([18021](https://github.com/civicrm/civicrm-core/pull/18021))**
 
-## <a name="misc"></a>Miscellany
+- **Cache loader - remove legacy handling, handle null result from setting
+  ([17999](https://github.com/civicrm/civicrm-core/pull/17999))**
 
 ## <a name="credits"></a>Credits
 
 This release was developed by the following code authors:
 
-AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman; Christian Wach; Circle Interactive - Pradeep Nayak; CiviCoop - Jaap Jansma, Klaas Eikelboom; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; dependabot[bot]; Fuzion - Jitendra Purohit; iXiam - César Ramos; JMA Consulting - Monish Deb, Seamus Lee; John Kingsnorth; Joinery - Allen Shaw; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; muniodiego; Progressive Technology Project - Jamie McClelland; Squiffle Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Timbsoft Technologies - Tunbola Ogunwande; Wikimedia Foundation - Eileen McNaughton
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman;
+Christian Wach; Circle Interactive - Pradeep Nayak; CiviCoop - Jaap Jansma,
+Klaas Eikelboom; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku;
+Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; Fuzion - Jitendra
+Purohit; iXiam - César Ramos, Diego Muñio; JMA Consulting - Monish Deb, Seamus
+Lee; John Kingsnorth; Joinery - Allen Shaw; Lighthouse Consulting and Design -
+Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech -
+Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire;
+Progressive Technology Project - Jamie McClelland; Squiffle Consulting - Aidan
+Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Timbsoft
+Technologies - Tunbola Ogunwande; Wikimedia Foundation - Eileen McNaughton
 
 Most authors also reviewed code for this release; in addition, the following
 reviewers contributed their comments:
 
-AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian Greens - Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions - Alan Dixon; Christian Wach; Circle Interactive - Pradeep Nayak; civibot[bot]; CiviCoop - Jaap Jansma, Klaas Eikelboom; civicrm-builder; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; CompuCorp - Jamie Novick; Coop SymbioTIC - Mathieu Lutfy, Samuel Vanhove; Dave D; DevApp - Adam Kwiatkowski; elcapo; Francesc Bassas i Bullich; Freeform Solutions - Herb van den Dool; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; irenemeisel; iXiam - César Ramos; JMA Consulting - Joe Murray, Monish Deb, Seamus Lee; Joinery - Allen Shaw; Korlon - Stuart Gaston; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Nicol Wistreich; Progressive Technology Project - Jamie McClelland; Rar9; Ray Wright; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Stephen Palmstrom; Tadpole Collective - Kevin Cristiano; Third Sector Design - Michael McAndrew; Wikimedia Foundation - Eileen McNaughton
+Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian Greens -
+Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions - Alan
+Dixon; Carlos Capote; CompuCorp - Jamie Novick; DevApp - Adam Kwiatkowski;
+Francesc Bassas i Bullich; Freeform Solutions - Herb van den Dool; Greenpeace
+Central and Eastern Europe - Patrick Figel; Irene Meisel; JMA Consulting - Joe
+Murray; Korlon - Stuart Gaston; Nicol Wistreich; Rar9; Ray Wright; Semper IT -
+Karin Gerritsen; Third Sector Design - Michael McAndrew;
 
 ## <a name="feedback"></a>Feedback
 

From f8220fdffdd1601df6eea273f39f5d730acf1ace Mon Sep 17 00:00:00 2001
From: Alice Frumin <alice@aghstrategies.com>
Date: Tue, 1 Sep 2020 14:15:29 -0400
Subject: [PATCH 081/834] commenting and sorting

---
 release-notes/5.29.0.md | 167 ++++++++++++++++++++++++++++++----------
 1 file changed, 126 insertions(+), 41 deletions(-)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index 5d2a66308d8a..a2cea1e2c800 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -23,58 +23,134 @@ Released September 2, 2020
 
 ## <a name="features"></a>Features
 
+### CiviMember
+
+- **Option to update expired memberships as part of the job.process_membership
+  ([dev/membership#18](https://lab.civicrm.org/dev/membership/-/issues/18):
+  [16298](https://github.com/civicrm/civicrm-core/pull/16298))**
+
+  Improves the Job.process_membership API/Scheduled job by adding some new
+  parameters, specifically:
+
+    - exclude_test_memberships: Exclude test memberships from calculations
+      (default = TRUE)
+    - only_active_membership_types: Exclude disabled membership types from
+      calculations (default = TRUE)
+    - exclude_membership_status_ids: Default: Exclude Pending, Cancelled,
+      Expired.
+
+  Deceased will always be excluded
+
+### Backdrop Integration
+
+- **Support for installing CiviCRM-Backdrop via "setup" UI
+  ([17749](https://github.com/civicrm/civicrm-core/pull/17749) and
+  [121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
+
+  Improves the installation and Setup process for Backdrop integration's so that
+  one enables the CiviCRM module like any other module and then is directed to
+  the setup screen to complete installation as opposed to having to navigate to
+  a specific link.
+
 ### Core CiviCRM
 
-- **crm- Missing Summary ([17809](https://github.com/civicrm/civicrm-core/pull/17809))**
+- **Icon in status message after saving a civireport is misleading
+  ([dev/report#43](https://lab.civicrm.org/dev/report/-/issues/43):
+  [17863](https://github.com/civicrm/civicrm-core/pull/17863))**
+
+  Improves icons in Status Messages for reports.
 
-- **CRM- Missing Summary ([17749](https://github.com/civicrm/civicrm-core/pull/17749))**
+- **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance
+  ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
 
 ## <a name="bugs"></a>Bugs resolved
 
-### CiviCase
+### Wordpress Integration
 
-- **Use case id to get relationship for activity creation ([17256](https://github.com/civicrm/civicrm-core/pull/17256) and [17764](https://github.com/civicrm/civicrm-core/pull/17764))**
+- **[civicrm.files] token doesn't work in some cases since 5.27
+  ([dev/wordpress#66](https://lab.civicrm.org/dev/wordpress/-/issues/66):
+  [18068](https://github.com/civicrm/civicrm-core/pull/18068))**
 
-### Core CiviCRM
+  Ensures the [civicrm.files] token plays nice for sites with older wordpress
+  file directory set ups.
 
-- **reporting#21 - don't multiple contribution details when a 1-to-many r… ([15435](https://github.com/civicrm/civicrm-core/pull/15435))**
+### Drupal Integration
 
-- **Contribution Summary Report: Taking the currency filtered in the "general total" row. Implements dev/report#27 ([16736](https://github.com/civicrm/civicrm-core/pull/16736))**
+- **Drupal 8 - Using Create User Record action on a contact with no email is too
+  quiet. Also CRM_Core_Session::setStatus is sometimes ignored.
+  ([dev/drupal#127](https://lab.civicrm.org/dev/drupal/-/issues/127):
+  [17914](https://github.com/civicrm/civicrm-core/pull/17914) and
+  [17915](https://github.com/civicrm/civicrm-core/pull/17915))**
 
-- **dev/report#43 - Icon after saving a civireport instance is misleading ([17863](https://github.com/civicrm/civicrm-core/pull/17863))**
+  Require email when adding a user and ensure that errors show.
 
+### CiviCase
 
+- **Fix case activity field set to allow long details to be exported
+  ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
 
-- **dev/membership#18 Enhance parameters for Job.process_membership ([16298](https://github.com/civicrm/civicrm-core/pull/16298))**
+### CiviContribute
 
+- **Contribution Details Statistics are multiplied under many circumstances
+  ([dev/report#21](https://lab.civicrm.org/dev/report/-/issues/21):
+  [15435](https://github.com/civicrm/civicrm-core/pull/15435) and
+  [17809](https://github.com/civicrm/civicrm-core/pull/17809))**
 
-- **mailing#70 Don't create users for test mail if user doesn't have permission ([17867](https://github.com/civicrm/civicrm-core/pull/17867))**
+- **Contribution Summary Report: The "general total" row does not take the
+  currency filtered
+  ([dev/report#27](https://lab.civicrm.org/dev/report/-/issues/27):
+  [16736](https://github.com/civicrm/civicrm-core/pull/16736))**
 
+  When the contribution summary report is used by filtering for a currency other
+  than the site's default currency, the "grand total" row shows the sign of the
+  default currency instead of the filtered currency.
 
+- **Define the logic that sets (or not) contribution receive_date in relation to
+  payments
+  ([dev/financial#139](https://lab.civicrm.org/dev/financial/-/issues/139):
+  [17777](https://github.com/civicrm/civicrm-core/pull/17777))**
 
-- **dev/drupal#114 and dev/core#1647 - Remove resource url status check ([17754](https://github.com/civicrm/civicrm-core/pull/17754))**
+  Ensures that the contribution receive_date does not change when payments come
+  in.
 
-- **dev/drupal#127 - require email for the Useradd task and errors not showing ([17915](https://github.com/civicrm/civicrm-core/pull/17915))**
+- **Fix PaypalIPN single function to not receive-by-reference
+  ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
 
-- **dev/drupal#127 - CRM_Core_Session::setStatus() gets ignored sometimes ([17914](https://github.com/civicrm/civicrm-core/pull/17914))**
+### CiviEvent
 
+- **Can't meaningfully disable self-service transfer/cancellation once enabled
+  ([dev/event#35](https://lab.civicrm.org/dev/event/-/issues/35):
+  [18040](https://github.com/civicrm/civicrm-core/pull/18040))**
 
-- **dev/financial#135 Remove stub function from payflowPro ([18078](https://github.com/civicrm/civicrm-core/pull/18078))**
+- **Event registration form has inconsistent labeling
+  ([dev/event#38](https://lab.civicrm.org/dev/event/-/issues/38):
+  [17695](https://github.com/civicrm/civicrm-core/pull/17695))**
 
-- **dev/financial#135 Remove unreachable doDirectPayment from manual processor ([18072](https://github.com/civicrm/civicrm-core/pull/18072))**
+- **Event cart hidden/enabled in buildkit 5.29 RC
+  ([dev/event#40](https://lab.civicrm.org/dev/event/-/issues/40):
+  [18101](https://github.com/civicrm/civicrm-core/pull/18101))**
 
-- **dev/financial#139 contribution receive_date shouldn't change when payments come in ([17777](https://github.com/civicrm/civicrm-core/pull/17777))**
+  Ensures that the Event Cart functionality defaults to off.
 
+### CiviMail
 
-- **event#35: move statusBounce out of BAO layer; don't allow self-service when dis… ([18040](https://github.com/civicrm/civicrm-core/pull/18040))**
+- **Test mailings create new contacts even when "Add Contacts" permission is not
+  present. ([dev/mail#70](https://lab.civicrm.org/dev/mail/-/issues/70):
+  [17867](https://github.com/civicrm/civicrm-core/pull/17867))**
 
-- **event#38 fix wording on event reg page ([17695](https://github.com/civicrm/civicrm-core/pull/17695))**
+  Ensures contacts are not created when a user without permissions to create
+  contacts sends a test email.
 
-- **dev/event#40 - EventCart - Check legacy setting until extension is public ([18101](https://github.com/civicrm/civicrm-core/pull/18101))**
+### Core CiviCRM
 
+- **Installing drupal 8 using civicrm-setup leads to "incorrect resource url"
+  system status check errors
+  ([dev/drupal#114](https://lab.civicrm.org/dev/drupal/-/issues/114) and
+  [dev/core#1647](https://lab.civicrm.org/dev/core/-/issues/1647):
+  [17754](https://github.com/civicrm/civicrm-core/pull/17754))**
 
+  Removes the resource url status check.
 
-- **dev/wordpress#66 Re-instate newer variables but with more support for… ([18068](https://github.com/civicrm/civicrm-core/pull/18068))**
 
 
 - **dev/core#183 Use TempTable builder to generate table for import ([17827](https://github.com/civicrm/civicrm-core/pull/17827))**
@@ -121,6 +197,8 @@ Released September 2, 2020
 
 - **dev/core#1827 activity search - fixing search by tags ([17655](https://github.com/civicrm/civicrm-core/pull/17655) and [17755](https://github.com/civicrm/civicrm-core/pull/17755))**
 
+- **dev/core#1843 Remove url-tracking in mass sms.  ([17700](https://github.com/civicrm/civicrm-core/pull/17700))**
+
 - **dev/core#1853 - Fix validation errors when removing contact subtype ([17765](https://github.com/civicrm/civicrm-core/pull/17765))**
 
 - **dev/core#1855 - Allow different output formats for CiviReport results and untangle code ([17901](https://github.com/civicrm/civicrm-core/pull/17901))**
@@ -193,43 +271,38 @@ Released September 2, 2020
 
 - **dev/core#1972 Fix tax_amount calclation on renewal form ([18271](https://github.com/civicrm/civicrm-core/pull/18271))**
 
+- **Fix obscure dedupe scenario where 'bad' location data can overwrite good
+  data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
+
+- **Fix JQuery Validation for radios
+  ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
+
+- **Fix buggy placement of icons on buttons
+  ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
+
+
+
 
-- **Revert "Swap out button/submit inputs for button elements" ([18185](https://github.com/civicrm/civicrm-core/pull/18185))**
 
-- **Swap out button/submit inputs for button elements ([18091](https://github.com/civicrm/civicrm-core/pull/18091))**
 
 - **Installation doclinks not getting url-rewritten ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
 
 - **Fix button name on updated form ([18000](https://github.com/civicrm/civicrm-core/pull/18000))**
 
-- **Refactor "applyLocale" and remove references to "language" column in UFMatch table ([18049](https://github.com/civicrm/civicrm-core/pull/18049))**
-
 - **Show cron warning on Scheduled Jobs admin page ([18065](https://github.com/civicrm/civicrm-core/pull/18065))**
 
 - **Use correct pdf package to generate pdf file on invoice download/email activity ([18056](https://github.com/civicrm/civicrm-core/pull/18056))**
 
-- **Fix buggy placement of icons on buttons ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
-
 - **CRM_Utils_Hook: deprecation warning and short array syntax ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
 
 - **Why not make the buttons flat? ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
 
-- **Fix obscure dedupe scenario where 'bad' location data can overwrite good data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
-
-- **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
-
-- **Fix JQuery Validation for radios ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
-
-- **Fix PaypalIPN single function to not receive-by-reference ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
-
 - **Remove requirement to pass 'contribution_status_id' => Pending from order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
 
 - **Use saved contribution's line items rather than the primaryContributionID ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
 
 - **Wrap multi record custom field inside a div ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
 
-- **Remove url-tracking in mass sms. dev/core#1843 ([17700](https://github.com/civicrm/civicrm-core/pull/17700))**
-
 - **Do not overwrite values saved from the repeatContribution routine ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
 
 - **SystemCheck: add ability to efficiently run only specified checks ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
@@ -242,12 +315,8 @@ Released September 2, 2020
 
 - **Wrong link to admin page in error message about FROM address on PCP page ([17996](https://github.com/civicrm/civicrm-core/pull/17996))**
 
-- **CRM_Core_BAO_Cache - Remove functions deprecated a year ago ([17989](https://github.com/civicrm/civicrm-core/pull/17989))**
-
 - **Fix repeattransaction api to use custom data from the template contribution ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
 
-- **Fix case activity field set to allow long details to be exported ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
-
 - **Fixed filling default values for tagssets in the advanced search form ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
 
 - **Remove duplicate cache flush ([17988](https://github.com/civicrm/civicrm-core/pull/17988))**
@@ -400,11 +469,19 @@ Released September 2, 2020
 
 - **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin ([214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
 
-- **Installation - Support "activate first" w/setup UI ([121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
 - **Installation - Support "activate first" w/setup UI ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
 
 ## <a name="misc"></a>Miscellany
 
+- **CRM_Core_BAO_Cache - Remove functions deprecated a year ago
+  ([17989](https://github.com/civicrm/civicrm-core/pull/17989))**
+
+- **Fix all core processors to implement doPayment and not doTransferPayment or
+  doDirectPayment
+  ([https://lab.civicrm.org/dev/financial/-/issues/135](https://lab.civicrm.org/dev/financial/-/issues/135):
+  [18078](https://github.com/civicrm/civicrm-core/pull/18078) and
+  [18072](https://github.com/civicrm/civicrm-core/pull/18072))**
+
 - **[REF] Extract setUserContext on contribution form & cleanup on backend add
   membership form
   ([17968](https://github.com/civicrm/civicrm-core/pull/17968))**
@@ -565,6 +642,9 @@ Released September 2, 2020
 - **[REF] Remove some deprecated size function calls replaced with length
   ([299](https://github.com/civicrm/civicrm-packages/pull/299))**
 
+- **Refactor "applyLocale" and remove references to "language" column in UFMatch
+  table ([18049](https://github.com/civicrm/civicrm-core/pull/18049))**
+
 - **[NFC] Fix provider unit test on PHP7.4
   ([18073](https://github.com/civicrm/civicrm-core/pull/18073))**
 
@@ -676,6 +756,11 @@ Released September 2, 2020
 - **Cache loader - remove legacy handling, handle null result from setting
   ([17999](https://github.com/civicrm/civicrm-core/pull/17999))**
 
+
+- **Use case id to get relationship for activity creation
+  ([17256](https://github.com/civicrm/civicrm-core/pull/17256) and
+  [17764](https://github.com/civicrm/civicrm-core/pull/17764))**
+
 ## <a name="credits"></a>Credits
 
 This release was developed by the following code authors:

From 0cce86621f9bc25007b9cfd14e8257b9d3f3fff7 Mon Sep 17 00:00:00 2001
From: Alice Frumin <alice@aghstrategies.com>
Date: Tue, 1 Sep 2020 17:02:10 -0400
Subject: [PATCH 082/834] sorting and annotating

---
 release-notes/5.29.0.md | 285 ++++++++++++++++++++++++----------------
 1 file changed, 170 insertions(+), 115 deletions(-)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index a2cea1e2c800..1be7e9ef6661 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -54,6 +54,13 @@ Released September 2, 2020
 
 ### Core CiviCRM
 
+- **Contact export is very slow, creates huge temporary tables
+  ([dev/core#1725](https://lab.civicrm.org/dev/core/-/issues/1725):
+  [17458](https://github.com/civicrm/civicrm-core/pull/17458))**
+
+  Improves performance when exporting contacts by only exporting primary address
+  fields.
+
 - **Icon in status message after saving a civireport is misleading
   ([dev/report#43](https://lab.civicrm.org/dev/report/-/issues/43):
   [17863](https://github.com/civicrm/civicrm-core/pull/17863))**
@@ -63,6 +70,19 @@ Released September 2, 2020
 - **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance
   ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
 
+- **Differentiate smart group from regular group using icon in select2 field
+  ([dev/core#785](https://lab.civicrm.org/dev/core/-/issues/785):
+  [17927](https://github.com/civicrm/civicrm-core/pull/17927) and
+  [13958](https://github.com/civicrm/civicrm-core/pull/13958))**
+
+  Improves Group's select2 by adding icon next to smart groups.
+
+- **Feature: Ability to enable SSL for database connection.
+  ([dev/core#1137](https://lab.civicrm.org/dev/core/-/issues/1137):
+  [17706](https://github.com/civicrm/civicrm-core/pull/17706))**
+
+  Makes it so sites can use ssl to connect to mysql.
+
 ## <a name="bugs"></a>Bugs resolved
 
 ### Wordpress Integration
@@ -74,6 +94,17 @@ Released September 2, 2020
   Ensures the [civicrm.files] token plays nice for sites with older wordpress
   file directory set ups.
 
+- **CiviCRM and the WordPress Pods plugin (since version 2.7.13) is incompatible
+  due to Pods including marionette v3.3.1 for backbone, newer than CiviCRM's
+  bundled marionette v1.0.3
+  ([dev/core#1090](https://lab.civicrm.org/dev/core/-/issues/1090):
+  [17855](https://github.com/civicrm/civicrm-core/pull/17855))**
+
+  Ensures CiviCRM plays nicely with recent versions of Elementor Plugin.
+
+- **Fix PHP notice on wordpress permissions form
+  ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
+
 ### Drupal Integration
 
 - **Drupal 8 - Using Create User Record action on a contact with no email is too
@@ -84,6 +115,13 @@ Released September 2, 2020
 
   Require email when adding a user and ensure that errors show.
 
+- **The following PHP variables are not set: $_SERVER[HTTP_HOST]
+  ([dev/core#750](https://lab.civicrm.org/dev/core/-/issues/750):
+  [17636](https://github.com/civicrm/civicrm-core/pull/17636))**
+
+  Skip the server variable checks if running in a CLI environment, removing an
+  error when running Drush commands against Drupal 8 and Drupal 9 based sites.
+
 ### CiviCase
 
 - **Fix case activity field set to allow long details to be exported
@@ -91,6 +129,11 @@ Released September 2, 2020
 
 ### CiviContribute
 
+- **Paypal IPN sometimes fails to update the next scheduled payment date when
+  recording the latest recurring payment
+  ([dev/core#1679](https://lab.civicrm.org/dev/core/-/issues/1679):
+  [17744](https://github.com/civicrm/civicrm-core/pull/17744))**
+
 - **Contribution Details Statistics are multiplied under many circumstances
   ([dev/report#21](https://lab.civicrm.org/dev/report/-/issues/21):
   [15435](https://github.com/civicrm/civicrm-core/pull/15435) and
@@ -116,6 +159,23 @@ Released September 2, 2020
 - **Fix PaypalIPN single function to not receive-by-reference
   ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
 
+- **On behalf label / Honoree Title / Honoree Description not translatable on
+  contribution page
+  ([dev/core#1280](https://lab.civicrm.org/dev/core/-/issues/1280):
+  [16838](https://github.com/civicrm/civicrm-core/pull/16838))**
+
+- **Load contribution page if live payment processor is disabled but test is
+  available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
+
+- **Remove requirement to pass 'contribution_status_id' => Pending from
+  order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
+
+- **Use saved contribution's line items rather than the primaryContributionID
+  ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
+
+- **Do not overwrite values saved from the repeatContribution routine
+  ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
+
 ### CiviEvent
 
 - **Can't meaningfully disable self-service transfer/cancellation once enabled
@@ -141,6 +201,12 @@ Released September 2, 2020
   Ensures contacts are not created when a user without permissions to create
   contacts sends a test email.
 
+### CiviMember
+
+- **Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing
+  a membership ([dev/core#1113](https://lab.civicrm.org/dev/core/-/issues/1113):
+  [16429](https://github.com/civicrm/civicrm-core/pull/16429))**
+
 ### Core CiviCRM
 
 - **Installing drupal 8 using civicrm-setup leads to "incorrect resource url"
@@ -151,33 +217,19 @@ Released September 2, 2020
 
   Removes the resource url status check.
 
+- **API4: 500 error on chain with custom field
+  ([dev/core#1578](https://lab.civicrm.org/dev/core/-/issues/1578):
+  [17866](https://github.com/civicrm/civicrm-core/pull/17866))**
 
+- **MySQL uses filesort index when building the query which can cause
+  performance issues
+  ([dev/core#1665](https://lab.civicrm.org/dev/core/-/issues/1665):
+  [18052](https://github.com/civicrm/civicrm-core/pull/18052))**
 
-- **dev/core#183 Use TempTable builder to generate table for import ([17827](https://github.com/civicrm/civicrm-core/pull/17827))**
-
-- **[dev/core#750] Don't check server variables if we're running in CLI ([17636](https://github.com/civicrm/civicrm-core/pull/17636))**
-
-- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([17927](https://github.com/civicrm/civicrm-core/pull/17927))**
-
-- **dev/core#785 Differentiate smart group from regular group using icon in select2 field ([13958](https://github.com/civicrm/civicrm-core/pull/13958))**
-
-- **dev/core#1090 Update extendedSerializeData to use the Backbone namesp… ([17855](https://github.com/civicrm/civicrm-core/pull/17855))**
+- **Custom fields not copied on shared address
+  ([dev/core#1670](https://lab.civicrm.org/dev/core/-/issues/1670):
+  [17580](https://github.com/civicrm/civicrm-core/pull/17580))**
 
-- **dev/core#1113 - Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing a membership ([16429](https://github.com/civicrm/civicrm-core/pull/16429))**
-
-- **dev/core#1137 - Allow ssl connection to mysql by specifying in DSN ([17706](https://github.com/civicrm/civicrm-core/pull/17706))**
-
-- **dev/core#1280 Fix ContributionPage soft_credit translation ([16838](https://github.com/civicrm/civicrm-core/pull/16838))**
-
-- **dev/core#1578 - Fix APIv4 chaining with custom fields ([17866](https://github.com/civicrm/civicrm-core/pull/17866))**
-
-- **dev/core#1665 Remove the having clause as well as having needs a group by ([18052](https://github.com/civicrm/civicrm-core/pull/18052))**
-
-- **dev/core#1670 copy custom fields from master to shared address ([17580](https://github.com/civicrm/civicrm-core/pull/17580))**
-
-- **dev/core#1679: Ensure Paypal IPN always updates the next scheduled payment date ([17744](https://github.com/civicrm/civicrm-core/pull/17744))**
-
-- **dev/core#1725 Only export primary address fields ([17458](https://github.com/civicrm/civicrm-core/pull/17458))**
 
 - **dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates ([17480](https://github.com/civicrm/civicrm-core/pull/17480))**
 
@@ -231,23 +283,11 @@ Released September 2, 2020
 
 - **dev/core#1902: "Contribution Source" profile field has no effect ([17930](https://github.com/civicrm/civicrm-core/pull/17930))**
 
-- **dev/core#1905 force backend links for new "configure" buttons ([18088](https://github.com/civicrm/civicrm-core/pull/18088))**
-
-- **dev/core#1905 rework #17942 with simpler ts strings ([18064](https://github.com/civicrm/civicrm-core/pull/18064))**
-
-- **dev/core#1905 Add configure icons on public pages ([17942](https://github.com/civicrm/civicrm-core/pull/17942))**
+- **dev/core#1905 force backend links for new "configure" buttons ([17942](https://github.com/civicrm/civicrm-core/pull/17942), [18088](https://github.com/civicrm/civicrm-core/pull/18088) and [18064](https://github.com/civicrm/civicrm-core/pull/18064))**
 
 - **dev/core#1906 - Allow payment create api to record payment on Failed … ([17943](https://github.com/civicrm/civicrm-core/pull/17943))**
 
-- **dev/core#1909 Fix E-notice when adding a field on a profile ([17962](https://github.com/civicrm/civicrm-core/pull/17962))**
-
-- **dev/core#1909 Fix e-notice when adding a payment processor ([17964](https://github.com/civicrm/civicrm-core/pull/17964))**
-
-- **dev/core#1909 - E_NOTICE opening file-on-case ([17959](https://github.com/civicrm/civicrm-core/pull/17959))**
-
-- **dev/core#1909 - E_NOTICE on contribution edit ([18006](https://github.com/civicrm/civicrm-core/pull/18006))**
-
-- **dev/core#1909 - Avoid E_Notice on SMS provider form when no default url ([17985](https://github.com/civicrm/civicrm-core/pull/17985))**
+- **dev/core#1909 Fix E-notice when adding a field on a profile ([18006](https://github.com/civicrm/civicrm-core/pull/18006), [17962](https://github.com/civicrm/civicrm-core/pull/17962), [17964](https://github.com/civicrm/civicrm-core/pull/17964), [17959](https://github.com/civicrm/civicrm-core/pull/17959), [17985](https://github.com/civicrm/civicrm-core/pull/17985))**
 
 - **dev/core#1913 Allow for schemas to be added by extensions if they are… ([17986](https://github.com/civicrm/civicrm-core/pull/17986))**
 
@@ -271,17 +311,6 @@ Released September 2, 2020
 
 - **dev/core#1972 Fix tax_amount calclation on renewal form ([18271](https://github.com/civicrm/civicrm-core/pull/18271))**
 
-- **Fix obscure dedupe scenario where 'bad' location data can overwrite good
-  data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
-
-- **Fix JQuery Validation for radios
-  ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
-
-- **Fix buggy placement of icons on buttons
-  ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
-
-
-
 
 
 
@@ -293,34 +322,18 @@ Released September 2, 2020
 
 - **Use correct pdf package to generate pdf file on invoice download/email activity ([18056](https://github.com/civicrm/civicrm-core/pull/18056))**
 
-- **CRM_Utils_Hook: deprecation warning and short array syntax ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
-
 - **Why not make the buttons flat? ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
 
-- **Remove requirement to pass 'contribution_status_id' => Pending from order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
-
-- **Use saved contribution's line items rather than the primaryContributionID ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
-
 - **Wrap multi record custom field inside a div ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
 
-- **Do not overwrite values saved from the repeatContribution routine ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
-
 - **SystemCheck: add ability to efficiently run only specified checks ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
 
 - **Change inform-icon to fa-info-circle ([18001](https://github.com/civicrm/civicrm-core/pull/18001))**
 
-- **CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option ([17990](https://github.com/civicrm/civicrm-core/pull/17990))**
-
-- **SQL temp table not using utf8mb4 if server default already set to utf8mb4 ([18012](https://github.com/civicrm/civicrm-core/pull/18012))**
-
-- **Wrong link to admin page in error message about FROM address on PCP page ([17996](https://github.com/civicrm/civicrm-core/pull/17996))**
-
 - **Fix repeattransaction api to use custom data from the template contribution ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
 
 - **Fixed filling default values for tagssets in the advanced search form ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
 
-- **Remove duplicate cache flush ([17988](https://github.com/civicrm/civicrm-core/pull/17988))**
-
 - **Simplify caching of status checks ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
 
 - **ensure custom field checkboxes are populated in profiles ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
@@ -331,22 +344,14 @@ Released September 2, 2020
 
 - **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
 
-- **Remove extraneous opportunistic cache flush. ([17936](https://github.com/civicrm/civicrm-core/pull/17936))**
-
 - **Improve caching of current domain ([17916](https://github.com/civicrm/civicrm-core/pull/17916))**
 
 - **Setup UI - Validate that at least one "Component" is enabled ([17778](https://github.com/civicrm/civicrm-core/pull/17778))**
 
 - **Member detail report: nest "in" options in parentheses ([17911](https://github.com/civicrm/civicrm-core/pull/17911))**
 
-- **Fix sticky table header on "Find Activities" page ([17917](https://github.com/civicrm/civicrm-core/pull/17917))**
-
-- **Remove unused "ufUniqID" session variable ([17904](https://github.com/civicrm/civicrm-core/pull/17904))**
-
 - **Replace a load of references to the wiki with docs links ([17900](https://github.com/civicrm/civicrm-core/pull/17900))**
 
-- **Remove check for valid email in synchronizeUFMatch ([17771](https://github.com/civicrm/civicrm-core/pull/17771))**
-
 - **Call apiv4 from Contribution create rather than fugly addActivity function ([17881](https://github.com/civicrm/civicrm-core/pull/17881))**
 
 - **APIv4 - Add BasicEntity helper class ([17899](https://github.com/civicrm/civicrm-core/pull/17899))**
@@ -365,7 +370,11 @@ Released September 2, 2020
 
 - **EventCart ext: Fix autogenerated code, remove unused hooks, update readme ([17884](https://github.com/civicrm/civicrm-core/pull/17884))**
 
-- **Load contribution page if live payment processor is disabled but test is available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
+- **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
+
+- **EventCart - Resolve BAO identity and uncommitted DAO changes ([17861](https://github.com/civicrm/civicrm-core/pull/17861))**
+
+- **Move BAO and template files into event cart ([17743](https://github.com/civicrm/civicrm-core/pull/17743))**
 
 - **Search debug ([17887](https://github.com/civicrm/civicrm-core/pull/17887))**
 
@@ -373,42 +382,19 @@ Released September 2, 2020
 
 - **Simplify flushing group contact cache query to reduce table locking and improve performance ([17846](https://github.com/civicrm/civicrm-core/pull/17846))**
 
-
-
 - **Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
 
 - **Fix currency symbol for Total Amount on contribution page ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
 
 - **RelationshipCache - Add a high-level index to facilitate relationship queries (more fields) ([17781](https://github.com/civicrm/civicrm-core/pull/17781))**
 
-- **Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks ([17831](https://github.com/civicrm/civicrm-core/pull/17831))**
-
-- **APIv4 - Add shorthand for setCheckPermissions() ([17834](https://github.com/civicrm/civicrm-core/pull/17834))**
-
-- **Use PrematureExit exception instead of weird hack in tests ([17870](https://github.com/civicrm/civicrm-core/pull/17870))**
-
-- **Remove unnecessary try/catch per #17729 ([17823](https://github.com/civicrm/civicrm-core/pull/17823))**
-
-- **Fixed DB Error: syntax error if line item refers to civicrm_case ([16626](https://github.com/civicrm/civicrm-core/pull/16626))**
-
-- **Fix potential js error on summary screen when reloading blocks ([17865](https://github.com/civicrm/civicrm-core/pull/17865))**
-
 - **Search Ext: fix loading options and parsing custom field names ([17864](https://github.com/civicrm/civicrm-core/pull/17864))**
 
-- **EventCart - Resolve BAO identity and uncommitted DAO changes ([17861](https://github.com/civicrm/civicrm-core/pull/17861))**
-
 - **Bump lodash from 4.17.15 to 4.17.19 ([17858](https://github.com/civicrm/civicrm-core/pull/17858))**
 
-- **handlePaymentNotification() should not be declared as a static method ([17849](https://github.com/civicrm/civicrm-core/pull/17849))**
-
-- **Move BAO and template files into event cart ([17743](https://github.com/civicrm/civicrm-core/pull/17743))**
 
 - **Update regen.sh with new & upcoming core extensions ([17839](https://github.com/civicrm/civicrm-core/pull/17839))**
 
-- **MembershipRenewalTest - Fix failure ([17830](https://github.com/civicrm/civicrm-core/pull/17830))**
-
-- **Remove hard coded charset. ([17826](https://github.com/civicrm/civicrm-core/pull/17826))**
-
 - **APIv4 - Add activity contacts to APIv4 field spec ([17766](https://github.com/civicrm/civicrm-core/pull/17766))**
 
 - **Adjust mysql SET NAMES in remaining places as we agreed this was the go ([17825](https://github.com/civicrm/civicrm-core/pull/17825))**
@@ -421,10 +407,6 @@ Released September 2, 2020
 
 - **CheckEnv - Give new installs a grace period before 'Cron Not Running' msg ([17800](https://github.com/civicrm/civicrm-core/pull/17800))**
 
-- **Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()' ([17816](https://github.com/civicrm/civicrm-core/pull/17816))**
-
-
-
 - **Add hidden tag to search extension ([17789](https://github.com/civicrm/civicrm-core/pull/17789))**
 
 - **Sort permittedActivityTypes ([17794](https://github.com/civicrm/civicrm-core/pull/17794))**
@@ -435,34 +417,20 @@ Released September 2, 2020
 
 - **Add system check to ensure WP base page exists ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
 
-- **Fixed notice error on Relationships report ([17787](https://github.com/civicrm/civicrm-core/pull/17787))**
-
-- **getLoggedInContactID() is a static function ([17783](https://github.com/civicrm/civicrm-core/pull/17783))**
-
 - **Add search extension ([17775](https://github.com/civicrm/civicrm-core/pull/17775))**
 
-- **Remove PaymentExpress ipn class ([17763](https://github.com/civicrm/civicrm-core/pull/17763))**
-
 - **Status Checks - Use more specific label regarding "Domain"/"Organization" check ([17776](https://github.com/civicrm/civicrm-core/pull/17776))**
 
 - **Bump minimum upgradable version to 4.4.7 ([17750](https://github.com/civicrm/civicrm-core/pull/17750))**
 
-- **Remove unused, deprecated functions ([17761](https://github.com/civicrm/civicrm-core/pull/17761))**
-
 - **Improve efficiency of findFiles ([17745](https://github.com/civicrm/civicrm-core/pull/17745))**
 
 - **APIv4 Explorer: Improve selection of fields for HAVING ([17746](https://github.com/civicrm/civicrm-core/pull/17746))**
 
-- **More unused functions in GenCode ([17756](https://github.com/civicrm/civicrm-core/pull/17756))**
-
-- **Fix PHP notice on wordpress permissions form ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
-
 - **Convert CRM.utils.formatDate tests to karma ([17757](https://github.com/civicrm/civicrm-core/pull/17757))**
 
 - **Teach CRM.utils.formatDate to also show time ([17684](https://github.com/civicrm/civicrm-core/pull/17684))**
 
-- **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
-
 - **Fixed for multi-select filter ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
 
 - **fix url for file field ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
@@ -471,8 +439,95 @@ Released September 2, 2020
 
 - **Installation - Support "activate first" w/setup UI ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
 
+
+
+- **SQL temp table not using utf8mb4 if server default already set to utf8mb4
+  ([18012](https://github.com/civicrm/civicrm-core/pull/18012))**
+
+- **Wrong link to admin page in error message about FROM address on PCP page
+  ([17996](https://github.com/civicrm/civicrm-core/pull/17996))**
+
+- **Fix sticky table header on "Find Activities" page
+  ([17917](https://github.com/civicrm/civicrm-core/pull/17917))**
+
+- **Fixed DB Error: syntax error if line item refers to civicrm_case
+  ([16626](https://github.com/civicrm/civicrm-core/pull/16626))**
+
+- **Fix potential js error on summary screen when reloading blocks
+  ([17865](https://github.com/civicrm/civicrm-core/pull/17865))**
+
+- **Fix 'Undefined variable: jsSet in CRM_Core_BAO_Mapping::loadSavedMapping()'
+  ([17816](https://github.com/civicrm/civicrm-core/pull/17816))**
+
+- **Fixed notice error on Relationships report
+  ([17787](https://github.com/civicrm/civicrm-core/pull/17787))**
+
+- **Fix obscure dedupe scenario where 'bad' location data can overwrite good
+  data ([17993](https://github.com/civicrm/civicrm-core/pull/17993))**
+
+- **Fix JQuery Validation for radios
+  ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
+
+- **Fix buggy placement of icons on buttons
+  ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
+
 ## <a name="misc"></a>Miscellany
 
+- **CRM_Utils_Hook: deprecation warning and short array syntax
+  ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
+
+- **Remove check for valid email in synchronizeUFMatch
+  ([17771](https://github.com/civicrm/civicrm-core/pull/17771))**
+
+- **Remove unused "ufUniqID" session variable
+  ([17904](https://github.com/civicrm/civicrm-core/pull/17904))**
+
+- **Remove duplicate cache flush
+  ([17988](https://github.com/civicrm/civicrm-core/pull/17988))**
+
+- **Remove extraneous opportunistic cache flush.
+  ([17936](https://github.com/civicrm/civicrm-core/pull/17936))**
+
+- **Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks
+  ([17831](https://github.com/civicrm/civicrm-core/pull/17831))**
+
+- **APIv4 - Add shorthand for setCheckPermissions()
+  ([17834](https://github.com/civicrm/civicrm-core/pull/17834))**
+
+- **Use PrematureExit exception instead of weird hack in tests
+  ([17870](https://github.com/civicrm/civicrm-core/pull/17870))**
+
+- **Remove unnecessary try/catch per #17729
+  ([17823](https://github.com/civicrm/civicrm-core/pull/17823))**
+
+- **handlePaymentNotification() should not be declared as a static method
+  ([17849](https://github.com/civicrm/civicrm-core/pull/17849))**
+
+- **MembershipRenewalTest - Fix failure
+  ([17830](https://github.com/civicrm/civicrm-core/pull/17830))**
+
+- **Remove hard coded charset.
+  ([17826](https://github.com/civicrm/civicrm-core/pull/17826))**
+
+- **getLoggedInContactID() is a static function
+  ([17783](https://github.com/civicrm/civicrm-core/pull/17783))**
+
+- **Remove PaymentExpress ipn class
+  ([17763](https://github.com/civicrm/civicrm-core/pull/17763))**
+
+- **Remove unused, deprecated functions
+  ([17761](https://github.com/civicrm/civicrm-core/pull/17761))**
+
+- **CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option
+  ([17990](https://github.com/civicrm/civicrm-core/pull/17990))**
+
+- **More unused functions in GenCode
+  ([17756](https://github.com/civicrm/civicrm-core/pull/17756))**
+
+- **Temporary tables should follow consistent naming convention
+  ([dev/core#183](https://lab.civicrm.org/dev/core/-/issues/183):
+  [17827](https://github.com/civicrm/civicrm-core/pull/17827))**
+
 - **CRM_Core_BAO_Cache - Remove functions deprecated a year ago
   ([17989](https://github.com/civicrm/civicrm-core/pull/17989))**
 

From 7921235102ae4245af32a59eaef0fc64826d4b56 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Wed, 2 Sep 2020 15:14:34 -0400
Subject: [PATCH 083/834] 5.29.0 release notes: finished writing

---
 release-notes/5.29.0.md | 678 ++++++++++++++++++++++++++++------------
 1 file changed, 482 insertions(+), 196 deletions(-)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index 1be7e9ef6661..3c7ff2e5779f 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -13,16 +13,42 @@ Released September 2, 2020
 
 | *Does this version...?*                                         |         |
 |:--------------------------------------------------------------- |:-------:|
-| Fix security vulnerabilities?                                   |         |
-| Change the database schema?                                     |         |
-| Alter the API?                                                  |         |
-| Require attention to configuration options?                     |         |
-| Fix problems installing or upgrading to a previous version?     |         |
-| Introduce features?                                             |         |
-| Fix bugs?                                                       |         |
+| Fix security vulnerabilities?                                   |   no    |
+| **Change the database schema?**                                 | **yes** |
+| **Alter the API?**                                              | **yes** |
+| **Require attention to configuration options?**                 | **yes** |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| **Introduce features?**                                         | **yes** |
+| **Fix bugs?**                                                   | **yes** |
 
 ## <a name="features"></a>Features
 
+### CiviContribute
+
+- **Add configure and priceset url icons on public contribution & event pages
+  ([dev/core#1905](https://lab.civicrm.org/dev/core/-/issues/1905):
+  [17942](https://github.com/civicrm/civicrm-core/pull/17942),
+  [18088](https://github.com/civicrm/civicrm-core/pull/18088) and
+  [18064](https://github.com/civicrm/civicrm-core/pull/18064))**
+
+  A "Configure" button now appears to administrators when viewing a contribution
+  page or event, or a priceset within either, from the frontend.  This links to
+  the corresponding form to administer the contribution page, event, or
+  priceset.
+
+### CiviEvent
+
+- **Move Event Cart to extension
+  ([17741](https://github.com/civicrm/civicrm-core/pull/17741),
+  [17743](https://github.com/civicrm/civicrm-core/pull/17743),
+  [17861](https://github.com/civicrm/civicrm-core/pull/17861),
+  [17884](https://github.com/civicrm/civicrm-core/pull/17884),
+  [17885](https://github.com/civicrm/civicrm-core/pull/17885), and
+  [17891](https://github.com/civicrm/civicrm-core/pull/17891))**
+
+  The event cart features have been moved to a separate extension that is
+  shipped with core.
+
 ### CiviMember
 
 - **Option to update expired memberships as part of the job.process_membership
@@ -41,6 +67,13 @@ Released September 2, 2020
 
   Deceased will always be excluded
 
+-  **Add auto-renew status to membership detail report
+  ([17683](https://github.com/civicrm/civicrm-core/pull/17683) and
+  [17911](https://github.com/civicrm/civicrm-core/pull/17911))**
+
+  The membership detail report can now display and filter on the auto-renew
+  status of each membership.
+
 ### Backdrop Integration
 
 - **Support for installing CiviCRM-Backdrop via "setup" UI
@@ -52,6 +85,33 @@ Released September 2, 2020
   the setup screen to complete installation as opposed to having to navigate to
   a specific link.
 
+### Drupal Integration
+
+- **Upgrading a site that still has "mysql" in the dsn string breaks in latest
+  master ([dev/core#1937](https://lab.civicrm.org/dev/core/-/issues/1937):
+  [18174](https://github.com/civicrm/civicrm-core/pull/18174))**
+
+  This adds an upgrade message for 5.29.0 warning that Composer patching will
+  need to be enabled before upgrading to 5.30.0 or higher.
+
+  The "mysql" in the DSN (as opposed to "mysqli") will not be a problem, but the
+  solution for this is in a package patch that appears in 5.30.
+
+- **Installation - Support "activate first" w/setup UI
+  ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
+
+  The new setup user interface for Backdrop and WordPress installations is now
+  available for Drupal 7.
+
+### WordPress Integration
+
+- **Add system check to ensure WP base page exists
+  ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
+
+  A new system check will display a message if the base page, as set in CiviCRM,
+  doesn't match an existing page in WordPress.  No message will display if
+  WordPress multisite is enabled.
+
 ### Core CiviCRM
 
 - **Contact export is very slow, creates huge temporary tables
@@ -61,19 +121,48 @@ Released September 2, 2020
   Improves performance when exporting contacts by only exporting primary address
   fields.
 
+- **Allow different output formats for CiviReport results, like native excel
+  format, and untangle code
+  ([dev/core#1855](https://lab.civicrm.org/dev/core/-/issues/1855):
+  [17901](https://github.com/civicrm/civicrm-core/pull/17901))**
+
+  This makes it possible to extend CiviReport by reworking the PDF and CSV
+  generation code as new output handlers, and allowing for extension developers
+  to add new ones.
+
 - **Icon in status message after saving a civireport is misleading
   ([dev/report#43](https://lab.civicrm.org/dev/report/-/issues/43):
   [17863](https://github.com/civicrm/civicrm-core/pull/17863))**
 
   Improves icons in Status Messages for reports.
 
+- **Show cron warning on Scheduled Jobs admin page
+  ([18065](https://github.com/civicrm/civicrm-core/pull/18065))**
+
+  A pop-up message will appear on the Scheduled Jobs page if cron has not been
+  running.
+
+- **Add APIv4 and pseudoconstants for RelationshipCache
+  ()**
+
+- **RelationshipCache - Add a high-level index to facilitate relationship
+  queries (more fields)
+  ([17781](https://github.com/civicrm/civicrm-core/pull/17781) and
+  [17879](https://github.com/civicrm/civicrm-core/pull/17879))**
+
+  A new table caches relationships to provide a single resource for tracking
+  relationships from a specified contact's perspective.  The RelationshipCache
+  records the "near" and "far" contacts and relationship names along with the
+  orientation and relationship type.  Each record from `civicrm_relationship`
+  will have two records in `civicrm_relationship_cache`, one for each
+  orientation.
+
 - **Remove ORDER BY and GROUP BY from alphabetQuery to improve performance
   ([16877](https://github.com/civicrm/civicrm-core/pull/16877))**
 
 - **Differentiate smart group from regular group using icon in select2 field
   ([dev/core#785](https://lab.civicrm.org/dev/core/-/issues/785):
-  [17927](https://github.com/civicrm/civicrm-core/pull/17927) and
-  [13958](https://github.com/civicrm/civicrm-core/pull/13958))**
+  [17927](https://github.com/civicrm/civicrm-core/pull/17927))**
 
   Improves Group's select2 by adding icon next to smart groups.
 
@@ -83,6 +172,65 @@ Released September 2, 2020
 
   Makes it so sites can use ssl to connect to mysql.
 
+- **Add in hook to allow for altering of Profile Schemas
+  ([dev/core#1913](https://lab.civicrm.org/dev/core/-/issues/1913):
+  [17986](https://github.com/civicrm/civicrm-core/pull/17986))**
+
+  Extensions that allow additional fields to be added to profiles can now add
+  schemas so that fields can be added from new entities.
+
+- **Why not make the buttons flat?
+  ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
+
+  Buttons no longer have a gradient background.
+
+- **SystemCheck: add ability to efficiently run only specified checks
+  ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
+
+  The APIv4 system check action can now filter on name, running just the
+  specified check(s).
+
+- **Change inform-icon to fa-info-circle
+  ([18001](https://github.com/civicrm/civicrm-core/pull/18001))**
+
+  The information icon is now produced with Font Awesome rather than a sprite.
+
+- **APIv4 - Add keyword to select all custom fields
+  ([17955](https://github.com/civicrm/civicrm-core/pull/17955))**
+
+  You can now use a wildcard to select all custom fields on an entity without
+  specifying each individually.
+
+- **Improve caching of current domain
+  ([17916](https://github.com/civicrm/civicrm-core/pull/17916))**
+
+  Domain information is now cached in one central place, making it more
+  straightforward to use and flush.
+
+- **APIv4 - Specify BridgeEntities to assist with joins
+  ([17808](https://github.com/civicrm/civicrm-core/pull/17808))**
+
+  Minor entities that intermediate many-to-many relationships are now specified
+  as bridge entities and extend from a new base class.  This will allow them to
+  be distinguished better in the future.
+
+- **APIv4 - Add shorthand for setCheckPermissions()
+  ([17834](https://github.com/civicrm/civicrm-core/pull/17834) and
+  [17874](https://github.com/civicrm/civicrm-core/pull/17874))**
+
+  The CRUD functions of APIv4 now accept a boolean argument that corresponds to
+  the value sent to `setCheckPermissions()`.  This provides a shorthand for a
+  very common use case.
+
+- **Add search extension
+  ([17775](https://github.com/civicrm/civicrm-core/pull/17775),
+  [17789](https://github.com/civicrm/civicrm-core/pull/17789), and
+  [17864](https://github.com/civicrm/civicrm-core/pull/17864))**
+
+  An extension that replaces Search Builder is now shipped with core, though it
+  is hidden from the extensions user interface because it is currently
+  incompatible with the default theming framework.
+
 ## <a name="bugs"></a>Bugs resolved
 
 ### Wordpress Integration
@@ -105,6 +253,10 @@ Released September 2, 2020
 - **Fix PHP notice on wordpress permissions form
   ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
 
+- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin
+  ([dev/wordpress#67](https://lab.civicrm.org/dev/wordpress/-/issues/67):
+  [214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
+
 ### Drupal Integration
 
 - **Drupal 8 - Using Create User Record action on a contact with no email is too
@@ -122,13 +274,63 @@ Released September 2, 2020
   Skip the server variable checks if running in a CLI environment, removing an
   error when running Drush commands against Drupal 8 and Drupal 9 based sites.
 
+- **Can't find recaptcha in Drupal 8
+  ([dev/core#1871](https://lab.civicrm.org/dev/core/-/issues/1871):
+  [17822](https://github.com/civicrm/civicrm-core/pull/17822))**
+
+- **Fixed for multi-select filter
+  ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
+
+  This fixes filters for multi-select fields in Views.
+
+- **fix url for file field
+  ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
+
+  This fixes the generated URL for file fields in Views.
+
 ### CiviCase
 
 - **Fix case activity field set to allow long details to be exported
   ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
 
+- **Case export has two fields that are not what they say they are
+  ([dev/core#1916](https://lab.civicrm.org/dev/core/-/issues/1916):
+  [18043](https://github.com/civicrm/civicrm-core/pull/18043))**
+
+- **Collapsed custom field set for activities with a required radio makes case
+  activity buttons seem disabled
+  ([dev/core#1928](https://lab.civicrm.org/dev/core/-/issues/1928):
+  [18080](https://github.com/civicrm/civicrm-core/pull/18080))**
+
+- **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash
+  ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
+
 ### CiviContribute
 
+- **Define the logic that sets (or not) contribution receive_date in relation to
+  payments
+  ([dev/financial#139](https://lab.civicrm.org/dev/financial/-/issues/139):
+  [17777](https://github.com/civicrm/civicrm-core/pull/17777) and
+  [18000](https://github.com/civicrm/civicrm-core/pull/18000))**
+
+  This undoes a regression where the contribution date of a pay-later
+  contribution would change when a payment completes the contribution.  The
+  contribution date is the accrual date and is distinct from the date the
+  contribution is entered and the date when all payments have been received.
+
+  In the process, this changes the "Update pending contribution status" search
+  action to be "Record payments for contributions".  The result is generally the
+  same, but the status change comes about because the payments complete the
+  contributions.  You can modify contribution statuses in bulk with a profile by
+  using the "Update multiple contributions" action.
+
+- **Disable frequency/interval fields if not required. Mark required if they are
+  so they are validated before submit
+  ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
+
+  The frequency and interval fields for recurring contributions now use jQuery
+  validation to disable or require them as appropriate.
+
 - **Paypal IPN sometimes fails to update the next scheduled payment date when
   recording the latest recurring payment
   ([dev/core#1679](https://lab.civicrm.org/dev/core/-/issues/1679):
@@ -148,17 +350,20 @@ Released September 2, 2020
   than the site's default currency, the "grand total" row shows the sign of the
   default currency instead of the filtered currency.
 
-- **Define the logic that sets (or not) contribution receive_date in relation to
-  payments
-  ([dev/financial#139](https://lab.civicrm.org/dev/financial/-/issues/139):
-  [17777](https://github.com/civicrm/civicrm-core/pull/17777))**
-
-  Ensures that the contribution receive_date does not change when payments come
-  in.
-
 - **Fix PaypalIPN single function to not receive-by-reference
   ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
 
+- **Allow Failed -> Completed status for contributions
+  ([dev/core#1906](https://lab.civicrm.org/dev/core/-/issues/1906):
+  [17943](https://github.com/civicrm/civicrm-core/pull/17943))**
+
+- **Fix currency symbol for Total Amount on contribution page
+  ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
+
+  This resolves a but where the total amount would show the default system
+  currency symbol regardless of the currency configured on the contribution
+  page.
+
 - **On behalf label / Honoree Title / Honoree Description not translatable on
   contribution page
   ([dev/core#1280](https://lab.civicrm.org/dev/core/-/issues/1280):
@@ -176,6 +381,32 @@ Released September 2, 2020
 - **Do not overwrite values saved from the repeatContribution routine
   ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
 
+- **"Contribution Source" profile field has no effect on new contribution
+  ([dev/core#1902](https://lab.civicrm.org/dev/core/-/issues/1902):
+  [17930](https://github.com/civicrm/civicrm-core/pull/17930))**
+
+- **Incorrect check for "soft_credit" after making pcp donation
+  ([dev/core#1915](https://lab.civicrm.org/dev/core/-/issues/1915):
+  [18002](https://github.com/civicrm/civicrm-core/pull/18002))**
+
+- **Total Tax Amount on the Contribution (generated in backoffice/offline) no
+  longer adds up to sum of the Tax Amount for the individual line items
+  ([dev/core#1983](https://lab.civicrm.org/dev/core/-/issues/1983):
+  [18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+
+- **Downloaded Invoice activity attaches non wkhtmltopdf invoice
+  ([dev/core#1922](https://lab.civicrm.org/dev/core/-/issues/1922):
+  [18056](https://github.com/civicrm/civicrm-core/pull/18056))**
+
+  Downloading an invoice would ignore whether wkhtmltopdf was configured and
+  always use dompdf.
+
+- **Fix repeattransaction api to use custom data from the template contribution
+  ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
+
+  The Contribution.repeattransaction API will now copy custom data from the
+  template rather than the earliest related contribution.
+
 ### CiviEvent
 
 - **Can't meaningfully disable self-service transfer/cancellation once enabled
@@ -194,6 +425,13 @@ Released September 2, 2020
 
 ### CiviMail
 
+- **Remove url-tracking in mass SMS
+  ([dev/core#1843](https://lab.civicrm.org/dev/core/-/issues/1843):
+  [17700](https://github.com/civicrm/civicrm-core/pull/17700))**
+
+  Rewritten URLs were confusing and made SMS messages unnecessarily long.  There
+  also have never been SMS tracking reports to use them anyway.
+
 - **Test mailings create new contacts even when "Add Contacts" permission is not
   present. ([dev/mail#70](https://lab.civicrm.org/dev/mail/-/issues/70):
   [17867](https://github.com/civicrm/civicrm-core/pull/17867))**
@@ -201,14 +439,57 @@ Released September 2, 2020
   Ensures contacts are not created when a user without permissions to create
   contacts sends a test email.
 
+- **Mailing Subscription form does not validate reCaptcha
+  ([dev/core#1755](https://lab.civicrm.org/dev/core/-/issues/1755):
+  [17305](https://github.com/civicrm/civicrm-core/pull/17305))**
+
+- **Text version of unsubscribed email is missing the link to resubscribe
+  ([dev/core#1919](https://lab.civicrm.org/dev/core/-/issues/1919):
+  [18015](https://github.com/civicrm/civicrm-core/pull/18015))**
+
+- **Add CiviMail synchronisation frequency setting
+  (in support of [dev/core#1768](https://lab.civicrm.org/dev/core/-/issues/1768):
+  [17709](https://github.com/civicrm/civicrm-core/pull/17709))**
+
+  This adds a setting for updating how frequently the database should be updated
+  with the status of emails that have been sent.  Updating the database more
+  frequently can slow the process down, but it reduces the likelihood that a
+  recipient will be re-emailed when recovering from a stalled mailing.
+
+- **Make new email open and url routes 'public'
+  ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
+
+  This denotes the paths for open and URL tracking as "public" pages as they are
+  meant to be used by unauthenticated email clients and recipients.
+
 ### CiviMember
 
 - **Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing
   a membership ([dev/core#1113](https://lab.civicrm.org/dev/core/-/issues/1113):
   [16429](https://github.com/civicrm/civicrm-core/pull/16429))**
 
+- **Offline Membership Renewal Tax Calculation is incorrect [regression]
+  ([dev/core#1972](https://lab.civicrm.org/dev/core/-/issues/1972):
+  [18271](https://github.com/civicrm/civicrm-core/pull/18271))**
+
 ### Core CiviCRM
 
+- **CRM_Dedupe_Finder parses phone key incorrectly
+  ([dev/core#1767](https://lab.civicrm.org/dev/core/-/issues/1767):
+  [17361](https://github.com/civicrm/civicrm-core/pull/17361) and
+  [17882](https://github.com/civicrm/civicrm-core/pull/17882))**
+
+  The process to match duplicate contacts was not accurately identifying phone
+  fields, causing contacts with matching phone numbers to be treated as if they
+  didn't match.
+
+- **Dedupe: Location type is treated inconsistently
+  ([dev/core#1826](https://lab.civicrm.org/dev/core/-/issues/1826):
+  [17645](https://github.com/civicrm/civicrm-core/pull/17645))**
+
+  Duplicate matching now ignores location type for postal address fields, now
+  consistent with how it has ignored phone and email location types.
+
 - **Installing drupal 8 using civicrm-setup leads to "incorrect resource url"
   system status check errors
   ([dev/drupal#114](https://lab.civicrm.org/dev/drupal/-/issues/114) and
@@ -230,216 +511,173 @@ Released September 2, 2020
   ([dev/core#1670](https://lab.civicrm.org/dev/core/-/issues/1670):
   [17580](https://github.com/civicrm/civicrm-core/pull/17580))**
 
+- **Email template permissions
+  ([dev/core#1751](https://lab.civicrm.org/dev/core/-/issues/1751):
+  [17480](https://github.com/civicrm/civicrm-core/pull/17480))**
+
+  Users sending an email are no longer able to save or modify a template if they
+  lack the "edit message templates" permission.
+
+- **Using Parent tag in search form doesn't pull contacts marked with child tag
+  in search form result
+  ([dev/core#1795](https://lab.civicrm.org/dev/core/-/issues/1795):
+  [17513](https://github.com/civicrm/civicrm-core/pull/17513))**
+
+- **Activity Search : Tags are not working
+  ([dev/core#1827](https://lab.civicrm.org/dev/core/-/issues/1827):
+  [17655](https://github.com/civicrm/civicrm-core/pull/17655) and
+  [17755](https://github.com/civicrm/civicrm-core/pull/17755))**
 
-- **dev/core#1751: [Create Email] Only Show Update/Save Template when User has Permission to Edit Templates ([17480](https://github.com/civicrm/civicrm-core/pull/17480))**
-
-- **dev/core#1755 Fix reCaptcha on Mailing Subscribe ([17305](https://github.com/civicrm/civicrm-core/pull/17305))**
-
-- **dev/core#1767 Fix phone key parsing in CRM_Dedupe_Finder ([17361](https://github.com/civicrm/civicrm-core/pull/17361) and [17882](https://github.com/civicrm/civicrm-core/pull/17882))**
-
-- **dev/core#1768 - Add CiviMail synchronisation frequency setting. ([17709](https://github.com/civicrm/civicrm-core/pull/17709))**
-
-- **core#1795: Searchable Parent tags ([17513](https://github.com/civicrm/civicrm-core/pull/17513))**
-
-- **core#1805: Autocomplete-select custom field is not searchable ([17569](https://github.com/civicrm/civicrm-core/pull/17569))**
-
-- **dev/core#1812 Missing view when logging set in a non-US English instance ([17815](https://github.com/civicrm/civicrm-core/pull/17815))**
-
-- **core#1826: Ignore location_type_id when deduping postal address ([17645](https://github.com/civicrm/civicrm-core/pull/17645))**
-
-- **dev/core#1827 activity search - fixing search by tags ([17655](https://github.com/civicrm/civicrm-core/pull/17655) and [17755](https://github.com/civicrm/civicrm-core/pull/17755))**
-
-- **dev/core#1843 Remove url-tracking in mass sms.  ([17700](https://github.com/civicrm/civicrm-core/pull/17700))**
-
-- **dev/core#1853 - Fix validation errors when removing contact subtype ([17765](https://github.com/civicrm/civicrm-core/pull/17765))**
-
-- **dev/core#1855 - Allow different output formats for CiviReport results and untangle code ([17901](https://github.com/civicrm/civicrm-core/pull/17901))**
-
-- **dev/core#1858 Prevent Duplicate contact records being created and har… ([17769](https://github.com/civicrm/civicrm-core/pull/17769))**
-
-- **dev/core#1861 fix failure to unset location_type_id when saving uffield ([17812](https://github.com/civicrm/civicrm-core/pull/17812))**
-
-- **dev/core#1863 Downgrade checkEnvironment level and skip non-prod checks ([17807](https://github.com/civicrm/civicrm-core/pull/17807))**
-
-- **dev/core#1868 - Regression - Description field is always blank on profiles admin page and slew of E_NOTICES ([17786](https://github.com/civicrm/civicrm-core/pull/17786))**
-
-- **dev/core#1869 - Include BOM in attachment when sending CSV CiviReport via mail_report job ([17806](https://github.com/civicrm/civicrm-core/pull/17806))**
-
-- **dev/core#1871 - require_once's that include "packages/" in the path don't work on drupal 8 ([17822](https://github.com/civicrm/civicrm-core/pull/17822))**
-
-- **dev/core#1872 - Packages and vendor path calculation used in system check is outdated ([17844](https://github.com/civicrm/civicrm-core/pull/17844))**
-
-- **dev/core#1874 - Failing test for new Individual form ([17835](https://github.com/civicrm/civicrm-core/pull/17835))**
-
-- **dev/core#1880 add backticks to custom field insertions ([17848](https://github.com/civicrm/civicrm-core/pull/17848))**
-
-- **dev/core#1888 - Fix one line in PR 17888  ([17898](https://github.com/civicrm/civicrm-core/pull/17898))**
-
-- **dev/core#1888 and dev/core#1885 - Fatal error on advanced search and warnings and missing group display on contact form ([17888](https://github.com/civicrm/civicrm-core/pull/17888))**
+- **Autocomplete-select custom field is not searchable
+  ([dev/core#1805](https://lab.civicrm.org/dev/core/-/issues/1805):
+  [17569](https://github.com/civicrm/civicrm-core/pull/17569))**
 
-- **dev/core#1894 - Make CRM_Activity_Form_SearchTest::testQill less time-sensitive ([17902](https://github.com/civicrm/civicrm-core/pull/17902))**
+- **Do not allow enabling database logging when using multilingual
+  ([dev/core#1812](https://lab.civicrm.org/dev/core/-/issues/1812):
+  [17815](https://github.com/civicrm/civicrm-core/pull/17815))**
 
-- **dev/core#1895 fix first/last name adv search ([17950](https://github.com/civicrm/civicrm-core/pull/17950))**
+  This has never worked, with network errors as the result.  This prevents it
+  from being set.
 
-- **dev/core#1902: "Contribution Source" profile field has no effect ([17930](https://github.com/civicrm/civicrm-core/pull/17930))**
+- **Can't remove subtype if any required custom field is based on it
+  ([dev/core#1853](https://lab.civicrm.org/dev/core/-/issues/1853):
+  [17765](https://github.com/civicrm/civicrm-core/pull/17765))**
 
-- **dev/core#1905 force backend links for new "configure" buttons ([17942](https://github.com/civicrm/civicrm-core/pull/17942), [18088](https://github.com/civicrm/civicrm-core/pull/18088) and [18064](https://github.com/civicrm/civicrm-core/pull/18064))**
+- **User account form action not passing along contact id correctly possibly
+  leading to duplicate contacts
+  ([dev/core#1858](https://lab.civicrm.org/dev/core/-/issues/1858):
+  [17769](https://github.com/civicrm/civicrm-core/pull/17769))**
 
-- **dev/core#1906 - Allow payment create api to record payment on Failed … ([17943](https://github.com/civicrm/civicrm-core/pull/17943))**
+  When creating a user account from a contact record, the contact ID was not
+  properly passed along.  Depending upon your unsupervised duplicate matching
+  rule, it would potentially create a duplicate contact record.
 
-- **dev/core#1909 Fix E-notice when adding a field on a profile ([18006](https://github.com/civicrm/civicrm-core/pull/18006), [17962](https://github.com/civicrm/civicrm-core/pull/17962), [17964](https://github.com/civicrm/civicrm-core/pull/17964), [17959](https://github.com/civicrm/civicrm-core/pull/17959), [17985](https://github.com/civicrm/civicrm-core/pull/17985))**
+- **Cannot edit a profile field of "Email" to use the Location Type "Primary"
+  ([dev/core#1861](https://lab.civicrm.org/dev/core/-/issues/1861):
+  [17812](https://github.com/civicrm/civicrm-core/pull/17812))**
 
-- **dev/core#1913 Allow for schemas to be added by extensions if they are… ([17986](https://github.com/civicrm/civicrm-core/pull/17986))**
+  The location type would get reset to your default location type rather than
+  staying as "primary".
 
-- **dev/core#1915 - E_NOTICE when making pcp contribution ([18002](https://github.com/civicrm/civicrm-core/pull/18002))**
+- **Downgrade checkEnvironment level and skip non-prod checks (part of
+  [dev/core#1863](https://lab.civicrm.org/dev/core/-/issues/1863):
+  [17807](https://github.com/civicrm/civicrm-core/pull/17807))**
 
-- **dev/core#1916 - Fix naming of case export fields / remove ones that aren't true ([18043](https://github.com/civicrm/civicrm-core/pull/18043))**
+  In non-production environments, a system check produces a message saying so.
+  This downgrades it from an "Alert" to a more appropriate level of "Notice",
+  and it also suppresses cron and CiviMail system checks in this situation.
 
-- **dev/core#1918 - Remove dubious qfkey checking code that never runs ([18007](https://github.com/civicrm/civicrm-core/pull/18007))**
+- **Slew of E_NOTICES on Profiles admin page and description field is always
+  blank ([dev/core#1868](https://lab.civicrm.org/dev/core/-/issues/1868):
+  [17786](https://github.com/civicrm/civicrm-core/pull/17786))**
 
-- **dev/core#1919 - Missing resubscribe url in text/plain version of unsubscribe confirmation email ([18015](https://github.com/civicrm/civicrm-core/pull/18015))**
+- **CiviReport sent as email via mail_report job with a CSV attachment doesn't
+  show UTF8 characters properly in Excel
+  ([dev/core#1869](https://lab.civicrm.org/dev/core/-/issues/1869):
+  [17806](https://github.com/civicrm/civicrm-core/pull/17806))**
 
-- **dev/core#1921 [Ref] remove isoToMysql ([18025](https://github.com/civicrm/civicrm-core/pull/18025))**
+- **References to packages path in security status checks are assumed to be
+  under civicrm root
+  ([dev/core#1872](https://lab.civicrm.org/dev/core/-/issues/1872):
+  [17844](https://github.com/civicrm/civicrm-core/pull/17844))**
 
-- **dev/core#1928 Fix HTML5 error due to required attribute being set swi… ([18080](https://github.com/civicrm/civicrm-core/pull/18080))**
+  This changes how package and vendor paths are calculated in system checks
+  since (in Drupal 8 and potentially elsewhere) they may not be within the
+  CiviCRM root folder.
 
-- **dev/core#1932 - Make status-checks more polite during upgrade ([18085](https://github.com/civicrm/civicrm-core/pull/18085))**
+- **custom data insert/update error if using reserved words
+  ([dev/core#1880](https://lab.civicrm.org/dev/core/-/issues/1880):
+  [17848](https://github.com/civicrm/civicrm-core/pull/17848))**
 
-- **dev/core#1937 - Upgrade message about needing composer patching turned on and updating mysql in DSN strings ([18174](https://github.com/civicrm/civicrm-core/pull/18174))**
+- **Advanced Search (search by complete or partial name) returns all contacts
+  ([dev/core#1895](https://lab.civicrm.org/dev/core/-/issues/1895):
+  [17950](https://github.com/civicrm/civicrm-core/pull/17950))**
 
-- **dev/core#1983 Fix to tax calculation on multi-line-item ([18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+  The ability to search first/last name was recently added to core. The primary
+  intent was to properly handle advanced searches that originate from
+  quicksearch first/last name filters. While that was working, a first/last name
+  search that originated directly from an advanced search was not working. This
+  fixes the issue.
 
-- **dev/core#1972 Fix tax_amount calclation on renewal form ([18271](https://github.com/civicrm/civicrm-core/pull/18271))**
+- **Miscellaneous E_NOTICES
+  ([dev/core#1909](https://lab.civicrm.org/dev/core/-/issues/1909):
+  [18006](https://github.com/civicrm/civicrm-core/pull/18006),
+  [17962](https://github.com/civicrm/civicrm-core/pull/17962),
+  [17964](https://github.com/civicrm/civicrm-core/pull/17964),
+  [17959](https://github.com/civicrm/civicrm-core/pull/17959), and
+  [17985](https://github.com/civicrm/civicrm-core/pull/17985))**
 
+- **CRM_Core_Key::valid() does backwards comparison
+  ([dev/core#1918](https://lab.civicrm.org/dev/core/-/issues/1918):
+  [18007](https://github.com/civicrm/civicrm-core/pull/18007))**
 
+  This removes legacy code that appeared to attempt to check for a valid
+  quickForm key but wasn't effectively doing so.
 
+- **Upgrade fails for 4.6 => 5.29 during status-check
+  ([dev/core#1932](https://lab.civicrm.org/dev/core/-/issues/1932):
+  [18085](https://github.com/civicrm/civicrm-core/pull/18085))**
 
-- **Installation doclinks not getting url-rewritten ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
+- **Installation doclinks not getting url-rewritten
+  ([18175](https://github.com/civicrm/civicrm-core/pull/18175))**
 
-- **Fix button name on updated form ([18000](https://github.com/civicrm/civicrm-core/pull/18000))**
+  Links to the new installation documentation are now handled in the same way as
+  other documentation sites.
 
-- **Show cron warning on Scheduled Jobs admin page ([18065](https://github.com/civicrm/civicrm-core/pull/18065))**
+- **Wrap multi record custom field inside a div
+  ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
 
-- **Use correct pdf package to generate pdf file on invoice download/email activity ([18056](https://github.com/civicrm/civicrm-core/pull/18056))**
+- **Fixed filling default values for tagssets in the advanced search form
+  ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
 
-- **Why not make the buttons flat? ([18054](https://github.com/civicrm/civicrm-core/pull/18054))**
+- **Simplify caching of status checks
+  ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
 
-- **Wrap multi record custom field inside a div ([17966](https://github.com/civicrm/civicrm-core/pull/17966))**
+- **ensure custom field checkboxes are populated in profiles
+  ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
 
-- **SystemCheck: add ability to efficiently run only specified checks ([17824](https://github.com/civicrm/civicrm-core/pull/17824))**
+- **Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it
+  using composer ([17948](https://github.com/civicrm/civicrm-core/pull/17948))**
 
-- **Change inform-icon to fa-info-circle ([18001](https://github.com/civicrm/civicrm-core/pull/18001))**
+- **Setup UI - Validate that at least one "Component" is enabled
+  ([17778](https://github.com/civicrm/civicrm-core/pull/17778))**
 
-- **Fix repeattransaction api to use custom data from the template contribution ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
+  This prevents you from proceeding with installation without enabling at least
+  one component.  Not enabling any components causes a messy failed
+  installation.
 
-- **Fixed filling default values for tagssets in the advanced search form ([17978](https://github.com/civicrm/civicrm-core/pull/17978))**
-
-- **Simplify caching of status checks ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
-
-- **ensure custom field checkboxes are populated in profiles ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
-
-- **Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it using composer ([17948](https://github.com/civicrm/civicrm-core/pull/17948))**
-
-- **APIv4 - Add keyword to select all custom fields ([17955](https://github.com/civicrm/civicrm-core/pull/17955))**
-
-- **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
-
-- **Improve caching of current domain ([17916](https://github.com/civicrm/civicrm-core/pull/17916))**
-
-- **Setup UI - Validate that at least one "Component" is enabled ([17778](https://github.com/civicrm/civicrm-core/pull/17778))**
-
-- **Member detail report: nest "in" options in parentheses ([17911](https://github.com/civicrm/civicrm-core/pull/17911))**
-
-- **Replace a load of references to the wiki with docs links ([17900](https://github.com/civicrm/civicrm-core/pull/17900))**
-
-- **Call apiv4 from Contribution create rather than fugly addActivity function ([17881](https://github.com/civicrm/civicrm-core/pull/17881))**
-
-- **APIv4 - Add BasicEntity helper class ([17899](https://github.com/civicrm/civicrm-core/pull/17899))**
-
-- **Add APIv4 and pseudoconstants for RelationshipCache ([17879](https://github.com/civicrm/civicrm-core/pull/17879))**
-
-- **Update version in the test_data_second_domain file and also update the setVersion script to update the file version as necessary ([17897](https://github.com/civicrm/civicrm-core/pull/17897))**
-
-- **Be a little less supportive to cvs ([17896](https://github.com/civicrm/civicrm-core/pull/17896))**
-
-- **APIv4 - Specify BridgeEntities to assist with joins ([17808](https://github.com/civicrm/civicrm-core/pull/17808))**
-
-- **Event Cart ext: Move menu entries to extension ([17891](https://github.com/civicrm/civicrm-core/pull/17891))**
-
-- **EventCart ext: Cleanup and move form components to ext ([17885](https://github.com/civicrm/civicrm-core/pull/17885))**
-
-- **EventCart ext: Fix autogenerated code, remove unused hooks, update readme ([17884](https://github.com/civicrm/civicrm-core/pull/17884))**
-
-- **Add eventcart shell ([17741](https://github.com/civicrm/civicrm-core/pull/17741))**
-
-- **EventCart - Resolve BAO identity and uncommitted DAO changes ([17861](https://github.com/civicrm/civicrm-core/pull/17861))**
-
-- **Move BAO and template files into event cart ([17743](https://github.com/civicrm/civicrm-core/pull/17743))**
+- **Call apiv4 from Contribution create rather than fugly addActivity function
+  ([17881](https://github.com/civicrm/civicrm-core/pull/17881))**
 
 - **Search debug ([17887](https://github.com/civicrm/civicrm-core/pull/17887))**
 
-- **Use new checkPermissions shorthand in api calls ([17874](https://github.com/civicrm/civicrm-core/pull/17874))**
-
-- **Simplify flushing group contact cache query to reduce table locking and improve performance ([17846](https://github.com/civicrm/civicrm-core/pull/17846))**
+- **Simplify flushing group contact cache query to reduce table locking and
+  improve performance
+  ([17846](https://github.com/civicrm/civicrm-core/pull/17846))**
 
-- **Disable frequency/interval fields if not required. Mark required if they are so they are validated before submit ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
+- **Make api get upgrade-safe
+  ([17729](https://github.com/civicrm/civicrm-core/pull/17729))**
 
-- **Fix currency symbol for Total Amount on contribution page ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
+  This avoids database errors when the code and database versions don't match by
+  preventing the API from accessing fields that are unsupported in the database.
 
-- **RelationshipCache - Add a high-level index to facilitate relationship queries (more fields) ([17781](https://github.com/civicrm/civicrm-core/pull/17781))**
+- **CheckEnv - Give new installs a grace period before 'Cron Not Running' msg
+  ([17800](https://github.com/civicrm/civicrm-core/pull/17800))**
 
-- **Search Ext: fix loading options and parsing custom field names ([17864](https://github.com/civicrm/civicrm-core/pull/17864))**
+  The system check will lower the severity of the "cron not running" check for
+  the first 24 hours after a site has been installed.
 
-- **Bump lodash from 4.17.15 to 4.17.19 ([17858](https://github.com/civicrm/civicrm-core/pull/17858))**
+- **Sort permittedActivityTypes
+  ([17794](https://github.com/civicrm/civicrm-core/pull/17794))**
 
+  This improves performance on filtering activity types by making it possible to
+  compare a list of permitted types with the overall list of activity type IDs.
 
-- **Update regen.sh with new & upcoming core extensions ([17839](https://github.com/civicrm/civicrm-core/pull/17839))**
-
-- **APIv4 - Add activity contacts to APIv4 field spec ([17766](https://github.com/civicrm/civicrm-core/pull/17766))**
-
-- **Adjust mysql SET NAMES in remaining places as we agreed this was the go ([17825](https://github.com/civicrm/civicrm-core/pull/17825))**
-
-- **Make new email open and url routes 'public' ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
-
-- **Make api get upgrade-safe ([17729](https://github.com/civicrm/civicrm-core/pull/17729))**
-
-- **CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers ([17780](https://github.com/civicrm/civicrm-core/pull/17780))**
-
-- **CheckEnv - Give new installs a grace period before 'Cron Not Running' msg ([17800](https://github.com/civicrm/civicrm-core/pull/17800))**
-
-- **Add hidden tag to search extension ([17789](https://github.com/civicrm/civicrm-core/pull/17789))**
-
-- **Sort permittedActivityTypes ([17794](https://github.com/civicrm/civicrm-core/pull/17794))**
-
-- **Add auto-renew status to membership detail report ([17683](https://github.com/civicrm/civicrm-core/pull/17683))**
-
-- **APIv4 - Fix saving custom fields with same name ([17791](https://github.com/civicrm/civicrm-core/pull/17791))**
-
-- **Add system check to ensure WP base page exists ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
-
-- **Add search extension ([17775](https://github.com/civicrm/civicrm-core/pull/17775))**
-
-- **Status Checks - Use more specific label regarding "Domain"/"Organization" check ([17776](https://github.com/civicrm/civicrm-core/pull/17776))**
-
-- **Bump minimum upgradable version to 4.4.7 ([17750](https://github.com/civicrm/civicrm-core/pull/17750))**
-
-- **Improve efficiency of findFiles ([17745](https://github.com/civicrm/civicrm-core/pull/17745))**
-
-- **APIv4 Explorer: Improve selection of fields for HAVING ([17746](https://github.com/civicrm/civicrm-core/pull/17746))**
-
-- **Convert CRM.utils.formatDate tests to karma ([17757](https://github.com/civicrm/civicrm-core/pull/17757))**
-
-- **Teach CRM.utils.formatDate to also show time ([17684](https://github.com/civicrm/civicrm-core/pull/17684))**
-
-- **Fixed for multi-select filter ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
-
-- **fix url for file field ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
-
-- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin ([214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
-
-- **Installation - Support "activate first" w/setup UI ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
-
+- **APIv4 - Fix saving custom fields with same name
+  ([17791](https://github.com/civicrm/civicrm-core/pull/17791))**
 
+- **Status Checks - Use more specific label regarding "Domain"/"Organization"
+  check ([17776](https://github.com/civicrm/civicrm-core/pull/17776))**
 
 - **SQL temp table not using utf8mb4 if server default already set to utf8mb4
   ([18012](https://github.com/civicrm/civicrm-core/pull/18012))**
@@ -468,11 +706,63 @@ Released September 2, 2020
 - **Fix JQuery Validation for radios
   ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
 
-- **Fix buggy placement of icons on buttons
-  ([18005](https://github.com/civicrm/civicrm-core/pull/18005))**
-
 ## <a name="misc"></a>Miscellany
 
+- **APIv4 - Add BasicEntity helper class
+  ([17899](https://github.com/civicrm/civicrm-core/pull/17899))**
+
+- **Bump minimum upgradable version to 4.4.7
+  ([17750](https://github.com/civicrm/civicrm-core/pull/17750))**
+
+- **Update version in the test_data_second_domain file and also update the
+  setVersion script to update the file version as necessary
+  ([17897](https://github.com/civicrm/civicrm-core/pull/17897))**
+
+- **Be a little less supportive to cvs
+  ([17896](https://github.com/civicrm/civicrm-core/pull/17896))**
+
+- **Replace a load of references to the wiki with docs links
+  ([17900](https://github.com/civicrm/civicrm-core/pull/17900))**
+
+- **Remove unneccessary isoToDate function
+  ([dev/core#1921](https://lab.civicrm.org/dev/core/-/issues/1921):
+  [18025](https://github.com/civicrm/civicrm-core/pull/18025))**
+
+- **CRM_Activity_Form_SearchTest::testQill can fail semi-randomly
+  ([dev/core#1894](https://lab.civicrm.org/dev/core/-/issues/1894):
+  [17902](https://github.com/civicrm/civicrm-core/pull/17902))**
+
+- **Test for fatal error on new individual form
+  ([dev/core#1874](https://lab.civicrm.org/dev/core/-/issues/1874):
+  [17835](https://github.com/civicrm/civicrm-core/pull/17835))**
+
+- **Bump lodash from 4.17.15 to 4.17.19
+  ([17858](https://github.com/civicrm/civicrm-core/pull/17858))**
+
+- **Update regen.sh with new & upcoming core extensions
+  ([17839](https://github.com/civicrm/civicrm-core/pull/17839))**
+
+- **APIv4 - Add activity contacts to APIv4 field spec
+  ([17766](https://github.com/civicrm/civicrm-core/pull/17766))**
+
+- **Adjust mysql SET NAMES in remaining places as we agreed this was the go
+  ([17825](https://github.com/civicrm/civicrm-core/pull/17825))**
+
+- **CRM_Utils_SQL - Add "onDuplicate()" and "syncInto()" helpers
+  ([17780](https://github.com/civicrm/civicrm-core/pull/17780))**
+
+- **Improve efficiency of findFiles
+  ([17745](https://github.com/civicrm/civicrm-core/pull/17745))**
+
+- **APIv4 Explorer: Improve selection of fields for HAVING
+  ([17746](https://github.com/civicrm/civicrm-core/pull/17746))**
+
+- **Convert CRM.utils.formatDate tests to karma
+  ([17757](https://github.com/civicrm/civicrm-core/pull/17757))**
+
+- **Teach CRM.utils.formatDate to also show time
+  ([17684](https://github.com/civicrm/civicrm-core/pull/17684))**
+
 - **CRM_Utils_Hook: deprecation warning and short array syntax
   ([17995](https://github.com/civicrm/civicrm-core/pull/17995))**
 
@@ -491,9 +781,6 @@ Released September 2, 2020
 - **Hooks/Dispatcher - Close loopholes that occur around "preboot" hooks
   ([17831](https://github.com/civicrm/civicrm-core/pull/17831))**
 
-- **APIv4 - Add shorthand for setCheckPermissions()
-  ([17834](https://github.com/civicrm/civicrm-core/pull/17834))**
-
 - **Use PrematureExit exception instead of weird hack in tests
   ([17870](https://github.com/civicrm/civicrm-core/pull/17870))**
 
@@ -811,7 +1098,6 @@ Released September 2, 2020
 - **Cache loader - remove legacy handling, handle null result from setting
   ([17999](https://github.com/civicrm/civicrm-core/pull/17999))**
 
-
 - **Use case id to get relationship for activity creation
   ([17256](https://github.com/civicrm/civicrm-core/pull/17256) and
   [17764](https://github.com/civicrm/civicrm-core/pull/17764))**
@@ -835,13 +1121,13 @@ Technologies - Tunbola Ogunwande; Wikimedia Foundation - Eileen McNaughton
 Most authors also reviewed code for this release; in addition, the following
 reviewers contributed their comments:
 
-Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian Greens -
-Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions - Alan
-Dixon; Carlos Capote; CompuCorp - Jamie Novick; DevApp - Adam Kwiatkowski;
+Agileware - Pengyi Zhang; Andrew Thompson; Artful Robot - Rich Lott; Australian
+Greens - Andrew Cormick-Dockery, John Twyman; Bastien Ho; Blackfly Solutions -
+Alan Dixon; Carlos Capote; CompuCorp - Jamie Novick; DevApp - Adam Kwiatkowski;
 Francesc Bassas i Bullich; Freeform Solutions - Herb van den Dool; Greenpeace
 Central and Eastern Europe - Patrick Figel; Irene Meisel; JMA Consulting - Joe
 Murray; Korlon - Stuart Gaston; Nicol Wistreich; Rar9; Ray Wright; Semper IT -
-Karin Gerritsen; Third Sector Design - Michael McAndrew;
+Karin Gerritsen; Third Sector Design - Michael McAndrew
 
 ## <a name="feedback"></a>Feedback
 

From 47c2ce56529939b65bc5e710c045a685c4bd3e7e Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Wed, 2 Sep 2020 15:19:00 -0400
Subject: [PATCH 084/834] 5.29.0 release notes: get sections in right order

---
 release-notes/5.29.0.md | 606 ++++++++++++++++++++--------------------
 1 file changed, 303 insertions(+), 303 deletions(-)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index 3c7ff2e5779f..bae0454eb091 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -23,95 +23,6 @@ Released September 2, 2020
 
 ## <a name="features"></a>Features
 
-### CiviContribute
-
-- **Add configure and priceset url icons on public contribution & event pages
-  ([dev/core#1905](https://lab.civicrm.org/dev/core/-/issues/1905):
-  [17942](https://github.com/civicrm/civicrm-core/pull/17942),
-  [18088](https://github.com/civicrm/civicrm-core/pull/18088) and
-  [18064](https://github.com/civicrm/civicrm-core/pull/18064))**
-
-  A "Configure" button now appears to administrators when viewing a contribution
-  page or event, or a priceset within either, from the frontend.  This links to
-  the corresponding form to administer the contribution page, event, or
-  priceset.
-
-### CiviEvent
-
-- **Move Event Cart to extension
-  ([17741](https://github.com/civicrm/civicrm-core/pull/17741),
-  [17743](https://github.com/civicrm/civicrm-core/pull/17743),
-  [17861](https://github.com/civicrm/civicrm-core/pull/17861),
-  [17884](https://github.com/civicrm/civicrm-core/pull/17884),
-  [17885](https://github.com/civicrm/civicrm-core/pull/17885), and
-  [17891](https://github.com/civicrm/civicrm-core/pull/17891))**
-
-  The event cart features have been moved to a separate extension that is
-  shipped with core.
-
-### CiviMember
-
-- **Option to update expired memberships as part of the job.process_membership
-  ([dev/membership#18](https://lab.civicrm.org/dev/membership/-/issues/18):
-  [16298](https://github.com/civicrm/civicrm-core/pull/16298))**
-
-  Improves the Job.process_membership API/Scheduled job by adding some new
-  parameters, specifically:
-
-    - exclude_test_memberships: Exclude test memberships from calculations
-      (default = TRUE)
-    - only_active_membership_types: Exclude disabled membership types from
-      calculations (default = TRUE)
-    - exclude_membership_status_ids: Default: Exclude Pending, Cancelled,
-      Expired.
-
-  Deceased will always be excluded
-
--  **Add auto-renew status to membership detail report
-  ([17683](https://github.com/civicrm/civicrm-core/pull/17683) and
-  [17911](https://github.com/civicrm/civicrm-core/pull/17911))**
-
-  The membership detail report can now display and filter on the auto-renew
-  status of each membership.
-
-### Backdrop Integration
-
-- **Support for installing CiviCRM-Backdrop via "setup" UI
-  ([17749](https://github.com/civicrm/civicrm-core/pull/17749) and
-  [121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
-
-  Improves the installation and Setup process for Backdrop integration's so that
-  one enables the CiviCRM module like any other module and then is directed to
-  the setup screen to complete installation as opposed to having to navigate to
-  a specific link.
-
-### Drupal Integration
-
-- **Upgrading a site that still has "mysql" in the dsn string breaks in latest
-  master ([dev/core#1937](https://lab.civicrm.org/dev/core/-/issues/1937):
-  [18174](https://github.com/civicrm/civicrm-core/pull/18174))**
-
-  This adds an upgrade message for 5.29.0 warning that Composer patching will
-  need to be enabled before upgrading to 5.30.0 or higher.
-
-  The "mysql" in the DSN (as opposed to "mysqli") will not be a problem, but the
-  solution for this is in a package patch that appears in 5.30.
-
-- **Installation - Support "activate first" w/setup UI
-  ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
-
-  The new setup user interface for Backdrop and WordPress installations is now
-  available for Drupal 7.
-
-### WordPress Integration
-
-- **Add system check to ensure WP base page exists
-  ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
-
-  A new system check will display a message if the base page, as set in CiviCRM,
-  doesn't match an existing page in WordPress.  No message will display if
-  WordPress multisite is enabled.
-
 ### Core CiviCRM
 
 - **Contact export is very slow, creates huge temporary tables
@@ -231,246 +142,96 @@ Released September 2, 2020
   is hidden from the extensions user interface because it is currently
   incompatible with the default theming framework.
 
-## <a name="bugs"></a>Bugs resolved
-
-### Wordpress Integration
-
-- **[civicrm.files] token doesn't work in some cases since 5.27
-  ([dev/wordpress#66](https://lab.civicrm.org/dev/wordpress/-/issues/66):
-  [18068](https://github.com/civicrm/civicrm-core/pull/18068))**
-
-  Ensures the [civicrm.files] token plays nice for sites with older wordpress
-  file directory set ups.
-
-- **CiviCRM and the WordPress Pods plugin (since version 2.7.13) is incompatible
-  due to Pods including marionette v3.3.1 for backbone, newer than CiviCRM's
-  bundled marionette v1.0.3
-  ([dev/core#1090](https://lab.civicrm.org/dev/core/-/issues/1090):
-  [17855](https://github.com/civicrm/civicrm-core/pull/17855))**
-
-  Ensures CiviCRM plays nicely with recent versions of Elementor Plugin.
-
-- **Fix PHP notice on wordpress permissions form
-  ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
-
-- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin
-  ([dev/wordpress#67](https://lab.civicrm.org/dev/wordpress/-/issues/67):
-  [214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
-
-### Drupal Integration
-
-- **Drupal 8 - Using Create User Record action on a contact with no email is too
-  quiet. Also CRM_Core_Session::setStatus is sometimes ignored.
-  ([dev/drupal#127](https://lab.civicrm.org/dev/drupal/-/issues/127):
-  [17914](https://github.com/civicrm/civicrm-core/pull/17914) and
-  [17915](https://github.com/civicrm/civicrm-core/pull/17915))**
-
-  Require email when adding a user and ensure that errors show.
-
-- **The following PHP variables are not set: $_SERVER[HTTP_HOST]
-  ([dev/core#750](https://lab.civicrm.org/dev/core/-/issues/750):
-  [17636](https://github.com/civicrm/civicrm-core/pull/17636))**
-
-  Skip the server variable checks if running in a CLI environment, removing an
-  error when running Drush commands against Drupal 8 and Drupal 9 based sites.
-
-- **Can't find recaptcha in Drupal 8
-  ([dev/core#1871](https://lab.civicrm.org/dev/core/-/issues/1871):
-  [17822](https://github.com/civicrm/civicrm-core/pull/17822))**
-
-- **Fixed for multi-select filter
-  ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
-
-  This fixes filters for multi-select fields in Views.
-
-- **fix url for file field
-  ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
-
-  This fixes the generated URL for file fields in Views.
-
-### CiviCase
-
-- **Fix case activity field set to allow long details to be exported
-  ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
-
-- **Case export has two fields that are not what they say they are
-  ([dev/core#1916](https://lab.civicrm.org/dev/core/-/issues/1916):
-  [18043](https://github.com/civicrm/civicrm-core/pull/18043))**
-
-- **Collapsed custom field set for activities with a required radio makes case
-  activity buttons seem disabled
-  ([dev/core#1928](https://lab.civicrm.org/dev/core/-/issues/1928):
-  [18080](https://github.com/civicrm/civicrm-core/pull/18080))**
-
-- **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash
-  ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
-
 ### CiviContribute
 
-- **Define the logic that sets (or not) contribution receive_date in relation to
-  payments
-  ([dev/financial#139](https://lab.civicrm.org/dev/financial/-/issues/139):
-  [17777](https://github.com/civicrm/civicrm-core/pull/17777) and
-  [18000](https://github.com/civicrm/civicrm-core/pull/18000))**
-
-  This undoes a regression where the contribution date of a pay-later
-  contribution would change when a payment completes the contribution.  The
-  contribution date is the accrual date and is distinct from the date the
-  contribution is entered and the date when all payments have been received.
-
-  In the process, this changes the "Update pending contribution status" search
-  action to be "Record payments for contributions".  The result is generally the
-  same, but the status change comes about because the payments complete the
-  contributions.  You can modify contribution statuses in bulk with a profile by
-  using the "Update multiple contributions" action.
-
-- **Disable frequency/interval fields if not required. Mark required if they are
-  so they are validated before submit
-  ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
-
-  The frequency and interval fields for recurring contributions now use jQuery
-  validation to disable or require them as appropriate.
-
-- **Paypal IPN sometimes fails to update the next scheduled payment date when
-  recording the latest recurring payment
-  ([dev/core#1679](https://lab.civicrm.org/dev/core/-/issues/1679):
-  [17744](https://github.com/civicrm/civicrm-core/pull/17744))**
-
-- **Contribution Details Statistics are multiplied under many circumstances
-  ([dev/report#21](https://lab.civicrm.org/dev/report/-/issues/21):
-  [15435](https://github.com/civicrm/civicrm-core/pull/15435) and
-  [17809](https://github.com/civicrm/civicrm-core/pull/17809))**
-
-- **Contribution Summary Report: The "general total" row does not take the
-  currency filtered
-  ([dev/report#27](https://lab.civicrm.org/dev/report/-/issues/27):
-  [16736](https://github.com/civicrm/civicrm-core/pull/16736))**
-
-  When the contribution summary report is used by filtering for a currency other
-  than the site's default currency, the "grand total" row shows the sign of the
-  default currency instead of the filtered currency.
-
-- **Fix PaypalIPN single function to not receive-by-reference
-  ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
-
-- **Allow Failed -> Completed status for contributions
-  ([dev/core#1906](https://lab.civicrm.org/dev/core/-/issues/1906):
-  [17943](https://github.com/civicrm/civicrm-core/pull/17943))**
-
-- **Fix currency symbol for Total Amount on contribution page
-  ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
-
-  This resolves a but where the total amount would show the default system
-  currency symbol regardless of the currency configured on the contribution
-  page.
-
-- **On behalf label / Honoree Title / Honoree Description not translatable on
-  contribution page
-  ([dev/core#1280](https://lab.civicrm.org/dev/core/-/issues/1280):
-  [16838](https://github.com/civicrm/civicrm-core/pull/16838))**
-
-- **Load contribution page if live payment processor is disabled but test is
-  available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
-
-- **Remove requirement to pass 'contribution_status_id' => Pending from
-  order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
-
-- **Use saved contribution's line items rather than the primaryContributionID
-  ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
-
-- **Do not overwrite values saved from the repeatContribution routine
-  ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
-
-- **"Contribution Source" profile field has no effect on new contribution
-  ([dev/core#1902](https://lab.civicrm.org/dev/core/-/issues/1902):
-  [17930](https://github.com/civicrm/civicrm-core/pull/17930))**
-
-- **Incorrect check for "soft_credit" after making pcp donation
-  ([dev/core#1915](https://lab.civicrm.org/dev/core/-/issues/1915):
-  [18002](https://github.com/civicrm/civicrm-core/pull/18002))**
+- **Add configure and priceset url icons on public contribution & event pages
+  ([dev/core#1905](https://lab.civicrm.org/dev/core/-/issues/1905):
+  [17942](https://github.com/civicrm/civicrm-core/pull/17942),
+  [18088](https://github.com/civicrm/civicrm-core/pull/18088) and
+  [18064](https://github.com/civicrm/civicrm-core/pull/18064))**
 
-- **Total Tax Amount on the Contribution (generated in backoffice/offline) no
-  longer adds up to sum of the Tax Amount for the individual line items
-  ([dev/core#1983](https://lab.civicrm.org/dev/core/-/issues/1983):
-  [18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+  A "Configure" button now appears to administrators when viewing a contribution
+  page or event, or a priceset within either, from the frontend.  This links to
+  the corresponding form to administer the contribution page, event, or
+  priceset.
 
-- **Downloaded Invoice activity attaches non wkhtmltopdf invoice
-  ([dev/core#1922](https://lab.civicrm.org/dev/core/-/issues/1922):
-  [18056](https://github.com/civicrm/civicrm-core/pull/18056))**
+### CiviEvent
 
-  Downloading an invoice would ignore whether wkhtmltopdf was configured and
-  always use dompdf.
+- **Move Event Cart to extension
+  ([17741](https://github.com/civicrm/civicrm-core/pull/17741),
+  [17743](https://github.com/civicrm/civicrm-core/pull/17743),
+  [17861](https://github.com/civicrm/civicrm-core/pull/17861),
+  [17884](https://github.com/civicrm/civicrm-core/pull/17884),
+  [17885](https://github.com/civicrm/civicrm-core/pull/17885), and
+  [17891](https://github.com/civicrm/civicrm-core/pull/17891))**
 
-- **Fix repeattransaction api to use custom data from the template contribution
-  ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
+  The event cart features have been moved to a separate extension that is
+  shipped with core.
 
-  The Contribution.repeattransaction API will now copy custom data from the
-  template rather than the earliest related contribution.
+### CiviMember
 
-### CiviEvent
+- **Option to update expired memberships as part of the job.process_membership
+  ([dev/membership#18](https://lab.civicrm.org/dev/membership/-/issues/18):
+  [16298](https://github.com/civicrm/civicrm-core/pull/16298))**
 
-- **Can't meaningfully disable self-service transfer/cancellation once enabled
-  ([dev/event#35](https://lab.civicrm.org/dev/event/-/issues/35):
-  [18040](https://github.com/civicrm/civicrm-core/pull/18040))**
+  Improves the Job.process_membership API/Scheduled job by adding some new
+  parameters, specifically:
 
-- **Event registration form has inconsistent labeling
-  ([dev/event#38](https://lab.civicrm.org/dev/event/-/issues/38):
-  [17695](https://github.com/civicrm/civicrm-core/pull/17695))**
+    - exclude_test_memberships: Exclude test memberships from calculations
+      (default = TRUE)
+    - only_active_membership_types: Exclude disabled membership types from
+      calculations (default = TRUE)
+    - exclude_membership_status_ids: Default: Exclude Pending, Cancelled,
+      Expired.
 
-- **Event cart hidden/enabled in buildkit 5.29 RC
-  ([dev/event#40](https://lab.civicrm.org/dev/event/-/issues/40):
-  [18101](https://github.com/civicrm/civicrm-core/pull/18101))**
+  Deceased will always be excluded
 
-  Ensures that the Event Cart functionality defaults to off.
+-  **Add auto-renew status to membership detail report
+  ([17683](https://github.com/civicrm/civicrm-core/pull/17683) and
+  [17911](https://github.com/civicrm/civicrm-core/pull/17911))**
 
-### CiviMail
+  The membership detail report can now display and filter on the auto-renew
+  status of each membership.
 
-- **Remove url-tracking in mass SMS
-  ([dev/core#1843](https://lab.civicrm.org/dev/core/-/issues/1843):
-  [17700](https://github.com/civicrm/civicrm-core/pull/17700))**
+### Backdrop Integration
 
-  Rewritten URLs were confusing and made SMS messages unnecessarily long.  There
-  also have never been SMS tracking reports to use them anyway.
+- **Support for installing CiviCRM-Backdrop via "setup" UI
+  ([17749](https://github.com/civicrm/civicrm-core/pull/17749) and
+  [121](https://github.com/civicrm/civicrm-backdrop/pull/121))**
 
-- **Test mailings create new contacts even when "Add Contacts" permission is not
-  present. ([dev/mail#70](https://lab.civicrm.org/dev/mail/-/issues/70):
-  [17867](https://github.com/civicrm/civicrm-core/pull/17867))**
+  Improves the installation and Setup process for Backdrop integration's so that
+  one enables the CiviCRM module like any other module and then is directed to
+  the setup screen to complete installation as opposed to having to navigate to
+  a specific link.
 
-  Ensures contacts are not created when a user without permissions to create
-  contacts sends a test email.
+### Drupal Integration
 
-- **Mailing Subscription form does not validate reCaptcha
-  ([dev/core#1755](https://lab.civicrm.org/dev/core/-/issues/1755):
-  [17305](https://github.com/civicrm/civicrm-core/pull/17305))**
+- **Upgrading a site that still has "mysql" in the dsn string breaks in latest
+  master ([dev/core#1937](https://lab.civicrm.org/dev/core/-/issues/1937):
+  [18174](https://github.com/civicrm/civicrm-core/pull/18174))**
 
-- **Text version of unsubscribed email is missing the link to resubscribe
-  ([dev/core#1919](https://lab.civicrm.org/dev/core/-/issues/1919):
-  [18015](https://github.com/civicrm/civicrm-core/pull/18015))**
+  This adds an upgrade message for 5.29.0 warning that Composer patching will
+  need to be enabled before upgrading to 5.30.0 or higher.
 
-- **Add CiviMail synchronisation frequency setting
-  (in support of [dev/core#1768](https://lab.civicrm.org/dev/core/-/issues/1768):
-  [17709](https://github.com/civicrm/civicrm-core/pull/17709))**
+  The "mysql" in the DSN (as opposed to "mysqli") will not be a problem, but the
+  solution for this is in a package patch that appears in 5.30.
 
-  This adds a setting for updating how frequently the database should be updated
-  with the status of emails that have been sent.  Updating the database more
-  frequently can slow the process down, but it reduces the likelihood that a
-  recipient will be re-emailed when recovering from a stalled mailing.
+- **Installation - Support "activate first" w/setup UI
+  ([606](https://github.com/civicrm/civicrm-drupal/pull/606))**
 
-- **Make new email open and url routes 'public'
-  ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
+  The new setup user interface for Backdrop and WordPress installations is now
+  available for Drupal 7.
 
-  This denotes the paths for open and URL tracking as "public" pages as they are
-  meant to be used by unauthenticated email clients and recipients.
+### WordPress Integration
 
-### CiviMember
+- **Add system check to ensure WP base page exists
+  ([17698](https://github.com/civicrm/civicrm-core/pull/17698))**
 
-- **Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing
-  a membership ([dev/core#1113](https://lab.civicrm.org/dev/core/-/issues/1113):
-  [16429](https://github.com/civicrm/civicrm-core/pull/16429))**
+  A new system check will display a message if the base page, as set in CiviCRM,
+  doesn't match an existing page in WordPress.  No message will display if
+  WordPress multisite is enabled.
 
-- **Offline Membership Renewal Tax Calculation is incorrect [regression]
-  ([dev/core#1972](https://lab.civicrm.org/dev/core/-/issues/1972):
-  [18271](https://github.com/civicrm/civicrm-core/pull/18271))**
+## <a name="bugs"></a>Bugs resolved
 
 ### Core CiviCRM
 
@@ -706,6 +467,245 @@ Released September 2, 2020
 - **Fix JQuery Validation for radios
   ([17937](https://github.com/civicrm/civicrm-core/pull/17937))**
 
+### CiviCase
+
+- **Fix case activity field set to allow long details to be exported
+  ([17970](https://github.com/civicrm/civicrm-core/pull/17970))**
+
+- **Case export has two fields that are not what they say they are
+  ([dev/core#1916](https://lab.civicrm.org/dev/core/-/issues/1916):
+  [18043](https://github.com/civicrm/civicrm-core/pull/18043))**
+
+- **Collapsed custom field set for activities with a required radio makes case
+  activity buttons seem disabled
+  ([dev/core#1928](https://lab.civicrm.org/dev/core/-/issues/1928):
+  [18080](https://github.com/civicrm/civicrm-core/pull/18080))**
+
+- **CRM_Utils_Check_Component_Case - Guard against post-upgrade crash
+  ([17944](https://github.com/civicrm/civicrm-core/pull/17944))**
+
+### CiviContribute
+
+- **Define the logic that sets (or not) contribution receive_date in relation to
+  payments
+  ([dev/financial#139](https://lab.civicrm.org/dev/financial/-/issues/139):
+  [17777](https://github.com/civicrm/civicrm-core/pull/17777) and
+  [18000](https://github.com/civicrm/civicrm-core/pull/18000))**
+
+  This undoes a regression where the contribution date of a pay-later
+  contribution would change when a payment completes the contribution.  The
+  contribution date is the accrual date and is distinct from the date the
+  contribution is entered and the date when all payments have been received.
+
+  In the process, this changes the "Update pending contribution status" search
+  action to be "Record payments for contributions".  The result is generally the
+  same, but the status change comes about because the payments complete the
+  contributions.  You can modify contribution statuses in bulk with a profile by
+  using the "Update multiple contributions" action.
+
+- **Disable frequency/interval fields if not required. Mark required if they are
+  so they are validated before submit
+  ([17526](https://github.com/civicrm/civicrm-core/pull/17526))**
+
+  The frequency and interval fields for recurring contributions now use jQuery
+  validation to disable or require them as appropriate.
+
+- **Paypal IPN sometimes fails to update the next scheduled payment date when
+  recording the latest recurring payment
+  ([dev/core#1679](https://lab.civicrm.org/dev/core/-/issues/1679):
+  [17744](https://github.com/civicrm/civicrm-core/pull/17744))**
+
+- **Contribution Details Statistics are multiplied under many circumstances
+  ([dev/report#21](https://lab.civicrm.org/dev/report/-/issues/21):
+  [15435](https://github.com/civicrm/civicrm-core/pull/15435) and
+  [17809](https://github.com/civicrm/civicrm-core/pull/17809))**
+
+- **Contribution Summary Report: The "general total" row does not take the
+  currency filtered
+  ([dev/report#27](https://lab.civicrm.org/dev/report/-/issues/27):
+  [16736](https://github.com/civicrm/civicrm-core/pull/16736))**
+
+  When the contribution summary report is used by filtering for a currency other
+  than the site's default currency, the "grand total" row shows the sign of the
+  default currency instead of the filtered currency.
+
+- **Fix PaypalIPN single function to not receive-by-reference
+  ([18044](https://github.com/civicrm/civicrm-core/pull/18044))**
+
+- **Allow Failed -> Completed status for contributions
+  ([dev/core#1906](https://lab.civicrm.org/dev/core/-/issues/1906):
+  [17943](https://github.com/civicrm/civicrm-core/pull/17943))**
+
+- **Fix currency symbol for Total Amount on contribution page
+  ([17703](https://github.com/civicrm/civicrm-core/pull/17703))**
+
+  This resolves a but where the total amount would show the default system
+  currency symbol regardless of the currency configured on the contribution
+  page.
+
+- **On behalf label / Honoree Title / Honoree Description not translatable on
+  contribution page
+  ([dev/core#1280](https://lab.civicrm.org/dev/core/-/issues/1280):
+  [16838](https://github.com/civicrm/civicrm-core/pull/16838))**
+
+- **Load contribution page if live payment processor is disabled but test is
+  available ([17828](https://github.com/civicrm/civicrm-core/pull/17828))**
+
+- **Remove requirement to pass 'contribution_status_id' => Pending from
+  order.create ([18018](https://github.com/civicrm/civicrm-core/pull/18018))**
+
+- **Use saved contribution's line items rather than the primaryContributionID
+  ([18033](https://github.com/civicrm/civicrm-core/pull/18033))**
+
+- **Do not overwrite values saved from the repeatContribution routine
+  ([17972](https://github.com/civicrm/civicrm-core/pull/17972))**
+
+- **"Contribution Source" profile field has no effect on new contribution
+  ([dev/core#1902](https://lab.civicrm.org/dev/core/-/issues/1902):
+  [17930](https://github.com/civicrm/civicrm-core/pull/17930))**
+
+- **Incorrect check for "soft_credit" after making pcp donation
+  ([dev/core#1915](https://lab.civicrm.org/dev/core/-/issues/1915):
+  [18002](https://github.com/civicrm/civicrm-core/pull/18002))**
+
+- **Total Tax Amount on the Contribution (generated in backoffice/offline) no
+  longer adds up to sum of the Tax Amount for the individual line items
+  ([dev/core#1983](https://lab.civicrm.org/dev/core/-/issues/1983):
+  [18290](https://github.com/civicrm/civicrm-core/pull/18290))**
+
+- **Downloaded Invoice activity attaches non wkhtmltopdf invoice
+  ([dev/core#1922](https://lab.civicrm.org/dev/core/-/issues/1922):
+  [18056](https://github.com/civicrm/civicrm-core/pull/18056))**
+
+  Downloading an invoice would ignore whether wkhtmltopdf was configured and
+  always use dompdf.
+
+- **Fix repeattransaction api to use custom data from the template contribution
+  ([17975](https://github.com/civicrm/civicrm-core/pull/17975))**
+
+  The Contribution.repeattransaction API will now copy custom data from the
+  template rather than the earliest related contribution.
+
+### CiviEvent
+
+- **Can't meaningfully disable self-service transfer/cancellation once enabled
+  ([dev/event#35](https://lab.civicrm.org/dev/event/-/issues/35):
+  [18040](https://github.com/civicrm/civicrm-core/pull/18040))**
+
+- **Event registration form has inconsistent labeling
+  ([dev/event#38](https://lab.civicrm.org/dev/event/-/issues/38):
+  [17695](https://github.com/civicrm/civicrm-core/pull/17695))**
+
+- **Event cart hidden/enabled in buildkit 5.29 RC
+  ([dev/event#40](https://lab.civicrm.org/dev/event/-/issues/40):
+  [18101](https://github.com/civicrm/civicrm-core/pull/18101))**
+
+  Ensures that the Event Cart functionality defaults to off.
+
+### CiviMail
+
+- **Remove url-tracking in mass SMS
+  ([dev/core#1843](https://lab.civicrm.org/dev/core/-/issues/1843):
+  [17700](https://github.com/civicrm/civicrm-core/pull/17700))**
+
+  Rewritten URLs were confusing and made SMS messages unnecessarily long.  There
+  also have never been SMS tracking reports to use them anyway.
+
+- **Test mailings create new contacts even when "Add Contacts" permission is not
+  present. ([dev/mail#70](https://lab.civicrm.org/dev/mail/-/issues/70):
+  [17867](https://github.com/civicrm/civicrm-core/pull/17867))**
+
+  Ensures contacts are not created when a user without permissions to create
+  contacts sends a test email.
+
+- **Mailing Subscription form does not validate reCaptcha
+  ([dev/core#1755](https://lab.civicrm.org/dev/core/-/issues/1755):
+  [17305](https://github.com/civicrm/civicrm-core/pull/17305))**
+
+- **Text version of unsubscribed email is missing the link to resubscribe
+  ([dev/core#1919](https://lab.civicrm.org/dev/core/-/issues/1919):
+  [18015](https://github.com/civicrm/civicrm-core/pull/18015))**
+
+- **Add CiviMail synchronisation frequency setting
+  (in support of [dev/core#1768](https://lab.civicrm.org/dev/core/-/issues/1768):
+  [17709](https://github.com/civicrm/civicrm-core/pull/17709))**
+
+  This adds a setting for updating how frequently the database should be updated
+  with the status of emails that have been sent.  Updating the database more
+  frequently can slow the process down, but it reduces the likelihood that a
+  recipient will be re-emailed when recovering from a stalled mailing.
+
+- **Make new email open and url routes 'public'
+  ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
+
+  This denotes the paths for open and URL tracking as "public" pages as they are
+  meant to be used by unauthenticated email clients and recipients.
+
+### CiviMember
+
+- **Decimal Separator - Invalid value "total_amount" (NaN,N) creating or editing
+  a membership ([dev/core#1113](https://lab.civicrm.org/dev/core/-/issues/1113):
+  [16429](https://github.com/civicrm/civicrm-core/pull/16429))**
+
+- **Offline Membership Renewal Tax Calculation is incorrect [regression]
+  ([dev/core#1972](https://lab.civicrm.org/dev/core/-/issues/1972):
+  [18271](https://github.com/civicrm/civicrm-core/pull/18271))**
+
+### Drupal Integration
+
+- **Drupal 8 - Using Create User Record action on a contact with no email is too
+  quiet. Also CRM_Core_Session::setStatus is sometimes ignored.
+  ([dev/drupal#127](https://lab.civicrm.org/dev/drupal/-/issues/127):
+  [17914](https://github.com/civicrm/civicrm-core/pull/17914) and
+  [17915](https://github.com/civicrm/civicrm-core/pull/17915))**
+
+  Require email when adding a user and ensure that errors show.
+
+- **The following PHP variables are not set: $_SERVER[HTTP_HOST]
+  ([dev/core#750](https://lab.civicrm.org/dev/core/-/issues/750):
+  [17636](https://github.com/civicrm/civicrm-core/pull/17636))**
+
+  Skip the server variable checks if running in a CLI environment, removing an
+  error when running Drush commands against Drupal 8 and Drupal 9 based sites.
+
+- **Can't find recaptcha in Drupal 8
+  ([dev/core#1871](https://lab.civicrm.org/dev/core/-/issues/1871):
+  [17822](https://github.com/civicrm/civicrm-core/pull/17822))**
+
+- **Fixed for multi-select filter
+  ([615](https://github.com/civicrm/civicrm-drupal/pull/615))**
+
+  This fixes filters for multi-select fields in Views.
+
+- **fix url for file field
+  ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
+
+  This fixes the generated URL for file fields in Views.
+
+### Wordpress Integration
+
+- **[civicrm.files] token doesn't work in some cases since 5.27
+  ([dev/wordpress#66](https://lab.civicrm.org/dev/wordpress/-/issues/66):
+  [18068](https://github.com/civicrm/civicrm-core/pull/18068))**
+
+  Ensures the [civicrm.files] token plays nice for sites with older wordpress
+  file directory set ups.
+
+- **CiviCRM and the WordPress Pods plugin (since version 2.7.13) is incompatible
+  due to Pods including marionette v3.3.1 for backbone, newer than CiviCRM's
+  bundled marionette v1.0.3
+  ([dev/core#1090](https://lab.civicrm.org/dev/core/-/issues/1090):
+  [17855](https://github.com/civicrm/civicrm-core/pull/17855))**
+
+  Ensures CiviCRM plays nicely with recent versions of Elementor Plugin.
+
+- **Fix PHP notice on wordpress permissions form
+  ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
+
+- **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin
+  ([dev/wordpress#67](https://lab.civicrm.org/dev/wordpress/-/issues/67):
+  [214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
+
 ## <a name="misc"></a>Miscellany
 
 - **APIv4 - Add BasicEntity helper class

From c48faf40e3e00c0d6c6e3ccc43ff9fa7e2241998 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 3 Sep 2020 10:06:24 +1200
Subject: [PATCH 085/834] Remove deprecated handling for partial_amount_to_pay

We added deprecation notices back in Feb when we stopped using these params in core. They were never truly
supported for extensions but we deprecated in case someone was doing something odd. However, it's
7 months on so time to cleanup
---
 CRM/Contribute/BAO/Contribution.php | 69 -----------------------------
 1 file changed, 69 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index bc56e48995f8..2c3a56d7e938 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -149,18 +149,6 @@ public static function add(&$params, $ids = []) {
     }
 
     $setPrevContribution = TRUE;
-    // CRM-13964 partial payment
-    if (!empty($params['partial_payment_total']) && !empty($params['partial_amount_to_pay'])) {
-      CRM_Core_Error::deprecatedFunctionWarning('partial_amount params are deprecated from Contribution.create - use Payment.create');
-      $partialAmtTotal = $params['partial_payment_total'];
-      $partialAmtPay = $params['partial_amount_to_pay'];
-      $params['total_amount'] = $partialAmtTotal;
-      if ($partialAmtPay < $partialAmtTotal) {
-        $params['contribution_status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Partially paid');
-        $params['is_pay_later'] = 0;
-        $setPrevContribution = FALSE;
-      }
-    }
     if ($contributionID && $setPrevContribution) {
       $params['prevContribution'] = self::getOriginalContribution($contributionID);
     }
@@ -3569,47 +3557,6 @@ public static function recordFinancialAccounts(&$params, $financialTrxnValues =
     }
 
     $statusId = $params['contribution']->contribution_status_id;
-    // CRM-13964 partial payment
-    if ($contributionStatus == 'Partially paid'
-      && !empty($params['partial_payment_total']) && !empty($params['partial_amount_to_pay'])
-    ) {
-      CRM_Core_Error::deprecatedFunctionWarning('partial_amount params are deprecated from Contribution.create - use Payment.create');
-      $partialAmtPay = CRM_Utils_Rule::cleanMoney($params['partial_amount_to_pay']);
-      $partialAmtTotal = CRM_Utils_Rule::cleanMoney($params['partial_payment_total']);
-
-      $fromFinancialAccountId = CRM_Financial_BAO_FinancialAccount::getFinancialAccountForFinancialTypeByRelationship($params['financial_type_id'], 'Accounts Receivable Account is');
-      $statusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
-      $params['total_amount'] = $partialAmtPay;
-
-      $balanceTrxnInfo = CRM_Core_BAO_FinancialTrxn::getBalanceTrxnAmt($params['contribution']->id, $params['financial_type_id']);
-      if (empty($balanceTrxnInfo['trxn_id'])) {
-        // create new balance transaction record
-        $toFinancialAccount = CRM_Financial_BAO_FinancialAccount::getFinancialAccountForFinancialTypeByRelationship($params['financial_type_id'], 'Accounts Receivable Account is');
-
-        $balanceTrxnParams['total_amount'] = $partialAmtTotal;
-        $balanceTrxnParams['to_financial_account_id'] = $toFinancialAccount;
-        $balanceTrxnParams['contribution_id'] = $params['contribution']->id;
-        $balanceTrxnParams['trxn_date'] = !empty($params['contribution']->receive_date) ? $params['contribution']->receive_date : date('YmdHis');
-        $balanceTrxnParams['fee_amount'] = $params['fee_amount'] ?? NULL;
-        $balanceTrxnParams['net_amount'] = $params['net_amount'] ?? NULL;
-        $balanceTrxnParams['currency'] = $params['contribution']->currency;
-        $balanceTrxnParams['trxn_id'] = $params['contribution']->trxn_id;
-        $balanceTrxnParams['status_id'] = $statusId;
-        $balanceTrxnParams['payment_instrument_id'] = $params['contribution']->payment_instrument_id;
-        $balanceTrxnParams['check_number'] = $params['check_number'] ?? NULL;
-        $balanceTrxnParams['pan_truncation'] = $params['pan_truncation'] ?? NULL;
-        $balanceTrxnParams['card_type_id'] = $params['card_type_id'] ?? NULL;
-        if (!empty($balanceTrxnParams['from_financial_account_id']) &&
-          ($statusId == array_search('Completed', $contributionStatuses) || $statusId == array_search('Partially paid', $contributionStatuses))
-        ) {
-          $balanceTrxnParams['is_payment'] = 1;
-        }
-        if (!empty($params['payment_processor'])) {
-          $balanceTrxnParams['payment_processor_id'] = $params['payment_processor'];
-        }
-        $financialTxn = CRM_Core_BAO_FinancialTrxn::create($balanceTrxnParams);
-      }
-    }
 
     // build line item array if its not set in $params
     if (empty($params['line_item']) || $additionalParticipantId) {
@@ -4392,22 +4339,6 @@ public static function updateRelatedPledge(
     }
   }
 
-  /**
-   * Compute the stats values
-   *
-   * @param string $stat either 'mode' or 'median'
-   * @param string $sql
-   * @param string $alias of civicrm_contribution
-   *
-   * @return array|null
-   * @deprecated
-   *
-   */
-  public static function computeStats($stat, $sql, $alias = NULL) {
-    CRM_Core_Error::deprecatedFunctionWarning('computeStats is now deprecated');
-    return [];
-  }
-
   /**
    * Is there only one line item attached to the contribution.
    *

From fee6edcef7dd9f4f18bcc13f3beade740b1794e9 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Thu, 3 Sep 2020 00:19:19 +0100
Subject: [PATCH 086/834] Do not block user incase 'Require approval' is
 checked

---
 CRM/Utils/System/Drupal8.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
index 78479501e3ab..feb6dc58e5a7 100644
--- a/CRM/Utils/System/Drupal8.php
+++ b/CRM/Utils/System/Drupal8.php
@@ -49,7 +49,7 @@ public function createUser(&$params, $mail) {
     if ($user_register_conf != 'visitors' && !$user->hasPermission('administer users')) {
       $account->block();
     }
-    elseif (!$verify_mail_conf) {
+    elseif ($verify_mail_conf) {
       $account->activate();
     }
 
@@ -98,7 +98,7 @@ public function createUser(&$params, $mail) {
     }
 
     // If this is a user creating their own account, login them in!
-    if ($account->isActive() && $user->isAnonymous()) {
+    if (!$verify_mail_conf && $account->isActive() && $user->isAnonymous()) {
       \user_login_finalize($account);
     }
 

From 11eed11026ff92154af770dc3743d0ad617a244e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 2 Sep 2020 16:34:27 -0700
Subject: [PATCH 087/834] dev/wordpress#73 - Be more forgiving about slash in
 wpBasePage

Overview
--------

The correct functioning of `wpBasePage` depends on whether the administrator
omitted or added a trailing slash.  This is apparent on URLs with a trailing slash, eg

```
http://wpmaster.bknix:8001/civicrm/contribute/transact/?reset=1&id=1
```

Make it less sensitive.

Before
------

URL is OK with default setting `wpBasePage=civicrm`

URL fails with setting `wpBasePage=civicrm/`

After
-----

URL is OK with either setting `wpBasePage=civicrm` or `wpBasePage=civicrm/`

Technical Details
-----------------

I believe the old symptom arose because of the formula which produces the WP
rewrite rules (`'^' .  $config->wpBasePage .  '/([^?]*)?'`) expects that
there is no trailing slash. You could theoretically patch there, but this
seems like it'll provide more thorough normalization.

When testing, the results affect the WP rewrite rules, so you may need to be particularly
aggressive about clearing caches whenever you make a change in code or settings, eg

```
wp cache flush ; cv flush;  wp rewrite flush
```
---
 CRM/Core/Config/MagicMerge.php | 2 +-
 CRM/Utils/System/WordPress.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
index 88110b643209..6050c22a2dac 100644
--- a/CRM/Core/Config/MagicMerge.php
+++ b/CRM/Core/Config/MagicMerge.php
@@ -170,7 +170,6 @@ public static function getPropertyMap() {
       'userFrameworkUsersTableName' => ['setting'],
       'verpSeparator' => ['setting'],
       'wkhtmltopdfPath' => ['setting'],
-      'wpBasePage' => ['setting'],
       'wpLoadPhp' => ['setting'],
 
       // "path" properties are managed via Civi::paths and $civicrm_paths
@@ -204,6 +203,7 @@ public static function getPropertyMap() {
       // @todo remove geocodeMethod. As of Feb 2018, $config->geocodeMethod works but gives a deprecation warning.
       'geocodeMethod' => ['callback', 'CRM_Utils_Geocode', 'getProviderClass'],
       'defaultCurrencySymbol' => ['callback', 'CRM_Core_BAO_Country', 'getDefaultCurrencySymbol'],
+      'wpBasePage' => ['callback', 'CRM_Utils_System_WordPress', 'getBasePage'],
     ];
   }
 
diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index 4e86eb89bf9f..61f499bd4bd6 100644
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -20,6 +20,13 @@
  */
 class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
 
+  /**
+   * Get a normalized version of the wpBasePage.
+   */
+  public static function getBasePage() {
+    return rtrim(Civi::settings()->get('wpBasePage'), '/');
+  }
+
   /**
    */
   public function __construct() {

From e4ee9e7bf80ff79bf25012b08f38d7e9c24fc4be Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 2 Sep 2020 18:20:30 -0700
Subject: [PATCH 088/834] 5.29.0.md - Last minute addition

---
 release-notes/5.29.0.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index bae0454eb091..a444e0e9593d 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -706,6 +706,9 @@ Released September 2, 2020
   ([dev/wordpress#67](https://lab.civicrm.org/dev/wordpress/-/issues/67):
   [214](https://github.com/civicrm/civicrm-wordpress/pull/214))**
 
+- **Be more forgiving about slash in wpBasePage ([dev/wordpress#73](https://lab.civicrm.org/dev/wordpress/issues/73):
+  [18332](https://github.com/civicrm/civicrm-core/pull/18332))**
+
 ## <a name="misc"></a>Miscellany
 
 - **APIv4 - Add BasicEntity helper class

From afea69496355e068aa0355b8c178a801e58faec3 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 2 Sep 2020 18:25:10 -0700
Subject: [PATCH 089/834] 5.29.0.md - Small copy-edits

---
 release-notes/5.29.0.md | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/release-notes/5.29.0.md b/release-notes/5.29.0.md
index a444e0e9593d..5548efbe9797 100644
--- a/release-notes/5.29.0.md
+++ b/release-notes/5.29.0.md
@@ -251,13 +251,13 @@ Released September 2, 2020
   Duplicate matching now ignores location type for postal address fields, now
   consistent with how it has ignored phone and email location types.
 
-- **Installing drupal 8 using civicrm-setup leads to "incorrect resource url"
+- **Installing Drupal 8 using civicrm-setup leads to "incorrect resource url"
   system status check errors
   ([dev/drupal#114](https://lab.civicrm.org/dev/drupal/-/issues/114) and
   [dev/core#1647](https://lab.civicrm.org/dev/core/-/issues/1647):
   [17754](https://github.com/civicrm/civicrm-core/pull/17754))**
 
-  Removes the resource url status check.
+  Removes the resource URL status check.
 
 - **API4: 500 error on chain with custom field
   ([dev/core#1578](https://lab.civicrm.org/dev/core/-/issues/1578):
@@ -346,7 +346,7 @@ Released September 2, 2020
   since (in Drupal 8 and potentially elsewhere) they may not be within the
   CiviCRM root folder.
 
-- **custom data insert/update error if using reserved words
+- **Custom data insert/update error if using reserved words
   ([dev/core#1880](https://lab.civicrm.org/dev/core/-/issues/1880):
   [17848](https://github.com/civicrm/civicrm-core/pull/17848))**
 
@@ -394,7 +394,7 @@ Released September 2, 2020
 - **Simplify caching of status checks
   ([17817](https://github.com/civicrm/civicrm-core/pull/17817))**
 
-- **ensure custom field checkboxes are populated in profiles
+- **Ensure custom field checkboxes are populated in profiles
   ([17977](https://github.com/civicrm/civicrm-core/pull/17977))**
 
 - **Upgrade PEAR/mail_mime package to be compliant with PHP7.4 and deploy it
@@ -604,7 +604,7 @@ Released September 2, 2020
 
 ### CiviMail
 
-- **Remove url-tracking in mass SMS
+- **Remove URL-tracking in mass SMS
   ([dev/core#1843](https://lab.civicrm.org/dev/core/-/issues/1843):
   [17700](https://github.com/civicrm/civicrm-core/pull/17700))**
 
@@ -618,7 +618,7 @@ Released September 2, 2020
   Ensures contacts are not created when a user without permissions to create
   contacts sends a test email.
 
-- **Mailing Subscription form does not validate reCaptcha
+- **Mailing Subscription form does not validate reCAPTCHA
   ([dev/core#1755](https://lab.civicrm.org/dev/core/-/issues/1755):
   [17305](https://github.com/civicrm/civicrm-core/pull/17305))**
 
@@ -635,7 +635,7 @@ Released September 2, 2020
   frequently can slow the process down, but it reduces the likelihood that a
   recipient will be re-emailed when recovering from a stalled mailing.
 
-- **Make new email open and url routes 'public'
+- **Mark the new routes for "open.php" and "url.php" as public
   ([17813](https://github.com/civicrm/civicrm-core/pull/17813))**
 
   This denotes the paths for open and URL tracking as "public" pages as they are
@@ -668,7 +668,7 @@ Released September 2, 2020
   Skip the server variable checks if running in a CLI environment, removing an
   error when running Drush commands against Drupal 8 and Drupal 9 based sites.
 
-- **Can't find recaptcha in Drupal 8
+- **Can't find reCAPTCHA in Drupal 8
   ([dev/core#1871](https://lab.civicrm.org/dev/core/-/issues/1871):
   [17822](https://github.com/civicrm/civicrm-core/pull/17822))**
 
@@ -677,7 +677,7 @@ Released September 2, 2020
 
   This fixes filters for multi-select fields in Views.
 
-- **fix url for file field
+- **Fix URL for file field
   ([608](https://github.com/civicrm/civicrm-drupal/pull/608))**
 
   This fixes the generated URL for file fields in Views.
@@ -688,7 +688,7 @@ Released September 2, 2020
   ([dev/wordpress#66](https://lab.civicrm.org/dev/wordpress/-/issues/66):
   [18068](https://github.com/civicrm/civicrm-core/pull/18068))**
 
-  Ensures the [civicrm.files] token plays nice for sites with older wordpress
+  Ensures the [civicrm.files] token plays nice for sites with older WordPress
   file directory set ups.
 
 - **CiviCRM and the WordPress Pods plugin (since version 2.7.13) is incompatible
@@ -699,7 +699,7 @@ Released September 2, 2020
 
   Ensures CiviCRM plays nicely with recent versions of Elementor Plugin.
 
-- **Fix PHP notice on wordpress permissions form
+- **Fix PHP notice on WordPress permissions form
   ([17758](https://github.com/civicrm/civicrm-core/pull/17758))**
 
 - **Slow down the frequency of WordPress "heartbeat" calls in CiviCRM admin
@@ -837,16 +837,16 @@ Released September 2, 2020
 - **[REF] - Add helper function for the repetitive task of fetching multilingual
   ([17650](https://github.com/civicrm/civicrm-core/pull/17650))**
 
-- **[Ref] Unit test attempt to create reported bugs , minor cleanup
+- **[REF] Unit test attempt to create reported bugs , minor cleanup
   ([17560](https://github.com/civicrm/civicrm-core/pull/17560))**
 
-- **REF Extract addToRecentItems from membership create
+- **[REF] Extract addToRecentItems from membership create
   ([17524](https://github.com/civicrm/civicrm-core/pull/17524))**
 
 - **[REF] Fix a couple of jQuery errors that have cropped up
   ([17871](https://github.com/civicrm/civicrm-core/pull/17871))**
 
-- **(REF) regen.sh - Remove unusual handling of `zipcodes.mysql`
+- **[REF] regen.sh - Remove unusual handling of `zipcodes.mysql`
   ([17869](https://github.com/civicrm/civicrm-core/pull/17869))**
 
 - **[REF] ScheduledJob cleanup, remove unused var
@@ -858,10 +858,10 @@ Released September 2, 2020
 - **[REF] Only printOnly once
   ([17850](https://github.com/civicrm/civicrm-core/pull/17850))**
 
-- **(REF) APIv4 ConformanceTest - Split apart into per-entity sub-tests
+- **[REF] APIv4 ConformanceTest - Split apart into per-entity sub-tests
   ([17845](https://github.com/civicrm/civicrm-core/pull/17845))**
 
-- **(REF) WebsiteTest - Mitigate flaky failures
+- **[REF] WebsiteTest - Mitigate flaky failures
   ([17833](https://github.com/civicrm/civicrm-core/pull/17833))**
 
 - **[REF] Follow up cleanup
@@ -876,19 +876,19 @@ Released September 2, 2020
 - **[REF] Unused interface CRM_Report_Interface
   ([17767](https://github.com/civicrm/civicrm-core/pull/17767))**
 
-- **REF - Cleanup StatusPreference BAO to be more standard
+- **[REF] - Cleanup StatusPreference BAO to be more standard
   ([17801](https://github.com/civicrm/civicrm-core/pull/17801))**
 
 - **[REF] Reduce interaction between dedupe code and createProfileContact
   ([17920](https://github.com/civicrm/civicrm-core/pull/17920))**
 
-- **[Ref] Simplify field reference
+- **[REF] Simplify field reference
   ([17941](https://github.com/civicrm/civicrm-core/pull/17941))**
 
 - **[REF] [Test] Minor simplification on test
   ([18019](https://github.com/civicrm/civicrm-core/pull/18019))**
 
-- **[Ref] Simplify is_email_receipt in sendMail
+- **[REF] Simplify is_email_receipt in sendMail
   ([18029](https://github.com/civicrm/civicrm-core/pull/18029))**
 
 - **[REF] Remove transaction from BaseIPN completeTransaction call
@@ -903,7 +903,7 @@ Released September 2, 2020
 - **[REF] Remove transaction from completeOrder signature
   ([18046](https://github.com/civicrm/civicrm-core/pull/18046))**
 
-- **[Ref] Remove transaction instantiation in PaypalPro
+- **[REF] Remove transaction instantiation in PaypalPro
   ([18026](https://github.com/civicrm/civicrm-core/pull/18026))**
 
 - **[REF] Stop instantiating transaction in PaypalIPN
@@ -915,7 +915,7 @@ Released September 2, 2020
 - **[REF] Tighten up function signature for dedupePair
   ([17923](https://github.com/civicrm/civicrm-core/pull/17923))**
 
-- **[Ref] Move noisily deprecate  BaseIPN->sendMail, call api from it rather
+- **[REF] Move noisily deprecate  BaseIPN->sendMail, call api from it rather
   than BAO function
   ([17982](https://github.com/civicrm/civicrm-core/pull/17982))**
 
@@ -993,7 +993,7 @@ Released September 2, 2020
 - **[NFC] Fix provider unit test on PHP7.4
   ([18073](https://github.com/civicrm/civicrm-core/pull/18073))**
 
-- **NFC - Docblock cleanup
+- **[NFC] Docblock cleanup
   ([610](https://github.com/civicrm/civicrm-drupal/pull/610))**
 
 - **[NFC] Update versions file to remove reference to Mail_mime and Mail
@@ -1012,7 +1012,7 @@ Released September 2, 2020
 - **[NFC] Improve docs for APIv4 Save action
   ([18004](https://github.com/civicrm/civicrm-core/pull/18004))**
 
-- **NFC - Docblock cleanup
+- **[NFC] Docblock cleanup
   ([17945](https://github.com/civicrm/civicrm-core/pull/17945))**
 
 - **[NFC] Update a few doc/wiki links in code comments
@@ -1024,7 +1024,7 @@ Released September 2, 2020
 - **[Test] Update hook signature in test
   ([609](https://github.com/civicrm/civicrm-drupal/pull/609))**
 
-- **Test - attempt to replicate #17852
+- **[Test] Attempt to replicate #17852
   ([18038](https://github.com/civicrm/civicrm-core/pull/18038))**
 
 - **[Test fix] We might need this to ensure really quick test runs don't fail
@@ -1056,7 +1056,7 @@ Released September 2, 2020
 - **[Test Framework] - Tests for report downloads
   ([17892](https://github.com/civicrm/civicrm-core/pull/17892))**
 
-- **api_v3_TaxContributionPageTest fix - remove hard coded processor id
+- **api_v3_TaxContributionPageTest - Remove hard coded processor id
   ([17860](https://github.com/civicrm/civicrm-core/pull/17860))**
 
 - **API tests - label versions in dataprovider versionThreeAndFour

From 39edd3c66783f6fa1b33674f79877037f6a9d35f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 3 Sep 2020 16:18:36 +1200
Subject: [PATCH 090/834] Remove pass-by-ref in PaypalProIPN::single

This is called from 2 places. Neither use the values again & neither receive any pass-by-reference values
themselves
---
 CRM/Core/Payment/PayPalProIPN.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index e5c58d3de7ec..024d845b427a 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -321,7 +321,7 @@ public function recur($input, $ids, $objects, $first) {
    *
    * @return void
    */
-  public function single(&$input, &$ids, &$objects, $recur = FALSE, $first = FALSE) {
+  public function single($input, $ids, $objects, $recur = FALSE, $first = FALSE) {
     $contribution = &$objects['contribution'];
 
     // make sure the invoice is valid and matches what we have in the contribution record

From fbebca7a718b7abe61c559d04a8354b9fd169b04 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 3 Sep 2020 15:40:47 +1200
Subject: [PATCH 091/834] Add ability to enable query logging per process

This allows us to run a command such as

env CIVICRM_DEBUG_LOG_QUERY=1 drush cvapi Contact.get

and the queries for that process (but not others) are logged.

This facilitates a cleaner record of queries as it is just one process and more flexibility
(and less risk of leaving it on by mistake)
---
 CRM/Core/Error.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index ee418c306b8b..98d1a29ded92 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -600,13 +600,15 @@ public static function debug_log_message($message, $out = FALSE, $prefix = '', $
    * @param string $string
    */
   public static function debug_query($string) {
-    if (defined('CIVICRM_DEBUG_LOG_QUERY')) {
-      if (CIVICRM_DEBUG_LOG_QUERY === 'backtrace') {
-        CRM_Core_Error::backtrace($string, TRUE);
-      }
-      elseif (CIVICRM_DEBUG_LOG_QUERY) {
-        CRM_Core_Error::debug_var('Query', $string, TRUE, TRUE, 'sql_log', PEAR_LOG_DEBUG);
-      }
+    if (!defined('CIVICRM_DEBUG_LOG_QUERY')) {
+      // TODO: When its updated to support getenv(), call CRM_Utils_Constant::value('CIVICRM_DEBUG_LOG_QUERY', FALSE)
+      define('CIVICRM_DEBUG_LOG_QUERY', getenv('CIVICRM_DEBUG_LOG_QUERY'));
+    }
+    if (CIVICRM_DEBUG_LOG_QUERY === 'backtrace') {
+      CRM_Core_Error::backtrace($string, TRUE);
+    }
+    elseif (CIVICRM_DEBUG_LOG_QUERY) {
+      CRM_Core_Error::debug_var('Query', $string, TRUE, TRUE, 'sql_log', PEAR_LOG_DEBUG);
     }
   }
 

From a2b357d9094c780ab97d6673ef9e88f24f4c273a Mon Sep 17 00:00:00 2001
From: Justin Freeman <justin@agileware.com.au>
Date: Thu, 3 Sep 2020 18:03:28 +1000
Subject: [PATCH 092/834] CIVICRM-1555 Change wording on the Opt Out and
 Unsubscribe pages

---
 CRM/Mailing/Form/Optout.php      | 6 +++---
 CRM/Mailing/Form/Unsubscribe.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Mailing/Form/Optout.php b/CRM/Mailing/Form/Optout.php
index 8514612e8153..e809d497b76f 100644
--- a/CRM/Mailing/Form/Optout.php
+++ b/CRM/Mailing/Form/Optout.php
@@ -47,7 +47,7 @@ public function preProcess() {
 
   public function buildQuickForm() {
     CRM_Utils_System::addHTMLHead('<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">');
-    CRM_Utils_System::setTitle(ts('Please Confirm Your Opt Out'));
+    CRM_Utils_System::setTitle(ts('Opt Out Confirmation'));
 
     $this->add('text', 'email_confirm', ts('Verify email address to opt out:'));
     $this->addRule('email_confirm', ts('Email address is required to opt out.'), 'required');
@@ -89,7 +89,7 @@ public function postProcess() {
         CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response($queue_id, NULL, TRUE, $job_id);
       }
 
-      $statusMsg = ts('Email: %1 has been successfully opted out',
+      $statusMsg = ts('%1 opt out confirmed.',
         [1 => $values['email_confirm']]
       );
 
@@ -97,7 +97,7 @@ public function postProcess() {
     }
     elseif ($result == FALSE) {
       // Email address not verified
-      $statusMsg = ts('The email address: %1 you have entered does not match the email associated with this opt out request.',
+      $statusMsg = ts('%1 is not associated with this opt out request.',
         [1 => $values['email_confirm']]
       );
 
diff --git a/CRM/Mailing/Form/Unsubscribe.php b/CRM/Mailing/Form/Unsubscribe.php
index 95a675965955..c63263ba0b9e 100644
--- a/CRM/Mailing/Form/Unsubscribe.php
+++ b/CRM/Mailing/Form/Unsubscribe.php
@@ -61,7 +61,7 @@ public function preProcess() {
       }
     }
     if (!$groupExist) {
-      $statusMsg = ts('Email: %1 has been successfully unsubscribed from this Mailing List/Group.',
+      $statusMsg = ts('%1 has been unsubscribed.',
         [1 => $email]
       );
       CRM_Core_Session::setStatus($statusMsg, '', 'error');
@@ -72,7 +72,7 @@ public function preProcess() {
 
   public function buildQuickForm() {
     CRM_Utils_System::addHTMLHead('<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">');
-    CRM_Utils_System::setTitle(ts('Please Confirm Your Unsubscribe from this Mailing/Group'));
+    CRM_Utils_System::setTitle(ts('Unsubscribe Confirmation'));
 
     $this->add('text', 'email_confirm', ts('Verify email address to unsubscribe:'));
     $this->addRule('email_confirm', ts('Email address is required to unsubscribe.'), 'required');
@@ -114,7 +114,7 @@ public function postProcess() {
         CRM_Mailing_Event_BAO_Unsubscribe::send_unsub_response($queue_id, $groups, FALSE, $job_id);
       }
 
-      $statusMsg = ts('Email: %1 has been successfully unsubscribed from this Mailing List/Group.',
+      $statusMsg = ts('%1 is unsubscribed.',
         [1 => $values['email_confirm']]
       );
 
@@ -122,7 +122,7 @@ public function postProcess() {
     }
     elseif ($result == FALSE) {
       // Email address not verified
-      $statusMsg = ts('The email address: %1 you have entered does not match the email associated with this unsubscribe request.',
+      $statusMsg = ts('%1 is not associated with this unsubscribe request.',
         [1 => $values['email_confirm']]
       );
 

From 878715d231d61d7ba1f34a5200990dd512e456ae Mon Sep 17 00:00:00 2001
From: CiviCRM <info@civicrm.org>
Date: Thu, 3 Sep 2020 09:05:29 +0000
Subject: [PATCH 093/834] Set version to 5.30.beta1

---
 CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl | 1 +
 sql/civicrm_generated.mysql                      | 2 +-
 sql/test_data_second_domain.mysql                | 2 +-
 xml/version.xml                                  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl

diff --git a/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
new file mode 100644
index 000000000000..9c22ccacf110
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.30.beta1 during upgrade *}
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index cdb7b1a269d9..4afb6f03fd1e 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.30.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.30.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql
index fd4896bad472..1e5bc3847436 100644
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -963,4 +963,4 @@ INSERT INTO civicrm_navigation
 VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
-UPDATE civicrm_domain SET version = '5.30.alpha1';
+UPDATE civicrm_domain SET version = '5.30.beta1';
diff --git a/xml/version.xml b/xml/version.xml
index 06ebf2f8ad8e..a59a35af874f 100644
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.30.alpha1</version_no>
+  <version_no>5.30.beta1</version_no>
 </version>

From 29ba40ecb43449a853f8250f7cb60cb0b1b87c6b Mon Sep 17 00:00:00 2001
From: CiviCRM <info@civicrm.org>
Date: Thu, 3 Sep 2020 09:13:24 +0000
Subject: [PATCH 094/834] Set version to 5.31.alpha1

---
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php | 72 +++++++++++++++++++
 .../Incremental/sql/5.31.alpha1.mysql.tpl     |  1 +
 sql/civicrm_generated.mysql                   |  2 +-
 sql/test_data_second_domain.mysql             |  2 +-
 xml/version.xml                               |  2 +-
 5 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 CRM/Upgrade/Incremental/php/FiveThirtyOne.php
 create mode 100644 CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl

diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
new file mode 100644
index 000000000000..cbc3760ac2ce
--- /dev/null
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Upgrade logic for FiveThirtyOne */
+class CRM_Upgrade_Incremental_php_FiveThirtyOne extends CRM_Upgrade_Incremental_Base {
+
+  /**
+   * Compute any messages which should be displayed beforeupgrade.
+   *
+   * Note: This function is called iteratively for each upcoming
+   * revision to the database.
+   *
+   * @param string $preUpgradeMessage
+   * @param string $rev
+   *   a version number, e.g. '4.4.alpha1', '4.4.beta3', '4.4.0'.
+   * @param null $currentVer
+   */
+  public function setPreUpgradeMessage(&$preUpgradeMessage, $rev, $currentVer = NULL) {
+    // Example: Generate a pre-upgrade message.
+    // if ($rev == '5.12.34') {
+    //   $preUpgradeMessage .= '<p>' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '</p>';
+    // }
+  }
+
+  /**
+   * Compute any messages which should be displayed after upgrade.
+   *
+   * @param string $postUpgradeMessage
+   *   alterable.
+   * @param string $rev
+   *   an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
+   */
+  public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
+    // Example: Generate a post-upgrade message.
+    // if ($rev == '5.12.34') {
+    //   $postUpgradeMessage .= '<br /><br />' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'.");
+    // }
+  }
+
+  /*
+   * Important! All upgrade functions MUST add a 'runSql' task.
+   * Uncomment and use the following template for a new upgrade version
+   * (change the x in the function name):
+   */
+
+  //  /**
+  //   * Upgrade function.
+  //   *
+  //   * @param string $rev
+  //   */
+  //  public function upgrade_5_0_x($rev) {
+  //    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  //    $this->addTask('Do the foo change', 'taskFoo', ...);
+  //    // Additional tasks here...
+  //    // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex.
+  //    // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
+  //  }
+
+  // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) {
+  //   return TRUE;
+  // }
+
+}
diff --git a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
new file mode 100644
index 000000000000..aaf47e53be3f
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.31.alpha1 during upgrade *}
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 4afb6f03fd1e..90b0b5a929b2 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.30.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.31.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql
index 1e5bc3847436..f87b4519b797 100644
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -963,4 +963,4 @@ INSERT INTO civicrm_navigation
 VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
-UPDATE civicrm_domain SET version = '5.30.beta1';
+UPDATE civicrm_domain SET version = '5.31.alpha1';
diff --git a/xml/version.xml b/xml/version.xml
index a59a35af874f..588d045c3b29 100644
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.30.beta1</version_no>
+  <version_no>5.31.alpha1</version_no>
 </version>

From 799b7660aedf87cc8ea520e22080cf123a79f1b2 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 3 Sep 2020 14:50:46 -0400
Subject: [PATCH 095/834] 5.30.0 release notes: raw from script

---
 release-notes/5.30.0.md | 307 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 release-notes/5.30.0.md

diff --git a/release-notes/5.30.0.md b/release-notes/5.30.0.md
new file mode 100644
index 000000000000..a2e702abae9f
--- /dev/null
+++ b/release-notes/5.30.0.md
@@ -0,0 +1,307 @@
+# CiviCRM 5.30.0
+
+Released October 7, 2020;
+
+- **[Features](#features)**
+- **[Bugs resolved](#bugs)**
+- **[Miscellany](#misc)**
+- **[Credits](#credits)**
+
+## <a name="features"></a>Features
+
+### Core CiviCRM
+
+- **crm- Missing Summary ([18229](https://github.com/civicrm/civicrm-core/pull/18229))**
+
+## <a name="bugs"></a>Bugs resolved
+
+### Core CiviCRM
+
+- **Add ability to enable query logging per process ([18335](https://github.com/civicrm/civicrm-core/pull/18335))**
+
+- **5.29 ([18334](https://github.com/civicrm/civicrm-core/pull/18334))**
+
+- **[REF] Move function to delete merged contacts to the Merger class and include all instances of the pair ([17980](https://github.com/civicrm/civicrm-core/pull/17980))**
+
+- **dev/core#1956 - Typo in call to nestedGroup on scheduled reminders admin form ([18323](https://github.com/civicrm/civicrm-core/pull/18323))**
+
+- **5.29 ([18327](https://github.com/civicrm/civicrm-core/pull/18327))**
+
+- **dev/mail#24, item 1 - Fix spec labels MailingEventSubscribe.create ([18325](https://github.com/civicrm/civicrm-core/pull/18325))**
+
+- **5.29 ([18320](https://github.com/civicrm/civicrm-core/pull/18320))**
+
+- **[REF] Remove most interaction with $objects in completeOrder ([18315](https://github.com/civicrm/civicrm-core/pull/18315))**
+
+- **Test & remove handling for max_related in renewal form ([18295](https://github.com/civicrm/civicrm-core/pull/18295))**
+
+- **5.29 to master ([18316](https://github.com/civicrm/civicrm-core/pull/18316))**
+
+- **REF Remove unused passbyreference and var from ipn_process_transaction ([18311](https://github.com/civicrm/civicrm-core/pull/18311))**
+
+- **[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContribution ([18303](https://github.com/civicrm/civicrm-core/pull/18303))**
+
+- **Fix test set up to call Order.create to create the correct line items ([18279](https://github.com/civicrm/civicrm-core/pull/18279))**
+
+- **[REF] Separate and move line-item specific portion of checkTaxAmount to LineItem api ([18294](https://github.com/civicrm/civicrm-core/pull/18294))**
+
+- **5.29 ([18305](https://github.com/civicrm/civicrm-core/pull/18305))**
+
+- **Move LineItem acl handling from v3 api to financialacls core extension ([18293](https://github.com/civicrm/civicrm-core/pull/18293))**
+
+- **[REF] Fix financial item allocation of negative payments against completed payments ([17810](https://github.com/civicrm/civicrm-core/pull/17810))**
+
+- **Remove 'hack' that overwrites result of searchColumns hook in mailings list ([18237](https://github.com/civicrm/civicrm-core/pull/18237))**
+
+- **5.29 to master ([18302](https://github.com/civicrm/civicrm-core/pull/18302))**
+
+- **event#34: allow negative self-service/transfer time ([18067](https://github.com/civicrm/civicrm-core/pull/18067))**
+
+- **Add test to check, remove unnecessary lines ([18292](https://github.com/civicrm/civicrm-core/pull/18292))**
+
+- **Clean money for non-deductible amount ([18300](https://github.com/civicrm/civicrm-core/pull/18300))**
+
+- **[REF] [test] Slight increase in test cover & make functions more re-usable ([18291](https://github.com/civicrm/civicrm-core/pull/18291))**
+
+- **[REF] simplify retrieval of existing membership on membership renewal form ([18296](https://github.com/civicrm/civicrm-core/pull/18296))**
+
+- **Improve robustness of api/class.api.php ([18283](https://github.com/civicrm/civicrm-core/pull/18283))**
+
+- **add serialize data to actionschedule ([18289](https://github.com/civicrm/civicrm-core/pull/18289))**
+
+- **dev/event#37 Add CONTAINS operator for APIv4 & Search ([18285](https://github.com/civicrm/civicrm-core/pull/18285))**
+
+- **[REF] Extract function to get locations to merge, rename 'operation' … ([17991](https://github.com/civicrm/civicrm-core/pull/17991))**
+
+- **dev/core#1980 Move (now tested) delete acl check from v3 api to pre delete hook ([18275](https://github.com/civicrm/civicrm-core/pull/18275))**
+
+- **remove dropped tables for activity target and assignment ([18280](https://github.com/civicrm/civicrm-core/pull/18280))**
+
+- **Add line item acl tests ([18274](https://github.com/civicrm/civicrm-core/pull/18274))**
+
+- **5.29 ([18276](https://github.com/civicrm/civicrm-core/pull/18276))**
+
+- **report#47 Report Bookkeeping add time field for date filter. ([18268](https://github.com/civicrm/civicrm-core/pull/18268))**
+
+- **Fix regen and update civicrm_generated ([18273](https://github.com/civicrm/civicrm-core/pull/18273))**
+
+- **[REF] Move Auto DSN Switching into a core function ([18270](https://github.com/civicrm/civicrm-core/pull/18270))**
+
+- **Shell Financial ACLs extension ([18269](https://github.com/civicrm/civicrm-core/pull/18269))**
+
+- **dev/core#912 update payment instrument of main contribution record ([18266](https://github.com/civicrm/civicrm-core/pull/18266))**
+
+- **Use already determined value for contributionRecurID ([18265](https://github.com/civicrm/civicrm-core/pull/18265))**
+
+- **Remove old dropped items from the schema xml ([18244](https://github.com/civicrm/civicrm-core/pull/18244))**
+
+- **Remove 1 of 2 remaining places where relatedObjects is called in completeOrder ([18257](https://github.com/civicrm/civicrm-core/pull/18257))**
+
+- **dev/core#1971 Caching of domain-specific option values ([18252](https://github.com/civicrm/civicrm-core/pull/18252))**
+
+- **Remove last pass-by-reference in completeOrder signature ([18258](https://github.com/civicrm/civicrm-core/pull/18258))**
+
+- **Support more table names for utf8mb4 conversions and database name ([18249](https://github.com/civicrm/civicrm-core/pull/18249))**
+
+- **[REF] Ensure that the form param _id is set when adding a new group w… ([18250](https://github.com/civicrm/civicrm-core/pull/18250))**
+
+- **Optimise proximity custom search, by reducing addGeocodingData fn call ([18248](https://github.com/civicrm/civicrm-core/pull/18248))**
+
+- **Expose field label to APIv4 and Search creaor ([18255](https://github.com/civicrm/civicrm-core/pull/18255))**
+
+- **Separate titles from labels in exportable fields ([18256](https://github.com/civicrm/civicrm-core/pull/18256))**
+
+- **Fix js for case type status change on load ([18254](https://github.com/civicrm/civicrm-core/pull/18254))**
+
+- **Batch Update via Profile does not supply data for editing when custom fields created after participant added to event ([18235](https://github.com/civicrm/civicrm-core/pull/18235))**
+
+- **Wrap "not you" message in crmRegion ([18236](https://github.com/civicrm/civicrm-core/pull/18236))**
+
+- **Do not pass by reference for createRelatedMemberships ([18243](https://github.com/civicrm/civicrm-core/pull/18243))**
+
+- **Remove 2019 deprecated function ([18242](https://github.com/civicrm/civicrm-core/pull/18242))**
+
+- **Add disable_smarty option to MessageTemplate.send API ([18118](https://github.com/civicrm/civicrm-core/pull/18118))**
+
+- **dev/core#1950 Update help text and description for the profile add to groups setting ([18153](https://github.com/civicrm/civicrm-core/pull/18153))**
+
+- **Remove ref to logging time ([18221](https://github.com/civicrm/civicrm-core/pull/18221))**
+
+- **Replace deprecated Drupal 8 constants ([18240](https://github.com/civicrm/civicrm-core/pull/18240))**
+
+- **trim white space when checking dedupe ([18234](https://github.com/civicrm/civicrm-core/pull/18234))**
+
+- **Spelling mistake "separator" not "seperator" ([18238](https://github.com/civicrm/civicrm-core/pull/18238))**
+
+- **[NFC] Some DAO checksums not updated ([18239](https://github.com/civicrm/civicrm-core/pull/18239))**
+
+- **5.29 ([18231](https://github.com/civicrm/civicrm-core/pull/18231))**
+
+- **5.29 ([18226](https://github.com/civicrm/civicrm-core/pull/18226))**
+
+- **5.29 to master ([18222](https://github.com/civicrm/civicrm-core/pull/18222))**
+
+- **[Test framework] - Remove test for deprecated way of calling hook invoke ([18136](https://github.com/civicrm/civicrm-core/pull/18136))**
+
+- **Cleanup contactID variables in event/contribution register buildQuickForm ([18208](https://github.com/civicrm/civicrm-core/pull/18208))**
+
+- **Remove unused variables from repeatTransaction ([18209](https://github.com/civicrm/civicrm-core/pull/18209))**
+
+- **Metadata fix in activity search ([18216](https://github.com/civicrm/civicrm-core/pull/18216))**
+
+- **Minor code cleanup to Order API ([18217](https://github.com/civicrm/civicrm-core/pull/18217))**
+
+- **5.29 ([18215](https://github.com/civicrm/civicrm-core/pull/18215))**
+
+- **(NFC) Add some tests to the `resources` group ([18211](https://github.com/civicrm/civicrm-core/pull/18211))**
+
+- **5.29 ([18210](https://github.com/civicrm/civicrm-core/pull/18210))**
+
+- **5.29 ([18203](https://github.com/civicrm/civicrm-core/pull/18203))**
+
+- **APIv4 - Fix output of CustomValue create/save/update ([18195](https://github.com/civicrm/civicrm-core/pull/18195))**
+
+- **5.29 ([18199](https://github.com/civicrm/civicrm-core/pull/18199))**
+
+- **Remove first_contribution key from repeattransaction ([18197](https://github.com/civicrm/civicrm-core/pull/18197))**
+
+- **Remove unnecessary transformation of upgrade msg severity ([18182](https://github.com/civicrm/civicrm-core/pull/18182))**
+
+- **Metadata fix - phone_type_id, location_type_id, gender_id ([18114](https://github.com/civicrm/civicrm-core/pull/18114))**
+
+- **Check if $post defined before trying to use its field values. ([18168](https://github.com/civicrm/civicrm-core/pull/18168))**
+
+- **5.29 to master ([18193](https://github.com/civicrm/civicrm-core/pull/18193))**
+
+- **Put mysql back in civicrm.settings.php template ([18188](https://github.com/civicrm/civicrm-core/pull/18188))**
+
+- **E_NOTICE on contribution page widget tab ([18189](https://github.com/civicrm/civicrm-core/pull/18189))**
+
+- **CRM_Utils_VersionCheck - respect force param ([18183](https://github.com/civicrm/civicrm-core/pull/18183))**
+
+- **5.29 ([18187](https://github.com/civicrm/civicrm-core/pull/18187))**
+
+- **(NFC) Update various DAO checksums ([18184](https://github.com/civicrm/civicrm-core/pull/18184))**
+
+- **E_WARNING when saving event fees admin page if there's no discounts set ([18169](https://github.com/civicrm/civicrm-core/pull/18169))**
+
+- **Upgrade screen - show success instead of error if already upgraded ([18181](https://github.com/civicrm/civicrm-core/pull/18181))**
+
+- **Processors - remove gross_amount param from processors ([18177](https://github.com/civicrm/civicrm-core/pull/18177))**
+
+- **5.29 ([18173](https://github.com/civicrm/civicrm-core/pull/18173))**
+
+- **{contribution.receipt_date} token does not use any CiviCRM date formatter, output in YYYY-MM-DD HH:MM:SS format and {contribution.receive_date} also uses a non-standard format ([18176](https://github.com/civicrm/civicrm-core/pull/18176))**
+
+- **Minor cleanup in test class ([18170](https://github.com/civicrm/civicrm-core/pull/18170))**
+
+- **[REF] Deprecate unused SQL temptable functions ([18171](https://github.com/civicrm/civicrm-core/pull/18171))**
+
+- **Mass SMS: Limit group selection to mailing groups ([18154](https://github.com/civicrm/civicrm-core/pull/18154))**
+
+- **[REF] Update recent replacement for CRM_Utils_Array::value ([18172](https://github.com/civicrm/civicrm-core/pull/18172))**
+
+- **5.29 ([18165](https://github.com/civicrm/civicrm-core/pull/18165))**
+
+- **Replace CRM_Utils_Array::value in contribution/confirm and bao/membership ([18157](https://github.com/civicrm/civicrm-core/pull/18157))**
+
+- **5.29 ([18159](https://github.com/civicrm/civicrm-core/pull/18159))**
+
+- **Remove legacy handling for 'fixing' line_item.entity_id ([18155](https://github.com/civicrm/civicrm-core/pull/18155))**
+
+- **Remove deprecated code ids['userId'] ([18156](https://github.com/civicrm/civicrm-core/pull/18156))**
+
+- **[REF] Remove usages of CRM_Utils_Money::format that pass in a blank s… ([18142](https://github.com/civicrm/civicrm-core/pull/18142))**
+
+- **5.29 ([18148](https://github.com/civicrm/civicrm-core/pull/18148))**
+
+- **Use more appropriate money format function ([18151](https://github.com/civicrm/civicrm-core/pull/18151))**
+
+- **API - Add upgrade-safe checks to ensure table exists before reading ([18135](https://github.com/civicrm/civicrm-core/pull/18135))**
+
+- **Deprecate 'trapException' in DAO::executeQuery ([18138](https://github.com/civicrm/civicrm-core/pull/18138))**
+
+- **(REF) CRM_Core_Region - Remove unused bits ([18139](https://github.com/civicrm/civicrm-core/pull/18139))**
+
+- **dev/core#1661 Allow phones with types longer than 16 chars to export ([17956](https://github.com/civicrm/civicrm-core/pull/17956))**
+
+- **[REF] Move isSSLDSN() function to avoid potential problems ([18131](https://github.com/civicrm/civicrm-core/pull/18131))**
+
+- **Deprecate/remove unused checkVersion() functions ([18134](https://github.com/civicrm/civicrm-core/pull/18134))**
+
+- **(dev/core#1944) Add new columns to mailing summary report ([18132](https://github.com/civicrm/civicrm-core/pull/18132))**
+
+- **CodeGen - Add use statement to extensions DAO files ([18094](https://github.com/civicrm/civicrm-core/pull/18094))**
+
+- **5.29 ([18128](https://github.com/civicrm/civicrm-core/pull/18128))**
+
+- **dev/core#1926 - Towards supporting SSL for mysql connections - remove DB::connect that doesn't add anything ([18095](https://github.com/civicrm/civicrm-core/pull/18095))**
+
+- **5.29 ([18122](https://github.com/civicrm/civicrm-core/pull/18122))**
+
+- **Fix PHP notice on contribution page ([18116](https://github.com/civicrm/civicrm-core/pull/18116))**
+
+- **[NFC] Add code comments about hidden but still used buttons ([18119](https://github.com/civicrm/civicrm-core/pull/18119))**
+
+- **dev/core#1943 add functionality to add civicrm log into Drupal access log ([18115](https://github.com/civicrm/civicrm-core/pull/18115))**
+
+- **5.29 to master ([18117](https://github.com/civicrm/civicrm-core/pull/18117))**
+
+- **[NFC] [Test] Initial testing on event payment forms. ([18112](https://github.com/civicrm/civicrm-core/pull/18112))**
+
+- **Add Serialize key to payment_processor field for Event & Contribution Page ([18110](https://github.com/civicrm/civicrm-core/pull/18110))**
+
+- **[NFC] Array formatting ([18109](https://github.com/civicrm/civicrm-core/pull/18109))**
+
+- **Remove unused variable ([18108](https://github.com/civicrm/civicrm-core/pull/18108))**
+
+- **5.29 ([18104](https://github.com/civicrm/civicrm-core/pull/18104))**
+
+- **5.29 ([18100](https://github.com/civicrm/civicrm-core/pull/18100))**
+
+- **There is no "I" in mysqli - oh wait there is ([18097](https://github.com/civicrm/civicrm-core/pull/18097))**
+
+- **5.29 to master ([18098](https://github.com/civicrm/civicrm-core/pull/18098))**
+
+- **[NFC] Update locale over-ride documentation to mention that it is mos… ([17919](https://github.com/civicrm/civicrm-core/pull/17919))**
+
+- **APIv4 Explorer - Fix possible undefined index ([18093](https://github.com/civicrm/civicrm-core/pull/18093))**
+
+- **[REF] Update subtypeInfo function to leverage getAllContactTypes ([17934](https://github.com/civicrm/civicrm-core/pull/17934))**
+
+- **[REF] Fix metadata label for contribution_page_id ([18047](https://github.com/civicrm/civicrm-core/pull/18047))**
+
+- **5.29 ([18090](https://github.com/civicrm/civicrm-core/pull/18090))**
+
+- **APIv4 Explorer: Generate short cv code ([18089](https://github.com/civicrm/civicrm-core/pull/18089))**
+
+- **[REF] Deploy Pear DB package using composer ([18027](https://github.com/civicrm/civicrm-core/pull/18027))**
+
+- **Allow for the setting of an additional constant CIVICRM_DRUSH_DSN ([613](https://github.com/civicrm/civicrm-drupal/pull/613))**
+
+- **7.x 5.29 ([621](https://github.com/civicrm/civicrm-drupal/pull/621))**
+
+- **7.x 5.29 ([616](https://github.com/civicrm/civicrm-drupal/pull/616))**
+
+- **[NFC] IDE cleanup - arrays, single quotes ([614](https://github.com/civicrm/civicrm-drupal/pull/614))**
+
+- **Remove handling for 4.2 DBs ([612](https://github.com/civicrm/civicrm-drupal/pull/612))**
+
+- **dev/wordpress#37 - Switch unambiguously to new installer UI ([215](https://github.com/civicrm/civicrm-wordpress/pull/215))**
+
+- **DB_DataObject - Read CIVICRM_DEBUG_LOG_QUERY correctly ([305](https://github.com/civicrm/civicrm-packages/pull/305))**
+
+- **[REF] Remove DB Package as it is now deployed using composer ([302](https://github.com/civicrm/civicrm-packages/pull/302))**
+
+## <a name="misc"></a>Miscellany
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following code authors:
+
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Zhang; Circle Interactive - Pradeep Nayak; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Sunil Pawar, Yashodha Chaku; Dave D; Flinders University of South Australia - Tom Anderson; JMA Consulting - Monish Deb, Seamus Lee; John Kingsnorth; Lemniscus - Noah Miller; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJW Consulting - Matthew Wire; Squiffle Consulting - Aidan Saunders; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight - Lars Sanders-Green
+
+Most authors also reviewed code for this release; in addition, the following
+reviewers contributed their comments:
+
+Artful Robot - Rich Lott; Christian Wach; civibot[bot]; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Dave D; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; JMA Consulting - Seamus Lee; John Kingsnorth; Lighthouse Consulting and Design - Brian Shaughnessy; MarshCastle; Megaphone Technology Consulting - Jon Goldberg; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Tadpole Collective - Kevin Cristiano; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight - Lars Sanders-Green
\ No newline at end of file

From 9aec4f344cda1b5bffa41f3183133674e46a57ae Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 3 Sep 2020 14:53:04 -0400
Subject: [PATCH 096/834] 5.30.0 release notes: added boilerplate

---
 release-notes.md        | 11 +++++++++++
 release-notes/5.30.0.md | 24 ++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/release-notes.md b/release-notes.md
index d2d501d26a72..0171d9a5981c 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -15,6 +15,17 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
+## CiviCRM 5.30.0
+
+Released October 7, 2020
+
+- **[Synopsis](release-notes/5.30.0.md#synopsis)**
+- **[Features](release-notes/5.30.0.md#features)**
+- **[Bugs resolved](release-notes/5.30.0.md#bugs)**
+- **[Miscellany](release-notes/5.30.0.md#misc)**
+- **[Credits](release-notes/5.30.0.md#credits)**
+- **[Feedback](release-notes/5.30.0.md#feedback)**
+
 ## CiviCRM 5.29.0
 
 Released September 2, 2020
diff --git a/release-notes/5.30.0.md b/release-notes/5.30.0.md
index a2e702abae9f..476686b17a87 100644
--- a/release-notes/5.30.0.md
+++ b/release-notes/5.30.0.md
@@ -1,11 +1,25 @@
 # CiviCRM 5.30.0
 
-Released October 7, 2020;
+Released October 7, 2020
 
+- **[Synopsis](#synopsis)**
 - **[Features](#features)**
 - **[Bugs resolved](#bugs)**
 - **[Miscellany](#misc)**
 - **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities?                                   |         |
+| Change the database schema?                                     |         |
+| Alter the API?                                                  |         |
+| Require attention to configuration options?                     |         |
+| Fix problems installing or upgrading to a previous version?     |         |
+| Introduce features?                                             |         |
+| Fix bugs?                                                       |         |
 
 ## <a name="features"></a>Features
 
@@ -304,4 +318,10 @@ AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Z
 Most authors also reviewed code for this release; in addition, the following
 reviewers contributed their comments:
 
-Artful Robot - Rich Lott; Christian Wach; civibot[bot]; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Dave D; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; JMA Consulting - Seamus Lee; John Kingsnorth; Lighthouse Consulting and Design - Brian Shaughnessy; MarshCastle; Megaphone Technology Consulting - Jon Goldberg; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Tadpole Collective - Kevin Cristiano; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight - Lars Sanders-Green
\ No newline at end of file
+Artful Robot - Rich Lott; Christian Wach; civibot[bot]; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Dave D; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; JMA Consulting - Seamus Lee; John Kingsnorth; Lighthouse Consulting and Design - Brian Shaughnessy; MarshCastle; Megaphone Technology Consulting - Jon Goldberg; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Tadpole Collective - Kevin Cristiano; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight - Lars Sanders-Green
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Alice Frumin and Andrew Hunt.  If you'd like
+to provide feedback on them, please log in to https://chat.civicrm.org/civicrm
+and contact `@agh1`.

From aeee327d2b9b004b8beca10f8d190263352d87c6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 3 Sep 2020 20:13:01 +1200
Subject: [PATCH 097/834] Move ACls on LineItem create to financialacls core
 extension

---
 CRM/Price/BAO/LineItem.php                    | 13 +-----------
 ext/financialacls/financialacls.php           |  9 +++++----
 .../tests/phpunit/LineItemTest.php            | 20 ++++++++++++++++++-
 tests/phpunit/api/v3/FinancialTypeACLTest.php |  2 +-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php
index b25c02c37c51..0067fef0a6ed 100644
--- a/CRM/Price/BAO/LineItem.php
+++ b/CRM/Price/BAO/LineItem.php
@@ -35,11 +35,9 @@ public static function create(&$params) {
     $id = $params['id'] ?? NULL;
     if ($id) {
       CRM_Utils_Hook::pre('edit', 'LineItem', $id, $params);
-      $op = CRM_Core_Action::UPDATE;
     }
     else {
       CRM_Utils_Hook::pre('create', 'LineItem', $params['entity_id'], $params);
-      $op = CRM_Core_Action::ADD;
     }
 
     // unset entity table and entity id in $params
@@ -54,21 +52,12 @@ public static function create(&$params) {
         $params['unit_price'] = 0;
       }
     }
-    if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus() && !empty($params['check_permissions'])) {
-      if (empty($params['financial_type_id'])) {
-        throw new Exception('Mandatory key(s) missing from params array: financial_type_id');
-      }
-      CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, $op);
-      if (!in_array($params['financial_type_id'], array_keys($types))) {
-        throw new Exception('You do not have permission to create this line item');
-      }
-    }
 
     $lineItemBAO = new CRM_Price_BAO_LineItem();
     $lineItemBAO->copyValues($params);
 
     $return = $lineItemBAO->save();
-    if ($lineItemBAO->entity_table == 'civicrm_membership' && $lineItemBAO->contribution_id && $lineItemBAO->entity_id) {
+    if ($lineItemBAO->entity_table === 'civicrm_membership' && $lineItemBAO->contribution_id && $lineItemBAO->entity_id) {
       $membershipPaymentParams = [
         'membership_id' => $lineItemBAO->entity_id,
         'contribution_id' => $lineItemBAO->contribution_id,
diff --git a/ext/financialacls/financialacls.php b/ext/financialacls/financialacls.php
index b079114d9f6f..c0edae5e58c1 100644
--- a/ext/financialacls/financialacls.php
+++ b/ext/financialacls/financialacls.php
@@ -146,7 +146,7 @@ function financialacls_civicrm_themes(&$themes) {
 /**
  * Intervene to prevent deletion, where permissions block it.
  *
- * @param \CRM_Core_DAO $op
+ * @param string $op
  * @param string $objectName
  * @param int|null $id
  * @param array $params
@@ -155,14 +155,15 @@ function financialacls_civicrm_themes(&$themes) {
  * @throws \CRM_Core_Exception
  */
 function financialacls_civicrm_pre($op, $objectName, $id, &$params) {
-  if ($objectName === 'LineItem' && $op === 'delete' && !empty($params['check_permissions'])) {
+  if ($objectName === 'LineItem' && !empty($params['check_permissions'])) {
     if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()) {
-      CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, CRM_Core_Action::DELETE);
+      $operationMap = ['delete' => CRM_Core_Action::DELETE, 'edit' => CRM_Core_Action::UPDATE, 'create' => CRM_Core_Action::ADD];
+      CRM_Financial_BAO_FinancialType::getAvailableFinancialTypes($types, $operationMap[$op]);
       if (empty($params['financial_type_id'])) {
         $params['financial_type_id'] = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_LineItem', $params['id'], 'financial_type_id');
       }
       if (!in_array($params['financial_type_id'], array_keys($types))) {
-        throw new API_Exception('You do not have permission to delete this line item');
+        throw new API_Exception('You do not have permission to ' . $op . ' this line item');
       }
     }
   }
diff --git a/ext/financialacls/tests/phpunit/LineItemTest.php b/ext/financialacls/tests/phpunit/LineItemTest.php
index 71eb6380c4d0..573847299487 100644
--- a/ext/financialacls/tests/phpunit/LineItemTest.php
+++ b/ext/financialacls/tests/phpunit/LineItemTest.php
@@ -43,7 +43,7 @@ public function setUpHeadless() {
   public function testLineItemApiPermissions() {
     $contact1 = $this->individualCreate();
     $defaultPriceFieldID = $this->getDefaultPriceFieldID();
-    $this->callAPISuccess('Order', 'create', [
+    $order = $this->callAPISuccess('Order', 'create', [
       'financial_type_id' => 'Donation',
       'contact_id' => $contact1,
       'line_items' => [
@@ -73,6 +73,8 @@ public function testLineItemApiPermissions() {
       'delete in CiviContribute',
       'view contributions of type Donation',
       'delete contributions of type Donation',
+      'add contributions of type Donation',
+      'edit contributions of type Donation',
     ]);
     Civi::settings()->set('acl_financial_type', TRUE);
     $this->createLoggedInUser();
@@ -83,6 +85,22 @@ public function testLineItemApiPermissions() {
 
     $this->callAPISuccess('LineItem', 'Delete', ['check_permissions' => TRUE, 'id' => $lineItems[0]['id']]);
     $this->callAPIFailure('LineItem', 'Delete', ['check_permissions' => TRUE, 'id' => $lineItems[1]['id']]);
+    $lineParams = [
+      'entity_id' => $order['id'],
+      'entity_table' => 'civicrm_contribution',
+      'line_total' => 20,
+      'unit_price' => 20,
+      'price_field_id' => $defaultPriceFieldID,
+      'qty' => 1,
+      'financial_type_id' => 'Donation',
+      'check_permissions' => TRUE,
+    ];
+    $line = $this->callAPISuccess('LineItem', 'Create', $lineParams);
+    $lineParams['financial_type_id'] = 'Event Fee';
+    $this->callAPIFailure('LineItem', 'Create', $lineParams);
+
+    $this->callAPIFailure('LineItem', 'Create', ['id' => $line['id'], 'check_permissions' => TRUE, 'financial_type_id' => 'Event Fee']);
+    $this->callAPISuccess('LineItem', 'Create', ['id' => $line['id'], 'check_permissions' => TRUE, 'financial_type_id' => 'Donation']);
   }
 
   /**
diff --git a/tests/phpunit/api/v3/FinancialTypeACLTest.php b/tests/phpunit/api/v3/FinancialTypeACLTest.php
index 7aa516ebd471..036960b09009 100644
--- a/tests/phpunit/api/v3/FinancialTypeACLTest.php
+++ b/tests/phpunit/api/v3/FinancialTypeACLTest.php
@@ -230,7 +230,7 @@ public function testCreateACLContributionChainedLineItems() {
       'add contributions of type Donation',
       'delete contributions of type Donation',
     ]);
-    $this->callAPIFailure('contribution', 'create', $params, 'Error in call to LineItem_create : You do not have permission to create this line item');
+    $this->callAPIFailure('Contribution', 'create', $params, 'Error in call to LineItem_create : You do not have permission to create this line item');
 
     // Check that the entire contribution has rolled back.
     $contribution = $this->callAPISuccess('contribution', 'get', []);

From eed14abbc29fe6b02e3168e65d5e1bffc5e0a614 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 3 Sep 2020 12:08:50 +1200
Subject: [PATCH 098/834] Stop passing / using object when all we need is the
 id

Rather than set id on the contribution object just to be able to access it via contribution->id
let's name the param we keep using & use that. Note I'm still getting contribution->id from contribution
here but I think this makes it clear that the object is mostly only used in addActivity now.

The sligtly larger change is in updateMembershipBasedOnCompletionOfContribution where there is
an instantiation of 'self()' since we no longer have the object
---
 CRM/Contribute/BAO/Contribution.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 238c4f196d3c..6990d69c37f8 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -444,7 +444,7 @@ public static function getPaymentProcessorReadyAddressParams($params, $billingLo
    *
    * @return int
    */
-  public function getNumTermsByContributionAndMembershipType($membershipTypeID, $contributionID) {
+  public static function getNumTermsByContributionAndMembershipType($membershipTypeID, $contributionID) {
     $numTerms = CRM_Core_DAO::singleValueQuery("
       SELECT membership_num_terms FROM civicrm_line_item li
       LEFT JOIN civicrm_price_field_value v ON li.price_field_value_id = v.id
@@ -4509,11 +4509,12 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     $changeDate = CRM_Utils_Array::value('trxn_date', $input, date('YmdHis'));
 
     $contributionResult = self::repeatTransaction($contribution, $input, $contributionParams);
+    $contributionID = (int) $contribution->id;
 
     if ($input['component'] == 'contribute') {
       if ($contributionParams['contribution_status_id'] === $completedContributionStatusID) {
         self::updateMembershipBasedOnCompletionOfContribution(
-          $contribution,
+          $contributionID,
           $changeDate
         );
       }
@@ -4526,7 +4527,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
       }
     }
 
-    $contributionParams['id'] = $contribution->id;
+    $contributionParams['id'] = $contributionID;
     $contributionParams['is_post_payment_create'] = $isPostPaymentCreate;
 
     if (!$contributionResult) {
@@ -4535,7 +4536,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
 
     // Add new soft credit against current $contribution.
     if ($recurringContributionID) {
-      CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($recurringContributionID, $contribution->id);
+      CRM_Contribute_BAO_ContributionRecur::addrecurSoftCredit($recurringContributionID, $contributionID);
     }
 
     $contribution->contribution_status_id = $contributionParams['contribution_status_id'];
@@ -4544,7 +4545,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     $transaction->commit();
 
     // @todo - check if Contribution::create does this, test, remove.
-    CRM_Contribute_BAO_ContributionRecur::updateRecurLinkedPledge($contribution->id, $recurringContributionID,
+    CRM_Contribute_BAO_ContributionRecur::updateRecurLinkedPledge($contributionID, $recurringContributionID,
       $contributionParams['contribution_status_id'], $input['amount']);
 
     // create an activity record
@@ -4561,7 +4562,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
 
     if (self::isEmailReceipt($input, $contribution->contribution_page_id, $recurringContributionID)) {
       civicrm_api3('Contribution', 'sendconfirmation', [
-        'id' => $contribution->id,
+        'id' => $contributionID,
         'payment_processor_id' => $paymentProcessorId,
       ]);
       CRM_Core_Error::debug_log_message("Receipt sent");
@@ -5157,14 +5158,14 @@ protected static function isPaymentInstrumentChange(&$params, $pendingStatuses)
    * Note that the way in which $memberships are loaded as objects is pretty messy & I think we could just
    * load them in this function. Code clean up would compensate for any minor performance implication.
    *
-   * @param \CRM_Contribute_BAO_Contribution $contribution
+   * @param int $contributionID
    * @param string $changeDate
    *
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function updateMembershipBasedOnCompletionOfContribution($contribution, $changeDate) {
-    $memberships = self::getRelatedMemberships($contribution->id);
+  public static function updateMembershipBasedOnCompletionOfContribution($contributionID, $changeDate) {
+    $memberships = self::getRelatedMemberships($contributionID);
     foreach ($memberships as $membership) {
       $membershipParams = [
         'id' => $membership['id'],
@@ -5202,9 +5203,9 @@ public static function updateMembershipBasedOnCompletionOfContribution($contribu
         // The api assumes num_terms is a special sauce for 'is_renewal' so we need to not pass it when updating a pending to completed.
         // ... except testCompleteTransactionMembershipPriceSetTwoTerms hits this line so the above is obviously not true....
         // @todo once apiv4 ships with core switch to that & find sanity.
-        $membershipParams['num_terms'] = $contribution->getNumTermsByContributionAndMembershipType(
+        $membershipParams['num_terms'] = self::getNumTermsByContributionAndMembershipType(
           $membershipParams['membership_type_id'],
-          $contribution->id
+          $contributionID
         );
       }
       // @todo remove all this stuff in favour of letting the api call further down handle in

From 80ece7a5cbb1fad7e06f182c60cd4373cbd20165 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 08:22:43 +1200
Subject: [PATCH 099/834] Minor code cleanup - this is only ever called from
 one place so component is alwasy event

---
 CRM/Event/Form/Task/Batch.php | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index a9835a08cf68..163c830cf135 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -295,7 +295,6 @@ public static function updatePendingOnlineContribution($participantId, $statusId
 
     $params = [
       'component_id' => $participantId,
-      'componentName' => 'Event',
       'contribution_id' => $contributionId,
       'contribution_status_id' => $contributionStatusId,
       'IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved' => 1,
@@ -323,13 +322,13 @@ public static function updateContributionStatus($params) {
     // get minimum required values.
     $statusId = $params['contribution_status_id'] ?? NULL;
     $componentId = $params['component_id'] ?? NULL;
-    $componentName = $params['componentName'] ?? NULL;
     $contributionId = $params['contribution_id'] ?? NULL;
 
     $input = $ids = $objects = [];
 
     //get the required ids.
     $ids['contribution'] = $contributionId;
+    $ids['participant'] = $params['component_id'];
 
     if (!$ids['contact'] = CRM_Utils_Array::value('contact_id', $params)) {
       $ids['contact'] = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution',
@@ -338,25 +337,14 @@ public static function updateContributionStatus($params) {
       );
     }
 
-    if ($componentName === 'Event') {
-      $name = 'event';
-      $ids['participant'] = $componentId;
-
-      if (!$ids['event'] = CRM_Utils_Array::value('event_id', $params)) {
-        $ids['event'] = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant',
-          $componentId,
-          'event_id'
-        );
-      }
+    if (!$ids['event'] = CRM_Utils_Array::value('event_id', $params)) {
+      $ids['event'] = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant',
+        $componentId,
+        'event_id'
+      );
     }
 
-    if ($componentName === 'Membership') {
-      $name = 'contribute';
-      $ids['membership'] = $componentId;
-    }
-    $ids['contributionPage'] = NULL;
-    $ids['contributionRecur'] = NULL;
-    $input['component'] = $name;
+    $input['component'] = 'event';
 
     $baseIPN = new CRM_Core_Payment_BaseIPN();
 

From bbcf0f467c3cd83f1513a55112f373b2a33bf08f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 06:49:01 -0700
Subject: [PATCH 100/834] (REF) CRM_Core_Resources_Strings - Move instance into
 container

---
 CRM/Core/Resources.php                   | 6 +++---
 Civi/Core/Container.php                  | 7 ++++++-
 tests/phpunit/CRM/Core/ResourcesTest.php | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 265112d8f994..3e736d3c0521 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -135,13 +135,13 @@ public static function singleton(CRM_Core_Resources $instance = NULL) {
    *
    * @param CRM_Extension_Mapper $extMapper
    *   Map extension names to their base path or URLs.
-   * @param CRM_Utils_Cache_Interface $cache
+   * @param CRM_Core_Resources_Strings $strings
    *   JS-localization cache.
    * @param string|null $cacheCodeKey Random code to append to resource URLs; changing the code forces clients to reload resources
    */
-  public function __construct($extMapper, $cache, $cacheCodeKey = NULL) {
+  public function __construct($extMapper, $strings, $cacheCodeKey = NULL) {
     $this->extMapper = $extMapper;
-    $this->strings = new CRM_Core_Resources_Strings($cache);
+    $this->strings = $strings;
     $this->cacheCodeKey = $cacheCodeKey;
     if ($cacheCodeKey !== NULL) {
       $this->cacheCode = Civi::settings()->get($cacheCodeKey);
diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index 5b96e40ef08e..ee8b214e7fd1 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -237,6 +237,11 @@ public function createContainer() {
       [new Reference('service_container')]
     ))->setFactory([new Reference(self::SELF), 'createResources'])->setPublic(TRUE);
 
+    $container->setDefinition('resources.js_strings', new Definition(
+      'CRM_Core_Resources_Strings',
+      [new Reference('cache.js_strings')]
+    ))->setPublic(TRUE);
+
     $container->setDefinition('prevnext', new Definition(
       'CRM_Core_PrevNextCache_Interface',
       [new Reference('service_container')]
@@ -450,7 +455,7 @@ public static function createResources($container) {
     $sys = \CRM_Extension_System::singleton();
     return new \CRM_Core_Resources(
       $sys->getMapper(),
-      $container->get('cache.js_strings'),
+      new \CRM_Core_Resources_Strings($container->get('cache.js_strings')),
       \CRM_Core_Config::isUpgradeMode() ? NULL : 'resCacheCode'
     );
   }
diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index 6c1fc7dd1fa4..629ba4f80320 100644
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -40,7 +40,7 @@ public function setUp() {
 
     list ($this->basedir, $this->container, $this->mapper) = $this->_createMapper();
     $cache = new CRM_Utils_Cache_Arraycache([]);
-    $this->res = new CRM_Core_Resources($this->mapper, $cache, NULL);
+    $this->res = new CRM_Core_Resources($this->mapper, new CRM_Core_Resources_Strings($cache), NULL);
     $this->res->setCacheCode('resTest');
     CRM_Core_Resources::singleton($this->res);
 

From 832eb60a0db787e3d70caa44e8574e811247e008 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 02:18:21 -0700
Subject: [PATCH 101/834] CRM_Core_Resources - Convert 'settings' to a type of
 snippet

---
 CRM/Core/Region.php                      | 25 ++++---
 CRM/Core/Resources.php                   | 87 ++++++++++--------------
 tests/phpunit/CRM/Core/ResourcesTest.php |  2 +-
 3 files changed, 54 insertions(+), 60 deletions(-)

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 06cece6bc9e7..d87664019dc9 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -4,7 +4,6 @@
  * Maintain a set of markup/templates to inject inside various regions
  */
 class CRM_Core_Region {
-  static private $_instances = NULL;
 
   /**
    * Obtain the content for a given region.
@@ -15,10 +14,10 @@ class CRM_Core_Region {
    * @return CRM_Core_Region
    */
   public static function &instance($name, $autocreate = TRUE) {
-    if ($autocreate && !isset(self::$_instances[$name])) {
-      self::$_instances[$name] = new CRM_Core_Region($name);
+    if ($autocreate && !isset(Civi::$statics[__CLASS__][$name])) {
+      Civi::$statics[__CLASS__][$name] = new CRM_Core_Region($name);
     }
-    return self::$_instances[$name];
+    return Civi::$statics[__CLASS__][$name];
   }
 
   /**
@@ -95,13 +94,14 @@ public function __construct($name) {
    *   - script: string, Javascript code
    *   - scriptUrl: string, URL of a Javascript file
    *   - jquery: string, Javascript code which runs inside a jQuery(function($){...}); block
+   *   - settings: array, list of static values to convey.
    *   - style: string, CSS code
    *   - styleUrl: string, URL of a CSS file
    *
    * @return array
    */
   public function add($snippet) {
-    static $types = ['markup', 'template', 'callback', 'scriptUrl', 'script', 'jquery', 'style', 'styleUrl'];
+    static $types = ['markup', 'template', 'callback', 'scriptUrl', 'script', 'jquery', 'settings', 'style', 'styleUrl'];
     $defaults = [
       'region' => $this->_name,
       'weight' => 1,
@@ -139,11 +139,10 @@ public function update($name, $snippet) {
    * Get snippet.
    *
    * @param string $name
-   *
-   * @return mixed
+   * @return array|NULL
    */
-  public function get($name) {
-    return !empty($this->_snippets[$name]) ? $this->_snippets[$name] : NULL;
+  public function &get($name) {
+    return $this->_snippets[$name];
   }
 
   /**
@@ -218,6 +217,14 @@ public function render($default, $allowCmsOverride = TRUE) {
           }
           break;
 
+        case 'settings':
+          $settingsData = json_encode(Civi::resources()->getSettings($this->_name), JSON_UNESCAPED_SLASHES);
+          $js = "(function(vars) {
+            if (window.CRM) CRM.$.extend(true, CRM, vars); else window.CRM = vars;
+            })($settingsData)";
+          $html .= sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $js);
+          break;
+
         default:
           throw new CRM_Core_Exception(ts('Snippet type %1 is unrecognized',
             [1 => $snippet['type']]));
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 3e736d3c0521..0d086f40c908 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -45,20 +45,6 @@ class CRM_Core_Resources {
    */
   private $strings = NULL;
 
-  /**
-   * Settings in free-form data tree.
-   *
-   * @var array
-   */
-  protected $settings = [];
-
-  /**
-   * Setting factories.
-   *
-   * @var callable[]
-   */
-  protected $settingsFactories = [];
-
   /**
    * Added core resources.
    *
@@ -269,9 +255,11 @@ public function addScript($code, $weight = self::DEFAULT_WEIGHT, $region = self:
    * @return CRM_Core_Resources
    */
   public function addVars($nameSpace, $vars, $region = NULL) {
-    $existing = CRM_Utils_Array::value($nameSpace, CRM_Utils_Array::value('vars', $this->settings), []);
-    $vars = $this->mergeSettings($existing, $vars);
-    $this->addSetting(['vars' => [$nameSpace => $vars]], $region);
+    $s = &$this->findCreateSettingSnippet($region);
+    $s['settings']['vars'][$nameSpace] = $this->mergeSettings(
+      $s['settings']['vars'][$nameSpace] ?? [],
+      $vars
+    );
     return $this;
   }
 
@@ -287,22 +275,8 @@ public function addVars($nameSpace, $vars, $region = NULL) {
    * @return CRM_Core_Resources
    */
   public function addSetting($settings, $region = NULL) {
-    if (!$region) {
-      $region = self::isAjaxMode() ? 'ajax-snippet' : 'html-header';
-    }
-    $this->settings = $this->mergeSettings($this->settings, $settings);
-    if (isset($this->addedSettings[$region])) {
-      return $this;
-    }
-    $resources = $this;
-    $settingsResource = [
-      'callback' => function (&$snippet, &$html) use ($resources, $region) {
-        $html .= "\n" . $resources->renderSetting($region);
-      },
-      'weight' => -100000,
-    ];
-    CRM_Core_Region::instance($region)->add($settingsResource);
-    $this->addedSettings[$region] = TRUE;
+    $s = &$this->findCreateSettingSnippet($region);
+    $s['settings'] = $this->mergeSettings($s['settings'], $settings);
     return $this;
   }
 
@@ -310,21 +284,23 @@ public function addSetting($settings, $region = NULL) {
    * Add JavaScript variables to the global CRM object via a callback function.
    *
    * @param callable $callable
+   * @param string|NULL $region
    * @return CRM_Core_Resources
    */
-  public function addSettingsFactory($callable) {
-    // Make sure our callback has been registered
-    $this->addSetting([]);
-    $this->settingsFactories[] = $callable;
+  public function addSettingsFactory($callable, $region = NULL) {
+    $s = &$this->findCreateSettingSnippet($region);
+    $s['settingsFactories'][] = $callable;
     return $this;
   }
 
   /**
    * Helper fn for addSettingsFactory.
+   * @deprecated
    */
-  public function getSettings() {
-    $result = $this->settings;
-    foreach ($this->settingsFactories as $callable) {
+  public function getSettings($region = NULL) {
+    $s = &$this->findCreateSettingSnippet($region);
+    $result = $s['settings'];
+    foreach ($s['settingsFactories'] as $callable) {
       $result = $this->mergeSettings($result, $callable());
     }
     CRM_Utils_Hook::alterResourceSettings($result);
@@ -348,17 +324,28 @@ protected function mergeSettings($settings, $additions) {
   }
 
   /**
-   * Helper fn for addSetting.
-   * Render JavaScript variables for the global CRM object.
-   *
-   * @return string
+   * @param string $regionName
+   * @return array
    */
-  public function renderSetting($region = NULL) {
-    $vars = json_encode($this->getSettings(), JSON_UNESCAPED_SLASHES);
-    $js = "(function(vars) {
-  if (window.CRM) CRM.$.extend(true, CRM, vars); else window.CRM = vars;
-})($vars)";
-    return sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $js);
+  private function &findCreateSettingSnippet($regionName) {
+    if (!$regionName) {
+      $regionName = self::isAjaxMode() ? 'ajax-snippet' : 'html-header';
+    }
+
+    $region = CRM_Core_Region::instance($regionName);
+    $snippet = &$region->get('settings');
+    if ($snippet !== NULL) {
+      return $snippet;
+    }
+
+    $region->add([
+      'name' => 'settings',
+      'type' => 'settings',
+      'settings' => [],
+      'settingsFactories' => [],
+      'weight' => -100000,
+    ]);
+    return $region->get('settings');
   }
 
   /**
diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index 629ba4f80320..f39a7a329fd6 100644
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -150,7 +150,7 @@ public function testAddSetting() {
       ['fruit' => ['yours' => 'orange', 'mine' => 'apple']],
       $this->res->getSettings()
     );
-    $actual = $this->res->renderSetting();
+    $actual = CRM_Core_Region::instance('html-header')->render('');
     $expected = json_encode(['fruit' => ['yours' => 'orange', 'mine' => 'apple']]);
     $this->assertTrue(strpos($actual, $expected) !== FALSE);
   }

From 8dbd7691a10621ae45b9113f9d79946cdd4fd2b5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 03:51:14 -0700
Subject: [PATCH 102/834] CollectionTrait - Create baseline trait based on
 CRM_Core_Region

---
 CRM/Core/Region.php                    | 143 ++-------------------
 CRM/Core/Resources/CollectionTrait.php | 168 +++++++++++++++++++++++++
 2 files changed, 178 insertions(+), 133 deletions(-)
 create mode 100644 CRM/Core/Resources/CollectionTrait.php

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index d87664019dc9..0d6cfc63301d 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -20,6 +20,10 @@ public static function &instance($name, $autocreate = TRUE) {
     return Civi::$statics[__CLASS__][$name];
   }
 
+  use CRM_Core_Resources_CollectionTrait {
+    CRM_Core_Resources_CollectionTrait::add as _add;
+  }
+
   /**
    * Symbolic name of this region
    *
@@ -27,28 +31,13 @@ public static function &instance($name, $autocreate = TRUE) {
    */
   public $_name;
 
-  /**
-   * List of snippets to inject within region.
-   *
-   * e.g. $this->_snippets[3]['type'] = 'template';
-   *
-   * @var array
-   */
-  public $_snippets;
-
-  /**
-   * Whether the snippets array has been sorted
-   *
-   * @var bool
-   */
-  public $_isSorted;
-
   /**
    * @param string $name
    */
   public function __construct($name) {
     $this->_name = $name;
-    $this->_snippets = [];
+    $this->types = ['markup', 'template', 'callback', 'scriptUrl', 'script', 'jquery', 'settings', 'style', 'styleUrl'];
+    $this->defaults['region'] = $name;
 
     // Placeholder which represents any of the default content generated by the main Smarty template
     $this->add([
@@ -57,92 +46,6 @@ public function __construct($name) {
       'markup' => '',
       'weight' => 0,
     ]);
-    $this->_isSorted = TRUE;
-  }
-
-  /**
-   * Add a snippet of content to a region.
-   *
-   * ```
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'markup' => '<div style="color:red">Hello!</div>',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'script' => 'alert("Hello");',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'template' => 'CRM/Myextension/Extra.tpl',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'callback' => 'myextension_callback_function',
-   * ));
-   * ```
-   *
-   * Note: This function does not perform any extra encoding of markup, script code, or etc. If
-   * you're passing in user-data, you must clean it yourself.
-   *
-   * @param array $snippet
-   *   Array; keys:.
-   *   - type: string (auto-detected for markup, template, callback, script, scriptUrl, jquery, style, styleUrl)
-   *   - name: string, optional
-   *   - weight: int, optional; default=1
-   *   - disabled: int, optional; default=0
-   *   - markup: string, HTML; required (for type==markup)
-   *   - template: string, path; required (for type==template)
-   *   - callback: mixed; required (for type==callback)
-   *   - arguments: array, optional (for type==callback)
-   *   - script: string, Javascript code
-   *   - scriptUrl: string, URL of a Javascript file
-   *   - jquery: string, Javascript code which runs inside a jQuery(function($){...}); block
-   *   - settings: array, list of static values to convey.
-   *   - style: string, CSS code
-   *   - styleUrl: string, URL of a CSS file
-   *
-   * @return array
-   */
-  public function add($snippet) {
-    static $types = ['markup', 'template', 'callback', 'scriptUrl', 'script', 'jquery', 'settings', 'style', 'styleUrl'];
-    $defaults = [
-      'region' => $this->_name,
-      'weight' => 1,
-      'disabled' => FALSE,
-    ];
-    $snippet += $defaults;
-    if (!isset($snippet['type'])) {
-      foreach ($types as $type) {
-        // auto-detect
-        if (isset($snippet[$type])) {
-          $snippet['type'] = $type;
-          break;
-        }
-      }
-    }
-    if (!isset($snippet['name'])) {
-      $snippet['name'] = count($this->_snippets);
-    }
-
-    $this->_snippets[$snippet['name']] = $snippet;
-    $this->_isSorted = FALSE;
-    return $snippet;
-  }
-
-  /**
-   * @param string $name
-   * @param $snippet
-   */
-  public function update($name, $snippet) {
-    $this->_snippets[$name] = array_merge($this->_snippets[$name], $snippet);
-    $this->_isSorted = FALSE;
-  }
-
-  /**
-   * Get snippet.
-   *
-   * @param string $name
-   * @return array|NULL
-   */
-  public function &get($name) {
-    return $this->_snippets[$name];
   }
 
   /**
@@ -156,20 +59,17 @@ public function &get($name) {
    */
   public function render($default, $allowCmsOverride = TRUE) {
     // $default is just another part of the region
-    if (is_array($this->_snippets['default'])) {
-      $this->_snippets['default']['markup'] = $default;
+    if (is_array($this->snippets['default'])) {
+      $this->snippets['default']['markup'] = $default;
     }
     // We hand as much of the work off to the CMS as possible
     $cms = CRM_Core_Config::singleton()->userSystem;
 
-    if (!$this->_isSorted) {
-      uasort($this->_snippets, ['CRM_Core_Region', '_cmpSnippet']);
-      $this->_isSorted = TRUE;
-    }
+    $this->sort();
 
     $smarty = CRM_Core_Smarty::singleton();
     $html = '';
-    foreach ($this->_snippets as $snippet) {
+    foreach ($this->snippets as $snippet) {
       if ($snippet['disabled']) {
         continue;
       }
@@ -233,27 +133,4 @@ public function render($default, $allowCmsOverride = TRUE) {
     return $html;
   }
 
-  /**
-   * @param $a
-   * @param $b
-   *
-   * @return int
-   */
-  public static function _cmpSnippet($a, $b) {
-    if ($a['weight'] < $b['weight']) {
-      return -1;
-    }
-    if ($a['weight'] > $b['weight']) {
-      return 1;
-    }
-    // fallback to name sort; don't really want to do this, but it makes results more stable
-    if ($a['name'] < $b['name']) {
-      return -1;
-    }
-    if ($a['name'] > $b['name']) {
-      return 1;
-    }
-    return 0;
-  }
-
 }
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
new file mode 100644
index 000000000000..3cb245ca1748
--- /dev/null
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -0,0 +1,168 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Resources_CollectionTrait
+ *
+ * This is a building-block for creating classes which maintain a list of resources.
+ */
+trait CRM_Core_Resources_CollectionTrait {
+
+  /**
+   * Static defaults - a list of options to apply to any new snippets.
+   *
+   * @var array
+   */
+  protected $defaults = ['weight' => 1, 'disabled' => FALSE];
+
+  /**
+   * List of snippets to inject within region.
+   *
+   * e.g. $this->_snippets[3]['type'] = 'template';
+   *
+   * @var array
+   */
+  protected $snippets = [];
+
+  /**
+   * Whether the snippets array has been sorted
+   *
+   * @var bool
+   */
+  protected $isSorted = TRUE;
+
+  /**
+   * Whitelist of supported types.
+   *
+   * @var array
+   */
+  protected $types = [];
+
+  /**
+   * Add an item to the collection. For example, when working with 'page-header' collection:
+   *
+   * ```
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'markup' => '<div style="color:red">Hello!</div>',
+   * ));
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'script' => 'alert("Hello");',
+   * ));
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'template' => 'CRM/Myextension/Extra.tpl',
+   * ));
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'callback' => 'myextension_callback_function',
+   * ));
+   * ```
+   *
+   * Note: This function does not perform any extra encoding of markup, script code, or etc. If
+   * you're passing in user-data, you must clean it yourself.
+   *
+   * @param array $snippet
+   *   Array; keys:.
+   *   - type: string (auto-detected for markup, template, callback, script, scriptUrl, jquery, style, styleUrl)
+   *   - name: string, optional
+   *   - weight: int, optional; default=1
+   *   - disabled: int, optional; default=0
+   *   - markup: string, HTML; required (for type==markup)
+   *   - template: string, path; required (for type==template)
+   *   - callback: mixed; required (for type==callback)
+   *   - arguments: array, optional (for type==callback)
+   *   - script: string, Javascript code
+   *   - scriptUrl: string, URL of a Javascript file
+   *   - jquery: string, Javascript code which runs inside a jQuery(function($){...}); block
+   *   - settings: array, list of static values to convey.
+   *   - style: string, CSS code
+   *   - styleUrl: string, URL of a CSS file
+   *
+   * @return array
+   *   The full/computed snippet (with defaults applied).
+   */
+  public function add($snippet) {
+    $snippet = array_merge($this->defaults, $snippet);
+    if (!isset($snippet['type'])) {
+      foreach ($this->types as $type) {
+        // auto-detect
+        if (isset($snippet[$type])) {
+          $snippet['type'] = $type;
+          break;
+        }
+      }
+    }
+    elseif (!in_array($snippet['type'], $this->types)) {
+      throw new \RuntimeException("Unsupported snippet type: " . $snippet['type']);
+    }
+    if (!isset($snippet['name'])) {
+      $snippet['name'] = count($this->snippets);
+    }
+
+    $this->snippets[$snippet['name']] = $snippet;
+    $this->isSorted = FALSE;
+    return $snippet;
+  }
+
+  /**
+   * @param string $name
+   * @param $snippet
+   */
+  public function update($name, $snippet) {
+    $this->snippets[$name] = array_merge($this->snippets[$name], $snippet);
+    $this->isSorted = FALSE;
+  }
+
+  /**
+   * Get snippet.
+   *
+   * @param string $name
+   * @return array|NULL
+   */
+  public function &get($name) {
+    return $this->snippets[$name];
+  }
+
+  /**
+   * Ensure that the collection is sorted.
+   *
+   * @return static
+   */
+  protected function sort() {
+    if (!$this->isSorted) {
+      uasort($this->snippets, [__CLASS__, '_cmpSnippet']);
+      $this->isSorted = TRUE;
+    }
+    return $this;
+  }
+
+  /**
+   * @param $a
+   * @param $b
+   *
+   * @return int
+   */
+  public static function _cmpSnippet($a, $b) {
+    if ($a['weight'] < $b['weight']) {
+      return -1;
+    }
+    if ($a['weight'] > $b['weight']) {
+      return 1;
+    }
+    // fallback to name sort; don't really want to do this, but it makes results more stable
+    if ($a['name'] < $b['name']) {
+      return -1;
+    }
+    if ($a['name'] > $b['name']) {
+      return 1;
+    }
+    return 0;
+  }
+
+}

From b41dbde6bfe916bc4084557ec9163ea446dcccfd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 05:44:00 -0700
Subject: [PATCH 103/834] (REF) CRM_Core_Region - Extract $renderSnippet()

This makes it possible for renderSnippet to work recursively.

For example, the current `jquery` type can build on the `script` type, and
the hypothetical `scriptFile` type could build on the `scriptUrl` type.
---
 CRM/Core/Region.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 0d6cfc63301d..6c5da95e102d 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -62,17 +62,14 @@ public function render($default, $allowCmsOverride = TRUE) {
     if (is_array($this->snippets['default'])) {
       $this->snippets['default']['markup'] = $default;
     }
-    // We hand as much of the work off to the CMS as possible
-    $cms = CRM_Core_Config::singleton()->userSystem;
 
     $this->sort();
 
+    $cms = CRM_Core_Config::singleton()->userSystem;
     $smarty = CRM_Core_Smarty::singleton();
     $html = '';
-    foreach ($this->snippets as $snippet) {
-      if ($snippet['disabled']) {
-        continue;
-      }
+
+    $renderSnippet = function($snippet) use (&$html, $smarty, $cms, $allowCmsOverride, &$renderSnippet) {
       switch ($snippet['type']) {
         case 'markup':
           $html .= $snippet['markup'];
@@ -97,8 +94,12 @@ public function render($default, $allowCmsOverride = TRUE) {
           break;
 
         case 'jquery':
-          $snippet['script'] = sprintf("CRM.\$(function(\$) {\n%s\n});", $snippet['jquery']);
-          // no break - continue processing as script
+          $renderSnippet([
+            'type' => 'script',
+            'script' => sprintf("CRM.\$(function(\$) {\n%s\n});", $snippet['jquery']),
+          ]);
+          break;
+
         case 'script':
           if (!$allowCmsOverride || !$cms->addScript($snippet['script'], $this->_name)) {
             $html .= sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $snippet['script']);
@@ -129,6 +130,12 @@ public function render($default, $allowCmsOverride = TRUE) {
           throw new CRM_Core_Exception(ts('Snippet type %1 is unrecognized',
             [1 => $snippet['type']]));
       }
+    };
+
+    foreach ($this->snippets as $snippet) {
+      if (empty($snippet['disabled'])) {
+        $renderSnippet($snippet);
+      }
     }
     return $html;
   }

From 04615f53c081944706ae87e16746a1209b9abc12 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 04:47:34 -0700
Subject: [PATCH 104/834] CollectionTrait - Support getAll(), filter(), find(),
 and clear()

---
 CRM/Core/Resources/CollectionTrait.php | 72 ++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 3cb245ca1748..8b09a1cb4090 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -119,6 +119,17 @@ public function update($name, $snippet) {
     $this->isSorted = FALSE;
   }
 
+  /**
+   * Remove all snippets.
+   *
+   * @return static
+   */
+  public function clear() {
+    $this->snippets = [];
+    $this->isSorted = TRUE;
+    return $this;
+  }
+
   /**
    * Get snippet.
    *
@@ -129,6 +140,67 @@ public function &get($name) {
     return $this->snippets[$name];
   }
 
+  /**
+   * Get a list of all snippets in this collection.
+   *
+   * @return iterable
+   */
+  public function getAll(): iterable {
+    $this->sort();
+    return $this->snippets;
+  }
+
+  /**
+   * Alter the contents of the collection.
+   *
+   * @param callable $callback
+   *   The callback is invoked once for each member in the collection.
+   *   The callback may return one of three values:
+   *   - TRUE: The item is OK and belongs in the collection.
+   *   - FALSE: The item is not OK and should be omitted from the collection.
+   *   - Array: The item should be revised (using the returned value).
+   * @return static
+   */
+  public function filter($callback) {
+    $this->sort();
+    $names = array_keys($this->snippets);
+    foreach ($names as $name) {
+      $ret = $callback($this->snippets[$name]);
+      if ($ret === TRUE) {
+        // OK
+      }
+      elseif ($ret === FALSE) {
+        unset($this->snippets[$name]);
+      }
+      elseif (is_array($ret)) {
+        $this->snippets[$name] = $ret;
+        $this->isSorted = FALSE;
+      }
+      else {
+        throw new \RuntimeException("CollectionTrait::filter() - Callback returned invalid value");
+      }
+    }
+    return $this;
+  }
+
+  /**
+   * Find all snippets which match the given criterion.
+   *
+   * @param callable $callback
+   * @return iterable
+   *   List of matching snippets.
+   */
+  public function find($callback): iterable {
+    $r = [];
+    $this->sort();
+    foreach ($this->snippets as $name => $snippet) {
+      if ($callback($snippet)) {
+        $r[$name] = $snippet;
+      }
+    }
+    return $r;
+  }
+
   /**
    * Ensure that the collection is sorted.
    *

From 007b7d354d82d5e0267a76904850543f8a905bc4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 04:11:25 -0700
Subject: [PATCH 105/834] CollectionTrait - Support addScript(),
 addScriptUrl(), addStyle(), addStyleUrl()

---
 CRM/Core/Resources.php                 | 32 ++---------
 CRM/Core/Resources/CollectionTrait.php | 75 +++++++++++++++++++++++++-
 2 files changed, 78 insertions(+), 29 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 0d086f40c908..a0d9d0ca991e 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -203,13 +203,7 @@ public function addScriptFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $regi
    * @return CRM_Core_Resources
    */
   public function addScriptUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add([
-      'name' => $url,
-      'type' => 'scriptUrl',
-      'scriptUrl' => $url,
-      'weight' => $weight,
-      'region' => $region,
-    ]);
+    CRM_Core_Region::instance($region)->add(['scriptUrl' => $url, 'weight' => $weight]);
     return $this;
   }
 
@@ -225,13 +219,7 @@ public function addScriptUrl($url, $weight = self::DEFAULT_WEIGHT, $region = sel
    * @return CRM_Core_Resources
    */
   public function addScript($code, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add([
-        // 'name' => automatic
-      'type' => 'script',
-      'script' => $code,
-      'weight' => $weight,
-      'region' => $region,
-    ]);
+    CRM_Core_Region::instance($region)->add(['script' => $code, 'weight' => $weight]);
     return $this;
   }
 
@@ -430,13 +418,7 @@ public function addStyleFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $regio
    * @return CRM_Core_Resources
    */
   public function addStyleUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add([
-      'name' => $url,
-      'type' => 'styleUrl',
-      'styleUrl' => $url,
-      'weight' => $weight,
-      'region' => $region,
-    ]);
+    CRM_Core_Region::instance($region)->add(['styleUrl' => $url, 'weight' => $weight]);
     return $this;
   }
 
@@ -452,13 +434,7 @@ public function addStyleUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self
    * @return CRM_Core_Resources
    */
   public function addStyle($code, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add([
-        // 'name' => automatic
-      'type' => 'style',
-      'style' => $code,
-      'weight' => $weight,
-      'region' => $region,
-    ]);
+    CRM_Core_Region::instance($region)->add(['style' => $code, 'weight' => $weight]);
     return $this;
   }
 
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 8b09a1cb4090..cdf07da9c676 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -13,6 +13,10 @@
  * Class CRM_Core_Resources_CollectionTrait
  *
  * This is a building-block for creating classes which maintain a list of resources.
+ *
+ * The class is generally organized in two sections: First, we have core
+ * bit that manages a list of '$snippets'. Second, we have a set of helper
+ * functions which add some syntactic sugar for the snippets.
  */
 trait CRM_Core_Resources_CollectionTrait {
 
@@ -102,7 +106,16 @@ public function add($snippet) {
       throw new \RuntimeException("Unsupported snippet type: " . $snippet['type']);
     }
     if (!isset($snippet['name'])) {
-      $snippet['name'] = count($this->snippets);
+      switch ($snippet['type']) {
+        case 'scriptUrl':
+        case 'styleUrl':
+          $snippet['name'] = $snippet[$snippet['type']];
+          break;
+
+        default:
+          $snippet['name'] = count($this->snippets);
+          break;
+      }
     }
 
     $this->snippets[$snippet['name']] = $snippet;
@@ -237,4 +250,64 @@ public static function _cmpSnippet($a, $b) {
     return 0;
   }
 
+  // -----------------------------------------------
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * @param string $code
+   *   JavaScript source code.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addScript(string $code, array $options = []) {
+    $this->add($options + ['script' => $code]);
+    return $this;
+  }
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * @param string $url
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addScriptUrl(string $url, array $options = []) {
+    $this->add($options + ['scriptUrl' => $url]);
+    return $this;
+  }
+
+  /**
+   * Add a CSS content to the current page using <STYLE>.
+   *
+   * @param string $code
+   *   CSS source code.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyle(string $code, array $options = []) {
+    $this->add($options + ['style' => $code]);
+    return $this;
+  }
+
+  /**
+   * Add a CSS file to the current page using <LINK HREF>.
+   *
+   * @param string $url
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyleUrl(string $url, array $options = []) {
+    $this->add($options + ['styleUrl' => $url]);
+    return $this;
+  }
+
 }

From f55f8f1793bccdd8ad9133c0c5e8aca57d4b785a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 04:29:59 -0700
Subject: [PATCH 106/834] CollectionTrait - Support addSetting(),
 addSettingsFactory(), ad nauseum

---
 CRM/Core/Region.php                    |   2 +-
 CRM/Core/Resources.php                 | 105 +++------------
 CRM/Core/Resources/CollectionTrait.php | 178 +++++++++++++++++++++++++
 3 files changed, 199 insertions(+), 86 deletions(-)

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 6c5da95e102d..3f4e1f29d04b 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -119,7 +119,7 @@ public function render($default, $allowCmsOverride = TRUE) {
           break;
 
         case 'settings':
-          $settingsData = json_encode(Civi::resources()->getSettings($this->_name), JSON_UNESCAPED_SLASHES);
+          $settingsData = json_encode($this->getSettings(), JSON_UNESCAPED_SLASHES);
           $js = "(function(vars) {
             if (window.CRM) CRM.$.extend(true, CRM, vars); else window.CRM = vars;
             })($settingsData)";
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index a0d9d0ca991e..0871810cccc0 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -147,19 +147,13 @@ public function __construct($extMapper, $strings, $cacheCodeKey = NULL) {
    * the client can use this info to make the app more secure; however,
    * it can produce a better-tuned (non-broken) UI.
    *
-   * @param array $permNames
+   * @param string|iterable $permNames
    *   List of permission names to check/export.
    * @return CRM_Core_Resources
    */
   public function addPermissions($permNames) {
-    $permNames = (array) $permNames;
-    $perms = [];
-    foreach ($permNames as $permName) {
-      $perms[$permName] = CRM_Core_Permission::check($permName);
-    }
-    return $this->addSetting([
-      'permissions' => $perms,
-    ]);
+    $this->getSettingRegion()->addPermissions($permNames);
+    return $this;
   }
 
   /**
@@ -243,11 +237,7 @@ public function addScript($code, $weight = self::DEFAULT_WEIGHT, $region = self:
    * @return CRM_Core_Resources
    */
   public function addVars($nameSpace, $vars, $region = NULL) {
-    $s = &$this->findCreateSettingSnippet($region);
-    $s['settings']['vars'][$nameSpace] = $this->mergeSettings(
-      $s['settings']['vars'][$nameSpace] ?? [],
-      $vars
-    );
+    $this->getSettingRegion($region)->addVars($nameSpace, $vars);
     return $this;
   }
 
@@ -263,8 +253,7 @@ public function addVars($nameSpace, $vars, $region = NULL) {
    * @return CRM_Core_Resources
    */
   public function addSetting($settings, $region = NULL) {
-    $s = &$this->findCreateSettingSnippet($region);
-    $s['settings'] = $this->mergeSettings($s['settings'], $settings);
+    $this->getSettingRegion($region)->addSetting($settings);
     return $this;
   }
 
@@ -272,68 +261,18 @@ public function addSetting($settings, $region = NULL) {
    * Add JavaScript variables to the global CRM object via a callback function.
    *
    * @param callable $callable
-   * @param string|NULL $region
    * @return CRM_Core_Resources
    */
-  public function addSettingsFactory($callable, $region = NULL) {
-    $s = &$this->findCreateSettingSnippet($region);
-    $s['settingsFactories'][] = $callable;
+  public function addSettingsFactory($callable) {
+    $this->getSettingRegion()->addSettingsFactory($callable);
     return $this;
   }
 
   /**
    * Helper fn for addSettingsFactory.
-   * @deprecated
-   */
-  public function getSettings($region = NULL) {
-    $s = &$this->findCreateSettingSnippet($region);
-    $result = $s['settings'];
-    foreach ($s['settingsFactories'] as $callable) {
-      $result = $this->mergeSettings($result, $callable());
-    }
-    CRM_Utils_Hook::alterResourceSettings($result);
-    return $result;
-  }
-
-  /**
-   * @param array $settings
-   * @param array $additions
-   * @return array
-   *   combination of $settings and $additions
    */
-  protected function mergeSettings($settings, $additions) {
-    foreach ($additions as $k => $v) {
-      if (isset($settings[$k]) && is_array($settings[$k]) && is_array($v)) {
-        $v += $settings[$k];
-      }
-      $settings[$k] = $v;
-    }
-    return $settings;
-  }
-
-  /**
-   * @param string $regionName
-   * @return array
-   */
-  private function &findCreateSettingSnippet($regionName) {
-    if (!$regionName) {
-      $regionName = self::isAjaxMode() ? 'ajax-snippet' : 'html-header';
-    }
-
-    $region = CRM_Core_Region::instance($regionName);
-    $snippet = &$region->get('settings');
-    if ($snippet !== NULL) {
-      return $snippet;
-    }
-
-    $region->add([
-      'name' => 'settings',
-      'type' => 'settings',
-      'settings' => [],
-      'settingsFactories' => [],
-      'weight' => -100000,
-    ]);
-    return $region->get('settings');
+  public function getSettings() {
+    return $this->getSettingRegion()->getSettings();
   }
 
   /**
@@ -367,21 +306,7 @@ private function &findCreateSettingSnippet($regionName) {
    * @return CRM_Core_Resources
    */
   public function addString($text, $domain = 'civicrm') {
-    foreach ((array) $text as $str) {
-      $translated = ts($str, [
-        'domain' => ($domain == 'civicrm') ? NULL : [$domain, NULL],
-        'raw' => TRUE,
-      ]);
-
-      // We only need to push this string to client if the translation
-      // is actually different from the original
-      if ($translated != $str) {
-        $bucket = $domain == 'civicrm' ? 'strings' : 'strings::' . $domain;
-        $this->addSetting([
-          $bucket => [$str => $translated],
-        ]);
-      }
-    }
+    $this->getSettingRegion()->addString($text, $domain);
     return $this;
   }
 
@@ -953,4 +878,14 @@ public static function isFullyFormedUrl($url) {
     return (substr($url, 0, 4) === 'http') || (substr($url, 0, 1) === '/');
   }
 
+  /**
+   * @param string|NULL $region
+   *   Optional request for a specific region. If NULL/omitted, use global default.
+   * @return \CRM_Core_Region
+   */
+  private function getSettingRegion($region = NULL) {
+    $region = $region ?: (self::isAjaxMode() ? 'ajax-snippet' : 'html-header');
+    return CRM_Core_Region::instance($region);
+  }
+
 }
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index cdf07da9c676..6532d752a305 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -252,6 +252,31 @@ public static function _cmpSnippet($a, $b) {
 
   // -----------------------------------------------
 
+  /**
+   * Export permission data to the client to enable smarter GUIs.
+   *
+   * Note: Application security stems from the server's enforcement
+   * of the security logic (e.g. in the API permissions). There's no way
+   * the client can use this info to make the app more secure; however,
+   * it can produce a better-tuned (non-broken) UI.
+   *
+   * @param string|iterable $permNames
+   *   List of permission names to check/export.
+   * @return static
+   */
+  public function addPermissions($permNames) {
+    // TODO: Maybe this should be its own resource type to allow smarter management?
+    $permNames = is_scalar($permNames) ? [$permNames] : $permNames;
+
+    $perms = [];
+    foreach ($permNames as $permName) {
+      $perms[$permName] = CRM_Core_Permission::check($permName);
+    }
+    return $this->addSetting([
+      'permissions' => $perms,
+    ]);
+  }
+
   /**
    * Add a JavaScript file to the current page using <SCRIPT SRC>.
    *
@@ -281,6 +306,57 @@ public function addScriptUrl(string $url, array $options = []) {
     return $this;
   }
 
+  /**
+   * Add translated string to the js CRM object.
+   * It can then be retrived from the client-side ts() function
+   * Variable substitutions can happen from client-side
+   *
+   * Note: this function rarely needs to be called directly and is mostly for internal use.
+   * See CRM_Core_Resources::addScriptFile which automatically adds translated strings from js files
+   *
+   * Simple example:
+   * // From php:
+   * CRM_Core_Resources::singleton()->addString('Hello');
+   * // The string is now available to javascript code i.e.
+   * ts('Hello');
+   *
+   * Example with client-side substitutions:
+   * // From php:
+   * CRM_Core_Resources::singleton()->addString('Your %1 has been %2');
+   * // ts() in javascript works the same as in php, for example:
+   * ts('Your %1 has been %2', {1: objectName, 2: actionTaken});
+   *
+   * NOTE: This function does not work with server-side substitutions
+   * (as this might result in collisions and unwanted variable injections)
+   * Instead, use code like:
+   * CRM_Core_Resources::singleton()->addSetting(array('myNamespace' => array('myString' => ts('Your %1 has been %2', array(subs)))));
+   * And from javascript access it at CRM.myNamespace.myString
+   *
+   * @param string|array $text
+   * @param string|null $domain
+   * @return static
+   */
+  public function addString($text, $domain = 'civicrm') {
+    // TODO: Maybe this should be its own resource type to allow smarter management?
+
+    foreach ((array) $text as $str) {
+      $translated = ts($str, [
+        'domain' => ($domain == 'civicrm') ? NULL : [$domain, NULL],
+        'raw' => TRUE,
+      ]);
+
+      // We only need to push this string to client if the translation
+      // is actually different from the original
+      if ($translated != $str) {
+        $bucket = $domain == 'civicrm' ? 'strings' : 'strings::' . $domain;
+        $this->addSetting([
+          $bucket => [$str => $translated],
+        ]);
+      }
+    }
+    return $this;
+  }
+
   /**
    * Add a CSS content to the current page using <STYLE>.
    *
@@ -310,4 +386,106 @@ public function addStyleUrl(string $url, array $options = []) {
     return $this;
   }
 
+  /**
+   * Add JavaScript variables to CRM.vars
+   *
+   * Example:
+   *   From the server:
+   *     CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
+   *   Access var from javascript:
+   *     CRM.vars.myNamespace.foo // "bar"
+   *
+   * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
+   *
+   * @param string $nameSpace
+   *   Usually the name of your extension.
+   * @param array $vars
+   * @return static
+   */
+  public function addVars(string $nameSpace, array $vars) {
+    $s = &$this->findCreateSettingSnippet();
+    $s['settings']['vars'][$nameSpace] = $this->mergeSettings(
+      $s['settings']['vars'][$nameSpace] ?? [],
+      $vars
+    );
+    return $this;
+  }
+
+  /**
+   * Add JavaScript variables to the root of the CRM object.
+   * This function is usually reserved for low-level system use.
+   * Extensions and components should generally use addVars instead.
+   *
+   * @param array $settings
+   * @return static
+   */
+  public function addSetting(array $settings) {
+    $s = &$this->findCreateSettingSnippet();
+    $s['settings'] = $this->mergeSettings($s['settings'], $settings);
+    return $this;
+  }
+
+  /**
+   * Add JavaScript variables to the global CRM object via a callback function.
+   *
+   * @param callable $callable
+   * @return static
+   */
+  public function addSettingsFactory($callable) {
+    $s = &$this->findCreateSettingSnippet();
+    $s['settingsFactories'][] = $callable;
+    return $this;
+  }
+
+  /**
+   * Get a fully-formed/altered list of settings, including the results of
+   * any callbacks/listeners.
+   *
+   * @return array
+   */
+  public function getSettings(): array {
+    $s = &$this->findCreateSettingSnippet();
+    $result = $s['settings'];
+    foreach ($s['settingsFactories'] as $callable) {
+      $result = $this->mergeSettings($result, $callable());
+    }
+    CRM_Utils_Hook::alterResourceSettings($result);
+    return $result;
+  }
+
+  /**
+   * @param array $settings
+   * @param array $additions
+   * @return array
+   *   combination of $settings and $additions
+   */
+  private function mergeSettings(array $settings, array $additions): array {
+    foreach ($additions as $k => $v) {
+      if (isset($settings[$k]) && is_array($settings[$k]) && is_array($v)) {
+        $v += $settings[$k];
+      }
+      $settings[$k] = $v;
+    }
+    return $settings;
+  }
+
+  /**
+   * @return array
+   */
+  private function &findCreateSettingSnippet(): array {
+    $snippet = &$this->get('settings');
+    if ($snippet !== NULL) {
+      return $snippet;
+    }
+
+    $this->add([
+      'name' => 'settings',
+      'type' => 'settings',
+      'settings' => [],
+      'settingsFactories' => [],
+      'weight' => -100000,
+    ]);
+    return $this->get('settings');
+  }
+
 }

From fce22e157147a8337b44a0aa7572b59cb99a6fba Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 5 Aug 2020 06:57:14 -0700
Subject: [PATCH 107/834] CollectionTrait - Support addScriptFile(),
 addStyleFile()

---
 CRM/Core/Resources.php                 | 41 ++++++++++++------
 CRM/Core/Resources/CollectionTrait.php | 59 ++++++++++++++++++++++++++
 2 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 0871810cccc0..9b694bb03a19 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -178,12 +178,14 @@ public function addPermissions($permNames) {
    * @throws \CRM_Core_Exception
    */
   public function addScriptFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION, $translate = TRUE) {
-    if ($translate) {
-      $domain = ($translate === TRUE) ? $ext : $translate;
-      $this->addString($this->strings->get($domain, $this->getPath($ext, $file), 'text/javascript'), $domain);
-    }
-    $url = $this->getUrl($ext, $this->filterMinify($ext, $file), TRUE);
-    return $this->addScriptUrl($url, $weight, $region);
+    CRM_Core_Region::instance($region)->addScriptFile($ext, $file, [
+      'weight' => $weight,
+      'translate' => $translate,
+      'name' => "$ext:$file",
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptFile() produce slightly different orderings..
+    ]);
+    return $this;
   }
 
   /**
@@ -197,7 +199,13 @@ public function addScriptFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $regi
    * @return CRM_Core_Resources
    */
   public function addScriptUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add(['scriptUrl' => $url, 'weight' => $weight]);
+    CRM_Core_Region::instance($region)->add([
+      'scriptUrl' => $url,
+      'weight' => $weight,
+      'name' => $url,
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings..
+    ]);
     return $this;
   }
 
@@ -324,11 +332,12 @@ public function addString($text, $domain = 'civicrm') {
    * @return CRM_Core_Resources
    */
   public function addStyleFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    /** @var Civi\Core\Themes $theme */
-    $theme = Civi::service('themes');
-    foreach ($theme->resolveUrls($theme->getActiveThemeKey(), $ext, $file) as $url) {
-      $this->addStyleUrl($url, $weight, $region);
-    }
+    CRM_Core_Region::instance($region)->addStyleFile($ext, $file, [
+      'weight' => $weight,
+      'name' => "$ext:$file",
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings..
+    ]);
     return $this;
   }
 
@@ -343,7 +352,13 @@ public function addStyleFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $regio
    * @return CRM_Core_Resources
    */
   public function addStyleUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add(['styleUrl' => $url, 'weight' => $weight]);
+    CRM_Core_Region::instance($region)->add([
+      'styleUrl' => $url,
+      'weight' => $weight,
+      'name' => $url,
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings..
+    ]);
     return $this;
   }
 
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 6532d752a305..eca138278d1d 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -292,6 +292,42 @@ public function addScript(string $code, array $options = []) {
     return $this;
   }
 
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * @param string $ext
+   *   extension name; use 'civicrm' for core.
+   * @param string $file
+   *   file path -- relative to the extension base dir.
+   * @param array $options
+   *   Open-ended list of options (per add()).
+   *   Ex: ['weight' => 123]
+   *   Accepts some additional options:
+   *   - bool|string $translate: Whether to load translated strings for this file. Use one of:
+   *     - FALSE: Do not load translated strings.
+   *     - TRUE: Load translated strings. Use the $ext's default domain.
+   *     - string: Load translated strings. Use a specific domain.
+   *
+   * @return static
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function addScriptFile(string $ext, string $file, array $options = []) {
+    // TODO: Maybe this should be its own resource type to allow smarter management?
+
+    $res = Civi::resources();
+
+    $translate = $options['translate'] ?? TRUE;
+    unset($options['translate']);
+    if ($translate) {
+      $domain = ($translate === TRUE) ? $ext : $translate;
+      $this->addString(Civi::service('resources.js_strings')->get($domain, $res->getPath($ext, $file), 'text/javascript'), $domain);
+    }
+    $url = $res->getUrl($ext, $res->filterMinify($ext, $file), TRUE);
+    $this->add($options + ['scriptUrl' => $url, 'name' => "$ext:$file"]);
+    return $this;
+  }
+
   /**
    * Add a JavaScript file to the current page using <SCRIPT SRC>.
    *
@@ -372,6 +408,29 @@ public function addStyle(string $code, array $options = []) {
     return $this;
   }
 
+  /**
+   * Add a CSS file to the current page using <LINK HREF>.
+   *
+   * @param string $ext
+   *   extension name; use 'civicrm' for core.
+   * @param string $file
+   *   file path -- relative to the extension base dir.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyleFile(string $ext, string $file, array $options = []) {
+    // TODO: Maybe this should be its own resource type to allow smarter management?
+
+    /** @var Civi\Core\Themes $theme */
+    $theme = Civi::service('themes');
+    foreach ($theme->resolveUrls($theme->getActiveThemeKey(), $ext, $file) as $url) {
+      $this->add($options + ['styleUrl' => $url, 'name' => "$ext:$file"]);
+    }
+    return $this;
+  }
+
   /**
    * Add a CSS file to the current page using <LINK HREF>.
    *

From 5dddc6e037ef38639f363a3a7d9ee83d63026f81 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2020 19:54:08 -0700
Subject: [PATCH 108/834] CollectionTrait - Support merge()

---
 CRM/Core/Resources/CollectionTrait.php | 56 ++++++++++++++++++++++++--
 1 file changed, 52 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index eca138278d1d..35147c48b737 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -105,7 +105,12 @@ public function add($snippet) {
     elseif (!in_array($snippet['type'], $this->types)) {
       throw new \RuntimeException("Unsupported snippet type: " . $snippet['type']);
     }
-    if (!isset($snippet['name'])) {
+    // Traditional behavior: sort by (1) weight and (2) either name or natural position. This second thing is called 'sortId'.
+    if (isset($snippet['name'])) {
+      $snippet['sortId'] = $snippet['name'];
+    }
+    else {
+      $snippet['sortId'] = $this->nextId();
       switch ($snippet['type']) {
         case 'scriptUrl':
         case 'styleUrl':
@@ -113,7 +118,7 @@ public function add($snippet) {
           break;
 
         default:
-          $snippet['name'] = count($this->snippets);
+          $snippet['name'] = $snippet['sortId'];
           break;
       }
     }
@@ -123,6 +128,17 @@ public function add($snippet) {
     return $snippet;
   }
 
+  protected function nextId() {
+    if (!isset(Civi::$statics['CRM_Core_Resource_Count'])) {
+      $resId = Civi::$statics['CRM_Core_Resource_Count'] = 1;
+    }
+    else {
+      $resId = ++Civi::$statics['CRM_Core_Resource_Count'];
+    }
+
+    return $resId;
+  }
+
   /**
    * @param string $name
    * @param $snippet
@@ -214,6 +230,38 @@ public function find($callback): iterable {
     return $r;
   }
 
+  /**
+   * Assimilate a list of resources into this list.
+   *
+   * @param iterable $snippets
+   *   List of snippets to add.
+   * @return static
+   * @see CRM_Core_Resources_CollectionInterface::merge()
+   */
+  public function merge(iterable $snippets) {
+    foreach ($snippets as $next) {
+      $name = $next['name'];
+      $current = $this->snippets[$name] ?? NULL;
+      if ($current === NULL) {
+        $this->add($next);
+      }
+      elseif ($current['type'] === 'settings' && $next['type'] === 'settings') {
+        $this->addSetting($next['settings']);
+        foreach ($next['settingsFactories'] as $factory) {
+          $this->addSettingsFactory($factory);
+        }
+        $this->isSorted = FALSE;
+      }
+      elseif ($current['type'] === 'settings' || $next['type'] === 'settings') {
+        throw new \RuntimeException(sprintf("Cannot merge snippets of types [%s] and [%s]" . $current['type'], $next['type']));
+      }
+      else {
+        $this->add($next);
+      }
+    }
+    return $this;
+  }
+
   /**
    * Ensure that the collection is sorted.
    *
@@ -241,10 +289,10 @@ public static function _cmpSnippet($a, $b) {
       return 1;
     }
     // fallback to name sort; don't really want to do this, but it makes results more stable
-    if ($a['name'] < $b['name']) {
+    if ($a['sortId'] < $b['sortId']) {
       return -1;
     }
-    if ($a['name'] > $b['name']) {
+    if ($a['sortId'] > $b['sortId']) {
       return 1;
     }
     return 0;

From bac2c5e42fb9a4d21f74d5bb41e0b51a9a8af7c0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2020 19:56:43 -0700
Subject: [PATCH 109/834] CollectionTrait - Model scriptFile and styleFile as
 distinct types

---
 CRM/Core/Region.php                    | 14 ++++++-
 CRM/Core/Resources/CollectionTrait.php | 55 +++++++++++++++-----------
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 3f4e1f29d04b..7a31455005ff 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -36,7 +36,7 @@ public static function &instance($name, $autocreate = TRUE) {
    */
   public function __construct($name) {
     $this->_name = $name;
-    $this->types = ['markup', 'template', 'callback', 'scriptUrl', 'script', 'jquery', 'settings', 'style', 'styleUrl'];
+    $this->types = ['markup', 'template', 'callback', 'scriptFile', 'scriptUrl', 'script', 'jquery', 'settings', 'style', 'styleFile', 'styleUrl'];
     $this->defaults['region'] = $name;
 
     // Placeholder which represents any of the default content generated by the main Smarty template
@@ -100,12 +100,24 @@ public function render($default, $allowCmsOverride = TRUE) {
           ]);
           break;
 
+        case 'scriptFile':
+          foreach ($snippet['scriptFileUrls'] as $url) {
+            $html .= $renderSnippet(['type' => 'scriptUrl', 'scriptUrl' => $url] + $snippet);
+          }
+          break;
+
         case 'script':
           if (!$allowCmsOverride || !$cms->addScript($snippet['script'], $this->_name)) {
             $html .= sprintf("<script type=\"text/javascript\">\n%s\n</script>\n", $snippet['script']);
           }
           break;
 
+        case 'styleFile':
+          foreach ($snippet['styleFileUrls'] as $url) {
+            $html .= $renderSnippet(['type' => 'styleUrl', 'styleUrl' => $url] + $snippet);
+          }
+          break;
+
         case 'styleUrl':
           if (!$allowCmsOverride || !$cms->addStyleUrl($snippet['styleUrl'], $this->_name)) {
             $html .= sprintf("<link href=\"%s\" rel=\"stylesheet\" type=\"text/css\"/>\n", $snippet['styleUrl']);
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 35147c48b737..38d259bc7337 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -102,27 +102,55 @@ public function add($snippet) {
         }
       }
     }
-    elseif (!in_array($snippet['type'], $this->types)) {
-      throw new \RuntimeException("Unsupported snippet type: " . $snippet['type']);
+    if (!in_array($snippet['type'] ?? NULL, $this->types)) {
+      $typeExpr = $snippet['type'] ?? '(' . implode(',', array_keys($snippet)) . ')';
+      throw new \RuntimeException("Unsupported snippet type: $typeExpr");
     }
     // Traditional behavior: sort by (1) weight and (2) either name or natural position. This second thing is called 'sortId'.
     if (isset($snippet['name'])) {
       $snippet['sortId'] = $snippet['name'];
     }
     else {
-      $snippet['sortId'] = $this->nextId();
       switch ($snippet['type']) {
         case 'scriptUrl':
         case 'styleUrl':
+          $snippet['sortId'] = $this->nextId();
           $snippet['name'] = $snippet[$snippet['type']];
           break;
 
+        case 'scriptFile':
+        case 'styleFile':
+          $snippet['sortId'] = $this->nextId();
+          $snippet['name'] = implode(':', $snippet[$snippet['type']]);
+          break;
+
         default:
+          $snippet['sortId'] = $this->nextId();
           $snippet['name'] = $snippet['sortId'];
           break;
       }
     }
 
+    if ($snippet['type'] === 'scriptFile' && !isset($snippet['scriptFileUrls'])) {
+      $res = Civi::resources();
+      list ($ext, $file) = $snippet['scriptFile'];
+
+      $snippet['translate'] = $snippet['translate'] ?? TRUE;
+      if ($snippet['translate']) {
+        $domain = ($snippet['translate'] === TRUE) ? $ext : $snippet['translate'];
+        // Is this too early?
+        $this->addString(Civi::service('resources.js_strings')->get($domain, $res->getPath($ext, $file), 'text/javascript'), $domain);
+      }
+      $snippet['scriptFileUrls'] = [$res->getUrl($ext, $res->filterMinify($ext, $file), TRUE)];
+    }
+
+    if ($snippet['type'] === 'styleFile' && !isset($snippet['styleFileUrls'])) {
+      /** @var Civi\Core\Themes $theme */
+      $theme = Civi::service('themes');
+      list ($ext, $file) = $snippet['styleFile'];
+      $snippet['styleFileUrls'] = $theme->resolveUrls($theme->getActiveThemeKey(), $ext, $file);
+    }
+
     $this->snippets[$snippet['name']] = $snippet;
     $this->isSorted = FALSE;
     return $snippet;
@@ -361,18 +389,7 @@ public function addScript(string $code, array $options = []) {
    * @throws \CRM_Core_Exception
    */
   public function addScriptFile(string $ext, string $file, array $options = []) {
-    // TODO: Maybe this should be its own resource type to allow smarter management?
-
-    $res = Civi::resources();
-
-    $translate = $options['translate'] ?? TRUE;
-    unset($options['translate']);
-    if ($translate) {
-      $domain = ($translate === TRUE) ? $ext : $translate;
-      $this->addString(Civi::service('resources.js_strings')->get($domain, $res->getPath($ext, $file), 'text/javascript'), $domain);
-    }
-    $url = $res->getUrl($ext, $res->filterMinify($ext, $file), TRUE);
-    $this->add($options + ['scriptUrl' => $url, 'name' => "$ext:$file"]);
+    $this->add($options + ['scriptFile' => [$ext, $file]]);
     return $this;
   }
 
@@ -469,13 +486,7 @@ public function addStyle(string $code, array $options = []) {
    * @return static
    */
   public function addStyleFile(string $ext, string $file, array $options = []) {
-    // TODO: Maybe this should be its own resource type to allow smarter management?
-
-    /** @var Civi\Core\Themes $theme */
-    $theme = Civi::service('themes');
-    foreach ($theme->resolveUrls($theme->getActiveThemeKey(), $ext, $file) as $url) {
-      $this->add($options + ['styleUrl' => $url, 'name' => "$ext:$file"]);
-    }
+    $this->add($options + ['styleFile' => [$ext, $file]]);
     return $this;
   }
 

From fcf926ad4ab1df90dd9d553a75f7385124420220 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 23 Aug 2020 18:49:44 -0700
Subject: [PATCH 110/834] Add "Bundle" support - ie an unattached, mixable list
 of resources

---
 CRM/Core/Resources.php                 | 57 ++++++++++++++++++++++++++
 CRM/Core/Resources/Bundle.php          | 38 +++++++++++++++++
 CRM/Core/Resources/CollectionTrait.php | 21 ++++++++++
 3 files changed, 116 insertions(+)
 create mode 100644 CRM/Core/Resources/Bundle.php

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 9b694bb03a19..4265fee1cf14 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -45,6 +45,15 @@ class CRM_Core_Resources {
    */
   private $strings = NULL;
 
+  /**
+   * Any bundles that have been added.
+   *
+   * Format is ($bundleName => bool).
+   *
+   * @var array
+   */
+  protected $addedBundles = [];
+
   /**
    * Added core resources.
    *
@@ -139,6 +148,54 @@ public function __construct($extMapper, $strings, $cacheCodeKey = NULL) {
     $this->paths = Civi::paths();
   }
 
+  /**
+   * Assimilate all the resources listed in a bundle.
+   *
+   * @param iterable|string|\CRM_Core_Resources_Bundle $bundle
+   *   Either bundle object, or the symbolic name of a bundle, or a list of budnles.
+   *   Note: For symbolic names, the bundle must be a container service ('bundle.FOO').
+   * @return static
+   */
+  public function addBundle($bundle) {
+    if (is_iterable($bundle)) {
+      foreach ($bundle as $b) {
+        $this->addBundle($b);
+        return $this;
+      }
+    }
+
+    if (is_string($bundle)) {
+      $bundle = Civi::service('bundle.' . $bundle);
+    }
+
+    if (isset($this->addedBundles[$bundle->name])) {
+      return $this;
+    }
+    $this->addedBundles[$bundle->name] = TRUE;
+
+    // If an item is already assigned to a region, we'll respect that.
+    // Otherwise, we'll use defaults.
+    $pickRegion = function ($snippet) {
+      if (isset($snippet['settings'])) {
+        return $this->getSettingRegion($snippet['region'] ?? NULL)->_name;
+      }
+      else {
+        return $snippet['region'] ?? self::DEFAULT_REGION;
+      }
+    };
+
+    $byRegion = [];
+    foreach ($bundle->getAll() as $snippet) {
+      $snippet['region'] = $pickRegion($snippet);
+      $byRegion[$snippet['region']][$snippet['name']] = $snippet;
+    }
+
+    foreach ($byRegion as $regionName => $snippets) {
+      CRM_Core_Region::instance($regionName)->merge($snippets);
+    }
+    return $this;
+  }
+
   /**
    * Export permission data to the client to enable smarter GUIs.
    *
diff --git a/CRM/Core/Resources/Bundle.php b/CRM/Core/Resources/Bundle.php
new file mode 100644
index 000000000000..311dc2a05d39
--- /dev/null
+++ b/CRM/Core/Resources/Bundle.php
@@ -0,0 +1,38 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Resources_Bundle
+ *
+ * A bundle is a collection of web resources with the following details:
+ * - Only scripts, styles, and settings are allowed. Free-form markup is not.
+ * - Resources *may* have a 'region'. Hopefully, this is not necessary for most bundles.
+ * - If no 'region' is given, then CRM_Core_Resources will pick a default at activation time.
+ */
+class CRM_Core_Resources_Bundle implements CRM_Core_Resources_CollectionInterface {
+
+  use CRM_Core_Resources_CollectionTrait;
+
+  /**
+   * Symbolic name for this bundle.
+   *
+   * @var string|null
+   */
+  public $name;
+
+  /**
+   */
+  public function __construct($name = NULL) {
+    $this->name = $name;
+    $this->types = ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl'];
+  }
+
+}
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 38d259bc7337..b402e61ea797 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -328,6 +328,27 @@ public static function _cmpSnippet($a, $b) {
 
   // -----------------------------------------------
 
+  /**
+   * Assimilate all the resources listed in a bundle.
+   *
+   * @param iterable|string|\CRM_Core_Resources_Bundle $bundle
+   *   Either bundle object, or the symbolic name of a bundle.
+   *   Note: For symbolic names, the bundle must be a container service ('bundle.FOO').
+   * @return static
+   */
+  public function addBundle($bundle) {
+    if (is_iterable($bundle)) {
+      foreach ($bundle as $b) {
+        $this->addBundle($b);
+        return $this;
+      }
+    }
+    if (is_string($bundle)) {
+      $bundle = Civi::service('bundle.' . $bundle);
+    }
+    return $this->merge($bundle->getAll());
+  }
+
   /**
    * Export permission data to the client to enable smarter GUIs.
    *

From 060617e9df668cd7d422b6b32276364cd3368310 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2020 20:45:29 -0700
Subject: [PATCH 111/834] CollectionTrait - Use "splats". Split out "adders".
 Define interfaces.

In the prior commits, the signatures for `addScriptFile()`,
`addScriptUrl()`, etc are not strictly interoperable between
`CRM_Core_Resources` and `CollectionTrait`.  This is because they use
key-value options instead of positional options.  This makes it easier
disregard positional options that don't make sense (e.g.  when calling
`CRM_Core_Region::addScriptFile()`, it's silly to reserve a positional
argument for the `$region` option).

The signatures *can* be unified by using "splats" (ie `...$options`) to
accept either key-value options or backward-compatible positional options.
The ultimate is hope is that:

* `CRM_Core_Resources`, `CRM_Core_Region`, and `CRM_Core_Bundle` all
  implement the `CollectionAdderInterface`.
* `CRM_Core_Resources`, `CRM_Core_Region`, and `CRM_Core_Bundle` all
  accept options in either format (key-value or positional).
* The positional format will fade-away.

The methods in CollectionTrait are newer terrain, so it's safer to change
those signatures, so we do that first.

Note that CollectionTrait formally builds on CollectionAdderTrait. This
ensures that IDE navigation to (eg) `CRM_Core_Region::add()` and
`CRM_Core_Resources_Bundle::add()` works as expected.
---
 CRM/Core/Region.php                           |   6 +-
 .../Resources/CollectionAdderInterface.php    | 208 ++++++++++
 CRM/Core/Resources/CollectionAdderTrait.php   | 382 ++++++++++++++++++
 CRM/Core/Resources/CollectionInterface.php    | 133 ++++++
 CRM/Core/Resources/CollectionTrait.php        | 249 +-----------
 5 files changed, 729 insertions(+), 249 deletions(-)
 create mode 100644 CRM/Core/Resources/CollectionAdderInterface.php
 create mode 100644 CRM/Core/Resources/CollectionAdderTrait.php
 create mode 100644 CRM/Core/Resources/CollectionInterface.php

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 7a31455005ff..c7eab5c58418 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -3,7 +3,7 @@
 /**
  * Maintain a set of markup/templates to inject inside various regions
  */
-class CRM_Core_Region {
+class CRM_Core_Region implements CRM_Core_Resources_CollectionInterface, CRM_Core_Resources_CollectionAdderInterface {
 
   /**
    * Obtain the content for a given region.
@@ -20,9 +20,7 @@ public static function &instance($name, $autocreate = TRUE) {
     return Civi::$statics[__CLASS__][$name];
   }
 
-  use CRM_Core_Resources_CollectionTrait {
-    CRM_Core_Resources_CollectionTrait::add as _add;
-  }
+  use CRM_Core_Resources_CollectionTrait;
 
   /**
    * Symbolic name of this region
diff --git a/CRM/Core/Resources/CollectionAdderInterface.php b/CRM/Core/Resources/CollectionAdderInterface.php
new file mode 100644
index 000000000000..5f435ce1b840
--- /dev/null
+++ b/CRM/Core/Resources/CollectionAdderInterface.php
@@ -0,0 +1,208 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * The collection-adder interface provides write-only support for a collection.
+ */
+interface CRM_Core_Resources_CollectionAdderInterface {
+
+  /**
+   * Add an item to the collection.
+   *
+   * @param array $snippet
+   * @return array
+   *   The full/computed snippet (with defaults applied).
+   * @see CRM_Core_Resources_CollectionInterface::add()
+   */
+  public function add($snippet);
+
+  // TODO public function addBundle($bundle);
+
+  /**
+   * Export permission data to the client to enable smarter GUIs.
+   *
+   * Note: Application security stems from the server's enforcement
+   * of the security logic (e.g. in the API permissions). There's no way
+   * the client can use this info to make the app more secure; however,
+   * it can produce a better-tuned (non-broken) UI.
+   *
+   * @param string|iterable $permNames
+   *   List of permission names to check/export.
+   * @return static
+   */
+  public function addPermissions($permNames);
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * @param string $code
+   *   JavaScript source code.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addScript(string $code, ...$options);
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * Options may be use key-value format (preferred) or positional format (legacy).
+   *
+   * - addScriptFile('myext', 'my.js', ['weight' => 123, 'region' => 'page-footer'])
+   * - addScriptFile('myext', 'my.js', 123, 'page-footer')
+   *
+   * @param string $ext
+   *   extension name; use 'civicrm' for core.
+   * @param string $file
+   *   file path -- relative to the extension base dir.
+   * @param array $options
+   *   Open-ended list of options (per add()).
+   *   Ex: ['weight' => 123]
+   *   Accepts some additional options:
+   *     - bool|string $translate: Whether to load translated strings for this file. Use one of:
+   *     - FALSE: Do not load translated strings.
+   *     - TRUE: Load translated strings. Use the $ext's default domain.
+   *     - string: Load translated strings. Use a specific domain.
+   *
+   * @return static
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function addScriptFile(string $ext, string $file, ...$options);
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * Options may be use key-value format (preferred) or positional format (legacy).
+   *
+   * - addScriptUrl('http://example.com/foo.js', ['weight' => 123, 'region' => 'page-footer'])
+   * - addScriptUrl('http://example.com/foo.js', 123, 'page-footer')
+   *
+   * @param string $url
+   * @param array $options
+   *   Open-ended list of options (per add())
+   * @return static
+   */
+  public function addScriptUrl(string $url, ...$options);
+
+  /**
+   * Add translated string to the js CRM object.
+   * It can then be retrived from the client-side ts() function
+   * Variable substitutions can happen from client-side
+   *
+   * Note: this function rarely needs to be called directly and is mostly for internal use.
+   * See CRM_Core_Resources::addScriptFile which automatically adds translated strings from js files
+   *
+   * Simple example:
+   * // From php:
+   * CRM_Core_Resources::singleton()->addString('Hello');
+   * // The string is now available to javascript code i.e.
+   * ts('Hello');
+   *
+   * Example with client-side substitutions:
+   * // From php:
+   * CRM_Core_Resources::singleton()->addString('Your %1 has been %2');
+   * // ts() in javascript works the same as in php, for example:
+   * ts('Your %1 has been %2', {1: objectName, 2: actionTaken});
+   *
+   * NOTE: This function does not work with server-side substitutions
+   * (as this might result in collisions and unwanted variable injections)
+   * Instead, use code like:
+   * CRM_Core_Resources::singleton()->addSetting(array('myNamespace' => array('myString' => ts('Your %1 has been %2', array(subs)))));
+   * And from javascript access it at CRM.myNamespace.myString
+   *
+   * @param string|array $text
+   * @param string|null $domain
+   * @return static
+   */
+  public function addString($text, $domain = 'civicrm');
+
+  /**
+   * Add a CSS content to the current page using <STYLE>.
+   *
+   * @param string $code
+   *   CSS source code.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyle(string $code, ...$options);
+
+  /**
+   * Add a CSS file to the current page using <LINK HREF>.
+   *
+   * @param string $ext
+   *   extension name; use 'civicrm' for core.
+   * @param string $file
+   *   file path -- relative to the extension base dir.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyleFile(string $ext, string $file, ...$options);
+
+  /**
+   * Add a CSS file to the current page using <LINK HREF>.
+   *
+   * @param string $url
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyleUrl(string $url, ...$options);
+
+  /**
+   * Add JavaScript variables to CRM.vars
+   *
+   * Example:
+   * From the server:
+   * CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
+   * Access var from javascript:
+   * CRM.vars.myNamespace.foo // "bar"
+   *
+   * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
+   *
+   * @param string $nameSpace
+   *   Usually the name of your extension.
+   * @param array $vars
+   *   Data to export.
+   * @param array $options
+   *   Extra processing instructions on where/how to place the data.
+   * @return static
+   */
+  public function addVars(string $nameSpace, array $vars, ...$options);
+
+  /**
+   * Add JavaScript variables to the root of the CRM object.
+   * This function is usually reserved for low-level system use.
+   * Extensions and components should generally use addVars instead.
+   *
+   * @param array $settings
+   *   Data to export.
+   * @param array $options
+   *   Extra processing instructions on where/how to place the data.
+   * @return static
+   */
+  public function addSetting(array $settings, ...$options);
+
+  /**
+   * Add JavaScript variables to the global CRM object via a callback function.
+   *
+   * @param callable $callable
+   * @return static
+   */
+  public function addSettingsFactory($callable);
+
+}
diff --git a/CRM/Core/Resources/CollectionAdderTrait.php b/CRM/Core/Resources/CollectionAdderTrait.php
new file mode 100644
index 000000000000..87ab8e878ab4
--- /dev/null
+++ b/CRM/Core/Resources/CollectionAdderTrait.php
@@ -0,0 +1,382 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Resources_CollectionTrait
+ *
+ * This is a building-block for creating classes which maintain a list of resources.
+ *
+ * The class is generally organized in two sections: First, we have core
+ * bit that manages a list of '$snippets'. Second, we have a set of helper
+ * functions which add some syntactic sugar for the snippets.
+ */
+trait CRM_Core_Resources_CollectionAdderTrait {
+
+  /**
+   * Add an item to the collection.
+   *
+   * @param array $snippet
+   * @return array
+   *   The full/computed snippet (with defaults applied).
+   * @see CRM_Core_Resources_CollectionInterface::add()
+   */
+  abstract public function add($snippet);
+
+  /**
+   * Locate the 'settings' snippet.
+   *
+   * @param array $options
+   * @return array
+   */
+  abstract protected function &findCreateSettingSnippet($options = []): array;
+
+  /**
+   * Export permission data to the client to enable smarter GUIs.
+   *
+   * Note: Application security stems from the server's enforcement
+   * of the security logic (e.g. in the API permissions). There's no way
+   * the client can use this info to make the app more secure; however,
+   * it can produce a better-tuned (non-broken) UI.
+   *
+   * @param string|iterable $permNames
+   *   List of permission names to check/export.
+   * @return static
+   */
+  public function addPermissions($permNames) {
+    // TODO: Maybe this should be its own resource type to allow smarter management?
+    $permNames = is_scalar($permNames) ? [$permNames] : $permNames;
+
+    $perms = [];
+    foreach ($permNames as $permName) {
+      $perms[$permName] = CRM_Core_Permission::check($permName);
+    }
+    return $this->addSetting([
+      'permissions' => $perms,
+    ]);
+  }
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * @param string $code
+   *   JavaScript source code.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addScript(string $code, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'script' => $code,
+    ]));
+    return $this;
+  }
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * Options may be use key-value format (preferred) or positional format (legacy).
+   *
+   * - addScriptFile('myext', 'my.js', ['weight' => 123, 'region' => 'page-footer'])
+   * - addScriptFile('myext', 'my.js', 123, 'page-footer')
+   *
+   * @param string $ext
+   *   extension name; use 'civicrm' for core.
+   * @param string $file
+   *   file path -- relative to the extension base dir.
+   * @param array $options
+   *   Open-ended list of options (per add()).
+   *   Ex: ['weight' => 123]
+   *   Accepts some additional options:
+   *   - bool|string $translate: Whether to load translated strings for this file. Use one of:
+   *     - FALSE: Do not load translated strings.
+   *     - TRUE: Load translated strings. Use the $ext's default domain.
+   *     - string: Load translated strings. Use a specific domain.
+   *
+   * @return static
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function addScriptFile(string $ext, string $file, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'scriptFile' => [$ext, $file],
+    ]));
+    return $this;
+  }
+
+  /**
+   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   *
+   * Options may be use key-value format (preferred) or positional format (legacy).
+   *
+   * - addScriptUrl('http://example.com/foo.js', ['weight' => 123, 'region' => 'page-footer'])
+   * - addScriptUrl('http://example.com/foo.js', 123, 'page-footer')
+   *
+   * @param string $url
+   * @param array $options
+   *   Open-ended list of options (per add())
+   * @return static
+   */
+  public function addScriptUrl(string $url, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'scriptUrl' => $url,
+    ]));
+    return $this;
+  }
+
+  /**
+   * Add translated string to the js CRM object.
+   * It can then be retrived from the client-side ts() function
+   * Variable substitutions can happen from client-side
+   *
+   * Note: this function rarely needs to be called directly and is mostly for internal use.
+   * See CRM_Core_Resources::addScriptFile which automatically adds translated strings from js files
+   *
+   * Simple example:
+   * // From php:
+   * CRM_Core_Resources::singleton()->addString('Hello');
+   * // The string is now available to javascript code i.e.
+   * ts('Hello');
+   *
+   * Example with client-side substitutions:
+   * // From php:
+   * CRM_Core_Resources::singleton()->addString('Your %1 has been %2');
+   * // ts() in javascript works the same as in php, for example:
+   * ts('Your %1 has been %2', {1: objectName, 2: actionTaken});
+   *
+   * NOTE: This function does not work with server-side substitutions
+   * (as this might result in collisions and unwanted variable injections)
+   * Instead, use code like:
+   * CRM_Core_Resources::singleton()->addSetting(array('myNamespace' => array('myString' => ts('Your %1 has been %2', array(subs)))));
+   * And from javascript access it at CRM.myNamespace.myString
+   *
+   * @param string|array $text
+   * @param string|null $domain
+   * @return static
+   */
+  public function addString($text, $domain = 'civicrm') {
+    // TODO: Maybe this should be its own resource type to allow smarter management?
+
+    foreach ((array) $text as $str) {
+      $translated = ts($str, [
+        'domain' => ($domain == 'civicrm') ? NULL : [$domain, NULL],
+        'raw' => TRUE,
+      ]);
+
+      // We only need to push this string to client if the translation
+      // is actually different from the original
+      if ($translated != $str) {
+        $bucket = $domain == 'civicrm' ? 'strings' : 'strings::' . $domain;
+        $this->addSetting([
+          $bucket => [$str => $translated],
+        ]);
+      }
+    }
+    return $this;
+  }
+
+  /**
+   * Add a CSS content to the current page using <STYLE>.
+   *
+   * @param string $code
+   *   CSS source code.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyle(string $code, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'style' => $code,
+    ]));
+    return $this;
+  }
+
+  /**
+   * Add a CSS file to the current page using <LINK HREF>.
+   *
+   * @param string $ext
+   *   extension name; use 'civicrm' for core.
+   * @param string $file
+   *   file path -- relative to the extension base dir.
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyleFile(string $ext, string $file, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'styleFile' => [$ext, $file],
+    ]));
+    return $this;
+  }
+
+  /**
+   * Add a CSS file to the current page using <LINK HREF>.
+   *
+   * @param string $url
+   * @param array $options
+   *   Open-ended list of options (per add())
+   *   Ex: ['weight' => 123]
+   * @return static
+   */
+  public function addStyleUrl(string $url, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'styleUrl' => $url,
+    ]));
+    return $this;
+  }
+
+  /**
+   * Add JavaScript variables to the root of the CRM object.
+   * This function is usually reserved for low-level system use.
+   * Extensions and components should generally use addVars instead.
+   *
+   * @param array $settings
+   *   Data to export.
+   * @param array $options
+   *   Extra processing instructions on where/how to place the data.
+   * @return static
+   */
+  public function addSetting(array $settings, ...$options) {
+    $s = &$this->findCreateSettingSnippet($options);
+    $s['settings'] = self::mergeSettings($s['settings'], $settings);
+    return $this;
+  }
+
+  /**
+   * Add JavaScript variables to the global CRM object via a callback function.
+   *
+   * @param callable $callable
+   * @return static
+   */
+  public function addSettingsFactory($callable) {
+    $s = &$this->findCreateSettingSnippet();
+    $s['settingsFactories'][] = $callable;
+    return $this;
+  }
+
+  /**
+   * Add JavaScript variables to CRM.vars
+   *
+   * Example:
+   *   From the server:
+   *     CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
+   *   Access var from javascript:
+   *     CRM.vars.myNamespace.foo // "bar"
+   *
+   * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
+   *
+   * @param string $nameSpace
+   *   Usually the name of your extension.
+   * @param array $vars
+   * @param array $options
+   *   There are no supported options.
+   * @return static
+   */
+  public function addVars(string $nameSpace, array $vars, ...$options) {
+    $s = &$this->findCreateSettingSnippet($options);
+    $s['settings']['vars'][$nameSpace] = self::mergeSettings(
+      $s['settings']['vars'][$nameSpace] ?? [],
+      $vars
+    );
+    return $this;
+  }
+
+  /**
+   * Given the "$options" for "addScriptUrl()" (etal), normalize the contents
+   * and potentially add more.
+   *
+   * @param array $splats
+   *   A list of options, as represented by the splat mechanism ("...$options").
+   *   This may appear in one of two ways:
+   *   - New (String Index): as in `addFoo($foo, array $options)`
+   *   - Old (Numeric Index): as in `addFoo($foo, int $weight = X, string $region = Y, bool $translate = X)`
+   * @param array $defaults
+   *   List of values to merge into $options.
+   * @return array
+   */
+  public static function mergeStandardOptions(array $splats, array $defaults = []) {
+    $count = count($splats);
+    switch ($count) {
+      case 0:
+        // Common+simple case: No splat options. We can short-circuit.
+        return $defaults;
+
+      case 1:
+        // Might be new format (key-value pairs) or old format
+        $parsed = is_array($splats[0]) ? $splats[0] : ['weight' => $splats[0]];
+        break;
+
+      case 2:
+        $parsed = ['weight' => $splats[0], 'region' => $splats[1]];
+        break;
+
+      case 3:
+        $parsed = ['weight' => $splats[0], 'region' => $splats[1], 'translate' => $splats[2]];
+        break;
+
+      default:
+        throw new \RuntimeException("Cannot resolve resource options. For clearest behavior, pass options in key-value format.");
+    }
+
+    return array_merge($defaults, $parsed);
+  }
+
+  /**
+   * Given the "$options" for "addSetting()" (etal), normalize the contents
+   * and potentially add more.
+   *
+   * @param array $splats
+   *   A list of options, as represented by the splat mechanism ("...$options").
+   *   This may appear in one of two ways:
+   *   - New (String Index): as in `addFoo($foo, array $options)`
+   *   - Old (Numeric Index): as in `addFoo($foo, int $weight = X, string $region = Y, bool $translate = X)`
+   * @param array $defaults
+   *   List of values to merge into $options.
+   * @return array
+   */
+  public static function mergeSettingOptions(array $splats, array $defaults = []) {
+    $count = count($splats);
+    switch ($count) {
+      case 0:
+        // Common+simple case: No splat options. We can short-circuit.
+        return $defaults;
+
+      case 1:
+        // Might be new format (key-value pairs) or old format
+        $parsed = is_array($splats[0]) ? $splats[0] : ['region' => $splats[0]];
+        break;
+
+      default:
+        throw new \RuntimeException("Cannot resolve resource options. For clearest behavior, pass options in key-value format.");
+    }
+
+    return array_merge($defaults, $parsed);
+  }
+
+  /**
+   * @param array $settings
+   * @param array $additions
+   * @return array
+   *   combination of $settings and $additions
+   */
+  public static function mergeSettings(array $settings, array $additions): array {
+    foreach ($additions as $k => $v) {
+      if (isset($settings[$k]) && is_array($settings[$k]) && is_array($v)) {
+        $v += $settings[$k];
+      }
+      $settings[$k] = $v;
+    }
+    return $settings;
+  }
+
+}
diff --git a/CRM/Core/Resources/CollectionInterface.php b/CRM/Core/Resources/CollectionInterface.php
new file mode 100644
index 000000000000..a00c881887f8
--- /dev/null
+++ b/CRM/Core/Resources/CollectionInterface.php
@@ -0,0 +1,133 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Resources_CollectionInterface
+ *
+ * This is a building-block for creating classes which maintain a list of resources.
+ */
+interface CRM_Core_Resources_CollectionInterface {
+
+  /**
+   * Add an item to the collection. For example, when working with 'page-header' collection:
+   *
+   * ```
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'markup' => '<div style="color:red">Hello!</div>',
+   * ));
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'script' => 'alert("Hello");',
+   * ));
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'template' => 'CRM/Myextension/Extra.tpl',
+   * ));
+   * CRM_Core_Region::instance('page-header')->add(array(
+   *   'callback' => 'myextension_callback_function',
+   * ));
+   * ```
+   *
+   * Note: This function does not perform any extra encoding of markup, script code, or etc. If
+   * you're passing in user-data, you must clean it yourself.
+   *
+   * @param array $snippet
+   *   Array; keys:.
+   *   - type: string (auto-detected for markup, template, callback, script, scriptFile, scriptUrl, jquery, style, styleFile, styleUrl)
+   *   - name: string, optional
+   *   - weight: int, optional; default=1
+   *   - disabled: int, optional; default=0
+   *   - markup: string, HTML; required (for type==markup)
+   *   - template: string, path; required (for type==template)
+   *   - callback: mixed; required (for type==callback)
+   *   - arguments: array, optional (for type==callback)
+   *   - script: string, Javascript code
+   *   - scriptFile: array, the name of the extension and file. Ex: ['civicrm', 'js/foo.js']
+   *   - scriptUrl: string, URL of a Javascript file
+   *   - jquery: string, Javascript code which runs inside a jQuery(function($){...}); block
+   *   - settings: array, list of static values to convey.
+   *   - style: string, CSS code
+   *   - styleFile: array, the name of the extension and file. Ex: ['civicrm', 'js/foo.js']
+   *   - styleUrl: string, URL of a CSS file
+   *
+   * @return array
+   *   The full/computed snippet (with defaults applied).
+   */
+  public function add($snippet);
+
+  /**
+   * Update specific properties of a snippet.
+   *
+   * Ex: $region->update('default', ['disabled' => TRUE]);
+   *
+   * @param string $name
+   * @param $snippet
+   * @return static
+   */
+  public function update($name, $snippet);
+
+  /**
+   * Remove all snippets.
+   *
+   * @return static
+   */
+  public function clear();
+
+  /**
+   * Get snippet.
+   *
+   * @param string $name
+   * @return array|NULL
+   */
+  public function &get($name);
+
+  /**
+   * Get a list of all snippets in this collection.
+   *
+   * @return iterable
+   */
+  public function getAll(): iterable;
+
+  /**
+   * Alter the contents of the collection.
+   *
+   * @param callable $callback
+   *   The callback is invoked once for each member in the collection.
+   *   The callback may return one of three values:
+   *   - TRUE: The item is OK and belongs in the collection.
+   *   - FALSE: The item is not OK and should be omitted from the collection.
+   *   - Array: The item should be revised (using the returned value).
+   * @return static
+   */
+  public function filter($callback);
+
+  /**
+   * Find all snippets which match the given criterion.
+   *
+   * @param callable $callback
+   *   The callback is invoked once for each member in the collection.
+   *   The callback may return one of two values:
+   *   - TRUE: The item is OK and belongs in the collection.
+   *   - FALSE: The item is not OK and should be omitted from the collection.
+   * @return iterable
+   *   List of matching snippets.
+   */
+  public function find($callback): iterable;
+
+  /**
+   * Assimilate a list of resources into this list.
+   *
+   * @param iterable $others
+   *   List of snippets to add.
+   * @return static
+   * @see CRM_Core_Resources_CollectionInterface::merge()
+   */
+  public function merge(iterable $others);
+
+}
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index b402e61ea797..c2adc9e1981b 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -20,6 +20,8 @@
  */
 trait CRM_Core_Resources_CollectionTrait {
 
+  use CRM_Core_Resources_CollectionAdderTrait;
+
   /**
    * Static defaults - a list of options to apply to any new snippets.
    *
@@ -349,233 +351,6 @@ public function addBundle($bundle) {
     return $this->merge($bundle->getAll());
   }
 
-  /**
-   * Export permission data to the client to enable smarter GUIs.
-   *
-   * Note: Application security stems from the server's enforcement
-   * of the security logic (e.g. in the API permissions). There's no way
-   * the client can use this info to make the app more secure; however,
-   * it can produce a better-tuned (non-broken) UI.
-   *
-   * @param string|iterable $permNames
-   *   List of permission names to check/export.
-   * @return static
-   */
-  public function addPermissions($permNames) {
-    // TODO: Maybe this should be its own resource type to allow smarter management?
-    $permNames = is_scalar($permNames) ? [$permNames] : $permNames;
-
-    $perms = [];
-    foreach ($permNames as $permName) {
-      $perms[$permName] = CRM_Core_Permission::check($permName);
-    }
-    return $this->addSetting([
-      'permissions' => $perms,
-    ]);
-  }
-
-  /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * @param string $code
-   *   JavaScript source code.
-   * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
-   * @return static
-   */
-  public function addScript(string $code, array $options = []) {
-    $this->add($options + ['script' => $code]);
-    return $this;
-  }
-
-  /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * @param string $ext
-   *   extension name; use 'civicrm' for core.
-   * @param string $file
-   *   file path -- relative to the extension base dir.
-   * @param array $options
-   *   Open-ended list of options (per add()).
-   *   Ex: ['weight' => 123]
-   *   Accepts some additional options:
-   *   - bool|string $translate: Whether to load translated strings for this file. Use one of:
-   *     - FALSE: Do not load translated strings.
-   *     - TRUE: Load translated strings. Use the $ext's default domain.
-   *     - string: Load translated strings. Use a specific domain.
-   *
-   * @return static
-   *
-   * @throws \CRM_Core_Exception
-   */
-  public function addScriptFile(string $ext, string $file, array $options = []) {
-    $this->add($options + ['scriptFile' => [$ext, $file]]);
-    return $this;
-  }
-
-  /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * @param string $url
-   * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
-   * @return static
-   */
-  public function addScriptUrl(string $url, array $options = []) {
-    $this->add($options + ['scriptUrl' => $url]);
-    return $this;
-  }
-
-  /**
-   * Add translated string to the js CRM object.
-   * It can then be retrived from the client-side ts() function
-   * Variable substitutions can happen from client-side
-   *
-   * Note: this function rarely needs to be called directly and is mostly for internal use.
-   * See CRM_Core_Resources::addScriptFile which automatically adds translated strings from js files
-   *
-   * Simple example:
-   * // From php:
-   * CRM_Core_Resources::singleton()->addString('Hello');
-   * // The string is now available to javascript code i.e.
-   * ts('Hello');
-   *
-   * Example with client-side substitutions:
-   * // From php:
-   * CRM_Core_Resources::singleton()->addString('Your %1 has been %2');
-   * // ts() in javascript works the same as in php, for example:
-   * ts('Your %1 has been %2', {1: objectName, 2: actionTaken});
-   *
-   * NOTE: This function does not work with server-side substitutions
-   * (as this might result in collisions and unwanted variable injections)
-   * Instead, use code like:
-   * CRM_Core_Resources::singleton()->addSetting(array('myNamespace' => array('myString' => ts('Your %1 has been %2', array(subs)))));
-   * And from javascript access it at CRM.myNamespace.myString
-   *
-   * @param string|array $text
-   * @param string|null $domain
-   * @return static
-   */
-  public function addString($text, $domain = 'civicrm') {
-    // TODO: Maybe this should be its own resource type to allow smarter management?
-
-    foreach ((array) $text as $str) {
-      $translated = ts($str, [
-        'domain' => ($domain == 'civicrm') ? NULL : [$domain, NULL],
-        'raw' => TRUE,
-      ]);
-
-      // We only need to push this string to client if the translation
-      // is actually different from the original
-      if ($translated != $str) {
-        $bucket = $domain == 'civicrm' ? 'strings' : 'strings::' . $domain;
-        $this->addSetting([
-          $bucket => [$str => $translated],
-        ]);
-      }
-    }
-    return $this;
-  }
-
-  /**
-   * Add a CSS content to the current page using <STYLE>.
-   *
-   * @param string $code
-   *   CSS source code.
-   * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
-   * @return static
-   */
-  public function addStyle(string $code, array $options = []) {
-    $this->add($options + ['style' => $code]);
-    return $this;
-  }
-
-  /**
-   * Add a CSS file to the current page using <LINK HREF>.
-   *
-   * @param string $ext
-   *   extension name; use 'civicrm' for core.
-   * @param string $file
-   *   file path -- relative to the extension base dir.
-   * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
-   * @return static
-   */
-  public function addStyleFile(string $ext, string $file, array $options = []) {
-    $this->add($options + ['styleFile' => [$ext, $file]]);
-    return $this;
-  }
-
-  /**
-   * Add a CSS file to the current page using <LINK HREF>.
-   *
-   * @param string $url
-   * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
-   * @return static
-   */
-  public function addStyleUrl(string $url, array $options = []) {
-    $this->add($options + ['styleUrl' => $url]);
-    return $this;
-  }
-
-  /**
-   * Add JavaScript variables to CRM.vars
-   *
-   * Example:
-   *   From the server:
-   *     CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
-   *   Access var from javascript:
-   *     CRM.vars.myNamespace.foo // "bar"
-   *
-   * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
-   *
-   * @param string $nameSpace
-   *   Usually the name of your extension.
-   * @param array $vars
-   * @return static
-   */
-  public function addVars(string $nameSpace, array $vars) {
-    $s = &$this->findCreateSettingSnippet();
-    $s['settings']['vars'][$nameSpace] = $this->mergeSettings(
-      $s['settings']['vars'][$nameSpace] ?? [],
-      $vars
-    );
-    return $this;
-  }
-
-  /**
-   * Add JavaScript variables to the root of the CRM object.
-   * This function is usually reserved for low-level system use.
-   * Extensions and components should generally use addVars instead.
-   *
-   * @param array $settings
-   * @return static
-   */
-  public function addSetting(array $settings) {
-    $s = &$this->findCreateSettingSnippet();
-    $s['settings'] = $this->mergeSettings($s['settings'], $settings);
-    return $this;
-  }
-
-  /**
-   * Add JavaScript variables to the global CRM object via a callback function.
-   *
-   * @param callable $callable
-   * @return static
-   */
-  public function addSettingsFactory($callable) {
-    $s = &$this->findCreateSettingSnippet();
-    $s['settingsFactories'][] = $callable;
-    return $this;
-  }
-
   /**
    * Get a fully-formed/altered list of settings, including the results of
    * any callbacks/listeners.
@@ -586,32 +361,16 @@ public function getSettings(): array {
     $s = &$this->findCreateSettingSnippet();
     $result = $s['settings'];
     foreach ($s['settingsFactories'] as $callable) {
-      $result = $this->mergeSettings($result, $callable());
+      $result = CRM_Core_Resources_CollectionAdderTrait::mergeSettings($result, $callable());
     }
     CRM_Utils_Hook::alterResourceSettings($result);
     return $result;
   }
 
-  /**
-   * @param array $settings
-   * @param array $additions
-   * @return array
-   *   combination of $settings and $additions
-   */
-  private function mergeSettings(array $settings, array $additions): array {
-    foreach ($additions as $k => $v) {
-      if (isset($settings[$k]) && is_array($settings[$k]) && is_array($v)) {
-        $v += $settings[$k];
-      }
-      $settings[$k] = $v;
-    }
-    return $settings;
-  }
-
   /**
    * @return array
    */
-  private function &findCreateSettingSnippet(): array {
+  protected function &findCreateSettingSnippet($options = []): array {
     $snippet = &$this->get('settings');
     if ($snippet !== NULL) {
       return $snippet;

From c8cbd3ba6828a232c48c9587aafb2422c07356ae Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 23 Aug 2020 19:15:53 -0700
Subject: [PATCH 112/834] (NFC) CollectionTrait - Reconcile docblocks

---
 .../Resources/CollectionAdderInterface.php    |  82 +++++++-------
 CRM/Core/Resources/CollectionAdderTrait.php   | 100 +++++++++--------
 CRM/Core/Resources/CollectionInterface.php    | 102 ++++++++++++------
 CRM/Core/Resources/CollectionTrait.php        |  57 ++++------
 4 files changed, 188 insertions(+), 153 deletions(-)

diff --git a/CRM/Core/Resources/CollectionAdderInterface.php b/CRM/Core/Resources/CollectionAdderInterface.php
index 5f435ce1b840..42d636d23d13 100644
--- a/CRM/Core/Resources/CollectionAdderInterface.php
+++ b/CRM/Core/Resources/CollectionAdderInterface.php
@@ -43,54 +43,46 @@ public function addPermissions($permNames);
   /**
    * Add a JavaScript file to the current page using <SCRIPT SRC>.
    *
+   * Ex: addScript('alert("Hello world");', ['weight' => 123]);
+   *
    * @param string $code
    *   JavaScript source code.
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addScript(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addScript(string $code, ...$options);
 
   /**
    * Add a JavaScript file to the current page using <SCRIPT SRC>.
    *
-   * Options may be use key-value format (preferred) or positional format (legacy).
-   *
-   * - addScriptFile('myext', 'my.js', ['weight' => 123, 'region' => 'page-footer'])
-   * - addScriptFile('myext', 'my.js', 123, 'page-footer')
+   * Ex: addScriptFile('myextension', 'myscript.js', ['weight' => 123]);
    *
    * @param string $ext
-   *   extension name; use 'civicrm' for core.
+   *   Extension name; use 'civicrm' for core.
    * @param string $file
-   *   file path -- relative to the extension base dir.
+   *   File path -- relative to the extension base dir.
    * @param array $options
-   *   Open-ended list of options (per add()).
-   *   Ex: ['weight' => 123]
-   *   Accepts some additional options:
-   *     - bool|string $translate: Whether to load translated strings for this file. Use one of:
-   *     - FALSE: Do not load translated strings.
-   *     - TRUE: Load translated strings. Use the $ext's default domain.
-   *     - string: Load translated strings. Use a specific domain.
-   *
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addScriptFile(string $code, int $weight, string $region, mixed $translate).
    * @return static
-   *
-   * @throws \CRM_Core_Exception
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addScriptFile(string $ext, string $file, ...$options);
 
   /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
+   * Add a JavaScript URL to the current page using <SCRIPT SRC>.
    *
-   * Options may be use key-value format (preferred) or positional format (legacy).
-   *
-   * - addScriptUrl('http://example.com/foo.js', ['weight' => 123, 'region' => 'page-footer'])
-   * - addScriptUrl('http://example.com/foo.js', 123, 'page-footer')
+   * Ex: addScriptUrl('http://example.com/foo.js', ['weight' => 123])
    *
    * @param string $url
    * @param array $options
-   *   Open-ended list of options (per add())
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addScriptUrl(string $url, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addScriptUrl(string $url, ...$options);
 
@@ -129,37 +121,46 @@ public function addString($text, $domain = 'civicrm');
   /**
    * Add a CSS content to the current page using <STYLE>.
    *
+   * Ex: addStyle('p { color: red; }', ['weight' => 100]);
+   *
    * @param string $code
    *   CSS source code.
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addStyle(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addStyle(string $code, ...$options);
 
   /**
    * Add a CSS file to the current page using <LINK HREF>.
    *
+   * Ex: addStyleFile('myextension', 'mystyles.css', ['weight' => 100]);
+   *
    * @param string $ext
-   *   extension name; use 'civicrm' for core.
+   *   Extension name; use 'civicrm' for core.
    * @param string $file
-   *   file path -- relative to the extension base dir.
+   *   File path -- relative to the extension base dir.
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addStyle(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addStyleFile(string $ext, string $file, ...$options);
 
   /**
    * Add a CSS file to the current page using <LINK HREF>.
    *
+   * Ex: addStyleUrl('http://example.com/foo.css', ['weight' => 100]);
+   *
    * @param string $url
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addStyleUrl(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addStyleUrl(string $url, ...$options);
 
@@ -167,10 +168,10 @@ public function addStyleUrl(string $url, ...$options);
    * Add JavaScript variables to CRM.vars
    *
    * Example:
-   * From the server:
-   * CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
-   * Access var from javascript:
-   * CRM.vars.myNamespace.foo // "bar"
+   *   From the server:
+   *     CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
+   *   Access var from javascript:
+   *     CRM.vars.myNamespace.foo // "bar"
    *
    * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
    *
@@ -179,8 +180,10 @@ public function addStyleUrl(string $url, ...$options);
    * @param array $vars
    *   Data to export.
    * @param array $options
-   *   Extra processing instructions on where/how to place the data.
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addVars(string $namespace, array $vars, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function addVars(string $nameSpace, array $vars, ...$options);
 
@@ -192,8 +195,11 @@ public function addVars(string $nameSpace, array $vars, ...$options);
    * @param array $settings
    *   Data to export.
    * @param array $options
-   *   Extra processing instructions on where/how to place the data.
+   *   Not used.
+   *   Positional equivalence: addSetting(array $settings, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addSetting()
    */
   public function addSetting(array $settings, ...$options);
 
diff --git a/CRM/Core/Resources/CollectionAdderTrait.php b/CRM/Core/Resources/CollectionAdderTrait.php
index 87ab8e878ab4..392cc4c55da9 100644
--- a/CRM/Core/Resources/CollectionAdderTrait.php
+++ b/CRM/Core/Resources/CollectionAdderTrait.php
@@ -12,11 +12,9 @@
 /**
  * Class CRM_Core_Resources_CollectionTrait
  *
- * This is a building-block for creating classes which maintain a list of resources.
- *
- * The class is generally organized in two sections: First, we have core
- * bit that manages a list of '$snippets'. Second, we have a set of helper
- * functions which add some syntactic sugar for the snippets.
+ * This trait is a building-block for creating classes which maintain a list of
+ * resources. It defines a set of helper functions which provide syntactic sugar
+ * for calling the add() method.
  */
 trait CRM_Core_Resources_CollectionAdderTrait {
 
@@ -27,6 +25,7 @@ trait CRM_Core_Resources_CollectionAdderTrait {
    * @return array
    *   The full/computed snippet (with defaults applied).
    * @see CRM_Core_Resources_CollectionInterface::add()
+   * @see CRM_Core_Resources_CollectionTrait::add()
    */
   abstract public function add($snippet);
 
@@ -35,20 +34,17 @@ abstract public function add($snippet);
    *
    * @param array $options
    * @return array
+   * @see CRM_Core_Resources_CollectionTrait::findCreateSettingSnippet()
    */
   abstract protected function &findCreateSettingSnippet($options = []): array;
 
   /**
    * Export permission data to the client to enable smarter GUIs.
    *
-   * Note: Application security stems from the server's enforcement
-   * of the security logic (e.g. in the API permissions). There's no way
-   * the client can use this info to make the app more secure; however,
-   * it can produce a better-tuned (non-broken) UI.
-   *
    * @param string|iterable $permNames
    *   List of permission names to check/export.
    * @return static
+   * @see CRM_Core_Resources_CollectionAdderInterface::addPermissions()
    */
   public function addPermissions($permNames) {
     // TODO: Maybe this should be its own resource type to allow smarter management?
@@ -66,12 +62,16 @@ public function addPermissions($permNames) {
   /**
    * Add a JavaScript file to the current page using <SCRIPT SRC>.
    *
+   * Ex: addScript('alert("Hello world");', ['weight' => 123]);
+   *
    * @param string $code
    *   JavaScript source code.
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addScript(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addScript()
    */
   public function addScript(string $code, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
@@ -83,27 +83,18 @@ public function addScript(string $code, ...$options) {
   /**
    * Add a JavaScript file to the current page using <SCRIPT SRC>.
    *
-   * Options may be use key-value format (preferred) or positional format (legacy).
-   *
-   * - addScriptFile('myext', 'my.js', ['weight' => 123, 'region' => 'page-footer'])
-   * - addScriptFile('myext', 'my.js', 123, 'page-footer')
+   * Ex: addScriptFile('myextension', 'myscript.js', ['weight' => 123]);
    *
    * @param string $ext
-   *   extension name; use 'civicrm' for core.
+   *   Extension name; use 'civicrm' for core.
    * @param string $file
-   *   file path -- relative to the extension base dir.
+   *   File path -- relative to the extension base dir.
    * @param array $options
-   *   Open-ended list of options (per add()).
-   *   Ex: ['weight' => 123]
-   *   Accepts some additional options:
-   *   - bool|string $translate: Whether to load translated strings for this file. Use one of:
-   *     - FALSE: Do not load translated strings.
-   *     - TRUE: Load translated strings. Use the $ext's default domain.
-   *     - string: Load translated strings. Use a specific domain.
-   *
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addScriptFile(string $code, int $weight, string $region, mixed $translate).
    * @return static
-   *
-   * @throws \CRM_Core_Exception
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addScriptFile()
    */
   public function addScriptFile(string $ext, string $file, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
@@ -113,17 +104,17 @@ public function addScriptFile(string $ext, string $file, ...$options) {
   }
 
   /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * Options may be use key-value format (preferred) or positional format (legacy).
+   * Add a JavaScript URL to the current page using <SCRIPT SRC>.
    *
-   * - addScriptUrl('http://example.com/foo.js', ['weight' => 123, 'region' => 'page-footer'])
-   * - addScriptUrl('http://example.com/foo.js', 123, 'page-footer')
+   * Ex: addScriptUrl('http://example.com/foo.js', ['weight' => 123])
    *
    * @param string $url
    * @param array $options
-   *   Open-ended list of options (per add())
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addScriptUrl(string $url, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addScriptUrl()
    */
   public function addScriptUrl(string $url, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
@@ -161,6 +152,7 @@ public function addScriptUrl(string $url, ...$options) {
    * @param string|array $text
    * @param string|null $domain
    * @return static
+   * @see CRM_Core_Resources_CollectionAdderInterface::addString()
    */
   public function addString($text, $domain = 'civicrm') {
     // TODO: Maybe this should be its own resource type to allow smarter management?
@@ -186,12 +178,16 @@ public function addString($text, $domain = 'civicrm') {
   /**
    * Add a CSS content to the current page using <STYLE>.
    *
+   * Ex: addStyle('p { color: red; }', ['weight' => 100]);
+   *
    * @param string $code
    *   CSS source code.
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addStyle(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addStyle()
    */
   public function addStyle(string $code, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
@@ -203,14 +199,18 @@ public function addStyle(string $code, ...$options) {
   /**
    * Add a CSS file to the current page using <LINK HREF>.
    *
+   * Ex: addStyleFile('myextension', 'mystyles.css', ['weight' => 100]);
+   *
    * @param string $ext
-   *   extension name; use 'civicrm' for core.
+   *   Extension name; use 'civicrm' for core.
    * @param string $file
-   *   file path -- relative to the extension base dir.
+   *   File path -- relative to the extension base dir.
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addStyle(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addStyleFile()
    */
   public function addStyleFile(string $ext, string $file, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
@@ -222,11 +222,15 @@ public function addStyleFile(string $ext, string $file, ...$options) {
   /**
    * Add a CSS file to the current page using <LINK HREF>.
    *
+   * Ex: addStyleUrl('http://example.com/foo.css', ['weight' => 100]);
+   *
    * @param string $url
    * @param array $options
-   *   Open-ended list of options (per add())
-   *   Ex: ['weight' => 123]
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addStyleUrl(string $code, int $weight, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addStyleUrl()
    */
   public function addStyleUrl(string $url, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
@@ -243,8 +247,11 @@ public function addStyleUrl(string $url, ...$options) {
    * @param array $settings
    *   Data to export.
    * @param array $options
-   *   Extra processing instructions on where/how to place the data.
+   *   Not used.
+   *   Positional equivalence: addSetting(array $settings, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addSetting()
    */
   public function addSetting(array $settings, ...$options) {
     $s = &$this->findCreateSettingSnippet($options);
@@ -257,6 +264,7 @@ public function addSetting(array $settings, ...$options) {
    *
    * @param callable $callable
    * @return static
+   * @see CRM_Core_Resources_CollectionAdderInterface::addSettingsFactory()
    */
   public function addSettingsFactory($callable) {
     $s = &$this->findCreateSettingSnippet();
@@ -278,9 +286,13 @@ public function addSettingsFactory($callable) {
    * @param string $nameSpace
    *   Usually the name of your extension.
    * @param array $vars
+   *   Data to export.
    * @param array $options
-   *   There are no supported options.
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addVars(string $namespace, array $vars, string $region).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addVars()
    */
   public function addVars(string $nameSpace, array $vars, ...$options) {
     $s = &$this->findCreateSettingSnippet($options);
diff --git a/CRM/Core/Resources/CollectionInterface.php b/CRM/Core/Resources/CollectionInterface.php
index a00c881887f8..5e278131de15 100644
--- a/CRM/Core/Resources/CollectionInterface.php
+++ b/CRM/Core/Resources/CollectionInterface.php
@@ -12,52 +12,82 @@
 /**
  * Class CRM_Core_Resources_CollectionInterface
  *
- * This is a building-block for creating classes which maintain a list of resources.
+ * A resource collection is a mix of *resources* (or *snippets* or *assets*) that can be
+ * added to a page. A fully-formed resource might look like this:
+ *
+ * ```
+ * array(
+ *   'name' => 'jQuery',
+ *   'region' => 'html-header',
+ *   'weight' => 100,
+ *   'type' => 'scriptUrl',
+ *   'scriptUrl' => 'https://example.com/js/jquery.min.js'
+ * )
+ * ```
+ *
+ * Typically, a resource is created with just one option, eg
+ *
+ * ```
+ * // Add resources in array notation
+ * $c->add(['script' => 'alert("Hello");']);
+ * $c->add(['scriptFile' => ['civicrm', 'js/crm.ckeditor.js']]);
+ * $c->add(['scriptUrl' => 'https://example.com/js/jquery.min.js']);
+ * $c->add(['style' => 'p { font-size: 4em; }']);
+ * $c->add(['styleFile' => ['civicrm', 'css/dashboard.css']]);
+ * $c->add(['styleUrl' => 'https://example.com/css/foobar.css']);
+ *
+ * // Add resources with helper methods
+ * $c->addScript('alert("Hello");');
+ * $c->addScriptFile('civicrm', 'js/crm.ckeditor.js');
+ * $c->addScriptUrl('https://example.com/js/jquery.min.js');
+ * $c->addStyle('p { font-size: 4em; }');
+ * $c->addStyleFile('civicrm', 'css/dashboard.css');
+ * $c->addStyleUrl('https://example.com/css/foobar.css');
+ * ```
+ *
+ * The other properties are automatically computed (dependent upon context),
+ * but they may be set explicitly. These options include:
+ *
+ *   - type: string (markup, template, callback, script, scriptFile, scriptUrl, jquery, style, styleFile, styleUrl)
+ *   - name: string, symbolic identifier for this resource
+ *   - weight: int, default=1. Lower weights come before higher weights.
+ *     (If two resources have the same weight, then a secondary ordering will be
+ *     used to ensure reproducibility. However, the secondary ordering is
+ *     not guaranteed among versions/implementations.)
+ *   - disabled: int, default=0
+ *   - region: string
+ *   - translate: bool|string, Autoload translations. (Only applies to 'scriptFile')
+ *       - FALSE: Do not load translated strings.
+ *       - TRUE: Load translated strings. Use the $ext's default domain.
+ *       - string: Load translated strings. Use a specific domain.
+ *
+ * For example, the following are equivalent ways to set the 'weight' option:
+ *
+ * ```php
+ * $c->add([
+ *   'script' => 'alert("Hello");',
+ *   'weight' => 100,
+ * ]);
+ * $c->addScript('alert("Hello");', ['weight' => 100]);
+ * ```
+ *
+ * Passing options in array (key-value) notation is clearest. For backward
+ * compatibility, some methods (eg `addScript()`) accept options in positional form.
+ * Where applicable, the docblock of each `addFoo()` will include a comment about positional form.
  */
 interface CRM_Core_Resources_CollectionInterface {
 
   /**
    * Add an item to the collection. For example, when working with 'page-header' collection:
    *
-   * ```
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'markup' => '<div style="color:red">Hello!</div>',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'script' => 'alert("Hello");',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'template' => 'CRM/Myextension/Extra.tpl',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'callback' => 'myextension_callback_function',
-   * ));
-   * ```
-   *
    * Note: This function does not perform any extra encoding of markup, script code, or etc. If
    * you're passing in user-data, you must clean it yourself.
    *
    * @param array $snippet
-   *   Array; keys:.
-   *   - type: string (auto-detected for markup, template, callback, script, scriptFile, scriptUrl, jquery, style, styleFile, styleUrl)
-   *   - name: string, optional
-   *   - weight: int, optional; default=1
-   *   - disabled: int, optional; default=0
-   *   - markup: string, HTML; required (for type==markup)
-   *   - template: string, path; required (for type==template)
-   *   - callback: mixed; required (for type==callback)
-   *   - arguments: array, optional (for type==callback)
-   *   - script: string, Javascript code
-   *   - scriptFile: array, the name of the extension and file. Ex: ['civicrm', 'js/foo.js']
-   *   - scriptUrl: string, URL of a Javascript file
-   *   - jquery: string, Javascript code which runs inside a jQuery(function($){...}); block
-   *   - settings: array, list of static values to convey.
-   *   - style: string, CSS code
-   *   - styleFile: array, the name of the extension and file. Ex: ['civicrm', 'js/foo.js']
-   *   - styleUrl: string, URL of a CSS file
-   *
+   *   The resource to add. For a full list of properties, see CRM_Core_Resources_CollectionInterface.
    * @return array
    *   The full/computed snippet (with defaults applied).
+   * @see CRM_Core_Resources_CollectionInterface
    */
   public function add($snippet);
 
@@ -67,7 +97,9 @@ public function add($snippet);
    * Ex: $region->update('default', ['disabled' => TRUE]);
    *
    * @param string $name
-   * @param $snippet
+   *   Symbolic of the resource/snippet to update.
+   * @param array $snippet
+   *   Resource options. See CollectionInterface docs.
    * @return static
    */
   public function update($name, $snippet);
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index c2adc9e1981b..f750f01db077 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -53,45 +53,14 @@ trait CRM_Core_Resources_CollectionTrait {
   protected $types = [];
 
   /**
-   * Add an item to the collection. For example, when working with 'page-header' collection:
-   *
-   * ```
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'markup' => '<div style="color:red">Hello!</div>',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'script' => 'alert("Hello");',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'template' => 'CRM/Myextension/Extra.tpl',
-   * ));
-   * CRM_Core_Region::instance('page-header')->add(array(
-   *   'callback' => 'myextension_callback_function',
-   * ));
-   * ```
-   *
-   * Note: This function does not perform any extra encoding of markup, script code, or etc. If
-   * you're passing in user-data, you must clean it yourself.
+   * Add an item to the collection.
    *
    * @param array $snippet
-   *   Array; keys:.
-   *   - type: string (auto-detected for markup, template, callback, script, scriptUrl, jquery, style, styleUrl)
-   *   - name: string, optional
-   *   - weight: int, optional; default=1
-   *   - disabled: int, optional; default=0
-   *   - markup: string, HTML; required (for type==markup)
-   *   - template: string, path; required (for type==template)
-   *   - callback: mixed; required (for type==callback)
-   *   - arguments: array, optional (for type==callback)
-   *   - script: string, Javascript code
-   *   - scriptUrl: string, URL of a Javascript file
-   *   - jquery: string, Javascript code which runs inside a jQuery(function($){...}); block
-   *   - settings: array, list of static values to convey.
-   *   - style: string, CSS code
-   *   - styleUrl: string, URL of a CSS file
-   *
+   *   Resource options. See CollectionInterface docs.
    * @return array
    *   The full/computed snippet (with defaults applied).
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionInterface::add()
    */
   public function add($snippet) {
     $snippet = array_merge($this->defaults, $snippet);
@@ -170,18 +139,26 @@ protected function nextId() {
   }
 
   /**
+   * Update specific properties of a snippet.
+   *
    * @param string $name
-   * @param $snippet
+   *   Symbolic of the resource/snippet to update.
+   * @param array $snippet
+   *   Resource options. See CollectionInterface docs.
+   * @return static
+   * @see CRM_Core_Resources_CollectionInterface::update()
    */
   public function update($name, $snippet) {
     $this->snippets[$name] = array_merge($this->snippets[$name], $snippet);
     $this->isSorted = FALSE;
+    return $this;
   }
 
   /**
    * Remove all snippets.
    *
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface::clear()
    */
   public function clear() {
     $this->snippets = [];
@@ -194,6 +171,7 @@ public function clear() {
    *
    * @param string $name
    * @return array|NULL
+   * @see CRM_Core_Resources_CollectionInterface::get()
    */
   public function &get($name) {
     return $this->snippets[$name];
@@ -203,6 +181,7 @@ public function &get($name) {
    * Get a list of all snippets in this collection.
    *
    * @return iterable
+   * @see CRM_Core_Resources_CollectionInterface::getAll()
    */
   public function getAll(): iterable {
     $this->sort();
@@ -219,6 +198,7 @@ public function getAll(): iterable {
    *   - FALSE: The item is not OK and should be omitted from the collection.
    *   - Array: The item should be revised (using the returned value).
    * @return static
+   * @see CRM_Core_Resources_CollectionInterface::filter()
    */
   public function filter($callback) {
     $this->sort();
@@ -246,8 +226,13 @@ public function filter($callback) {
    * Find all snippets which match the given criterion.
    *
    * @param callable $callback
+   *   The callback is invoked once for each member in the collection.
+   *   The callback may return one of three values:
+   *   - TRUE: The item is OK and belongs in the collection.
+   *   - FALSE: The item is not OK and should be omitted from the collection.
    * @return iterable
    *   List of matching snippets.
+   * @see CRM_Core_Resources_CollectionInterface::find()
    */
   public function find($callback): iterable {
     $r = [];

From 2a5e575224a7859a483a39bf8641d6f4b4a21dfe Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2020 21:20:29 -0700
Subject: [PATCH 113/834] CollectionTrait - Add corresponding unit-test
 coverage (via RegionTest, BundleTest)

---
 tests/phpunit/CRM/Core/RegionTest.php         |  14 +
 .../phpunit/CRM/Core/Resources/BundleTest.php |  59 +++
 .../Core/Resources/CollectionTestTrait.php    | 337 ++++++++++++++++++
 3 files changed, 410 insertions(+)
 create mode 100644 tests/phpunit/CRM/Core/Resources/BundleTest.php
 create mode 100644 tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php

diff --git a/tests/phpunit/CRM/Core/RegionTest.php b/tests/phpunit/CRM/Core/RegionTest.php
index d4d9e83cb2fa..9f1d62831700 100644
--- a/tests/phpunit/CRM/Core/RegionTest.php
+++ b/tests/phpunit/CRM/Core/RegionTest.php
@@ -17,6 +17,20 @@ public function setUp() {
     $this->useTransaction();
   }
 
+  use CRM_Core_Resources_CollectionTestTrait;
+
+  /**
+   * @return \CRM_Core_Resources_CollectionInterface
+   */
+  public function createEmptyCollection() {
+    @++Civi::$statics['CRM_Core_RegionTestId'];
+    $r = new CRM_Core_Region('region_' . Civi::$statics['CRM_Core_RegionTestId']);
+    $r->filter(function($snippet) {
+      return $snippet['name'] !== 'default';
+    });
+    return $r;
+  }
+
   /**
    * When a {crmRegion} is blank and when there are no extra snippets, the
    * output is blank.
diff --git a/tests/phpunit/CRM/Core/Resources/BundleTest.php b/tests/phpunit/CRM/Core/Resources/BundleTest.php
new file mode 100644
index 000000000000..87630bf0214f
--- /dev/null
+++ b/tests/phpunit/CRM/Core/Resources/BundleTest.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Tests for manipulating bundles
+ * @group headless
+ * @group resources
+ */
+class CRM_Core_Resources_BundleTest extends CiviUnitTestCase {
+
+  use CRM_Core_Resources_CollectionTestTrait;
+
+  /**
+   * @return \CRM_Core_Resources_CollectionInterface
+   */
+  public function createEmptyCollection() {
+    return new CRM_Core_Resources_Bundle();
+  }
+
+  /**
+   * Create two bundles (parent, child) - and merge the child into the parent.
+   */
+  public function testMergeIntoRegion() {
+    $bundle = $this->createEmptyCollection();
+    $region = CRM_Core_Region::instance(__FUNCTION__);
+
+    $bundle->addScriptUrl('http://example.com/bundle.js');
+    $bundle->addStyleUrl('http://example.com/bundle.css');
+    $bundle->addSetting(['child' => ['schoolbooks']]);
+    $this->assertCount(3, $bundle->getAll());
+
+    $region->addScriptUrl('http://example.com/region.js');
+    $region->addStyleUrl('http://example.com/region.css');
+    $region->addSetting(['region' => ['groceries']]);
+    $this->assertCount(3 + 1 /* default */, $region->getAll());
+
+    $region->merge($bundle->getAll());
+    $this->assertCount(5 + 1 /* default */, $region->getAll());
+
+    $expectSettings = [
+      'child' => ['schoolbooks'],
+      'region' => ['groceries'],
+    ];
+    $this->assertEquals($expectSettings, $region->getSettings());
+    $this->assertEquals('http://example.com/bundle.js', $region->get('http://example.com/bundle.js')['scriptUrl']);
+    $this->assertEquals('http://example.com/bundle.css', $region->get('http://example.com/bundle.css')['styleUrl']);
+    $this->assertEquals('http://example.com/region.js', $region->get('http://example.com/region.js')['scriptUrl']);
+    $this->assertEquals('http://example.com/region.css', $region->get('http://example.com/region.css')['styleUrl']);
+  }
+
+}
diff --git a/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php b/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
new file mode 100644
index 000000000000..14e8942350cb
--- /dev/null
+++ b/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
@@ -0,0 +1,337 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Resources_CollectionTestTrait
+ *
+ * If you have a concrete class which uses CollectionTrait, this helper
+ * should make it easier to write a unit-test.
+ */
+trait CRM_Core_Resources_CollectionTestTrait {
+
+  /**
+   * @return \CRM_Core_Resources_CollectionInterface
+   */
+  abstract public function createEmptyCollection();
+
+  public function getSnippetExamples() {
+    $es = [];
+
+    /**
+     * Private helper to generate several similar examples.
+     * @param array $callbacks
+     *   List of callbacks which can be used to add a resource to the bundle.
+     * @param array $expect
+     *   The fully formed resource that should be created as a result.
+     */
+    $addCases = function($callbacks, $expect) use (&$es) {
+      foreach ($callbacks as $key => $callback) {
+        if (isset($es[$key])) {
+          throw new \RuntimeException("Cannot prepare examples: Case \"$key\" defined twice");
+        }
+        $es[$key] = [$callback, $expect];
+      }
+    };
+
+    $addCases(
+    // List of equivalent method calls
+      [
+        'add(scriptUrl): dfl' => ['add', ['scriptUrl' => 'http://example.com/foo.js']],
+        'addScriptUrl(): dfl' => ['addScriptUrl', 'http://example.com/foo.js'],
+        'addScriptUrl(): pos dfl-wgt' => ['addScriptUrl', 'http://example.com/foo.js', 1],
+      ],
+      // Fully-formed result expected for this call
+      [
+        'name' => 'http://example.com/foo.js',
+        'disabled' => FALSE,
+        'weight' => 1,
+        'sortId' => 1,
+        'type' => 'scriptUrl',
+        'scriptUrl' => 'http://example.com/foo.js',
+      ]
+    );
+
+    $addCases(
+      [
+        'add(scriptUrl): wgt' => ['add', ['scriptUrl' => 'http://example.com/foo.js', 'weight' => 100]],
+        'addScriptUrl(): arr wgt' => ['addScriptUrl', 'http://example.com/foo.js', ['weight' => 100]],
+        'addScriptUrl(): pos wgt' => ['addScriptUrl', 'http://example.com/foo.js', 100],
+      ],
+      [
+        'name' => 'http://example.com/foo.js',
+        'disabled' => FALSE,
+        'weight' => 100,
+        'sortId' => 1,
+        'type' => 'scriptUrl',
+        'scriptUrl' => 'http://example.com/foo.js',
+      ]
+    );
+
+    $addCases(
+      [
+        'add(styleUrl)' => ['add', ['styleUrl' => 'http://example.com/foo.css']],
+        'addStyleUrl()' => ['addStyleUrl', 'http://example.com/foo.css'],
+      ],
+      [
+        'name' => 'http://example.com/foo.css',
+        'disabled' => FALSE,
+        'weight' => 1,
+        'sortId' => 1,
+        'type' => 'styleUrl',
+        'styleUrl' => 'http://example.com/foo.css',
+      ]
+    );
+
+    $addCases(
+      [
+        'add(styleFile)' => ['add', ['styleFile' => ['civicrm', 'css/civicrm.css']]],
+        'addStyleFile()' => ['addStyleFile', 'civicrm', 'css/civicrm.css'],
+      ],
+      [
+        'name' => 'civicrm:css/civicrm.css',
+        'disabled' => FALSE,
+        'weight' => 1,
+        'sortId' => 1,
+        'type' => 'styleFile',
+        'styleFile' => ['civicrm', 'css/civicrm.css'],
+        'styleFileUrls' => [
+          Civi::paths()->getUrl('[civicrm.root]/css/civicrm.css?r=XXXX'),
+        ],
+      ]
+    );
+
+    $basicFooJs = [
+      'name' => 'civicrm:js/foo.js',
+      'disabled' => FALSE,
+      'sortId' => 1,
+      'type' => 'scriptFile',
+      'scriptFile' => ['civicrm', 'js/foo.js'],
+      'scriptFileUrls' => [
+        Civi::paths()->getUrl('[civicrm.root]/js/foo.js?r=XXXX'),
+      ],
+    ];
+
+    $addCases(
+      [
+        'add(scriptFile): dfl' => ['add', ['scriptFile' => ['civicrm', 'js/foo.js']]],
+        'addScriptFile(): dfl' => ['addScriptFile', 'civicrm', 'js/foo.js'],
+        'addScriptFile(): dfl pos-wgt' => ['addScriptFile', 'civicrm', 'js/foo.js', 1],
+      ],
+      $basicFooJs + ['weight' => 1, 'translate' => TRUE]
+    );
+
+    $addCases(
+      [
+        'add(scriptFile): wgt-rgn' => ['add', ['scriptFile' => ['civicrm', 'js/foo.js'], 'weight' => 100, 'region' => 'zoo']],
+        'addScriptFile(): arr wgt-rgn' => ['addScriptFile', 'civicrm', 'js/foo.js', ['weight' => 100, 'region' => 'zoo']],
+        'addScriptFile(): pos wgt-rgn' => ['addScriptFile', 'civicrm', 'js/foo.js', 100, 'zoo'],
+        'addScriptFile(): pos wgt-rgn-trn' => ['addScriptFile', 'civicrm', 'js/foo.js', 100, 'zoo', TRUE],
+      ],
+      $basicFooJs + ['weight' => 100, 'region' => 'zoo', 'translate' => TRUE]
+    );
+
+    $addCases(
+      [
+        'add(scriptFile): wgt-rgn-trnOff' => ['add', ['scriptFile' => ['civicrm', 'js/foo.js'], 'weight' => -200, 'region' => 'zoo', 'translate' => FALSE]],
+        'addScriptFile(): arr wgt-rgn-trnOff' => ['addScriptFile', 'civicrm', 'js/foo.js', ['weight' => -200, 'region' => 'zoo', 'translate' => FALSE]],
+        'addScriptFile(): pos wgt-rgn-trnOff' => ['addScriptFile', 'civicrm', 'js/foo.js', -200, 'zoo', FALSE],
+      ],
+      $basicFooJs + ['weight' => -200, 'region' => 'zoo', 'translate' => FALSE]
+    );
+
+    $addCases(
+      [
+        'add(script)' => ['add', ['script' => 'window.alert("Boo!");']],
+        'addScript()' => ['addScript', 'window.alert("Boo!");'],
+      ],
+      [
+        'name' => 1,
+        'disabled' => FALSE,
+        'weight' => 1,
+        'sortId' => 1,
+        'type' => 'script',
+        'script' => 'window.alert("Boo!");',
+      ]
+    );
+
+    return $es;
+  }
+
+  /**
+   * Add a snippet with some method and ensure that it's actually added.
+   *
+   * @param array $callbackArgs
+   *   Ex: ['addScriptUrl', 'http://example.com/foo.js'].
+   * @param array $expectSnippet
+   * @dataProvider getSnippetExamples
+   */
+  public function testAddDefaults($callbackArgs, $expectSnippet) {
+    if ($callbackArgs === NULL) {
+      return;
+    }
+    $method = array_shift($callbackArgs);
+
+    $b = $this->createEmptyCollection();
+    $result = call_user_func_array([$b, $method], $callbackArgs);
+
+    // Check direct result.
+    if ($method === 'add') {
+      $this->assertSameSnippet($expectSnippet, $result);
+    }
+    else {
+      $this->assertTrue($b === $result);
+    }
+
+    // Check side-effect of registering snippet.
+    $count = 0;
+    foreach ($b->getAll() as $getSnippet) {
+      $this->assertSameSnippet($expectSnippet, $getSnippet, 'getAll() method should return snippet with properly computed defaults');
+      $count++;
+    }
+    $this->assertEquals(1, $count, 'Expect one registered snippet');
+  }
+
+  /**
+   * Add some items to a bundle - then clear() all of them.
+   */
+  public function testClear() {
+    $b = $this->createEmptyCollection();
+    $b->addScriptUrl('http://example.com/child.js');
+    $this->assertEquals(1, count($b->getAll()));
+    $b->addStyleUrl('http://example.com/child.css');
+    $this->assertEquals(2, count($b->getAll()));
+
+    $b->clear();
+    $this->assertEquals(0, count($b->getAll()));
+
+    $b->addScriptUrl('http://example.com/encore.js');
+    $this->assertEquals(1, count($b->getAll()));
+  }
+
+  /**
+   * Create two bundles (parent, child) - and merge the child into the parent.
+   */
+  public function testMerge() {
+    $child = $this->createEmptyCollection();
+    $parent = $this->createEmptyCollection();
+
+    $child->addScriptUrl('http://example.com/child.js');
+    $child->addStyleUrl('http://example.com/child.css');
+    $child->addSetting(['child' => ['schoolbooks']]);
+    $this->assertCount(3, $child->getAll());
+
+    $parent->addScriptUrl('http://example.com/parent.js');
+    $parent->addStyleUrl('http://example.com/parent.css');
+    $parent->addSetting(['parent' => ['groceries']]);
+    $this->assertCount(3, $parent->getAll());
+
+    $parent->merge($child->getAll());
+    $this->assertCount(5, $parent->getAll());
+
+    $expectSettings = [
+      'child' => ['schoolbooks'],
+      'parent' => ['groceries'],
+    ];
+    $this->assertEquals($expectSettings, $parent->getSettings());
+    $this->assertEquals('http://example.com/child.js', $parent->get('http://example.com/child.js')['scriptUrl']);
+    $this->assertEquals('http://example.com/child.css', $parent->get('http://example.com/child.css')['styleUrl']);
+    $this->assertEquals('http://example.com/parent.js', $parent->get('http://example.com/parent.js')['scriptUrl']);
+    $this->assertEquals('http://example.com/parent.css', $parent->get('http://example.com/parent.css')['styleUrl']);
+  }
+
+  public function testAddBundle() {
+    $part1 = $this->createEmptyCollection();
+    $part2 = $this->createEmptyCollection();
+    $part1->add(['script' => 'doPart1()']);
+    $part1->add(['script' => 'doPart2()']);
+    $expectScripts = ['doPart1()', 'doPart2()'];
+
+    $sumA = $this->createEmptyCollection()->addBundle($part1)->addBundle($part2);
+    $this->assertEquals($expectScripts, array_column($sumA->getAll(), 'script'));
+
+    $sumB = $this->createEmptyCollection()->addBundle([$part1, $part2]);
+    $this->assertEquals($expectScripts, array_column($sumB->getAll(), 'script'));
+  }
+
+  /**
+   * Functions like `addScriptFile()` accept positional arguments
+   * in the order ($weight, $region, $translate).
+   */
+  public function testStandardSplatParser() {
+    $parse = function(...$options) {
+      return CRM_Core_Resources_CollectionAdderTrait::mergeStandardOptions($options, []);
+    };
+    $this->assertEquals([], $parse());
+    $this->assertEquals(['weight' => '100'], $parse('100'));
+    $this->assertEquals(['weight' => '100', 'region' => 'footer'], $parse('100', 'footer'));
+    $this->assertEquals(['weight' => '100', 'region' => 'footer', 'translate' => FALSE], $parse('100', 'footer', FALSE));
+    $this->assertEquals(['weight' => 200], $parse(['weight' => 200]));
+    $this->assertEquals(['region' => 'shakaneigh'], $parse(['region' => 'shakaneigh']));
+    $this->assertEquals(['frobnicate' => TRUE], $parse(['frobnicate' => TRUE]));
+  }
+
+  /**
+   * Functions like `addVars()` accept positional arguments
+   * in the order ($region).
+   */
+  public function testSettingsSplatParser() {
+    $parse = function(...$options) {
+      return CRM_Core_Resources_CollectionAdderTrait::mergeSettingOptions($options, []);
+    };
+    $this->assertEquals([], $parse());
+    $this->assertEquals(['region' => 'oakaneigh'], $parse('oakaneigh'));
+    $this->assertEquals(['region' => 'oakaneigh'], $parse(['region' => 'oakaneigh']));
+    $this->assertEquals(['frobnicate' => TRUE], $parse(['frobnicate' => TRUE]));
+  }
+
+  /**
+   * Assert that two snippets are equivalent.
+   *
+   * @param array $expect
+   * @param array $actual
+   * @param string $message
+   */
+  public function assertSameSnippet($expect, $actual, $message = '') {
+    $normalizeUrl = function($url) {
+      // If there is a cache code (?r=XXXX), then replace random value with constant XXXX.
+      return preg_replace(';([\?\&]r=)([a-zA-Z0-9_\-]+);', '\1XXXX', $url);
+    };
+
+    $normalizeSnippet = function ($snippet) use ($normalizeUrl) {
+      // Any URLs in 'styleFileUrls' or '
+      foreach (['styleUrl', 'scriptUrl'] as $field) {
+        if (isset($snippet[$field])) {
+          $snippet[$field] = $normalizeUrl($snippet[$field]);
+        }
+      }
+      foreach (['styleFileUrls', 'scriptFileUrls'] as $field) {
+        if (isset($snippet[$field])) {
+          $snippet[$field] = array_map($normalizeUrl, $snippet[$field]);
+        }
+      }
+      ksort($snippet);
+      return $snippet;
+    };
+
+    // If there isn't an explicit expectation for 'region', then we won't check it.
+    if (!isset($expect['region']) || '*' === $expect['region']) {
+      if (isset($actual['region'])) {
+        unset($expect['region']);
+        unset($actual['region']);
+      }
+    }
+
+    $expect = $normalizeSnippet($expect);
+    $actual = $normalizeSnippet($actual);
+    $this->assertEquals($expect, $actual, $message);
+  }
+
+}

From 8d2c99cfe807f27dad36cebbf4f5165eef32efe2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2020 22:05:02 -0700
Subject: [PATCH 114/834] CRM_Core_Resources::addCoreResources - Option
 `$region` is not meaningfully used

If you grep universe for `addCoreResources` and `addCoreStyles`, all matches
fall into these buckets:

1. They use the implicit default region.
2. They explicitly use the `html-header` region.
3. (Singular case) addCoreResources($region) delegates to addCoreStyles($region);
   but given 1+2, this must still be `html-header`.
---
 CRM/Core/Resources.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 4265fee1cf14..3ac2b72e882e 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -564,6 +564,13 @@ public function resetCacheCode() {
    * @return CRM_Core_Resources
    */
   public function addCoreResources($region = 'html-header') {
+    if ($region !== 'html-header') {
+      // The signature of this method allowed different regions. However, this
+      // doesn't appear to be used - based on grepping `universe` generally
+      // and `civicrm-{core,backdrop,drupal,packages,wordpress,joomla}` specifically,
+      // it appears that all callers use 'html-header' (either implicitly or explicitly).
+      throw new \CRM_Core_Exception("Error: addCoreResources only supports html-header");
+    }
     if (!isset($this->addedCoreResources[$region]) && !self::isAjaxMode()) {
       $this->addedCoreResources[$region] = TRUE;
       $config = CRM_Core_Config::singleton();
@@ -616,6 +623,13 @@ public function addCoreResources($region = 'html-header') {
    * @return CRM_Core_Resources
    */
   public function addCoreStyles($region = 'html-header') {
+    if ($region !== 'html-header') {
+      // The signature of this method allowed different regions. However, this
+      // doesn't appear to be used - based on grepping `universe` generally
+      // and `civicrm-{core,backdrop,drupal,packages,wordpress,joomla}` specifically,
+      // it appears that all callers use 'html-header' (either implicitly or explicitly).
+      throw new \CRM_Core_Exception("Error: addCoreResources only supports html-header");
+    }
     if (!isset($this->addedCoreStyles[$region])) {
       $this->addedCoreStyles[$region] = TRUE;
 

From b2d8361e82e3fdaadde2846774f0130b4c773783 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 22 Aug 2020 17:54:42 -0700
Subject: [PATCH 115/834] CRM_Core_Resources_Common - Add skeleton for bundles,
 'coreStyles' and 'coreResources'

---
 CRM/Core/Resources/Common.php | 68 +++++++++++++++++++++++++++++++++++
 CRM/Utils/Hook.php            | 16 +++++++++
 Civi/Core/Container.php       |  6 ++++
 3 files changed, 90 insertions(+)
 create mode 100644 CRM/Core/Resources/Common.php

diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
new file mode 100644
index 000000000000..008b60a5af3c
--- /dev/null
+++ b/CRM/Core/Resources/Common.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Define some common, global lists of resources.
+ */
+class CRM_Core_Resources_Common {
+
+  const REGION = 'html-header';
+
+  /**
+   * The 'bundle.coreStyles' service is a collection of resources used on some
+   * non-Civi pages (wherein Civi may be mixed-in).
+   *
+   * @param string $name
+   *   i.e. 'coreStyles'
+   * @return \CRM_Core_Resources_Bundle
+   */
+  public static function createStyleBundle($name) {
+    $bundle = new CRM_Core_Resources_Bundle($name);
+    // TODO
+    CRM_Utils_Hook::alterBundle($bundle);
+    self::useRegion($bundle, self::REGION);
+    return $bundle;
+  }
+
+  /**
+   * The 'bundle.coreResources' service is a collection of resources
+   * shared by Civi pages (ie pages where Civi controls rendering).
+   *
+   * @param string $name
+   *   i.e. 'coreResources'
+   * @return \CRM_Core_Resources_Bundle
+   */
+  public static function createFullBundle($name) {
+    $bundle = new CRM_Core_Resources_Bundle($name);
+    // TODO
+    CRM_Utils_Hook::alterBundle($bundle);
+    self::useRegion($bundle, self::REGION);
+    return $bundle;
+  }
+
+  /**
+   * Ensure that all elements of the bundle are in the same region.
+   *
+   * @param CRM_Core_Resources_Bundle $bundle
+   * @param string $region
+   * @return CRM_Core_Resources_Bundle
+   */
+  protected static function useRegion($bundle, $region) {
+    $bundle->filter(function ($s) use ($region) {
+      if ($s['type'] !== 'settings' && !isset($s['region'])) {
+        $s['region'] = $region;
+      }
+      return $s;
+    });
+    return $bundle;
+  }
+
+}
diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php
index 381b69f8f685..17532b2bb8b8 100644
--- a/CRM/Utils/Hook.php
+++ b/CRM/Utils/Hook.php
@@ -421,6 +421,22 @@ public static function links($op, $objectName, &$objectId, &$links, &$mask = NUL
     return self::singleton()->invoke(['op', 'objectName', 'objectId', 'links', 'mask', 'values'], $op, $objectName, $objectId, $links, $mask, $values, 'civicrm_links');
   }
 
+  /**
+   * Alter the contents of a resource bundle (ie a collection of JS/CSS/etc).
+   *
+   * TIP: $bundle->add*() and $bundle->filter() should be useful for
+   * adding/removing/updating items.
+   *
+   * @param CRM_Core_Resources_Bundle $bundle
+   * @return null
+   * @see CRM_Core_Resources_CollectionInterface::add()
+   * @see CRM_Core_Resources_CollectionInterface::filter()
+   */
+  public static function alterBundle($bundle) {
+    return self::singleton()
+      ->invoke(['bundle'], $bundle, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_alterBundle');
+  }
+
   /**
    * This hook is invoked during the CiviCRM form preProcess phase.
    *
diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index ee8b214e7fd1..5a36afacf4d7 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -206,6 +206,12 @@ public function createContainer() {
       []
     ))->setPublic(TRUE);
 
+    $container->setDefinition('bundle.coreStyles', new Definition('CRM_Core_Resources_Bundle', ['coreStyles']))
+      ->setFactory('CRM_Core_Resources_Common::createStyleBundle');
+
+    $container->setDefinition('bundle.coreResources', new Definition('CRM_Core_Resources_Bundle', ['coreResources']))
+      ->setFactory('CRM_Core_Resources_Common::createFullBundle');
+
     $container->setDefinition('pear_mail', new Definition('Mail'))
       ->setFactory('CRM_Utils_Mail::createMailer');
 

From 5526ab4dd0aa9b7da984545842e9c1aea1d68303 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 22 Aug 2020 18:00:20 -0700
Subject: [PATCH 116/834] CRM_Core_Resources - Move addCoreStyles to
 'coreStyles' bundle

---
 CRM/Core/Resources.php        | 28 +---------------------------
 CRM/Core/Resources/Common.php | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 3ac2b72e882e..15905c46c95a 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -63,15 +63,6 @@ class CRM_Core_Resources {
    */
   protected $addedCoreResources = [];
 
-  /**
-   * Added core styles.
-   *
-   * Format is ($regionName => bool).
-   *
-   * @var array
-   */
-  protected $addedCoreStyles = [];
-
   /**
    * Added settings.
    *
@@ -616,9 +607,6 @@ public function addCoreResources($region = 'html-header') {
   /**
    * This will add CiviCRM's standard CSS
    *
-   * TODO: Separate the functional code (like addStyle/addScript) from the policy code
-   * (like addCoreResources/addCoreStyles).
-   *
    * @param string $region
    * @return CRM_Core_Resources
    */
@@ -630,21 +618,7 @@ public function addCoreStyles($region = 'html-header') {
       // it appears that all callers use 'html-header' (either implicitly or explicitly).
       throw new \CRM_Core_Exception("Error: addCoreResources only supports html-header");
     }
-    if (!isset($this->addedCoreStyles[$region])) {
-      $this->addedCoreStyles[$region] = TRUE;
-
-      // Load custom or core css
-      $config = CRM_Core_Config::singleton();
-      if (!empty($config->customCSSURL)) {
-        $customCSSURL = $this->addCacheCode($config->customCSSURL);
-        $this->addStyleUrl($customCSSURL, 99, $region);
-      }
-      if (!Civi::settings()->get('disable_core_css')) {
-        $this->addStyleFile('civicrm', 'css/civicrm.css', -99, $region);
-      }
-      // crm-i.css added ahead of other styles so it can be overridden by FA.
-      $this->addStyleFile('civicrm', 'css/crm-i.css', -101, $region);
-    }
+    $this->addBundle('coreStyles');
     return $this;
   }
 
diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index 008b60a5af3c..3159c08dce49 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -26,7 +26,19 @@ class CRM_Core_Resources_Common {
    */
   public static function createStyleBundle($name) {
     $bundle = new CRM_Core_Resources_Bundle($name);
-    // TODO
+
+    // Load custom or core css
+    $config = CRM_Core_Config::singleton();
+    if (!empty($config->customCSSURL)) {
+      $customCSSURL = Civi::resources()->addCacheCode($config->customCSSURL);
+      $bundle->addStyleUrl($customCSSURL, 99);
+    }
+    if (!Civi::settings()->get('disable_core_css')) {
+      $bundle->addStyleFile('civicrm', 'css/civicrm.css', -99);
+    }
+    // crm-i.css added ahead of other styles so it can be overridden by FA.
+    $bundle->addStyleFile('civicrm', 'css/crm-i.css', -101);
+
     CRM_Utils_Hook::alterBundle($bundle);
     self::useRegion($bundle, self::REGION);
     return $bundle;

From 8d469336d90b686ad6dea7a5e74668dd6f8bac76 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 22 Aug 2020 20:30:02 -0700
Subject: [PATCH 117/834] CRM_Core_Resources - Move addCoreResources to
 'coreResources' bundle

---
 CRM/Core/Resources.php        | 178 +---------------------------------
 CRM/Core/Resources/Common.php | 178 +++++++++++++++++++++++++++++++++-
 2 files changed, 179 insertions(+), 177 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 15905c46c95a..002adcabf867 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -548,9 +548,6 @@ public function resetCacheCode() {
    * This adds CiviCRM's standard css and js to the specified region of the document.
    * It will only run once.
    *
-   * TODO: Separate the functional code (like addStyle/addScript) from the policy code
-   * (like addCoreResources/addCoreStyles).
-   *
    * @param string $region
    * @return CRM_Core_Resources
    */
@@ -562,43 +559,8 @@ public function addCoreResources($region = 'html-header') {
       // it appears that all callers use 'html-header' (either implicitly or explicitly).
       throw new \CRM_Core_Exception("Error: addCoreResources only supports html-header");
     }
-    if (!isset($this->addedCoreResources[$region]) && !self::isAjaxMode()) {
-      $this->addedCoreResources[$region] = TRUE;
-      $config = CRM_Core_Config::singleton();
-
-      // Add resources from coreResourceList
-      $jsWeight = -9999;
-      foreach ($this->coreResourceList($region) as $item) {
-        if (is_array($item)) {
-          $this->addSetting($item);
-        }
-        elseif (strpos($item, '.css')) {
-          $this->isFullyFormedUrl($item) ? $this->addStyleUrl($item, -100, $region) : $this->addStyleFile('civicrm', $item, -100, $region);
-        }
-        elseif ($this->isFullyFormedUrl($item)) {
-          $this->addScriptUrl($item, $jsWeight++, $region);
-        }
-        else {
-          // Don't bother  looking for ts() calls in packages, there aren't any
-          $translate = (substr($item, 0, 3) == 'js/');
-          $this->addScriptFile('civicrm', $item, $jsWeight++, $region, $translate);
-        }
-      }
-      // Add global settings
-      $settings = [
-        'config' => [
-          'isFrontend' => $config->userFrameworkFrontend,
-        ],
-      ];
-      // Disable profile creation if user lacks permission
-      if (!CRM_Core_Permission::check('edit all contacts') && !CRM_Core_Permission::check('add contacts')) {
-        $settings['config']['entityRef']['contactCreate'] = FALSE;
-      }
-      $this->addSetting($settings);
-
-      // Give control of jQuery and _ back to the CMS - this loads last
-      $this->addScriptFile('civicrm', 'js/noconflict.js', 9999, $region, FALSE);
-
+    if (!self::isAjaxMode()) {
+      $this->addBundle('coreResources');
       $this->addCoreStyles($region);
     }
     return $this;
@@ -659,142 +621,6 @@ public static function outputLocalizationJS() {
     CRM_Utils_System::civiExit();
   }
 
-  /**
-   * List of core resources we add to every CiviCRM page.
-   *
-   * Note: non-compressed versions of .min files will be used in debug mode
-   *
-   * @param string $region
-   * @return array
-   */
-  public function coreResourceList($region) {
-    $config = CRM_Core_Config::singleton();
-
-    // Scripts needed by everyone, everywhere
-    // FIXME: This is too long; list needs finer-grained segmentation
-    $items = [
-      "bower_components/jquery/dist/jquery.min.js",
-      "bower_components/jquery-ui/jquery-ui.min.js",
-      "bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css",
-      "bower_components/lodash-compat/lodash.min.js",
-      "packages/jquery/plugins/jquery.mousewheel.min.js",
-      "bower_components/select2/select2.min.js",
-      "bower_components/select2/select2.min.css",
-      "bower_components/font-awesome/css/font-awesome.min.css",
-      "packages/jquery/plugins/jquery.form.min.js",
-      "packages/jquery/plugins/jquery.timeentry.min.js",
-      "packages/jquery/plugins/jquery.blockUI.min.js",
-      "bower_components/datatables/media/js/jquery.dataTables.min.js",
-      "bower_components/datatables/media/css/jquery.dataTables.min.css",
-      "bower_components/jquery-validation/dist/jquery.validate.min.js",
-      "bower_components/jquery-validation/dist/additional-methods.min.js",
-      "packages/jquery/plugins/jquery.ui.datepicker.validation.min.js",
-      "js/Common.js",
-      "js/crm.datepicker.js",
-      "js/crm.ajax.js",
-      "js/wysiwyg/crm.wysiwyg.js",
-    ];
-
-    // Dynamic localization script
-    $items[] = $this->addCacheCode(
-      CRM_Utils_System::url('civicrm/ajax/l10n-js/' . CRM_Core_I18n::getLocale(),
-        ['cid' => CRM_Core_Session::getLoggedInContactID()], FALSE, NULL, FALSE)
-    );
-
-    // add wysiwyg editor
-    $editor = Civi::settings()->get('editor_id');
-    if ($editor == "CKEditor") {
-      CRM_Admin_Form_CKEditorConfig::setConfigDefault();
-      $items[] = [
-        'config' => [
-          'wysisygScriptLocation' => Civi::paths()->getUrl("[civicrm.root]/js/wysiwyg/crm.ckeditor.js"),
-          'CKEditorCustomConfig' => CRM_Admin_Form_CKEditorConfig::getConfigUrl(),
-        ],
-      ];
-    }
-
-    // These scripts are only needed by back-office users
-    if (CRM_Core_Permission::check('access CiviCRM')) {
-      $items[] = "packages/jquery/plugins/jquery.tableHeader.js";
-      $items[] = "packages/jquery/plugins/jquery.notify.min.js";
-    }
-
-    $contactID = CRM_Core_Session::getLoggedInContactID();
-
-    // Menubar
-    $position = 'none';
-    if (
-      $contactID && !$config->userFrameworkFrontend
-      && CRM_Core_Permission::check('access CiviCRM')
-      && !@constant('CIVICRM_DISABLE_DEFAULT_MENU')
-      && !CRM_Core_Config::isUpgradeMode()
-    ) {
-      $position = Civi::settings()->get('menubar_position') ?: 'over-cms-menu';
-    }
-    if ($position !== 'none') {
-      $items[] = 'bower_components/smartmenus/dist/jquery.smartmenus.min.js';
-      $items[] = 'bower_components/smartmenus/dist/addons/keyboard/jquery.smartmenus.keyboard.min.js';
-      $items[] = 'js/crm.menubar.js';
-      // @see CRM_Core_Resources::renderMenubarStylesheet
-      $items[] = Civi::service('asset_builder')->getUrl('crm-menubar.css', [
-        'menubarColor' => Civi::settings()->get('menubar_color'),
-        'height' => 40,
-        'breakpoint' => 768,
-      ]);
-      // Variables for crm.menubar.js
-      $items[] = [
-        'menubar' => [
-          'position' => $position,
-          'qfKey' => CRM_Core_Key::get('CRM_Contact_Controller_Search', TRUE),
-          'cacheCode' => CRM_Core_BAO_Navigation::getCacheKey($contactID),
-        ],
-      ];
-    }
-
-    // JS for multilingual installations
-    if (!empty($config->languageLimit) && count($config->languageLimit) > 1 && CRM_Core_Permission::check('translate CiviCRM')) {
-      $items[] = "js/crm.multilingual.js";
-    }
-
-    // Enable administrators to edit option lists in a dialog
-    if (CRM_Core_Permission::check('administer CiviCRM') && $this->ajaxPopupsEnabled) {
-      $items[] = "js/crm.optionEdit.js";
-    }
-
-    $tsLocale = CRM_Core_I18n::getLocale();
-    // Add localized jQuery UI files
-    if ($tsLocale && $tsLocale != 'en_US') {
-      // Search for i18n file in order of specificity (try fr-CA, then fr)
-      list($lang) = explode('_', $tsLocale);
-      $path = "bower_components/jquery-ui/ui/i18n";
-      foreach ([str_replace('_', '-', $tsLocale), $lang] as $language) {
-        $localizationFile = "$path/datepicker-{$language}.js";
-        if ($this->getPath('civicrm', $localizationFile)) {
-          $items[] = $localizationFile;
-          break;
-        }
-      }
-    }
-
-    // Allow hooks to modify this list
-    CRM_Utils_Hook::coreResourceList($items, $region);
-
-    // Oof, existing listeners would expect $items to typically begin with 'bower_components/' or 'packages/'
-    // (using an implicit base of `[civicrm.root]`). We preserve the hook contract and cleanup $items post-hook.
-    $map = [
-      'bower_components' => rtrim(Civi::paths()->getUrl('[civicrm.bower]/.', 'absolute'), '/'),
-      'packages' => rtrim(Civi::paths()->getUrl('[civicrm.packages]/.', 'absolute'), '/'),
-    ];
-    $filter = function($m) use ($map) {
-      return $map[$m[1]] . $m[2];
-    };
-    $items = array_map(function($item) use ($filter) {
-      return is_array($item) ? $item : preg_replace_callback(';^(bower_components|packages)(/.*);', $filter, $item);
-    }, $items);
-
-    return $items;
-  }
-
   /**
    * @return bool
    *   is this page request an ajax snippet?
diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index 3159c08dce49..3dc2dd7c5265 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -54,12 +54,188 @@ public static function createStyleBundle($name) {
    */
   public static function createFullBundle($name) {
     $bundle = new CRM_Core_Resources_Bundle($name);
-    // TODO
+    $config = CRM_Core_Config::singleton();
+
+    // Add resources from coreResourceList
+    $jsWeight = -9999;
+    foreach (self::coreResourceList(self::REGION) as $item) {
+      if (is_array($item)) {
+        $bundle->addSetting($item);
+      }
+      elseif (strpos($item, '.css')) {
+        Civi::resources()->isFullyFormedUrl($item) ? $bundle->addStyleUrl($item, -100) : $bundle->addStyleFile('civicrm', $item, -100);
+      }
+      elseif (Civi::resources()->isFullyFormedUrl($item)) {
+        $bundle->addScriptUrl($item, $jsWeight++);
+      }
+      else {
+        // Don't bother  looking for ts() calls in packages, there aren't any
+        $translate = (substr($item, 0, 3) == 'js/');
+        $bundle->addScriptFile('civicrm', $item, [
+          'weight' => $jsWeight++,
+          'translate' => $translate,
+        ]);
+      }
+    }
+    // Add global settings
+    $settings = [
+      'config' => [
+        'isFrontend' => $config->userFrameworkFrontend,
+      ],
+    ];
+    // Disable profile creation if user lacks permission
+    if (!CRM_Core_Permission::check('edit all contacts') && !CRM_Core_Permission::check('add contacts')) {
+      $settings['config']['entityRef']['contactCreate'] = FALSE;
+    }
+    $bundle->addSetting($settings);
+
+    // Give control of jQuery and _ back to the CMS - this loads last
+    $bundle->addScriptFile('civicrm', 'js/noconflict.js', [
+      'weight' => 9999,
+      'translate' => FALSE,
+    ]);
+
     CRM_Utils_Hook::alterBundle($bundle);
     self::useRegion($bundle, self::REGION);
     return $bundle;
   }
 
+  /**
+   * List of core resources we add to every CiviCRM page.
+   *
+   * Note: non-compressed versions of .min files will be used in debug mode
+   *
+   * @param string $region
+   * @return array
+   */
+  protected static function coreResourceList($region) {
+    $config = CRM_Core_Config::singleton();
+
+    // Scripts needed by everyone, everywhere
+    // FIXME: This is too long; list needs finer-grained segmentation
+    $items = [
+      "bower_components/jquery/dist/jquery.min.js",
+      "bower_components/jquery-ui/jquery-ui.min.js",
+      "bower_components/jquery-ui/themes/smoothness/jquery-ui.min.css",
+      "bower_components/lodash-compat/lodash.min.js",
+      "packages/jquery/plugins/jquery.mousewheel.min.js",
+      "bower_components/select2/select2.min.js",
+      "bower_components/select2/select2.min.css",
+      "bower_components/font-awesome/css/font-awesome.min.css",
+      "packages/jquery/plugins/jquery.form.min.js",
+      "packages/jquery/plugins/jquery.timeentry.min.js",
+      "packages/jquery/plugins/jquery.blockUI.min.js",
+      "bower_components/datatables/media/js/jquery.dataTables.min.js",
+      "bower_components/datatables/media/css/jquery.dataTables.min.css",
+      "bower_components/jquery-validation/dist/jquery.validate.min.js",
+      "bower_components/jquery-validation/dist/additional-methods.min.js",
+      "packages/jquery/plugins/jquery.ui.datepicker.validation.min.js",
+      "js/Common.js",
+      "js/crm.datepicker.js",
+      "js/crm.ajax.js",
+      "js/wysiwyg/crm.wysiwyg.js",
+    ];
+
+    // Dynamic localization script
+    $items[] = Civi::resources()->addCacheCode(
+      CRM_Utils_System::url('civicrm/ajax/l10n-js/' . CRM_Core_I18n::getLocale(),
+        ['cid' => CRM_Core_Session::getLoggedInContactID()], FALSE, NULL, FALSE)
+    );
+
+    // add wysiwyg editor
+    $editor = Civi::settings()->get('editor_id');
+    if ($editor == "CKEditor") {
+      CRM_Admin_Form_CKEditorConfig::setConfigDefault();
+      $items[] = [
+        'config' => [
+          'wysisygScriptLocation' => Civi::paths()->getUrl("[civicrm.root]/js/wysiwyg/crm.ckeditor.js"),
+          'CKEditorCustomConfig' => CRM_Admin_Form_CKEditorConfig::getConfigUrl(),
+        ],
+      ];
+    }
+
+    // These scripts are only needed by back-office users
+    if (CRM_Core_Permission::check('access CiviCRM')) {
+      $items[] = "packages/jquery/plugins/jquery.tableHeader.js";
+      $items[] = "packages/jquery/plugins/jquery.notify.min.js";
+    }
+
+    $contactID = CRM_Core_Session::getLoggedInContactID();
+
+    // Menubar
+    $position = 'none';
+    if (
+      $contactID && !$config->userFrameworkFrontend
+      && CRM_Core_Permission::check('access CiviCRM')
+      && !@constant('CIVICRM_DISABLE_DEFAULT_MENU')
+      && !CRM_Core_Config::isUpgradeMode()
+    ) {
+      $position = Civi::settings()->get('menubar_position') ?: 'over-cms-menu';
+    }
+    if ($position !== 'none') {
+      $items[] = 'bower_components/smartmenus/dist/jquery.smartmenus.min.js';
+      $items[] = 'bower_components/smartmenus/dist/addons/keyboard/jquery.smartmenus.keyboard.min.js';
+      $items[] = 'js/crm.menubar.js';
+      // @see CRM_Core_Resources::renderMenubarStylesheet
+      $items[] = Civi::service('asset_builder')->getUrl('crm-menubar.css', [
+        'menubarColor' => Civi::settings()->get('menubar_color'),
+        'height' => 40,
+        'breakpoint' => 768,
+      ]);
+      // Variables for crm.menubar.js
+      $items[] = [
+        'menubar' => [
+          'position' => $position,
+          'qfKey' => CRM_Core_Key::get('CRM_Contact_Controller_Search', TRUE),
+          'cacheCode' => CRM_Core_BAO_Navigation::getCacheKey($contactID),
+        ],
+      ];
+    }
+
+    // JS for multilingual installations
+    if (!empty($config->languageLimit) && count($config->languageLimit) > 1 && CRM_Core_Permission::check('translate CiviCRM')) {
+      $items[] = "js/crm.multilingual.js";
+    }
+
+    // Enable administrators to edit option lists in a dialog
+    if (CRM_Core_Permission::check('administer CiviCRM') && Civi::settings()->get('ajaxPopupsEnabled')) {
+      $items[] = "js/crm.optionEdit.js";
+    }
+
+    $tsLocale = CRM_Core_I18n::getLocale();
+    // Add localized jQuery UI files
+    if ($tsLocale && $tsLocale != 'en_US') {
+      // Search for i18n file in order of specificity (try fr-CA, then fr)
+      list($lang) = explode('_', $tsLocale);
+      $path = "bower_components/jquery-ui/ui/i18n";
+      foreach ([str_replace('_', '-', $tsLocale), $lang] as $language) {
+        $localizationFile = "$path/datepicker-{$language}.js";
+        if (Civi::resources()->getPath('civicrm', $localizationFile)) {
+          $items[] = $localizationFile;
+          break;
+        }
+      }
+    }
+
+    // Allow hooks to modify this list
+    CRM_Utils_Hook::coreResourceList($items, $region);
+
+    // Oof, existing listeners would expect $items to typically begin with 'bower_components/' or 'packages/'
+    // (using an implicit base of `[civicrm.root]`). We preserve the hook contract and cleanup $items post-hook.
+    $map = [
+      'bower_components' => rtrim(Civi::paths()->getUrl('[civicrm.bower]/.', 'absolute'), '/'),
+      'packages' => rtrim(Civi::paths()->getUrl('[civicrm.packages]/.', 'absolute'), '/'),
+    ];
+    $filter = function($m) use ($map) {
+      return $map[$m[1]] . $m[2];
+    };
+    $items = array_map(function($item) use ($filter) {
+      return is_array($item) ? $item : preg_replace_callback(';^(bower_components|packages)(/.*);', $filter, $item);
+    }, $items);
+
+    return $items;
+  }
+
   /**
    * Ensure that all elements of the bundle are in the same region.
    *

From 8b7abdb6cf4e15bc0b20c61435dc04f9db5d45b6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 24 Aug 2020 02:47:22 -0700
Subject: [PATCH 118/834] CollectionAdderTrait - Use secondary ordering more
 akin to CRM_Core_Resources

This is a very subtle behavioral change.  To understand it, we must consider
the traditional ordering in `CRM_Core_Resources::addScriptUrl()` and
`CRM_Core_Region::add()`.  Compare these two examples:

```
Civi::resources()->addScriptUrl('http://example.com/foo.js', 100, 'page-footer');
Civi::resources()->addScriptUrl('http://example.com/bar.js', 100, 'page-footer');

CRM_Core_Region::instance('page-footer')->add([
  'scriptUrl' => 'http://example.com/foo.js',
  'weight' => 100,
]);
CRM_Core_Region::instance('page-footer')->add([
  'scriptUrl' => 'http://example.com/bar.js',
  'weight' => 100,
]);
```

You might expect this to output `<SCRIPT>`s in the same order.  After all,
the examples use the same URLs, the same weights, and the same
procedural/natural order.  Moreover, `Civi::resources()` is just a wrapper
for `CRM_Core_Region`.  Surely they were the same!

They were not. The output order would differ.

The reason is that the ordering had two keys (`weight,name`), and the
secondary-key (`name`) was hidden from us:

* In `CRM_Core_Resources::addScriptUrl()`, the default `name` was the URL.
  This was handy for de-duping resources.
* In `CRM_Core_Region::add()`, the default `name` was a numeric position.
  This made it behave like procedural/natural-ordering.

Of course, the goal in this branch is to make various collections support
the same methods and the same behaviors.  But they didn't agree before, so
something has to give.  Either:

1. Standardize on the behavior of `Resources::addScriptUrl()` and change `Region::add(scriptUrl)`.
2. Standardize on the behavior of `Region::add(scriptUrl)` and change `Resources::addScriptUrl()`.
3. Embrace a split. All `CRM_Core_Resources::add*()` behave one way, and all `CRM_Core_Region::add*()` behave another.
4. Embrace a split. All rich adders (`*::addScriptUrl()`) behave one way, and all generic adders (`*::add()`) behave another.

This developmental branch has been using `#3`. The patch changes it to `#4`.

Both splits achieve backward compatibility wrt `Resources::addScriptUrl()`
and `Region::add(scriptUrl)`.  The difference is that `#4` allows us to have
the same behavior in all collections (regardless of subtype), which means
that collections can be more interoperable and share more code.  From my
POV, it's still quirkier than `#1` or `#2`, but it's not as quirky as `#3`.
---
 CRM/Core/Resources/CollectionAdderTrait.php   | 12 ++++++
 CRM/Core/Resources/CollectionTrait.php        |  7 ++--
 .../Core/Resources/CollectionTestTrait.php    | 40 +++++++++++--------
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/CRM/Core/Resources/CollectionAdderTrait.php b/CRM/Core/Resources/CollectionAdderTrait.php
index 392cc4c55da9..469d1c426f88 100644
--- a/CRM/Core/Resources/CollectionAdderTrait.php
+++ b/CRM/Core/Resources/CollectionAdderTrait.php
@@ -99,6 +99,9 @@ public function addScript(string $code, ...$options) {
   public function addScriptFile(string $ext, string $file, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
       'scriptFile' => [$ext, $file],
+      'name' => "$ext:$file",
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptFile() produce slightly different orderings.
     ]));
     return $this;
   }
@@ -119,6 +122,9 @@ public function addScriptFile(string $ext, string $file, ...$options) {
   public function addScriptUrl(string $url, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
       'scriptUrl' => $url,
+      'name' => $url,
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings.
     ]));
     return $this;
   }
@@ -215,6 +221,9 @@ public function addStyle(string $code, ...$options) {
   public function addStyleFile(string $ext, string $file, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
       'styleFile' => [$ext, $file],
+      'name' => "$ext:$file",
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings.
     ]));
     return $this;
   }
@@ -235,6 +244,9 @@ public function addStyleFile(string $ext, string $file, ...$options) {
   public function addStyleUrl(string $url, ...$options) {
     $this->add(self::mergeStandardOptions($options, [
       'styleUrl' => $url,
+      'name' => $url,
+      // Setting the name above may appear superfluous, but it preserves a historical quirk
+      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings.
     ]));
     return $this;
   }
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index f750f01db077..4d97aeeced74 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -64,6 +64,7 @@ trait CRM_Core_Resources_CollectionTrait {
    */
   public function add($snippet) {
     $snippet = array_merge($this->defaults, $snippet);
+    $snippet['id'] = $this->nextId();
     if (!isset($snippet['type'])) {
       foreach ($this->types as $type) {
         // auto-detect
@@ -85,18 +86,18 @@ public function add($snippet) {
       switch ($snippet['type']) {
         case 'scriptUrl':
         case 'styleUrl':
-          $snippet['sortId'] = $this->nextId();
+          $snippet['sortId'] = $snippet['id'];
           $snippet['name'] = $snippet[$snippet['type']];
           break;
 
         case 'scriptFile':
         case 'styleFile':
-          $snippet['sortId'] = $this->nextId();
+          $snippet['sortId'] = $snippet['id'];
           $snippet['name'] = implode(':', $snippet[$snippet['type']]);
           break;
 
         default:
-          $snippet['sortId'] = $this->nextId();
+          $snippet['sortId'] = $snippet['id'];
           $snippet['name'] = $snippet['sortId'];
           break;
       }
diff --git a/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php b/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
index 14e8942350cb..61787dfd4845 100644
--- a/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
+++ b/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
@@ -42,7 +42,7 @@ public function getSnippetExamples() {
     };
 
     $addCases(
-    // List of equivalent method calls
+      // List of equivalent method calls
       [
         'add(scriptUrl): dfl' => ['add', ['scriptUrl' => 'http://example.com/foo.js']],
         'addScriptUrl(): dfl' => ['addScriptUrl', 'http://example.com/foo.js'],
@@ -53,12 +53,22 @@ public function getSnippetExamples() {
         'name' => 'http://example.com/foo.js',
         'disabled' => FALSE,
         'weight' => 1,
-        'sortId' => 1,
         'type' => 'scriptUrl',
         'scriptUrl' => 'http://example.com/foo.js',
       ]
     );
 
+    // For historical reasons, the `add(scriptUrl)` and `addScriptUrl()` calls
+    // differ very slightly in how data is ordered.
+    $addCases(
+      ['add(scriptUrl): dfl: sortId' => ['add', ['scriptUrl' => 'http://example.com/foo.js']]],
+      ['sortId' => ($this instanceof CRM_Core_RegionTest ? 2 : 1)]
+    );
+    $addCases(
+      ['addScriptUrl(): dfl: sortId' => ['addScriptUrl', 'http://example.com/foo.js']],
+      ['sortId' => 'http://example.com/foo.js']
+    );
+
     $addCases(
       [
         'add(scriptUrl): wgt' => ['add', ['scriptUrl' => 'http://example.com/foo.js', 'weight' => 100]],
@@ -69,7 +79,6 @@ public function getSnippetExamples() {
         'name' => 'http://example.com/foo.js',
         'disabled' => FALSE,
         'weight' => 100,
-        'sortId' => 1,
         'type' => 'scriptUrl',
         'scriptUrl' => 'http://example.com/foo.js',
       ]
@@ -84,7 +93,6 @@ public function getSnippetExamples() {
         'name' => 'http://example.com/foo.css',
         'disabled' => FALSE,
         'weight' => 1,
-        'sortId' => 1,
         'type' => 'styleUrl',
         'styleUrl' => 'http://example.com/foo.css',
       ]
@@ -99,7 +107,6 @@ public function getSnippetExamples() {
         'name' => 'civicrm:css/civicrm.css',
         'disabled' => FALSE,
         'weight' => 1,
-        'sortId' => 1,
         'type' => 'styleFile',
         'styleFile' => ['civicrm', 'css/civicrm.css'],
         'styleFileUrls' => [
@@ -111,7 +118,6 @@ public function getSnippetExamples() {
     $basicFooJs = [
       'name' => 'civicrm:js/foo.js',
       'disabled' => FALSE,
-      'sortId' => 1,
       'type' => 'scriptFile',
       'scriptFile' => ['civicrm', 'js/foo.js'],
       'scriptFileUrls' => [
@@ -153,10 +159,10 @@ public function getSnippetExamples() {
         'addScript()' => ['addScript', 'window.alert("Boo!");'],
       ],
       [
-        'name' => 1,
+        // Regions always have a 'default' with ID#1, so our test always becomes #2.
+        'name' => ($this instanceof CRM_Core_RegionTest ? 2 : 1),
         'disabled' => FALSE,
         'weight' => 1,
-        'sortId' => 1,
         'type' => 'script',
         'script' => 'window.alert("Boo!");',
       ]
@@ -321,17 +327,17 @@ public function assertSameSnippet($expect, $actual, $message = '') {
       return $snippet;
     };
 
-    // If there isn't an explicit expectation for 'region', then we won't check it.
-    if (!isset($expect['region']) || '*' === $expect['region']) {
-      if (isset($actual['region'])) {
-        unset($expect['region']);
-        unset($actual['region']);
-      }
-    }
-
     $expect = $normalizeSnippet($expect);
     $actual = $normalizeSnippet($actual);
-    $this->assertEquals($expect, $actual, $message);
+
+    foreach ($expect as $expectKey => $expectValue) {
+      if ($expectValue === '*') {
+        $this->assertTrue(!empty($actual[$expectKey]));
+      }
+      else {
+        $this->assertEquals($expectValue, $actual[$expectKey]);
+      }
+    }
   }
 
 }

From e9d08c6b837dbe648af2402e63565606420e951f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 24 Aug 2020 03:10:33 -0700
Subject: [PATCH 119/834] CRM_Core_Resources - Use splats,
 CollectionAdderTrait, CollectionAdderInterface

Before
------

`CRM_Core_Resources` directly implements a number of functions (`addFoo()`)

After
-----

`CRM_Core_Resources` re-uses the implementations from `CollectionAdderTrait`

Comment
-------

The method signatures in `CollectionAdderTrait` look different, but they are
compatible.  In particular, the use of splat (`...$options`) means that they
can accept either key-value options or positional options. The existing
test-cases in `CollectionTestTrait` assert as much.
---
 CRM/Core/Resources.php                      | 268 +++-----------------
 CRM/Core/Resources/CollectionAdderTrait.php |   2 +-
 CRM/Core/Resources/CollectionTrait.php      |   2 +-
 3 files changed, 37 insertions(+), 235 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 002adcabf867..5b7765a33a6c 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -24,10 +24,12 @@
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
-class CRM_Core_Resources {
+class CRM_Core_Resources implements CRM_Core_Resources_CollectionAdderInterface {
   const DEFAULT_WEIGHT = 0;
   const DEFAULT_REGION = 'page-footer';
 
+  use CRM_Core_Resources_CollectionAdderTrait;
+
   /**
    * We don't have a container or dependency-injection, so use singleton instead
    *
@@ -139,6 +141,38 @@ public function __construct($extMapper, $strings, $cacheCodeKey = NULL) {
     $this->paths = Civi::paths();
   }
 
+  /**
+   * Add an item to the collection.
+   *
+   * @param array $snippet
+   * @return array
+   *   The full/computed snippet (with defaults applied).
+   * @see CRM_Core_Resources_CollectionInterface::add()
+   */
+  public function add($snippet) {
+    if (!isset($snippet['region'])) {
+      $snippet['region'] = self::DEFAULT_REGION;
+    }
+    if (!isset($snippet['weight'])) {
+      $snippet['weight'] = self::DEFAULT_WEIGHT;
+    }
+    return CRM_Core_Region::instance($snippet['region'])->add($snippet);
+  }
+
+  /**
+   * Locate the 'settings' snippet.
+   *
+   * @param array $options
+   * @return array
+   * @see CRM_Core_Resources_CollectionTrait::findCreateSettingSnippet()
+   */
+  public function &findCreateSettingSnippet($options = []): array {
+    $options = CRM_Core_Resources_CollectionAdderTrait::mergeSettingOptions($options, [
+      'region' => NULL,
+    ]);
+    return $this->getSettingRegion($options['region'])->findCreateSettingSnippet($options);
+  }
+
   /**
    * Assimilate all the resources listed in a bundle.
    *
@@ -187,143 +221,6 @@ public function addBundle($bundle) {
     return $this;
   }
 
-  /**
-   * Export permission data to the client to enable smarter GUIs.
-   *
-   * Note: Application security stems from the server's enforcement
-   * of the security logic (e.g. in the API permissions). There's no way
-   * the client can use this info to make the app more secure; however,
-   * it can produce a better-tuned (non-broken) UI.
-   *
-   * @param string|iterable $permNames
-   *   List of permission names to check/export.
-   * @return CRM_Core_Resources
-   */
-  public function addPermissions($permNames) {
-    $this->getSettingRegion()->addPermissions($permNames);
-    return $this;
-  }
-
-  /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * @param string $ext
-   *   extension name; use 'civicrm' for core.
-   * @param string $file
-   *   file path -- relative to the extension base dir.
-   * @param int $weight
-   *   relative weight within a given region.
-   * @param string $region
-   *   location within the file; 'html-header', 'page-header', 'page-footer'.
-   * @param bool|string $translate
-   *   Whether to load translated strings for this file. Use one of:
-   *   - FALSE: Do not load translated strings.
-   *   - TRUE: Load translated strings. Use the $ext's default domain.
-   *   - string: Load translated strings. Use a specific domain.
-   *
-   * @return CRM_Core_Resources
-   *
-   * @throws \CRM_Core_Exception
-   */
-  public function addScriptFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION, $translate = TRUE) {
-    CRM_Core_Region::instance($region)->addScriptFile($ext, $file, [
-      'weight' => $weight,
-      'translate' => $translate,
-      'name' => "$ext:$file",
-      // Setting the name above may appear superfluous, but it preserves a historical quirk
-      // where Region::add() and Resources::addScriptFile() produce slightly different orderings..
-    ]);
-    return $this;
-  }
-
-  /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * @param string $url
-   * @param int $weight
-   *   relative weight within a given region.
-   * @param string $region
-   *   location within the file; 'html-header', 'page-header', 'page-footer'.
-   * @return CRM_Core_Resources
-   */
-  public function addScriptUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add([
-      'scriptUrl' => $url,
-      'weight' => $weight,
-      'name' => $url,
-      // Setting the name above may appear superfluous, but it preserves a historical quirk
-      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings..
-    ]);
-    return $this;
-  }
-
-  /**
-   * Add a JavaScript file to the current page using <SCRIPT SRC>.
-   *
-   * @param string $code
-   *   JavaScript source code.
-   * @param int $weight
-   *   relative weight within a given region.
-   * @param string $region
-   *   location within the file; 'html-header', 'page-header', 'page-footer'.
-   * @return CRM_Core_Resources
-   */
-  public function addScript($code, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add(['script' => $code, 'weight' => $weight]);
-    return $this;
-  }
-
-  /**
-   * Add JavaScript variables to CRM.vars
-   *
-   * Example:
-   * From the server:
-   * CRM_Core_Resources::singleton()->addVars('myNamespace', array('foo' => 'bar'));
-   * Access var from javascript:
-   * CRM.vars.myNamespace.foo // "bar"
-   *
-   * @see https://docs.civicrm.org/dev/en/latest/standards/javascript/
-   *
-   * @param string $nameSpace
-   *   Usually the name of your extension.
-   * @param array $vars
-   * @param string $region
-   *   The region to add settings to (eg. for payment processors usually billing-block)
-   *
-   * @return CRM_Core_Resources
-   */
-  public function addVars($nameSpace, $vars, $region = NULL) {
-    $this->getSettingRegion($region)->addVars($nameSpace, $vars);
-    return $this;
-  }
-
-  /**
-   * Add JavaScript variables to the root of the CRM object.
-   * This function is usually reserved for low-level system use.
-   * Extensions and components should generally use addVars instead.
-   *
-   * @param array $settings
-   * @param string $region
-   *   The region to add settings to (eg. for payment processors usually billing-block)
-   *
-   * @return CRM_Core_Resources
-   */
-  public function addSetting($settings, $region = NULL) {
-    $this->getSettingRegion($region)->addSetting($settings);
-    return $this;
-  }
-
-  /**
-   * Add JavaScript variables to the global CRM object via a callback function.
-   *
-   * @param callable $callable
-   * @return CRM_Core_Resources
-   */
-  public function addSettingsFactory($callable) {
-    $this->getSettingRegion()->addSettingsFactory($callable);
-    return $this;
-  }
-
   /**
    * Helper fn for addSettingsFactory.
    */
@@ -331,101 +228,6 @@ public function getSettings() {
     return $this->getSettingRegion()->getSettings();
   }
 
-  /**
-   * Add translated string to the js CRM object.
-   * It can then be retrived from the client-side ts() function
-   * Variable substitutions can happen from client-side
-   *
-   * Note: this function rarely needs to be called directly and is mostly for internal use.
-   * See CRM_Core_Resources::addScriptFile which automatically adds translated strings from js files
-   *
-   * Simple example:
-   * // From php:
-   * CRM_Core_Resources::singleton()->addString('Hello');
-   * // The string is now available to javascript code i.e.
-   * ts('Hello');
-   *
-   * Example with client-side substitutions:
-   * // From php:
-   * CRM_Core_Resources::singleton()->addString('Your %1 has been %2');
-   * // ts() in javascript works the same as in php, for example:
-   * ts('Your %1 has been %2', {1: objectName, 2: actionTaken});
-   *
-   * NOTE: This function does not work with server-side substitutions
-   * (as this might result in collisions and unwanted variable injections)
-   * Instead, use code like:
-   * CRM_Core_Resources::singleton()->addSetting(array('myNamespace' => array('myString' => ts('Your %1 has been %2', array(subs)))));
-   * And from javascript access it at CRM.myNamespace.myString
-   *
-   * @param string|array $text
-   * @param string|null $domain
-   * @return CRM_Core_Resources
-   */
-  public function addString($text, $domain = 'civicrm') {
-    $this->getSettingRegion()->addString($text, $domain);
-    return $this;
-  }
-
-  /**
-   * Add a CSS file to the current page using <LINK HREF>.
-   *
-   * @param string $ext
-   *   extension name; use 'civicrm' for core.
-   * @param string $file
-   *   file path -- relative to the extension base dir.
-   * @param int $weight
-   *   relative weight within a given region.
-   * @param string $region
-   *   location within the file; 'html-header', 'page-header', 'page-footer'.
-   * @return CRM_Core_Resources
-   */
-  public function addStyleFile($ext, $file, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->addStyleFile($ext, $file, [
-      'weight' => $weight,
-      'name' => "$ext:$file",
-      // Setting the name above may appear superfluous, but it preserves a historical quirk
-      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings..
-    ]);
-    return $this;
-  }
-
-  /**
-   * Add a CSS file to the current page using <LINK HREF>.
-   *
-   * @param string $url
-   * @param int $weight
-   *   relative weight within a given region.
-   * @param string $region
-   *   location within the file; 'html-header', 'page-header', 'page-footer'.
-   * @return CRM_Core_Resources
-   */
-  public function addStyleUrl($url, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add([
-      'styleUrl' => $url,
-      'weight' => $weight,
-      'name' => $url,
-      // Setting the name above may appear superfluous, but it preserves a historical quirk
-      // where Region::add() and Resources::addScriptUrl() produce slightly different orderings..
-    ]);
-    return $this;
-  }
-
-  /**
-   * Add a CSS content to the current page using <STYLE>.
-   *
-   * @param string $code
-   *   CSS source code.
-   * @param int $weight
-   *   relative weight within a given region.
-   * @param string $region
-   *   location within the file; 'html-header', 'page-header', 'page-footer'.
-   * @return CRM_Core_Resources
-   */
-  public function addStyle($code, $weight = self::DEFAULT_WEIGHT, $region = self::DEFAULT_REGION) {
-    CRM_Core_Region::instance($region)->add(['style' => $code, 'weight' => $weight]);
-    return $this;
-  }
-
   /**
    * Determine file path of a resource provided by an extension.
    *
diff --git a/CRM/Core/Resources/CollectionAdderTrait.php b/CRM/Core/Resources/CollectionAdderTrait.php
index 469d1c426f88..03fcd65ae367 100644
--- a/CRM/Core/Resources/CollectionAdderTrait.php
+++ b/CRM/Core/Resources/CollectionAdderTrait.php
@@ -36,7 +36,7 @@ abstract public function add($snippet);
    * @return array
    * @see CRM_Core_Resources_CollectionTrait::findCreateSettingSnippet()
    */
-  abstract protected function &findCreateSettingSnippet($options = []): array;
+  abstract public function &findCreateSettingSnippet($options = []): array;
 
   /**
    * Export permission data to the client to enable smarter GUIs.
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index 4d97aeeced74..d92070587144 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -356,7 +356,7 @@ public function getSettings(): array {
   /**
    * @return array
    */
-  protected function &findCreateSettingSnippet($options = []): array {
+  public function &findCreateSettingSnippet($options = []): array {
     $snippet = &$this->get('settings');
     if ($snippet !== NULL) {
       return $snippet;

From 63918d376faf25f699f54e61122c36ade0828f40 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 24 Aug 2020 21:26:23 -0700
Subject: [PATCH 120/834] Forward port
 https://github.com/civicrm/civicrm-core/pull/18141

---
 CRM/Core/Resources.php                   |  4 ++--
 tests/phpunit/CRM/Core/ResourcesTest.php | 27 ++++++++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 5b7765a33a6c..795789474c8a 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -224,8 +224,8 @@ public function addBundle($bundle) {
   /**
    * Helper fn for addSettingsFactory.
    */
-  public function getSettings() {
-    return $this->getSettingRegion()->getSettings();
+  public function getSettings($region = NULL) {
+    return $this->getSettingRegion($region)->getSettings();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index f39a7a329fd6..e3e8627bd847 100644
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -138,7 +138,7 @@ public function testAddVars() {
           ],
         ],
       ],
-      $this->res->getSettings()
+      $this->res->getSettings('html-header')
     );
   }
 
@@ -148,10 +148,23 @@ public function testAddSetting() {
       ->addSetting(['fruit' => ['yours' => 'orange']]);
     $this->assertTreeEquals(
       ['fruit' => ['yours' => 'orange', 'mine' => 'apple']],
-      $this->res->getSettings()
+      $this->res->getSettings('html-header')
     );
     $actual = CRM_Core_Region::instance('html-header')->render('');
-    $expected = json_encode(['fruit' => ['yours' => 'orange', 'mine' => 'apple']]);
+    $expected = 'var CRM = ' . json_encode(['fruit' => ['yours' => 'orange', 'mine' => 'apple']]) . ';';
+    $this->assertTrue(strpos($actual, $expected) !== FALSE);
+  }
+
+  public function testAddSettingToBillingBlock() {
+    $this->res
+      ->addSetting(['cheese' => ['cheddar' => 'yellow']], 'billing-block')
+      ->addSetting(['cheese' => ['edam' => 'red']], 'billing-block');
+    $this->assertTreeEquals(
+      ['cheese' => ['edam' => 'red', 'cheddar' => 'yellow']],
+      $this->res->getSettings('billing-block')
+    );
+    $actual = CRM_Core_Region::instance('billing-block')->render('');
+    $expected = 'CRM.$.extend(true, CRM, ' . json_encode(['cheese' => ['edam' => 'red', 'cheddar' => 'yellow']]) . ');';
     $this->assertTrue(strpos($actual, $expected) !== FALSE);
   }
 
@@ -162,7 +175,7 @@ public function testAddSettingHook() {
       $event->data['fruit']['mine'] = 'banana';
     });
     $this->res->addSetting(['fruit' => ['mine' => 'apple']]);
-    $settings = $this->res->getSettings();
+    $settings = $this->res->getSettings('html-header');
     $this->assertTreeEquals(['fruit' => ['mine' => 'banana']], $settings);
   }
 
@@ -174,7 +187,7 @@ public function testAddSettingFactory() {
       return ['fruit' => ['mine' => 'apple']];
     });
 
-    $actual = $this->res->getSettings();
+    $actual = $this->res->getSettings('html-header');
     $expected = ['fruit' => ['yours' => 'orange', 'mine' => 'apple']];
     $this->assertTreeEquals($expected, $actual);
   }
@@ -186,14 +199,14 @@ public function testAddSettingAndSettingFactory() {
     $this->res->addSettingsFactory(function () use (&$muckableValue) {
       return $muckableValue;
     });
-    $actual = $this->res->getSettings();
+    $actual = $this->res->getSettings('html-header');
     $expected = ['fruit' => ['mine' => 'apple', 'yours' => 'orange', 'theirs' => 'apricot']];
     $this->assertTreeEquals($expected, $actual);
 
     // note: the setting is not fixed based on what the factory returns when registered; it's based
     // on what the factory returns when getSettings is called
     $muckableValue = ['fruit' => ['yours' => 'banana']];
-    $actual = $this->res->getSettings();
+    $actual = $this->res->getSettings('html-header');
     $expected = ['fruit' => ['mine' => 'apple', 'yours' => 'banana']];
     $this->assertTreeEquals($expected, $actual);
   }

From 950538ac8a0dd528896a921685e0d83c38be0a34 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 25 Aug 2020 15:35:30 -0700
Subject: [PATCH 121/834] (NFC) Docblock tweaks

---
 CRM/Core/Resources/CollectionAdderInterface.php | 2 ++
 CRM/Core/Resources/CollectionAdderTrait.php     | 4 +++-
 CRM/Core/Resources/CollectionInterface.php      | 2 ++
 CRM/Core/Resources/CollectionTrait.php          | 5 ++---
 CRM/Core/Resources/Common.php                   | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Resources/CollectionAdderInterface.php b/CRM/Core/Resources/CollectionAdderInterface.php
index 42d636d23d13..5f7e6b0ead15 100644
--- a/CRM/Core/Resources/CollectionAdderInterface.php
+++ b/CRM/Core/Resources/CollectionAdderInterface.php
@@ -11,6 +11,8 @@
 
 /**
  * The collection-adder interface provides write-only support for a collection.
+ *
+ * @see CRM_Core_Resources_CollectionAdderTrait
  */
 interface CRM_Core_Resources_CollectionAdderInterface {
 
diff --git a/CRM/Core/Resources/CollectionAdderTrait.php b/CRM/Core/Resources/CollectionAdderTrait.php
index 03fcd65ae367..da3ecb2904a0 100644
--- a/CRM/Core/Resources/CollectionAdderTrait.php
+++ b/CRM/Core/Resources/CollectionAdderTrait.php
@@ -14,7 +14,9 @@
  *
  * This trait is a building-block for creating classes which maintain a list of
  * resources. It defines a set of helper functions which provide syntactic sugar
- * for calling the add() method.
+ * for calling the add() method. It implements most of the `CollectionAdderInterface`.
+ *
+ * @see CRM_Core_Resources_CollectionAdderInterface
  */
 trait CRM_Core_Resources_CollectionAdderTrait {
 
diff --git a/CRM/Core/Resources/CollectionInterface.php b/CRM/Core/Resources/CollectionInterface.php
index 5e278131de15..e3d1433b7105 100644
--- a/CRM/Core/Resources/CollectionInterface.php
+++ b/CRM/Core/Resources/CollectionInterface.php
@@ -74,6 +74,8 @@
  * Passing options in array (key-value) notation is clearest. For backward
  * compatibility, some methods (eg `addScript()`) accept options in positional form.
  * Where applicable, the docblock of each `addFoo()` will include a comment about positional form.
+ *
+ * @see CRM_Core_Resources_CollectionTrait
  */
 interface CRM_Core_Resources_CollectionInterface {
 
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index d92070587144..b7616edafce0 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -13,10 +13,9 @@
  * Class CRM_Core_Resources_CollectionTrait
  *
  * This is a building-block for creating classes which maintain a list of resources.
+ * It implements of the `CollectionInterface`.
  *
- * The class is generally organized in two sections: First, we have core
- * bit that manages a list of '$snippets'. Second, we have a set of helper
- * functions which add some syntactic sugar for the snippets.
+ * @see CRM_Core_Resources_CollectionInterface
  */
 trait CRM_Core_Resources_CollectionTrait {
 
diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index 3dc2dd7c5265..e5f34cc1d936 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -23,6 +23,7 @@ class CRM_Core_Resources_Common {
    * @param string $name
    *   i.e. 'coreStyles'
    * @return \CRM_Core_Resources_Bundle
+   * @see \Civi\Core\Container::createContainer()
    */
   public static function createStyleBundle($name) {
     $bundle = new CRM_Core_Resources_Bundle($name);
@@ -51,6 +52,7 @@ public static function createStyleBundle($name) {
    * @param string $name
    *   i.e. 'coreResources'
    * @return \CRM_Core_Resources_Bundle
+   * @see \Civi\Core\Container::createContainer()
    */
   public static function createFullBundle($name) {
     $bundle = new CRM_Core_Resources_Bundle($name);

From 19d42be6d6f8cb7122d0bea065986b85efed8307 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 25 Aug 2020 16:54:30 -0700
Subject: [PATCH 122/834] (NFC) CRM_Core_Resources::addBundle() - More
 explanatory comments.

---
 CRM/Core/Resources.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 795789474c8a..6d73cccb00be 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -177,11 +177,32 @@ public function &findCreateSettingSnippet($options = []): array {
    * Assimilate all the resources listed in a bundle.
    *
    * @param iterable|string|\CRM_Core_Resources_Bundle $bundle
-   *   Either bundle object, or the symbolic name of a bundle, or a list of budnles.
+   *   Either bundle object, or the symbolic name of a bundle, or a list of bundles.
    *   Note: For symbolic names, the bundle must be a container service ('bundle.FOO').
    * @return static
    */
   public function addBundle($bundle) {
+    // There are two ways you might write this method: (1) immediately merge
+    // resources from the bundle, or (2) store a reference to the bundle and
+    // merge resources later. Both have pros/cons. The implementation does #1.
+    //
+    // The upshot of #1 is *multi-region* support. For example, a bundle might
+    // add some JS to `html-header` and then add some HTML to `page-header`.
+    // Implementing this requires splitting the bundle (ie copying specific
+    // resources to their respective regions). The timing of `addBundle()` is
+    // favorable to splitting.
+    //
+    // The upshot of #2 would be *reduced timing sensitivity for downstream*:
+    // if party A wants to include some bundle, and party B wants to refine
+    // the same bundle, then it wouldn't matter if A or B executed first.
+    // This should make DX generally more forgiving. But we can't split until
+    // everyone has their shot at tweaking the bundle.
+    //
+    // In theory, you could have both characteristics if you figure the right
+    // time at which to perform a split. Or maybe you could have both by tracking
+    // more detailed references+events among the bundles/regions. I haven't
+    // seen a simple way to do get both.
+
     if (is_iterable($bundle)) {
       foreach ($bundle as $b) {
         $this->addBundle($b);

From 0aded46e5903558260a839cce649d6d74aca7e7f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 25 Aug 2020 16:53:47 -0700
Subject: [PATCH 123/834] (REF) CRM_Core_Resources::addBundle() - Improve
 readability. Add test.

---
 CRM/Core/Resources.php                   | 24 +++++--------
 CRM/Core/Resources/Bundle.php            |  7 ++--
 tests/phpunit/CRM/Core/ResourcesTest.php | 45 ++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 6d73cccb00be..4a48798230c8 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -219,23 +219,17 @@ public function addBundle($bundle) {
     }
     $this->addedBundles[$bundle->name] = TRUE;
 
-    // If an item is already assigned to a region, we'll respect that.
-    // Otherwise, we'll use defaults.
-    $pickRegion = function ($snippet) {
-      if (isset($snippet['settings'])) {
-        return $this->getSettingRegion($snippet['region'] ?? NULL)->_name;
+    // Ensure that every asset has a region.
+    $bundle->filter(function($snippet) {
+      if (empty($snippet['region'])) {
+        $snippet['region'] = isset($snippet['settings'])
+          ? $this->getSettingRegion()->_name
+          : self::DEFAULT_REGION;
       }
-      else {
-        return $snippet['region'] ?? self::DEFAULT_REGION;
-      }
-    };
-
-    $byRegion = [];
-    foreach ($bundle->getAll() as $snippet) {
-      $snippet['region'] = $pickRegion($snippet);
-      $byRegion[$snippet['region']][$snippet['name']] = $snippet;
-    }
+      return $snippet;
+    });
 
+    $byRegion = CRM_Utils_Array::index(['region', 'name'], $bundle->getAll());
     foreach ($byRegion as $regionName => $snippets) {
       CRM_Core_Region::instance($regionName)->merge($snippets);
     }
diff --git a/CRM/Core/Resources/Bundle.php b/CRM/Core/Resources/Bundle.php
index 311dc2a05d39..62c1a0426958 100644
--- a/CRM/Core/Resources/Bundle.php
+++ b/CRM/Core/Resources/Bundle.php
@@ -29,10 +29,13 @@ class CRM_Core_Resources_Bundle implements CRM_Core_Resources_CollectionInterfac
   public $name;
 
   /**
+   * @param string|NULL $name
+   * @param string[]|NULL $types
+   *   List of resource-types to permit in this bundle. NULL for a default list.
    */
-  public function __construct($name = NULL) {
+  public function __construct($name = NULL, $types = NULL) {
     $this->name = $name;
-    $this->types = ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl'];
+    $this->types = $types ?: ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl'];
   }
 
 }
diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index e3e8627bd847..2d726ab811c6 100644
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -60,6 +60,51 @@ public function tearDown() {
     $_GET = $this->originalGet;
   }
 
+  /**
+   * Make two bundles (multi-regional). Add them to CRM_Core_Resources.
+   * Ensure that the resources land in the right regions.
+   */
+  public function testAddBundle() {
+    $foo = new CRM_Core_Resources_Bundle('foo', ['scriptUrl', 'styleUrl', 'markup']);
+    $bar = new CRM_Core_Resources_Bundle('bar', ['scriptUrl', 'styleUrl', 'markup']);
+
+    $foo->addScriptUrl('http://example.com/foo.js', 100, 'testAddBundle_foo');
+    $foo->add(['markup' => 'Hello, foo', 'region' => 'page-header']);
+    $bar->addScriptUrl('http://example.com/bar.js', 100, 'testAddBundle_bar');
+    $bar->add(['markup' => 'Hello, bar', 'region' => 'page-header']);
+    $foo->addStyleUrl('http://example.com/shoes.css');
+
+    $this->res->addBundle($foo);
+    $this->res->addBundle([$bar]);
+
+    $getPropsByRegion = function($region, $key) {
+      $props = [];
+      foreach (CRM_Core_Region::instance($region)->getAll() as $snippet) {
+        if (isset($snippet[$key])) {
+          $props[] = $snippet[$key];
+        }
+      }
+      return $props;
+    };
+
+    $this->assertEquals(
+      ['http://example.com/foo.js'],
+      $getPropsByRegion('testAddBundle_foo', 'scriptUrl')
+    );
+    $this->assertEquals(
+      ['http://example.com/bar.js'],
+      $getPropsByRegion('testAddBundle_bar', 'scriptUrl')
+    );
+    $this->assertEquals(
+      ['', 'Hello, foo', 'Hello, bar'],
+      $getPropsByRegion('page-header', 'markup')
+    );
+    $this->assertEquals(
+      ['http://example.com/shoes.css'],
+      $getPropsByRegion('page-footer', 'styleUrl')
+    );
+  }
+
   public function testAddScriptFile() {
     $this->res
       ->addScriptFile('com.example.ext', 'foo%20bar.js', 0, 'testAddScriptFile')

From e564eac67d3fcfee8fad1760e928f6af81e13d22 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 25 Aug 2020 17:11:34 -0700
Subject: [PATCH 124/834] CollectionAdderInterface - Support addMarkup($html)

---
 .../Resources/CollectionAdderInterface.php    | 16 ++++++++++++++
 CRM/Core/Resources/CollectionAdderTrait.php   | 21 +++++++++++++++++++
 .../Core/Resources/CollectionTestTrait.php    | 21 +++++++++++++++++--
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/Resources/CollectionAdderInterface.php b/CRM/Core/Resources/CollectionAdderInterface.php
index 5f7e6b0ead15..e3b4f2cc9212 100644
--- a/CRM/Core/Resources/CollectionAdderInterface.php
+++ b/CRM/Core/Resources/CollectionAdderInterface.php
@@ -28,6 +28,22 @@ public function add($snippet);
 
   // TODO public function addBundle($bundle);
 
+  /**
+   * Add an HTML blob.
+   *
+   * Ex: addMarkup('<p>Hello world!</p>', ['weight' => 123]);
+   *
+   * @param string $markup
+   *   HTML code.
+   * @param array $options
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addMarkup(string $code, int $weight, string $region).
+   * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addScript()
+   */
+  public function addMarkup(string $markup, ...$options);
+
   /**
    * Export permission data to the client to enable smarter GUIs.
    *
diff --git a/CRM/Core/Resources/CollectionAdderTrait.php b/CRM/Core/Resources/CollectionAdderTrait.php
index da3ecb2904a0..da81a34a03d9 100644
--- a/CRM/Core/Resources/CollectionAdderTrait.php
+++ b/CRM/Core/Resources/CollectionAdderTrait.php
@@ -40,6 +40,27 @@ abstract public function add($snippet);
    */
   abstract public function &findCreateSettingSnippet($options = []): array;
 
+  /**
+   * Add an HTML blob.
+   *
+   * Ex: addMarkup('<p>Hello world!</p>', ['weight' => 123]);
+   *
+   * @param string $markup
+   *   HTML code.
+   * @param array $options
+   *   Open-ended list of key-value options. See CollectionInterface docs.
+   *   Positional equivalence: addMarkup(string $code, int $weight, string $region).
+   * @return static
+   * @see CRM_Core_Resources_CollectionInterface
+   * @see CRM_Core_Resources_CollectionAdderInterface::addMarkup()
+   */
+  public function addMarkup(string $markup, ...$options) {
+    $this->add(self::mergeStandardOptions($options, [
+      'markup' => $markup,
+    ]));
+    return $this;
+  }
+
   /**
    * Export permission data to the client to enable smarter GUIs.
    *
diff --git a/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php b/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
index 61787dfd4845..3b1a069cbb42 100644
--- a/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
+++ b/tests/phpunit/CRM/Core/Resources/CollectionTestTrait.php
@@ -23,6 +23,8 @@ trait CRM_Core_Resources_CollectionTestTrait {
   abstract public function createEmptyCollection();
 
   public function getSnippetExamples() {
+    $allowsMarkup = ($this instanceof CRM_Core_RegionTest);
+    $defaultCount = ($this instanceof CRM_Core_RegionTest) ? 1 : 0;
     $es = [];
 
     /**
@@ -159,8 +161,7 @@ public function getSnippetExamples() {
         'addScript()' => ['addScript', 'window.alert("Boo!");'],
       ],
       [
-        // Regions always have a 'default' with ID#1, so our test always becomes #2.
-        'name' => ($this instanceof CRM_Core_RegionTest ? 2 : 1),
+        'name' => 1 + $defaultCount,
         'disabled' => FALSE,
         'weight' => 1,
         'type' => 'script',
@@ -168,6 +169,22 @@ public function getSnippetExamples() {
       ]
     );
 
+    if ($allowsMarkup) {
+      $addCases(
+        [
+          'add(markup)' => ['add', ['markup' => '<p>HELLO</p>']],
+          'addMarkup()' => ['addMarkup', '<p>HELLO</p>'],
+        ],
+        [
+          'name' => 1 + $defaultCount,
+          'disabled' => FALSE,
+          'weight' => 1,
+          'type' => 'markup',
+          'markup' => '<p>HELLO</p>',
+        ]
+      );
+    }
+
     return $es;
   }
 

From fa9a476957b2a090824754cad9d113c076cb8bda Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 4 Sep 2020 08:08:09 +1000
Subject: [PATCH 125/834] Update unit tests to match content

---
 tests/phpunit/CRM/Core/ResourcesTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index 2d726ab811c6..93596d0c0fdc 100644
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -196,7 +196,7 @@ public function testAddSetting() {
       $this->res->getSettings('html-header')
     );
     $actual = CRM_Core_Region::instance('html-header')->render('');
-    $expected = 'var CRM = ' . json_encode(['fruit' => ['yours' => 'orange', 'mine' => 'apple']]) . ';';
+    $expected = '})(' . json_encode(['fruit' => ['yours' => 'orange', 'mine' => 'apple']]) . ')';
     $this->assertTrue(strpos($actual, $expected) !== FALSE);
   }
 
@@ -209,7 +209,7 @@ public function testAddSettingToBillingBlock() {
       $this->res->getSettings('billing-block')
     );
     $actual = CRM_Core_Region::instance('billing-block')->render('');
-    $expected = 'CRM.$.extend(true, CRM, ' . json_encode(['cheese' => ['edam' => 'red', 'cheddar' => 'yellow']]) . ');';
+    $expected = '})(' . json_encode(['cheese' => ['edam' => 'red', 'cheddar' => 'yellow']]) . ')';
     $this->assertTrue(strpos($actual, $expected) !== FALSE);
   }
 

From f70aa6547238ac10bbe4ef9dd8de6b281594572e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 11:51:50 +1200
Subject: [PATCH 126/834] Preliminary cleanup on test

Just fixing unused variables, exception declarations etc
---
 tests/phpunit/api/v3/LineItemTest.php | 51 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/tests/phpunit/api/v3/LineItemTest.php b/tests/phpunit/api/v3/LineItemTest.php
index 9638d4c2b68e..953b2b695d8f 100644
--- a/tests/phpunit/api/v3/LineItemTest.php
+++ b/tests/phpunit/api/v3/LineItemTest.php
@@ -14,33 +14,29 @@
  * @group headless
  */
 class api_v3_LineItemTest extends CiviUnitTestCase {
-  protected $_apiversion = 3;
-  protected $testAmount = 34567;
   protected $params;
-  protected $id = 0;
-  protected $contactIds = [];
   protected $_entity = 'line_item';
-  protected $contribution_result = NULL;
-
-  public $DBResetRequired = TRUE;
-  protected $_financialTypeId = 1;
 
+  /**
+   * Prepare for test.
+   *
+   * @throws \CRM_Core_Exception
+   */
   public function setUp() {
     parent::setUp();
-    $this->useTransaction(TRUE);
-    $this->_individualId = $this->individualCreate();
+    $this->useTransaction();
     $contributionParams = [
-      'contact_id' => $this->_individualId,
+      'contact_id' => $this->individualCreate(),
       'receive_date' => '20120511',
       'total_amount' => 100.00,
-      'financial_type_id' => $this->_financialTypeId,
+      'financial_type_id' => 'Donation',
       'non_deductible_amount' => 10.00,
       'fee_amount' => 51.00,
       'net_amount' => 91.00,
       'source' => 'SSF',
       'contribution_status_id' => 1,
     ];
-    $contribution = $this->callAPISuccess('contribution', 'create', $contributionParams);
+    $contribution = $this->callAPISuccess('Contribution', 'create', $contributionParams);
     $this->params = [
       'price_field_value_id' => 1,
       'price_field_id' => 1,
@@ -52,13 +48,20 @@ public function setUp() {
     ];
   }
 
+  /**
+   * Test basic create line item.
+   *
+   * @throws \CRM_Core_Exception
+   */
   public function testCreateLineItem() {
-    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params + ['debug' => 1], __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count']);
-    $this->assertNotNull($result['values'][$result['id']]['id']);
-    $this->getAndCheck($this->params, $result['id'], $this->_entity);
+    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__)['values'];
+    $this->assertCount(1, $result);
+    $this->getAndCheck($this->params, key($result), $this->_entity);
   }
 
+  /**
+   * Test basic get line item.
+   */
   public function testGetBasicLineItem() {
     $getParams = [
       'entity_table' => 'civicrm_contribution',
@@ -67,17 +70,27 @@ public function testGetBasicLineItem() {
     $this->assertEquals(1, $getResult['count']);
   }
 
+  /**
+   * Test delete line item.
+   *
+   * @throws \CRM_Core_Exception
+   */
   public function testDeleteLineItem() {
     $getParams = [
       'entity_table' => 'civicrm_contribution',
     ];
     $getResult = $this->callAPISuccess($this->_entity, 'get', $getParams);
     $deleteParams = ['id' => $getResult['id']];
-    $deleteResult = $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
-    $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
+    $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
+    $checkDeleted = $this->callAPISuccess($this->_entity, 'get');
     $this->assertEquals(0, $checkDeleted['count']);
   }
 
+  /**
+   * Test getfields function.
+   *
+   * @throws \CRM_Core_Exception
+   */
   public function testGetFieldsLineItem() {
     $result = $this->callAPISuccess($this->_entity, 'getfields', ['action' => 'create']);
     $this->assertEquals(1, $result['values']['entity_id']['api.required']);

From 15912a4decf275132d36ac7c8483805a49227e0e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 15:26:33 +1200
Subject: [PATCH 127/834] Convert PaypalPro to use Guzzle - step 1 - prepare to
 capture

---
 CRM/Core/Payment/PayPalImpl.php               | 53 ++++++-----
 .../CRM/Core/Payment/PaypalProTest.php        | 89 ++++++++++++++++++
 .../CRM/Core/Payment/PaypalProTrait.php       | 94 +++++++++++++++++++
 3 files changed, 211 insertions(+), 25 deletions(-)
 create mode 100644 tests/phpunit/CRM/Core/Payment/PaypalProTest.php
 create mode 100644 tests/phpunit/CRM/Core/Payment/PaypalProTrait.php

diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php
index be3f794b11ef..2da74b406572 100644
--- a/CRM/Core/Payment/PayPalImpl.php
+++ b/CRM/Core/Payment/PayPalImpl.php
@@ -45,6 +45,25 @@ public function __construct($mode, &$paymentProcessor) {
     $this->_paymentProcessor = $paymentProcessor;
   }
 
+  /**
+   * @var GuzzleHttp\Client
+   */
+  protected $guzzleClient;
+
+  /**
+   * @return \GuzzleHttp\Client
+   */
+  public function getGuzzleClient(): \GuzzleHttp\Client {
+    return $this->guzzleClient ?? new \GuzzleHttp\Client();
+  }
+
+  /**
+   * @param \GuzzleHttp\Client $guzzleClient
+   */
+  public function setGuzzleClient(\GuzzleHttp\Client $guzzleClient) {
+    $this->guzzleClient = $guzzleClient;
+  }
+
   /**
    * Helper function to check which payment processor type is being used.
    *
@@ -996,35 +1015,19 @@ public function invokeAPI($args) {
       throw new PaymentProcessorException('curl functions NOT available.');
     }
 
-    //setting the curl parameters.
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $url);
-    curl_setopt($ch, CURLOPT_VERBOSE, 0);
-
-    //turning off the server and peer verification(TrustManager Concept).
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, Civi::settings()->get('verifySSL'));
-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, Civi::settings()->get('verifySSL') ? 2 : 0);
-
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-    curl_setopt($ch, CURLOPT_POST, 1);
+    $response = (string) $this->getGuzzleClient()->post($url, [
+      'body' => $nvpreq,
+      'curl' => [
+        CURLOPT_RETURNTRANSFER => TRUE,
+        CURLOPT_SSL_VERIFYPEER => Civi::settings()->get('verifySSL'),
+      ],
+    ])->getBody();
 
-    //setting the nvpreq as POST FIELD to curl
-    curl_setopt($ch, CURLOPT_POSTFIELDS, $nvpreq);
-
-    //getting response from server
-    $response = curl_exec($ch);
-
-    //converting NVPResponse to an Associative Array
     $result = self::deformat($response);
 
-    if (curl_errno($ch)) {
-      throw new PaymentProcessorException(ts('Network error') . ' ' . curl_error($ch) . curl_errno($ch), curl_errno($ch));
-    }
-    curl_close($ch);
-
-    $outcome = strtolower(CRM_Utils_Array::value('ack', $result));
+    $outcome = strtolower($result['ack'] ?? '');
 
-    if ($outcome != 'success' && $outcome != 'successwithwarning') {
+    if ($outcome !== 'success' && $outcome !== 'successwithwarning') {
       throw new PaymentProcessorException("{$result['l_shortmessage0']} {$result['l_longmessage0']}");
     }
 
diff --git a/tests/phpunit/CRM/Core/Payment/PaypalProTest.php b/tests/phpunit/CRM/Core/Payment/PaypalProTest.php
new file mode 100644
index 000000000000..5a96d6e496b0
--- /dev/null
+++ b/tests/phpunit/CRM/Core/Payment/PaypalProTest.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Payment_PaypalPro
+ * @group headless
+ */
+class CRM_Core_Payment_PaypalProTest extends CiviUnitTestCase {
+
+  use CRM_Core_Payment_PaypalProTrait;
+
+  /**
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function setUp() {
+    parent::setUp();
+    $this->createPaypalProProcessor();
+
+    $this->processor = Civi\Payment\System::singleton()->getById($this->ids['PaymentProcessor']['paypal_pro']);
+  }
+
+  public function tearDown() {
+    $this->quickCleanUpFinancialEntities();
+    parent::tearDown();
+  }
+
+  /**
+   * Test doing a one-off payment.
+   *
+   * @throws \Civi\Payment\Exception\PaymentProcessorException
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function testSinglePayment() {
+    $this->setupMockHandler();
+    $params = $this->getBillingParams();
+    $params['amount'] = 5.24;
+    $params['currency'] = 'USD';
+    $params['invoiceID'] = 'xyz';
+    $params['ip_address'] = '127.0.0.1';
+    foreach ($params as $key => $value) {
+      // Paypal is super special and requires this. Leaving out of the more generic
+      // get billing params for now to make it more obvious.
+      // When/if PropertyBag supports all the params paypal needs we can convert & simplify this.
+      $params[str_replace('-5', '', str_replace('billing_', '', $key))] = $value;
+    }
+    $params['state_province'] = 'IL';
+    $params['country'] = 'US';
+    $this->processor->doPayment($params);
+    $this->assertEquals($this->getExpectedSinglePaymentRequests(), $this->getRequestBodies());
+  }
+
+  /**
+   * Get some basic billing parameters.
+   *
+   * These are what are entered by the form-filler.
+   *
+   * @return array
+   */
+  protected function getBillingParams(): array {
+    return [
+      'billing_first_name' => 'John',
+      'billing_middle_name' => '',
+      'billing_last_name' => "O'Connor",
+      'billing_street_address-5' => '8 Hobbitton Road',
+      'billing_city-5' => 'The Shire',
+      'billing_state_province_id-5' => 1012,
+      'billing_postal_code-5' => 5010,
+      'billing_country_id-5' => 1228,
+      'credit_card_number' => '4444333322221111',
+      'cvv2' => 123,
+      'credit_card_exp_date' => [
+        'M' => 9,
+        'Y' => 2025,
+      ],
+      'credit_card_type' => 'Visa',
+      'year' => 2022,
+      'month' => 10,
+    ];
+  }
+
+}
diff --git a/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php b/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php
new file mode 100644
index 000000000000..c7e65b37b1ff
--- /dev/null
+++ b/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Payment_AuthorizeNetTest
+ * @group headless
+ */
+trait CRM_Core_Payment_PaypalProTrait {
+  use \Civi\Test\GuzzleTestTrait;
+
+  /**
+   * @var \CRM_Core_Payment_PayPalImpl
+   */
+  protected $processor;
+
+  /**
+   * Is this a recurring transaction.
+   *
+   * @var bool
+   */
+  protected $isRecur = FALSE;
+
+  /**
+   * Get the expected response from Paypal Pro for a single payment.
+   *
+   * @return array
+   */
+  public function getExpectedSinglePaymentResponses() {
+    return [
+      'placeholder',
+    ];
+  }
+
+  /**
+   *  Get the expected request from Authorize.net.
+   *
+   * @return array
+   */
+  public function getExpectedSinglePaymentRequests() {
+    return [
+      'placeholder',
+    ];
+  }
+
+  /**
+   *  Get the expected request from Authorize.net.
+   *
+   * @return array
+   */
+  public function getExpectedRecurResponses() {
+    return [
+      'placeholder',
+    ];
+  }
+
+  /**
+   * Add a mock handler to the paypal Pro processor for testing.
+   *
+   * @param int|null $id
+   *
+   * @throws \CiviCRM_API3_Exception
+   */
+  protected function setupMockHandler($id = NULL) {
+    if ($id) {
+      $this->processor = Civi\Payment\System::singleton()->getById($id);
+    }
+    $responses = $this->isRecur ? $this->getExpectedRecurResponses() : $this->getExpectedSinglePaymentResponses();
+    // Comment the next line out when trying to capture the response.
+    // see https://github.com/civicrm/civicrm-core/pull/18350
+    //$this->createMockHandler($responses);
+    $this->setUpClientWithHistoryContainer();
+    $this->processor->setGuzzleClient($this->getGuzzleClient());
+  }
+
+  /**
+   * Create an AuthorizeNet processors with a configured mock handler.
+   *
+   * @throws \CiviCRM_API3_Exception
+   */
+  protected function createPaypalProProcessor() {
+    $processorID = $this->paymentProcessorCreate(['is_test' => 0]);
+    $this->setupMockHandler($processorID);
+    $this->ids['PaymentProcessor']['paypal_pro'] = $processorID;
+  }
+
+}

From b8a960ed604aa5430b5a0c21e3ee6e5f9d5046ad Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 17:47:48 +1200
Subject: [PATCH 128/834] Add expected responses & enble the handler

---
 tests/phpunit/CRM/Core/Payment/PaypalProTrait.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php b/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php
index c7e65b37b1ff..126e2e7d3709 100644
--- a/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php
+++ b/tests/phpunit/CRM/Core/Payment/PaypalProTrait.php
@@ -9,12 +9,14 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Test\GuzzleTestTrait;
+
 /**
  * Class CRM_Core_Payment_AuthorizeNetTest
  * @group headless
  */
 trait CRM_Core_Payment_PaypalProTrait {
-  use \Civi\Test\GuzzleTestTrait;
+  use GuzzleTestTrait;
 
   /**
    * @var \CRM_Core_Payment_PayPalImpl
@@ -35,7 +37,8 @@ trait CRM_Core_Payment_PaypalProTrait {
    */
   public function getExpectedSinglePaymentResponses() {
     return [
-      'placeholder',
+      'TIMESTAMP=2020%2d09%2d04T04%3a05%3a11Z&CORRELATIONID=246132f75a6f3&ACK=Success&VERSION=3&BUILD=54790461&AMT=5%2e24&CURRENCYCODE=USD&AVSCODE=A&CVV2MATCH=M&TRANSACTIONID=9TU23130NB247535M',
+      'RECEIVERBUSINESS=sunil%2e_1183377782_biz%40webaccess%2eco%2ein&RECEIVEREMAIL=sunil%2e_1183377782_biz%40webaccess%2eco%2ein&RECEIVERID=BNCETES6EECQQ&EMAIL=86Y37281N5671683A%40dcc2%2epaypal%2ecom&PAYERID=RYUKTRK2TRA4J&PAYERSTATUS=verified&COUNTRYCODE=US&ADDRESSOWNER=PayPal&ADDRESSSTATUS=None&INVNUM=68023&SALESTAX=0%2e00&TIMESTAMP=2020%2d09%2d04T05%3a18%3a33Z&CORRELATIONID=b74cfc6e440ea&ACK=Success&VERSION=3&BUILD=54686869&FIRSTNAME=John&LASTNAME=O%27Connor&TRANSACTIONID=58E89379MT3066727&RECEIPTID=3065%2d9946%2d9883%2d0395&TRANSACTIONTYPE=webaccept&PAYMENTTYPE=instant&ORDERTIME=2020%2d09%2d04T05%3a18%3a28Z&AMT=5%2e24&FEEAMT=0%2e45&TAXAMT=0%2e00&CURRENCYCODE=USD&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None&SHIPPINGMETHOD=Default&L_QTY0=1&L_TAXAMT0=0%2e00&L_CURRENCYCODE0=USD&L_AMT0=5%2e24',
     ];
   }
 
@@ -46,7 +49,8 @@ public function getExpectedSinglePaymentResponses() {
    */
   public function getExpectedSinglePaymentRequests() {
     return [
-      'placeholder',
+      'user=sunil._1183377782_biz_api1.webaccess.co.in&pwd=1183377788&version=3&signature=APixCoQ-Zsaj-u3IH7mD5Do-7HUqA9loGnLSzsZga9Zr-aNmaJa3WGPH&subject=&method=DoDirectPayment&paymentAction=Sale&amt=5.24&currencyCode=USD&invnum=xyz&ipaddress=127.0.0.1&creditCardType=Visa&acct=4444333322221111&expDate=102022&cvv2=123&firstName=John&lastName=O%27Connor&email=&street=8+Hobbitton+Road&city=The+Shire&state=IL&countryCode=US&zip=5010&desc=&custom=&BUTTONSOURCE=CiviCRM_SP',
+      'TRANSACTIONID=9TU23130NB247535M&user=sunil._1183377782_biz_api1.webaccess.co.in&pwd=1183377788&version=3&signature=APixCoQ-Zsaj-u3IH7mD5Do-7HUqA9loGnLSzsZga9Zr-aNmaJa3WGPH&subject=&method=GetTransactionDetails',
     ];
   }
 
@@ -75,7 +79,7 @@ protected function setupMockHandler($id = NULL) {
     $responses = $this->isRecur ? $this->getExpectedRecurResponses() : $this->getExpectedSinglePaymentResponses();
     // Comment the next line out when trying to capture the response.
     // see https://github.com/civicrm/civicrm-core/pull/18350
-    //$this->createMockHandler($responses);
+    $this->createMockHandler($responses);
     $this->setUpClientWithHistoryContainer();
     $this->processor->setGuzzleClient($this->getGuzzleClient());
   }

From 0b17a87098276b79104eb60052674140b2c20f0f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 18:27:58 +1200
Subject: [PATCH 129/834] Add test to cover existing v3 api setting of
 financial type on line items

---
 CRM/Financial/BAO/FinancialTypeAccount.php | 19 +++++++++++-----
 tests/phpunit/api/v3/LineItemTest.php      | 26 ++++++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/CRM/Financial/BAO/FinancialTypeAccount.php b/CRM/Financial/BAO/FinancialTypeAccount.php
index f7cb9652cb99..248d2b4f6b8f 100644
--- a/CRM/Financial/BAO/FinancialTypeAccount.php
+++ b/CRM/Financial/BAO/FinancialTypeAccount.php
@@ -52,14 +52,17 @@ public static function retrieve(&$params, &$defaults = [], &$allValues = []) {
    * @param array $params
    *   Reference array contains the values submitted by the form.
    * @param array $ids
-   *   Reference array contains the id.
+   *   Reference array contains one possible value
+   *   - entityFinancialAccount.
    *
-   * @return object
+   * @return CRM_Financial_DAO_EntityFinancialAccount
+   *
+   * @throws \CRM_Core_Exception
    */
-  public static function add(&$params, &$ids = NULL) {
+  public static function add(&$params, $ids = NULL) {
     // action is taken depending upon the mode
     $financialTypeAccount = new CRM_Financial_DAO_EntityFinancialAccount();
-    if ($params['entity_table'] != 'civicrm_financial_type') {
+    if ($params['entity_table'] !== 'civicrm_financial_type') {
       $financialTypeAccount->entity_id = $params['entity_id'];
       $financialTypeAccount->entity_table = $params['entity_table'];
       $financialTypeAccount->find(TRUE);
@@ -71,6 +74,7 @@ public static function add(&$params, &$ids = NULL) {
     $financialTypeAccount->copyValues($params);
     self::validateRelationship($financialTypeAccount);
     $financialTypeAccount->save();
+    unset(Civi::$statics['CRM_Core_PseudoConstant']['taxRates']);
     return $financialTypeAccount;
   }
 
@@ -80,6 +84,7 @@ public static function add(&$params, &$ids = NULL) {
    * @param int $financialTypeAccountId
    * @param int $accountId
    *
+   * @throws \CRM_Core_Exception
    */
   public static function del($financialTypeAccountId, $accountId = NULL) {
     // check if financial type is present
@@ -102,6 +107,7 @@ public static function del($financialTypeAccountId, $accountId = NULL) {
 
     foreach ($dependency as $name) {
       $daoString = 'CRM_' . $name[0] . '_DAO_' . $name[1];
+      /* @var \CRM_Core_DAO $dao */
       $dao = new $daoString();
       $dao->financial_type_id = $financialTypeId;
       if ($dao->find(TRUE)) {
@@ -111,7 +117,7 @@ public static function del($financialTypeAccountId, $accountId = NULL) {
     }
 
     if ($check) {
-      if ($name[1] == 'PremiumsProduct' || $name[1] == 'Product') {
+      if ($name[1] === 'PremiumsProduct' || $name[1] === 'Product') {
         CRM_Core_Session::setStatus(ts('You cannot remove an account with a %1 relationship while the Financial Type is used for a Premium.', [1 => $relationValues[$financialTypeAccountId]]));
       }
       else {
@@ -136,6 +142,7 @@ public static function del($financialTypeAccountId, $accountId = NULL) {
    *   Payment instrument value.
    *
    * @return null|int
+   * @throws \CiviCRM_API3_Exception
    */
   public static function getInstrumentFinancialAccount($paymentInstrumentValue) {
     if (!isset(\Civi::$statics[__CLASS__]['instrument_financial_accounts'][$paymentInstrumentValue])) {
@@ -249,7 +256,7 @@ public static function createDefaultFinancialAccounts($financialType) {
   /**
    * Validate account relationship with financial account type
    *
-   * @param obj $financialTypeAccount of CRM_Financial_DAO_EntityFinancialAccount
+   * @param CRM_Financial_DAO_EntityFinancialAccount $financialTypeAccount of CRM_Financial_DAO_EntityFinancialAccount
    *
    * @throws CRM_Core_Exception
    */
diff --git a/tests/phpunit/api/v3/LineItemTest.php b/tests/phpunit/api/v3/LineItemTest.php
index 953b2b695d8f..4993cf48352f 100644
--- a/tests/phpunit/api/v3/LineItemTest.php
+++ b/tests/phpunit/api/v3/LineItemTest.php
@@ -14,6 +14,8 @@
  * @group headless
  */
 class api_v3_LineItemTest extends CiviUnitTestCase {
+  use CRM_Financial_Form_SalesTaxTrait;
+
   protected $params;
   protected $_entity = 'line_item';
 
@@ -48,6 +50,30 @@ public function setUp() {
     ];
   }
 
+  /**
+   * Test tax is calculated correctly on the line item.
+   */
+  public function testCreateLineItemWithTax() {
+    $this->enableSalesTaxOnFinancialType('Donation');
+    $this->params['financial_type_id'] = 'Donation';
+    $result = $this->callAPISuccess('LineItem', 'create', $this->params);
+    $lineItem = $this->callAPISuccessGetSingle('LineItem', ['id' => $result['id']]);
+    $this->assertEquals(5, $lineItem['tax_amount']);
+    $this->assertEquals(50, $lineItem['line_total']);
+  }
+
+  /**
+   * Enable tax for the given financial type.
+   *
+   * @todo move to a trait, share.
+   *
+   * @param string $type
+   */
+  public function enableSalesTaxOnFinancialType($type) {
+    $this->enableTaxAndInvoicing();
+    $this->relationForFinancialTypeWithFinancialAccount(CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'financial_type_id', $type));
+  }
+
   /**
    * Test basic create line item.
    *

From 6e7adedc1b5348e617d28fd9a94ba9b6681f4f93 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2020 23:44:28 -0700
Subject: [PATCH 130/834] CRM_Core_Resources - Define 'bootstrap3' bundle

---
 CRM/Core/Resources/Common.php | 19 +++++++++++++++++++
 Civi/Core/Container.php       |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index e5f34cc1d936..df5328932a0c 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -16,6 +16,25 @@ class CRM_Core_Resources_Common {
 
   const REGION = 'html-header';
 
+  /**
+   * The 'bundle.bootstrap3' service is a collection of resources which are
+   * loaded when a page needs to support Boostrap CSS v3.
+   *
+   * @param string $name
+   *   i.e. 'bootstrap3'
+   * @return \CRM_Core_Resources_Bundle
+   */
+  public static function createBootstrap3Bundle($name) {
+    $bundle = new CRM_Core_Resources_Bundle($name);
+    $bundle->addStyleFile('civicrm', 'css/bootstrap3.css');
+    $bundle->addScriptFile('civicrm', 'js/bootstrap3.js', [
+      'translate' => FALSE,
+    ]);
+    CRM_Utils_Hook::alterBundle($bundle);
+    self::useRegion($bundle, self::REGION);
+    return $bundle;
+  }
+
   /**
    * The 'bundle.coreStyles' service is a collection of resources used on some
    * non-Civi pages (wherein Civi may be mixed-in).
diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index 5a36afacf4d7..a0bf20703287 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -206,6 +206,9 @@ public function createContainer() {
       []
     ))->setPublic(TRUE);
 
+    $container->setDefinition('bundle.bootstrap3', new Definition('CRM_Core_Resources_Bundle', ['bootstrap3']))
+      ->setFactory('CRM_Core_Resources_Common::createBootstrap3Bundle');
+
     $container->setDefinition('bundle.coreStyles', new Definition('CRM_Core_Resources_Bundle', ['coreStyles']))
       ->setFactory('CRM_Core_Resources_Common::createStyleBundle');
 

From 8266ce8e99d5260f408d8b26657a517a0b9a0f7c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 18 Aug 2020 14:17:52 -0700
Subject: [PATCH 131/834] Api4Explorer - Activate bootstrap3

---
 CRM/Api4/Page/Api4Explorer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CRM/Api4/Page/Api4Explorer.php b/CRM/Api4/Page/Api4Explorer.php
index 6de079bb8f15..8f2942d94207 100644
--- a/CRM/Api4/Page/Api4Explorer.php
+++ b/CRM/Api4/Page/Api4Explorer.php
@@ -40,6 +40,7 @@ public function run() {
       'groupOptions' => array_column((array) $groupOptions, 'options', 'name'),
     ];
     Civi::resources()
+      ->addBundle('bootstrap3')
       ->addVars('api4', $vars)
       ->addPermissions(['access debug output', 'edit groups', 'administer reserved groups'])
       ->addScriptFile('civicrm', 'js/load-bootstrap.js')

From d853edea874fcb599205fe890ba0e6bd6bc3e3d0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 3 Sep 2020 23:56:46 -0700
Subject: [PATCH 132/834] Bootstrap3 - Move warning from Api4Explorer to bundle
 default

The Api4Explorer page has a neat trick - if (by any means) you manage to
have Bootstrap3 active within the body of this Civi page, then it will
display a warning.

This patch moves the trick to be part of the `bootstrap3` bundle, which
means that it will be applied to any page where `bootstrap3` is activated.
---
 CRM/Core/Resources/Common.php  | 26 +++++++++++++++++++++-----
 ang/api4Explorer/Explorer.html |  9 ---------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index df5328932a0c..c85abeaec0a1 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -25,11 +25,27 @@ class CRM_Core_Resources_Common {
    * @return \CRM_Core_Resources_Bundle
    */
   public static function createBootstrap3Bundle($name) {
-    $bundle = new CRM_Core_Resources_Bundle($name);
-    $bundle->addStyleFile('civicrm', 'css/bootstrap3.css');
-    $bundle->addScriptFile('civicrm', 'js/bootstrap3.js', [
-      'translate' => FALSE,
-    ]);
+    $bundle = new CRM_Core_Resources_Bundle($name, ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl', 'markup']);
+    // Leave it to the theme/provider to register specific resources.
+    // $bundle->addStyleFile('civicrm', 'css/bootstrap3.css');
+    // $bundle->addScriptFile('civicrm', 'js/bootstrap3.js', [
+    //  'translate' => FALSE,
+    //]);
+
+    //  This warning will show if bootstrap is unavailable. Normally it will be hidden by the bootstrap .collapse class.
+    $bundle->addMarkup('
+      <div id="bootstrap-theme">
+        <div class="messages warning no-popup collapse">
+          <p>
+            <i class="crm-i fa-exclamation-triangle" aria-hidden="true"></i>
+            <strong>' . ts('Bootstrap theme not found.') . '</strong>
+          </p>
+          <p>' . ts('This screen may not work correctly without a bootstrap-based theme such as Shoreditch installed.') . '</p>
+        </div>
+      </div>',
+      ['region' => 'page-header']
+    );
+
     CRM_Utils_Hook::alterBundle($bundle);
     self::useRegion($bundle, self::REGION);
     return $bundle;
diff --git a/ang/api4Explorer/Explorer.html b/ang/api4Explorer/Explorer.html
index b32196dfd55c..52b807d4adec 100644
--- a/ang/api4Explorer/Explorer.html
+++ b/ang/api4Explorer/Explorer.html
@@ -5,15 +5,6 @@ <h1 crm-page-title>
     {{:: ts('CiviCRM APIv4') }}{{ entity ? (' (' + entity + '::' + action + ')') : '' }}
   </h1>
 
-  <!--This warning will show if bootstrap is unavailable. Normally it will be hidden by the bootstrap .collapse class.-->
-  <div class="messages warning no-popup collapse">
-    <p>
-      <i class="crm-i fa-exclamation-triangle" aria-hidden="true"></i>
-      <strong>{{:: ts('Bootstrap theme not found.') }}</strong>
-    </p>
-    <p>{{:: ts('This screen may not work correctly without a bootstrap-based theme such as Shoreditch installed.') }}</p>
-  </div>
-
   <div class="api4-explorer-row">
       <form name="api4-explorer" class="panel panel-default explorer-params-panel">
         <div class="panel-heading">

From 583151491b00891bb47197a00de289efaf3d79d9 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 13:38:03 +1200
Subject: [PATCH 133/834] Fix test to use validateAllContributions

---
 CRM/Contribute/Form/Contribution/Confirm.php  | 14 ++++++++--
 CRM/Financial/BAO/Order.php                   | 27 +++++++++++++++++--
 tests/phpunit/CiviTest/CiviUnitTestCase.php   |  5 +++-
 tests/phpunit/api/v3/ContributionPageTest.php | 14 +++-------
 tests/phpunit/api/v3/ContributionTest.php     |  4 +--
 5 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index a9a2988d4d97..0e5750e76899 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1903,9 +1903,19 @@ public static function submit($params) {
     $params['invoiceID'] = md5(uniqid(rand(), TRUE));
 
     // We want to move away from passing in amount as it is calculated by the actually-submitted params.
-    $params['amount'] = $params['amount'] ?? $form->getMainContributionAmount($params);
+    if ($form->getMainContributionAmount($params)) {
+      $params['amount'] = $form->getMainContributionAmount($params);
+    }
     $paramsProcessedForForm = $form->_params = self::getFormParams($params['id'], $params);
-    $form->_amount = $params['amount'];
+
+    $order = new CRM_Financial_BAO_Order();
+    $order->setPriceSelectionFromUnfilteredInput($params);
+    if (isset($params['amount'])) {
+      // @todo deprecate receiving amount, calculate on the form.
+      $order->setOverrideTotalAmount($params['amount']);
+    }
+    $amount = $order->getTotalAmount();
+    $form->_amount = $params['amount'] = $form->_params['amount'] = $params['amount'] ?? $amount;
     // hack these in for test support.
     $form->_fields['billing_first_name'] = 1;
     $form->_fields['billing_last_name'] = 1;
diff --git a/CRM/Financial/BAO/Order.php b/CRM/Financial/BAO/Order.php
index 43fa9cd2d72a..80cf3b66ec58 100644
--- a/CRM/Financial/BAO/Order.php
+++ b/CRM/Financial/BAO/Order.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\PriceField;
+
 /**
  *
  * @package CRM
@@ -231,9 +233,15 @@ protected function calculateLineItems(): array {
     }
 
     foreach ($this->getPriceOptions() as $fieldID => $valueID) {
+      if (!isset($this->priceSetID)) {
+        $this->setPriceSetID(PriceField::get()->addSelect('price_set_id')->addWhere('id', '=', $fieldID)->execute()->first()['price_set_id']);
+      }
       $throwAwayArray = [];
       // @todo - still using getLine for now but better to bring it to this class & do a better job.
-      $lineItems[$valueID] = CRM_Price_BAO_PriceSet::getLine($params, $throwAwayArray, $this->getPriceSetID(), $this->getPriceFieldSpec($fieldID), $fieldID, 0)[1][$valueID];
+      $newLines = CRM_Price_BAO_PriceSet::getLine($params, $throwAwayArray, $this->getPriceSetID(), $this->getPriceFieldSpec($fieldID), $fieldID, 0)[1];
+      foreach ($newLines as $newLine) {
+        $lineItems[$newLine['price_field_value_id']] = $newLine;
+      }
     }
 
     foreach ($lineItems as &$lineItem) {
@@ -261,7 +269,7 @@ protected function calculateLineItems(): array {
   }
 
   /**
-   * Get the total tax amount for the order.
+   * Get the total amount for the order.
    *
    * @return float
    *
@@ -275,6 +283,21 @@ public function getTotalTaxAmount() :float {
     return $amount;
   }
 
+  /**
+   * Get the total tax amount for the order.
+   *
+   * @return float
+   *
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function getTotalAmount() :float {
+    $amount = 0.0;
+    foreach ($this->getLineItems() as $lineItem) {
+      $amount += $lineItem['line_total'] ?? 0.0;
+    }
+    return $amount;
+  }
+
   /**
    * Get the tax rate for the given financial type.
    *
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 0e889a429937..bd09aec21b87 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -3551,13 +3551,16 @@ protected function validateAllPayments() {
    * @throws \CRM_Core_Exception
    */
   protected function validateAllContributions() {
-    $contributions = $this->callAPISuccess('Contribution', 'get', [])['values'];
+    $contributions = $this->callAPISuccess('Contribution', 'get', ['return' => ['tax_amount', 'total_amount']])['values'];
     foreach ($contributions as $contribution) {
       $lineItems = $this->callAPISuccess('LineItem', 'get', ['contribution_id' => $contribution['id']])['values'];
       $total = 0;
+      $taxTotal = 0;
       foreach ($lineItems as $lineItem) {
         $total += $lineItem['line_total'];
+        $taxTotal += (float) ($lineItem['tax_amount'] ?? 0);
       }
+      $this->assertEquals($taxTotal, (float) ($contribution['tax_amount'] ?? 0));
       $this->assertEquals($total, $contribution['total_amount']);
     }
   }
diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index 689694a72a46..83d2d3966fae 100644
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -1862,7 +1862,6 @@ public function testSubmitContributionPageWithPriceSet($thousandSeparator) {
     $submitParams = [
       'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
       'id' => (int) $this->_ids['contribution_page'],
-      'amount' => 80,
       'first_name' => 'Billy',
       'last_name' => 'Gruff',
       'email' => 'billy@goat.gruff',
@@ -1870,7 +1869,7 @@ public function testSubmitContributionPageWithPriceSet($thousandSeparator) {
     ];
     $this->addPriceFields($submitParams);
 
-    $this->callAPISuccess('contribution_page', 'submit', $submitParams);
+    $this->callAPISuccess('ContributionPage', 'submit', $submitParams);
     $contribution = $this->callAPISuccessGetSingle('contribution', [
       'contribution_page_id' => $this->_ids['contribution_page'],
       'contribution_status_id' => 'Pending',
@@ -1988,12 +1987,12 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
     // Set quantity for our test
     $submitParams['price_' . $priceFieldId] = 110;
 
-    // contribution_page submit requires amount and tax_amount - and that's ok we're not testing that - we're testing at the LineItem level
-    $submitParams['amount'] = $this->formatMoneyInput(180 * 16.95 + 110 * 2.95);
     // This is the correct Tax Amount - use it later to compare to what the CiviCRM Core came up with at the LineItem level
     $submitParams['tax_amount'] = (180 * 16.95 * 0.10 + 110 * 2.95 * 0.10);
 
-    $this->callAPISuccess('contribution_page', 'submit', $submitParams);
+    $this->callAPISuccess('ContributionPage', 'submit', $submitParams);
+    $this->validateAllContributions();
+
     $contribution = $this->callAPISuccessGetSingle('contribution', [
       'contribution_page_id' => $this->_ids['contribution_page'],
     ]);
@@ -2011,13 +2010,8 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
     ]);
 
     $finalContribution = $this->callAPISuccess('Contribution', 'getsingle', ['id' => $contribution['id'], 'return' => ['tax_amount', 'total_amount']]);
-
     $this->assertEquals($lineItem1['line_total'] + $lineItem2['line_total'], round(180 * 16.95 + 110 * 2.95, 2), 'Line Item Total is incorrect.');
-    $this->assertEquals($lineItem1['line_total'] + $lineItem2['line_total'], $finalContribution['total_amount'], 'Contribution total should match line item totals');
-
     $this->assertEquals(round($lineItem1['tax_amount'] + $lineItem2['tax_amount'], 2), round(180 * 16.95 * 0.10 + 110 * 2.95 * 0.10, 2), 'Wrong Sales Tax Amount is calculated and stored.');
-    $this->assertEquals(round($lineItem1['tax_amount'] + $lineItem2['tax_amount'], 2), $finalContribution['tax_amount'], 'Sales Tax Amount on Contribution does not match sum of Sales Tax Amount across the Line Items.');
-
   }
 
   /**
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 503cba4b9a14..1781250d1dd3 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -2098,7 +2098,7 @@ public function testCompleteTransactionEuro() {
   /**
    * Test to ensure mail is sent on chosing pay later
    */
-  public function testpayLater() {
+  public function testPayLater() {
     $mut = new CiviMailUtils($this, TRUE);
     $this->swapMessageTemplateForTestTemplate();
     $this->createLoggedInUser();
@@ -2140,7 +2140,7 @@ public function testpayLater() {
       'description' => 'Online Contribution: Help Support CiviCRM!',
       'price_set_id' => $priceSet['id'],
     ];
-    $this->callAPISuccess('contribution_page', 'submit', $params);
+    $this->callAPISuccess('ContributionPage', 'submit', $params);
 
     $mut->checkMailLog([
       'is_pay_later:::1',

From 684954efccfba3ebec62d199aeba9c3fff5ccb6e Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Fri, 4 Sep 2020 22:39:32 +0530
Subject: [PATCH 134/834] Added Test case for Membership View page

---
 .../CRM/Member/Form/MembershipTest.php        | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index ef0d0e99bda8..154888b412d5 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -1512,4 +1512,77 @@ public function testCreatePendingWithMultipleTerms() {
     $this->assertCount(1, $contribution['values'], 'Completed contribution should be fetched.');
   }
 
+  /**
+   * Test Membership Payment owned by other contact, membership view should show all contribution records in listing.
+   * is other contact.
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
+   * @throws \Exception
+   */
+  public function testMembershipViewContributionOwnerDifferent() {
+    // Membership Owner
+    $contactId1 = $this->individualCreate();
+
+    // Contribution Onwer
+    $contactId2 = $this->individualCreate();
+
+    // create new membership type
+    $membershipTypeAnnualFixed = $this->callAPISuccess('membership_type', 'create', [
+      'domain_id' => 1,
+      'name' => 'AnnualFixed 2',
+      'member_of_contact_id' => 23,
+      'duration_unit' => 'year',
+      'minimum_fee' => 50,
+      'duration_interval' => 1,
+      'period_type' => 'fixed',
+      'fixed_period_start_day' => '101',
+      'fixed_period_rollover_day' => '1231',
+      'financial_type_id' => 2,
+    ]);
+
+    // create Membership
+    $membershipId = $this->contactMembershipCreate([
+      'contact_id' => $contactId1,
+      'membership_type_id' => $membershipTypeAnnualFixed['id'],
+      'status_id' => 'New',
+    ]);
+
+    // 1st Payment
+    $contriParams = [
+      'membership_id' => $membershipId,
+      'total_amount' => 25,
+      'financial_type_id' => 2,
+      'contact_id' => $contactId2,
+    ];
+    $contribution1 = CRM_Member_BAO_Membership::recordMembershipContribution($contriParams);
+
+    // 2nd Payment
+    $contriParams = [
+      'membership_id' => $membershipId,
+      'total_amount' => 25,
+      'financial_type_id' => 2,
+      'contact_id' => $contactId2,
+    ];
+    $contribution2 = CRM_Member_BAO_Membership::recordMembershipContribution($contriParams);
+
+    // View Membership record
+    $membershipViewForm = new CRM_Member_Form_MembershipView();
+    $membershipViewForm->controller = new CRM_Core_Controller_Simple('CRM_Member_Form_MembershipView', 'View Membership');
+    $membershipViewForm->set('id', $membershipId);
+    $membershipViewForm->set('context', 'membership');
+    $membershipViewForm->controller->setEmbedded(TRUE);
+    $membershipViewForm->preProcess();
+
+    // get contribution rows related to membership payments
+    $templateVar = $membershipViewForm->getTemplate()->get_template_vars('rows');
+
+    $this->assertEquals($templateVar[0]['contribution_id'], $contribution1->id);
+    $this->assertEquals($templateVar[0]['contact_id'], $contactId2);
+
+    $this->assertEquals($templateVar[1]['contribution_id'], $contribution2->id);
+    $this->assertEquals($templateVar[1]['contact_id'], $contactId2);
+    $this->assertEquals(count($templateVar), 2);
+  }
+
 }

From 07ebcb2331f62b33d9ba130267a8ab0190d06284 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 18:55:51 +1200
Subject: [PATCH 135/834] Move tax handling from line item api to BAO to make
 it available from apiv4

This implementation has some limitations. I only address one in this PR - removing the rounding - as
the focus of the PR is the move.

The rounding from all save layers was previously removed but it was reverted when it was eroneously believed
to have caused a bug. The bug turned out to be https://github.com/civicrm/civicrm-core/pull/18297
---
 CRM/Price/BAO/LineItem.php |  8 +++++++-
 api/v3/LineItem.php        | 11 +++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php
index 0067fef0a6ed..dca601f20016 100644
--- a/CRM/Price/BAO/LineItem.php
+++ b/CRM/Price/BAO/LineItem.php
@@ -26,7 +26,7 @@ class CRM_Price_BAO_LineItem extends CRM_Price_DAO_LineItem {
    * @param array $params
    *   (reference) an assoc array of name/value pairs.
    *
-   * @return \CRM_Price_DAO_LineItem
+   * @return CRM_Price_BAO_LineItem
    *
    * @throws \CiviCRM_API3_Exception
    * @throws \Exception
@@ -53,6 +53,12 @@ public static function create(&$params) {
       }
     }
 
+    $taxRates = CRM_Core_PseudoConstant::getTaxRates();
+    if (isset($params['financial_type_id'], $params['line_total'], $taxRates[$params['financial_type_id']])) {
+      $taxRate = $taxRates[$params['financial_type_id']];
+      $params['tax_amount'] = ($taxRate / 100) * $params['line_total'];
+    }
+
     $lineItemBAO = new CRM_Price_BAO_LineItem();
     $lineItemBAO->copyValues($params);
 
diff --git a/api/v3/LineItem.php b/api/v3/LineItem.php
index 6e3690388fea..b255dc1d06a1 100644
--- a/api/v3/LineItem.php
+++ b/api/v3/LineItem.php
@@ -26,16 +26,11 @@
  *
  * @return array
  *   api result array
+ *
+ * @throws \API_Exception
+ * @throws \Civi\API\Exception\UnauthorizedException
  */
 function civicrm_api3_line_item_create($params) {
-  // @todo the following line is not really appropriate for the api. The BAO should
-  // do the work.
-  $taxRates = CRM_Core_PseudoConstant::getTaxRates();
-  if (isset($params['financial_type_id']) && array_key_exists($params['financial_type_id'], $taxRates)) {
-    $taxRate = $taxRates[$params['financial_type_id']];
-    $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($params['line_total'], $taxRate);
-    $params['tax_amount'] = round($taxAmount['tax_amount'], 2);
-  }
   return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params, 'LineItem');
 }
 

From 560df6345cd017710d11ccf1067222f7e197e6c4 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 09:19:01 +1200
Subject: [PATCH 136/834] [REF] Simplify logic on calling
 self::updateContributionStatus

self::updateContributionStatus is only called when contributionStatusId has been set - there is only
one place that is set so move the code up there rather than set a param to trigger action further down
---
 CRM/Event/Form/Task/Batch.php | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index 163c830cf135..f8ac3af5f34a 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -268,7 +268,7 @@ public static function updatePendingOnlineContribution($participantId, $statusId
     $contributionId = CRM_Contribute_BAO_Contribution::checkOnlinePendingContribution($participantId,
       'Event'
     );
-    if (!$contributionId) {
+    if (!$contributionId || !$participantId) {
       return;
     }
 
@@ -280,28 +280,22 @@ public static function updatePendingOnlineContribution($participantId, $statusId
     $negativeStatuses = CRM_Event_PseudoConstant::participantStatus(NULL, "class = 'Negative'");
     $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
 
-    $contributionStatusId = NULL;
     if (array_key_exists($statusId, $positiveStatuses)) {
-      $contributionStatusId = array_search('Completed', $contributionStatuses);
+      $params = [
+        'component_id' => $participantId,
+        'contribution_id' => $contributionId,
+        'contribution_status_id' => array_search('Completed', $contributionStatuses),
+        'IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved' => 1,
+      ];
+
+      //change related contribution status.
+      self::updateContributionStatus($params);
     }
     if (array_key_exists($statusId, $negativeStatuses)) {
       civicrm_api3('Contribution', 'create', ['id' => $contributionId, 'contribution_status_id' => 'Cancelled']);
       return;
     }
 
-    if (!$contributionStatusId || !$participantId || !$contributionId) {
-      return;
-    }
-
-    $params = [
-      'component_id' => $participantId,
-      'contribution_id' => $contributionId,
-      'contribution_status_id' => $contributionStatusId,
-      'IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved' => 1,
-    ];
-
-    //change related contribution status.
-    self::updateContributionStatus($params);
   }
 
   /**

From 7ba71757dcbd66ddc9f5d44584ff6ad0b036a210 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 10:18:35 +1200
Subject: [PATCH 137/834] Use eventID rather than the object in
 completeTransaction

This allows us to stop passing it in as an object as a follow up. It potentially does an extra query but this is
mitigated by
1) it only does a look up if the contribution does not already have a source (rare)
2) it uses a pseudoconstant so would only look up a given event once

- we can later remove the whole loading of event and just get the id from the participant record
---
 CRM/Contribute/BAO/Contribution.php       | 12 ++++++------
 tests/phpunit/api/v3/ContributionTest.php |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 1ddbc229aa17..2abaeb5b868b 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4406,7 +4406,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
       'financial_type_id',
     ];
 
-    $event = $objects['event'] ?? NULL;
+    $eventID = $objects['event']->id ?? NULL;
 
     $paymentProcessorId = '';
     if (isset($objects['paymentProcessor'])) {
@@ -4422,7 +4422,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
 
     $contributionParams = array_merge([
       'contribution_status_id' => $completedContributionStatusID,
-      'source' => self::getRecurringContributionDescription($contribution, $event),
+      'source' => self::getRecurringContributionDescription($contribution, $eventID),
     ], array_intersect_key($input, array_fill_keys($inputContributionWhiteList, 1)
     ));
 
@@ -4636,12 +4636,12 @@ public function loadRelatedMembershipObjects($ids = []) {
    * Get the description (source field) for the recurring contribution.
    *
    * @param CRM_Contribute_BAO_Contribution $contribution
-   * @param CRM_Event_DAO_Event|null $event
+   * @param int|null $eventID
    *
    * @return string
    * @throws \CiviCRM_API3_Exception
    */
-  protected static function getRecurringContributionDescription($contribution, $event) {
+  protected static function getRecurringContributionDescription($contribution, $eventID) {
     if (!empty($contribution->source)) {
       return $contribution->source;
     }
@@ -4652,8 +4652,8 @@ protected static function getRecurringContributionDescription($contribution, $ev
       ]);
       return ts('Online Contribution') . ': ' . $contributionPageTitle;
     }
-    elseif ($event) {
-      return ts('Online Event Registration') . ': ' . $event->title;
+    elseif ($eventID) {
+      return ts('Online Event Registration') . ': ' . CRM_Event_PseudoConstant::event($eventID);
     }
     elseif (!empty($contribution->contribution_recur_id)) {
       return 'recurring contribution';
diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
index 1781250d1dd3..deb222613378 100644
--- a/tests/phpunit/api/v3/ContributionTest.php
+++ b/tests/phpunit/api/v3/ContributionTest.php
@@ -3316,16 +3316,17 @@ public function testCompleteTransactionWithParticipantRecord() {
     $mut = new CiviMailUtils($this, TRUE);
     $mut->clearMessages();
     $this->_individualId = $this->createLoggedInUser();
+    // Unset source to test whether one is generated if not set already on the contribution.
+    unset($this->_params['source']);
     $contributionID = $this->createPendingParticipantContribution();
     $this->createJoinedProfile(['entity_id' => $this->_ids['event']['test'], 'entity_table' => 'civicrm_event']);
     $this->createJoinedProfile(['entity_id' => $this->_ids['event']['test'], 'entity_table' => 'civicrm_event', 'weight' => 2], ['name' => 'post_1', 'title' => 'title_post_2', 'frontend_title' => 'public 2']);
     $this->createJoinedProfile(['entity_id' => $this->_ids['event']['test'], 'entity_table' => 'civicrm_event', 'weight' => 3], ['name' => 'post_2', 'title' => 'title_post_3', 'frontend_title' => 'public 3']);
     $this->eliminateUFGroupOne();
 
-    $this->callAPISuccess('contribution', 'completetransaction', [
-      'id' => $contributionID,
-    ]
-    );
+    $this->callAPISuccess('contribution', 'completetransaction', ['id' => $contributionID]);
+    $contribution = $this->callAPISuccessGetSingle('Contribution', ['id' => $contributionID, 'return' => ['contribution_source']]);
+    $this->assertEquals('Online Event Registration: Annual CiviCRM meet', $contribution['contribution_source']);
     $participantStatus = $this->callAPISuccessGetValue('participant', [
       'id' => $this->_ids['participant'],
       'return' => 'participant_status_id',

From 663d42bdfb42a04ac7607471d383ba7aa0b06d46 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 10:39:33 +1200
Subject: [PATCH 138/834] Remove some places where the ghost of 2014 is getting
 special love

per https://lab.civicrm.org/dev/core/-/issues/1921 we fixed the root cause of this 6 years ago....
---
 CRM/Contribute/BAO/ContributionRecur.php | 3 ---
 CRM/Core/Payment/BaseIPN.php             | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php
index 63d7799768d3..b7e12eb2c06c 100644
--- a/CRM/Contribute/BAO/ContributionRecur.php
+++ b/CRM/Contribute/BAO/ContributionRecur.php
@@ -261,9 +261,6 @@ public static function cancelRecurContribution($params) {
     if ($recur->find(TRUE)) {
       $transaction = new CRM_Core_Transaction();
       $recur->contribution_status_id = $cancelledId;
-      $recur->start_date = CRM_Utils_Date::isoToMysql($recur->start_date);
-      $recur->create_date = CRM_Utils_Date::isoToMysql($recur->create_date);
-      $recur->modified_date = CRM_Utils_Date::isoToMysql($recur->modified_date);
       $recur->cancel_reason = $params['cancel_reason'] ?? NULL;
       $recur->cancel_date = date('YmdHis');
       $recur->save();
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 2dd1cb74e4f1..d99c8c8f80cf 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -119,9 +119,6 @@ public function validateData($input, &$ids, &$objects, $required = TRUE, $paymen
       }
     }
 
-    $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);
-    $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date);
-
     $objects['contact'] = &$contact;
     $objects['contribution'] = &$contribution;
 
@@ -305,9 +302,6 @@ public function cancelled(&$objects, $transaction = NULL, $input = []) {
       'flip' => 1,
     ]);
     $contribution->contribution_status_id = $contributionStatuses['Cancelled'];
-    $contribution->receive_date = CRM_Utils_Date::isoToMysql($contribution->receive_date);
-    $contribution->receipt_date = CRM_Utils_Date::isoToMysql($contribution->receipt_date);
-    $contribution->thankyou_date = CRM_Utils_Date::isoToMysql($contribution->thankyou_date);
     $contribution->cancel_date = self::$_now;
     $contribution->cancel_reason = $input['reasonCode'] ?? NULL;
     $contribution->save();

From 71cc06bbb14fd7bdaa5a9b3037f4f77f088fd044 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 15 Aug 2020 10:47:54 +1200
Subject: [PATCH 139/834] Export fix on long custom fields

Fixes a code miss wereby improved metadata meant the code intended to handle custom
fields was not being hit, adds tests for fixed variant of a long option value
---
 CRM/Export/BAO/ExportProcessor.php            | 49 +++++++------------
 tests/phpunit/CRM/Export/BAO/ExportTest.php   |  6 +++
 .../CRMTraits/Custom/CustomDataTrait.php      | 21 ++++++++
 3 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index 7c2fbb859217..4e9581d1cf67 100644
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -1456,11 +1456,22 @@ public function getSqlColumnDefinition($fieldName, $columnName) {
           return "`$fieldName` varchar(16)";
 
         case CRM_Utils_Type::T_STRING:
-          if (isset($queryFields[$columnName]['maxlength'])) {
-            return "`$fieldName` varchar({$queryFields[$columnName]['maxlength']})";
+          if (isset($fieldSpec['maxlength'])) {
+            return "`$fieldName` varchar({$fieldSpec['maxlength']})";
           }
-          else {
-            return "`$fieldName` varchar(255)";
+          $dataType = $fieldSpec['data_type'] ?? '';
+          // set the sql columns for custom data
+          switch ($dataType) {
+            case 'String':
+              // May be option labels, which could be up to 512 characters
+              $length = max(512, CRM_Utils_Array::value('text_length', $fieldSpec));
+              return "`$fieldName` varchar($length)";
+
+            case 'Memo':
+              return "`$fieldName` text";
+
+            default:
+              return "`$fieldName` varchar(255)";
           }
 
         case CRM_Utils_Type::T_TEXT:
@@ -1483,36 +1494,10 @@ public function getSqlColumnDefinition($fieldName, $columnName) {
       }
     }
     else {
-      if (substr($fieldName, -3, 3) == '_id') {
+      if (substr($fieldName, -3, 3) === '_id') {
         return "`$fieldName` varchar(255)";
       }
-      elseif (substr($fieldName, -5, 5) == '_note') {
-        return "`$fieldName` text";
-      }
-      else {
-        // set the sql columns for custom data
-        if (isset($queryFields[$columnName]['data_type'])) {
-
-          switch ($queryFields[$columnName]['data_type']) {
-            case 'String':
-              // May be option labels, which could be up to 512 characters
-              $length = max(512, CRM_Utils_Array::value('text_length', $queryFields[$columnName]));
-              return "`$fieldName` varchar($length)";
-
-            case 'Link':
-              return "`$fieldName` varchar(255)";
-
-            case 'Memo':
-              return "`$fieldName` text";
-
-            default:
-              return "`$fieldName` varchar(255)";
-          }
-        }
-        else {
-          return "`$fieldName` text";
-        }
-      }
+      return "`$fieldName` text";
     }
   }
 
diff --git a/tests/phpunit/CRM/Export/BAO/ExportTest.php b/tests/phpunit/CRM/Export/BAO/ExportTest.php
index deb43c526f16..3db128633f5b 100644
--- a/tests/phpunit/CRM/Export/BAO/ExportTest.php
+++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php
@@ -679,7 +679,9 @@ public function testExportRelationshipsMergeToHouseholdAllFields() {
   /**
    * Test custom data exporting.
    *
+   * @throws \API_Exception
    * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
    * @throws \League\Csv\Exception
    */
   public function testExportCustomData() {
@@ -690,17 +692,20 @@ public function testExportCustomData() {
     for ($i = 0; $i < 70; $i++) {
       $longString .= 'Blah';
     }
+    $this->addOptionToCustomField('select_string', ['label' => $longString, 'name' => 'blah']);
 
     $this->callAPISuccess('Contact', 'create', [
       'id' => $this->contactIDs[1],
       $this->getCustomFieldName('text') => $longString,
       $this->getCustomFieldName('country') => 'LA',
+      $this->getCustomFieldName('select_string') => 'blah',
       'api.Address.create' => ['location_type_id' => 'Billing', 'city' => 'Waipu'],
     ]);
     $selectedFields = [
       ['name' => 'city', 'location_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Address', 'location_type_id', 'Billing')],
       ['name' => $this->getCustomFieldName('text')],
       ['name' => $this->getCustomFieldName('country')],
+      ['name' => $this->getCustomFieldName('select_string')],
     ];
 
     $this->doExportTest([
@@ -711,6 +716,7 @@ public function testExportCustomData() {
     $this->assertEquals($longString, $row['Enter text here']);
     $this->assertEquals('Waipu', $row['Billing-City']);
     $this->assertEquals("Lao People's Democratic Republic", $row['Country']);
+    $this->assertEquals($longString, $row['Pick Color']);
   }
 
   /**
diff --git a/tests/phpunit/CRMTraits/Custom/CustomDataTrait.php b/tests/phpunit/CRMTraits/Custom/CustomDataTrait.php
index 759d62a9d17b..251326c7ce75 100644
--- a/tests/phpunit/CRMTraits/Custom/CustomDataTrait.php
+++ b/tests/phpunit/CRMTraits/Custom/CustomDataTrait.php
@@ -10,6 +10,8 @@
  */
 
 use Civi\Api4\CustomGroup;
+use Civi\Api4\CustomField;
+use Civi\Api4\OptionValue;
 
 /**
  * Trait Custom Data trait.
@@ -164,6 +166,25 @@ protected function getCustomFieldName($key) {
     return 'custom_' . $this->getCustomFieldID($key);
   }
 
+  /**
+   * Add another option to the custom field.
+   *
+   * @param string $key
+   * @param array $values
+   *
+   * @return int
+   * @throws \API_Exception
+   */
+  protected function addOptionToCustomField($key, $values) {
+    $optionGroupID = CustomField::get(FALSE)
+      ->addWhere('id', '=', $this->getCustomFieldID($key))
+      ->addSelect('option_group_id')
+      ->execute()->first()['option_group_id'];
+    return (int) OptionValue::create(FALSE)
+      ->setValues(array_merge(['option_group_id' => $optionGroupID], $values))
+      ->execute()->first()['value'];
+  }
+
   /**
    * Get the custom field name for the relevant key.
    *

From d713d5f9a1a917299ebcf711d41c47573404ceb3 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 5 Sep 2020 08:51:27 +1000
Subject: [PATCH 140/834] [NFC] Update Event DAO Checksum

---
 CRM/Event/DAO/Event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
index 8a7806e8a338..a7febe5bfe94 100644
--- a/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:164ee1a507b9244536114d1569ccff1e)
+ * (GenCodeChecksum:82ba48cbb804cf6f4b26fa50f07d44db)
  */
 
 /**

From 1e6dcc01c59d88fba809bd1e8334332970fdec28 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Sat, 5 Sep 2020 00:20:38 +0100
Subject: [PATCH 141/834] Fixed pre hook params for LineItem

---
 CRM/Price/BAO/LineItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Price/BAO/LineItem.php b/CRM/Price/BAO/LineItem.php
index 0067fef0a6ed..bffcccbe4744 100644
--- a/CRM/Price/BAO/LineItem.php
+++ b/CRM/Price/BAO/LineItem.php
@@ -37,7 +37,7 @@ public static function create(&$params) {
       CRM_Utils_Hook::pre('edit', 'LineItem', $id, $params);
     }
     else {
-      CRM_Utils_Hook::pre('create', 'LineItem', $params['entity_id'], $params);
+      CRM_Utils_Hook::pre('create', 'LineItem', $id, $params);
     }
 
     // unset entity table and entity id in $params

From f8c35cad3842a60181281278a4f7e02e7e69fa64 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 4 Sep 2020 19:10:06 +1200
Subject: [PATCH 142/834] dev/core#1998 Address dedupe clash on dashboard
 contact

---
 CRM/Dedupe/Merger.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index d8fd267310cd..69827f16192f 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -541,6 +541,12 @@ public static function moveContactBelongings($mergeHandler, $tables, $tableOpera
         continue;
       }
 
+      if ($table === 'civicrm_dashboard_contact') {
+        $sqls[] = "UPDATE IGNORE civicrm_dashboard_contact SET contact_id = $mainId WHERE contact_id = $otherId";
+        $sqls[] = "DELETE FROM civicrm_dashboard_contact WHERE contact_id = $otherId";
+        continue;
+      }
+
       if ($table === 'civicrm_dedupe_exception') {
         $sqls[] = "UPDATE IGNORE civicrm_dedupe_exception SET contact_id1 = $mainId WHERE contact_id1 = $otherId";
         $sqls[] = "UPDATE IGNORE civicrm_dedupe_exception SET contact_id2 = $mainId WHERE contact_id2 = $otherId";

From 49df88a8282c811fc1661a96aceedaa3818f2005 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 3 Sep 2020 20:59:25 -0400
Subject: [PATCH 143/834] Fix customField legacy handling in APIv3

---
 CRM/Core/DAO/CustomField.php                  |  8 ++-
 CRM/Upgrade/Incremental/sql/5.29.1.mysql.tpl  |  7 +++
 api/v3/CustomField.php                        | 37 ++++++++++--
 .../phpunit/CRM/Core/BAO/CustomFieldTest.php  | 20 +++----
 .../phpunit/CRM/Core/BAO/CustomQueryTest.php  |  2 +-
 .../Utils/Migrate/fixtures/Activity-text.xml  |  1 +
 .../Migrate/fixtures/ActivityMeeting-text.xml |  1 +
 .../Utils/Migrate/fixtures/Contact-text.xml   |  1 +
 .../Migrate/fixtures/Individual-text.xml      |  1 +
 .../fixtures/IndividualStudent-text.xml       |  1 +
 tests/phpunit/api/v3/CustomFieldTest.php      | 60 +++++++++++++++++++
 .../phpunit/api/v4/Action/CustomValueTest.php |  4 +-
 xml/schema/Core/CustomField.xml               |  4 +-
 13 files changed, 125 insertions(+), 22 deletions(-)
 create mode 100644 CRM/Upgrade/Incremental/sql/5.29.1.mysql.tpl

diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 137fbf81a247..6cae23bea076 100644
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:200b28277fc9e025b42d3f3e45fde020)
+ * (GenCodeChecksum:1acb9b3538bd3005b99e6af6d9ec062f)
  */
 
 /**
@@ -227,7 +227,7 @@ class CRM_Core_DAO_CustomField extends CRM_Core_DAO {
   public $option_group_id;
 
   /**
-   * Serialization method - a non-null value indicates a multi-valued field.
+   * Serialization method - a non-zero value indicates a multi-valued field.
    *
    * @var int
    */
@@ -688,8 +688,10 @@ public static function &fields() {
           'name' => 'serialize',
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Serialize'),
-          'description' => ts('Serialization method - a non-null value indicates a multi-valued field.'),
+          'description' => ts('Serialization method - a non-zero value indicates a multi-valued field.'),
+          'required' => TRUE,
           'where' => 'civicrm_custom_field.serialize',
+          'default' => '0',
           'table_name' => 'civicrm_custom_field',
           'entity' => 'CustomField',
           'bao' => 'CRM_Core_BAO_CustomField',
diff --git a/CRM/Upgrade/Incremental/sql/5.29.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.29.1.mysql.tpl
new file mode 100644
index 000000000000..f51e009f0dc4
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.29.1.mysql.tpl
@@ -0,0 +1,7 @@
+{* file to handle db changes in 5.29.1 during upgrade *}
+
+UPDATE `civicrm_custom_field` SET `serialize` = 0 WHERE `serialize` IS NULL;
+
+ALTER TABLE `civicrm_custom_field`
+CHANGE COLUMN `serialize`
+`serialize` int unsigned NOT NULL DEFAULT 0 COMMENT 'Serialization method - a non-zero value indicates a multi-valued field.';
diff --git a/api/v3/CustomField.php b/api/v3/CustomField.php
index 1667721744b7..a9b664b0b59a 100644
--- a/api/v3/CustomField.php
+++ b/api/v3/CustomField.php
@@ -122,18 +122,45 @@ function civicrm_api3_custom_field_delete($params) {
  * @return array
  */
 function civicrm_api3_custom_field_get($params) {
-  if (CRM_Core_BAO_Domain::isDBVersionAtLeast('5.27.alpha1') && ($params['legacy_html_type'] ?? TRUE) && !empty($params['return'])) {
-    if (is_array($params['return'])) {
+  // Legacy handling for serialize property
+  $handleLegacy = (($params['legacy_html_type'] ?? !isset($params['serialize'])) && CRM_Core_BAO_Domain::isDBVersionAtLeast('5.27.alpha1'));
+  if ($handleLegacy && !empty($params['return'])) {
+    if (!is_array($params['return'])) {
+      $params['return'] = explode(',', str_replace(' ', '', $params['return']));
+    }
+    if (!in_array('serialize', $params['return'])) {
       $params['return'][] = 'serialize';
     }
-    elseif (is_string($params['return'])) {
-      $params['return'] .= ',serialize';
+  }
+  if ($handleLegacy && !empty($params['html_type'])) {
+    $serializedTypes = ['CheckBox', 'Multi-Select', 'Multi-Select Country', 'Multi-Select State/Province'];
+    if (is_string($params['html_type'])) {
+      if (strpos($params['html_type'], 'Multi-Select') === 0) {
+        $params['html_type'] = str_replace('Multi-Select', 'Select', $params['html_type']);
+        $params['serialize'] = 1;
+      }
+      elseif (!in_array($params['html_type'], $serializedTypes)) {
+        $params['serialize'] = 0;
+      }
+    }
+    elseif (is_array($params['html_type']) && !empty($params['html_type']['IN'])) {
+      $excludeNonSerialized = !array_diff($params['html_type']['IN'], $serializedTypes);
+      $onlyNonSerialized = !array_intersect($params['html_type']['IN'], $serializedTypes);
+      $params['html_type']['IN'] = array_map(function($val) {
+        return str_replace('Multi-Select', 'Select', $val);
+      }, $params['html_type']['IN']);
+      if ($excludeNonSerialized) {
+        $params['serialize'] = 1;
+      }
+      if ($onlyNonSerialized) {
+        $params['serialize'] = 0;
+      }
     }
   }
 
   $results = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 
-  if (($params['legacy_html_type'] ?? TRUE) && !empty($results['values']) && is_array($results['values'])) {
+  if ($handleLegacy && !empty($results['values']) && is_array($results['values']) && !isset($params['serialize'])) {
     foreach ($results['values'] as $id => $result) {
       if (!empty($result['serialize']) && !empty($result['html_type'])) {
         $results['values'][$id]['html_type'] = str_replace('Select', 'Multi-Select', $result['html_type']);
diff --git a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
index 42a74c202693..bf3cdf38c8f2 100644
--- a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
+++ b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
@@ -481,7 +481,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.' . $this->getCustomFieldColumnName('country'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
         'pseudoconstant' => [
           'table' => 'civicrm_country',
           'keyColumn' => 'id',
@@ -559,7 +559,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.my_file_' . $this->getCustomFieldID('file'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       $this->getCustomFieldName('text') => [
         'name' => $this->getCustomFieldName('text'),
@@ -593,7 +593,7 @@ public function testGetFieldsForImport() {
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
         'maxlength' => 300,
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       $this->getCustomFieldName('select_string') => [
         'name' => $this->getCustomFieldName('select_string'),
@@ -626,7 +626,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.pick_color_' . $this->getCustomFieldID('select_string'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
         'pseudoconstant' => [
           'optionGroupName' => $this->callAPISuccessGetValue('CustomField', ['id' => $this->getCustomFieldID('select_string'), 'return' => 'option_group_id.name']),
           'optionEditPath' => 'civicrm/admin/options/' . $this->callAPISuccessGetValue('CustomField', ['id' => $this->getCustomFieldID('select_string'), 'return' => 'option_group_id.name']),
@@ -663,7 +663,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.test_date_' . $this->getCustomFieldID('select_date'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       $this->getCustomFieldName('link') => [
         'name' => $this->getCustomFieldName('link'),
@@ -696,7 +696,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.test_link_' . $this->getCustomFieldID('link'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       $this->getCustomFieldName('int') => [
         'name' => $this->getCustomFieldName('int'),
@@ -729,7 +729,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.' . $this->getCustomFieldColumnName('int'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       $this->getCustomFieldName('contact_reference') => [
         'name' => $this->getCustomFieldName('contact_reference'),
@@ -762,7 +762,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.' . $this->getCustomFieldColumnName('contact_reference'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       $this->getCustomFieldName('state') => [
         'name' => $this->getCustomFieldName('state'),
@@ -788,7 +788,7 @@ public function testGetFieldsForImport() {
         'where' => 'civicrm_value_custom_group_' . $customGroupID . '.' . $this->getCustomFieldColumnName('state'),
         'extends_table' => 'civicrm_contact',
         'search_table' => 'contact_a',
-        'serialize' => NULL,
+        'serialize' => 0,
         'pseudoconstant' => [
           'table' => 'civicrm_state_province',
           'keyColumn' => 'id',
@@ -871,7 +871,7 @@ public function testGetFieldsForImport() {
         'text_length' => NULL,
         'options_per_line' => NULL,
         'is_search_range' => '0',
-        'serialize' => NULL,
+        'serialize' => 0,
         'pseudoconstant' => [
           'callback' => 'CRM_Core_SelectValues::boolean',
         ],
diff --git a/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php b/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php
index acca0de169bf..d1a103d53297 100644
--- a/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php
+++ b/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php
@@ -85,7 +85,7 @@ public function testSearchCustomDataDateRelative() {
       'type' => 4,
       'where' => 'civicrm_value_testsearchcus_' . $ids['custom_group_id'] . '.date_field_' . $dateCustomField['id'],
       'import' => 1,
-      'serialize' => NULL,
+      'serialize' => 0,
     ], $queryObj->getFieldSpec('custom_' . $dateCustomField['id']));
 
   }
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
index b678d654d1ad..20a73caf24a8 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Activity-text.xml
@@ -31,6 +31,7 @@
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
+      <serialize>0</serialize>
       <in_selector>0</in_selector>
       <custom_group_name>example</custom_group_name>
     </CustomField>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
index fe8d93eea5e2..58a45e824bd2 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/ActivityMeeting-text.xml
@@ -33,6 +33,7 @@
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
+      <serialize>0</serialize>
       <in_selector>0</in_selector>
       <custom_group_name>example</custom_group_name>
     </CustomField>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
index c6fd51652288..22cb829ad871 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Contact-text.xml
@@ -31,6 +31,7 @@
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
+      <serialize>0</serialize>
       <in_selector>0</in_selector>
       <custom_group_name>example</custom_group_name>
     </CustomField>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
index 59768ede169a..ffdd76a9ef9f 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/Individual-text.xml
@@ -31,6 +31,7 @@
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
+      <serialize>0</serialize>
       <in_selector>0</in_selector>
       <custom_group_name>example</custom_group_name>
     </CustomField>
diff --git a/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml b/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
index 2a367d908e39..6c7e06e69214 100644
--- a/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
+++ b/tests/phpunit/CRM/Utils/Migrate/fixtures/IndividualStudent-text.xml
@@ -33,6 +33,7 @@
       <is_active>1</is_active>
       <is_view>0</is_view>
       <column_name>name1_1</column_name>
+      <serialize>0</serialize>
       <in_selector>0</in_selector>
       <custom_group_name>example</custom_group_name>
     </CustomField>
diff --git a/tests/phpunit/api/v3/CustomFieldTest.php b/tests/phpunit/api/v3/CustomFieldTest.php
index 5d828378d203..8fc16468a1df 100644
--- a/tests/phpunit/api/v3/CustomFieldTest.php
+++ b/tests/phpunit/api/v3/CustomFieldTest.php
@@ -618,4 +618,64 @@ public function testDisableSearchableContactReferenceField() {
     $this->callAPISuccess('CustomField', 'create', $params);
   }
 
+  public function testLegacyHtmlType() {
+    $customGroup = $this->customGroupCreate([
+      'name' => 'testCustomGroup',
+      'title' => 'testCustomGroup',
+      'extends' => 'Individual',
+    ]);
+    $f1 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'SingleSelect',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'String',
+      'html_type' => 'Select',
+      'option_values' => [1 => 'One', 2 => 'Two'],
+    ]);
+    $f2 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'CheckBoxes',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'String',
+      'html_type' => 'CheckBox',
+      'option_values' => [1 => 'One', 2 => 'Two'],
+    ]);
+    $f3 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'MultiSelect',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'String',
+      'html_type' => 'Multi-Select',
+      'option_values' => [1 => 'One', 2 => 'Two'],
+    ]);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => 'Multi-Select',
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('MultiSelect', $result['values'][0]['label']);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => ['IN' => ['Multi-Select', 'CheckBox']],
+      'sequential' => 1,
+    ]);
+    $this->assertCount(2, $result['values']);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => 'Select',
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('SingleSelect', $result['values'][0]['label']);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => ['IN' => ['Select']],
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('SingleSelect', $result['values'][0]['label']);
+  }
+
 }
diff --git a/tests/phpunit/api/v4/Action/CustomValueTest.php b/tests/phpunit/api/v4/Action/CustomValueTest.php
index 81edd46e2a7f..0b39e2617314 100644
--- a/tests/phpunit/api/v4/Action/CustomValueTest.php
+++ b/tests/phpunit/api/v4/Action/CustomValueTest.php
@@ -89,7 +89,7 @@ public function testCRUD() {
         'entity' => "Custom_$group",
         'data_type' => 'String',
         'fk_entity' => NULL,
-        'serialize' => NULL,
+        'serialize' => 0,
         'options' => $optionValues,
       ],
       [
@@ -109,7 +109,7 @@ public function testCRUD() {
         'entity' => "Custom_$group",
         'data_type' => 'String',
         'fk_entity' => NULL,
-        'serialize' => NULL,
+        'serialize' => 0,
       ],
       [
         'name' => 'id',
diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml
index 8d49adce76d0..44c632256010 100644
--- a/xml/schema/Core/CustomField.xml
+++ b/xml/schema/Core/CustomField.xml
@@ -278,11 +278,13 @@
     <type>int unsigned</type>
     <title>Serialize</title>
     <length>255</length>
-    <comment>Serialization method - a non-null value indicates a multi-valued field.</comment>
+    <comment>Serialization method - a non-zero value indicates a multi-valued field.</comment>
     <pseudoconstant>
       <callback>CRM_Core_SelectValues::fieldSerialization</callback>
     </pseudoconstant>
     <add>5.27</add>
+    <required>true</required>
+    <default>0</default>
   </field>
   <field>
     <name>filter</name>

From ae1baeec7cc5c32d6ba593bfa6c77fbb473d7152 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 4 Sep 2020 12:21:12 +1000
Subject: [PATCH 144/834] Migrate Eway(Single Currency) Payment Processor Type
 out into its own extension

---
 .gitignore                                    |   1 +
 CRM/Event/DAO/Event.php                       |   2 +-
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php |  37 +-
 distmaker/dists/common.sh                     |   1 +
 ext/ewaysingle/CRM/Core/Payment/eWAY.mgd.php  |  24 +
 .../ewaysingle/CRM}/Core/Payment/eWAY.php     |   5 +-
 ext/ewaysingle/LICENSE.txt                    | 667 +++++++++++++
 ext/ewaysingle/README.md                      |  44 +
 ext/ewaysingle/ewaysingle.civix.php           | 477 +++++++++
 ext/ewaysingle/ewaysingle.php                 | 172 ++++
 ext/ewaysingle/images/screenshot.png          | Bin 0 -> 11775 bytes
 ext/ewaysingle/info.xml                       |  30 +
 ext/ewaysingle/lib/XML/Util.php               | 911 ++++++++++++++++++
 .../lib/eWAY/eWAY_GatewayRequest.php          | 243 +++++
 .../lib/eWAY/eWAY_GatewayResponse.php         | 171 ++++
 sql/civicrm_generated.mysql                   |   2 +-
 xml/templates/civicrm_data.tpl                |   1 -
 17 files changed, 2780 insertions(+), 8 deletions(-)
 create mode 100644 ext/ewaysingle/CRM/Core/Payment/eWAY.mgd.php
 rename {CRM => ext/ewaysingle/CRM}/Core/Payment/eWAY.php (99%)
 create mode 100644 ext/ewaysingle/LICENSE.txt
 create mode 100644 ext/ewaysingle/README.md
 create mode 100644 ext/ewaysingle/ewaysingle.civix.php
 create mode 100644 ext/ewaysingle/ewaysingle.php
 create mode 100644 ext/ewaysingle/images/screenshot.png
 create mode 100644 ext/ewaysingle/info.xml
 create mode 100644 ext/ewaysingle/lib/XML/Util.php
 create mode 100644 ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
 create mode 100644 ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php

diff --git a/.gitignore b/.gitignore
index 0070fbb42c66..0f5fcd13673b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 !/ext/sequentialcreditnotes
 !/ext/flexmailer
 !/ext/eventcart
+!/ext/ewaysingle
 !/ext/search
 !/ext/financialacls
 backdrop/
diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
index 8a7806e8a338..a7febe5bfe94 100644
--- a/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:164ee1a507b9244536114d1569ccff1e)
+ * (GenCodeChecksum:82ba48cbb804cf6f4b26fa50f07d44db)
  */
 
 /**
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index cbc3760ac2ce..b85942cd3fce 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -65,8 +65,39 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
   //    // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
   //  }
 
-  // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) {
-  //   return TRUE;
-  // }
+  /**
+   * Upgrade function.
+   *
+   * @param string $rev
+   */
+  public function upgrade_5_31_alpha1($rev) {
+   $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+   $this->addTask('enableeWAYSingleCurrencyExtension', 'enableEwaySingleExtension');
+  }
+
+  public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
+    $eWAYPaymentProcessorType = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_payment_processor_type WHERE class_name = 'Payment_eWAY'");
+    if ($eWAYPaymentProcessorType) {
+      $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([
+        'type' => 'module',
+        'full_name' => 'ewaysingle',
+        'name' => 'eway Single currency extension',
+        'label' => 'eway Single currency extension',
+        'file' => 'ewaysingle',
+        'schema_version' => NULL,
+        'is_active' => 1,
+      ]);
+      CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL());
+      $managedEntity = CRM_Utils_SQL_Insert::into('civicrm_managed')->row([
+        'name' => 'eWAY',
+        'module' => 'ewaysingle',
+        'entity_type' => 'PaymentProcessorType',
+        'entity_id' => $eWAYPaymentProcessorType,
+        'cleanup' => NULL,
+      ]);
+      CRM_Core_DAO::executeQuery($managedEntity->usingReplace()->toSQL());
+    }
+    return TRUE;
+  }
 
 }
diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 522bcc0c2ec2..65d8d48b36e8 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -109,6 +109,7 @@ function dm_core_exts() {
   echo ext/sequentialcreditnotes
   echo ext/flexmailer
   echo ext/eventcart
+  echo ext/ewaysingle
   echo ext/financialacls
 }
 
diff --git a/ext/ewaysingle/CRM/Core/Payment/eWAY.mgd.php b/ext/ewaysingle/CRM/Core/Payment/eWAY.mgd.php
new file mode 100644
index 000000000000..978303bc60ec
--- /dev/null
+++ b/ext/ewaysingle/CRM/Core/Payment/eWAY.mgd.php
@@ -0,0 +1,24 @@
+<?php
+// This file declares a managed database record of type "ReportTemplate".
+// The record will be automatically inserted, updated, or deleted from the
+// database as appropriate. For more details, see "hook_civicrm_managed" at:
+// http://wiki.civicrm.org/confluence/display/CRMDOC42/Hook+Reference
+return array(
+  0 => array(
+    'name' => 'eWAY',
+    'entity' => 'PaymentProcessorType',
+    'params' => array(
+      'version' => 3,
+      'name' => 'eWAY',
+      'title' => 'eWAY (Single Currency)',
+      'description' => '',
+      'user_name_label' => 'Customer ID',
+      'class_name' => 'Payment_eWAY',
+      'billing_mode' => 1,
+      'url_site_default' => 'https://www.eway.com.au/gateway_cvn/xmlpayment.asp',
+      'payment_type' => 1,
+      'is_recur' => 0,
+      'url_site_test_default' => 'https://www.eway.com.au/gateway_cvn/xmltest/testpage.asp',
+    ),
+  ),
+);
diff --git a/CRM/Core/Payment/eWAY.php b/ext/ewaysingle/CRM/Core/Payment/eWAY.php
similarity index 99%
rename from CRM/Core/Payment/eWAY.php
rename to ext/ewaysingle/CRM/Core/Payment/eWAY.php
index e8ec19da0dab..59411cd5d0cf 100644
--- a/CRM/Core/Payment/eWAY.php
+++ b/ext/ewaysingle/CRM/Core/Payment/eWAY.php
@@ -77,10 +77,11 @@
  */
 
 use Civi\Payment\Exception\PaymentProcessorException;
+use CRM_Ewaysingle_ExtensionUtil as E;
 
 // require Standard eWAY API libraries
-require_once 'eWAY/eWAY_GatewayRequest.php';
-require_once 'eWAY/eWAY_GatewayResponse.php';
+require_once E::path('lib/eWAY/eWAY_GatewayRequest.php');
+require_once E::path('lib/eWAY/eWAY_GatewayResponse.php');
 
 /**
  * Class CRM_Core_Payment_eWAY.
diff --git a/ext/ewaysingle/LICENSE.txt b/ext/ewaysingle/LICENSE.txt
new file mode 100644
index 000000000000..5ceb74b89110
--- /dev/null
+++ b/ext/ewaysingle/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: ewaysingle
+Copyright (C) 2020, Seamus Lee <seamuslee001@gmail.com>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/ewaysingle/README.md b/ext/ewaysingle/README.md
new file mode 100644
index 000000000000..52c94dafc116
--- /dev/null
+++ b/ext/ewaysingle/README.md
@@ -0,0 +1,44 @@
+# ewaysingle
+
+![Screenshot](/images/screenshot.png)
+
+(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+
+The extension is licensed under [AGPL-3.0](LICENSE.txt).
+
+## Requirements
+
+* PHP v7.0+
+* CiviCRM (*FIXME: Version number*)
+
+## Installation (Web UI)
+
+This extension has not yet been published for installation via the web UI.
+
+## Installation (CLI, Zip)
+
+Sysadmins and developers may download the `.zip` file for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+cd <extension-dir>
+cv dl ewaysingle@https://github.com/FIXME/ewaysingle/archive/master.zip
+```
+
+## Installation (CLI, Git)
+
+Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+git clone https://github.com/FIXME/ewaysingle.git
+cv en ewaysingle
+```
+
+## Usage
+
+(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+
+## Known Issues
+
+(* FIXME *)
diff --git a/ext/ewaysingle/ewaysingle.civix.php b/ext/ewaysingle/ewaysingle.civix.php
new file mode 100644
index 000000000000..2a71b5bdba5e
--- /dev/null
+++ b/ext/ewaysingle/ewaysingle.civix.php
@@ -0,0 +1,477 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_Ewaysingle_ExtensionUtil {
+  const SHORT_NAME = "ewaysingle";
+  const LONG_NAME = "ewaysingle";
+  const CLASS_PREFIX = "CRM_Ewaysingle";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = []) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = [self::LONG_NAME, NULL];
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_Ewaysingle_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
+ */
+function _ewaysingle_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = [$extDir, $template->template_dir];
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+ */
+function _ewaysingle_civix_civicrm_xmlMenu(&$files) {
+  foreach (_ewaysingle_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function _ewaysingle_civix_civicrm_install() {
+  _ewaysingle_civix_civicrm_config();
+  if ($upgrader = _ewaysingle_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+function _ewaysingle_civix_civicrm_postInstall() {
+  _ewaysingle_civix_civicrm_config();
+  if ($upgrader = _ewaysingle_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+function _ewaysingle_civix_civicrm_uninstall() {
+  _ewaysingle_civix_civicrm_config();
+  if ($upgrader = _ewaysingle_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function _ewaysingle_civix_civicrm_enable() {
+  _ewaysingle_civix_civicrm_config();
+  if ($upgrader = _ewaysingle_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onEnable'])) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ * @return mixed
+ */
+function _ewaysingle_civix_civicrm_disable() {
+  _ewaysingle_civix_civicrm_config();
+  if ($upgrader = _ewaysingle_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onDisable'])) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
+ */
+function _ewaysingle_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _ewaysingle_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_Ewaysingle_Upgrader
+ */
+function _ewaysingle_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/Ewaysingle/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_Ewaysingle_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern.
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
+ * @return array
+ */
+function _ewaysingle_civix_find_files($dir, $pattern) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = [$dir];
+  $result = [];
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_ewaysingle_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry[0] == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
+ */
+function _ewaysingle_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _ewaysingle_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
+ */
+function _ewaysingle_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_ewaysingle_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = [
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    ];
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+ */
+function _ewaysingle_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _ewaysingle_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _ewaysingle_civix_civicrm_themes(&$themes) {
+  $files = _ewaysingle_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ *
+ * @return array
+ */
+function _ewaysingle_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : [];
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ *
+ * @return bool
+ */
+function _ewaysingle_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = [
+      'attributes' => array_merge([
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ], $item),
+    ];
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = [];
+        }
+        $found = _ewaysingle_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _ewaysingle_civix_navigationMenu(&$nodes) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
+    _ewaysingle_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _ewaysingle_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _ewaysingle_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _ewaysingle_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _ewaysingle_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
+ */
+function _ewaysingle_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+ */
+function _ewaysingle_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, []);
+}
diff --git a/ext/ewaysingle/ewaysingle.php b/ext/ewaysingle/ewaysingle.php
new file mode 100644
index 000000000000..d3f2932d6a00
--- /dev/null
+++ b/ext/ewaysingle/ewaysingle.php
@@ -0,0 +1,172 @@
+<?php
+
+require_once 'ewaysingle.civix.php';
+// phpcs:disable
+use CRM_Ewaysingle_ExtensionUtil as E;
+// phpcs:enable
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
+ */
+function ewaysingle_civicrm_config(&$config) {
+  _ewaysingle_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+ */
+function ewaysingle_civicrm_xmlMenu(&$files) {
+  _ewaysingle_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function ewaysingle_civicrm_install() {
+  _ewaysingle_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+function ewaysingle_civicrm_postInstall() {
+  _ewaysingle_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+function ewaysingle_civicrm_uninstall() {
+  _ewaysingle_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function ewaysingle_civicrm_enable() {
+  _ewaysingle_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ */
+function ewaysingle_civicrm_disable() {
+  _ewaysingle_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
+ */
+function ewaysingle_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _ewaysingle_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
+ */
+function ewaysingle_civicrm_managed(&$entities) {
+  _ewaysingle_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
+ */
+function ewaysingle_civicrm_caseTypes(&$caseTypes) {
+  _ewaysingle_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+ */
+function ewaysingle_civicrm_angularModules(&$angularModules) {
+  _ewaysingle_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
+ */
+function ewaysingle_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _ewaysingle_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+ */
+function ewaysingle_civicrm_entityTypes(&$entityTypes) {
+  _ewaysingle_civix_civicrm_entityTypes($entityTypes);
+}
+
+/**
+ * Implements hook_civicrm_thems().
+ */
+function ewaysingle_civicrm_themes(&$themes) {
+  _ewaysingle_civix_civicrm_themes($themes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_preProcess
+ */
+//function ewaysingle_civicrm_preProcess($formName, &$form) {
+//
+//}
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_navigationMenu
+ */
+//function ewaysingle_civicrm_navigationMenu(&$menu) {
+//  _ewaysingle_civix_insert_navigation_menu($menu, 'Mailings', array(
+//    'label' => E::ts('New subliminal message'),
+//    'name' => 'mailing_subliminal_message',
+//    'url' => 'civicrm/mailing/subliminal',
+//    'permission' => 'access CiviMail',
+//    'operator' => 'OR',
+//    'separator' => 0,
+//  ));
+//  _ewaysingle_civix_navigationMenu($menu);
+//}
diff --git a/ext/ewaysingle/images/screenshot.png b/ext/ewaysingle/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6765b696fa03249ac2cd605d5f0e4aa000ad6dad
GIT binary patch
literal 11775
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
IrTdTn0|#irRsaA1

literal 0
HcmV?d00001

diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml
new file mode 100644
index 000000000000..bd99f5c4bd29
--- /dev/null
+++ b/ext/ewaysingle/info.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<extension key="ewaysingle" type="module">
+  <file>ewaysingle</file>
+  <name>eway Single currency extension</name>
+  <description>Extension to contain the eWAY single currency Payment Processor.</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>Seamus Lee</author>
+    <email>seamuslee001@gmail.com</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://FIXME</url>
+    <url desc="Documentation">http://FIXME</url>
+    <url desc="Support">http://FIXME</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2020-09-04</releaseDate>
+  <version>1.0</version>
+  <develStage>alpha</develStage>
+  <compatibility>
+    <ver>5.0</ver>
+  </compatibility>
+  <comments>This is a new, undeveloped module</comments>
+  <classloader>
+    <psr4 prefix="Civi\" path="Civi"/>
+  </classloader>
+  <civix>
+    <namespace>CRM/Ewaysingle</namespace>
+  </civix>
+</extension>
diff --git a/ext/ewaysingle/lib/XML/Util.php b/ext/ewaysingle/lib/XML/Util.php
new file mode 100644
index 000000000000..f5927b16cfd4
--- /dev/null
+++ b/ext/ewaysingle/lib/XML/Util.php
@@ -0,0 +1,911 @@
+<?php
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * XML_Util
+ *
+ * XML Utilities package
+ * 
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Util
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id: Util.php,v 1.38 2008/11/13 00:03:38 ashnazg Exp $
+ * @link      http://pear.php.net/package/XML_Util
+ */
+
+/**
+ * error code for invalid chars in XML name
+ */
+define('XML_UTIL_ERROR_INVALID_CHARS', 51);
+
+/**
+ * error code for invalid chars in XML name
+ */
+define('XML_UTIL_ERROR_INVALID_START', 52);
+
+/**
+ * error code for non-scalar tag content
+ */
+define('XML_UTIL_ERROR_NON_SCALAR_CONTENT', 60);
+
+/**
+ * error code for missing tag name
+ */
+define('XML_UTIL_ERROR_NO_TAG_NAME', 61);
+
+/**
+ * replace XML entities
+ */
+define('XML_UTIL_REPLACE_ENTITIES', 1);
+
+/**
+ * embedd content in a CData Section
+ */
+define('XML_UTIL_CDATA_SECTION', 5);
+
+/**
+ * do not replace entitites
+ */
+define('XML_UTIL_ENTITIES_NONE', 0);
+
+/**
+ * replace all XML entitites
+ * This setting will replace <, >, ", ' and &
+ */
+define('XML_UTIL_ENTITIES_XML', 1);
+
+/**
+ * replace only required XML entitites
+ * This setting will replace <, " and &
+ */
+define('XML_UTIL_ENTITIES_XML_REQUIRED', 2);
+
+/**
+ * replace HTML entitites
+ * @link http://www.php.net/htmlentities
+ */
+define('XML_UTIL_ENTITIES_HTML', 3);
+
+/**
+ * Collapse all empty tags.
+ */
+define('XML_UTIL_COLLAPSE_ALL', 1);
+
+/**
+ * Collapse only empty XHTML tags that have no end tag.
+ */
+define('XML_UTIL_COLLAPSE_XHTML_ONLY', 2);
+
+/**
+ * utility class for working with XML documents
+ *
+
+ * @category  XML
+ * @package   XML_Util
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: 1.2.1
+ * @link      http://pear.php.net/package/XML_Util
+ */
+class XML_Util
+{
+    /**
+     * return API version
+     *
+     * @return string $version API version
+     * @access public
+     * @static
+     */
+    function apiVersion()
+    {
+        return '1.1';
+    }
+
+    /**
+     * replace XML entities
+     *
+     * With the optional second parameter, you may select, which
+     * entities should be replaced.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // replace XML entites:
+     * $string = XML_Util::replaceEntities('This string contains < & >.');
+     * </code>
+     *
+     * With the optional third parameter, you may pass the character encoding
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // replace XML entites in UTF-8:
+     * $string = XML_Util::replaceEntities(
+     *     'This string contains < & > as well as ä, ö, ß, à and ê',
+     *     XML_UTIL_ENTITIES_HTML,
+     *     'UTF-8'
+     * );
+     * </code>
+     *
+     * @param string $string          string where XML special chars 
+     *                                should be replaced
+     * @param int    $replaceEntities setting for entities in attribute values 
+     *                                (one of XML_UTIL_ENTITIES_XML, 
+     *                                XML_UTIL_ENTITIES_XML_REQUIRED, 
+     *                                XML_UTIL_ENTITIES_HTML)
+     * @param string $encoding        encoding value (if any)...
+     *                                must be a valid encoding as determined
+     *                                by the htmlentities() function
+     *
+     * @return string string with replaced chars
+     * @access public
+     * @static
+     * @see reverseEntities()
+     */
+    function replaceEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
+        $encoding = 'ISO-8859-1')
+    {
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_XML:
+            return strtr($string, array(
+                '&'  => '&amp;',
+                '>'  => '&gt;',
+                '<'  => '&lt;',
+                '"'  => '&quot;',
+                '\'' => '&apos;' ));
+            break;
+        case XML_UTIL_ENTITIES_XML_REQUIRED:
+            return strtr($string, array(
+                '&' => '&amp;',
+                '<' => '&lt;',
+                '"' => '&quot;' ));
+            break;
+        case XML_UTIL_ENTITIES_HTML:
+            return htmlentities($string, ENT_COMPAT, $encoding);
+            break;
+        }
+        return $string;
+    }
+
+    /**
+     * reverse XML entities
+     *
+     * With the optional second parameter, you may select, which
+     * entities should be reversed.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // reverse XML entites:
+     * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
+     * </code>
+     *
+     * With the optional third parameter, you may pass the character encoding
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // reverse XML entites in UTF-8:
+     * $string = XML_Util::reverseEntities(
+     *     'This string contains &lt; &amp; &gt; as well as'
+     *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
+     *     XML_UTIL_ENTITIES_HTML,
+     *     'UTF-8'
+     * );
+     * </code>
+     *
+     * @param string $string          string where XML special chars 
+     *                                should be replaced
+     * @param int    $replaceEntities setting for entities in attribute values 
+     *                                (one of XML_UTIL_ENTITIES_XML, 
+     *                                XML_UTIL_ENTITIES_XML_REQUIRED, 
+     *                                XML_UTIL_ENTITIES_HTML)
+     * @param string $encoding        encoding value (if any)...
+     *                                must be a valid encoding as determined
+     *                                by the html_entity_decode() function
+     *
+     * @return string string with replaced chars
+     * @access public
+     * @static
+     * @see replaceEntities()
+     */
+    function reverseEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
+        $encoding = 'ISO-8859-1')
+    {
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_XML:
+            return strtr($string, array(
+                '&amp;'  => '&',
+                '&gt;'   => '>',
+                '&lt;'   => '<',
+                '&quot;' => '"',
+                '&apos;' => '\'' ));
+            break;
+        case XML_UTIL_ENTITIES_XML_REQUIRED:
+            return strtr($string, array(
+                '&amp;'  => '&',
+                '&lt;'   => '<',
+                '&quot;' => '"' ));
+            break;
+        case XML_UTIL_ENTITIES_HTML:
+            return html_entity_decode($string, ENT_COMPAT, $encoding);
+            break;
+        }
+        return $string;
+    }
+
+    /**
+     * build an xml declaration
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // get an XML declaration:
+     * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
+     * </code>
+     *
+     * @param string $version    xml version
+     * @param string $encoding   character encoding
+     * @param bool   $standalone document is standalone (or not)
+     *
+     * @return string xml declaration
+     * @access public
+     * @static
+     * @uses attributesToString() to serialize the attributes of the XML declaration
+     */
+    function getXMLDeclaration($version = '1.0', $encoding = null, 
+        $standalone = null)
+    {
+        $attributes = array(
+            'version' => $version,
+        );
+        // add encoding
+        if ($encoding !== null) {
+            $attributes['encoding'] = $encoding;
+        }
+        // add standalone, if specified
+        if ($standalone !== null) {
+            $attributes['standalone'] = $standalone ? 'yes' : 'no';
+        }
+
+        return sprintf('<?xml%s?>', 
+            XML_Util::attributesToString($attributes, false));
+    }
+
+    /**
+     * build a document type declaration
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // get a doctype declaration:
+     * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
+     * </code>
+     *
+     * @param string $root        name of the root tag
+     * @param string $uri         uri of the doctype definition 
+     *                            (or array with uri and public id)
+     * @param string $internalDtd internal dtd entries
+     *
+     * @return string doctype declaration
+     * @access public
+     * @static
+     * @since 0.2
+     */
+    function getDocTypeDeclaration($root, $uri = null, $internalDtd = null)
+    {
+        if (is_array($uri)) {
+            $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
+        } elseif (!empty($uri)) {
+            $ref = sprintf(' SYSTEM "%s"', $uri);
+        } else {
+            $ref = '';
+        }
+
+        if (empty($internalDtd)) {
+            return sprintf('<!DOCTYPE %s%s>', $root, $ref);
+        } else {
+            return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
+        }
+    }
+
+    /**
+     * create string representation of an attribute list
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // build an attribute string
+     * $att = array(
+     *              'foo'   =>  'bar',
+     *              'argh'  =>  'tomato'
+     *            );
+     *
+     * $attList = XML_Util::attributesToString($att);
+     * </code>
+     *
+     * @param array      $attributes attribute array
+     * @param bool|array $sort       sort attribute list alphabetically, 
+     *                               may also be an assoc array containing 
+     *                               the keys 'sort', 'multiline', 'indent', 
+     *                               'linebreak' and 'entities'
+     * @param bool       $multiline  use linebreaks, if more than 
+     *                               one attribute is given
+     * @param string     $indent     string used for indentation of 
+     *                               multiline attributes
+     * @param string     $linebreak  string used for linebreaks of 
+     *                               multiline attributes
+     * @param int        $entities   setting for entities in attribute values 
+     *                               (one of XML_UTIL_ENTITIES_NONE, 
+     *                               XML_UTIL_ENTITIES_XML, 
+     *                               XML_UTIL_ENTITIES_XML_REQUIRED, 
+     *                               XML_UTIL_ENTITIES_HTML)
+     *
+     * @return string string representation of the attributes
+     * @access public
+     * @static
+     * @uses replaceEntities() to replace XML entities in attribute values
+     * @todo allow sort also to be an options array
+     */
+    function attributesToString($attributes, $sort = true, $multiline = false, 
+        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML)
+    {
+        /*
+         * second parameter may be an array
+         */
+        if (is_array($sort)) {
+            if (isset($sort['multiline'])) {
+                $multiline = $sort['multiline'];
+            }
+            if (isset($sort['indent'])) {
+                $indent = $sort['indent'];
+            }
+            if (isset($sort['linebreak'])) {
+                $multiline = $sort['linebreak'];
+            }
+            if (isset($sort['entities'])) {
+                $entities = $sort['entities'];
+            }
+            if (isset($sort['sort'])) {
+                $sort = $sort['sort'];
+            } else {
+                $sort = true;
+            }
+        }
+        $string = '';
+        if (is_array($attributes) && !empty($attributes)) {
+            if ($sort) {
+                ksort($attributes);
+            }
+            if ( !$multiline || count($attributes) == 1) {
+                foreach ($attributes as $key => $value) {
+                    if ($entities != XML_UTIL_ENTITIES_NONE) {
+                        if ($entities === XML_UTIL_CDATA_SECTION) {
+                            $entities = XML_UTIL_ENTITIES_XML;
+                        }
+                        $value = XML_Util::replaceEntities($value, $entities);
+                    }
+                    $string .= ' ' . $key . '="' . $value . '"';
+                }
+            } else {
+                $first = true;
+                foreach ($attributes as $key => $value) {
+                    if ($entities != XML_UTIL_ENTITIES_NONE) {
+                        $value = XML_Util::replaceEntities($value, $entities);
+                    }
+                    if ($first) {
+                        $string .= ' ' . $key . '="' . $value . '"';
+                        $first   = false;
+                    } else {
+                        $string .= $linebreak . $indent . $key . '="' . $value . '"';
+                    }
+                }
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Collapses empty tags.
+     *
+     * @param string $xml  XML
+     * @param int    $mode Whether to collapse all empty tags (XML_UTIL_COLLAPSE_ALL)
+     *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
+     *
+     * @return string XML
+     * @access public
+     * @static
+     * @todo PEAR CS - unable to avoid "space after open parens" error
+     *       in the IF branch
+     */
+    function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL) 
+    {
+        if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
+            return preg_replace(
+                '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
+                . 'param)([^>]*)><\/\\1>/s',
+                '<\\1\\2 />',
+                $xml);
+        } else {
+            return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
+        }
+    }
+
+    /**
+     * create a tag
+     *
+     * This method will call XML_Util::createTagFromArray(), which
+     * is more flexible.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML tag:
+     * $tag = XML_Util::createTag('myNs:myTag', 
+     *     array('foo' => 'bar'), 
+     *     'This is inside the tag', 
+     *     'http://www.w3c.org/myNs#');
+     * </code>
+     *
+     * @param string $qname           qualified tagname (including namespace)
+     * @param array  $attributes      array containg attributes
+     * @param mixed  $content         the content
+     * @param string $namespaceUri    URI of the namespace
+     * @param int    $replaceEntities whether to replace XML special chars in 
+     *                                content, embedd it in a CData section 
+     *                                or none of both
+     * @param bool   $multiline       whether to create a multiline tag where 
+     *                                each attribute gets written to a single line
+     * @param string $indent          string used to indent attributes 
+     *                                (_auto indents attributes so they start 
+     *                                at the same column)
+     * @param string $linebreak       string used for linebreaks
+     * @param bool   $sortAttributes  Whether to sort the attributes or not
+     *
+     * @return string XML tag
+     * @access public
+     * @static
+     * @see createTagFromArray()
+     * @uses createTagFromArray() to create the tag
+     */
+    function createTag($qname, $attributes = array(), $content = null, 
+        $namespaceUri = null, $replaceEntities = XML_UTIL_REPLACE_ENTITIES, 
+        $multiline = false, $indent = '_auto', $linebreak = "\n", 
+        $sortAttributes = true)
+    {
+        $tag = array(
+            'qname'      => $qname,
+            'attributes' => $attributes
+        );
+
+        // add tag content
+        if ($content !== null) {
+            $tag['content'] = $content;
+        }
+
+        // add namespace Uri
+        if ($namespaceUri !== null) {
+            $tag['namespaceUri'] = $namespaceUri;
+        }
+
+        return XML_Util::createTagFromArray($tag, $replaceEntities, $multiline, 
+            $indent, $linebreak, $sortAttributes);
+    }
+
+    /**
+     * create a tag from an array
+     * this method awaits an array in the following format
+     * <pre>
+     * array(
+     *     // qualified name of the tag
+     *     'qname' => $qname        
+     *
+     *     // namespace prefix (optional, if qname is specified or no namespace)
+     *     'namespace' => $namespace    
+     *
+     *     // local part of the tagname (optional, if qname is specified)
+     *     'localpart' => $localpart,   
+     *
+     *     // array containing all attributes (optional)
+     *     'attributes' => array(),      
+     *
+     *     // tag content (optional)
+     *     'content' => $content,     
+     *
+     *     // namespaceUri for the given namespace (optional)
+     *     'namespaceUri' => $namespaceUri 
+     * )
+     * </pre>
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * $tag = array(
+     *     'qname'        => 'foo:bar',
+     *     'namespaceUri' => 'http://foo.com',
+     *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
+     *     'content'      => 'I\'m inside the tag',
+     * );
+     * // creating a tag with qualified name and namespaceUri
+     * $string = XML_Util::createTagFromArray($tag);
+     * </code>
+     *
+     * @param array  $tag             tag definition
+     * @param int    $replaceEntities whether to replace XML special chars in 
+     *                                content, embedd it in a CData section 
+     *                                or none of both
+     * @param bool   $multiline       whether to create a multiline tag where each 
+     *                                attribute gets written to a single line
+     * @param string $indent          string used to indent attributes 
+     *                                (_auto indents attributes so they start 
+     *                                at the same column)
+     * @param string $linebreak       string used for linebreaks
+     * @param bool   $sortAttributes  Whether to sort the attributes or not
+     *
+     * @return string XML tag
+     * @access public
+     * @static
+     * @see createTag()
+     * @uses attributesToString() to serialize the attributes of the tag
+     * @uses splitQualifiedName() to get local part and namespace of a qualified name
+     * @uses createCDataSection()
+     * @uses raiseError()
+     */
+    function createTagFromArray($tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = false, $indent = '_auto', $linebreak = "\n", 
+        $sortAttributes = true)
+    {
+        if (isset($tag['content']) && !is_scalar($tag['content'])) {
+            return XML_Util::raiseError('Supplied non-scalar value as tag content',
+            XML_UTIL_ERROR_NON_SCALAR_CONTENT);
+        }
+
+        if (!isset($tag['qname']) && !isset($tag['localPart'])) {
+            return XML_Util::raiseError('You must either supply a qualified name '
+                . '(qname) or local tag name (localPart).', 
+                XML_UTIL_ERROR_NO_TAG_NAME);
+        }
+
+        // if no attributes hav been set, use empty attributes
+        if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
+            $tag['attributes'] = array();
+        }
+
+        if (isset($tag['namespaces'])) {
+            foreach ($tag['namespaces'] as $ns => $uri) {
+                $tag['attributes']['xmlns:' . $ns] = $uri;
+            }
+        }
+
+        if (!isset($tag['qname'])) {
+            // qualified name is not given
+
+            // check for namespace
+            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+                $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
+            } else {
+                $tag['qname'] = $tag['localPart'];
+            }
+        } elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
+            // namespace URI is set, but no namespace
+
+            $parts = XML_Util::splitQualifiedName($tag['qname']);
+
+            $tag['localPart'] = $parts['localPart'];
+            if (isset($parts['namespace'])) {
+                $tag['namespace'] = $parts['namespace'];
+            }
+        }
+
+        if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
+            // is a namespace given
+            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+                $tag['attributes']['xmlns:' . $tag['namespace']] =
+                    $tag['namespaceUri'];
+            } else {
+                // define this Uri as the default namespace
+                $tag['attributes']['xmlns'] = $tag['namespaceUri'];
+            }
+        }
+
+        // check for multiline attributes
+        if ($multiline === true) {
+            if ($indent === '_auto') {
+                $indent = str_repeat(' ', (strlen($tag['qname'])+2));
+            }
+        }
+
+        // create attribute list
+        $attList = XML_Util::attributesToString($tag['attributes'], 
+            $sortAttributes, $multiline, $indent, $linebreak, $replaceEntities);
+        if (!isset($tag['content']) || (string)$tag['content'] == '') {
+            $tag = sprintf('<%s%s />', $tag['qname'], $attList);
+        } else {
+            switch ($replaceEntities) {
+            case XML_UTIL_ENTITIES_NONE:
+                break;
+            case XML_UTIL_CDATA_SECTION:
+                $tag['content'] = XML_Util::createCDataSection($tag['content']);
+                break;
+            default:
+                $tag['content'] = XML_Util::replaceEntities($tag['content'], 
+                    $replaceEntities);
+                break;
+            }
+            $tag = sprintf('<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
+                $tag['qname']);
+        }
+        return $tag;
+    }
+
+    /**
+     * create a start element
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createStartElement('myNs:myTag', 
+     *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
+     * </code>
+     *
+     * @param string $qname          qualified tagname (including namespace)
+     * @param array  $attributes     array containg attributes
+     * @param string $namespaceUri   URI of the namespace
+     * @param bool   $multiline      whether to create a multiline tag where each 
+     *                               attribute gets written to a single line
+     * @param string $indent         string used to indent attributes (_auto indents
+     *                               attributes so they start at the same column)
+     * @param string $linebreak      string used for linebreaks
+     * @param bool   $sortAttributes Whether to sort the attributes or not
+     *
+     * @return string XML start element
+     * @access public
+     * @static
+     * @see createEndElement(), createTag()
+     */
+    function createStartElement($qname, $attributes = array(), $namespaceUri = null,
+        $multiline = false, $indent = '_auto', $linebreak = "\n", 
+        $sortAttributes = true)
+    {
+        // if no attributes hav been set, use empty attributes
+        if (!isset($attributes) || !is_array($attributes)) {
+            $attributes = array();
+        }
+
+        if ($namespaceUri != null) {
+            $parts = XML_Util::splitQualifiedName($qname);
+        }
+
+        // check for multiline attributes
+        if ($multiline === true) {
+            if ($indent === '_auto') {
+                $indent = str_repeat(' ', (strlen($qname)+2));
+            }
+        }
+
+        if ($namespaceUri != null) {
+            // is a namespace given
+            if (isset($parts['namespace']) && !empty($parts['namespace'])) {
+                $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
+            } else {
+                // define this Uri as the default namespace
+                $attributes['xmlns'] = $namespaceUri;
+            }
+        }
+
+        // create attribute list
+        $attList = XML_Util::attributesToString($attributes, $sortAttributes, 
+            $multiline, $indent, $linebreak);
+        $element = sprintf('<%s%s>', $qname, $attList);
+        return  $element;
+    }
+
+    /**
+     * create an end element
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createEndElement('myNs:myTag');
+     * </code>
+     *
+     * @param string $qname qualified tagname (including namespace)
+     *
+     * @return string XML end element
+     * @access public
+     * @static
+     * @see createStartElement(), createTag()
+     */
+    function createEndElement($qname)
+    {
+        $element = sprintf('</%s>', $qname);
+        return $element;
+    }
+
+    /**
+     * create an XML comment
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createComment('I am a comment');
+     * </code>
+     *
+     * @param string $content content of the comment
+     *
+     * @return string XML comment
+     * @access public
+     * @static
+     */
+    function createComment($content)
+    {
+        $comment = sprintf('<!-- %s -->', $content);
+        return $comment;
+    }
+
+    /**
+     * create a CData section
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create a CData section
+     * $tag = XML_Util::createCDataSection('I am content.');
+     * </code>
+     *
+     * @param string $data data of the CData section
+     *
+     * @return string CData section with content
+     * @access public
+     * @static
+     */
+    function createCDataSection($data)
+    {
+        return sprintf('<![CDATA[%s]]>', 
+            preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data)));
+
+    }
+
+    /**
+     * split qualified name and return namespace and local part
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // split qualified tag
+     * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
+     * </code>
+     * the returned array will contain two elements:
+     * <pre>
+     * array(
+     *     'namespace' => 'xslt',
+     *     'localPart' => 'stylesheet'
+     * );
+     * </pre>
+     *
+     * @param string $qname     qualified tag name
+     * @param string $defaultNs default namespace (optional)
+     *
+     * @return array array containing namespace and local part
+     * @access public
+     * @static
+     */
+    function splitQualifiedName($qname, $defaultNs = null)
+    {
+        if (strstr($qname, ':')) {
+            $tmp = explode(':', $qname);
+            return array(
+                'namespace' => $tmp[0],
+                'localPart' => $tmp[1]
+            );
+        }
+        return array(
+            'namespace' => $defaultNs,
+            'localPart' => $qname
+        );
+    }
+
+    /**
+     * check, whether string is valid XML name
+     *
+     * <p>XML names are used for tagname, attribute names and various
+     * other, lesser known entities.</p>
+     * <p>An XML name may only consist of alphanumeric characters,
+     * dashes, undescores and periods, and has to start with a letter
+     * or an underscore.</p>
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // verify tag name
+     * $result = XML_Util::isValidName('invalidTag?');
+     * if (is_a($result, 'PEAR_Error')) {
+     *    print 'Invalid XML name: ' . $result->getMessage();
+     * }
+     * </code>
+     *
+     * @param string $string string that should be checked
+     *
+     * @return mixed true, if string is a valid XML name, PEAR error otherwise
+     * @access public
+     * @static
+     * @todo support for other charsets
+     * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
+     */
+    function isValidName($string)
+    {
+        // check for invalid chars
+        if (!preg_match('/^[[:alpha:]_]$/', $string{0})) {
+            return XML_Util::raiseError('XML names may only start with letter '
+                . 'or underscore', XML_UTIL_ERROR_INVALID_START);
+        }
+
+        // check for invalid chars
+        if (!preg_match('/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?[[:alpha:]_]([[:alnum:]\_\-\.]+)?$/',
+            $string)
+        ) {
+            return XML_Util::raiseError('XML names may only contain alphanumeric '
+                . 'chars, period, hyphen, colon and underscores', 
+                XML_UTIL_ERROR_INVALID_CHARS);
+        }
+        // XML name is valid
+        return true;
+    }
+
+    /**
+     * replacement for XML_Util::raiseError
+     *
+     * Avoids the necessity to always require
+     * PEAR.php
+     *
+     * @param string $msg  error message
+     * @param int    $code error code
+     *
+     * @return PEAR_Error
+     * @access public
+     * @static
+     * @todo PEAR CS - should this use include_once instead?
+     */
+    function raiseError($msg, $code)
+    {
+        require_once 'PEAR.php';
+        return PEAR::raiseError($msg, $code);
+    }
+}
+?>
diff --git a/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php b/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
new file mode 100644
index 000000000000..2d26e59a3142
--- /dev/null
+++ b/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
@@ -0,0 +1,243 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+*/
+
+/**************************************************************************************************************************
+ * Licensed to CiviCRM under the Academic Free License version 3.0
+ * Written & Contributed by Dolphin Software P/L - March 2008 
+ *
+ * 'eWAY_GatewayRequest.php' - Based on the standard supplied eWay sample code 'GatewayResponse.php'
+ *
+ * The only significant change from the original is that the 'CVN' field is uncommented,
+ * unlike the distributed sample code.
+ *
+ * ALSO: Added a 'GetTransactionNumber' function.
+ *
+ **************************************************************************************************************************/
+use CRM_Ewaysingle_ExtensionUtil as E;
+ 
+class GatewayRequest
+{
+	var $txCustomerID = "";
+
+	var $txAmount = 0;
+
+	var $txCardholderName = "";
+
+	var $txCardNumber = "";
+
+	var $txCardExpiryMonth = "01";
+
+	var $txCardExpiryYear = "00";
+
+	var $txTransactionNumber = "";
+
+	var $txCardholderFirstName = "";
+
+	var $txCardholderLastName = "";
+
+	var $txCardholderEmailAddress = "";
+
+	var $txCardholderAddress = "";
+
+	var $txCardholderPostalCode = "";
+
+	var $txInvoiceReference = "";
+
+	var $txInvoiceDescription = "";
+
+    var $txCVN = "";
+
+	var $txOption1 = "";
+
+	var $txOption2 = "";
+
+	var $txOption3 = "";
+    
+    var $txCustomerBillingCountry = "";
+
+    var $txCustomerIPAddress = "";
+
+   function __construct()
+   {
+      // Empty Constructor
+   }
+
+   function GetTransactionNumber()
+   {
+      return $this->txTransactionNumber;
+   }
+
+   function EwayCustomerID($value) 
+   {
+      $this->txCustomerID=$value;
+   }
+
+   function InvoiceAmount($value)
+   {
+      $this->txAmount=$value;
+   }
+
+   function CardHolderName($value)
+   {
+      $this->txCardholderName=$value;
+   }
+
+   function CardExpiryMonth($value)  
+   {
+      $this->txCardExpiryMonth=$value;
+   }
+
+   function CardExpiryYear($value)
+   {
+      $this->txCardExpiryYear=$value;
+   }
+
+   function TransactionNumber($value)
+   {
+      $this->txTransactionNumber=$value;
+   }
+
+   function PurchaserFirstName($value)
+   {
+      $this->txCardholderFirstName=$value;
+   }
+
+   function PurchaserLastName($value)
+   {
+      $this->txCardholderLastName=$value;
+   }
+
+   function CardNumber($value)
+   {
+      $this->txCardNumber=$value;
+   }
+
+   function PurchaserAddress($value)
+   {
+      $this->txCardholderAddress=$value;
+   }
+
+   function PurchaserPostalCode($value)
+   {
+      $this->txCardholderPostalCode=$value;
+   }
+
+   function PurchaserEmailAddress($value)
+   {
+      $this->txCardholderEmailAddress=$value;
+   }
+
+   function InvoiceReference($value) 
+   {
+      $this->txInvoiceReference=$value; 
+   }
+
+   function InvoiceDescription($value) 
+   {
+      $this->txInvoiceDescription=$value; 
+   }
+
+   function CVN($value) 
+   {
+      $this->txCVN=$value; 
+   }
+
+   function EwayOption1($value) 
+   {
+      $this->txOption1=$value; 
+   }
+
+   function EwayOption2($value) 
+   {
+      $this->txOption2=$value; 
+   }
+
+   function EwayOption3($value) 
+   {
+      $this->txOption3=$value; 
+   }
+
+   function CustomerBillingCountry($value) 
+   {
+       $this->txCustomerBillingCountry=$value; 
+   }
+
+   function CustomerIPAddress($value) 
+   {
+       $this->txCustomerIPAddress=$value; 
+   }
+
+   function ToXml()
+   {
+      // We don't really need the overhead of creating an XML DOM object
+      // to really just concatenate a string together.
+
+      $xml = "<ewaygateway>";
+      $xml .= $this->CreateNode("ewayCustomerID",                 $this->txCustomerID);
+      $xml .= $this->CreateNode("ewayTotalAmount",                $this->txAmount);
+      $xml .= $this->CreateNode("ewayCardHoldersName",            $this->txCardholderName);
+      $xml .= $this->CreateNode("ewayCardNumber",                 $this->txCardNumber);
+      $xml .= $this->CreateNode("ewayCardExpiryMonth",            $this->txCardExpiryMonth);
+      $xml .= $this->CreateNode("ewayCardExpiryYear",             $this->txCardExpiryYear);
+      $xml .= $this->CreateNode("ewayTrxnNumber",                 $this->txTransactionNumber);
+      $xml .= $this->CreateNode("ewayCustomerInvoiceDescription", $this->txInvoiceDescription);
+      $xml .= $this->CreateNode("ewayCustomerFirstName",          $this->txCardholderFirstName);
+      $xml .= $this->CreateNode("ewayCustomerLastName",           $this->txCardholderLastName);
+      $xml .= $this->CreateNode("ewayCustomerEmail",              $this->txCardholderEmailAddress);
+      $xml .= $this->CreateNode("ewayCustomerAddress",            $this->txCardholderAddress);
+      $xml .= $this->CreateNode("ewayCustomerPostcode",           $this->txCardholderPostalCode);
+      $xml .= $this->CreateNode("ewayCustomerInvoiceRef",         $this->txInvoiceReference);
+      $xml .= $this->CreateNode("ewayCVN",                        $this->txCVN);
+      $xml .= $this->CreateNode("ewayOption1",                    $this->txOption1);
+      $xml .= $this->CreateNode("ewayOption2",                    $this->txOption2);
+      $xml .= $this->CreateNode("ewayOption3",                    $this->txOption3);
+      $xml .= $this->CreateNode("ewayCustomerIPAddress",          $this->txCustomerIPAddress);
+      $xml .= $this->CreateNode("ewayCustomerBillingCountry",     $this->txCustomerBillingCountry);
+      $xml .= "</ewaygateway>";
+      
+      return $xml;
+   }
+   
+   
+   /********************************************************
+   * Builds a simple XML Node
+   *
+   * 'NodeName' is the anem of the node being created.
+   * 'NodeValue' is its value
+   *
+   ********************************************************/
+   function CreateNode($NodeName, $NodeValue)
+   {
+    require_once E::path('lib/XML/Util.php');
+
+    $xml = new XML_Util();
+    $node = "<" . $NodeName . ">" . $xml->replaceEntities($NodeValue) . "</" . $NodeName . ">";
+    return $node;
+   }
+   
+} // class GatewayRequest
+
+?>
diff --git a/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php b/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php
new file mode 100644
index 000000000000..100bfb3fdcf4
--- /dev/null
+++ b/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php
@@ -0,0 +1,171 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+*/
+
+/**************************************************************************************************************************
+ * Licensed to CiviCRM under the Academic Free License version 3.0
+ * Written & Contributed by Dolphin Software P/L - March 2008 
+ *
+ * 'eWAY_GatewayResponse.php' - Loosley based on the standard supplied eWay sample code 'GatewayResponse.php'
+ *
+ * The 'simplexml_load_string' has been removed as it was causing major issues
+ * with Drupal V5.7 / CiviCRM 1.9 installtion's Home page. 
+ * Filling the Home page with "Warning: session_start() [function.session-start]: Node no longer exists in ..." messages
+ *
+ * Found web reference indicating 'simplexml_load_string' was a probable cause.
+ * As soon as 'simplexml_load_string' was removed the problem fixed itself.
+ *
+ * Additionally the '$txStatus' var has been set as a string rather than a boolean.
+ * This is because the returned $params['trxn_result_code'] is in fact a string and not a boolean.
+ **************************************************************************************************************************/
+ 
+class GatewayResponse
+{
+	var $txAmount              = 0;
+	var $txTransactionNumber   = "";
+	var $txInvoiceReference    = "";
+	var $txOption1             = "";
+	var $txOption2             = "";
+	var $txOption3             = "";
+	var $txStatus              = "";
+	var $txAuthCode            = "";
+	var $txError               = "";
+    var $txBeagleScore         = "";
+
+	function __construct()
+	{
+	   // Empty Constructor
+    }
+   
+	function ProcessResponse($Xml)
+	{
+#####################################################################################
+#                                                                                   #
+#      $xtr = simplexml_load_string($Xml) or die ("Unable to load XML string!");    #
+#                                                                                   #
+#      $this->txError             = $xtr->ewayTrxnError;                            #
+#      $this->txStatus            = $xtr->ewayTrxnStatus;                           #
+#      $this->txTransactionNumber = $xtr->ewayTrxnNumber;                           #
+#      $this->txOption1           = $xtr->ewayTrxnOption1;                          #
+#      $this->txOption2           = $xtr->ewayTrxnOption2;                          #
+#      $this->txOption3           = $xtr->ewayTrxnOption3;                          #
+#      $this->txAmount            = $xtr->ewayReturnAmount;                         #
+#      $this->txAuthCode          = $xtr->ewayAuthCode;                             #
+#      $this->txInvoiceReference  = $xtr->ewayTrxnReference;                        #
+#                                                                                   #
+#####################################################################################
+
+      $this->txError             = self::GetNodeValue("ewayTrxnError", $Xml);
+      $this->txStatus            = self::GetNodeValue("ewayTrxnStatus", $Xml);
+      $this->txTransactionNumber = self::GetNodeValue("ewayTrxnNumber", $Xml);
+      $this->txOption1           = self::GetNodeValue("ewayTrxnOption1", $Xml);
+      $this->txOption2           = self::GetNodeValue("ewayTrxnOption2", $Xml);
+      $this->txOption3           = self::GetNodeValue("ewayTrxnOption3", $Xml);
+      $amount                    = self::GetNodeValue("ewayReturnAmount", $Xml);
+      $this->txAuthCode          = self::GetNodeValue("ewayAuthCode", $Xml);
+      $this->txInvoiceReference  = self::GetNodeValue("ewayTrxnReference", $Xml);
+      $this->txBeagleScore       = self::GetNodeValue("ewayBeagleScore", $Xml);
+      $this->txAmount = (int) $amount;
+   }
+   
+   
+   /************************************************************************
+   * Simple function to use in place of the 'simplexml_load_string' call.
+   * 
+   * It returns the NodeValue for a given NodeName
+   * or returns and empty string.
+   ************************************************************************/
+   function GetNodeValue($NodeName, &$strXML)
+   {
+      $OpeningNodeName = "<" . $NodeName . ">";
+      $ClosingNodeName = "</" . $NodeName . ">";
+      
+      $pos1 = stripos($strXML, $OpeningNodeName);
+      $pos2 = stripos($strXML, $ClosingNodeName);
+      
+      if ( ($pos1 === false) || ($pos2 === false) )
+         return "";
+         
+      $pos1 += strlen($OpeningNodeName);
+      $len   = $pos2 - $pos1;
+
+      $return = substr($strXML, $pos1, $len);                                       
+      
+      return ($return);
+   }
+   
+
+   function TransactionNumber()
+   {
+      return $this->txTransactionNumber; 
+   }
+
+   function InvoiceReference() 
+   {
+      return $this->txInvoiceReference; 
+   }
+
+   function Option1() 
+   {
+      return $this->txOption1; 
+   }
+
+   function Option2() 
+   {
+      return $this->txOption2; 
+   }
+
+   function Option3() 
+   {
+      return $this->txOption3; 
+   }
+
+   function AuthorisationCode()
+   {
+      return $this->txAuthCode; 
+   }
+
+   function Error()
+   {
+      return $this->txError; 
+   }   
+
+   function Amount() 
+   {
+      return $this->txAmount; 
+   }   
+
+   function Status()
+   {
+      return $this->txStatus;
+   }
+
+   function BeagleScore ()
+   {
+       return $this->txBeagleScore ;
+   }
+}
+
+?>
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 90b0b5a929b2..8349eba43811 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -1065,7 +1065,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_payment_processor_type` WRITE;
 /*!40000 ALTER TABLE `civicrm_payment_processor_type` DISABLE KEYS */;
-INSERT INTO `civicrm_payment_processor_type` (`id`, `name`, `title`, `description`, `is_active`, `is_default`, `user_name_label`, `password_label`, `signature_label`, `subject_label`, `class_name`, `url_site_default`, `url_api_default`, `url_recur_default`, `url_button_default`, `url_site_test_default`, `url_api_test_default`, `url_recur_test_default`, `url_button_test_default`, `billing_mode`, `is_recur`, `payment_type`, `payment_instrument_id`) VALUES (1,'PayPal_Standard','PayPal - Website Payments Standard',NULL,1,0,'Merchant Account Email',NULL,NULL,NULL,'Payment_PayPalImpl','https://www.paypal.com/',NULL,'https://www.paypal.com/',NULL,'https://www.sandbox.paypal.com/',NULL,'https://www.sandbox.paypal.com/',NULL,4,1,1,1),(2,'PayPal','PayPal - Website Payments Pro',NULL,1,0,'User Name','Password','Signature',NULL,'Payment_PayPalImpl','https://www.paypal.com/','https://api-3t.paypal.com/','https://www.paypal.com/','https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif','https://www.sandbox.paypal.com/','https://api-3t.sandbox.paypal.com/','https://www.sandbox.paypal.com/','https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif',3,1,1,1),(3,'PayPal_Express','PayPal - Express',NULL,1,0,'User Name','Password','Signature',NULL,'Payment_PayPalImpl','https://www.paypal.com/','https://api-3t.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif','https://www.sandbox.paypal.com/','https://api-3t.sandbox.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif',2,1,1,1),(4,'AuthNet','Authorize.Net',NULL,1,0,'API Login','Payment Key','MD5 Hash',NULL,'Payment_AuthorizeNet','https://secure2.authorize.net/gateway/transact.dll',NULL,'https://api2.authorize.net/xml/v1/request.api',NULL,'https://test.authorize.net/gateway/transact.dll',NULL,'https://apitest.authorize.net/xml/v1/request.api',NULL,1,1,1,1),(5,'PayJunction','PayJunction',NULL,0,0,'User Name','Password',NULL,NULL,'Payment_PayJunction','https://payjunction.com/quick_link',NULL,NULL,NULL,'https://www.payjunctionlabs.com/quick_link',NULL,NULL,NULL,1,1,1,1),(6,'eWAY','eWAY (Single Currency)',NULL,0,0,'Customer ID',NULL,NULL,NULL,'Payment_eWAY','https://www.eway.com.au/gateway_cvn/xmlpayment.asp',NULL,NULL,NULL,'https://www.eway.com.au/gateway_cvn/xmltest/testpage.asp',NULL,NULL,NULL,1,0,1,1),(7,'Dummy','Dummy Payment Processor',NULL,1,1,'User Name',NULL,NULL,NULL,'Payment_Dummy',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,1),(8,'Elavon','Elavon Payment Processor','Elavon / Nova Virtual Merchant',0,0,'SSL Merchant ID ','SSL User ID','SSL PIN',NULL,'Payment_Elavon','https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,'https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,1,0,1,1),(9,'Realex','Realex Payment',NULL,0,0,'Merchant ID','Password',NULL,'Account','Payment_Realex','https://epage.payandshop.com/epage.cgi',NULL,NULL,NULL,'https://epage.payandshop.com/epage-remote.cgi',NULL,NULL,NULL,1,0,1,1),(10,'PayflowPro','PayflowPro',NULL,0,0,'Vendor ID','Password','Partner (merchant)','User','Payment_PayflowPro','https://Payflowpro.paypal.com',NULL,NULL,NULL,'https://pilot-Payflowpro.paypal.com',NULL,NULL,NULL,1,0,1,1),(11,'FirstData','FirstData (aka linkpoint)','FirstData (aka linkpoint)',0,0,'Store name','certificate path',NULL,NULL,'Payment_FirstData','https://secure.linkpt.net',NULL,NULL,NULL,'https://staging.linkpt.net',NULL,NULL,NULL,1,NULL,1,1);
+INSERT INTO `civicrm_payment_processor_type` (`id`, `name`, `title`, `description`, `is_active`, `is_default`, `user_name_label`, `password_label`, `signature_label`, `subject_label`, `class_name`, `url_site_default`, `url_api_default`, `url_recur_default`, `url_button_default`, `url_site_test_default`, `url_api_test_default`, `url_recur_test_default`, `url_button_test_default`, `billing_mode`, `is_recur`, `payment_type`, `payment_instrument_id`) VALUES (1,'PayPal_Standard','PayPal - Website Payments Standard',NULL,1,0,'Merchant Account Email',NULL,NULL,NULL,'Payment_PayPalImpl','https://www.paypal.com/',NULL,'https://www.paypal.com/',NULL,'https://www.sandbox.paypal.com/',NULL,'https://www.sandbox.paypal.com/',NULL,4,1,1,1),(2,'PayPal','PayPal - Website Payments Pro',NULL,1,0,'User Name','Password','Signature',NULL,'Payment_PayPalImpl','https://www.paypal.com/','https://api-3t.paypal.com/','https://www.paypal.com/','https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif','https://www.sandbox.paypal.com/','https://api-3t.sandbox.paypal.com/','https://www.sandbox.paypal.com/','https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif',3,1,1,1),(3,'PayPal_Express','PayPal - Express',NULL,1,0,'User Name','Password','Signature',NULL,'Payment_PayPalImpl','https://www.paypal.com/','https://api-3t.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif','https://www.sandbox.paypal.com/','https://api-3t.sandbox.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif',2,1,1,1),(4,'AuthNet','Authorize.Net',NULL,1,0,'API Login','Payment Key','MD5 Hash',NULL,'Payment_AuthorizeNet','https://secure2.authorize.net/gateway/transact.dll',NULL,'https://api2.authorize.net/xml/v1/request.api',NULL,'https://test.authorize.net/gateway/transact.dll',NULL,'https://apitest.authorize.net/xml/v1/request.api',NULL,1,1,1,1),(5,'PayJunction','PayJunction',NULL,0,0,'User Name','Password',NULL,NULL,'Payment_PayJunction','https://payjunction.com/quick_link',NULL,NULL,NULL,'https://www.payjunctionlabs.com/quick_link',NULL,NULL,NULL,1,1,1,1),(6,'Dummy','Dummy Payment Processor',NULL,1,1,'User Name',NULL,NULL,NULL,'Payment_Dummy',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,1),(7,'Elavon','Elavon Payment Processor','Elavon / Nova Virtual Merchant',0,0,'SSL Merchant ID ','SSL User ID','SSL PIN',NULL,'Payment_Elavon','https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,'https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,1,0,1,1),(8,'Realex','Realex Payment',NULL,0,0,'Merchant ID','Password',NULL,'Account','Payment_Realex','https://epage.payandshop.com/epage.cgi',NULL,NULL,NULL,'https://epage.payandshop.com/epage-remote.cgi',NULL,NULL,NULL,1,0,1,1),(9,'PayflowPro','PayflowPro',NULL,0,0,'Vendor ID','Password','Partner (merchant)','User','Payment_PayflowPro','https://Payflowpro.paypal.com',NULL,NULL,NULL,'https://pilot-Payflowpro.paypal.com',NULL,NULL,NULL,1,0,1,1),(10,'FirstData','FirstData (aka linkpoint)','FirstData (aka linkpoint)',0,0,'Store name','certificate path',NULL,NULL,'Payment_FirstData','https://secure.linkpt.net',NULL,NULL,NULL,'https://staging.linkpt.net',NULL,NULL,NULL,1,NULL,1,1);
 /*!40000 ALTER TABLE `civicrm_payment_processor_type` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index d9891d3e1c96..ee4fae30c0cb 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1157,7 +1157,6 @@ VALUES
  ('PayPal_Express',     '{ts escape="sql"}PayPal - Express{/ts}',       NULL,1,0,'{ts escape="sql"}User Name{/ts}','{ts escape="sql"}Password{/ts}','{ts escape="sql"}Signature{/ts}',NULL,'Payment_PayPalImpl','https://www.paypal.com/','https://api-3t.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif','https://www.sandbox.paypal.com/','https://api-3t.sandbox.paypal.com/',NULL,'https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif',2, 1),
  ('AuthNet',            '{ts escape="sql"}Authorize.Net{/ts}',          NULL,1,0,'{ts escape="sql"}API Login{/ts}','{ts escape="sql"}Payment Key{/ts}','{ts escape="sql"}MD5 Hash{/ts}',NULL,'Payment_AuthorizeNet','https://secure2.authorize.net/gateway/transact.dll',NULL,'https://api2.authorize.net/xml/v1/request.api',NULL,'https://test.authorize.net/gateway/transact.dll',NULL,'https://apitest.authorize.net/xml/v1/request.api',NULL,1,1),
  ('PayJunction',        '{ts escape="sql"}PayJunction{/ts}',            NULL,0,0,'User Name','Password',NULL,NULL,'Payment_PayJunction','https://payjunction.com/quick_link',NULL,NULL,NULL,'https://www.payjunctionlabs.com/quick_link',NULL,NULL,NULL,1,1),
- ('eWAY',               '{ts escape="sql"}eWAY (Single Currency){/ts}', NULL,0,0,'Customer ID',NULL,NULL,NULL,'Payment_eWAY','https://www.eway.com.au/gateway_cvn/xmlpayment.asp',NULL,NULL,NULL,'https://www.eway.com.au/gateway_cvn/xmltest/testpage.asp',NULL,NULL,NULL,1,0),
  ('Dummy',              '{ts escape="sql"}Dummy Payment Processor{/ts}',NULL,1,1,'{ts escape="sql"}User Name{/ts}',NULL,NULL,NULL,'Payment_Dummy',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1),
  ('Elavon',             '{ts escape="sql"}Elavon Payment Processor{/ts}','{ts escape="sql"}Elavon / Nova Virtual Merchant{/ts}',0,0,'{ts escape="sql"}SSL Merchant ID {/ts}','{ts escape="sql"}SSL User ID{/ts}','{ts escape="sql"}SSL PIN{/ts}',NULL,'Payment_Elavon','https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,'https://www.myvirtualmerchant.com/VirtualMerchant/processxml.do',NULL,NULL,NULL,1,0),
  ('Realex',             '{ts escape="sql"}Realex Payment{/ts}',         NULL,0,0,'Merchant ID', 'Password', NULL, 'Account', 'Payment_Realex', 'https://epage.payandshop.com/epage.cgi', NULL, NULL, NULL, 'https://epage.payandshop.com/epage-remote.cgi', NULL, NULL, NULL, 1, 0),

From 68f481e61c2e0ff9c0b79548e2bebcfc6f5af2cd Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 5 Sep 2020 08:43:32 +1000
Subject: [PATCH 145/834] Change eWAY processor to use guzzle, fix style issues
 and update info.xml and add in test of eWAY single Currency payment processor

Update README
---
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php |    4 +-
 ext/ewaysingle/CRM/Core/Payment/eWAY.php      |   75 +-
 ext/ewaysingle/README.md                      |   28 +-
 ext/ewaysingle/info.xml                       |   14 +-
 ext/ewaysingle/lib/XML/Util.php               | 1532 +++++++++--------
 .../lib/eWAY/eWAY_GatewayRequest.php          |  458 +++--
 .../lib/eWAY/eWAY_GatewayResponse.php         |  321 ++--
 ext/ewaysingle/phpunit.xml.dist               |   18 +
 .../phpunit/CRM/Core/Payment/EwayTest.php     |  212 +++
 ext/ewaysingle/tests/phpunit/bootstrap.php    |   63 +
 10 files changed, 1472 insertions(+), 1253 deletions(-)
 create mode 100644 ext/ewaysingle/phpunit.xml.dist
 create mode 100644 ext/ewaysingle/tests/phpunit/CRM/Core/Payment/EwayTest.php
 create mode 100644 ext/ewaysingle/tests/phpunit/bootstrap.php

diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index b85942cd3fce..efc87e6e14e0 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -71,8 +71,8 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_31_alpha1($rev) {
-   $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
-   $this->addTask('enableeWAYSingleCurrencyExtension', 'enableEwaySingleExtension');
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addTask('enableeWAYSingleCurrencyExtension', 'enableEwaySingleExtension');
   }
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
diff --git a/ext/ewaysingle/CRM/Core/Payment/eWAY.php b/ext/ewaysingle/CRM/Core/Payment/eWAY.php
index 59411cd5d0cf..a50389ffd33b 100644
--- a/ext/ewaysingle/CRM/Core/Payment/eWAY.php
+++ b/ext/ewaysingle/CRM/Core/Payment/eWAY.php
@@ -88,6 +88,11 @@
  */
 class CRM_Core_Payment_eWAY extends CRM_Core_Payment {
 
+  /**
+   * @var GuzzleHttp\Client
+   */
+  protected $guzzleClient;
+
   /**
    * *******************************************************
    * Constructor
@@ -106,6 +111,20 @@ public function __construct($mode, &$paymentProcessor) {
     $this->_paymentProcessor = $paymentProcessor;
   }
 
+  /**
+   * @return \GuzzleHttp\Client
+   */
+  public function getGuzzleClient(): \GuzzleHttp\Client {
+    return $this->guzzleClient ?? new \GuzzleHttp\Client();
+  }
+
+  /**
+   * @param \GuzzleHttp\Client $guzzleClient
+   */
+  public function setGuzzleClient(\GuzzleHttp\Client $guzzleClient) {
+    $this->guzzleClient = $guzzleClient;
+  }
+
   /**
    * Sends request and receive response from eWAY payment process.
    *
@@ -246,50 +265,13 @@ public function doDirectPayment(&$params) {
     //----------------------------------------------------------------------------------------------------
     $requestxml = $eWAYRequest->ToXML();
 
-    $submit = curl_init($gateway_URL);
-
-    if (!$submit) {
-      throw new PaymentProcessorException('Could not initiate connection to payment gateway', 9004);
-    }
-
-    curl_setopt($submit, CURLOPT_POST, TRUE);
-    // return the result on success, FALSE on failure
-    curl_setopt($submit, CURLOPT_RETURNTRANSFER, TRUE);
-    curl_setopt($submit, CURLOPT_POSTFIELDS, $requestxml);
-    curl_setopt($submit, CURLOPT_TIMEOUT, 36000);
-    // if open_basedir or safe_mode are enabled in PHP settings CURLOPT_FOLLOWLOCATION won't work so don't apply it
-    // it's not really required CRM-5841
-    if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) {
-      // ensures any Location headers are followed
-      curl_setopt($submit, CURLOPT_FOLLOWLOCATION, 1);
-    }
-
-    // Send the data out over the wire
-    //--------------------------------
-    $responseData = curl_exec($submit);
-
-    //----------------------------------------------------------------------------------------------------
-    // See if we had a curl error - if so tell 'em and bail out
-    //
-    // NOTE: curl_error does not return a logical value (see its documentation), but
-    //       a string, which is empty when there was no error.
-    //----------------------------------------------------------------------------------------------------
-    if ((curl_errno($submit) > 0) || (strlen(curl_error($submit)) > 0)) {
-      $errorNum = curl_errno($submit);
-      $errorDesc = curl_error($submit);
-
-      // Paranoia - in the unlikley event that 'curl' errno fails
-      if ($errorNum == 0) {
-        $errorNum = 9005;
-      }
-
-      // Paranoia - in the unlikley event that 'curl' error fails
-      if (strlen($errorDesc) == 0) {
-        $errorDesc = 'Connection to eWAY payment gateway failed';
-      }
-
-      throw new PaymentProcessorException($errorDesc, $errorNum);
-    }
+    $responseData = (string) $this->getGuzzleClient()->post($this->_paymentProcessor['url_site'], [
+      'body' => $requestxml,
+      'curl' => [
+        CURLOPT_RETURNTRANSFER => TRUE,
+        CURLOPT_SSL_VERIFYPEER => Civi::settings()->get('verifySSL'),
+      ],
+    ])->getBody();
 
     //----------------------------------------------------------------------------------------------------
     // If null data returned - tell 'em and bail out
@@ -308,11 +290,6 @@ public function doDirectPayment(&$params) {
       throw new PaymentProcessorException('Error: No data returned from payment gateway.', 9007);
     }
 
-    //----------------------------------------------------------------------------------------------------
-    // Success so far - close the curl and check the data
-    //----------------------------------------------------------------------------------------------------
-    curl_close($submit);
-
     //----------------------------------------------------------------------------------------------------
     // Payment successfully sent to gateway - process the response now
     //----------------------------------------------------------------------------------------------------
diff --git a/ext/ewaysingle/README.md b/ext/ewaysingle/README.md
index 52c94dafc116..81ddd1e7a6ba 100644
--- a/ext/ewaysingle/README.md
+++ b/ext/ewaysingle/README.md
@@ -2,43 +2,31 @@
 
 ![Screenshot](/images/screenshot.png)
 
-(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+This extension is aimed at containing the original Core eWAY (Single Currency) Payment Processor Type that is legacy. See known issues below
 
 The extension is licensed under [AGPL-3.0](LICENSE.txt).
 
 ## Requirements
 
-* PHP v7.0+
-* CiviCRM (*FIXME: Version number*)
+* PHP v7.1+
+* CiviCRM 5.31
 
 ## Installation (Web UI)
 
-This extension has not yet been published for installation via the web UI.
+Navigate to the Extensions Page and install the extension.
 
-## Installation (CLI, Zip)
+## Installation (CLI)
 
-Sysadmins and developers may download the `.zip` file for this extension and
-install it with the command-line tool [cv](https://github.com/civicrm/cv).
+To enable this extension in the CLI do the following
 
 ```bash
-cd <extension-dir>
-cv dl ewaysingle@https://github.com/FIXME/ewaysingle/archive/master.zip
-```
-
-## Installation (CLI, Git)
-
-Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
-install it with the command-line tool [cv](https://github.com/civicrm/cv).
-
-```bash
-git clone https://github.com/FIXME/ewaysingle.git
 cv en ewaysingle
 ```
 
 ## Usage
 
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+The eWAY (Single Currency) Payment Processor Type will show up as one of the options when your adding in a PaymentProcessor.
 
 ## Known Issues
 
-(* FIXME *)
+This Payment Processor does not do any kind of recurring payments at all for that you would need another extension e.g. [Agileware Eway Recurring](https://github.com/agileware/au.com.agileware.ewayrecurring)
diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml
index bd99f5c4bd29..d69c7cd3627d 100644
--- a/ext/ewaysingle/info.xml
+++ b/ext/ewaysingle/info.xml
@@ -9,18 +9,18 @@
     <email>seamuslee001@gmail.com</email>
   </maintainer>
   <urls>
-    <url desc="Main Extension Page">http://FIXME</url>
-    <url desc="Documentation">http://FIXME</url>
-    <url desc="Support">http://FIXME</url>
+    <url desc="Main Extension Page">https://github.com/civicrm/civicrm-core/blob/master/ext/ewayrecurring</url>
+    <url desc="Documentation">https://github.com/civicrm/civicrm-core/blob/master/ext/ewayrecurring</url>
+    <url desc="Support">https://github.com/civicrm/civicrm-core/blob/master/ext/ewayrecurring</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2020-09-04</releaseDate>
+  <releaseDate>2020-10-07</releaseDate>
   <version>1.0</version>
-  <develStage>alpha</develStage>
+  <develStage>stable</develStage>
   <compatibility>
-    <ver>5.0</ver>
+    <ver>5.31</ver>
   </compatibility>
-  <comments>This is a new, undeveloped module</comments>
+  <comments>This is an extension to contain the eWAY Single Currency Payment Processor</comments>
   <classloader>
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>
diff --git a/ext/ewaysingle/lib/XML/Util.php b/ext/ewaysingle/lib/XML/Util.php
index f5927b16cfd4..cbef96ac831c 100644
--- a/ext/ewaysingle/lib/XML/Util.php
+++ b/ext/ewaysingle/lib/XML/Util.php
@@ -6,7 +6,7 @@
  * XML_Util
  *
  * XML Utilities package
- * 
+ *
  * PHP versions 4 and 5
  *
  * LICENSE:
@@ -113,7 +113,7 @@
 /**
  * utility class for working with XML documents
  *
-
+ *
  * @category  XML
  * @package   XML_Util
  * @author    Stephan Schmidt <schst@php.net>
@@ -122,790 +122,800 @@
  * @version   Release: 1.2.1
  * @link      http://pear.php.net/package/XML_Util
  */
-class XML_Util
-{
-    /**
-     * return API version
-     *
-     * @return string $version API version
-     * @access public
-     * @static
-     */
-    function apiVersion()
-    {
-        return '1.1';
-    }
-
-    /**
-     * replace XML entities
-     *
-     * With the optional second parameter, you may select, which
-     * entities should be replaced.
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // replace XML entites:
-     * $string = XML_Util::replaceEntities('This string contains < & >.');
-     * </code>
-     *
-     * With the optional third parameter, you may pass the character encoding
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // replace XML entites in UTF-8:
-     * $string = XML_Util::replaceEntities(
-     *     'This string contains < & > as well as ä, ö, ß, à and ê',
-     *     XML_UTIL_ENTITIES_HTML,
-     *     'UTF-8'
-     * );
-     * </code>
-     *
-     * @param string $string          string where XML special chars 
-     *                                should be replaced
-     * @param int    $replaceEntities setting for entities in attribute values 
-     *                                (one of XML_UTIL_ENTITIES_XML, 
-     *                                XML_UTIL_ENTITIES_XML_REQUIRED, 
-     *                                XML_UTIL_ENTITIES_HTML)
-     * @param string $encoding        encoding value (if any)...
-     *                                must be a valid encoding as determined
-     *                                by the htmlentities() function
-     *
-     * @return string string with replaced chars
-     * @access public
-     * @static
-     * @see reverseEntities()
-     */
-    function replaceEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
-        $encoding = 'ISO-8859-1')
-    {
-        switch ($replaceEntities) {
-        case XML_UTIL_ENTITIES_XML:
-            return strtr($string, array(
-                '&'  => '&amp;',
-                '>'  => '&gt;',
-                '<'  => '&lt;',
-                '"'  => '&quot;',
-                '\'' => '&apos;' ));
-            break;
-        case XML_UTIL_ENTITIES_XML_REQUIRED:
-            return strtr($string, array(
-                '&' => '&amp;',
-                '<' => '&lt;',
-                '"' => '&quot;' ));
-            break;
-        case XML_UTIL_ENTITIES_HTML:
-            return htmlentities($string, ENT_COMPAT, $encoding);
-            break;
-        }
-        return $string;
-    }
-
-    /**
-     * reverse XML entities
-     *
-     * With the optional second parameter, you may select, which
-     * entities should be reversed.
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // reverse XML entites:
-     * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
-     * </code>
-     *
-     * With the optional third parameter, you may pass the character encoding
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // reverse XML entites in UTF-8:
-     * $string = XML_Util::reverseEntities(
-     *     'This string contains &lt; &amp; &gt; as well as'
-     *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
-     *     XML_UTIL_ENTITIES_HTML,
-     *     'UTF-8'
-     * );
-     * </code>
-     *
-     * @param string $string          string where XML special chars 
-     *                                should be replaced
-     * @param int    $replaceEntities setting for entities in attribute values 
-     *                                (one of XML_UTIL_ENTITIES_XML, 
-     *                                XML_UTIL_ENTITIES_XML_REQUIRED, 
-     *                                XML_UTIL_ENTITIES_HTML)
-     * @param string $encoding        encoding value (if any)...
-     *                                must be a valid encoding as determined
-     *                                by the html_entity_decode() function
-     *
-     * @return string string with replaced chars
-     * @access public
-     * @static
-     * @see replaceEntities()
-     */
-    function reverseEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
-        $encoding = 'ISO-8859-1')
-    {
-        switch ($replaceEntities) {
-        case XML_UTIL_ENTITIES_XML:
-            return strtr($string, array(
-                '&amp;'  => '&',
-                '&gt;'   => '>',
-                '&lt;'   => '<',
-                '&quot;' => '"',
-                '&apos;' => '\'' ));
-            break;
-        case XML_UTIL_ENTITIES_XML_REQUIRED:
-            return strtr($string, array(
-                '&amp;'  => '&',
-                '&lt;'   => '<',
-                '&quot;' => '"' ));
-            break;
-        case XML_UTIL_ENTITIES_HTML:
-            return html_entity_decode($string, ENT_COMPAT, $encoding);
-            break;
-        }
-        return $string;
-    }
-
-    /**
-     * build an xml declaration
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // get an XML declaration:
-     * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
-     * </code>
-     *
-     * @param string $version    xml version
-     * @param string $encoding   character encoding
-     * @param bool   $standalone document is standalone (or not)
-     *
-     * @return string xml declaration
-     * @access public
-     * @static
-     * @uses attributesToString() to serialize the attributes of the XML declaration
-     */
-    function getXMLDeclaration($version = '1.0', $encoding = null, 
-        $standalone = null)
-    {
-        $attributes = array(
-            'version' => $version,
-        );
-        // add encoding
-        if ($encoding !== null) {
-            $attributes['encoding'] = $encoding;
-        }
-        // add standalone, if specified
-        if ($standalone !== null) {
-            $attributes['standalone'] = $standalone ? 'yes' : 'no';
-        }
-
-        return sprintf('<?xml%s?>', 
-            XML_Util::attributesToString($attributes, false));
-    }
-
-    /**
-     * build a document type declaration
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // get a doctype declaration:
-     * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
-     * </code>
-     *
-     * @param string $root        name of the root tag
-     * @param string $uri         uri of the doctype definition 
-     *                            (or array with uri and public id)
-     * @param string $internalDtd internal dtd entries
-     *
-     * @return string doctype declaration
-     * @access public
-     * @static
-     * @since 0.2
-     */
-    function getDocTypeDeclaration($root, $uri = null, $internalDtd = null)
-    {
-        if (is_array($uri)) {
-            $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
-        } elseif (!empty($uri)) {
-            $ref = sprintf(' SYSTEM "%s"', $uri);
-        } else {
-            $ref = '';
-        }
+class XML_Util {
+
+  /**
+   * return API version
+   *
+   * @return string $version API version
+   * @access public
+   * @static
+   */
+  public function apiVersion() {
+    return '1.1';
+  }
+
+  /**
+   * replace XML entities
+   *
+   * With the optional second parameter, you may select, which
+   * entities should be replaced.
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // replace XML entites:
+   * $string = XML_Util::replaceEntities('This string contains < & >.');
+   * </code>
+   *
+   * With the optional third parameter, you may pass the character encoding
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // replace XML entites in UTF-8:
+   * $string = XML_Util::replaceEntities(
+   *     'This string contains < & > as well as ä, ö, ß, à and ê',
+   *     XML_UTIL_ENTITIES_HTML,
+   *     'UTF-8'
+   * );
+   * </code>
+   *
+   * @param string $string          string where XML special chars
+   *                                should be replaced
+   * @param int $replaceEntities
+   *                                (one of XML_UTIL_ENTITIES_XML,
+   *                             XML_UTIL_ENTITIES_XML_REQUIRED,
+   *                             XML_UTIL_ENTITIES_HTML)
+   * @param string $encoding        encoding value (if any)...
+   *                                must be a valid encoding as determined
+   *                                by the htmlentities() function
+   *
+   * @return string string with replaced chars
+   * @access public
+   * @static
+   * @see reverseEntities()
+   */
+  public function replaceEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
+        $encoding = 'ISO-8859-1') {
+    switch ($replaceEntities) {
+      case XML_UTIL_ENTITIES_XML:
+        return strtr($string, array(
+          '&'  => '&amp;',
+          '>'  => '&gt;',
+          '<'  => '&lt;',
+          '"'  => '&quot;',
+          '\'' => '&apos;',
+        ));
+
+      break;
+      case XML_UTIL_ENTITIES_XML_REQUIRED:
+        return strtr($string, array(
+          '&' => '&amp;',
+          '<' => '&lt;',
+          '"' => '&quot;',
+        ));
+
+      break;
+      case XML_UTIL_ENTITIES_HTML:
+        return htmlentities($string, ENT_COMPAT, $encoding);
+
+      break;
+    }
+    return $string;
+  }
+
+  /**
+   * reverse XML entities
+   *
+   * With the optional second parameter, you may select, which
+   * entities should be reversed.
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // reverse XML entites:
+   * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
+   * </code>
+   *
+   * With the optional third parameter, you may pass the character encoding
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // reverse XML entites in UTF-8:
+   * $string = XML_Util::reverseEntities(
+   *     'This string contains &lt; &amp; &gt; as well as'
+   *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
+   *     XML_UTIL_ENTITIES_HTML,
+   *     'UTF-8'
+   * );
+   * </code>
+   *
+   * @param string $string          string where XML special chars
+   *                                should be replaced
+   * @param int $replaceEntities
+   *                                (one of XML_UTIL_ENTITIES_XML,
+   *                             XML_UTIL_ENTITIES_XML_REQUIRED,
+   *                             XML_UTIL_ENTITIES_HTML)
+   * @param string $encoding        encoding value (if any)...
+   *                                must be a valid encoding as determined
+   *                                by the html_entity_decode() function
+   *
+   * @return string string with replaced chars
+   * @access public
+   * @static
+   * @see replaceEntities()
+   */
+  public function reverseEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
+        $encoding = 'ISO-8859-1') {
+    switch ($replaceEntities) {
+      case XML_UTIL_ENTITIES_XML:
+        return strtr($string, array(
+          '&amp;'  => '&',
+          '&gt;'   => '>',
+          '&lt;'   => '<',
+          '&quot;' => '"',
+          '&apos;' => '\'',
+        ));
+
+      break;
+      case XML_UTIL_ENTITIES_XML_REQUIRED:
+        return strtr($string, array(
+          '&amp;'  => '&',
+          '&lt;'   => '<',
+          '&quot;' => '"',
+        ));
+
+      break;
+      case XML_UTIL_ENTITIES_HTML:
+        return html_entity_decode($string, ENT_COMPAT, $encoding);
+
+      break;
+    }
+    return $string;
+  }
+
+  /**
+   * build an xml declaration
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // get an XML declaration:
+   * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
+   * </code>
+   *
+   * @param string $version    xml version
+   * @param string $encoding   character encoding
+   * @param bool $standalone
+   *
+   * @return string xml declaration
+   * @access public
+   * @static
+   * @uses attributesToString() to serialize the attributes of the XML declaration
+   */
+  public function getXMLDeclaration($version = '1.0', $encoding = NULL,
+        $standalone = NULL) {
+    $attributes = array(
+      'version' => $version,
+    );
+    // add encoding
+    if ($encoding !== NULL) {
+      $attributes['encoding'] = $encoding;
+    }
+    // add standalone, if specified
+    if ($standalone !== NULL) {
+      $attributes['standalone'] = $standalone ? 'yes' : 'no';
+    }
 
-        if (empty($internalDtd)) {
-            return sprintf('<!DOCTYPE %s%s>', $root, $ref);
-        } else {
-            return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
-        }
+    return sprintf('<?xml%s?>',
+        XML_Util::attributesToString($attributes, FALSE));
+  }
+
+  /**
+   * build a document type declaration
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // get a doctype declaration:
+   * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
+   * </code>
+   *
+   * @param string $root        name of the root tag
+   * @param string $uri         uri of the doctype definition
+   *                            (or array with uri and public id)
+   * @param string $internalDtd internal dtd entries
+   *
+   * @return string doctype declaration
+   * @access public
+   * @static
+   * @since 0.2
+   */
+  public function getDocTypeDeclaration($root, $uri = NULL, $internalDtd = NULL) {
+    if (is_array($uri)) {
+      $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
+    }
+    elseif (!empty($uri)) {
+      $ref = sprintf(' SYSTEM "%s"', $uri);
+    }
+    else {
+      $ref = '';
     }
 
-    /**
-     * create string representation of an attribute list
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // build an attribute string
-     * $att = array(
-     *              'foo'   =>  'bar',
-     *              'argh'  =>  'tomato'
-     *            );
-     *
-     * $attList = XML_Util::attributesToString($att);
-     * </code>
-     *
-     * @param array      $attributes attribute array
-     * @param bool|array $sort       sort attribute list alphabetically, 
-     *                               may also be an assoc array containing 
-     *                               the keys 'sort', 'multiline', 'indent', 
-     *                               'linebreak' and 'entities'
-     * @param bool       $multiline  use linebreaks, if more than 
-     *                               one attribute is given
-     * @param string     $indent     string used for indentation of 
-     *                               multiline attributes
-     * @param string     $linebreak  string used for linebreaks of 
-     *                               multiline attributes
-     * @param int        $entities   setting for entities in attribute values 
-     *                               (one of XML_UTIL_ENTITIES_NONE, 
-     *                               XML_UTIL_ENTITIES_XML, 
-     *                               XML_UTIL_ENTITIES_XML_REQUIRED, 
-     *                               XML_UTIL_ENTITIES_HTML)
-     *
-     * @return string string representation of the attributes
-     * @access public
-     * @static
-     * @uses replaceEntities() to replace XML entities in attribute values
-     * @todo allow sort also to be an options array
+    if (empty($internalDtd)) {
+      return sprintf('<!DOCTYPE %s%s>', $root, $ref);
+    }
+    else {
+      return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
+    }
+  }
+
+  /**
+   * create string representation of an attribute list
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // build an attribute string
+   * $att = array(
+   *              'foo'   =>  'bar',
+   *              'argh'  =>  'tomato'
+   *            );
+   *
+   * $attList = XML_Util::attributesToString($att);
+   * </code>
+   *
+   * @param array $attributes
+   * @param bool|array $sort       sort attribute list alphabetically,
+   *                               may also be an assoc array containing
+   *                               the keys 'sort', 'multiline', 'indent',
+   *                               'linebreak' and 'entities'
+   * @param bool $multiline
+   *                               one attribute is given
+   * @param string $indent
+   *                               multiline attributes
+   * @param string $linebreak
+   *                               multiline attributes
+   * @param int $entities
+   *                               (one of XML_UTIL_ENTITIES_NONE,
+   *                        XML_UTIL_ENTITIES_XML,
+   *                        XML_UTIL_ENTITIES_XML_REQUIRED,
+   *                        XML_UTIL_ENTITIES_HTML)
+   *
+   * @return string string representation of the attributes
+   * @access public
+   * @static
+   * @uses replaceEntities() to replace XML entities in attribute values
+   * @todo allow sort also to be an options array
+   */
+  public function attributesToString($attributes, $sort = TRUE, $multiline = FALSE,
+        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML) {
+    /*
+     * second parameter may be an array
      */
-    function attributesToString($attributes, $sort = true, $multiline = false, 
-        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML)
-    {
-        /*
-         * second parameter may be an array
-         */
-        if (is_array($sort)) {
-            if (isset($sort['multiline'])) {
-                $multiline = $sort['multiline'];
-            }
-            if (isset($sort['indent'])) {
-                $indent = $sort['indent'];
-            }
-            if (isset($sort['linebreak'])) {
-                $multiline = $sort['linebreak'];
-            }
-            if (isset($sort['entities'])) {
-                $entities = $sort['entities'];
-            }
-            if (isset($sort['sort'])) {
-                $sort = $sort['sort'];
-            } else {
-                $sort = true;
-            }
-        }
-        $string = '';
-        if (is_array($attributes) && !empty($attributes)) {
-            if ($sort) {
-                ksort($attributes);
-            }
-            if ( !$multiline || count($attributes) == 1) {
-                foreach ($attributes as $key => $value) {
-                    if ($entities != XML_UTIL_ENTITIES_NONE) {
-                        if ($entities === XML_UTIL_CDATA_SECTION) {
-                            $entities = XML_UTIL_ENTITIES_XML;
-                        }
-                        $value = XML_Util::replaceEntities($value, $entities);
-                    }
-                    $string .= ' ' . $key . '="' . $value . '"';
-                }
-            } else {
-                $first = true;
-                foreach ($attributes as $key => $value) {
-                    if ($entities != XML_UTIL_ENTITIES_NONE) {
-                        $value = XML_Util::replaceEntities($value, $entities);
-                    }
-                    if ($first) {
-                        $string .= ' ' . $key . '="' . $value . '"';
-                        $first   = false;
-                    } else {
-                        $string .= $linebreak . $indent . $key . '="' . $value . '"';
-                    }
-                }
+    if (is_array($sort)) {
+      if (isset($sort['multiline'])) {
+        $multiline = $sort['multiline'];
+      }
+      if (isset($sort['indent'])) {
+        $indent = $sort['indent'];
+      }
+      if (isset($sort['linebreak'])) {
+        $multiline = $sort['linebreak'];
+      }
+      if (isset($sort['entities'])) {
+        $entities = $sort['entities'];
+      }
+      if (isset($sort['sort'])) {
+        $sort = $sort['sort'];
+      }
+      else {
+        $sort = TRUE;
+      }
+    }
+    $string = '';
+    if (is_array($attributes) && !empty($attributes)) {
+      if ($sort) {
+        ksort($attributes);
+      }
+      if (!$multiline || count($attributes) == 1) {
+        foreach ($attributes as $key => $value) {
+          if ($entities != XML_UTIL_ENTITIES_NONE) {
+            if ($entities === XML_UTIL_CDATA_SECTION) {
+              $entities = XML_UTIL_ENTITIES_XML;
             }
+            $value = XML_Util::replaceEntities($value, $entities);
+          }
+          $string .= ' ' . $key . '="' . $value . '"';
         }
-        return $string;
-    }
-
-    /**
-     * Collapses empty tags.
-     *
-     * @param string $xml  XML
-     * @param int    $mode Whether to collapse all empty tags (XML_UTIL_COLLAPSE_ALL)
-     *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
-     *
-     * @return string XML
-     * @access public
-     * @static
-     * @todo PEAR CS - unable to avoid "space after open parens" error
-     *       in the IF branch
-     */
-    function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL) 
-    {
-        if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
-            return preg_replace(
-                '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
-                . 'param)([^>]*)><\/\\1>/s',
-                '<\\1\\2 />',
-                $xml);
-        } else {
-            return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
+      }
+      else {
+        $first = TRUE;
+        foreach ($attributes as $key => $value) {
+          if ($entities != XML_UTIL_ENTITIES_NONE) {
+            $value = XML_Util::replaceEntities($value, $entities);
+          }
+          if ($first) {
+            $string .= ' ' . $key . '="' . $value . '"';
+            $first   = FALSE;
+          }
+          else {
+            $string .= $linebreak . $indent . $key . '="' . $value . '"';
+          }
         }
+      }
+    }
+    return $string;
+  }
+
+  /**
+   * Collapses empty tags.
+   *
+   * @param string $xml  XML
+   * @param int $mode
+   *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
+   *
+   * @return string XML
+   * @access public
+   * @static
+   * @todo PEAR CS - unable to avoid "space after open parens" error
+   *       in the IF branch
+   */
+  public function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL) {
+    if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
+      return preg_replace(
+        '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
+        . 'param)([^>]*)><\/\\1>/s',
+        '<\\1\\2 />',
+        $xml);
+    }
+    else {
+      return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
+    }
+  }
+
+  /**
+   * create a tag
+   *
+   * This method will call XML_Util::createTagFromArray(), which
+   * is more flexible.
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // create an XML tag:
+   * $tag = XML_Util::createTag('myNs:myTag',
+   *     array('foo' => 'bar'),
+   *     'This is inside the tag',
+   *     'http://www.w3c.org/myNs#');
+   * </code>
+   *
+   * @param string $qname           qualified tagname (including namespace)
+   * @param array $attributes
+   * @param mixed $content
+   * @param string $namespaceUri    URI of the namespace
+   * @param int $replaceEntities
+   *                                content, embedd it in a CData section
+   *                             or none of both
+   * @param bool $multiline
+   *                                each attribute gets written to a single line
+   * @param string $indent          string used to indent attributes
+   *                                (_auto indents attributes so they start
+   *                                at the same column)
+   * @param string $linebreak       string used for linebreaks
+   * @param bool $sortAttributes
+   *
+   * @return string XML tag
+   * @access public
+   * @static
+   * @see createTagFromArray()
+   * @uses createTagFromArray() to create the tag
+   */
+  public function createTag($qname, $attributes = array(), $content = NULL,
+        $namespaceUri = NULL, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = FALSE, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = TRUE) {
+    $tag = array(
+      'qname'      => $qname,
+      'attributes' => $attributes,
+    );
+
+    // add tag content
+    if ($content !== NULL) {
+      $tag['content'] = $content;
     }
 
-    /**
-     * create a tag
-     *
-     * This method will call XML_Util::createTagFromArray(), which
-     * is more flexible.
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML tag:
-     * $tag = XML_Util::createTag('myNs:myTag', 
-     *     array('foo' => 'bar'), 
-     *     'This is inside the tag', 
-     *     'http://www.w3c.org/myNs#');
-     * </code>
-     *
-     * @param string $qname           qualified tagname (including namespace)
-     * @param array  $attributes      array containg attributes
-     * @param mixed  $content         the content
-     * @param string $namespaceUri    URI of the namespace
-     * @param int    $replaceEntities whether to replace XML special chars in 
-     *                                content, embedd it in a CData section 
-     *                                or none of both
-     * @param bool   $multiline       whether to create a multiline tag where 
-     *                                each attribute gets written to a single line
-     * @param string $indent          string used to indent attributes 
-     *                                (_auto indents attributes so they start 
-     *                                at the same column)
-     * @param string $linebreak       string used for linebreaks
-     * @param bool   $sortAttributes  Whether to sort the attributes or not
-     *
-     * @return string XML tag
-     * @access public
-     * @static
-     * @see createTagFromArray()
-     * @uses createTagFromArray() to create the tag
-     */
-    function createTag($qname, $attributes = array(), $content = null, 
-        $namespaceUri = null, $replaceEntities = XML_UTIL_REPLACE_ENTITIES, 
-        $multiline = false, $indent = '_auto', $linebreak = "\n", 
-        $sortAttributes = true)
-    {
-        $tag = array(
-            'qname'      => $qname,
-            'attributes' => $attributes
-        );
-
-        // add tag content
-        if ($content !== null) {
-            $tag['content'] = $content;
-        }
-
-        // add namespace Uri
-        if ($namespaceUri !== null) {
-            $tag['namespaceUri'] = $namespaceUri;
-        }
+    // add namespace Uri
+    if ($namespaceUri !== NULL) {
+      $tag['namespaceUri'] = $namespaceUri;
+    }
 
-        return XML_Util::createTagFromArray($tag, $replaceEntities, $multiline, 
-            $indent, $linebreak, $sortAttributes);
-    }
-
-    /**
-     * create a tag from an array
-     * this method awaits an array in the following format
-     * <pre>
-     * array(
-     *     // qualified name of the tag
-     *     'qname' => $qname        
-     *
-     *     // namespace prefix (optional, if qname is specified or no namespace)
-     *     'namespace' => $namespace    
-     *
-     *     // local part of the tagname (optional, if qname is specified)
-     *     'localpart' => $localpart,   
-     *
-     *     // array containing all attributes (optional)
-     *     'attributes' => array(),      
-     *
-     *     // tag content (optional)
-     *     'content' => $content,     
-     *
-     *     // namespaceUri for the given namespace (optional)
-     *     'namespaceUri' => $namespaceUri 
-     * )
-     * </pre>
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * $tag = array(
-     *     'qname'        => 'foo:bar',
-     *     'namespaceUri' => 'http://foo.com',
-     *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
-     *     'content'      => 'I\'m inside the tag',
-     * );
-     * // creating a tag with qualified name and namespaceUri
-     * $string = XML_Util::createTagFromArray($tag);
-     * </code>
-     *
-     * @param array  $tag             tag definition
-     * @param int    $replaceEntities whether to replace XML special chars in 
-     *                                content, embedd it in a CData section 
-     *                                or none of both
-     * @param bool   $multiline       whether to create a multiline tag where each 
-     *                                attribute gets written to a single line
-     * @param string $indent          string used to indent attributes 
-     *                                (_auto indents attributes so they start 
-     *                                at the same column)
-     * @param string $linebreak       string used for linebreaks
-     * @param bool   $sortAttributes  Whether to sort the attributes or not
-     *
-     * @return string XML tag
-     * @access public
-     * @static
-     * @see createTag()
-     * @uses attributesToString() to serialize the attributes of the tag
-     * @uses splitQualifiedName() to get local part and namespace of a qualified name
-     * @uses createCDataSection()
-     * @uses raiseError()
-     */
-    function createTagFromArray($tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
-        $multiline = false, $indent = '_auto', $linebreak = "\n", 
-        $sortAttributes = true)
-    {
-        if (isset($tag['content']) && !is_scalar($tag['content'])) {
-            return XML_Util::raiseError('Supplied non-scalar value as tag content',
-            XML_UTIL_ERROR_NON_SCALAR_CONTENT);
-        }
+    return XML_Util::createTagFromArray($tag, $replaceEntities, $multiline,
+        $indent, $linebreak, $sortAttributes);
+  }
+
+  /**
+   * create a tag from an array
+   * this method awaits an array in the following format
+   * <pre>
+   * array(
+   *     // qualified name of the tag
+   *     'qname' => $qname
+   *
+   *     // namespace prefix (optional, if qname is specified or no namespace)
+   *     'namespace' => $namespace
+   *
+   *     // local part of the tagname (optional, if qname is specified)
+   *     'localpart' => $localpart,
+   *
+   *     // array containing all attributes (optional)
+   *     'attributes' => array(),
+   *
+   *     // tag content (optional)
+   *     'content' => $content,
+   *
+   *     // namespaceUri for the given namespace (optional)
+   *     'namespaceUri' => $namespaceUri
+   * )
+   * </pre>
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * $tag = array(
+   *     'qname'        => 'foo:bar',
+   *     'namespaceUri' => 'http://foo.com',
+   *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
+   *     'content'      => 'I\'m inside the tag',
+   * );
+   * // creating a tag with qualified name and namespaceUri
+   * $string = XML_Util::createTagFromArray($tag);
+   * </code>
+   *
+   * @param array $tag
+   * @param int $replaceEntities
+   *                                content, embedd it in a CData section
+   *                             or none of both
+   * @param bool $multiline
+   *                                attribute gets written to a single line
+   * @param string $indent          string used to indent attributes
+   *                                (_auto indents attributes so they start
+   *                                at the same column)
+   * @param string $linebreak       string used for linebreaks
+   * @param bool $sortAttributes
+   *
+   * @return string XML tag
+   * @access public
+   * @static
+   * @see createTag()
+   * @uses attributesToString() to serialize the attributes of the tag
+   * @uses splitQualifiedName() to get local part and namespace of a qualified name
+   * @uses createCDataSection()
+   * @uses raiseError()
+   */
+  public function createTagFromArray($tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = FALSE, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = TRUE) {
+    if (isset($tag['content']) && !is_scalar($tag['content'])) {
+      return XML_Util::raiseError('Supplied non-scalar value as tag content',
+      XML_UTIL_ERROR_NON_SCALAR_CONTENT);
+    }
 
-        if (!isset($tag['qname']) && !isset($tag['localPart'])) {
-            return XML_Util::raiseError('You must either supply a qualified name '
-                . '(qname) or local tag name (localPart).', 
-                XML_UTIL_ERROR_NO_TAG_NAME);
-        }
+    if (!isset($tag['qname']) && !isset($tag['localPart'])) {
+      return XML_Util::raiseError('You must either supply a qualified name '
+        . '(qname) or local tag name (localPart).',
+        XML_UTIL_ERROR_NO_TAG_NAME);
+    }
 
-        // if no attributes hav been set, use empty attributes
-        if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
-            $tag['attributes'] = array();
-        }
+    // if no attributes hav been set, use empty attributes
+    if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
+      $tag['attributes'] = array();
+    }
 
-        if (isset($tag['namespaces'])) {
-            foreach ($tag['namespaces'] as $ns => $uri) {
-                $tag['attributes']['xmlns:' . $ns] = $uri;
-            }
-        }
+    if (isset($tag['namespaces'])) {
+      foreach ($tag['namespaces'] as $ns => $uri) {
+        $tag['attributes']['xmlns:' . $ns] = $uri;
+      }
+    }
 
-        if (!isset($tag['qname'])) {
-            // qualified name is not given
+    if (!isset($tag['qname'])) {
+      // qualified name is not given
 
-            // check for namespace
-            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
-                $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
-            } else {
-                $tag['qname'] = $tag['localPart'];
-            }
-        } elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
-            // namespace URI is set, but no namespace
+      // check for namespace
+      if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+        $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
+      }
+      else {
+        $tag['qname'] = $tag['localPart'];
+      }
+    }
+    elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
+      // namespace URI is set, but no namespace
 
-            $parts = XML_Util::splitQualifiedName($tag['qname']);
+      $parts = XML_Util::splitQualifiedName($tag['qname']);
 
-            $tag['localPart'] = $parts['localPart'];
-            if (isset($parts['namespace'])) {
-                $tag['namespace'] = $parts['namespace'];
-            }
-        }
+      $tag['localPart'] = $parts['localPart'];
+      if (isset($parts['namespace'])) {
+        $tag['namespace'] = $parts['namespace'];
+      }
+    }
 
-        if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
-            // is a namespace given
-            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
-                $tag['attributes']['xmlns:' . $tag['namespace']] =
+    if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
+      // is a namespace given
+      if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+        $tag['attributes']['xmlns:' . $tag['namespace']] =
                     $tag['namespaceUri'];
-            } else {
-                // define this Uri as the default namespace
-                $tag['attributes']['xmlns'] = $tag['namespaceUri'];
-            }
-        }
+      }
+      else {
+        // define this Uri as the default namespace
+        $tag['attributes']['xmlns'] = $tag['namespaceUri'];
+      }
+    }
 
-        // check for multiline attributes
-        if ($multiline === true) {
-            if ($indent === '_auto') {
-                $indent = str_repeat(' ', (strlen($tag['qname'])+2));
-            }
-        }
+    // check for multiline attributes
+    if ($multiline === TRUE) {
+      if ($indent === '_auto') {
+        $indent = str_repeat(' ', (strlen($tag['qname']) + 2));
+      }
+    }
 
-        // create attribute list
-        $attList = XML_Util::attributesToString($tag['attributes'], 
-            $sortAttributes, $multiline, $indent, $linebreak, $replaceEntities);
-        if (!isset($tag['content']) || (string)$tag['content'] == '') {
-            $tag = sprintf('<%s%s />', $tag['qname'], $attList);
-        } else {
-            switch ($replaceEntities) {
-            case XML_UTIL_ENTITIES_NONE:
-                break;
-            case XML_UTIL_CDATA_SECTION:
-                $tag['content'] = XML_Util::createCDataSection($tag['content']);
-                break;
-            default:
-                $tag['content'] = XML_Util::replaceEntities($tag['content'], 
-                    $replaceEntities);
-                break;
-            }
-            $tag = sprintf('<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
-                $tag['qname']);
-        }
-        return $tag;
-    }
-
-    /**
-     * create a start element
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML start element:
-     * $tag = XML_Util::createStartElement('myNs:myTag', 
-     *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
-     * </code>
-     *
-     * @param string $qname          qualified tagname (including namespace)
-     * @param array  $attributes     array containg attributes
-     * @param string $namespaceUri   URI of the namespace
-     * @param bool   $multiline      whether to create a multiline tag where each 
-     *                               attribute gets written to a single line
-     * @param string $indent         string used to indent attributes (_auto indents
-     *                               attributes so they start at the same column)
-     * @param string $linebreak      string used for linebreaks
-     * @param bool   $sortAttributes Whether to sort the attributes or not
-     *
-     * @return string XML start element
-     * @access public
-     * @static
-     * @see createEndElement(), createTag()
-     */
-    function createStartElement($qname, $attributes = array(), $namespaceUri = null,
-        $multiline = false, $indent = '_auto', $linebreak = "\n", 
-        $sortAttributes = true)
-    {
-        // if no attributes hav been set, use empty attributes
-        if (!isset($attributes) || !is_array($attributes)) {
-            $attributes = array();
-        }
+    // create attribute list
+    $attList = XML_Util::attributesToString($tag['attributes'],
+        $sortAttributes, $multiline, $indent, $linebreak, $replaceEntities);
+    if (!isset($tag['content']) || (string) $tag['content'] == '') {
+      $tag = sprintf('<%s%s />', $tag['qname'], $attList);
+    }
+    else {
+      switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_NONE:
+          break;
+
+        case XML_UTIL_CDATA_SECTION:
+          $tag['content'] = XML_Util::createCDataSection($tag['content']);
+          break;
+
+        default:
+          $tag['content'] = XML_Util::replaceEntities($tag['content'],
+          $replaceEntities);
+          break;
+      }
+      $tag = sprintf('<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
+        $tag['qname']);
+    }
+    return $tag;
+  }
+
+  /**
+   * create a start element
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // create an XML start element:
+   * $tag = XML_Util::createStartElement('myNs:myTag',
+   *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
+   * </code>
+   *
+   * @param string $qname          qualified tagname (including namespace)
+   * @param array $attributes
+   * @param string $namespaceUri   URI of the namespace
+   * @param bool $multiline
+   *                               attribute gets written to a single line
+   * @param string $indent         string used to indent attributes (_auto indents
+   *                               attributes so they start at the same column)
+   * @param string $linebreak      string used for linebreaks
+   * @param bool $sortAttributes
+   *
+   * @return string XML start element
+   * @access public
+   * @static
+   * @see createEndElement()
+   * @see createTag()
+   */
+  public function createStartElement($qname, $attributes = array(), $namespaceUri = NULL,
+        $multiline = FALSE, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = TRUE) {
+    // if no attributes hav been set, use empty attributes
+    if (!isset($attributes) || !is_array($attributes)) {
+      $attributes = array();
+    }
 
-        if ($namespaceUri != null) {
-            $parts = XML_Util::splitQualifiedName($qname);
-        }
+    if ($namespaceUri != NULL) {
+      $parts = XML_Util::splitQualifiedName($qname);
+    }
 
-        // check for multiline attributes
-        if ($multiline === true) {
-            if ($indent === '_auto') {
-                $indent = str_repeat(' ', (strlen($qname)+2));
-            }
-        }
+    // check for multiline attributes
+    if ($multiline === TRUE) {
+      if ($indent === '_auto') {
+        $indent = str_repeat(' ', (strlen($qname) + 2));
+      }
+    }
 
-        if ($namespaceUri != null) {
-            // is a namespace given
-            if (isset($parts['namespace']) && !empty($parts['namespace'])) {
-                $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
-            } else {
-                // define this Uri as the default namespace
-                $attributes['xmlns'] = $namespaceUri;
-            }
-        }
+    if ($namespaceUri != NULL) {
+      // is a namespace given
+      if (isset($parts['namespace']) && !empty($parts['namespace'])) {
+        $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
+      }
+      else {
+        // define this Uri as the default namespace
+        $attributes['xmlns'] = $namespaceUri;
+      }
+    }
 
-        // create attribute list
-        $attList = XML_Util::attributesToString($attributes, $sortAttributes, 
-            $multiline, $indent, $linebreak);
-        $element = sprintf('<%s%s>', $qname, $attList);
-        return  $element;
-    }
-
-    /**
-     * create an end element
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML start element:
-     * $tag = XML_Util::createEndElement('myNs:myTag');
-     * </code>
-     *
-     * @param string $qname qualified tagname (including namespace)
-     *
-     * @return string XML end element
-     * @access public
-     * @static
-     * @see createStartElement(), createTag()
-     */
-    function createEndElement($qname)
-    {
-        $element = sprintf('</%s>', $qname);
-        return $element;
-    }
-
-    /**
-     * create an XML comment
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create an XML start element:
-     * $tag = XML_Util::createComment('I am a comment');
-     * </code>
-     *
-     * @param string $content content of the comment
-     *
-     * @return string XML comment
-     * @access public
-     * @static
-     */
-    function createComment($content)
-    {
-        $comment = sprintf('<!-- %s -->', $content);
-        return $comment;
-    }
-
-    /**
-     * create a CData section
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // create a CData section
-     * $tag = XML_Util::createCDataSection('I am content.');
-     * </code>
-     *
-     * @param string $data data of the CData section
-     *
-     * @return string CData section with content
-     * @access public
-     * @static
-     */
-    function createCDataSection($data)
-    {
-        return sprintf('<![CDATA[%s]]>', 
-            preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data)));
-
-    }
-
-    /**
-     * split qualified name and return namespace and local part
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // split qualified tag
-     * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
-     * </code>
-     * the returned array will contain two elements:
-     * <pre>
-     * array(
-     *     'namespace' => 'xslt',
-     *     'localPart' => 'stylesheet'
-     * );
-     * </pre>
-     *
-     * @param string $qname     qualified tag name
-     * @param string $defaultNs default namespace (optional)
-     *
-     * @return array array containing namespace and local part
-     * @access public
-     * @static
-     */
-    function splitQualifiedName($qname, $defaultNs = null)
-    {
-        if (strstr($qname, ':')) {
-            $tmp = explode(':', $qname);
-            return array(
-                'namespace' => $tmp[0],
-                'localPart' => $tmp[1]
-            );
-        }
-        return array(
-            'namespace' => $defaultNs,
-            'localPart' => $qname
-        );
-    }
-
-    /**
-     * check, whether string is valid XML name
-     *
-     * <p>XML names are used for tagname, attribute names and various
-     * other, lesser known entities.</p>
-     * <p>An XML name may only consist of alphanumeric characters,
-     * dashes, undescores and periods, and has to start with a letter
-     * or an underscore.</p>
-     *
-     * <code>
-     * require_once 'XML/Util.php';
-     *
-     * // verify tag name
-     * $result = XML_Util::isValidName('invalidTag?');
-     * if (is_a($result, 'PEAR_Error')) {
-     *    print 'Invalid XML name: ' . $result->getMessage();
-     * }
-     * </code>
-     *
-     * @param string $string string that should be checked
-     *
-     * @return mixed true, if string is a valid XML name, PEAR error otherwise
-     * @access public
-     * @static
-     * @todo support for other charsets
-     * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
-     */
-    function isValidName($string)
-    {
-        // check for invalid chars
-        if (!preg_match('/^[[:alpha:]_]$/', $string{0})) {
-            return XML_Util::raiseError('XML names may only start with letter '
-                . 'or underscore', XML_UTIL_ERROR_INVALID_START);
-        }
+    // create attribute list
+    $attList = XML_Util::attributesToString($attributes, $sortAttributes,
+        $multiline, $indent, $linebreak);
+    $element = sprintf('<%s%s>', $qname, $attList);
+    return $element;
+  }
+
+  /**
+   * create an end element
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // create an XML start element:
+   * $tag = XML_Util::createEndElement('myNs:myTag');
+   * </code>
+   *
+   * @param string $qname qualified tagname (including namespace)
+   *
+   * @return string XML end element
+   * @access public
+   * @static
+   * @see createStartElement()
+   * @see createTag()
+   */
+  public function createEndElement($qname) {
+    $element = sprintf('</%s>', $qname);
+    return $element;
+  }
+
+  /**
+   * create an XML comment
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // create an XML start element:
+   * $tag = XML_Util::createComment('I am a comment');
+   * </code>
+   *
+   * @param string $content content of the comment
+   *
+   * @return string XML comment
+   * @access public
+   * @static
+   */
+  public function createComment($content) {
+    $comment = sprintf('<!-- %s -->', $content);
+    return $comment;
+  }
+
+  /**
+   * create a CData section
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // create a CData section
+   * $tag = XML_Util::createCDataSection('I am content.');
+   * </code>
+   *
+   * @param string $data data of the CData section
+   *
+   * @return string CData section with content
+   * @access public
+   * @static
+   */
+  public function createCDataSection($data) {
+    return sprintf('<![CDATA[%s]]>',
+        preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data)));
+
+  }
+
+  /**
+   * split qualified name and return namespace and local part
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // split qualified tag
+   * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
+   * </code>
+   * the returned array will contain two elements:
+   * <pre>
+   * array(
+   *     'namespace' => 'xslt',
+   *     'localPart' => 'stylesheet'
+   * );
+   * </pre>
+   *
+   * @param string $qname     qualified tag name
+   * @param string $defaultNs default namespace (optional)
+   *
+   * @return array array containing namespace and local part
+   * @access public
+   * @static
+   */
+  public function splitQualifiedName($qname, $defaultNs = NULL) {
+    if (strstr($qname, ':')) {
+      $tmp = explode(':', $qname);
+      return array(
+        'namespace' => $tmp[0],
+        'localPart' => $tmp[1],
+      );
+    }
+    return array(
+      'namespace' => $defaultNs,
+      'localPart' => $qname,
+    );
+  }
+
+  /**
+   * check, whether string is valid XML name
+   *
+   * <p>XML names are used for tagname, attribute names and various
+   * other, lesser known entities.</p>
+   * <p>An XML name may only consist of alphanumeric characters,
+   * dashes, undescores and periods, and has to start with a letter
+   * or an underscore.</p>
+   *
+   * <code>
+   * require_once 'XML/Util.php';
+   *
+   * // verify tag name
+   * $result = XML_Util::isValidName('invalidTag?');
+   * if (is_a($result, 'PEAR_Error')) {
+   *    print 'Invalid XML name: ' . $result->getMessage();
+   * }
+   * </code>
+   *
+   * @param string $string string that should be checked
+   *
+   * @return mixed true, if string is a valid XML name, PEAR error otherwise
+   * @access public
+   * @static
+   * @todo support for other charsets
+   * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
+   */
+  public function isValidName($string) {
+    // check for invalid chars
+    if (!preg_match('/^[[:alpha:]_]$/', $string{0})) {
+      return XML_Util::raiseError('XML names may only start with letter '
+        . 'or underscore', XML_UTIL_ERROR_INVALID_START);
+    }
 
-        // check for invalid chars
-        if (!preg_match('/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?[[:alpha:]_]([[:alnum:]\_\-\.]+)?$/',
-            $string)
-        ) {
-            return XML_Util::raiseError('XML names may only contain alphanumeric '
-                . 'chars, period, hyphen, colon and underscores', 
-                XML_UTIL_ERROR_INVALID_CHARS);
-        }
-        // XML name is valid
-        return true;
-    }
-
-    /**
-     * replacement for XML_Util::raiseError
-     *
-     * Avoids the necessity to always require
-     * PEAR.php
-     *
-     * @param string $msg  error message
-     * @param int    $code error code
-     *
-     * @return PEAR_Error
-     * @access public
-     * @static
-     * @todo PEAR CS - should this use include_once instead?
-     */
-    function raiseError($msg, $code)
-    {
-        require_once 'PEAR.php';
-        return PEAR::raiseError($msg, $code);
+    // check for invalid chars
+    if (!preg_match('/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?[[:alpha:]_]([[:alnum:]\_\-\.]+)?$/',
+        $string)
+    ) {
+      return XML_Util::raiseError('XML names may only contain alphanumeric '
+        . 'chars, period, hyphen, colon and underscores',
+        XML_UTIL_ERROR_INVALID_CHARS);
     }
+    // XML name is valid
+    return TRUE;
+  }
+
+  /**
+   * replacement for XML_Util::raiseError
+   *
+   * Avoids the necessity to always require
+   * PEAR.php
+   *
+   * @param string $msg  error message
+   * @param int $code
+   *
+   * @return PEAR_Error
+   * @access public
+   * @static
+   * @todo PEAR CS - should this use include_once instead?
+   */
+  public function raiseError($msg, $code) {
+    require_once 'PEAR.php';
+    return PEAR::raiseError($msg, $code);
+  }
+
 }
-?>
diff --git a/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php b/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
index 2d26e59a3142..a3f5984e4b83 100644
--- a/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
+++ b/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
@@ -1,243 +1,215 @@
-<?php
-
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | 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        |
- +--------------------------------------------------------------------+
-*/
-
-/**************************************************************************************************************************
- * Licensed to CiviCRM under the Academic Free License version 3.0
- * Written & Contributed by Dolphin Software P/L - March 2008 
- *
- * 'eWAY_GatewayRequest.php' - Based on the standard supplied eWay sample code 'GatewayResponse.php'
- *
- * The only significant change from the original is that the 'CVN' field is uncommented,
- * unlike the distributed sample code.
- *
- * ALSO: Added a 'GetTransactionNumber' function.
- *
- **************************************************************************************************************************/
-use CRM_Ewaysingle_ExtensionUtil as E;
- 
-class GatewayRequest
-{
-	var $txCustomerID = "";
-
-	var $txAmount = 0;
-
-	var $txCardholderName = "";
-
-	var $txCardNumber = "";
-
-	var $txCardExpiryMonth = "01";
-
-	var $txCardExpiryYear = "00";
-
-	var $txTransactionNumber = "";
-
-	var $txCardholderFirstName = "";
-
-	var $txCardholderLastName = "";
-
-	var $txCardholderEmailAddress = "";
-
-	var $txCardholderAddress = "";
-
-	var $txCardholderPostalCode = "";
-
-	var $txInvoiceReference = "";
-
-	var $txInvoiceDescription = "";
-
-    var $txCVN = "";
-
-	var $txOption1 = "";
-
-	var $txOption2 = "";
-
-	var $txOption3 = "";
-    
-    var $txCustomerBillingCountry = "";
-
-    var $txCustomerIPAddress = "";
-
-   function __construct()
-   {
-      // Empty Constructor
-   }
-
-   function GetTransactionNumber()
-   {
-      return $this->txTransactionNumber;
-   }
-
-   function EwayCustomerID($value) 
-   {
-      $this->txCustomerID=$value;
-   }
-
-   function InvoiceAmount($value)
-   {
-      $this->txAmount=$value;
-   }
-
-   function CardHolderName($value)
-   {
-      $this->txCardholderName=$value;
-   }
-
-   function CardExpiryMonth($value)  
-   {
-      $this->txCardExpiryMonth=$value;
-   }
-
-   function CardExpiryYear($value)
-   {
-      $this->txCardExpiryYear=$value;
-   }
-
-   function TransactionNumber($value)
-   {
-      $this->txTransactionNumber=$value;
-   }
-
-   function PurchaserFirstName($value)
-   {
-      $this->txCardholderFirstName=$value;
-   }
-
-   function PurchaserLastName($value)
-   {
-      $this->txCardholderLastName=$value;
-   }
-
-   function CardNumber($value)
-   {
-      $this->txCardNumber=$value;
-   }
-
-   function PurchaserAddress($value)
-   {
-      $this->txCardholderAddress=$value;
-   }
-
-   function PurchaserPostalCode($value)
-   {
-      $this->txCardholderPostalCode=$value;
-   }
-
-   function PurchaserEmailAddress($value)
-   {
-      $this->txCardholderEmailAddress=$value;
-   }
-
-   function InvoiceReference($value) 
-   {
-      $this->txInvoiceReference=$value; 
-   }
-
-   function InvoiceDescription($value) 
-   {
-      $this->txInvoiceDescription=$value; 
-   }
-
-   function CVN($value) 
-   {
-      $this->txCVN=$value; 
-   }
-
-   function EwayOption1($value) 
-   {
-      $this->txOption1=$value; 
-   }
-
-   function EwayOption2($value) 
-   {
-      $this->txOption2=$value; 
-   }
-
-   function EwayOption3($value) 
-   {
-      $this->txOption3=$value; 
-   }
-
-   function CustomerBillingCountry($value) 
-   {
-       $this->txCustomerBillingCountry=$value; 
-   }
-
-   function CustomerIPAddress($value) 
-   {
-       $this->txCustomerIPAddress=$value; 
-   }
-
-   function ToXml()
-   {
-      // We don't really need the overhead of creating an XML DOM object
-      // to really just concatenate a string together.
-
-      $xml = "<ewaygateway>";
-      $xml .= $this->CreateNode("ewayCustomerID",                 $this->txCustomerID);
-      $xml .= $this->CreateNode("ewayTotalAmount",                $this->txAmount);
-      $xml .= $this->CreateNode("ewayCardHoldersName",            $this->txCardholderName);
-      $xml .= $this->CreateNode("ewayCardNumber",                 $this->txCardNumber);
-      $xml .= $this->CreateNode("ewayCardExpiryMonth",            $this->txCardExpiryMonth);
-      $xml .= $this->CreateNode("ewayCardExpiryYear",             $this->txCardExpiryYear);
-      $xml .= $this->CreateNode("ewayTrxnNumber",                 $this->txTransactionNumber);
-      $xml .= $this->CreateNode("ewayCustomerInvoiceDescription", $this->txInvoiceDescription);
-      $xml .= $this->CreateNode("ewayCustomerFirstName",          $this->txCardholderFirstName);
-      $xml .= $this->CreateNode("ewayCustomerLastName",           $this->txCardholderLastName);
-      $xml .= $this->CreateNode("ewayCustomerEmail",              $this->txCardholderEmailAddress);
-      $xml .= $this->CreateNode("ewayCustomerAddress",            $this->txCardholderAddress);
-      $xml .= $this->CreateNode("ewayCustomerPostcode",           $this->txCardholderPostalCode);
-      $xml .= $this->CreateNode("ewayCustomerInvoiceRef",         $this->txInvoiceReference);
-      $xml .= $this->CreateNode("ewayCVN",                        $this->txCVN);
-      $xml .= $this->CreateNode("ewayOption1",                    $this->txOption1);
-      $xml .= $this->CreateNode("ewayOption2",                    $this->txOption2);
-      $xml .= $this->CreateNode("ewayOption3",                    $this->txOption3);
-      $xml .= $this->CreateNode("ewayCustomerIPAddress",          $this->txCustomerIPAddress);
-      $xml .= $this->CreateNode("ewayCustomerBillingCountry",     $this->txCustomerBillingCountry);
-      $xml .= "</ewaygateway>";
-      
-      return $xml;
-   }
-   
-   
-   /********************************************************
-   * Builds a simple XML Node
-   *
-   * 'NodeName' is the anem of the node being created.
-   * 'NodeValue' is its value
-   *
-   ********************************************************/
-   function CreateNode($NodeName, $NodeValue)
-   {
-    require_once E::path('lib/XML/Util.php');
-
-    $xml = new XML_Util();
-    $node = "<" . $NodeName . ">" . $xml->replaceEntities($NodeValue) . "</" . $NodeName . ">";
-    return $node;
-   }
-   
-} // class GatewayRequest
-
-?>
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Licensed to CiviCRM under the Academic Free License version 3.0
+ * Written & Contributed by Dolphin Software P/L - March 2008
+ *
+ * 'eWAY_GatewayRequest.php' - Based on the standard supplied eWay sample code 'GatewayResponse.php'
+ *
+ * The only significant change from the original is that the 'CVN' field is uncommented,
+ * unlike the distributed sample code.
+ *
+ * ALSO: Added a 'GetTransactionNumber' function.
+ *
+ */
+use CRM_Ewaysingle_ExtensionUtil as E;
+
+class GatewayRequest {
+  public $txCustomerID = "";
+
+  public $txAmount = 0;
+
+  public $txCardholderName = "";
+
+  public $txCardNumber = "";
+
+  public $txCardExpiryMonth = "01";
+
+  public $txCardExpiryYear = "00";
+
+  public $txTransactionNumber = "";
+
+  public $txCardholderFirstName = "";
+
+  public $txCardholderLastName = "";
+
+  public $txCardholderEmailAddress = "";
+
+  public $txCardholderAddress = "";
+
+  public $txCardholderPostalCode = "";
+
+  public $txInvoiceReference = "";
+
+  public $txInvoiceDescription = "";
+
+  public $txCVN = "";
+
+  public $txOption1 = "";
+
+  public $txOption2 = "";
+
+  public $txOption3 = "";
+
+  public $txCustomerBillingCountry = "";
+
+  public $txCustomerIPAddress = "";
+
+  public function __construct() {
+    // Empty Constructor
+  }
+
+  public function GetTransactionNumber() {
+    return $this->txTransactionNumber;
+  }
+
+  public function EwayCustomerID($value) {
+    $this->txCustomerID = $value;
+  }
+
+  public function InvoiceAmount($value) {
+    $this->txAmount = $value;
+  }
+
+  public function CardHolderName($value) {
+    $this->txCardholderName = $value;
+  }
+
+  public function CardExpiryMonth($value) {
+    $this->txCardExpiryMonth = $value;
+  }
+
+  public function CardExpiryYear($value) {
+    $this->txCardExpiryYear = $value;
+  }
+
+  public function TransactionNumber($value) {
+    $this->txTransactionNumber = $value;
+  }
+
+  public function PurchaserFirstName($value) {
+    $this->txCardholderFirstName = $value;
+  }
+
+  public function PurchaserLastName($value) {
+    $this->txCardholderLastName = $value;
+  }
+
+  public function CardNumber($value) {
+    $this->txCardNumber = $value;
+  }
+
+  public function PurchaserAddress($value) {
+    $this->txCardholderAddress = $value;
+  }
+
+  public function PurchaserPostalCode($value) {
+    $this->txCardholderPostalCode = $value;
+  }
+
+  public function PurchaserEmailAddress($value) {
+    $this->txCardholderEmailAddress = $value;
+  }
+
+  public function InvoiceReference($value) {
+    $this->txInvoiceReference = $value;
+  }
+
+  public function InvoiceDescription($value) {
+    $this->txInvoiceDescription = $value;
+  }
+
+  public function CVN($value) {
+    $this->txCVN = $value;
+  }
+
+  public function EwayOption1($value) {
+    $this->txOption1 = $value;
+  }
+
+  public function EwayOption2($value) {
+    $this->txOption2 = $value;
+  }
+
+  public function EwayOption3($value) {
+    $this->txOption3 = $value;
+  }
+
+  public function CustomerBillingCountry($value) {
+    $this->txCustomerBillingCountry = $value;
+  }
+
+  public function CustomerIPAddress($value) {
+    $this->txCustomerIPAddress = $value;
+  }
+
+  public function ToXml() {
+    // We don't really need the overhead of creating an XML DOM object
+    // to really just concatenate a string together.
+
+    $xml = "<ewaygateway>";
+    $xml .= $this->CreateNode("ewayCustomerID", $this->txCustomerID);
+    $xml .= $this->CreateNode("ewayTotalAmount", $this->txAmount);
+    $xml .= $this->CreateNode("ewayCardHoldersName", $this->txCardholderName);
+    $xml .= $this->CreateNode("ewayCardNumber", $this->txCardNumber);
+    $xml .= $this->CreateNode("ewayCardExpiryMonth", $this->txCardExpiryMonth);
+    $xml .= $this->CreateNode("ewayCardExpiryYear", $this->txCardExpiryYear);
+    $xml .= $this->CreateNode("ewayTrxnNumber", $this->txTransactionNumber);
+    $xml .= $this->CreateNode("ewayCustomerInvoiceDescription", $this->txInvoiceDescription);
+    $xml .= $this->CreateNode("ewayCustomerFirstName", $this->txCardholderFirstName);
+    $xml .= $this->CreateNode("ewayCustomerLastName", $this->txCardholderLastName);
+    $xml .= $this->CreateNode("ewayCustomerEmail", $this->txCardholderEmailAddress);
+    $xml .= $this->CreateNode("ewayCustomerAddress", $this->txCardholderAddress);
+    $xml .= $this->CreateNode("ewayCustomerPostcode", $this->txCardholderPostalCode);
+    $xml .= $this->CreateNode("ewayCustomerInvoiceRef", $this->txInvoiceReference);
+    $xml .= $this->CreateNode("ewayCVN", $this->txCVN);
+    $xml .= $this->CreateNode("ewayOption1", $this->txOption1);
+    $xml .= $this->CreateNode("ewayOption2", $this->txOption2);
+    $xml .= $this->CreateNode("ewayOption3", $this->txOption3);
+    $xml .= $this->CreateNode("ewayCustomerIPAddress", $this->txCustomerIPAddress);
+    $xml .= $this->CreateNode("ewayCustomerBillingCountry", $this->txCustomerBillingCountry);
+    $xml .= "</ewaygateway>";
+
+    return $xml;
+  }
+
+  /**
+   * Builds a simple XML Node
+   *
+   * 'NodeName' is the anem of the node being created.
+   * 'NodeValue' is its value
+   *
+   */
+  public function CreateNode($NodeName, $NodeValue) {
+    require_once E::path('lib/XML/Util.php');
+
+    $xml = new XML_Util();
+    $node = "<" . $NodeName . ">" . $xml->replaceEntities($NodeValue) . "</" . $NodeName . ">";
+    return $node;
+  }
+
+}
diff --git a/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php b/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php
index 100bfb3fdcf4..08c16b284dc7 100644
--- a/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php
+++ b/ext/ewaysingle/lib/eWAY/eWAY_GatewayResponse.php
@@ -1,171 +1,150 @@
-<?php
-
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | 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        |
- +--------------------------------------------------------------------+
-*/
-
-/**************************************************************************************************************************
- * Licensed to CiviCRM under the Academic Free License version 3.0
- * Written & Contributed by Dolphin Software P/L - March 2008 
- *
- * 'eWAY_GatewayResponse.php' - Loosley based on the standard supplied eWay sample code 'GatewayResponse.php'
- *
- * The 'simplexml_load_string' has been removed as it was causing major issues
- * with Drupal V5.7 / CiviCRM 1.9 installtion's Home page. 
- * Filling the Home page with "Warning: session_start() [function.session-start]: Node no longer exists in ..." messages
- *
- * Found web reference indicating 'simplexml_load_string' was a probable cause.
- * As soon as 'simplexml_load_string' was removed the problem fixed itself.
- *
- * Additionally the '$txStatus' var has been set as a string rather than a boolean.
- * This is because the returned $params['trxn_result_code'] is in fact a string and not a boolean.
- **************************************************************************************************************************/
- 
-class GatewayResponse
-{
-	var $txAmount              = 0;
-	var $txTransactionNumber   = "";
-	var $txInvoiceReference    = "";
-	var $txOption1             = "";
-	var $txOption2             = "";
-	var $txOption3             = "";
-	var $txStatus              = "";
-	var $txAuthCode            = "";
-	var $txError               = "";
-    var $txBeagleScore         = "";
-
-	function __construct()
-	{
-	   // Empty Constructor
-    }
-   
-	function ProcessResponse($Xml)
-	{
-#####################################################################################
-#                                                                                   #
-#      $xtr = simplexml_load_string($Xml) or die ("Unable to load XML string!");    #
-#                                                                                   #
-#      $this->txError             = $xtr->ewayTrxnError;                            #
-#      $this->txStatus            = $xtr->ewayTrxnStatus;                           #
-#      $this->txTransactionNumber = $xtr->ewayTrxnNumber;                           #
-#      $this->txOption1           = $xtr->ewayTrxnOption1;                          #
-#      $this->txOption2           = $xtr->ewayTrxnOption2;                          #
-#      $this->txOption3           = $xtr->ewayTrxnOption3;                          #
-#      $this->txAmount            = $xtr->ewayReturnAmount;                         #
-#      $this->txAuthCode          = $xtr->ewayAuthCode;                             #
-#      $this->txInvoiceReference  = $xtr->ewayTrxnReference;                        #
-#                                                                                   #
-#####################################################################################
-
-      $this->txError             = self::GetNodeValue("ewayTrxnError", $Xml);
-      $this->txStatus            = self::GetNodeValue("ewayTrxnStatus", $Xml);
-      $this->txTransactionNumber = self::GetNodeValue("ewayTrxnNumber", $Xml);
-      $this->txOption1           = self::GetNodeValue("ewayTrxnOption1", $Xml);
-      $this->txOption2           = self::GetNodeValue("ewayTrxnOption2", $Xml);
-      $this->txOption3           = self::GetNodeValue("ewayTrxnOption3", $Xml);
-      $amount                    = self::GetNodeValue("ewayReturnAmount", $Xml);
-      $this->txAuthCode          = self::GetNodeValue("ewayAuthCode", $Xml);
-      $this->txInvoiceReference  = self::GetNodeValue("ewayTrxnReference", $Xml);
-      $this->txBeagleScore       = self::GetNodeValue("ewayBeagleScore", $Xml);
-      $this->txAmount = (int) $amount;
-   }
-   
-   
-   /************************************************************************
-   * Simple function to use in place of the 'simplexml_load_string' call.
-   * 
-   * It returns the NodeValue for a given NodeName
-   * or returns and empty string.
-   ************************************************************************/
-   function GetNodeValue($NodeName, &$strXML)
-   {
-      $OpeningNodeName = "<" . $NodeName . ">";
-      $ClosingNodeName = "</" . $NodeName . ">";
-      
-      $pos1 = stripos($strXML, $OpeningNodeName);
-      $pos2 = stripos($strXML, $ClosingNodeName);
-      
-      if ( ($pos1 === false) || ($pos2 === false) )
-         return "";
-         
-      $pos1 += strlen($OpeningNodeName);
-      $len   = $pos2 - $pos1;
-
-      $return = substr($strXML, $pos1, $len);                                       
-      
-      return ($return);
-   }
-   
-
-   function TransactionNumber()
-   {
-      return $this->txTransactionNumber; 
-   }
-
-   function InvoiceReference() 
-   {
-      return $this->txInvoiceReference; 
-   }
-
-   function Option1() 
-   {
-      return $this->txOption1; 
-   }
-
-   function Option2() 
-   {
-      return $this->txOption2; 
-   }
-
-   function Option3() 
-   {
-      return $this->txOption3; 
-   }
-
-   function AuthorisationCode()
-   {
-      return $this->txAuthCode; 
-   }
-
-   function Error()
-   {
-      return $this->txError; 
-   }   
-
-   function Amount() 
-   {
-      return $this->txAmount; 
-   }   
-
-   function Status()
-   {
-      return $this->txStatus;
-   }
-
-   function BeagleScore ()
-   {
-       return $this->txBeagleScore ;
-   }
-}
-
-?>
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 5                                                  |
+ +--------------------------------------------------------------------+
+ | 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        |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Licensed to CiviCRM under the Academic Free License version 3.0
+ * Written & Contributed by Dolphin Software P/L - March 2008
+ *
+ * 'eWAY_GatewayResponse.php' - Loosley based on the standard supplied eWay sample code 'GatewayResponse.php'
+ *
+ * The 'simplexml_load_string' has been removed as it was causing major issues
+ * with Drupal V5.7 / CiviCRM 1.9 installtion's Home page.
+ * Filling the Home page with "Warning: session_start() [function.session-start]: Node no longer exists in ..." messages
+ *
+ * Found web reference indicating 'simplexml_load_string' was a probable cause.
+ * As soon as 'simplexml_load_string' was removed the problem fixed itself.
+ *
+ * Additionally the '$txStatus' var has been set as a string rather than a boolean.
+ * This is because the returned $params['trxn_result_code'] is in fact a string and not a boolean.
+ */
+class GatewayResponse {
+  public $txAmount              = 0;
+  public $txTransactionNumber   = "";
+  public $txInvoiceReference    = "";
+  public $txOption1             = "";
+  public $txOption2             = "";
+  public $txOption3             = "";
+  public $txStatus              = "";
+  public $txAuthCode            = "";
+  public $txError               = "";
+  public $txBeagleScore         = "";
+
+  public function __construct() {
+    // Empty Constructor
+  }
+
+  public function ProcessResponse($Xml) {
+    //$xtr = simplexml_load_string($Xml) or die ("Unable to load XML string!");
+
+    //$this->txError             = $xtr->ewayTrxnError;
+    //$this->txStatus            = $xtr->ewayTrxnStatus;
+    //$this->txTransactionNumber = $xtr->ewayTrxnNumber;
+    //$this->txOption1           = $xtr->ewayTrxnOption1;
+    //$this->txOption2           = $xtr->ewayTrxnOption2;
+    //$this->txOption3           = $xtr->ewayTrxnOption3;
+    //$this->txAmount            = $xtr->ewayReturnAmount;
+    //$this->txAuthCode          = $xtr->ewayAuthCode;
+    //$this->txInvoiceReference  = $xtr->ewayTrxnReference;
+
+    $this->txError             = self::GetNodeValue("ewayTrxnError", $Xml);
+    $this->txStatus            = self::GetNodeValue("ewayTrxnStatus", $Xml);
+    $this->txTransactionNumber = self::GetNodeValue("ewayTrxnNumber", $Xml);
+    $this->txOption1           = self::GetNodeValue("ewayTrxnOption1", $Xml);
+    $this->txOption2           = self::GetNodeValue("ewayTrxnOption2", $Xml);
+    $this->txOption3           = self::GetNodeValue("ewayTrxnOption3", $Xml);
+    $amount                    = self::GetNodeValue("ewayReturnAmount", $Xml);
+    $this->txAuthCode          = self::GetNodeValue("ewayAuthCode", $Xml);
+    $this->txInvoiceReference  = self::GetNodeValue("ewayTrxnReference", $Xml);
+    $this->txBeagleScore       = self::GetNodeValue("ewayBeagleScore", $Xml);
+    $this->txAmount = (int) $amount;
+  }
+
+  /**
+   * Simple function to use in place of the 'simplexml_load_string' call.
+   *
+   * It returns the NodeValue for a given NodeName
+   * or returns and empty string.
+   */
+  public function GetNodeValue($NodeName, &$strXML) {
+    $OpeningNodeName = "<" . $NodeName . ">";
+    $ClosingNodeName = "</" . $NodeName . ">";
+
+    $pos1 = stripos($strXML, $OpeningNodeName);
+    $pos2 = stripos($strXML, $ClosingNodeName);
+
+    if (($pos1 === FALSE) || ($pos2 === FALSE)) {
+      return "";
+    }
+
+    $pos1 += strlen($OpeningNodeName);
+    $len   = $pos2 - $pos1;
+
+    $return = substr($strXML, $pos1, $len);
+
+    return ($return);
+  }
+
+  public function TransactionNumber() {
+    return $this->txTransactionNumber;
+  }
+
+  public function InvoiceReference() {
+    return $this->txInvoiceReference;
+  }
+
+  public function Option1() {
+    return $this->txOption1;
+  }
+
+  public function Option2() {
+    return $this->txOption2;
+  }
+
+  public function Option3() {
+    return $this->txOption3;
+  }
+
+  public function AuthorisationCode() {
+    return $this->txAuthCode;
+  }
+
+  public function Error() {
+    return $this->txError;
+  }
+
+  public function Amount() {
+    return $this->txAmount;
+  }
+
+  public function Status() {
+    return $this->txStatus;
+  }
+
+  public function BeagleScore () {
+    return $this->txBeagleScore;
+  }
+
+}
diff --git a/ext/ewaysingle/phpunit.xml.dist b/ext/ewaysingle/phpunit.xml.dist
new file mode 100644
index 000000000000..fc8f870b723b
--- /dev/null
+++ b/ext/ewaysingle/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/phpunit/bootstrap.php">
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <directory>./tests/phpunit</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./</directory>
+    </whitelist>
+  </filter>
+  <listeners>
+    <listener class="Civi\Test\CiviTestListener">
+      <arguments/>
+    </listener>
+  </listeners>
+</phpunit>
diff --git a/ext/ewaysingle/tests/phpunit/CRM/Core/Payment/EwayTest.php b/ext/ewaysingle/tests/phpunit/CRM/Core/Payment/EwayTest.php
new file mode 100644
index 000000000000..6591c5bb1676
--- /dev/null
+++ b/ext/ewaysingle/tests/phpunit/CRM/Core/Payment/EwayTest.php
@@ -0,0 +1,212 @@
+<?php
+
+use CRM_Ewaysingle_ExtensionUtil as E;
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+
+/**
+ * FIXME - Add test description.
+ *
+ * Tips:
+ *  - With HookInterface, you may implement CiviCRM hooks directly in the test class.
+ *    Simply create corresponding functions (e.g. "hook_civicrm_post(...)" or similar).
+ *  - With TransactionalInterface, any data changes made by setUp() or test****() functions will
+ *    rollback automatically -- as long as you don't manipulate schema or truncate tables.
+ *    If this test needs to manipulate schema or truncate tables, then either:
+ *       a. Do all that using setupHeadless() and Civi\Test.
+ *       b. Disable TransactionalInterface, and handle all setup/teardown yourself.
+ *
+ * @group headless
+ */
+class CRM_Core_Payment_EwayTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, HookInterface {
+
+  use \Civi\Test\GuzzleTestTrait;
+  use \Civi\Test\Api3TestTrait;
+
+  public function setUpHeadless() {
+    // Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+    // See: https://docs.civicrm.org/dev/en/latest/testing/phpunit/#civitest
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->apply();
+  }
+
+  public function setUp() {
+    $this->setUpEwayProcessor();
+    $this->processor = \Civi\Payment\System::singleton()->getById($this->ids['PaymentProcessor']['eWAY']);
+    parent::setUp();
+  }
+
+  public function tearDown() {
+    $this->callAPISuccess('PaymentProcessor', 'delete', ['id' => $this->ids['PaymentProcessor']['eWAY']]);
+    parent::tearDown();
+  }
+
+  /**
+   * Test making a once off payment
+   */
+  public function testSinglePayment() {
+    $this->setupMockHandler();
+    $params = $this->getBillingParams();
+    $params['amount'] = 10.00;
+    $params['currency'] = 'AUD';
+    $params['description'] = 'Test Contribution';
+    $params['invoiceID'] = 'xyz';
+    $params['email'] = 'unittesteway@civicrm.org';
+    $params['ip_address'] = '127.0.0.1';
+    foreach ($params as $key => $value) {
+      // Paypal is super special and requires this. Leaving out of the more generic
+      // get billing params for now to make it more obvious.
+      // When/if PropertyBag supports all the params paypal needs we can convert & simplify this.
+      $params[str_replace('-5', '', str_replace('billing_', '', $key))] = $value;
+    }
+    $params['state_province'] = 'NSW';
+    $params['country'] = 'AUS';
+    $this->processor->doPayment($params);
+    $this->assertEquals($this->getExpectedSinglePaymentRequests(), $this->getRequestBodies());
+  }
+
+  /**
+   * Test making a failed once off payment
+   */
+  public function testErrorSinglePayment() {
+    $this->setupMockHandler(NULL, TRUE);
+    $params = $this->getBillingParams();
+    $params['amount'] = 5.24;
+    $params['currency'] = 'AUD';
+    $params['description'] = 'Test Contribution';
+    $params['invoiceID'] = 'xyz';
+    $params['email'] = 'unittesteway@civicrm.org';
+    $params['ip_address'] = '127.0.0.1';
+    foreach ($params as $key => $value) {
+      // Paypal is super special and requires this. Leaving out of the more generic
+      // get billing params for now to make it more obvious.
+      // When/if PropertyBag supports all the params paypal needs we can convert & simplify this.
+      $params[str_replace('-5', '', str_replace('billing_', '', $key))] = $value;
+    }
+    $params['state_province'] = 'NSW';
+    $params['country'] = 'AUS';
+    try {
+      $this->processor->doPayment($params);
+      $this->fail('Test was meant to throw an exception');
+    }
+    catch (\Civi\Payment\Exception\PaymentProcessorException $e) {
+      $this->assertEquals('Error: [24] - Do Not Honour(Test Gateway).', $e->getMessage());
+      $this->assertEquals(9008, $e->getErrorCode());
+    }
+  }
+
+  /**
+   * Get some basic billing parameters.
+   *
+   * These are what are entered by the form-filler.
+   *
+   * @return array
+   */
+  protected function getBillingParams(): array {
+    return [
+      'billing_first_name' => 'John',
+      'billing_middle_name' => '',
+      'billing_last_name' => "O'Connor",
+      'billing_street_address-5' => '8 Hobbitton Road',
+      'billing_city-5' => 'The Shire',
+      'billing_state_province_id-5' => 1012,
+      'billing_postal_code-5' => 5010,
+      'billing_country_id-5' => 1228,
+      'credit_card_number' => '4444333322221111',
+      'cvv2' => 123,
+      'credit_card_exp_date' => [
+        'M' => 9,
+        'Y' => 2025,
+      ],
+      'credit_card_type' => 'Visa',
+      'year' => 2022,
+      'month' => 10,
+    ];
+  }
+
+  public function setUpEwayProcessor() {
+    $params = [
+      'name' => 'demo',
+      'domain_id' => CRM_Core_Config::domainID(),
+      'payment_processor_type_id' => 'eWAY',
+      'is_active' => 1,
+      'is_default' => 0,
+      'is_test' => 0,
+      'user_name' => '87654321',
+      'url_site' => 'https://www.eway.com.au/gateway/xmltest/testpage.asp',
+      'class_name' => 'Payment_eWAY',
+      'billing_mode' => 1,
+      'financial_type_id' => 1,
+      'financial_account_id' => 12,
+      // Credit card = 1 so can pass 'by accident'.
+      'payment_instrument_id' => 'Debit Card',
+    ];
+    if (!is_numeric($params['payment_processor_type_id'])) {
+      // really the api should handle this through getoptions but it's not exactly api call so lets just sort it
+      //here
+      $params['payment_processor_type_id'] = $this->callAPISuccess('payment_processor_type', 'getvalue', [
+        'name' => $params['payment_processor_type_id'],
+        'return' => 'id',
+      ], 'integer');
+    }
+    $result = $this->callAPISuccess('payment_processor', 'create', $params);
+    $processorID = $result['id'];
+    $this->setupMockHandler($processorID);
+    $this->ids['PaymentProcessor']['eWAY'] = $processorID;
+  }
+
+  /**
+   * Add a mock handler to the paypal Pro processor for testing.
+   *
+   * @param int|null $id
+   * @param bool $error
+   *
+   * @throws \CiviCRM_API3_Exception
+   */
+  protected function setupMockHandler($id = NULL, $error = FALSE) {
+    if ($id) {
+      $this->processor = Civi\Payment\System::singleton()->getById($id);
+    }
+    $responses = $error ? $this->getExpectedSinglePaymentErrorResponses() : $this->getExpectedSinglePaymentResponses();
+    // Comment the next line out when trying to capture the response.
+    // see https://github.com/civicrm/civicrm-core/pull/18350
+    $this->createMockHandler($responses);
+    $this->setUpClientWithHistoryContainer();
+    $this->processor->setGuzzleClient($this->getGuzzleClient());
+  }
+
+  /**
+   * Get the expected response from eWAY for a single payment.
+   *
+   * @return array
+   */
+  public function getExpectedSinglePaymentResponses() {
+    return [
+      '<ewayResponse><ewayTrxnStatus>True</ewayTrxnStatus><ewayTrxnNumber>10002</ewayTrxnNumber><ewayTrxnReference>xyz</ewayTrxnReference><ewayTrxnOption1/><ewayTrxnOption2/><ewayTrxnOption3/><ewayAuthCode>123456</ewayAuthCode><ewayReturnAmount>1000</ewayReturnAmount><ewayTrxnError>00,Transaction Approved(Test Gateway)</ewayTrxnError></ewayResponse>',
+    ];
+  }
+
+  /**
+   *  Get the expected request from eWAY.
+   *
+   * @return array
+   */
+  public function getExpectedSinglePaymentRequests() {
+    return [
+      '<ewaygateway><ewayCustomerID>87654321</ewayCustomerID><ewayTotalAmount>1000</ewayTotalAmount><ewayCardHoldersName>John O&apos;Connor</ewayCardHoldersName><ewayCardNumber>4444333322221111</ewayCardNumber><ewayCardExpiryMonth>10</ewayCardExpiryMonth><ewayCardExpiryYear>22</ewayCardExpiryYear><ewayTrxnNumber>xyz</ewayTrxnNumber><ewayCustomerInvoiceDescription>Test Contribution</ewayCustomerInvoiceDescription><ewayCustomerFirstName>John</ewayCustomerFirstName><ewayCustomerLastName>O&apos;Connor</ewayCustomerLastName><ewayCustomerEmail>unittesteway@civicrm.org</ewayCustomerEmail><ewayCustomerAddress>8 Hobbitton Road, The Shire, NSW.</ewayCustomerAddress><ewayCustomerPostcode>5010</ewayCustomerPostcode><ewayCustomerInvoiceRef>xyz</ewayCustomerInvoiceRef><ewayCVN>123</ewayCVN><ewayOption1></ewayOption1><ewayOption2></ewayOption2><ewayOption3></ewayOption3><ewayCustomerIPAddress>127.0.0.1</ewayCustomerIPAddress><ewayCustomerBillingCountry>AUS</ewayCustomerBillingCountry></ewaygateway>',
+    ];
+  }
+
+  /**
+   * Get the expected response from eWAY for a single payment.
+   *
+   * @return array
+   */
+  public function getExpectedSinglePaymentErrorResponses() {
+    return [
+      '<ewayResponse><ewayTrxnStatus>False</ewayTrxnStatus><ewayTrxnNumber>10003</ewayTrxnNumber><ewayTrxnReference>xyz</ewayTrxnReference><ewayTrxnOption1/><ewayTrxnOption2/><ewayTrxnOption3/><ewayAuthCode>123456</ewayAuthCode><ewayReturnAmount>524</ewayReturnAmount><ewayTrxnError>24,Do Not Honour(Test Gateway)</ewayTrxnError></ewayResponse>',
+    ];
+  }
+
+}
diff --git a/ext/ewaysingle/tests/phpunit/bootstrap.php b/ext/ewaysingle/tests/phpunit/bootstrap.php
new file mode 100644
index 000000000000..a5b49253c819
--- /dev/null
+++ b/ext/ewaysingle/tests/phpunit/bootstrap.php
@@ -0,0 +1,63 @@
+<?php
+
+ini_set('memory_limit', '2G');
+ini_set('safe_mode', 0);
+// phpcs:disable
+eval(cv('php:boot --level=classloader', 'phpcode'));
+// phpcs:enable
+// Allow autoloading of PHPUnit helper classes in this extension.
+$loader = new \Composer\Autoload\ClassLoader();
+$loader->add('CRM_', __DIR__);
+$loader->add('Civi\\', __DIR__);
+$loader->add('api_', __DIR__);
+$loader->add('api\\', __DIR__);
+$loader->register();
+
+/**
+ * Call the "cv" command.
+ *
+ * @param string $cmd
+ *   The rest of the command to send.
+ * @param string $decode
+ *   Ex: 'json' or 'phpcode'.
+ * @return string
+ *   Response output (if the command executed normally).
+ * @throws \RuntimeException
+ *   If the command terminates abnormally.
+ */
+function cv($cmd, $decode = 'json') {
+  $cmd = 'cv ' . $cmd;
+  $descriptorSpec = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => STDERR);
+  $oldOutput = getenv('CV_OUTPUT');
+  putenv("CV_OUTPUT=json");
+
+  // Execute `cv` in the original folder. This is a work-around for
+  // phpunit/codeception, which seem to manipulate PWD.
+  $cmd = sprintf('cd %s; %s', escapeshellarg(getenv('PWD')), $cmd);
+
+  $process = proc_open($cmd, $descriptorSpec, $pipes, __DIR__);
+  putenv("CV_OUTPUT=$oldOutput");
+  fclose($pipes[0]);
+  $result = stream_get_contents($pipes[1]);
+  fclose($pipes[1]);
+  if (proc_close($process) !== 0) {
+    throw new RuntimeException("Command failed ($cmd):\n$result");
+  }
+  switch ($decode) {
+    case 'raw':
+      return $result;
+
+    case 'phpcode':
+      // If the last output is /*PHPCODE*/, then we managed to complete execution.
+      if (substr(trim($result), 0, 12) !== "/*BEGINPHP*/" || substr(trim($result), -10) !== "/*ENDPHP*/") {
+        throw new \RuntimeException("Command failed ($cmd):\n$result");
+      }
+      return $result;
+
+    case 'json':
+      return json_decode($result, 1);
+
+    default:
+      throw new RuntimeException("Bad decoder format ($decode)");
+  }
+}

From fab5b18c84bd80c24d79944a45a75a5abe4c98e3 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 5 Sep 2020 12:31:08 +1000
Subject: [PATCH 146/834] [NFC] Enable APIv4 Testing on the statusPrefence API
 Tests

---
 tests/phpunit/api/v3/StatusPreferenceTest.php | 34 ++++++++++++++-----
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/tests/phpunit/api/v3/StatusPreferenceTest.php b/tests/phpunit/api/v3/StatusPreferenceTest.php
index 4df4907d98c5..6d9b117ad798 100644
--- a/tests/phpunit/api/v3/StatusPreferenceTest.php
+++ b/tests/phpunit/api/v3/StatusPreferenceTest.php
@@ -16,13 +16,11 @@
  * @group headless
  */
 class api_v3_StatusPreferenceTest extends CiviUnitTestCase {
-  protected $_apiversion;
   protected $_contactID;
   protected $_locationType;
   protected $_params;
 
   public function setUp() {
-    $this->_apiversion = 3;
     parent::setUp();
     $this->useTransaction(TRUE);
     $this->_params = [
@@ -34,7 +32,11 @@ public function setUp() {
     ];
   }
 
-  public function testCreateStatusPreference() {
+  /**
+   * @dataProvider versionThreeAndFour
+   */
+  public function testCreateStatusPreference($version) {
+    $this->_apiversion = $version;
     $result = $this->callAPIAndDocument('StatusPreference', 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertNotNull($result['id'], 'In line ' . __LINE__);
     $id = $result['id'];
@@ -44,7 +46,11 @@ public function testCreateStatusPreference() {
     $this->callAPISuccess('StatusPreference', 'delete', ['id' => $result['id']]);
   }
 
-  public function testDeleteStatusPreference() {
+  /**
+   * @dataProvider versionThreeAndFour
+   */
+  public function testDeleteStatusPreference($version) {
+    $this->_apiversion = $version;
     // create one
     $create = $this->callAPISuccess('StatusPreference', 'create', $this->_params);
 
@@ -59,15 +65,19 @@ public function testDeleteStatusPreference() {
 
   /**
    * Test a get with empty params.
+   * @dataProvider versionThreeAndFour
    */
-  public function testStatusPreferenceGetEmptyParams() {
+  public function testStatusPreferenceGetEmptyParams($version) {
+    $this->_apiversion = $version;
     $result = $this->callAPISuccess('StatusPreference', 'Get', []);
   }
 
   /**
    * Test a StatusPreference get.
+   * @dataProvider versionThreeAndFour
    */
-  public function testStatusPreferenceGet() {
+  public function testStatusPreferenceGet($version) {
+    $this->_apiversion = $version;
     $statusPreference = $this->callAPISuccess('StatusPreference', 'create', $this->_params);
     $id = $statusPreference['id'];
     $params = [
@@ -82,16 +92,20 @@ public function testStatusPreferenceGet() {
 
   /**
    * Ensure you can't create a StatusPref with ignore_severity > 7.
+   * @dataProvider versionThreeAndFour
    */
-  public function testCreateInvalidMinimumReportSeverity() {
+  public function testCreateInvalidMinimumReportSeverity($version) {
+    $this->_apiversion = $version;
     $this->_params['ignore_severity'] = 45;
     $result = $this->callAPIFailure('StatusPreference', 'create', $this->_params);
   }
 
   /**
    * Test creating a severity by name, not integer.
+   * @dataProvider versionThreeAndFour
    */
-  public function testCreateSeverityByName() {
+  public function testCreateSeverityByName($version) {
+    $this->_apiversion = $version;
     // Any permutation of uppercase/lowercase should work.
     $this->_params['ignore_severity'] = 'cRItical';
     $result = $this->callAPIAndDocument('StatusPreference', 'create', $this->_params, __FUNCTION__, __FILE__);
@@ -101,8 +115,10 @@ public function testCreateSeverityByName() {
 
   /**
    * Test creating an invalid severity by name.
+   * @dataProvider versionThreeAndFour
    */
-  public function testCreateSeverityWithInvalidName() {
+  public function testCreateSeverityWithInvalidName($version) {
+    $this->_apiversion = $version;
     $this->_params['ignore_severity'] = 'wdsadasdarning';
     $result = $this->callAPIFailure('StatusPreference', 'create', $this->_params);
   }

From 4d53a8391ff3c8e38d1c4efe042faf90c1ef410a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 14:40:03 +1200
Subject: [PATCH 147/834] Remove unnecessary call to 'validateData' from pdf
 generator

the call to validateData fills the objects array - but the only object being used is 'contribution'
so there is an easier way to load it....

The UI way to pass through this code is to send a pdf receipt from contribution search

          'title' => ts('Receipts - print or email'),
---
 CRM/Contribute/Form/Task/PDF.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/CRM/Contribute/Form/Task/PDF.php b/CRM/Contribute/Form/Task/PDF.php
index e05ebab9d5a8..7b99516a88b9 100644
--- a/CRM/Contribute/Form/Task/PDF.php
+++ b/CRM/Contribute/Form/Task/PDF.php
@@ -142,12 +142,12 @@ public function postProcess() {
     $elements = self::getElements($this->_contributionIds, $params, $this->_contactIds);
 
     foreach ($elements['details'] as $contribID => $detail) {
-      $input = $ids = $objects = [];
+      $input = $ids = [];
 
       if (in_array($detail['contact'], $elements['excludeContactIds'])) {
         continue;
       }
-
+      // @todo - CRM_Contribute_BAO_Contribution::sendMail re-does pretty much everything between here & when we call it.
       $input['component'] = $detail['component'];
 
       $ids['contact'] = $detail['contact'];
@@ -158,11 +158,9 @@ public function postProcess() {
       $ids['participant'] = $detail['participant'] ?? NULL;
       $ids['event'] = $detail['event'] ?? NULL;
 
-      if (!$elements['baseIPN']->validateData($input, $ids, $objects, FALSE)) {
-        throw new CRM_Core_Exception('invalid data');
-      }
-
-      $contribution = &$objects['contribution'];
+      $contribution = new CRM_Contribute_BAO_Contribution();
+      $contribution->id = $contribID;
+      $contribution->fetch();
 
       // set some fake input values so we can reuse IPN code
       $input['amount'] = $contribution->total_amount;
@@ -181,9 +179,6 @@ public function postProcess() {
             1 => [$contribution->trxn_id, 'String'],
           ]);
 
-      // CRM_Contribute_BAO_Contribution::composeMessageArray expects mysql formatted date
-      $objects['contribution']->receive_date = CRM_Utils_Date::isoToMysql($objects['contribution']->receive_date);
-
       if (isset($params['from_email_address']) && !$elements['createPdf']) {
         // If a logged in user from email is used rather than a domain wide from email address
         // the from_email_address params key will be numerical and we need to convert it to be
@@ -195,7 +190,7 @@ public function postProcess() {
         $input['receipt_from_name'] = str_replace('"', '', $fromDetails[0]);
       }
 
-      $mail = CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects['contribution']->id, $elements['createPdf']);
+      $mail = CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $contribID, $elements['createPdf']);
 
       if ($mail['html']) {
         $message[] = $mail['html'];

From 3c86501c8e9c79a80ea29feab3906a2e4a036541 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 5 Sep 2020 12:50:14 +1000
Subject: [PATCH 148/834] [REF] Ensure that all bundle container services are
 public for Symfony v4

---
 Civi/Core/Container.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index a0bf20703287..d898c61fde3b 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -207,16 +207,16 @@ public function createContainer() {
     ))->setPublic(TRUE);
 
     $container->setDefinition('bundle.bootstrap3', new Definition('CRM_Core_Resources_Bundle', ['bootstrap3']))
-      ->setFactory('CRM_Core_Resources_Common::createBootstrap3Bundle');
+      ->setFactory('CRM_Core_Resources_Common::createBootstrap3Bundle')->setPublic(TRUE);
 
     $container->setDefinition('bundle.coreStyles', new Definition('CRM_Core_Resources_Bundle', ['coreStyles']))
-      ->setFactory('CRM_Core_Resources_Common::createStyleBundle');
+      ->setFactory('CRM_Core_Resources_Common::createStyleBundle')->setPublic(TRUE);
 
     $container->setDefinition('bundle.coreResources', new Definition('CRM_Core_Resources_Bundle', ['coreResources']))
-      ->setFactory('CRM_Core_Resources_Common::createFullBundle');
+      ->setFactory('CRM_Core_Resources_Common::createFullBundle')->setPublic(TRUE);
 
     $container->setDefinition('pear_mail', new Definition('Mail'))
-      ->setFactory('CRM_Utils_Mail::createMailer');
+      ->setFactory('CRM_Utils_Mail::createMailer')->setPublic(TRUE);
 
     if (empty(\Civi::$statics[__CLASS__]['boot'])) {
       throw new \RuntimeException('Cannot initialize container. Boot services are undefined.');

From 391ccd2781fc9d116dd04e012eb9123db456d018 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 14:50:55 +1200
Subject: [PATCH 149/834] Remove inaccessible call to baseIPN failed

As is now clear the updateContributionStatus function is only accessible to complete
a contribution. This removes the call to baseIPN->failed() as it is unreachable,
along with the hacky handling to support it
---
 CRM/Core/Payment/BaseIPN.php  | 16 +++++++---------
 CRM/Event/Form/Task/Batch.php |  8 --------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index d99c8c8f80cf..d3f56e9f70fc 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -232,17 +232,15 @@ public function failed(&$objects, $transaction = NULL, $input = []) {
       CRM_Contribute_BAO_ContributionRecur::copyCustomValues($objects['contributionRecur']->id, $contribution->id);
     }
 
-    if (empty($input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'])) {
-      if (!empty($memberships)) {
-        foreach ($memberships as $membership) {
-          // @fixme Should we cancel only Pending memberships? per cancelled()
-          $this->cancelMembership($membership, $membership->status_id, FALSE);
-        }
+    if (!empty($memberships)) {
+      foreach ($memberships as $membership) {
+        // @fixme Should we cancel only Pending memberships? per cancelled()
+        $this->cancelMembership($membership, $membership->status_id, FALSE);
       }
+    }
 
-      if ($participant) {
-        $this->cancelParticipant($participant->id);
-      }
+    if ($participant) {
+      $this->cancelParticipant($participant->id);
     }
 
     if ($transaction) {
diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index f8ac3af5f34a..66afd39c582f 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -284,7 +284,6 @@ public static function updatePendingOnlineContribution($participantId, $statusId
       $params = [
         'component_id' => $participantId,
         'contribution_id' => $contributionId,
-        'contribution_status_id' => array_search('Completed', $contributionStatuses),
         'IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved' => 1,
       ];
 
@@ -314,7 +313,6 @@ public static function updatePendingOnlineContribution($participantId, $statusId
    */
   public static function updateContributionStatus($params) {
     // get minimum required values.
-    $statusId = $params['contribution_status_id'] ?? NULL;
     $componentId = $params['component_id'] ?? NULL;
     $contributionId = $params['contribution_id'] ?? NULL;
 
@@ -357,12 +355,6 @@ public static function updateContributionStatus($params) {
       'flip' => 1,
     ]);
     $input['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'] = $params['IAmAHorribleNastyBeyondExcusableHackInTheCRMEventFORMTaskClassThatNeedsToBERemoved'] ?? NULL;
-    if ($statusId == $contributionStatuses['Failed']) {
-      $transaction = new CRM_Core_Transaction();
-      $baseIPN->failed($objects, $transaction, $input);
-      $transaction->commit();
-      return;
-    }
 
     // status is not pending
     if ($contribution->contribution_status_id != $contributionStatuses['Pending']) {

From 2ca2776d64db4524d23b9ba983019d5b3ce6854d Mon Sep 17 00:00:00 2001
From: KarinG <karin@semper-it.com>
Date: Fri, 4 Sep 2020 20:53:18 -0600
Subject: [PATCH 150/834] Tidy up
 testSubmitContributionPageWithPriceSetQuantity

---
 tests/phpunit/api/v3/ContributionPageTest.php | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index 83d2d3966fae..21c515e10416 100644
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -1940,7 +1940,6 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
 
     $this->setUpContributionPage();
     $submitParams = [
-      'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
       'id' => (int) $this->_ids['contribution_page'],
       'first_name' => 'J',
       'last_name' => 'T',
@@ -1949,7 +1948,11 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
       'receive_date' => date('Y-m-d H:i:s'),
     ];
 
-    // Create PriceSet/PriceField
+    // Add Existing PriceField
+    // This is a Shoe-eating Goat; qty = 1; unit_price = $10.00; There is no sales tax on Goats
+    $submitParams['price_' . $this->_ids['price_field'][0]] = reset($this->_ids['price_field_value']);
+
+    // Create additional PriceSet/PriceField
     $priceSetID = reset($this->_ids['price_set']);
     $priceField = $this->callAPISuccess('price_field', 'create', [
       'price_set_id' => $priceSetID,
@@ -1997,21 +2000,26 @@ public function testSubmitContributionPageWithPriceSetQuantity($thousandSeparato
       'contribution_page_id' => $this->_ids['contribution_page'],
     ]);
 
-    // Retrieve the lineItem that belongs to the Printing Rights and check the tax_amount CiviCRM Core calculated for it
+    // Retrieve the lineItem that belongs to the Goat
     $lineItem1 = $this->callAPISuccessGetSingle('LineItem', [
+      'contribution_id' => $contribution['id'],
+      'label' => 'Shoe-eating Goat',
+    ]);
+
+    // Retrieve the lineItem that belongs to the Printing Rights and check the tax_amount CiviCRM Core calculated for it
+    $lineItem2 = $this->callAPISuccessGetSingle('LineItem', [
       'contribution_id' => $contribution['id'],
       'label' => 'Printing Rights',
     ]);
 
     // Retrieve the lineItem that belongs to the Another Line Item and check the tax_amount CiviCRM Core calculated for it
-    $lineItem2 = $this->callAPISuccessGetSingle('LineItem', [
+    $lineItem3 = $this->callAPISuccessGetSingle('LineItem', [
       'contribution_id' => $contribution['id'],
       'label' => 'Another Line Item',
     ]);
 
-    $finalContribution = $this->callAPISuccess('Contribution', 'getsingle', ['id' => $contribution['id'], 'return' => ['tax_amount', 'total_amount']]);
-    $this->assertEquals($lineItem1['line_total'] + $lineItem2['line_total'], round(180 * 16.95 + 110 * 2.95, 2), 'Line Item Total is incorrect.');
-    $this->assertEquals(round($lineItem1['tax_amount'] + $lineItem2['tax_amount'], 2), round(180 * 16.95 * 0.10 + 110 * 2.95 * 0.10, 2), 'Wrong Sales Tax Amount is calculated and stored.');
+    $this->assertEquals($lineItem1['line_total'] + $lineItem2['line_total'] + $lineItem3['line_total'], round(10 + 180 * 16.95 + 110 * 2.95, 2), 'Line Item Total is incorrect.');
+    $this->assertEquals(round($lineItem1['tax_amount'] + $lineItem2['tax_amount'] + $lineItem3['tax_amount'], 2), round(180 * 16.95 * 0.10 + 110 * 2.95 * 0.10, 2), 'Wrong Sales Tax Amount is calculated and stored.');
   }
 
   /**

From d5e416c04c0b38750b64f9493daaf7ca5c5b6308 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 14:57:31 +1200
Subject: [PATCH 151/834] Rename variable key to participantID to make it clear
 what it is

---
 CRM/Event/Form/Task/Batch.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index f8ac3af5f34a..47bb8dd70e46 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -268,7 +268,7 @@ public static function updatePendingOnlineContribution($participantId, $statusId
     $contributionId = CRM_Contribute_BAO_Contribution::checkOnlinePendingContribution($participantId,
       'Event'
     );
-    if (!$contributionId || !$participantId) {
+    if (!$contributionId) {
       return;
     }
 
@@ -426,11 +426,11 @@ public function assignToTemplate() {
   public function submit($params) {
     $statusClasses = CRM_Event_PseudoConstant::participantStatusClass();
     if (isset($params['field'])) {
-      foreach ($params['field'] as $key => $value) {
+      foreach ($params['field'] as $participantID => $value) {
 
         //check for custom data
         $value['custom'] = CRM_Core_BAO_CustomField::postProcess($value,
-          $key,
+          $participantID,
           'Participant'
         );
         foreach (array_keys($value) as $fieldName) {
@@ -444,7 +444,7 @@ public function submit($params) {
           }
         }
 
-        $value['id'] = $key;
+        $value['id'] = $participantID;
 
         if (!empty($value['participant_role'])) {
           if (is_array($value['participant_role'])) {
@@ -460,9 +460,9 @@ public function submit($params) {
         $relatedStatusChange = FALSE;
         if (!empty($value['participant_status'])) {
           $value['status_id'] = $value['participant_status'];
-          $fromStatusId = $this->_fromStatusIds[$key] ?? NULL;
+          $fromStatusId = $this->_fromStatusIds[$participantID] ?? NULL;
           if (!$fromStatusId) {
-            $fromStatusId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $key, 'status_id');
+            $fromStatusId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant', $participantID, 'status_id');
           }
 
           if ($fromStatusId != $value['status_id']) {
@@ -479,11 +479,11 @@ public function submit($params) {
 
         //need to trigger mails when we change status
         if ($statusChange) {
-          CRM_Event_BAO_Participant::transitionParticipants([$key], $value['status_id'], $fromStatusId);
+          CRM_Event_BAO_Participant::transitionParticipants([$participantID], $value['status_id'], $fromStatusId);
         }
-        if ($relatedStatusChange && $key && $value['status_id']) {
+        if ($relatedStatusChange && $participantID && $value['status_id']) {
           //update related contribution status, CRM-4395
-          self::updatePendingOnlineContribution($key, $value['status_id']);
+          self::updatePendingOnlineContribution((int) $participantID, $value['status_id']);
         }
       }
       CRM_Core_Session::setStatus(ts('The updates have been saved.'), ts('Saved'), 'success');

From e6f479ea3f0ca3425c3c6b1e99cfabac34d4f15a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 15:07:31 +1200
Subject: [PATCH 152/834] Fix Invoice class to not call validateData

This avoids calling the BaseIPN validateData class from Invoice.php and calls the narrower
loadRelatedObjects to avoid having to change the code around it
---
 CRM/Contribute/Form/Task/Invoice.php                | 13 +++++--------
 .../CRM/Contribute/Form/Task/InvoiceTest.php        |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index b2087a647462..8701a47c5c88 100644
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -210,7 +210,7 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
     $pendingStatusId = CRM_Utils_Array::key('Pending', $contributionStatusID);
 
     foreach ($invoiceElements['details'] as $contribID => $detail) {
-      $input = $ids = $objects = [];
+      $input = $ids = [];
       if (in_array($detail['contact'], $invoiceElements['excludeContactIds'])) {
         continue;
       }
@@ -225,11 +225,10 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
       $ids['participant'] = $detail['participant'] ?? NULL;
       $ids['event'] = $detail['event'] ?? NULL;
 
-      if (!$invoiceElements['baseIPN']->validateData($input, $ids, $objects, FALSE)) {
-        CRM_Core_Error::statusBounce('Supplied data was not able to be validated');
-      }
-
-      $contribution = &$objects['contribution'];
+      $contribution = new CRM_Contribute_BAO_Contribution();
+      $contribution->id = $contribID;
+      $contribution->fetch();
+      $contribution->loadRelatedObjects($input, $ids, TRUE);
 
       $input['amount'] = $contribution->total_amount;
       $input['invoice_id'] = $contribution->invoice_id;
@@ -237,8 +236,6 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
       $input['contribution_status_id'] = $contribution->contribution_status_id;
       $input['organization_name'] = $contribution->_relatedObjects['contact']->organization_name;
 
-      $objects['contribution']->receive_date = CRM_Utils_Date::isoToMysql($objects['contribution']->receive_date);
-
       // Fetch the billing address. getValues should prioritize the billing
       // address, otherwise will return the primary address.
       $billingAddress = [];
diff --git a/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php b/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
index 01172c613359..e652922e80bf 100644
--- a/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
@@ -69,6 +69,7 @@ public function testInvoiceForDueDate() {
 
     $this->assertNotContains('Due Date', $invoiceHTML[$result['id']]);
     $this->assertNotContains('PAYMENT ADVICE', $invoiceHTML[$result['id']]);
+    $this->assertContains('Mr. Anthony Anderson II', $invoiceHTML[$result['id']]);
 
     $this->assertContains('Due Date', $invoiceHTML[$contribution['id']]);
     $this->assertContains('PAYMENT ADVICE', $invoiceHTML[$contribution['id']]);

From 863592c31644c445663bb8ad08b47aaed91ee24c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 15:52:12 +1200
Subject: [PATCH 153/834] Simply loading of related objects in transition
 components

This alters transitionComponents to  bypass validateData to load the related objects

Stepping through validateData it's clear that validate data
1) loads the contribution - this is now in transitionComponents
2) loads the contact - that is not specifically necessary as it is not used in transitionComponents
3) does some validation that relates to the IPNyness of BaseIPN but not to an internally called function
4) calls 'loadObjects'

LoadObjects does some error handling, sets the processorID if passed in, which it isn't  and then calls
contribution->loadRelatedObjects( )

- we now do that last call directly in-function

OrderTest::testCancelWithParticipant passes directly through this code
---
 CRM/Contribute/BAO/Contribution.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 2abaeb5b868b..38b1ce7bb532 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2129,11 +2129,7 @@ public static function transitionComponents($params, $processContributionObject
       return $updateResult;
     }
 
-    //now we are ready w/ required ids, start processing.
-
-    $baseIPN = new CRM_Core_Payment_BaseIPN();
-
-    $input = $ids = $objects = [];
+    $input = $ids = [];
 
     $input['component'] = $componentDetails['component'] ?? NULL;
     $ids['contribution'] = $contributionId;
@@ -2145,14 +2141,16 @@ public static function transitionComponents($params, $processContributionObject
     $ids['contributionRecur'] = NULL;
     $ids['contributionPage'] = NULL;
 
-    if (!$baseIPN->validateData($input, $ids, $objects, FALSE)) {
-      throw new CRM_Core_Exception('Unable to validate supplied data');
-    }
+    $contribution = new CRM_Contribute_BAO_Contribution();
+    $contribution->id = $ids['contribution'];
+    $contribution->find();
+
+    $contribution->loadRelatedObjects($input, $ids);
+
+    $memberships = $contribution->_relatedObjects['membership'] ?? [];
+    $participant = $contribution->_relatedObjects['participant'] ?? [];
+    $pledgePayment = $contribution->_relatedObjects['pledge_payment'] ?? [];
 
-    $memberships = &$objects['membership'];
-    $participant = &$objects['participant'];
-    $pledgePayment = &$objects['pledge_payment'];
-    $contribution = &$objects['contribution'];
     $pledgeID = $oldStatus = NULL;
     $pledgePaymentIDs = [];
     if ($pledgePayment) {

From 5d3726db9717307fe80593c0e9ea07dc6ef6f2f6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 15:58:34 +1200
Subject: [PATCH 154/834] dev/core#1921 Further removal of iso date handling

Same deal as https://github.com/civicrm/civicrm-core/pull/18359
---
 CRM/Core/Payment/PayPalIPN.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index b6948ddbd47b..289bdcd74558 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -98,14 +98,6 @@ public function recur($input, $ids, $objects, $first) {
 
     $now = date('YmdHis');
 
-    // fix dates that already exist
-    $dates = ['create', 'start', 'end', 'cancel', 'modified'];
-    foreach ($dates as $date) {
-      $name = "{$date}_date";
-      if ($recur->$name) {
-        $recur->$name = CRM_Utils_Date::isoToMysql($recur->$name);
-      }
-    }
     $sendNotification = FALSE;
     $subscriptionPaymentStatus = NULL;
     // set transaction type

From 87c5b5b481d9d5d29377264e9f83614f838efa18 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 16:03:30 +1200
Subject: [PATCH 155/834] Remove deprecated ids param

---
 CRM/Contribute/BAO/Contribution.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 2abaeb5b868b..c97eec991ba2 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -84,22 +84,17 @@ public function __construct() {
    *
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
-   * @param array $ids
-   *   The array that holds all the db ids.
    *
    * @return \CRM_Contribute_BAO_Contribution
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function add(&$params, $ids = []) {
+  public static function add(&$params) {
     if (empty($params)) {
       return NULL;
     }
-    if (!empty($ids)) {
-      CRM_Core_Error::deprecatedFunctionWarning('ids should not be passed into Contribution.add');
-    }
-    //per http://wiki.civicrm.org/confluence/display/CRM/Database+layer we are moving away from $ids array
-    $contributionID = CRM_Utils_Array::value('contribution', $ids, CRM_Utils_Array::value('id', $params));
+
+    $contributionID = $params['id'] ?? NULL;
     $action = $contributionID ? 'edit' : 'create';
     $duplicates = [];
     if (self::checkDuplicate($params, $duplicates, $contributionID)) {

From 0c1281235ead0ba3767780c13d159199b26b2d3d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 13:30:43 +1200
Subject: [PATCH 156/834] [REF] Code cleanup on membership renewal & test

This wound up being mainly a clean up of the test class & the addition of a test on changing
membership type.

However, there is a minor code consolidation which makes 3 actual changes
1) if we are doing a test renewal we shouldn't make the membership test
2) even when renewing a Pending membership we should save any submitted custom data
3) modified id is also set for pending (although future test work might indicate this can go
---
 CRM/Member/Form/MembershipRenewal.php         |  44 ++----
 .../CRM/Member/Form/MembershipRenewalTest.php | 146 ++++++------------
 2 files changed, 61 insertions(+), 129 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 162ca1cc613f..e7ea29422939 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -750,7 +750,19 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
     $ids = [];
     $currentMembership = civicrm_api3('Membership', 'getsingle', ['id' => $membershipID]);
-
+    $memParams = [
+      'id' => $currentMembership['id'],
+      'membership_type_id' => $membershipTypeID,
+      'join_date' => $currentMembership['join_date'],
+      'modified_id' => $contactID,
+      'custom' => $customFieldsFormatted,
+      'membership_activity_status' => ($pending || $isPayLater) ? 'Scheduled' : 'Completed',
+      // Since we are renewing, make status override false.
+      'is_override' => FALSE,
+    ];
+    if ($contributionRecurID) {
+      $memParams['contribution_recur_id'] = $contributionRecurID;
+    }
     // Do NOT do anything.
     //1. membership with status : PENDING/CANCELLED (CRM-2395)
     //2. Paylater/IPN renew. CRM-4556.
@@ -759,18 +771,11 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
       // CRM-15475
       array_search('Cancelled', CRM_Member_PseudoConstant::membershipStatus(NULL, " name = 'Cancelled' ", 'name', FALSE, TRUE)),
     ])) {
-      $memParams = [
-        'id' => $currentMembership['id'],
+      $memParams = array_merge($memParams, [
         'status_id' => $currentMembership['status_id'],
         'start_date' => $currentMembership['start_date'],
         'end_date' => $currentMembership['end_date'],
-        'join_date' => $currentMembership['join_date'],
-        'membership_type_id' => $membershipTypeID,
-        'membership_activity_status' => ($pending || $isPayLater) ? 'Scheduled' : 'Completed',
-      ];
-      if ($contributionRecurID) {
-        $memParams['contribution_recur_id'] = $contributionRecurID;
-      }
+      ]);
       return CRM_Member_BAO_Membership::create($memParams);
     }
 
@@ -785,18 +790,11 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
       $membershipTypeID,
       $numRenewTerms
     );
-    $memParams = [
-      'membership_type_id' => $membershipTypeID,
+    $memParams = array_merge($memParams, [
       'end_date' => $dates['end_date'] ?? NULL,
-      'join_date' => $currentMembership['join_date'],
       'start_date' => $isMembershipCurrent ? $currentMembership['start_date'] : ($dates['start_date'] ?? NULL),
-      'id' => $currentMembership['id'],
-      'is_test' => $is_test,
-      // Since we are renewing, make status override false.
-      'is_override' => FALSE,
-      'modified_id' => $contactID,
       'log_start_date' => $dates['log_start_date'],
-    ];
+    ]);
 
     // Now Renew the membership
     if ($isMembershipCurrent) {
@@ -804,16 +802,8 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
       if (!empty($currentMembership['id'])) {
         $ids['membership'] = $currentMembership['id'];
       }
-      $memParams['membership_activity_status'] = ($pending || $isPayLater) ? 'Scheduled' : 'Completed';
-    }
-
-    // Putting this in an IF is precautionary as it seems likely that it would be ignored if empty, but
-    // perhaps shouldn't be?
-    if ($contributionRecurID) {
-      $memParams['contribution_recur_id'] = $contributionRecurID;
     }
 
-    $memParams['custom'] = $customFieldsFormatted;
     // @todo stop passing $ids (membership and userId may be set by this point)
     $membership = CRM_Member_BAO_Membership::create($memParams, $ids);
 
diff --git a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
index 1b8fe6b3ce3e..f13fdf4c5291 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
@@ -77,12 +77,11 @@ public function setUp() {
     $this->_individualId = $this->individualCreate();
     $this->_paymentProcessorID = $this->processorCreate();
     $this->financialTypeID = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'financial_type_id', 'Member Dues');
-
-    $this->loadXMLDataSet(dirname(__FILE__) . '/dataset/data.xml');
+    $this->ids['contact']['organization'] = $this->organizationCreate();
     $this->membershipTypeAnnualFixedID = $this->callAPISuccess('membership_type', 'create', [
       'domain_id' => 1,
       'name' => 'AnnualFixed',
-      'member_of_contact_id' => 23,
+      'member_of_contact_id' => $this->ids['contact']['organization'],
       'duration_unit' => 'year',
       'duration_interval' => 1,
       'period_type' => 'fixed',
@@ -116,16 +115,13 @@ public function tearDown() {
     $this->quickCleanup(
       [
         'civicrm_relationship',
-        'civicrm_membership_type',
-        'civicrm_membership',
         'civicrm_uf_match',
         'civicrm_address',
       ]
     );
-    foreach ([17, 18, 23, 32] as $contactID) {
+    foreach ($this->ids['contact'] as $contactID) {
       $this->callAPISuccess('contact', 'delete', ['id' => $contactID, 'skip_undelete' => TRUE]);
     }
-    $this->callAPISuccess('relationship_type', 'delete', ['id' => 20]);
   }
 
   /**
@@ -137,43 +133,10 @@ public function tearDown() {
   public function testSubmit() {
     $form = $this->getForm();
     $this->createLoggedInUser();
-    $params = [
-      'cid' => $this->_individualId,
-      'join_date' => date('m/d/Y', time()),
-      'start_date' => '',
-      'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
-      'auto_renew' => '0',
-      'num_terms' => '1',
-      'source' => '',
-      'total_amount' => '50.00',
-      //Member dues, see data.xml
-      'financial_type_id' => '2',
-      'soft_credit_type_id' => '',
-      'soft_credit_contact_id' => '',
-      'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
-      'receipt_text_signup' => 'Thank you text',
-      'payment_processor_id' => $this->_paymentProcessorID,
-      'credit_card_number' => '4111111111111111',
-      'cvv2' => '123',
-      'credit_card_exp_date' => [
-        'M' => '9',
-        // TODO: Future proof
-        'Y' => '2024',
-      ],
-      'credit_card_type' => 'Visa',
-      'billing_first_name' => 'Test',
-      'billing_middlename' => 'Last',
-      'billing_street_address-5' => '10 Test St',
-      'billing_city-5' => 'Test',
-      'billing_state_province_id-5' => '1003',
-      'billing_postal_code-5' => '90210',
-      'billing_country_id-5' => '1228',
-    ];
+    $params = $this->getBaseSubmitParams();
     $form->_contactID = $this->_individualId;
 
-    $form->testSubmit($params);
+    $form->testSubmit(array_merge($params, ['total_amount' => 50]));
     $form->setRenewalMessage();
     $membership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $this->_individualId]);
     $this->callAPISuccessGetCount('ContributionRecur', ['contact_id' => $this->_individualId], 0);
@@ -216,42 +179,41 @@ public function testSubmitWithTax() {
     $this->enableTaxAndInvoicing();
     $this->relationForFinancialTypeWithFinancialAccount($this->financialTypeID);
     $form = $this->getForm();
-
-    $form->testSubmit([
-      'cid' => $this->_individualId,
-      'join_date' => date('Y-m-d'),
-      'start_date' => '',
-      'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
-      'auto_renew' => '0',
-      'num_terms' => '1',
-      'source' => '',
+    $form->testSubmit(array_merge($this->getBaseSubmitParams(), [
       'total_amount' => '50.00',
-      'financial_type_id' => $this->financialTypeID,
-      'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
-      'receipt_text_signup' => 'Thank you text',
-      'payment_processor_id' => $this->_paymentProcessorID,
-      'credit_card_number' => '4111111111111111',
-      'cvv2' => '123',
-      'credit_card_exp_date' => [
-        'M' => '9',
-        'Y' => date('Y') + 2,
-      ],
-      'credit_card_type' => 'Visa',
-      'billing_first_name' => 'Test',
-      'billing_middle_name' => 'Last',
-      'billing_street_address-5' => '10 Test St',
-      'billing_city-5' => 'Test',
-      'billing_state_province_id-5' => '1003',
-      'billing_postal_code-5' => '90210',
-      'billing_country_id-5' => '1228',
-    ]);
+    ]));
     $contribution = $this->callAPISuccessGetSingle('Contribution', ['contact_id' => $this->_individualId, 'is_test' => TRUE, 'return' => ['total_amount', 'tax_amount']]);
     $this->assertEquals(50, $contribution['total_amount']);
     $this->assertEquals(4.55, $contribution['tax_amount']);
   }
 
+  /**
+   * Test the submit function of the membership form.
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function testSubmitChangeType() {
+    $form = $this->getForm();
+    $this->createLoggedInUser();
+    $membershipBefore = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $this->_individualId]);
+    $newMembershipTypeID = $this->callAPISuccess('MembershipType', 'create', [
+      'name' => 'Monthly',
+      'member_of_contact_id' => $this->ids['contact']['organization'],
+      'financial_type_id' => $this->financialTypeID,
+      'duration_unit' => 'month',
+      'duration_interval' => 2,
+      'period_type' => 'rolling',
+    ])['id'];
+    $form->_contactID = $this->_individualId;
+
+    $form->testSubmit(array_merge($this->getBaseSubmitParams(), ['membership_type_id' => [$this->ids['contact']['organization'], $newMembershipTypeID]]));
+    $membership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $this->_individualId]);
+    $this->assertEquals($newMembershipTypeID, $membership['membership_type_id']);
+    // The date (31 Dec this year) should be progressed by 2 months to 28 Dec next year.
+    $this->assertEquals(date('Y', strtotime($membershipBefore['end_date'])) + 1 . '-02-28', $membership['end_date']);
+  }
+
   /**
    * Test the submit function of the membership form.
    *
@@ -277,7 +239,7 @@ public function testSubmitRecur() {
       'end_date' => '',
       'campaign_id' => '',
       // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '1',
       'is_recur' => 1,
       'num_terms' => '1',
@@ -285,8 +247,6 @@ public function testSubmitRecur() {
       'total_amount' => '77.00',
       //Member dues, see data.xml
       'financial_type_id' => '2',
-      'soft_credit_type_id' => 11,
-      'soft_credit_contact_id' => '',
       'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
       'receipt_text' => 'Thank you text',
       'payment_processor_id' => $this->_paymentProcessorID,
@@ -373,7 +333,7 @@ public function testSubmitRecurCompleteInstant() {
     $form->preProcess();
 
     $form->_contactID = $this->_individualId;
-    $params = $this->getBaseSubmitParams();
+    $params = array_merge($this->getBaseSubmitParams(), ['is_recur' => 1, 'auto_renew' => '1']);
     $form->_mode = 'test';
 
     $form->testSubmit($params);
@@ -459,11 +419,9 @@ public function testSubmitRecurCompleteInstantWithMail($thousandSeparator) {
     $form->preProcess();
 
     $form->_contactID = $this->_individualId;
-    $params = $this->getBaseSubmitParams();
-    $params['send_receipt'] = 1;
     $form->_mode = 'test';
 
-    $form->testSubmit($params);
+    $form->testSubmit(array_merge($this->getBaseSubmitParams(), ['is_recur' => 1, 'send_receipt' => 1, 'auto_renew' => 1]));
     $contributionRecur = $this->callAPISuccessGetSingle('ContributionRecur', ['contact_id' => $this->_individualId]);
     $this->assertEquals(1, $contributionRecur['is_email_receipt']);
     $this->mut->checkMailLog([
@@ -489,14 +447,12 @@ public function testSubmitPayLater() {
       'start_date' => '',
       'end_date' => '',
       // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
       'num_terms' => '2',
       'total_amount' => '50.00',
       //Member dues, see data.xml
       'financial_type_id' => '2',
-      'soft_credit_type_id' => '',
-      'soft_credit_contact_id' => '',
       'payment_instrument_id' => 4,
       'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
       'receipt_text_signup' => 'Thank you text',
@@ -537,18 +493,15 @@ public function testSubmitPayLaterWithBilling() {
     $originalMembership = $this->callAPISuccessGetSingle('membership', []);
     $params = [
       'cid' => $this->_individualId,
-      'join_date' => date('m/d/Y', time()),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the first value being the organisation & the second being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
       'num_terms' => '2',
       'total_amount' => '50.00',
       //Member dues, see data.xml
       'financial_type_id' => '2',
-      'soft_credit_type_id' => '',
-      'soft_credit_contact_id' => '',
       'payment_instrument_id' => 4,
       'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
       'receipt_text_signup' => 'Thank you text',
@@ -605,14 +558,12 @@ public function testSubmitComplete() {
       'start_date' => '',
       'end_date' => '',
       // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
       'num_terms' => '2',
       'total_amount' => '50.00',
       //Member dues, see data.xml
       'financial_type_id' => '2',
-      'soft_credit_type_id' => '',
-      'soft_credit_contact_id' => '',
       'payment_instrument_id' => 4,
       'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
       'receipt_text_signup' => 'Thank you text',
@@ -673,21 +624,12 @@ protected function getForm($mode = 'test') {
   protected function getBaseSubmitParams() {
     return [
       'cid' => $this->_individualId,
-      'price_set_id' => 0,
-      'join_date' => date('Y-m-d'),
-      'start_date' => '',
-      'end_date' => '',
-      'campaign_id' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
-      'auto_renew' => '1',
-      'is_recur' => 1,
+      // This format reflects the key being the organisation & the value being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'num_terms' => '1',
       'total_amount' => $this->formatMoneyInput('7800.90'),
       //Member dues, see data.xml
       'financial_type_id' => '2',
-      'soft_credit_type_id' => 11,
-      'soft_credit_contact_id' => '',
       'from_email_address' => '"Demonstrators Anonymous" <info@example.org>',
       'receipt_text' => 'Thank you text',
       'payment_processor_id' => $this->_paymentProcessorID,
@@ -729,7 +671,7 @@ public function testSubmitRenewExpired() {
 
     $params = [
       'contact_id' => $this->_individualId,
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'renewal_date' => '2020-06-10',
       'financial_type_id' => '2',
       'num_terms' => '1',

From 26626bac14d91d792818f2cf04deb3f01afe6e9f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Sep 2020 16:43:39 +1200
Subject: [PATCH 157/834] Load event title from participantID

This is a follow on to https://github.com/civicrm/civicrm-core/pull/18358 - after thinking
more I realised that I had already established this code is rarely reached and by
doing a very small query when it is we can avoid loading the whole event to pass in

Same test applies...
---
 CRM/Contribute/BAO/Contribution.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 2abaeb5b868b..3508d3753d5a 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -12,6 +12,7 @@
 use Civi\Api4\Activity;
 use Civi\Api4\ContributionPage;
 use Civi\Api4\ContributionRecur;
+use Civi\Api4\Participant;
 
 /**
  *
@@ -4406,8 +4407,9 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
       'financial_type_id',
     ];
 
-    $eventID = $objects['event']->id ?? NULL;
-
+    // @todo - accept payment_processor_id as an input parameter as it is part of the
+    // incoming payment information (at least when coming from a payment processor).
+    // this is the last 'object' to get rid of....
     $paymentProcessorId = '';
     if (isset($objects['paymentProcessor'])) {
       if (is_array($objects['paymentProcessor'])) {
@@ -4422,7 +4424,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
 
     $contributionParams = array_merge([
       'contribution_status_id' => $completedContributionStatusID,
-      'source' => self::getRecurringContributionDescription($contribution, $eventID),
+      'source' => self::getRecurringContributionDescription($contribution, $participantID),
     ], array_intersect_key($input, array_fill_keys($inputContributionWhiteList, 1)
     ));
 
@@ -4636,12 +4638,13 @@ public function loadRelatedMembershipObjects($ids = []) {
    * Get the description (source field) for the recurring contribution.
    *
    * @param CRM_Contribute_BAO_Contribution $contribution
-   * @param int|null $eventID
+   * @param int|null $participantID
    *
    * @return string
    * @throws \CiviCRM_API3_Exception
+   * @throws \API_Exception
    */
-  protected static function getRecurringContributionDescription($contribution, $eventID) {
+  protected static function getRecurringContributionDescription($contribution, $participantID) {
     if (!empty($contribution->source)) {
       return $contribution->source;
     }
@@ -4652,8 +4655,12 @@ protected static function getRecurringContributionDescription($contribution, $ev
       ]);
       return ts('Online Contribution') . ': ' . $contributionPageTitle;
     }
-    elseif ($eventID) {
-      return ts('Online Event Registration') . ': ' . CRM_Event_PseudoConstant::event($eventID);
+    elseif ($participantID) {
+      $eventTitle = Participant::get(FALSE)
+        ->addSelect('event.title')
+        ->addWhere('id', '=', (int) $participantID)
+        ->execute()->first()['event.title'];
+      return ts('Online Event Registration') . ': ' . $eventTitle;
     }
     elseif (!empty($contribution->contribution_recur_id)) {
       return 'recurring contribution';

From 89808b94c6e566be9c790aecede8aa0926206b39 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 5 Sep 2020 15:37:17 +1000
Subject: [PATCH 158/834] [REF] Hide eway extension in UI and only install it
 if the original eway payment processor is still being used

---
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php | 6 +++++-
 ext/ewaysingle/info.xml                       | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index efc87e6e14e0..8cecc02d43cb 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -77,7 +77,8 @@ public function upgrade_5_31_alpha1($rev) {
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
     $eWAYPaymentProcessorType = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_payment_processor_type WHERE class_name = 'Payment_eWAY'");
-    if ($eWAYPaymentProcessorType) {
+    $ewayPaymentProcessorCount = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_payment_processor WHERE payment_processor_type_id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]);
+    if ($ewayPaymentProcessorCount) {
       $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([
         'type' => 'module',
         'full_name' => 'ewaysingle',
@@ -97,6 +98,9 @@ public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
       ]);
       CRM_Core_DAO::executeQuery($managedEntity->usingReplace()->toSQL());
     }
+    else {
+      CRM_Core_DAO::executeQuery("DELETE FROM civicrm_payment_processor_type WHERE id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]);
+    }
     return TRUE;
   }
 
diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml
index d69c7cd3627d..7e9daa1dd5ba 100644
--- a/ext/ewaysingle/info.xml
+++ b/ext/ewaysingle/info.xml
@@ -16,6 +16,9 @@
   </urls>
   <releaseDate>2020-10-07</releaseDate>
   <version>1.0</version>
+  <tags>
+    <tag>mgmt:hidden</tag>
+  </tags>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.31</ver>

From 7538f64d04c889a40fffe51cdde462020794c651 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 6 Sep 2020 07:45:11 +1000
Subject: [PATCH 159/834] report#45 Switch out function call
 CRM_Utils_Array::value and extend test coverage

Minor fix for MySQL 8
---
 CRM/Contact/BAO/Group.php                 |  6 +++---
 tests/phpunit/CRM/Group/Page/AjaxTest.php | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
index 5fe886756d20..ab328527e0bb 100644
--- a/CRM/Contact/BAO/Group.php
+++ b/CRM/Contact/BAO/Group.php
@@ -1223,12 +1223,12 @@ public static function whereClause(&$params, $sortBy = TRUE, $excludeHidden = TR
       $clauses[] = '`groups`.parents IS NULL';
     }
 
-    $savedSearch = CRM_Utils_Array::value('savedSearch', $params);
+    $savedSearch = $params['savedSearch'] ?? NULL;
     if ($savedSearch == 1) {
-      $clauses[] = 'groups.saved_search_id IS NOT NULL';
+      $clauses[] = '`groups`.saved_search_id IS NOT NULL';
     }
     elseif ($savedSearch == 2) {
-      $clauses[] = 'groups.saved_search_id IS NULL';
+      $clauses[] = '`groups`.saved_search_id IS NULL';
     }
 
     // only show child groups of a specific parent group
diff --git a/tests/phpunit/CRM/Group/Page/AjaxTest.php b/tests/phpunit/CRM/Group/Page/AjaxTest.php
index 686e16fc9f3c..6eb09d8bb125 100644
--- a/tests/phpunit/CRM/Group/Page/AjaxTest.php
+++ b/tests/phpunit/CRM/Group/Page/AjaxTest.php
@@ -98,7 +98,27 @@ public function testGroupListWithFilter() {
     }
     $this->assertEquals(1, $groups['recordsTotal']);
     $this->assertEquals('not-me-active', $groups['data'][0]['title']);
+    // Search on just smart groups keeping the title filter
+    $_GET['savedSearch'] = 1;
+    try {
+      CRM_Group_Page_AJAX::getGroupList();
+    }
+    catch (CRM_Core_Exception_PrematureExitException $e) {
+      $groups = $e->errorData;
+    }
+    $this->assertEquals(0, $groups['recordsTotal']);
+    // Now search on just normal groups keeping the title filter
+    $_GET['savedSearch'] = 2;
+    try {
+      CRM_Group_Page_AJAX::getGroupList();
+    }
+    catch (CRM_Core_Exception_PrematureExitException $e) {
+      $groups = $e->errorData;
+    }
+    $this->assertEquals(1, $groups['recordsTotal']);
+    $this->assertEquals('not-me-active', $groups['data'][0]['title']);
     unset($_GET['title']);
+    unset($_GET['savedSearch']);
 
     // check on status
     $_GET['status'] = 2;

From 62e432ac496079921af108b55d7117b11550fe6b Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 2 Nov 2019 15:40:38 +1300
Subject: [PATCH 160/834] Add postAssert to check payments and contributions
 are valid on all tests.

---
 CRM/Contribute/Form/Contribution/Confirm.php  |  2 +-
 tests/phpunit/CiviTest/CiviUnitTestCase.php   | 23 ++++++++
 tests/phpunit/api/v3/ACLPermissionTest.php    |  1 +
 tests/phpunit/api/v3/ContributionPageTest.php | 58 ++++++++++++++-----
 4 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 0e5750e76899..b6c5a1e9c729 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1993,7 +1993,7 @@ public static function getFormParams($id, array $params) {
       if (!empty($params['payment_processor_id'])) {
         $params['is_pay_later'] = 0;
       }
-      elseif ($params['amount'] !== 0) {
+      elseif (($params['amount'] ?? 0) !== 0) {
         $params['is_pay_later'] = civicrm_api3('contribution_page', 'getvalue', [
           'id' => $id,
           'return' => 'is_pay_later',
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index bd09aec21b87..cf2f3fbffb14 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -134,6 +134,16 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase {
    */
   protected $ids = [];
 
+  /**
+   * Should financials be checked after the test but before tear down.
+   *
+   * Ideally all tests (or at least all that call any financial api calls ) should do this but there
+   * are some test data issues and some real bugs currently blockinng.
+   *
+   * @var bool
+   */
+  protected $isValidateFinancialsOnPostAssert = FALSE;
+
   /**
    * Class used for hooks during tests.
    *
@@ -479,6 +489,19 @@ protected function tearDown() {
     $this->assertEquals(NULL, CRM_Core_DAO::$_nullObject);
   }
 
+  /**
+   * CHeck that all tests that have created payments have created them with the right financial entities.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function assertPostConditions() {
+    if (!$this->isValidateFinancialsOnPostAssert) {
+      return;
+    }
+    $this->validateAllPayments();
+    $this->validateAllContributions();
+  }
+
   /**
    * Create a batch of external API calls which can
    * be executed concurrently.
diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index be9b40228510..58626c2767f6 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -51,6 +51,7 @@ public function tearDown() {
       'civicrm_acl_entity_role',
       'civicrm_acl_contact_cache',
       'civicrm_contribution',
+      'civicrm_line_item',
       'civicrm_participant',
       'civicrm_uf_match',
       'civicrm_activity',
diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php
index 21c515e10416..bf81029ff79e 100644
--- a/tests/phpunit/api/v3/ContributionPageTest.php
+++ b/tests/phpunit/api/v3/ContributionPageTest.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\PriceFieldValue;
+
 /**
  *  Test APIv3 civicrm_contribute_recur* functions
  *
@@ -40,6 +42,13 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase {
    */
   protected $_ids = [];
 
+  /**
+   * Should financials be checked after the test but before tear down.
+   *
+   * @var bool
+   */
+  protected $isValidateFinancialsOnPostAssert = TRUE;
+
   /**
    * Setup for test.
    *
@@ -348,7 +357,6 @@ public function testSubmitMembershipBlockNotSeparatePayment() {
     $submitParams = [
       'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
       'id' => (int) $this->_ids['contribution_page'],
-      'amount' => 10,
       'billing_first_name' => 'Billy',
       'billing_middle_name' => 'Goat',
       'billing_last_name' => 'Gruff',
@@ -454,11 +462,12 @@ public function testSubmitMembershipBlockNotSeparatePaymentZeroDollarsWithEmail(
     $this->_ids['membership_type'] = [$this->membershipTypeCreate(['minimum_fee' => 0])];
     $this->setUpMembershipContributionPage();
     $this->addProfile('supporter_profile', $this->_ids['contribution_page']);
+    $priceFieldValueID = reset($this->_ids['price_field_value']);
+    PriceFieldValue::update()->addWhere('id', '=', $priceFieldValueID)->setValues(['amount' => 0])->execute();
 
     $submitParams = [
-      'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
+      'price_' . $this->_ids['price_field'][0] => $priceFieldValueID,
       'id' => (int) $this->_ids['contribution_page'],
-      'amount' => 0,
       'billing_first_name' => 'Billy',
       'billing_middle_name' => 'Goat',
       'billing_last_name' => 'Gruffier',
@@ -485,17 +494,16 @@ public function testSubmitMembershipBlockNotSeparatePaymentZeroDollarsWithEmail(
   }
 
   /**
-   * Test submit with a pay later abnd check line item in mails.
+   * Test submit with a pay later and check line item in mails.
    *
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipBlockIsSeparatePaymentPayLaterWithEmail() {
     $mut = new CiviMailUtils($this, TRUE);
-    $this->setUpMembershipContributionPage();
+    $this->setUpMembershipContributionPage(TRUE);
     $submitParams = [
       'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
       'id' => (int) $this->_ids['contribution_page'],
-      'amount' => 10,
       'billing_first_name' => 'Billy',
       'billing_middle_name' => 'Goat',
       'billing_last_name' => 'Gruff',
@@ -504,9 +512,10 @@ public function testSubmitMembershipBlockIsSeparatePaymentPayLaterWithEmail() {
       'email-Primary' => 'billy-goat@the-bridge.net',
     ];
 
-    $this->callAPISuccess('contribution_page', 'submit', $submitParams);
-    $contribution = $this->callAPISuccess('contribution', 'getsingle', ['contribution_page_id' => $this->_ids['contribution_page']]);
-    $this->callAPISuccess('membership_payment', 'getsingle', ['contribution_id' => $contribution['id']]);
+    $this->callAPISuccess('ContributionPage', 'submit', $submitParams);
+    $contributions = $this->callAPISuccess('Contribution', 'get', ['contribution_page_id' => $this->_ids['contribution_page']])['values'];
+    $this->assertCount(2, $contributions);
+    $this->callAPISuccess('membership_payment', 'getsingle', ['contribution_id' => ['IN' => array_keys($contributions)]]);
     $mut->checkMailLog([
       'Membership Amount -...             $ 2.00',
     ]);
@@ -529,15 +538,14 @@ public function testSubmitMembershipBlockIsSeparatePayment() {
       'billing_middle_name' => 'Goat',
       'billing_last_name' => 'Gruff',
       'selectMembership' => $this->_ids['membership_type'][0],
-      'amount' => 10,
     ];
 
     $this->callAPISuccess('ContributionPage', 'submit', $submitParams);
     $contributions = $this->callAPISuccess('contribution', 'get', ['contribution_page_id' => $this->_ids['contribution_page']]);
     $this->assertCount(2, $contributions['values']);
     $lines = $this->callAPISuccess('LineItem', 'get', ['sequential' => 1]);
-    $this->assertEquals(10, $lines['values'][0]['line_total']);
-    $membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle', []);
+    $this->assertEquals(2, $lines['values'][0]['line_total']);
+    $membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle');
     $this->assertTrue(in_array($membershipPayment['contribution_id'], array_keys($contributions['values'])));
     $membership = $this->callAPISuccessGetSingle('membership', ['id' => $membershipPayment['membership_id']]);
     $this->assertEquals($membership['contact_id'], $contributions['values'][$membershipPayment['contribution_id']]['contact_id']);
@@ -555,7 +563,6 @@ public function testSubmitMembershipBlockIsSeparatePaymentWithPayLater() {
     $submitParams = [
       'price_' . $this->_ids['price_field'][0] => reset($this->_ids['price_field_value']),
       'id' => (int) $this->_ids['contribution_page'],
-      'amount' => 0,
       'billing_first_name' => 'Billy',
       'billing_middle_name' => 'Goat',
       'billing_last_name' => 'Gruff',
@@ -585,6 +592,8 @@ public function testSubmitMembershipBlockIsSeparatePaymentWithPayLater() {
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipBlockIsSeparatePaymentWithEmail() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $mut = new CiviMailUtils($this, TRUE);
     $this->setUpMembershipContributionPage(TRUE);
     $this->addProfile('supporter_profile', $this->_ids['contribution_page']);
@@ -634,6 +643,8 @@ public function testSubmitMembershipBlockIsSeparatePaymentWithEmail() {
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipBlockIsSeparatePaymentZeroDollarsPayLaterWithEmail() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $mut = new CiviMailUtils($this, TRUE);
     $this->_ids['membership_type'] = [$this->membershipTypeCreate(['minimum_fee' => 0])];
     $this->setUpMembershipContributionPage(TRUE);
@@ -673,6 +684,8 @@ public function testSubmitMembershipBlockIsSeparatePaymentZeroDollarsPayLaterWit
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipBlockTwoTypesIsSeparatePayment() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->_ids['membership_type'] = [$this->membershipTypeCreate(['minimum_fee' => 6])];
     $this->_ids['membership_type'][] = $this->membershipTypeCreate(['name' => 'Student', 'minimum_fee' => 50]);
     $this->setUpMembershipContributionPage(TRUE);
@@ -707,6 +720,8 @@ public function testSubmitMembershipBlockTwoTypesIsSeparatePayment() {
    * @throws \CiviCRM_API3_Exception
    */
   public function testSubmitMembershipBlockIsSeparatePaymentPaymentProcessorNow() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $mut = new CiviMailUtils($this, TRUE);
     $this->setUpMembershipContributionPage(TRUE);
     $processor = Civi\Payment\System::singleton()->getById($this->_paymentProcessor['id']);
@@ -883,6 +898,8 @@ public function testSubmitPaymentProcessorFailure() {
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantPaymentYear() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->doSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantPayment(['duration_unit' => 'year', 'recur_frequency_unit' => 'year']);
   }
 
@@ -897,6 +914,8 @@ public function testSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantP
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantPaymentMonth() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->doSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantPayment(['duration_unit' => 'month', 'recur_frequency_unit' => 'month']);
   }
 
@@ -919,6 +938,8 @@ public function testSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantP
    * @throws \CRM_Core_Exception
    */
   public function doSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantPayment($params = []) {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->params['is_recur'] = 1;
     $this->params['recur_frequency_unit'] = $params['recur_frequency_unit'];
     $membershipTypeParams['duration_unit'] = $params['duration_unit'];
@@ -1009,6 +1030,8 @@ public function doSubmitMembershipPriceSetPaymentPaymentProcessorRecurInstantPay
    * @throws \CRM_Core_Exception
    */
   public function testSubmitMembershipComplexNonPriceSetPaymentPaymentProcessorRecurInstantPayment() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->params['is_recur'] = 1;
     $this->params['recur_frequency_unit'] = $membershipTypeParams['duration_unit'] = 'year';
     // Add a membership so membership & contribution are not both 1.
@@ -1112,7 +1135,6 @@ public function testSubmitMembershipComplexPriceSetPaymentPaymentProcessorRecurI
       'price_' . $this->_ids['price_field']['org1'] => $this->_ids['price_field_value']['org1'],
       'price_' . $this->_ids['price_field']['org2'] => $this->_ids['price_field_value']['org2'],
       'id' => (int) $this->_ids['contribution_page'],
-      'amount' => 10,
       'billing_first_name' => 'Billy',
       'billing_middle_name' => 'Goat',
       'billing_last_name' => 'Gruff',
@@ -1268,7 +1290,7 @@ public function testSubmitMembershipPriceSetPaymentPaymentProcessorSeparatePayme
     $membershipPayment = $this->callAPISuccess('membership_payment', 'getsingle', []);
     $this->callAPISuccessGetSingle('membership', ['id' => $membershipPayment['membership_id']]);
     $this->assertNotEmpty($contribution['values'][$membershipPayment['contribution_id']]['contribution_recur_id']);
-    $this->callAPISuccess('contribution_recur', 'getsingle', []);
+    $this->callAPISuccess('contribution_recur', 'getsingle');
   }
 
   /**
@@ -1612,6 +1634,8 @@ public function setUpContributionPage($isRecur = FALSE) {
    * @throws \CRM_Core_Exception
    */
   public function setUpMultiIntervalMembershipContributionPage() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->setupPaymentProcessor();
     $contributionPage = $this->callAPISuccess($this->_entity, 'create', $this->params);
     $this->_ids['contribution_page'] = $contributionPage['id'];
@@ -1733,6 +1757,8 @@ protected function setupPaymentProcessor() {
    * @throws \CRM_Core_Exception
    */
   public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->params['adjust_recur_start_date'] = TRUE;
     $this->params['is_pay_later'] = FALSE;
     $this->setUpContributionPage();
@@ -1803,6 +1829,8 @@ public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {
    * @throws \CRM_Core_Exception
    */
   public function testSubmitPledgePayment() {
+    // Need to work on valid financials on this test.
+    $this->isValidateFinancialsOnPostAssert = FALSE;
     $this->testSubmitPledgePaymentPaymentProcessorRecurFuturePayment();
     $pledge = $this->callAPISuccess('pledge', 'getsingle', []);
     $params = [

From 6067e16b06c6da57700905de22bb8861659785a7 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 6 Sep 2020 10:59:14 +1200
Subject: [PATCH 161/834] Finish deprecating BaseIPN->completeTransaction

This has been marked deprecated, but still called for a long timme.

Now that it is just a one-liner I think it's cleaner if the core processors that use it do the one line
directly
---
 CRM/Core/Payment/AuthorizeNetIPN.php | 6 +++++-
 CRM/Core/Payment/BaseIPN.php         | 1 +
 CRM/Core/Payment/PayPalIPN.php       | 6 +++++-
 CRM/Core/Payment/PayPalProIPN.php    | 6 +++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index 83697bd338fa..ca4de653532f 100644
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -182,7 +182,11 @@ public function recur($input, $ids, $objects, $first) {
       return TRUE;
     }
 
-    $this->completeTransaction($input, $ids, $objects);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, [
+      'related_contact' => $ids['related_contact'] ?? NULL,
+      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+    ], $objects);
 
     // Only Authorize.net does this so it is on the a.net class. If there is a need for other processors
     // to do this we should make it available via the api, e.g as a parameter, changing the nuance
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index d99c8c8f80cf..518e35a2d2ed 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -461,6 +461,7 @@ private function cancelMembership($membership, $membershipStatusID, $onlyCancelP
    * @throws \CiviCRM_API3_Exception
    */
   public function completeTransaction($input, $ids, $objects) {
+    CRM_Core_Error::deprecatedFunctionWarning('Use Payment.create api');
     CRM_Contribute_BAO_Contribution::completeOrder($input, [
       'related_contact' => $ids['related_contact'] ?? NULL,
       'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index 289bdcd74558..830f085a0735 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -276,7 +276,11 @@ public function single($input, $ids, $objects, $recur = FALSE, $first = FALSE) {
       return;
     }
 
-    $this->completeTransaction($input, $ids, $objects);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, [
+      'related_contact' => $ids['related_contact'] ?? NULL,
+      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+    ], $objects);
   }
 
   /**
diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index 024d845b427a..a0f418eeee03 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -373,7 +373,11 @@ public function single($input, $ids, $objects, $recur = FALSE, $first = FALSE) {
       return;
     }
 
-    $this->completeTransaction($input, $ids, $objects);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, [
+      'related_contact' => $ids['related_contact'] ?? NULL,
+      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+    ], $objects);
   }
 
   /**

From 318c63045e82d30ed7fe8cdacb91a6d31fc5331b Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 6 Sep 2020 11:18:36 +1200
Subject: [PATCH 162/834] dev/core#1921 Fix legacy date handling

Per https://lab.civicrm.org/dev/core/-/issues/1921 this was required before dao->save()
right up until 2014
---
 CRM/Contribute/BAO/Contribution.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index a20a62853fdb..971f433f913e 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -454,18 +454,6 @@ public static function getNumTermsByContributionAndMembershipType($membershipTyp
    * @throws \CiviCRM_API3_Exception
    */
   public static function create(&$params, $ids = []) {
-    $dateFields = [
-      'receive_date',
-      'cancel_date',
-      'receipt_date',
-      'thankyou_date',
-      'revenue_recognition_date',
-    ];
-    foreach ($dateFields as $df) {
-      if (isset($params[$df])) {
-        $params[$df] = CRM_Utils_Date::isoToMysql($params[$df]);
-      }
-    }
 
     $transaction = new CRM_Core_Transaction();
 

From 62a721eda743ba248cf3b1a571a83f5fdbc72a56 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 6 Sep 2020 13:29:32 +1200
Subject: [PATCH 163/834] [REF] simplify interaction with objects in complete
 order

Per https://github.com/civicrm/civicrm-core/pull/18382 this line seems to be heavily tested so
& per the test we can use the 'already calculated value' for payment_processor_id rather than look
it up in yet another place.

This adds a query but in most cases queries can be removed before calling this function as
the various objects are not really accessed anymore (apart from the few lines just above this)
---
 CRM/Contribute/BAO/Contribution.php             | 5 ++---
 tests/phpunit/CRM/Member/BAO/MembershipTest.php | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index a20a62853fdb..06b843457efd 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -13,6 +13,7 @@
 use Civi\Api4\ContributionPage;
 use Civi\Api4\ContributionRecur;
 use Civi\Api4\Participant;
+use Civi\Api4\PaymentProcessor;
 
 /**
  *
@@ -4425,10 +4426,8 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
 
     $contributionParams['payment_processor'] = $paymentProcessorId;
 
-    // If paymentProcessor is not set then the payment_instrument_id would not be correct.
-    // not clear when or if this would occur if you encounter this please fix here & add a unit test.
     if (empty($contributionParams['payment_instrument_id']) && isset($contribution->_relatedObjects['paymentProcessor']['payment_instrument_id'])) {
-      $contributionParams['payment_instrument_id'] = $contribution->_relatedObjects['paymentProcessor']['payment_instrument_id'];
+      $contributionParams['payment_instrument_id'] = PaymentProcessor::get()->addWhere('id', '=', $paymentProcessorId)->addSelect('payment_instrument_id')->execute()->first()['payment_instrument_id'];
     }
 
     if ($recurringContributionID) {
diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
index 8cebb74c1c40..1da7704d03e0 100644
--- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
@@ -757,7 +757,9 @@ public function testMembershipPaymentForSingleContributionMultipleMembership() {
       'original_contribution_id' => $contribution['id'],
       'contribution_status_id' => 'Completed',
     ]);
-    $this->callAPISuccessGetCount('Contribution', [], 2);
+    $contributions = $this->callAPISuccess('Contribution', 'get', ['sequential' => 1])['values'];
+    $this->assertCount(2, $contributions);
+    $this->assertEquals('Debit Card', CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'payment_instrument_id', $contributions[1]['payment_instrument_id']));
     // @todo this fails depending on what tests it is run with due some bad stuff in Membership.create
     // It needs to be addressed but might involve the switch to ORDER. Membership BAO does bad line item stuff.
     // $this->callAPISuccessGetCount('LineItem', [], 6);

From cd0f2a34110d4603145900c74b961a41a844a55d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 6 Sep 2020 12:50:55 +1200
Subject: [PATCH 164/834] Add try catch to main loops on core ipn classes

---
 CRM/Core/Payment/AuthorizeNetIPN.php          | 101 ++++++-------
 CRM/Core/Payment/PayPalIPN.php                | 136 +++++++++---------
 CRM/Core/Payment/PayPalProIPN.php             | 122 ++++++++--------
 .../CRM/Core/Payment/PayPalProIPNTest.php     |  20 +--
 4 files changed, 191 insertions(+), 188 deletions(-)

diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index 83697bd338fa..3b36f17e9ae6 100644
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -35,61 +35,66 @@ public function __construct($inputData) {
    * @return bool|void
    */
   public function main($component = 'contribute') {
+    try {
+      //we only get invoice num as a key player from payment gateway response.
+      //for ARB we get x_subscription_id and x_subscription_paynum
+      $x_subscription_id = $this->retrieve('x_subscription_id', 'String');
+      $ids = $objects = $input = [];
 
-    //we only get invoice num as a key player from payment gateway response.
-    //for ARB we get x_subscription_id and x_subscription_paynum
-    $x_subscription_id = $this->retrieve('x_subscription_id', 'String');
-    $ids = $objects = $input = [];
+      if ($x_subscription_id) {
+        // Presence of the id means it is approved.
+        $input['component'] = $component;
 
-    if ($x_subscription_id) {
-      // Presence of the id means it is approved.
-      $input['component'] = $component;
+        // load post vars in $input
+        $this->getInput($input, $ids);
 
-      // load post vars in $input
-      $this->getInput($input, $ids);
+        // load post ids in $ids
+        $this->getIDs($ids, $input);
 
-      // load post ids in $ids
-      $this->getIDs($ids, $input);
-
-      // Attempt to get payment processor ID from URL
-      if (!empty($this->_inputParameters['processor_id'])) {
-        $paymentProcessorID = $this->_inputParameters['processor_id'];
-      }
-      else {
-        // This is an unreliable method as there could be more than one instance.
-        // Recommended approach is to use the civicrm/payment/ipn/xx url where xx is the payment
-        // processor id & the handleNotification function (which should call the completetransaction api & by-pass this
-        // entirely). The only thing the IPN class should really do is extract data from the request, validate it
-        // & call completetransaction or call fail? (which may not exist yet).
-        Civi::log()->warning('Unreliable method used to get payment_processor_id for AuthNet IPN - this will cause problems if you have more than one instance');
-        $paymentProcessorTypeID = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessorType',
-          'AuthNet', 'id', 'name'
-        );
-        $paymentProcessorID = (int) civicrm_api3('PaymentProcessor', 'getvalue', [
-          'is_test' => 0,
-          'options' => ['limit' => 1],
-          'payment_processor_type_id' => $paymentProcessorTypeID,
-          'return' => 'id',
-        ]);
-      }
+        // Attempt to get payment processor ID from URL
+        if (!empty($this->_inputParameters['processor_id'])) {
+          $paymentProcessorID = $this->_inputParameters['processor_id'];
+        }
+        else {
+          // This is an unreliable method as there could be more than one instance.
+          // Recommended approach is to use the civicrm/payment/ipn/xx url where xx is the payment
+          // processor id & the handleNotification function (which should call the completetransaction api & by-pass this
+          // entirely). The only thing the IPN class should really do is extract data from the request, validate it
+          // & call completetransaction or call fail? (which may not exist yet).
+          Civi::log()->warning('Unreliable method used to get payment_processor_id for AuthNet IPN - this will cause problems if you have more than one instance');
+          $paymentProcessorTypeID = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessorType',
+            'AuthNet', 'id', 'name'
+          );
+          $paymentProcessorID = (int) civicrm_api3('PaymentProcessor', 'getvalue', [
+            'is_test' => 0,
+            'options' => ['limit' => 1],
+            'payment_processor_type_id' => $paymentProcessorTypeID,
+            'return' => 'id',
+          ]);
+        }
 
-      if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
-        return FALSE;
-      }
-      if (!empty($ids['paymentProcessor']) && $objects['contributionRecur']->payment_processor_id != $ids['paymentProcessor']) {
-        Civi::log()->warning('Payment Processor does not match the recurring processor id.', ['civi.tag' => 'deprecated']);
-      }
+        if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
+          return FALSE;
+        }
+        if (!empty($ids['paymentProcessor']) && $objects['contributionRecur']->payment_processor_id != $ids['paymentProcessor']) {
+          Civi::log()->warning('Payment Processor does not match the recurring processor id.', ['civi.tag' => 'deprecated']);
+        }
 
-      if ($component == 'contribute' && $ids['contributionRecur']) {
-        // check if first contribution is completed, else complete first contribution
-        $first = TRUE;
-        if ($objects['contribution']->contribution_status_id == 1) {
-          $first = FALSE;
+        if ($component == 'contribute' && $ids['contributionRecur']) {
+          // check if first contribution is completed, else complete first contribution
+          $first = TRUE;
+          if ($objects['contribution']->contribution_status_id == 1) {
+            $first = FALSE;
+          }
+          return $this->recur($input, $ids, $objects, $first);
         }
-        return $this->recur($input, $ids, $objects, $first);
       }
+      return TRUE;
+    }
+    catch (CRM_Core_Exception $e) {
+      Civi::log()->debug($e->getMessage());
+      echo 'Invalid or missing data';
     }
-    return TRUE;
   }
 
   /**
@@ -107,9 +112,7 @@ public function recur($input, $ids, $objects, $first) {
 
     // do a subscription check
     if ($recur->processor_id != $input['subscription_id']) {
-      CRM_Core_Error::debug_log_message('Unrecognized subscription.');
-      echo 'Failure: Unrecognized subscription<p>';
-      return FALSE;
+      throw new CRM_Core_Exception('Unrecognized subscription.');
     }
 
     $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index 289bdcd74558..230804d871a1 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -53,8 +53,6 @@ public function __construct($inputData) {
   public function retrieve($name, $type, $abort = TRUE) {
     $value = CRM_Utils_Type::validate(CRM_Utils_Array::value($name, $this->_inputParameters), $type, FALSE);
     if ($abort && $value === NULL) {
-      Civi::log()->debug("PayPalIPN: Could not find an entry for $name");
-      echo "Failure: Missing Parameter<p>" . CRM_Utils_Type::escape($name, 'String');
       throw new CRM_Core_Exception("PayPalIPN: Could not find an entry for $name");
     }
     return $value;
@@ -286,84 +284,90 @@ public function single($input, $ids, $objects, $recur = FALSE, $first = FALSE) {
    * @throws \CiviCRM_API3_Exception
    */
   public function main() {
-    $objects = $ids = $input = [];
-    $component = $this->retrieve('module', 'String');
-    $input['component'] = $component;
+    try {
+      $objects = $ids = $input = [];
+      $component = $this->retrieve('module', 'String');
+      $input['component'] = $component;
 
-    $ids['contact'] = $this->retrieve('contactID', 'Integer', TRUE);
-    $contributionID = $ids['contribution'] = $this->retrieve('contributionID', 'Integer', TRUE);
-    $membershipID = $this->retrieve('membershipID', 'Integer', FALSE);
-    $contributionRecurID = $this->retrieve('contributionRecurID', 'Integer', FALSE);
+      $ids['contact'] = $this->retrieve('contactID', 'Integer', TRUE);
+      $contributionID = $ids['contribution'] = $this->retrieve('contributionID', 'Integer', TRUE);
+      $membershipID = $this->retrieve('membershipID', 'Integer', FALSE);
+      $contributionRecurID = $this->retrieve('contributionRecurID', 'Integer', FALSE);
 
-    $this->getInput($input);
+      $this->getInput($input);
 
-    if ($component == 'event') {
-      $ids['event'] = $this->retrieve('eventID', 'Integer', TRUE);
-      $ids['participant'] = $this->retrieve('participantID', 'Integer', TRUE);
-    }
-    else {
-      // get the optional ids
-      $ids['membership'] = $membershipID;
-      $ids['contributionRecur'] = $contributionRecurID;
-      $ids['contributionPage'] = $this->retrieve('contributionPageID', 'Integer', FALSE);
-      $ids['related_contact'] = $this->retrieve('relatedContactID', 'Integer', FALSE);
-      $ids['onbehalf_dupe_alert'] = $this->retrieve('onBehalfDupeAlert', 'Integer', FALSE);
-    }
+      if ($component == 'event') {
+        $ids['event'] = $this->retrieve('eventID', 'Integer', TRUE);
+        $ids['participant'] = $this->retrieve('participantID', 'Integer', TRUE);
+      }
+      else {
+        // get the optional ids
+        $ids['membership'] = $membershipID;
+        $ids['contributionRecur'] = $contributionRecurID;
+        $ids['contributionPage'] = $this->retrieve('contributionPageID', 'Integer', FALSE);
+        $ids['related_contact'] = $this->retrieve('relatedContactID', 'Integer', FALSE);
+        $ids['onbehalf_dupe_alert'] = $this->retrieve('onBehalfDupeAlert', 'Integer', FALSE);
+      }
 
-    $paymentProcessorID = $this->getPayPalPaymentProcessorID($input, $ids);
+      $paymentProcessorID = $this->getPayPalPaymentProcessorID($input, $ids);
 
-    Civi::log()->debug('PayPalIPN: Received (ContactID: ' . $ids['contact'] . '; trxn_id: ' . $input['trxn_id'] . ').');
+      Civi::log()->debug('PayPalIPN: Received (ContactID: ' . $ids['contact'] . '; trxn_id: ' . $input['trxn_id'] . ').');
 
-    // Debugging related to possible missing membership linkage
-    if ($contributionRecurID && $this->retrieve('membershipID', 'Integer', FALSE)) {
-      $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($contributionRecurID);
-      $membershipPayment = civicrm_api3('MembershipPayment', 'get', [
-        'contribution_id' => $templateContribution['id'],
-        'membership_id' => $membershipID,
-      ]);
-      $lineItems  = civicrm_api3('LineItem', 'get', [
-        'contribution_id' => $templateContribution['id'],
-        'entity_id' => $membershipID,
-        'entity_table' => 'civicrm_membership',
-      ]);
-      Civi::log()->debug('PayPalIPN: Received payment for membership ' . (int) $membershipID
-        . '. Original contribution was ' . (int) $contributionID . '. The template for this contribution is '
-        . $templateContribution['id'] . ' it is linked to ' . $membershipPayment['count']
-        . 'payments for this membership. It has ' . $lineItems['count'] . ' line items linked to  this membership.'
-        . '  it is  expected the original contribution will be linked by both entities to the membership.'
-      );
-      if (empty($membershipPayment['count']) && empty($lineItems['count'])) {
-        Civi::log()->debug('PayPalIPN: Will attempt to compensate');
-        $input['membership_id'] = $this->retrieve('membershipID', 'Integer', FALSE);
-      }
-      if ($contributionRecurID) {
-        $recurLinks = civicrm_api3('ContributionRecur', 'get', [
+      // Debugging related to possible missing membership linkage
+      if ($contributionRecurID && $this->retrieve('membershipID', 'Integer', FALSE)) {
+        $templateContribution = CRM_Contribute_BAO_ContributionRecur::getTemplateContribution($contributionRecurID);
+        $membershipPayment = civicrm_api3('MembershipPayment', 'get', [
+          'contribution_id' => $templateContribution['id'],
           'membership_id' => $membershipID,
-          'contribution_recur_id' => $contributionRecurID,
         ]);
-        Civi::log()->debug('PayPalIPN: Membership should be  linked to  contribution recur  record ' . $contributionRecurID
-          . ' ' . $recurLinks['count'] . 'links found'
+        $lineItems = civicrm_api3('LineItem', 'get', [
+          'contribution_id' => $templateContribution['id'],
+          'entity_id' => $membershipID,
+          'entity_table' => 'civicrm_membership',
+        ]);
+        Civi::log()->debug('PayPalIPN: Received payment for membership ' . (int) $membershipID
+          . '. Original contribution was ' . (int) $contributionID . '. The template for this contribution is '
+          . $templateContribution['id'] . ' it is linked to ' . $membershipPayment['count']
+          . 'payments for this membership. It has ' . $lineItems['count'] . ' line items linked to  this membership.'
+          . '  it is  expected the original contribution will be linked by both entities to the membership.'
         );
+        if (empty($membershipPayment['count']) && empty($lineItems['count'])) {
+          Civi::log()->debug('PayPalIPN: Will attempt to compensate');
+          $input['membership_id'] = $this->retrieve('membershipID', 'Integer', FALSE);
+        }
+        if ($contributionRecurID) {
+          $recurLinks = civicrm_api3('ContributionRecur', 'get', [
+            'membership_id' => $membershipID,
+            'contribution_recur_id' => $contributionRecurID,
+          ]);
+          Civi::log()->debug('PayPalIPN: Membership should be  linked to  contribution recur  record ' . $contributionRecurID
+            . ' ' . $recurLinks['count'] . 'links found'
+          );
+        }
+      }
+      if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
+        return;
       }
-    }
-    if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
-      return;
-    }
 
-    self::$_paymentProcessor = &$objects['paymentProcessor'];
-    if ($component == 'contribute') {
-      if ($ids['contributionRecur']) {
-        // check if first contribution is completed, else complete first contribution
-        $first = TRUE;
-        $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
-        if ($objects['contribution']->contribution_status_id == $completedStatusId) {
-          $first = FALSE;
+      self::$_paymentProcessor = &$objects['paymentProcessor'];
+      if ($component == 'contribute') {
+        if ($ids['contributionRecur']) {
+          // check if first contribution is completed, else complete first contribution
+          $first = TRUE;
+          $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
+          if ($objects['contribution']->contribution_status_id == $completedStatusId) {
+            $first = FALSE;
+          }
+          $this->recur($input, $ids, $objects, $first);
+          return;
         }
-        $this->recur($input, $ids, $objects, $first);
-        return;
       }
+      $this->single($input, $ids, $objects);
+    }
+    catch (CRM_Core_Exception $e) {
+      Civi::log()->debug($e->getMessage());
+      echo 'Invalid or missing data';
     }
-    $this->single($input, $ids, $objects);
   }
 
   /**
diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index 024d845b427a..f6b2f016d892 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -412,77 +412,83 @@ public function getPayPalPaymentProcessorID() {
   public function main() {
     CRM_Core_Error::debug_var('GET', $_GET, TRUE, TRUE);
     CRM_Core_Error::debug_var('POST', $_POST, TRUE, TRUE);
-    if ($this->_isPaymentExpress) {
-      $this->handlePaymentExpress();
-      return;
-    }
-    $objects = $ids = $input = [];
-    $this->_component = $input['component'] = self::getValue('m');
-    $input['invoice'] = self::getValue('i', TRUE);
-    // get the contribution and contact ids from the GET params
-    $ids['contact'] = self::getValue('c', TRUE);
-    $ids['contribution'] = self::getValue('b', TRUE);
-
-    $this->getInput($input);
-
-    if ($this->_component == 'event') {
-      $ids['event'] = self::getValue('e', TRUE);
-      $ids['participant'] = self::getValue('p', TRUE);
-      $ids['contributionRecur'] = self::getValue('r', FALSE);
-    }
-    else {
-      // get the optional ids
-      //@ how can this not be broken retrieving from GET as we are dealing with a POST request?
-      // copy & paste? Note the retrieve function now uses data from _REQUEST so this will be included
-      $ids['membership'] = self::retrieve('membershipID', 'Integer', 'GET', FALSE);
-      $ids['contributionRecur'] = self::getValue('r', FALSE);
-      $ids['contributionPage'] = self::getValue('p', FALSE);
-      $ids['related_contact'] = self::retrieve('relatedContactID', 'Integer', 'GET', FALSE);
-      $ids['onbehalf_dupe_alert'] = self::retrieve('onBehalfDupeAlert', 'Integer', 'GET', FALSE);
-    }
+    try {
+      if ($this->_isPaymentExpress) {
+        $this->handlePaymentExpress();
+        return;
+      }
+      $objects = $ids = $input = [];
+      $this->_component = $input['component'] = self::getValue('m');
+      $input['invoice'] = self::getValue('i', TRUE);
+      // get the contribution and contact ids from the GET params
+      $ids['contact'] = self::getValue('c', TRUE);
+      $ids['contribution'] = self::getValue('b', TRUE);
+
+      $this->getInput($input);
+
+      if ($this->_component == 'event') {
+        $ids['event'] = self::getValue('e', TRUE);
+        $ids['participant'] = self::getValue('p', TRUE);
+        $ids['contributionRecur'] = self::getValue('r', FALSE);
+      }
+      else {
+        // get the optional ids
+        //@ how can this not be broken retrieving from GET as we are dealing with a POST request?
+        // copy & paste? Note the retrieve function now uses data from _REQUEST so this will be included
+        $ids['membership'] = self::retrieve('membershipID', 'Integer', 'GET', FALSE);
+        $ids['contributionRecur'] = self::getValue('r', FALSE);
+        $ids['contributionPage'] = self::getValue('p', FALSE);
+        $ids['related_contact'] = self::retrieve('relatedContactID', 'Integer', 'GET', FALSE);
+        $ids['onbehalf_dupe_alert'] = self::retrieve('onBehalfDupeAlert', 'Integer', 'GET', FALSE);
+      }
 
-    if (!$ids['membership'] && $ids['contributionRecur']) {
-      $sql = "
+      if (!$ids['membership'] && $ids['contributionRecur']) {
+        $sql = "
     SELECT m.id
       FROM civicrm_membership m
 INNER JOIN civicrm_membership_payment mp ON m.id = mp.membership_id AND mp.contribution_id = %1
      WHERE m.contribution_recur_id = %2
      LIMIT 1";
-      $sqlParams = [
-        1 => [$ids['contribution'], 'Integer'],
-        2 => [$ids['contributionRecur'], 'Integer'],
-      ];
-      if ($membershipId = CRM_Core_DAO::singleValueQuery($sql, $sqlParams)) {
-        $ids['membership'] = $membershipId;
+        $sqlParams = [
+          1 => [$ids['contribution'], 'Integer'],
+          2 => [$ids['contributionRecur'], 'Integer'],
+        ];
+        if ($membershipId = CRM_Core_DAO::singleValueQuery($sql, $sqlParams)) {
+          $ids['membership'] = $membershipId;
+        }
       }
-    }
 
-    $paymentProcessorID = CRM_Utils_Array::value('processor_id', $this->_inputParameters);
-    if (!$paymentProcessorID) {
-      $paymentProcessorID = self::getPayPalPaymentProcessorID();
-    }
+      $paymentProcessorID = CRM_Utils_Array::value('processor_id', $this->_inputParameters);
+      if (!$paymentProcessorID) {
+        $paymentProcessorID = self::getPayPalPaymentProcessorID();
+      }
 
-    if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
-      return;
-    }
+      if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
+        return;
+      }
 
-    self::$_paymentProcessor = &$objects['paymentProcessor'];
-    //?? how on earth would we not have component be one of these?
-    // they are the only valid settings & this IPN file can't even be called without one of them
-    // grepping for this class doesn't find other paths to call this class
-    if ($this->_component == 'contribute' || $this->_component == 'event') {
-      if ($ids['contributionRecur']) {
-        // check if first contribution is completed, else complete first contribution
-        $first = TRUE;
-        $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
-        if ($objects['contribution']->contribution_status_id == $completedStatusId) {
-          $first = FALSE;
+      self::$_paymentProcessor = &$objects['paymentProcessor'];
+      //?? how on earth would we not have component be one of these?
+      // they are the only valid settings & this IPN file can't even be called without one of them
+      // grepping for this class doesn't find other paths to call this class
+      if ($this->_component == 'contribute' || $this->_component == 'event') {
+        if ($ids['contributionRecur']) {
+          // check if first contribution is completed, else complete first contribution
+          $first = TRUE;
+          $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
+          if ($objects['contribution']->contribution_status_id == $completedStatusId) {
+            $first = FALSE;
+          }
+          $this->recur($input, $ids, $objects, $first);
+          return;
         }
-        $this->recur($input, $ids, $objects, $first);
-        return;
       }
+      $this->single($input, $ids, $objects, FALSE, FALSE);
+    }
+    catch (CRM_Core_Exception $e) {
+      Civi::log()->debug($e->getMessage());
+      echo 'Invalid or missing data';
     }
-    $this->single($input, $ids, $objects, FALSE, FALSE);
   }
 
   /**
diff --git a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php
index 7e97b7b77f1f..201b5cc07db3 100644
--- a/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/PayPalProIPNTest.php
@@ -167,25 +167,15 @@ public function testIPNPaymentCRM13743() {
    * However, for Paypal Pro users payment express transactions can't work as they don't hold the component
    * which is required for them to be handled by either the Pro or Express class
    *
-   * So, the point of this test is simply to ensure it fails in a known way & with a better message than
-   * previously & that refactorings don't mess with that
-   *
-   * Obviously if the behaviour is fixed then the test should be updated!
+   * So, the point of this test is simply to ensure it fails in a known way
    */
   public function testIPNPaymentExpressNoError() {
     $this->setupRecurringPaymentProcessorTransaction();
     $paypalIPN = new CRM_Core_Payment_PayPalProIPN($this->getPaypalExpressTransactionIPN());
-    try {
-      $paypalIPN->main();
-    }
-    catch (CRM_Core_Exception $e) {
-      $contribution = $this->callAPISuccess('contribution', 'getsingle', ['id' => $this->_contributionID]);
-      // no change
-      $this->assertEquals(2, $contribution['contribution_status_id']);
-      $this->assertEquals('Paypal IPNS not handled other than recurring_payments', $e->getMessage());
-      return;
-    }
-    $this->fail('The Paypal Express IPN should have caused an exception');
+    $paypalIPN->main();
+    $contribution = $this->callAPISuccess('contribution', 'getsingle', ['id' => $this->_contributionID]);
+    // no change
+    $this->assertEquals(2, $contribution['contribution_status_id']);
   }
 
   /**

From a7bcb32d4b9eda2a5f2358c423c5c17abdbfe7b1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 5 Sep 2020 15:22:32 -0400
Subject: [PATCH 165/834] Remove redundant custom field types

The html_type 'Select Country' and 'Select State/Province' serve no purpose. They are the same as Select, just with a different data_type.

This adds an APIv3 shim to display the old types.
---
 CRM/Core/BAO/CustomField.php                  |  7 +-
 CRM/Core/SelectValues.php                     |  2 -
 CRM/Custom/Form/Field.php                     |  8 +-
 .../Page/MultipleRecordFieldsListing.php      |  4 +-
 .../Incremental/sql/5.31.alpha1.mysql.tpl     |  4 +
 Civi/Api4/Service/Spec/SpecFormatter.php      |  2 -
 api/v3/CustomField.php                        | 34 ++++++--
 .../phpunit/CRM/Core/BAO/CustomFieldTest.php  | 19 +++--
 .../CRM/Core/BAO/CustomValueTableTest.php     |  2 +-
 tests/phpunit/api/v3/CustomFieldTest.php      | 83 +++++++++++++++++++
 10 files changed, 131 insertions(+), 34 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 66871a7d5d8e..107242a5155c 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -250,7 +250,9 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) {
     // This provides legacy support for APIv3, allowing no-longer-existent html types
     if ($fieldName == 'html_type' && isset($props['version']) && $props['version'] == 3) {
       $options['Multi-Select'] = 'Multi-Select';
+      $options['Select Country'] = 'Select Country';
       $options['Multi-Select Country'] = 'Multi-Select Country';
+      $options['Select State/Province'] = 'Select State/Province';
       $options['Multi-Select State/Province'] = 'Multi-Select State/Province';
     }
     return $options;
@@ -678,11 +680,8 @@ public static function addQuickFormElement(
 
     $placeholder = $search ? ts('- any -') : ($useRequired ? ts('- select -') : ts('- none -'));
 
-    // FIXME: Why are select state/country separate widget types?
     $isSelect = (in_array($widget, [
       'Select',
-      'Select State/Province',
-      'Select Country',
       'CheckBox',
       'Radio',
     ]));
@@ -1057,8 +1056,6 @@ private static function formatDisplayValue($value, $field, $entityId = NULL) {
       case 'Select':
       case 'Autocomplete-Select':
       case 'Radio':
-      case 'Select Country':
-      case 'Select State/Province':
       case 'CheckBox':
         if ($field['data_type'] == 'ContactReference' && $value) {
           if (is_numeric($value)) {
diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index f7d22c826a1d..7adcd178c528 100644
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -174,8 +174,6 @@ public static function customHtmlType() {
       'CheckBox' => ts('Checkbox(es)'),
       'Select Date' => ts('Select Date'),
       'File' => ts('File'),
-      'Select State/Province' => ts('Select State/Province'),
-      'Select Country' => ts('Select Country'),
       'RichTextEditor' => ts('Rich Text Editor'),
       'Autocomplete-Select' => ts('Autocomplete-Select'),
       'Link' => ts('Link'),
diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index f5e6096c0e6c..840650e7d9f7 100644
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -82,8 +82,8 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
     ['TextArea' => 'TextArea', 'RichTextEditor' => 'RichTextEditor'],
     ['Date' => 'Select Date'],
     ['Radio' => 'Radio'],
-    ['StateProvince' => 'Select State/Province'],
-    ['Country' => 'Select Country'],
+    ['StateProvince' => 'Select'],
+    ['Country' => 'Select'],
     ['File' => 'File'],
     ['Link' => 'Link'],
     ['ContactReference' => 'Autocomplete-Select'],
@@ -158,8 +158,8 @@ public function preProcess() {
         ['TextArea' => ts('TextArea'), 'RichTextEditor' => ts('Rich Text Editor')],
         ['Date' => ts('Select Date')],
         ['Radio' => ts('Radio')],
-        ['StateProvince' => ts('Select State/Province')],
-        ['Country' => ts('Select Country')],
+        ['StateProvince' => ts('Select')],
+        ['Country' => ts('Select')],
         ['File' => ts('Select File')],
         ['Link' => ts('Link')],
         ['ContactReference' => ts('Autocomplete-Select')],
diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php b/CRM/Profile/Page/MultipleRecordFieldsListing.php
index 1311d85c3ee6..a6c92afc62a3 100644
--- a/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -341,8 +341,6 @@ public function browse() {
 
                   case 'Radio':
                   case 'Select':
-                  case 'Select Country':
-                  case 'Select State/Province':
                     $editable = TRUE;
                     $fieldAttributes['data-type'] = $spec['data_type'] == 'Boolean' ? 'boolean' : 'select';
                     if (!$spec['is_required']) {
@@ -408,7 +406,7 @@ public function browse() {
 
     $headers = [];
     if (!empty($fieldIDs)) {
-      $fields = ['Radio', 'Select', 'Select Country', 'Select State/Province'];
+      $fields = ['Radio', 'Select'];
       foreach ($fieldIDs as $fieldID) {
         if ($this->_pageViewType == 'profileDataView') {
           $headers[$fieldID] = $customGroupInfo[$fieldID]['fieldLabel'];
diff --git a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
index aaf47e53be3f..663ae49a2678 100644
--- a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
@@ -1 +1,5 @@
 {* file to handle db changes in 5.31.alpha1 during upgrade *}
+
+{* Remove Country & State special select fields *}
+UPDATE civicrm_custom_field SET html_type = 'Select'
+WHERE html_type IN ('Select Country', 'Select State/Province');
diff --git a/Civi/Api4/Service/Spec/SpecFormatter.php b/Civi/Api4/Service/Spec/SpecFormatter.php
index 23209a4e242c..9e00ba09f59c 100644
--- a/Civi/Api4/Service/Spec/SpecFormatter.php
+++ b/Civi/Api4/Service/Spec/SpecFormatter.php
@@ -143,8 +143,6 @@ public static function setInputTypeAndAttrs(FieldSpec &$fieldSpec, $data, $dataT
     unset($inputAttrs['type']);
 
     $map = [
-      'Select State/Province' => 'Select',
-      'Select Country' => 'Select',
       'Select Date' => 'Date',
       'Link' => 'Url',
     ];
diff --git a/api/v3/CustomField.php b/api/v3/CustomField.php
index a9b664b0b59a..ecfe665fddae 100644
--- a/api/v3/CustomField.php
+++ b/api/v3/CustomField.php
@@ -31,9 +31,11 @@
 function civicrm_api3_custom_field_create($params) {
 
   // Legacy handling for old way of naming serialized fields
-  if (!empty($params['html_type']) && ($params['html_type'] == 'CheckBox' || strpos($params['html_type'], 'Multi-') === 0)) {
-    $params['serialize'] = 1;
-    $params['html_type'] = str_replace('Multi-', '', $params['html_type']);
+  if (!empty($params['html_type'])) {
+    if ($params['html_type'] == 'CheckBox' || strpos($params['html_type'], 'Multi-') === 0) {
+      $params['serialize'] = 1;
+    }
+    $params['html_type'] = str_replace(['Multi-Select', 'Select Country', 'Select State/Province'], 'Select', $params['html_type']);
   }
 
   // Array created for passing options in params.
@@ -131,7 +133,14 @@ function civicrm_api3_custom_field_get($params) {
     if (!in_array('serialize', $params['return'])) {
       $params['return'][] = 'serialize';
     }
+    if (!in_array('data_type', $params['return'])) {
+      $params['return'][] = 'data_type';
+    }
   }
+  $legacyDataTypes = [
+    'Select State/Province' => 'StateProvince',
+    'Select Country' => 'Country',
+  ];
   if ($handleLegacy && !empty($params['html_type'])) {
     $serializedTypes = ['CheckBox', 'Multi-Select', 'Multi-Select Country', 'Multi-Select State/Province'];
     if (is_string($params['html_type'])) {
@@ -142,12 +151,16 @@ function civicrm_api3_custom_field_get($params) {
       elseif (!in_array($params['html_type'], $serializedTypes)) {
         $params['serialize'] = 0;
       }
+      if (isset($legacyDataTypes[$params['html_type']])) {
+        $params['data_type'] = $legacyDataTypes[$params['html_type']];
+        unset($params['html_type']);
+      }
     }
     elseif (is_array($params['html_type']) && !empty($params['html_type']['IN'])) {
       $excludeNonSerialized = !array_diff($params['html_type']['IN'], $serializedTypes);
       $onlyNonSerialized = !array_intersect($params['html_type']['IN'], $serializedTypes);
       $params['html_type']['IN'] = array_map(function($val) {
-        return str_replace('Multi-Select', 'Select', $val);
+        return str_replace(['Multi-Select', 'Select Country', 'Select State/Province'], 'Select', $val);
       }, $params['html_type']['IN']);
       if ($excludeNonSerialized) {
         $params['serialize'] = 1;
@@ -160,10 +173,15 @@ function civicrm_api3_custom_field_get($params) {
 
   $results = _civicrm_api3_basic_get(_civicrm_api3_get_BAO(__FUNCTION__), $params);
 
-  if ($handleLegacy && !empty($results['values']) && is_array($results['values']) && !isset($params['serialize'])) {
-    foreach ($results['values'] as $id => $result) {
-      if (!empty($result['serialize']) && !empty($result['html_type'])) {
-        $results['values'][$id]['html_type'] = str_replace('Select', 'Multi-Select', $result['html_type']);
+  if ($handleLegacy && !empty($results['values']) && is_array($results['values'])) {
+    foreach ($results['values'] as $id => &$result) {
+      if (!empty($result['html_type'])) {
+        if (in_array($result['data_type'], $legacyDataTypes)) {
+          $result['html_type'] = array_search($result['data_type'], $legacyDataTypes);
+        }
+        if (!empty($result['serialize'])) {
+          $result['html_type'] = str_replace('Select', 'Multi-Select', $result['html_type']);
+        }
       }
     }
   }
diff --git a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
index bf3cdf38c8f2..6642d75c7782 100644
--- a/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
+++ b/tests/phpunit/CRM/Core/BAO/CustomFieldTest.php
@@ -135,7 +135,7 @@ public function testGetDisplayedValues() {
     $fieldsToCreate = [
       [
         'data_type' => 'Country',
-        'html_type' => 'Select Country',
+        'html_type' => 'Select',
         'tests' => [
           'United States' => 1228,
           '' => NULL,
@@ -143,7 +143,8 @@ public function testGetDisplayedValues() {
       ],
       [
         'data_type' => 'StateProvince',
-        'html_type' => 'Multi-Select State/Province',
+        'html_type' => 'Select',
+        'serialize' => 1,
         'tests' => [
           '' => 0,
           'Alabama' => 1000,
@@ -296,21 +297,21 @@ public function testMoveField() {
       'custom_group_id' => $groups['A']['id'],
       'label' => 'Country A',
       'dataType' => 'Country',
-      'htmlType' => 'Select Country',
+      'htmlType' => 'Select',
       'default_value' => NULL,
     ]);
     $countryB = $this->customFieldCreate([
       'custom_group_id' => $groups['A']['id'],
       'label' => 'Country B',
       'dataType' => 'Country',
-      'htmlType' => 'Select Country',
+      'htmlType' => 'Select',
       'default_value' => NULL,
     ]);
     $countryC = $this->customFieldCreate([
       'custom_group_id' => $groups['B']['id'],
       'label' => 'Country C',
       'dataType' => 'Country',
-      'htmlType' => 'Select Country',
+      'htmlType' => 'Select',
       'default_value' => NULL,
     ]);
 
@@ -460,7 +461,7 @@ public function testGetFieldsForImport() {
         'options_per_line' => NULL,
         'text_length' => NULL,
         'data_type' => 'Country',
-        'html_type' => 'Select Country',
+        'html_type' => 'Select',
         'is_search_range' => '0',
         'id' => $this->getCustomFieldID('country'),
         'label' => 'Country',
@@ -499,7 +500,7 @@ public function testGetFieldsForImport() {
         'options_per_line' => NULL,
         'text_length' => NULL,
         'data_type' => 'Country',
-        'html_type' => 'Select Country',
+        'html_type' => 'Select',
         'is_search_range' => '0',
         'id' => $this->getCustomFieldID('multi_country'),
         'label' => 'Country-multi',
@@ -797,7 +798,7 @@ public function testGetFieldsForImport() {
         'import' => 1,
         'data_type' => 'StateProvince',
         'type' => 1,
-        'html_type' => 'Select State/Province',
+        'html_type' => 'Select',
         'text_length' => NULL,
         'options_per_line' => NULL,
         'is_search_range' => '0',
@@ -835,7 +836,7 @@ public function testGetFieldsForImport() {
         'data_type' => 'StateProvince',
         'name' => $this->getCustomFieldName('multi_state'),
         'type' => 1,
-        'html_type' => 'Select State/Province',
+        'html_type' => 'Select',
         'text_length' => NULL,
         'options_per_line' => NULL,
         'is_search_range' => '0',
diff --git a/tests/phpunit/CRM/Core/BAO/CustomValueTableTest.php b/tests/phpunit/CRM/Core/BAO/CustomValueTableTest.php
index 580df3134dfe..a4d51bdc0fee 100644
--- a/tests/phpunit/CRM/Core/BAO/CustomValueTableTest.php
+++ b/tests/phpunit/CRM/Core/BAO/CustomValueTableTest.php
@@ -89,7 +89,7 @@ public function testStoreStateProvince() {
     $fields = [
       'custom_group_id' => $customGroup['id'],
       'data_type' => 'StateProvince',
-      'html_type' => 'Select State/Province',
+      'html_type' => 'Select',
       'default_value' => '',
     ];
 
diff --git a/tests/phpunit/api/v3/CustomFieldTest.php b/tests/phpunit/api/v3/CustomFieldTest.php
index 8fc16468a1df..e5c900dd245f 100644
--- a/tests/phpunit/api/v3/CustomFieldTest.php
+++ b/tests/phpunit/api/v3/CustomFieldTest.php
@@ -107,6 +107,16 @@ public function testCustomFieldCreateAllAvailableFormInputs() {
     $dtype = CRM_Core_BAO_CustomField::dataType();
     $htype = CRM_Custom_Form_Field::$_dataToHTML;
 
+    // Legacy html types returned by v3
+    foreach ($htype as &$item) {
+      if (isset($item['StateProvince'])) {
+        $item['StateProvince'] = 'Select State/Province';
+      }
+      if (isset($item['Country'])) {
+        $item['Country'] = 'Select Country';
+      }
+    }
+
     $n = 0;
     foreach ($dtype as $dkey => $dvalue) {
       foreach ($htype[$n] as $hkey => $hvalue) {
@@ -678,4 +688,77 @@ public function testLegacyHtmlType() {
     $this->assertEquals('SingleSelect', $result['values'][0]['label']);
   }
 
+  public function testLegacyStateCountryTypes() {
+    $customGroup = $this->customGroupCreate([
+      'name' => 'testCustomGroup',
+      'title' => 'testCustomGroup',
+      'extends' => 'Individual',
+    ]);
+    $f1 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'CountrySelect',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'Country',
+      'html_type' => 'Select Country',
+    ]);
+    $f2 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'StateSelect',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'StateProvince',
+      'html_type' => 'Select State/Province',
+    ]);
+    $f3 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'MultiSelectSP',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'StateProvince',
+      'html_type' => 'Multi-Select State/Province',
+    ]);
+    $f4 = $this->callAPISuccess('CustomField', 'create', [
+      'label' => 'MultiSelectCountry',
+      'custom_group_id' => 'testCustomGroup',
+      'data_type' => 'Country',
+      'html_type' => 'Select Country',
+      'serialize' => 1,
+    ]);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => 'Multi-Select State/Province',
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('MultiSelectSP', $result['values'][0]['label']);
+    $this->assertEquals('Multi-Select State/Province', $result['values'][0]['html_type']);
+    $this->assertEquals('1', $result['values'][0]['serialize']);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => 'Multi-Select Country',
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('MultiSelectCountry', $result['values'][0]['label']);
+    $this->assertEquals('Multi-Select Country', $result['values'][0]['html_type']);
+    $this->assertEquals('1', $result['values'][0]['serialize']);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => 'Select Country',
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('CountrySelect', $result['values'][0]['label']);
+    $this->assertEquals('Select Country', $result['values'][0]['html_type']);
+    $this->assertEquals('0', $result['values'][0]['serialize']);
+
+    $result = $this->callAPISuccess('CustomField', 'get', [
+      'custom_group_id' => 'testCustomGroup',
+      'html_type' => 'Select State/Province',
+      'sequential' => 1,
+    ]);
+    $this->assertCount(1, $result['values']);
+    $this->assertEquals('StateSelect', $result['values'][0]['label']);
+    $this->assertEquals('Select State/Province', $result['values'][0]['html_type']);
+    $this->assertEquals('0', $result['values'][0]['serialize']);
+  }
+
 }

From b3dd4cb004d8fcd18bd58b27465e5b91c271a8e3 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Wed, 2 Sep 2020 20:36:00 -0400
Subject: [PATCH 166/834] e_warning when editing custom field

---
 CRM/Logging/Schema.php                   | 10 ++++---
 tests/phpunit/CRM/Logging/SchemaTest.php | 38 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
index 25b63413d254..2d1d0e303791 100644
--- a/CRM/Logging/Schema.php
+++ b/CRM/Logging/Schema.php
@@ -441,10 +441,12 @@ public function fixSchemaDifferencesFor($table, $cols = []) {
     // should treat it as a modification.
     $this->resetSchemaCacheForTable("log_$table");
     $logTableSchema = $this->columnSpecsOf("log_$table");
-    foreach ($cols['ADD'] as $colKey => $col) {
-      if (array_key_exists($col, $logTableSchema)) {
-        $cols['MODIFY'][] = $col;
-        unset($cols['ADD'][$colKey]);
+    if (!empty($cols['ADD'])) {
+      foreach ($cols['ADD'] as $colKey => $col) {
+        if (array_key_exists($col, $logTableSchema)) {
+          $cols['MODIFY'][] = $col;
+          unset($cols['ADD'][$colKey]);
+        }
       }
     }
 
diff --git a/tests/phpunit/CRM/Logging/SchemaTest.php b/tests/phpunit/CRM/Logging/SchemaTest.php
index 63269ab3185b..19631715e225 100644
--- a/tests/phpunit/CRM/Logging/SchemaTest.php
+++ b/tests/phpunit/CRM/Logging/SchemaTest.php
@@ -324,6 +324,44 @@ public function testEnumChange() {
     $this->assertEquals("'A','B','C','D'", $ci['civicrm_test_enum_change']['test_enum']['ENUM_VALUES']);
   }
 
+  /**
+   * Test editing a custom field
+   */
+  public function testCustomFieldEdit() {
+    $schema = new CRM_Logging_Schema();
+    $schema->enableLogging();
+    $customGroup = $this->entityCustomGroupWithSingleFieldCreate('Contact', 'ContactTest.php');
+
+    // get the custom group table name
+    $params = ['id' => $customGroup['custom_group_id']];
+    $custom_group = $this->callAPISuccess('custom_group', 'getsingle', $params);
+
+    // get the field db column name
+    $params = ['id' => $customGroup['custom_field_id']];
+    $custom_field = $this->callAPISuccess('custom_field', 'getsingle', $params);
+
+    // check it
+    $dao = CRM_Core_DAO::executeQuery("SHOW CREATE TABLE `log_{$custom_group['table_name']}`");
+    $dao->fetch();
+    $this->assertStringContainsString("`{$custom_field['column_name']}` varchar(255)", $dao->Create_Table);
+
+    // Edit the field
+    $params = [
+      'id' => $customGroup['custom_field_id'],
+      'label' => 'Label changed',
+      'text_length' => 768,
+    ];
+    $this->callAPISuccess('custom_field', 'create', $params);
+
+    // update logging schema
+    $schema->fixSchemaDifferences();
+
+    // verify
+    $dao = CRM_Core_DAO::executeQuery("SHOW CREATE TABLE `log_{$custom_group['table_name']}`");
+    $dao->fetch();
+    $this->assertStringContainsString("`{$custom_field['column_name']}` varchar(768)", $dao->Create_Table);
+  }
+
   /**
    * Determine if we are running on MySQL 8 version 8.0.19 or later.
    *

From fd1e4c76e45a2f1f3509ec2547ae9edcb3f1cb2e Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sun, 6 Sep 2020 17:19:44 -0400
Subject: [PATCH 167/834] mismatched classnames

---
 tests/phpunit/CRM/Contact/AllTests.php           | 16 ++--------------
 .../CRM/Contact/BAO/RelationshipCacheTest.php    |  2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/tests/phpunit/CRM/Contact/AllTests.php b/tests/phpunit/CRM/Contact/AllTests.php
index 5329cd1b76a8..e71083ed08ba 100644
--- a/tests/phpunit/CRM/Contact/AllTests.php
+++ b/tests/phpunit/CRM/Contact/AllTests.php
@@ -1,8 +1,6 @@
 <?php
-// vim: set si ai expandtab tabstop=4 shiftwidth=4 softtabstop=4:
-
 /**
- *  File for the CRM_Contacts_AllTests class
+ *  File for the CRM_Contact_AllTests class
  *
  *  (PHP 5)
  *
@@ -34,7 +32,7 @@
  *
  * @package   CiviCRM
  */
-class CRM_Contacts_AllTests extends CiviTestSuite {
+class CRM_Contact_AllTests extends CiviTestSuite {
   private static $instance = NULL;
 
   /**
@@ -55,13 +53,3 @@ public static function suite() {
   }
 
 }
-// class CRM_Contacts_AllTests
-
-// -- set Emacs parameters --
-// Local variables:
-// mode: php;
-// tab-width: 4
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
diff --git a/tests/phpunit/CRM/Contact/BAO/RelationshipCacheTest.php b/tests/phpunit/CRM/Contact/BAO/RelationshipCacheTest.php
index 9c5f900178ec..67fd78535ed8 100644
--- a/tests/phpunit/CRM/Contact/BAO/RelationshipCacheTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/RelationshipCacheTest.php
@@ -15,7 +15,7 @@
  * @package CiviCRM
  * @group headless
  */
-class RelationshipCacheTest extends CiviUnitTestCase {
+class CRM_Contact_BAO_RelationshipCacheTest extends CiviUnitTestCase {
 
   protected function setUp() {
     $this->useTransaction(TRUE);

From eb0fd0ce726c565827e10020dde87b3d9c249f09 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 7 Sep 2020 09:32:41 +1200
Subject: [PATCH 168/834] [REF] Remove unused lines from loadObjects

loadObjects is only called from one place. As we can see the contribution object is
always passed in so we don't need to handle the possibility of it being anything other than a
BAO (I tweaked the error handling around that line too to make it clearer where it was
coming from)
---
 CRM/Core/Payment/BaseIPN.php | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index d99c8c8f80cf..cd8f54f9a3fd 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -92,9 +92,7 @@ public function validateData($input, &$ids, &$objects, $required = TRUE, $paymen
     $contribution = new CRM_Contribute_BAO_Contribution();
     $contribution->id = $ids['contribution'];
     if (!$contribution->find(TRUE)) {
-      CRM_Core_Error::debug_log_message("Could not find contribution record: {$contribution->id} in IPN request: " . print_r($input, TRUE));
-      echo "Failure: Could not find contribution record for {$contribution->id}<p>";
-      return FALSE;
+      throw new CRM_Core_Exception('Failure: Could not find contribution record for ' . (int) $contribution->id, NULL, ['context' => "Could not find contribution record: {$contribution->id} in IPN request: " . print_r($input, TRUE)]);
     }
 
     // make sure contact exists and is valid
@@ -159,17 +157,8 @@ public function loadObjects($input, &$ids, &$objects, $required, $paymentProcess
         'echo_error' => 1,
       ];
     }
+    $contribution = &$objects['contribution'];
     $ids['paymentProcessor'] = $paymentProcessorID;
-    if (is_a($objects['contribution'], 'CRM_Contribute_BAO_Contribution')) {
-      $contribution = &$objects['contribution'];
-    }
-    else {
-      //legacy support - functions are 'used' to be able to pass in a DAO
-      $contribution = new CRM_Contribute_BAO_Contribution();
-      $contribution->id = $ids['contribution'] ?? NULL;
-      $contribution->find(TRUE);
-      $objects['contribution'] = &$contribution;
-    }
     try {
       $success = $contribution->loadRelatedObjects($input, $ids);
       if ($required && empty($contribution->_relatedObjects['paymentProcessor'])) {

From 70fe72324318c7342c1c21df5c5f87dfe2757ef3 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 7 Sep 2020 06:37:25 +1000
Subject: [PATCH 169/834] [REF] Mark
 CRM_Contribute_BAO_Contribution_Utils::formatAmount deprecated and replace
 its only usage with CRM_Utils_Rule::cleanMoney

---
 CRM/Contribute/BAO/Contribution.php       | 2 +-
 CRM/Contribute/BAO/Contribution/Utils.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index a20a62853fdb..042152c1c2c4 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -5492,7 +5492,7 @@ public static function createProportionalEntry($entityParams, $eftParams) {
       $paid = $entityParams['line_item_amount'] * ($entityParams['trxn_total_amount'] / $entityParams['contribution_total_amount']);
     }
     // Record Entity Financial Trxn; CRM-20145
-    $eftParams['amount'] = CRM_Contribute_BAO_Contribution_Utils::formatAmount($paid);
+    $eftParams['amount'] = $paid;
     civicrm_api3('EntityFinancialTrxn', 'create', $eftParams);
   }
 
diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 21fd4716d431..683b92c6a618 100644
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -496,6 +496,7 @@ public static function calculateTaxAmount($amount, $taxRate) {
    *   Amount rounded and returned with the desired decimal places
    */
   public static function formatAmount($amount, $decimals = 2) {
+    CRM_Core_Error::deprecatedFunctionWarning('Use CRM_Utils_Rule::cleanMoney instead');
     return number_format((float) round($amount, (int) $decimals), (int) $decimals, '.', '');
   }
 

From e4addeb23f80dadc1a0763c65c9231ddc7571b80 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Wed, 5 Aug 2020 15:41:00 -0400
Subject: [PATCH 170/834] [REF] change deprecated function to API4 call

---
 CRM/Contribute/Form/Contribution/Confirm.php  | 28 ++++++++++---------
 .../CRM/Contribute/BAO/ContributionTest.php   | 11 ++++----
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 228e285dfdee..d1916a14c42c 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1145,19 +1145,9 @@ public static function processOnBehalfOrganization(&$behalfOrganization, &$conta
     // create employer relationship with $contactID only when new organization is there
     // else retain the existing relationship
     else {
-      // get the Employee relationship type id
-      $relTypeId = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_RelationshipType', 'Employee of', 'id', 'name_a_b');
-
-      // keep relationship params ready
-      $relParams['relationship_type_id'] = $relTypeId . '_a_b';
-      $relParams['is_permission_a_b'] = 1;
-      $relParams['is_active'] = 1;
       $isNotCurrentEmployer = TRUE;
     }
 
-    // formalities for creating / editing organization.
-    $behalfOrganization['contact_type'] = 'Organization';
-
     if (!$orgID) {
       // check if matching organization contact exists
       $dupeIDs = CRM_Contact_BAO_Contact::getDuplicateContacts($behalfOrganization, 'Organization', 'Unsupervised', [], FALSE);
@@ -1182,14 +1172,26 @@ public static function processOnBehalfOrganization(&$behalfOrganization, &$conta
     }
 
     // create organization, add location
+    $behalfOrganization['contact_type'] = 'Organization';
     $orgID = CRM_Contact_BAO_Contact::createProfileContact($behalfOrganization, $fields, $orgID,
       NULL, NULL, 'Organization'
     );
     // create relationship
     if ($isNotCurrentEmployer) {
-      $relParams['contact_check'][$orgID] = 1;
-      $cid = ['contact' => $contactID];
-      CRM_Contact_BAO_Relationship::legacyCreateMultiple($relParams, $cid);
+      try {
+        \Civi\Api4\Relationship::create(FALSE)
+          ->addValue('contact_id_a', $contactID)
+          ->addValue('contact_id_b', $orgID)
+          ->addValue('relationship_type_id', CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_RelationshipType', 'Employee of', 'id', 'name_a_b'))
+          ->addValue('is_permission_a_b:name', 'View and update')
+          ->execute();
+      }
+      catch (CRM_Core_Exception $e) {
+        // Ignore if duplicate relationship.
+        if ($e->getMessage() !== 'Duplicate Relationship') {
+          throw $e;
+        }
+      }
     }
 
     // if multiple match - send a duplicate alert
diff --git a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
index 1a06b3df1ff7..b73e7c9f8a04 100644
--- a/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
+++ b/tests/phpunit/CRM/Contribute/BAO/ContributionTest.php
@@ -1338,7 +1338,7 @@ public function testProcessOnBehalfOrganization() {
       'postal_code' => '222222',
       'country' => 'United States',
     ];
-    $contactID = $this->individualCreate();
+    $originalContactId = $contactID = $this->individualCreate();
     $orgId = $this->organizationCreate(['organization_name' => 'testorg1']);
     $orgCount = $this->callAPISuccessGetCount('Contact', [
       'contact_type' => "Organization",
@@ -1347,7 +1347,7 @@ public function testProcessOnBehalfOrganization() {
     $this->assertEquals($orgCount, 1);
 
     $values = $params = [];
-    $behalfOrganization = [
+    $originalBehalfOrganization = $behalfOrganization = [
       'organization_name' => 'testorg1',
       'phone' => [
         1 => [
@@ -1383,9 +1383,10 @@ public function testProcessOnBehalfOrganization() {
       'country-3' => 1,
       'state_province-3' => 1,
     ];
-    CRM_Contribute_Form_Contribution_Confirm::processOnBehalfOrganization($behalfOrganization, $contactID, $values, $params, $fields);
+    $empty = [];
+    CRM_Contribute_Form_Contribution_Confirm::processOnBehalfOrganization($behalfOrganization, $contactID, $empty, $empty, $empty);
 
-    //Check whether new organisation is not created.
+    //Check whether new organisation is created.
     $result = $this->callAPISuccess('Contact', 'get', [
       'contact_type' => "Organization",
       'organization_name' => "testorg1",
@@ -1399,7 +1400,7 @@ public function testProcessOnBehalfOrganization() {
 
     //Check if alert is assigned to params if more than 1 dupe exists.
     $orgId = $this->organizationCreate(['organization_name' => 'testorg1', 'email' => 'testorg@gmail.com']);
-    CRM_Contribute_Form_Contribution_Confirm::processOnBehalfOrganization($behalfOrganization, $contactID, $values, $params, $fields);
+    CRM_Contribute_Form_Contribution_Confirm::processOnBehalfOrganization($originalBehalfOrganization, $originalContactId, $values, $params, $fields);
     $this->assertEquals($params['onbehalf_dupe_alert'], 1);
   }
 

From d4578334cb98b0d2967070536d39add26932a1cc Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sun, 6 Sep 2020 19:37:56 -0400
Subject: [PATCH 171/834] swap out Array::value

---
 CRM/Contribute/BAO/Contribution.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 971f433f913e..8ad64dabdca1 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -199,7 +199,7 @@ public static function add(&$params) {
       CRM_Contribute_BAO_ContributionRecur::updateOnNewPayment(
         (!empty($params['contribution_recur_id']) ? $params['contribution_recur_id'] : $params['prevContribution']->contribution_recur_id),
         $contributionStatus,
-        CRM_Utils_Array::value('receive_date', $params)
+        $params['receive_date'] ?? NULL
       );
     }
 
@@ -2262,7 +2262,7 @@ public static function transitionComponents($params, $processContributionObject
             $numterms = 1;
             $lineitems = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contributionId);
             foreach ($lineitems as $lineitem) {
-              if ($membership->membership_type_id == CRM_Utils_Array::value('membership_type_id', $lineitem)) {
+              if ($membership->membership_type_id == ($lineitem['membership_type_id'] ?? NULL)) {
                 $numterms = $lineitem['membership_num_terms'] ?? NULL;
 
                 // in case membership_num_terms comes through as null or zero
@@ -2324,7 +2324,7 @@ public static function transitionComponents($params, $processContributionObject
             //updating the membership log
             $membershipLog = [];
             $membershipLog = $formattedParams;
-            $logStartDate = CRM_Utils_Date::customFormat(CRM_Utils_Array::value('log_start_date', $dates), $format);
+            $logStartDate = CRM_Utils_Date::customFormat($dates['log_start_date'] ?? NULL, $format);
             $logStartDate = ($logStartDate) ? CRM_Utils_Date::isoToMysql($logStartDate) : $formattedParams['start_date'];
 
             $membershipLog['start_date'] = $logStartDate;
@@ -3237,7 +3237,7 @@ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessa
 
     // For some unit tests contribution cannot contain paymentProcessor information
     $billingMode = empty($this->_relatedObjects['paymentProcessor']) ? CRM_Core_Payment::BILLING_MODE_NOTIFY : $this->_relatedObjects['paymentProcessor']['billing_mode'];
-    $template->assign('contributeMode', CRM_Utils_Array::value($billingMode, CRM_Core_SelectValues::contributeMode()));
+    $template->assign('contributeMode', CRM_Core_SelectValues::contributeMode()[$billingMode] ?? NULL);
 
     //assign honor information to receipt message
     $softRecord = CRM_Contribute_BAO_ContributionSoft::getSoftContribution($this->id);
@@ -3287,7 +3287,7 @@ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessa
       $template->assign('price', $productDAO->price);
       $template->assign('sku', $productDAO->sku);
     }
-    $template->assign('title', CRM_Utils_Array::value('title', $values));
+    $template->assign('title', $values['title'] ?? NULL);
     $values['amount'] = CRM_Utils_Array::value('total_amount', $input, (CRM_Utils_Array::value('amount', $input)), NULL);
     if (!$values['amount'] && isset($this->total_amount)) {
       $values['amount'] = $this->total_amount;
@@ -3333,11 +3333,7 @@ public function _assignMessageVariablesToTemplate(&$values, $input, $returnMessa
     );
     $values['receipt_date'] = (empty($this->receipt_date) ? NULL : $this->receipt_date);
     $template->assign('action', $this->is_test ? 1024 : 1);
-    $template->assign('receipt_text',
-      CRM_Utils_Array::value('receipt_text',
-        $values
-      )
-    );
+    $template->assign('receipt_text', $values['receipt_text'] ?? NULL);
     $template->assign('is_monetary', 1);
     $template->assign('is_recur', !empty($this->contribution_recur_id));
     $template->assign('currency', $this->currency);

From 1b2de78e187d2fcdf540b12de05ce30ac5848603 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 7 Sep 2020 09:47:32 +1000
Subject: [PATCH 172/834] [NFC] Aim to reduce memory usage in create single
 value alter test by removing xdebug items from comparaison

---
 tests/phpunit/api/v3/SyntaxConformanceTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 0f0e4003ac0c..ed7e6a5ae1fd 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -1511,6 +1511,8 @@ public function testCreateSingleValueAlter($entityName) {
       foreach ($floatFields as $floatField) {
         $checkEntity[$floatField] = rtrim($checkEntity[$floatField], "0");
       }
+      unset($entity['xdebug']);
+      unset($checkEntity['xdebug']);
       $this->assertAPIArrayComparison($entity, $checkEntity, [], "checking if $fieldName was correctly updated\n" . print_r([
         'update-params' => $updateParams,
         'update-result' => $update,

From 446bb2d5c7d18638baf60dda45a95a1e730a7f48 Mon Sep 17 00:00:00 2001
From: Swastik Pareek <swastik@compucorp.co.uk>
Date: Wed, 2 Sep 2020 13:40:33 +0100
Subject: [PATCH 173/834] dev/core#1987 Fix Drupal Base 'isFrontEndPage'
 function

---
 CRM/Utils/System/DrupalBase.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Utils/System/DrupalBase.php b/CRM/Utils/System/DrupalBase.php
index aeef820d20fd..9234c87d75fc 100644
--- a/CRM/Utils/System/DrupalBase.php
+++ b/CRM/Utils/System/DrupalBase.php
@@ -660,7 +660,8 @@ public function isFrontEndPage() {
 
     // Get the menu for above URL.
     $item = CRM_Core_Menu::get($path);
-    return !empty($item['is_public']);
+    // In case the URL is not a civicrm page (a drupal page) we set the FE theme to TRUE - covering the corner case
+    return (empty($item) || !empty($item['is_public']));
   }
 
   /**

From 5a7f780d828f457ec2bd1e70eab53557d871e419 Mon Sep 17 00:00:00 2001
From: Swastik Pareek <swastik@compucorp.co.uk>
Date: Wed, 2 Sep 2020 13:41:19 +0100
Subject: [PATCH 174/834] dev/core#1987 Enable frontend and backend theme
 configuration in display preferences

---
 .../CRM/Admin/Form/Preferences/Display.tpl    | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 44ff0ba7aabb..e36cc9501fd1 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -206,22 +206,14 @@
         {$form.menubar_color.html}
       </td>
     </tr>
-
-    {if $config->userSystem->is_drupal EQ '1'}
-      <tr class="crm-preferences-display-form-block-theme">
-        <td class="label">{ts}Theme{/ts} {help id="theme"}</td>
-        <td>{$form.theme_backend.html}</td>
-      </tr>
-    {else}
-      <tr class="crm-preferences-display-form-block-theme_backend">
-        <td class="label">{$form.theme_backend.label} {help id="theme_backend"}</td>
-        <td>{$form.theme_backend.html}</td>
-      </tr>
-      <tr class="crm-preferences-display-form-block-theme_frontend">
-        <td class="label">{$form.theme_frontend.label} {help id="theme_frontend"}</td>
-        <td>{$form.theme_frontend.html}</td>
-      </tr>
-      {/if}
+    <tr class="crm-preferences-display-form-block-theme_backend">
+      <td class="label">{$form.theme_backend.label} {help id="theme_backend"}</td>
+      <td>{$form.theme_backend.html}</td>
+    </tr>
+    <tr class="crm-preferences-display-form-block-theme_frontend">
+      <td class="label">{$form.theme_frontend.label} {help id="theme_frontend"}</td>
+      <td>{$form.theme_frontend.html}</td>
+    </tr>
   </table>
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>

From 5c82823a532a406d14486b6f2624b224185b9daf Mon Sep 17 00:00:00 2001
From: Dennis P Osorio <dennis@megaphonetech.com>
Date: Mon, 7 Sep 2020 12:22:21 -0400
Subject: [PATCH 175/834] fixed spelling of address on lines 122 and 247

fixed capitalization on line 247

fix capitalization fix on line 122
---
 CRM/Contact/Form/Task/Delete.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Contact/Form/Task/Delete.php b/CRM/Contact/Form/Task/Delete.php
index a4996b227f5e..9fac47037a18 100644
--- a/CRM/Contact/Form/Task/Delete.php
+++ b/CRM/Contact/Form/Task/Delete.php
@@ -119,7 +119,7 @@ public function preProcess() {
             'count' => $sharedAddressCount,
           ]);
         }
-        CRM_Core_Session::setStatus($message . ' ' . ts('Shared addresses will not be removed or altered but will no longer be shared.'), ts('Shared Addesses Owner'));
+        CRM_Core_Session::setStatus($message . ' ' . ts('Shared addresses will not be removed or altered but will no longer be shared.'), ts('Shared Addresses Owner'));
       }
 
       // set in form controller so that queries are not fired again
@@ -244,7 +244,7 @@ public function postProcess() {
       }
       $message .= '<ul><li>' . implode('</li><li>', $this->_sharedAddressMessage['contactList']) . '</li></ul>';
 
-      $session->setStatus($message, ts('Shared Addesses Owner Deleted'), 'info', ['expires' => 0]);
+      $session->setStatus($message, ts('Shared Addresses Owner Deleted'), 'info', ['expires' => 0]);
 
       $this->set('sharedAddressMessage', NULL);
     }

From 3f40001eb5780580d10ad49abc23be005e91944a Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Mon, 7 Sep 2020 18:27:20 +0100
Subject: [PATCH 176/834] dev/core#1854: Add Test to Check Bug Remains Fixed

Added test to check updating a membership's status doesn't cause the wrongful
deletion of related memberships.
---
 .../phpunit/CRM/Member/BAO/MembershipTest.php | 146 +++++++++++++++++-
 1 file changed, 145 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/CRM/Member/BAO/MembershipTest.php b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
index 8e0307e799d6..c327379e923b 100644
--- a/tests/phpunit/CRM/Member/BAO/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipTest.php
@@ -15,6 +15,10 @@
  */
 class CRM_Member_BAO_MembershipTest extends CiviUnitTestCase {
 
+  private $_contactID;
+  private $_membershipStatusID;
+  private $_membershipTypeID;
+
   public function setUp() {
     parent::setUp();
 
@@ -46,11 +50,12 @@ public function tearDown() {
    *
    * @param $organizationId
    * @param bool $withRelationship
+   * @param int $maxRelated
    *
    * @return array|int
    * @throws \CRM_Core_Exception
    */
-  private function createMembershipType($organizationId, $withRelationship = FALSE) {
+  private function createMembershipType($organizationId, $withRelationship = FALSE, $maxRelated = 0) {
     $membershipType = $this->callAPISuccess('MembershipType', 'create', [
       //Default domain ID
       'domain_id' => 1,
@@ -62,7 +67,9 @@ private function createMembershipType($organizationId, $withRelationship = FALSE
       'name' => 'Organiation Membership Type',
       'relationship_type_id' => ($withRelationship) ? 5 : NULL,
       'relationship_direction' => ($withRelationship) ? 'b_a' : NULL,
+      'max_related' => $maxRelated ?: NULL,
     ]);
+
     return $membershipType["values"][$membershipType["id"]];
   }
 
@@ -826,4 +833,141 @@ protected function setupMembership(): array {
     return [$contactId, $membershipId];
   }
 
+  /**
+   * Test done to verify bug dev/core#1854 remains fixed.
+   *
+   * Under certain special circumstances, updating a membership that had related
+   * memberships and a maximum related value, resulted in some related
+   * memberships being deleted, even though the maximum value was not reached.
+   *
+   * The problem presented itself when a membership is found for the nth contact
+   * related to the organization, the nth+1 contact didn't have a membership,
+   * and the nth+b contact does have a membership, where b > 1.
+   *
+   * This test builds that scenario and checks updating the status of the
+   * membership does not cause the deletion of memberships.
+   *
+   * https://lab.civicrm.org/dev/core/-/issues/1854
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function testMembershipUpdateDoesNotDeleteRelatedMembershipsByMistake() {
+    $membershipOrganizationId = $this->organizationCreate();
+    $employerId = $this->organizationCreate();
+
+    // Create membership type with relationship.
+    $membershipTypeWithRelationship = $this->createMembershipType($membershipOrganizationId, TRUE, 2);
+
+    // Creating membership for employer.
+    $membership = $this->callAPISuccess("Membership", "create", [
+      'membership_type_id' => $membershipTypeWithRelationship["id"],
+      'contact_id'         => $employerId,
+      'status_id'          => $this->_membershipStatusID,
+    ]);
+    $membership = $membership['values'][$membership["id"]];
+    $this->assertEquals(0, $this->getRelatedMembershipsCount($membership["id"]), 'Related membership count should be 0.');
+
+    // Create relationship between organization and individual contacts.
+    $employees = $this->createContacts(5);
+    foreach ($employees as $contactID) {
+      $this->callAPISuccess('Relationship', 'create', [
+        'relationship_type_id' => 5,
+        'contact_id_a'         => $contactID,
+        'contact_id_b'         => $employerId,
+        'is_active'            => 1,
+      ]);
+    }
+    $this->deleteRelatedMemberhsips($membership["id"]);
+    $this->assertEquals(0, $this->getRelatedMembershipsCount($membership["id"]), 'Related membership count should be 0.');
+
+    // Create related memberships for first and last contact.
+    $relatedMembership1 = $this->createRelatedMembershipForContact($employees[0], $membership);
+    $relatedMembership2 = $this->createRelatedMembershipForContact($employees[4], $membership);
+    $this->assertEquals(2, $this->getRelatedMembershipsCount($membership["id"]), 'Related membership count should be 2.');
+
+    // Reset statics.
+    unset(\Civi::$statics[CRM_Member_BAO_Membership::class]['related_contacts']);
+
+    // Update membership by changing its status.
+    $otherStatusID = $this->membershipStatusCreate('another status ' . rand(1, 1000));
+    $membership["status_id"] = $otherStatusID;
+    $this->callAPISuccess("Membership", "create", $membership);
+
+    // Assert nothing has changed.
+    $relatedMembershipsCount = $this->getRelatedMembershipsCount($membership["id"]);
+    $this->assertEquals(2, $relatedMembershipsCount, "Related membership count should still be 2, but found $relatedMembershipsCount");
+    $this->assertMembershipExists($relatedMembership1['id']);
+    $this->assertMembershipExists($relatedMembership2['id']);
+
+    // Clean up: Delete exerything!
+    $this->membershipDelete($membership["id"]);
+    $this->membershipStatusDelete($otherStatusID);
+  }
+
+  /**
+   * Creates the given amount of contacts.
+   *
+   * @param int $count
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  private function createContacts($count) {
+    $contacts = [];
+    for ($i = 0; $i < $count; $i++) {
+      $contacts[] = $this->individualCreate();
+    }
+
+    return $contacts;
+  }
+
+  /**
+   * Deletes related memberships for given parent membership ID.
+   *
+   * @param int $parentMembershipID
+   *
+   * @throws \CRM_Core_Exception
+   */
+  private function deleteRelatedMemberhsips($parentMembershipID) {
+    $memberships = $this->callAPISuccess("Membership", "get", [
+      'owner_membership_id' => $parentMembershipID,
+      'api.Membership.delete' => ['id' => '$value.id'],
+    ]);
+  }
+
+  /**
+   * Creates a related membership for the given contact ID.
+   *
+   * @param int $contactID
+   * @param array $parentMembership
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  private function createRelatedMembershipForContact($contactID, $parentMembership) {
+    $membership = $this->callAPISuccess("Membership", "create", [
+      'membership_type_id' => $parentMembership["membership_type_id"],
+      'contact_id'         => $contactID,
+      'status_id'          => $this->_membershipStatusID,
+      'owner_membership_id' => $parentMembership['id'],
+    ]);
+
+    return $membership;
+  }
+
+  /**
+   * Checks the given membership ID can be found.
+   *
+   * @param $membershipID
+   *
+   * @throws \CRM_Core_Exception
+   */
+  private function assertMembershipExists($membershipID) {
+    $membership = $this->callAPISuccess("Membership", "get", [
+      'id' => $membershipID,
+    ]);
+    $this->assertEquals(1, $membership['count']);
+    $this->assertEquals($membershipID, $membership['id']);
+  }
+
 }

From 355b9405e792b01c37a20ca89a826b25413b7726 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 8 Sep 2020 08:40:54 +1000
Subject: [PATCH 177/834] [REF] Improve the human readable name of the eway
 upgrade step to be clearer about what it is doing and also fix issue with a
 hard fault if the eway single currency payment processor type has been
 already removed

---
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php | 50 ++++++++++---------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 8cecc02d43cb..50c35a60e80c 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -72,34 +72,36 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    */
   public function upgrade_5_31_alpha1($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
-    $this->addTask('enableeWAYSingleCurrencyExtension', 'enableEwaySingleExtension');
+    $this->addTask('Remove Eway Single Currency Payment Processor type if not used or install the new extension for it', 'enableEwaySingleExtension');
   }
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
     $eWAYPaymentProcessorType = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_payment_processor_type WHERE class_name = 'Payment_eWAY'");
-    $ewayPaymentProcessorCount = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_payment_processor WHERE payment_processor_type_id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]);
-    if ($ewayPaymentProcessorCount) {
-      $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([
-        'type' => 'module',
-        'full_name' => 'ewaysingle',
-        'name' => 'eway Single currency extension',
-        'label' => 'eway Single currency extension',
-        'file' => 'ewaysingle',
-        'schema_version' => NULL,
-        'is_active' => 1,
-      ]);
-      CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL());
-      $managedEntity = CRM_Utils_SQL_Insert::into('civicrm_managed')->row([
-        'name' => 'eWAY',
-        'module' => 'ewaysingle',
-        'entity_type' => 'PaymentProcessorType',
-        'entity_id' => $eWAYPaymentProcessorType,
-        'cleanup' => NULL,
-      ]);
-      CRM_Core_DAO::executeQuery($managedEntity->usingReplace()->toSQL());
-    }
-    else {
-      CRM_Core_DAO::executeQuery("DELETE FROM civicrm_payment_processor_type WHERE id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]);
+    if ($eWAYPaymentProcessorType) {
+      $ewayPaymentProcessorCount = CRM_Core_DAO::singleValueQuery("SELECT count(id) FROM civicrm_payment_processor WHERE payment_processor_type_id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]);
+      if ($ewayPaymentProcessorCount) {
+        $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([
+          'type' => 'module',
+          'full_name' => 'ewaysingle',
+          'name' => 'eway Single currency extension',
+          'label' => 'eway Single currency extension',
+          'file' => 'ewaysingle',
+          'schema_version' => NULL,
+          'is_active' => 1,
+        ]);
+        CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL());
+        $managedEntity = CRM_Utils_SQL_Insert::into('civicrm_managed')->row([
+          'name' => 'eWAY',
+          'module' => 'ewaysingle',
+          'entity_type' => 'PaymentProcessorType',
+          'entity_id' => $eWAYPaymentProcessorType,
+          'cleanup' => NULL,
+        ]);
+        CRM_Core_DAO::executeQuery($managedEntity->usingReplace()->toSQL());
+      }
+      else {
+        CRM_Core_DAO::executeQuery("DELETE FROM civicrm_payment_processor_type WHERE id = %1", [1 => [$eWAYPaymentProcessorType, 'Positive']]);
+      }
     }
     return TRUE;
   }

From 755a18357bf04fb264b6a1bfad316d8d4f8328bf Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 6 Feb 2020 17:07:11 +1300
Subject: [PATCH 178/834] Implement 'super permissions' as described by @totten

This picks up on an idea Tim has pushed several times - ie that instead of giving out 'Administer CiviCRM' willy nilly
we could deprioritise it in favour of 2 more granular permission bundles - ie Administer CiviCRM data & administe CiviCRM system.

This allows us to make some permissions more 'locked away' without endlessly adding new 'administer Payment Processors'
because we've realised not everyone who can create profiles needs to be able to see payment processor credentials.

It also allows us to make system checks less broadly visible where they are not appropriate.

Note that to proceed with this we would need to go through all places that check Administer CiviCRM & put in one
or both of the 2 new permissions. Having Administer CiviCRM implicitly includes anything granted to the existing
permissions so the implementation is smooth-ish there. However, I can imagine we would need a hook allowing people
to categorise themselves or we would find ourselves litigating all sorts
---
 CRM/Core/Permission.php                       | 58 +++++++++++++++++--
 CRM/Core/xml/Menu/Admin.xml                   | 15 ++---
 CRM/Event/Form/ManageEvent.php                |  2 +-
 CRM/Event/Form/ManageEvent/TabHeader.php      |  2 +-
 CRM/Event/Form/Registration/Register.php      |  2 +-
 CRM/Event/Page/ManageEvent.php                |  2 +-
 CRM/Grant/Page/DashBoard.php                  |  2 +-
 CRM/UF/Form/Inline/Preview.php                |  2 +-
 CRM/Utils/Check.php                           |  2 +-
 .../phpunit/CRM/Core/Permission/BaseTest.php  | 30 +++++++---
 10 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php
index 2c71a406defa..cbed76e3c8f2 100644
--- a/CRM/Core/Permission.php
+++ b/CRM/Core/Permission.php
@@ -119,9 +119,17 @@ public static function check($permissions, $contactId = NULL) {
       }
       else {
         // This is an individual permission
-        $granted = CRM_Core_Config::singleton()->userPermissionClass->check($permission, $userId);
-        // Call the permission_check hook to permit dynamic escalation (CRM-19256)
-        CRM_Utils_Hook::permission_check($permission, $granted, $contactId);
+        $impliedPermissions = self::getImpliedPermissionsFor($permission);
+        $impliedPermissions[] = $permission;
+        foreach ($impliedPermissions as $permissionOption) {
+          $granted = CRM_Core_Config::singleton()->userPermissionClass->check($permissionOption, $userId);
+          // Call the permission_check hook to permit dynamic escalation (CRM-19256)
+          CRM_Utils_Hook::permission_check($permissionOption, $granted, $contactId);
+          if ($granted) {
+            break;
+          }
+        }
+
         if (
           !$granted
           && !($tempPerm && $tempPerm->check($permission))
@@ -893,11 +901,53 @@ public static function getCorePermissions() {
         $prefix . ts('send SMS'),
         ts('Send an SMS'),
       ],
+      'administer CiviCRM system' => [
+        'label' => $prefix . ts('administer CiviCRM System'),
+        'description' => ts('Perform all system administration tasks in CiviCRM:'),
+      ],
+      'administer CiviCRM data' => [
+        'label' => $prefix . ts('administer CiviCRM Data'),
+        'description' => ts('Perform all system administration tasks in CiviCRM:'),
+      ],
     ];
-
+    foreach (self::getImpliedPermissions() as $name => $includes) {
+      foreach ($includes as $permission) {
+        $permissions[$name][] = $permissions[$permission];
+      }
+    }
     return $permissions;
   }
 
+  /**
+   * Get permissions implied by 'superset' permissions.
+   *
+   * @return array
+   */
+  public static function getImpliedPermissions() {
+    return [
+      'administer CiviCRM' => ['administer CiviCRM system', 'administer CiviCRM data'],
+      'administer CiviCRM data' => ['edit message templates', 'administer dedupe rules'],
+      'administer CiviCRM system' => ['edit api keys', 'edit system workflow message templates', 'administer payment processors'],
+    ];
+  }
+
+  /**
+   * Get any super-permissions that imply the given permission.
+   *
+   * @param string $permission
+   *
+   * @return array
+   */
+  public static function getImpliedPermissionsFor(string $permission) {
+    $return = [];
+    foreach (self::getImpliedPermissions() as $superPermission => $components) {
+      if (in_array($permission, $components, TRUE)) {
+        $return[$superPermission] = $superPermission;
+      }
+    }
+    return $return;
+  }
+
   /**
    * For each entity provides an array of permissions required for each action
    *
diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index 20b52451cc27..df4d108a1d47 100644
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -259,7 +259,7 @@
      <desc>Schedule Reminders.</desc>
      <page_callback>CRM_Admin_Page_ScheduleReminders</page_callback>
      <access_callback>1</access_callback>
-     <access_arguments>administer CiviCRM;edit all events</access_arguments>
+     <access_arguments>administer CiviCRM data;edit all events</access_arguments>
      <adminGroup>Communications</adminGroup>
      <weight>40</weight>
   </item>
@@ -397,7 +397,7 @@
      <title>Manage Extensions</title>
      <page_callback>CRM_Admin_Page_Extensions</page_callback>
      <desc></desc>
-     <access_arguments>administer CiviCRM</access_arguments>
+     <access_arguments>administer CiviCRM system</access_arguments>
      <adminGroup>System Settings</adminGroup>
      <weight>120</weight>
   </item>
@@ -405,7 +405,7 @@
      <path>civicrm/admin/extensions/upgrade</path>
      <title>Database Upgrades</title>
      <page_callback>CRM_Admin_Page_ExtensionsUpgrade</page_callback>
-     <access_arguments>administer CiviCRM</access_arguments>
+     <access_arguments>administer CiviCRM system</access_arguments>
   </item>
   <item>
      <path>civicrm/admin/setting/smtp</path>
@@ -413,6 +413,7 @@
      <page_callback>CRM_Admin_Form_Setting_Smtp</page_callback>
      <adminGroup>System Settings</adminGroup>
      <weight>20</weight>
+    <access_arguments>administer CiviCRM system</access_arguments>
   </item>
   <item>
      <path>civicrm/admin/paymentProcessor</path>
@@ -535,14 +536,14 @@
      <path>civicrm/admin/runjobs</path>
      <desc>URL used for running scheduled jobs.</desc>
      <page_callback>CRM_Utils_System::executeScheduledJobs</page_callback>
-     <access_arguments>access CiviCRM,administer CiviCRM</access_arguments>
+     <access_arguments>access CiviCRM,administer CiviCRM system</access_arguments>
   </item>
   <item>
      <path>civicrm/admin/job</path>
      <title>Scheduled Jobs</title>
      <desc>Managing periodially running tasks.</desc>
      <page_callback>CRM_Admin_Page_Job</page_callback>
-     <access_arguments>access CiviCRM,administer CiviCRM</access_arguments>
+     <access_arguments>access CiviCRM,administer CiviCRM system</access_arguments>
      <adminGroup>System Settings</adminGroup>
      <weight>1370</weight>
   </item>
@@ -551,7 +552,7 @@
      <title>Scheduled Jobs Log</title>
      <desc>Browsing the log of periodially running tasks.</desc>
      <page_callback>CRM_Admin_Page_JobLog</page_callback>
-     <access_arguments>access CiviCRM,administer CiviCRM</access_arguments>
+     <access_arguments>access CiviCRM,administer CiviCRM system</access_arguments>
      <adminGroup>Manage</adminGroup>
      <weight>1380</weight>
   </item>
@@ -573,7 +574,7 @@
   <item>
      <path>civicrm/admin</path>
      <title>Administer CiviCRM</title>
-     <access_arguments>administer CiviCRM,access CiviCRM</access_arguments>
+     <access_arguments>administer CiviCRM system,administer CiviCRM data,access CiviCRM</access_arguments>
      <page_type>1</page_type>
      <page_callback>CRM_Admin_Page_Admin</page_callback>
      <is_ssl>true</is_ssl>
diff --git a/CRM/Event/Form/ManageEvent.php b/CRM/Event/Form/ManageEvent.php
index 74c595c4999b..292e8b2b4c85 100644
--- a/CRM/Event/Form/ManageEvent.php
+++ b/CRM/Event/Form/ManageEvent.php
@@ -180,7 +180,7 @@ public function preProcess() {
     $ufEdit = CRM_ACL_API::group(CRM_Core_Permission::EDIT, NULL, 'civicrm_uf_group', $ufGroups);
     $checkPermission = [
       [
-        'administer CiviCRM',
+        'administer CiviCRM data',
         'manage event profiles',
       ],
     ];
diff --git a/CRM/Event/Form/ManageEvent/TabHeader.php b/CRM/Event/Form/ManageEvent/TabHeader.php
index ebfba8f0dc39..260605871f1a 100644
--- a/CRM/Event/Form/ManageEvent/TabHeader.php
+++ b/CRM/Event/Form/ManageEvent/TabHeader.php
@@ -70,7 +70,7 @@ public static function process(&$form) {
     $tabs['registration'] = ['title' => ts('Online Registration')] + $default;
     // @fixme I don't understand the event permissions check here - can we just get rid of it?
     $permissions = CRM_Event_BAO_Event::getAllPermissions();
-    if (CRM_Core_Permission::check('administer CiviCRM') || !empty($permissions[CRM_Core_Permission::EDIT])) {
+    if (CRM_Core_Permission::check('administer CiviCRM data') || !empty($permissions[CRM_Core_Permission::EDIT])) {
       $tabs['reminder'] = ['title' => ts('Schedule Reminders'), 'class' => 'livePage'] + $default;
     }
     $tabs['conference'] = ['title' => ts('Conference Slots')] + $default;
diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php
index bd133450b0e1..88cea65ebddf 100644
--- a/CRM/Event/Form/Registration/Register.php
+++ b/CRM/Event/Form/Registration/Register.php
@@ -563,7 +563,7 @@ public static function buildAmount(&$form, $required = TRUE, $discountId = NULL)
 
       // CRM-14492 Admin price fields should show up on event registration if user has 'administer CiviCRM' permissions
       $adminFieldVisible = FALSE;
-      if (CRM_Core_Permission::check('administer CiviCRM')) {
+      if (CRM_Core_Permission::check('administer CiviCRM data')) {
         $adminFieldVisible = TRUE;
       }
 
diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index 08dc44dfbba4..f0d05726c551 100644
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -165,7 +165,7 @@ public static function &tabs() {
 
       // @fixme I don't understand the event permissions check here - can we just get rid of it?
       $permissions = CRM_Event_BAO_Event::getAllPermissions();
-      if (CRM_Core_Permission::check('administer CiviCRM') || !empty($permissions[CRM_Core_Permission::EDIT])) {
+      if (CRM_Core_Permission::check('administer CiviCRM data') || !empty($permissions[CRM_Core_Permission::EDIT])) {
         self::$_tabLinks[$cacheKey]['reminder']
           = [
             'title' => ts('Schedule Reminders'),
diff --git a/CRM/Grant/Page/DashBoard.php b/CRM/Grant/Page/DashBoard.php
index 3389c4abb903..df53739b3c0c 100644
--- a/CRM/Grant/Page/DashBoard.php
+++ b/CRM/Grant/Page/DashBoard.php
@@ -27,7 +27,7 @@ class CRM_Grant_Page_DashBoard extends CRM_Core_Page {
    * @return void
    */
   public function preProcess() {
-    $admin = CRM_Core_Permission::check('administer CiviCRM');
+    $admin = CRM_Core_Permission::check('administer CiviCRM data');
 
     $grantSummary = CRM_Grant_BAO_Grant::getGrantSummary($admin);
 
diff --git a/CRM/UF/Form/Inline/Preview.php b/CRM/UF/Form/Inline/Preview.php
index 49f1adbd97c3..b604fe8a64f2 100644
--- a/CRM/UF/Form/Inline/Preview.php
+++ b/CRM/UF/Form/Inline/Preview.php
@@ -29,7 +29,7 @@ public function preProcess() {
     // Inline forms don't get menu-level permission checks
     $checkPermission = [
       [
-        'administer CiviCRM',
+        'administer CiviCRM data',
         'manage event profiles',
       ],
     ];
diff --git a/CRM/Utils/Check.php b/CRM/Utils/Check.php
index 1e4d9f7df707..290de63123d4 100644
--- a/CRM/Utils/Check.php
+++ b/CRM/Utils/Check.php
@@ -64,7 +64,7 @@ public static function getSeverityList() {
    * Display daily system status alerts (admin only).
    */
   public function showPeriodicAlerts() {
-    if (CRM_Core_Permission::check('administer CiviCRM')) {
+    if (CRM_Core_Permission::check('administer CiviCRM system')) {
       $session = CRM_Core_Session::singleton();
       if ($session->timer('check_' . __CLASS__, self::CHECK_TIMER)) {
 
diff --git a/tests/phpunit/CRM/Core/Permission/BaseTest.php b/tests/phpunit/CRM/Core/Permission/BaseTest.php
index dca187540c7a..2095aba6861a 100644
--- a/tests/phpunit/CRM/Core/Permission/BaseTest.php
+++ b/tests/phpunit/CRM/Core/Permission/BaseTest.php
@@ -6,6 +6,8 @@
  */
 class CRM_Core_Permission_BaseTest extends CiviUnitTestCase {
 
+  use CRMTraits_ACL_PermissionTrait;
+
   /**
    * @return array
    *   (0 => input to translatePermission, 1 => expected output from translatePermission)
@@ -13,13 +15,13 @@ class CRM_Core_Permission_BaseTest extends CiviUnitTestCase {
   public function translateData() {
     $cases = [];
 
-    $cases[] = ["administer CiviCRM", "administer CiviCRM"];
-    $cases[] = ["cms:universal name", "local name"];
-    $cases[] = ["cms:universal name2", "local name2"];
-    $cases[] = ["cms:unknown universal name", CRM_Core_Permission::ALWAYS_DENY_PERMISSION];
-    $cases[] = ["myruntime:foo", "foo"];
-    $cases[] = ["otherruntime:foo", CRM_Core_Permission::ALWAYS_DENY_PERMISSION];
-    $cases[] = ["otherruntime:foo:bar", CRM_Core_Permission::ALWAYS_DENY_PERMISSION];
+    $cases[] = ['administer CiviCRM', 'administer CiviCRM'];
+    $cases[] = ['cms:universal name', 'local name'];
+    $cases[] = ['cms:universal name2', 'local name2'];
+    $cases[] = ['cms:unknown universal name', CRM_Core_Permission::ALWAYS_DENY_PERMISSION];
+    $cases[] = ['myruntime:foo', 'foo'];
+    $cases[] = ['otherruntime:foo', CRM_Core_Permission::ALWAYS_DENY_PERMISSION];
+    $cases[] = ['otherruntime:foo:bar', CRM_Core_Permission::ALWAYS_DENY_PERMISSION];
     $cases[] = [CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION, CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION];
 
     return $cases;
@@ -27,6 +29,7 @@ public function translateData() {
 
   /**
    * @dataProvider translateData
+   *
    * @param string $input
    *   The name of a permission which should be translated.
    * @param string $expected
@@ -34,7 +37,7 @@ public function translateData() {
    */
   public function testTranslate($input, $expected) {
     $perm = new CRM_Core_Permission_Base();
-    $actual = $perm->translatePermission($input, "myruntime", [
+    $actual = $perm->translatePermission($input, 'myruntime', [
       'universal name' => 'local name',
       'universal name2' => 'local name2',
       'gunk' => 'gunky',
@@ -42,4 +45,15 @@ public function testTranslate($input, $expected) {
     $this->assertEquals($expected, $actual);
   }
 
+  /**
+   * Test that the user has the implied permission of administer CiviCRM data by virtue of having administer CiviCRM.
+   */
+  public function testImpliedPermission() {
+    $this->createLoggedInUser();
+    CRM_Core_Config::singleton()->userPermissionClass->permissions = [
+      'administer CiviCRM',
+    ];
+    $this->assertTrue(CRM_Core_Permission::check('administer CiviCRM data'));
+  }
+
 }

From 86d0e74958360c1bdd6bfbd2c8b27c69cc17d8ee Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 8 Sep 2020 12:37:25 +1200
Subject: [PATCH 179/834] Fix search extension excluded from tarball

---
 distmaker/dists/common.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 522bcc0c2ec2..c96ce67d864b 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -106,6 +106,7 @@ function dm_install_coreext() {
 ## Get a list of default/core extension directories (space-delimited)
 ## reldirs=$(dm_core_exts)
 function dm_core_exts() {
+  echo ext/search
   echo ext/sequentialcreditnotes
   echo ext/flexmailer
   echo ext/eventcart

From c424169e5645b8f4f39373e08996f9651b9e4e8e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 8 Sep 2020 12:14:12 +1200
Subject: [PATCH 180/834] Comment out implied permissions for administer
 CiviCRM system per discussion

---
 CRM/Core/Permission.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php
index cbed76e3c8f2..049984501c22 100644
--- a/CRM/Core/Permission.php
+++ b/CRM/Core/Permission.php
@@ -927,7 +927,7 @@ public static function getImpliedPermissions() {
     return [
       'administer CiviCRM' => ['administer CiviCRM system', 'administer CiviCRM data'],
       'administer CiviCRM data' => ['edit message templates', 'administer dedupe rules'],
-      'administer CiviCRM system' => ['edit api keys', 'edit system workflow message templates', 'administer payment processors'],
+      'administer CiviCRM system' => ['edit system workflow message templates'],
     ];
   }
 

From 49ed48886918c4022e90dceaf67f2b342e5552e3 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 7 Sep 2020 11:14:42 +1200
Subject: [PATCH 181/834] Remove error handling from loadObjects

The processors now have their own try->catch so we don't need to catch here.

I wasn't sure about the debug_log_message part so I copied it into the processors
, at risk of duplicating
---
 CRM/Contribute/BAO/Contribution.php           |   8 +-
 CRM/Core/Payment/BaseIPN.php                  |  36 +-----
 .../phpunit/CRM/Core/Payment/BaseIPNTest.php  | 104 +++++++++---------
 3 files changed, 64 insertions(+), 84 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 3de7326172e1..6f0823033ca0 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2773,7 +2773,7 @@ public static function getContributionDates() {
    *   Load all related objects - even where id not passed in? (allows API to call this).
    *
    * @return bool
-   * @throws Exception
+   * @throws CRM_Core_Exception
    */
   public function loadRelatedObjects($input, &$ids, $loadAll = FALSE) {
     // @todo deprecate this function - the steps should be
@@ -2840,7 +2840,7 @@ public function loadRelatedObjects($input, &$ids, $loadAll = FALSE) {
         $payment = new CRM_Pledge_BAO_PledgePayment();
         $payment->id = $paymentID;
         if (!$payment->find(TRUE)) {
-          throw new Exception("Could not find pledge payment record: " . $paymentID);
+          throw new CRM_Core_Exception("Could not find pledge payment record: " . $paymentID);
         }
         $this->_relatedObjects['pledge_payment'][] = $payment;
       }
@@ -2858,7 +2858,7 @@ public function loadRelatedObjects($input, &$ids, $loadAll = FALSE) {
       if ($ids['event'] &&
         !$event->find(TRUE)
       ) {
-        throw new Exception("Could not find event: " . $ids['event']);
+        throw new CRM_Core_Exception("Could not find event: " . $ids['event']);
       }
 
       $this->_relatedObjects['event'] = &$event;
@@ -2868,7 +2868,7 @@ public function loadRelatedObjects($input, &$ids, $loadAll = FALSE) {
       if ($ids['participant'] &&
         !$participant->find(TRUE)
       ) {
-        throw new Exception("Could not find participant: " . $ids['participant']);
+        throw new CRM_Core_Exception("Could not find participant: " . $ids['participant']);
       }
       $participant->register_date = CRM_Utils_Date::isoToMysql($participant->register_date);
 
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 391064c823f6..e1fa68af31b6 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -143,42 +143,16 @@ public function validateData($input, &$ids, &$objects, $required = TRUE, $paymen
    * @param array $objects
    * @param bool $required
    * @param int $paymentProcessorID
-   * @param array $error_handling
    *
    * @return bool|array
+   * @throws \CRM_Core_Exception
    */
-  public function loadObjects($input, &$ids, &$objects, $required, $paymentProcessorID, $error_handling = NULL) {
-    if (empty($error_handling)) {
-      // default options are that we log an error & echo it out
-      // note that we should refactor this error handling into error code @ some point
-      // but for now setting up enough separation so we can do unit tests
-      $error_handling = [
-        'log_error' => 1,
-        'echo_error' => 1,
-      ];
-    }
+  public function loadObjects($input, &$ids, &$objects, $required, $paymentProcessorID) {
     $contribution = &$objects['contribution'];
     $ids['paymentProcessor'] = $paymentProcessorID;
-    try {
-      $success = $contribution->loadRelatedObjects($input, $ids);
-      if ($required && empty($contribution->_relatedObjects['paymentProcessor'])) {
-        throw new CRM_Core_Exception("Could not find payment processor for contribution record: " . $contribution->id);
-      }
-    }
-    catch (Exception $e) {
-      $success = FALSE;
-      if (!empty($error_handling['log_error'])) {
-        CRM_Core_Error::debug_log_message($e->getMessage());
-      }
-      if (!empty($error_handling['echo_error'])) {
-        echo $e->getMessage();
-      }
-      if (!empty($error_handling['return_error'])) {
-        return [
-          'is_error' => 1,
-          'error_message' => ($e->getMessage()),
-        ];
-      }
+    $success = $contribution->loadRelatedObjects($input, $ids);
+    if ($required && empty($contribution->_relatedObjects['paymentProcessor'])) {
+      throw new CRM_Core_Exception("Could not find payment processor for contribution record: " . $contribution->id);
     }
     $objects = array_merge($objects, $contribution->_relatedObjects);
     return $success;
diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
index acc4eb5433ee..f56f11cf56b9 100644
--- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
@@ -148,8 +148,8 @@ public function testLoadMembershipObjectsLoadAll() {
     $this->assertArrayHasKey($this->_membershipTypeID, $contribution->_relatedObjects['membership']);
     $this->assertTrue(is_a($contribution->_relatedObjects['membership'][$this->_membershipTypeID], 'CRM_Member_BAO_Membership'));
     $this->assertTrue(is_a($contribution->_relatedObjects['financialType'], 'CRM_Financial_BAO_FinancialType'));
-    $this->assertFalse(empty($contribution->_relatedObjects['contributionRecur']));
-    $this->assertFalse(empty($contribution->_relatedObjects['paymentProcessor']));
+    $this->assertNotEmpty($contribution->_relatedObjects['contributionRecur']);
+    $this->assertNotEmpty($contribution->_relatedObjects['paymentProcessor']);
   }
 
   /**
@@ -215,10 +215,10 @@ public function testSendMailMembershipWithoutLoadObjects() {
   public function testLoadParticipantObjects() {
     $this->_setUpParticipantObjects();
     $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
-    $this->assertFalse(empty($this->objects['participant']));
+    $this->assertNotEmpty($this->objects['participant']);
     $this->assertTrue(is_a($this->objects['participant'], 'CRM_Event_BAO_Participant'));
     $this->assertTrue(is_a($this->objects['financialType'], 'CRM_Financial_BAO_FinancialType'));
-    $this->assertFalse(empty($this->objects['event']));
+    $this->assertNotEmpty($this->objects['event']);
     $this->assertTrue(is_a($this->objects['event'], 'CRM_Event_BAO_Event'));
     $this->assertTrue(is_a($this->objects['contribution'], 'CRM_Contribute_BAO_Contribution'));
     $this->assertNotEmpty($this->objects['event']->id);
@@ -280,11 +280,11 @@ public function testsendMailParticipantObjectsNoMail() {
     $tablesToTruncate = [
       'civicrm_mailing_spool',
     ];
-    $this->quickCleanup($tablesToTruncate, FALSE);
+    $this->quickCleanup($tablesToTruncate);
     $mut = new CiviMailUtils($this, TRUE);
     $contribution = new CRM_Contribute_BAO_Contribution();
     $contribution->id = $this->_contributionId;
-    $msg = $contribution->composeMessageArray($this->input, $this->ids, $values);
+    $contribution->composeMessageArray($this->input, $this->ids, $values);
     $mut->assertMailLogEmpty('no mail should have been send as event set to no confirm');
     $mut->stop();
   }
@@ -295,11 +295,11 @@ public function testsendMailParticipantObjectsNoMail() {
   public function testLoadPledgeObjects() {
     $this->_setUpPledgeObjects();
     $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, $this->_processorId);
-    $this->assertFalse(empty($this->objects['pledge_payment'][0]));
+    $this->assertNotEmpty($this->objects['pledge_payment'][0]);
     $this->assertTrue(is_a($this->objects['financialType'], 'CRM_Financial_BAO_FinancialType'));
     $this->assertTrue(is_a($this->objects['contribution'], 'CRM_Contribute_BAO_Contribution'));
     $this->assertTrue(is_a($this->objects['pledge_payment'][0], 'CRM_Pledge_BAO_PledgePayment'));
-    $this->assertFalse(empty($this->objects['pledge_payment'][0]->id));
+    $this->assertNotEmpty($this->objects['pledge_payment'][0]->id);
     $this->assertEquals($this->_financialTypeId, $this->objects['financialType']->id);
     $this->assertEquals($this->_processorId, $this->objects['paymentProcessor']['id']);
     $this->assertEquals($this->_contributionId, $this->objects['contribution']->id);
@@ -313,25 +313,41 @@ public function testLoadPledgeObjects() {
   public function testLoadPledgeObjectsInvalidPledgeID() {
     $this->_setUpPledgeObjects();
     $this->ids['pledge_payment'][0] = 0;
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]);
-    $this->assertArrayHasKey('error_message', $result);
+    try {
+      $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL);
+    }
+    catch (CRM_Core_Exception $e) {
+      $this->assertEquals('Could not find payment processor for contribution record: 1', $e->getMessage());
+    }
     $this->assertArrayNotHasKey('pledge_payment', $this->objects);
-    $this->assertEquals('Could not find payment processor for contribution record: 1', $result['error_message']);
+
     $this->ids['pledge_payment'][0] = NULL;
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]);
-    $this->assertArrayHasKey('error_message', $result);
+    try {
+      $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL);
+    }
+    catch (CRM_Core_Exception $e) {
+      $this->assertEquals('Could not find payment processor for contribution record: 1', $e->getMessage());
+    }
     $this->assertArrayNotHasKey('pledge_payment', $this->objects);
-    $this->assertEquals('Could not find payment processor for contribution record: 1', $result['error_message']);
+
     $this->ids['pledge_payment'][0] = '';
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]);
-    $this->assertArrayHasKey('error_message', $result);
+
+    try {
+      $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL);
+      $this->assertArrayHasKey('error_message', $result);
+    }
+    catch (CRM_Core_Exception $e) {
+      $this->assertEquals('Could not find payment processor for contribution record: 1', $e->getMessage());
+    }
     $this->assertArrayNotHasKey('pledge_payment', $this->objects);
-    $this->assertEquals('Could not find payment processor for contribution record: 1', $result['error_message']);
 
     $this->ids['pledge_payment'][0] = 999;
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, $this->_processorId, ['return_error' => 1]);
-    $this->assertArrayHasKey('error_message', $result);
-    $this->assertEquals('Could not find pledge payment record: 999', $result['error_message']);
+    try {
+      $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, $this->_processorId);
+    }
+    catch (CRM_Core_Exception $e) {
+      $this->assertEquals('Could not find pledge payment record: 999', $e->getMessage());
+    }
   }
 
   /**
@@ -350,25 +366,15 @@ public function testSendMailPledge() {
    */
   public function testRequiredWithoutProcessorID() {
     $this->_setUpPledgeObjects();
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]);
-    $this->assertArrayHasKey('error_message', $result);
-    $this->assertEquals('Could not find payment processor for contribution record: 1', $result['error_message']);
+    try {
+      $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL);
+    }
+    catch (CRM_Core_Exception $e) {
+      $this->assertEquals('Could not find payment processor for contribution record: 1', $e->getMessage());
+    }
     // error is only returned if $required set to True
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, NULL, ['return_error' => 1]);
-    $this->assertFalse(is_array($result));
-    //check that error is not returned if error checking not set
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['log_error' => 1]);
-    $this->assertFalse(is_array($result));
-  }
-
-  /**
-   * Test that an error is not if required set & no processor ID
-   */
-  public function testRequiredWithContributionPage() {
-    $this->_setUpContributionObjects(TRUE);
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]);
-    $this->assertEquals(1, $result['is_error']);
-    ;
+    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, NULL);
+    $this->assertEquals(TRUE, $result);
   }
 
   /**
@@ -379,7 +385,7 @@ public function testRequiredWithContributionPage() {
   public function testPaymentProcessorLoadsAsParam() {
     $this->_setUpContributionObjects();
     $this->input = array_merge($this->input, ['payment_processor_id' => $this->_processorId]);
-    $this->assertTrue($this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]));
+    $this->assertTrue($this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL));
   }
 
   /**
@@ -387,15 +393,14 @@ public function testPaymentProcessorLoadsAsParam() {
    */
   public function testRequiredWithContributionPageError() {
     $this->_setUpContributionObjects();
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['return_error' => 1]);
-    $this->assertArrayHasKey('error_message', $result);
-    $this->assertEquals('Could not find payment processor for contribution record: 1', $result['error_message']);
+    try {
+      $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL);
+    }
+    catch (CRM_Core_Exception $e) {
+      $this->assertEquals('Could not find payment processor for contribution record: 1', $e->getMessage());
+    }
     // error is only returned if $required set to True
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, NULL, ['return_error' => 1]);
-    $this->assertFalse(is_array($result));
-    //check that error is not returned if error checking not set
-    $result = $this->IPN->loadObjects($this->input, $this->ids, $this->objects, TRUE, NULL, ['log_error' => 1]);
-    $this->assertFalse(is_array($result));
+    $this->IPN->loadObjects($this->input, $this->ids, $this->objects, FALSE, NULL);
   }
 
   public function testThatCancellingEventPaymentWillCancelAllAdditionalPendingParticipantsAndCreateCancellationActivities() {
@@ -469,8 +474,7 @@ public function _setUpContributionObjects($contributionPage = FALSE) {
     $contributionPageID = NULL;
 
     if (!empty($contributionPage)) {
-      $dao = new CRM_Core_DAO();
-      $contribution_page = $dao->createTestObject('CRM_Contribute_DAO_ContributionPage');
+      $contribution_page = CRM_Core_DAO::createTestObject('CRM_Contribute_DAO_ContributionPage');
       $contribution_page->payment_processor = 1;
       $contribution_page->save();
       $contribution->contribution_page_id = $contributionPageID = $contribution_page->id;
@@ -577,6 +581,8 @@ public function _setUpRecurringContribution() {
    *
    * @param string $participantStatus
    *   The participant to create status
+   *
+   * @throws \CRM_Core_Exception
    */
   public function _setUpParticipantObjects($participantStatus = 'Attended') {
     $event = $this->eventCreate(['is_email_confirm' => 1]);

From 38299e12f75fa5fc85cf422dcfcb88fd6b60a667 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 7 Sep 2020 16:28:58 +0100
Subject: [PATCH 182/834] Switch frontend contribution form to
 cached/non-deprecated functions for membershipTypes

---
 CRM/Contribute/Form/Contribution/Main.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
index 7753b2a13573..6ff333e145f9 100644
--- a/CRM/Contribute/Form/Contribution/Main.php
+++ b/CRM/Contribute/Form/Contribution/Main.php
@@ -605,11 +605,10 @@ public static function formRule($fields, $files, $self) {
       $isTest = $self->_action & CRM_Core_Action::PREVIEW;
       $lifeMember = CRM_Member_BAO_Membership::getAllContactMembership($self->_membershipContactID, $isTest, TRUE);
 
-      $membershipOrgDetails = CRM_Member_BAO_MembershipType::getMembershipTypeOrganization();
-
+      $membershipOrgDetails = CRM_Member_BAO_MembershipType::getAllMembershipTypes();
       $unallowedOrgs = [];
       foreach (array_keys($lifeMember) as $memTypeId) {
-        $unallowedOrgs[] = $membershipOrgDetails[$memTypeId];
+        $unallowedOrgs[] = $membershipOrgDetails[$memTypeId]['member_of_contact_id'];
       }
     }
 
@@ -774,7 +773,7 @@ public static function formRule($fields, $files, $self) {
         if (!empty($lifeMember)) {
           foreach ($priceFieldIDS as $priceFieldId) {
             if (($id = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceFieldValue', $priceFieldId, 'membership_type_id')) &&
-              in_array($membershipOrgDetails[$id], $unallowedOrgs)
+              in_array($membershipOrgDetails[$id]['member_of_contact_id'], $unallowedOrgs)
             ) {
               $errors['_qf_default'] = ts('You already have a lifetime membership and cannot select a membership with a shorter term.');
               break;
@@ -791,6 +790,7 @@ public static function formRule($fields, $files, $self) {
           foreach ($count as $id => $occurrence) {
             if ($occurrence > 1) {
               $errors['_qf_default'] = ts('You have selected multiple memberships for the same organization or entity. Please review your selections and choose only one membership per entity. Contact the site administrator if you need assistance.');
+              break;
             }
           }
         }

From fbd40c08cfcd697f482b8972f2c1d4b7559d03f4 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 8 Sep 2020 15:44:56 +0100
Subject: [PATCH 183/834] Use title instead name in status message

---
 CRM/Admin/Form/OptionGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Admin/Form/OptionGroup.php b/CRM/Admin/Form/OptionGroup.php
index af8ca876340c..2a5ec115a29c 100644
--- a/CRM/Admin/Form/OptionGroup.php
+++ b/CRM/Admin/Form/OptionGroup.php
@@ -133,7 +133,7 @@ public function postProcess() {
       }
 
       $optionGroup = CRM_Core_BAO_OptionGroup::add($params);
-      CRM_Core_Session::setStatus(ts('The Option Group \'%1\' has been saved.', [1 => $optionGroup->name]), ts('Saved'), 'success');
+      CRM_Core_Session::setStatus(ts('The Option Group \'%1\' has been saved.', [1 => $optionGroup->title]), ts('Saved'), 'success');
     }
   }
 

From 8e1615e8b5c7c30f4fe463c2fca3159d5310394d Mon Sep 17 00:00:00 2001
From: Alice Frumin <alice@aghstrategies.com>
Date: Thu, 3 Sep 2020 16:41:49 -0400
Subject: [PATCH 184/834] 5.30 release-notes: first stab at release notes

---
 contributor-key.yml     |   2 +-
 release-notes/5.30.0.md | 503 ++++++++++++++++++++++++++++------------
 2 files changed, 353 insertions(+), 152 deletions(-)

diff --git a/contributor-key.yml b/contributor-key.yml
index fe7abc511963..adf56d17aafc 100644
--- a/contributor-key.yml
+++ b/contributor-key.yml
@@ -975,7 +975,7 @@
 - name        : Manish Zope
   jira        : manish
 
-- github      : marsh-circle
+- github      : MarshCastle
   name        : Martin Castle
   organization: Circle Interactive
   jira        : marshCircle
diff --git a/release-notes/5.30.0.md b/release-notes/5.30.0.md
index 476686b17a87..61d45a1c54f7 100644
--- a/release-notes/5.30.0.md
+++ b/release-notes/5.30.0.md
@@ -13,312 +13,513 @@ Released October 7, 2020
 
 | *Does this version...?*                                         |         |
 |:--------------------------------------------------------------- |:-------:|
-| Fix security vulnerabilities?                                   |         |
-| Change the database schema?                                     |         |
-| Alter the API?                                                  |         |
-| Require attention to configuration options?                     |         |
-| Fix problems installing or upgrading to a previous version?     |         |
-| Introduce features?                                             |         |
-| Fix bugs?                                                       |         |
+| Fix security vulnerabilities?                                   |   no    |
+| **Change the database schema?**                                 | **yes** |
+| **Alter the API?**                                              | **yes** |
+| Require attention to configuration options?                     |   no    |
+| **Fix problems installing or upgrading to a previous version?** | **yes** |
+| **Introduce features?**                                         | **yes** |
+| **Fix bugs?**                                                   | **yes** |
 
 ## <a name="features"></a>Features
 
 ### Core CiviCRM
 
-- **crm- Missing Summary ([18229](https://github.com/civicrm/civicrm-core/pull/18229))**
+- **APIv4 Explorer: Generate short cv code
+  ([18089](https://github.com/civicrm/civicrm-core/pull/18089))**
 
-## <a name="bugs"></a>Bugs resolved
+  Improves the APIv4 Explorer user interface by including cv code to run the API
+  from CLI.
 
-### Core CiviCRM
+- **Optimise proximity custom search, by reducing addGeocodingData fn call
+  ([18248](https://github.com/civicrm/civicrm-core/pull/18248))**
 
-- **Add ability to enable query logging per process ([18335](https://github.com/civicrm/civicrm-core/pull/18335))**
+  Improves performance of the proximity custom search.
 
-- **5.29 ([18334](https://github.com/civicrm/civicrm-core/pull/18334))**
+- **Support more table names for utf8mb4 conversions and database name
+  ([18249](https://github.com/civicrm/civicrm-core/pull/18249))**
 
-- **[REF] Move function to delete merged contacts to the Merger class and include all instances of the pair ([17980](https://github.com/civicrm/civicrm-core/pull/17980))**
+  Improves the System.utf8conversion API so that one can specify table patterns
+  and databases.
 
-- **dev/core#1956 - Typo in call to nestedGroup on scheduled reminders admin form ([18323](https://github.com/civicrm/civicrm-core/pull/18323))**
+- **distmaker - Autogenerate civicrm-*-patchset.tar.gz
+  ([18229](https://github.com/civicrm/civicrm-core/pull/18229))**
 
-- **5.29 ([18327](https://github.com/civicrm/civicrm-core/pull/18327))**
+  Adds a script to autogenerate `civicrm-*-patchset.tar.gz` instead of having to
+  manually generate it every release.
 
-- **dev/mail#24, item 1 - Fix spec labels MailingEventSubscribe.create ([18325](https://github.com/civicrm/civicrm-core/pull/18325))**
+- **Finish allowing use of SSL to connect to database
+  (Work Towards [dev/core#1926](https://lab.civicrm.org/dev/core/-/issues/1926):
+  [18095](https://github.com/civicrm/civicrm-core/pull/18095))**
 
-- **5.29 ([18320](https://github.com/civicrm/civicrm-core/pull/18320))**
+  Code cleanup towards the goal of allowing SSL database connections.
 
-- **[REF] Remove most interaction with $objects in completeOrder ([18315](https://github.com/civicrm/civicrm-core/pull/18315))**
+- **Profile settings - Add new contacts to a Group? is misleading
+  ([dev/core#1950](https://lab.civicrm.org/dev/core/-/issues/1950):
+  [18153](https://github.com/civicrm/civicrm-core/pull/18153))**
 
-- **Test & remove handling for max_related in renewal form ([18295](https://github.com/civicrm/civicrm-core/pull/18295))**
+  Improves user experience by editing the help text and description for the "Add
+  new contacts to a Group?" setting.
 
-- **5.29 to master ([18316](https://github.com/civicrm/civicrm-core/pull/18316))**
+- **API4: Inconsistent behavior on Role ID
+  ([dev/event#37](https://lab.civicrm.org/dev/event/-/issues/37):
+  [18285](https://github.com/civicrm/civicrm-core/pull/18285))**
 
-- **REF Remove unused passbyreference and var from ipn_process_transaction ([18311](https://github.com/civicrm/civicrm-core/pull/18311))**
+  Allows searching within arrays or serialized strings via APIv4 (and the new
+  Search extension).
 
-- **[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContribution ([18303](https://github.com/civicrm/civicrm-core/pull/18303))**
+- **APIv4 - Fix output of CustomValue create/save/update
+  ([18195](https://github.com/civicrm/civicrm-core/pull/18195))**
 
-- **Fix test set up to call Order.create to create the correct line items ([18279](https://github.com/civicrm/civicrm-core/pull/18279))**
+  Improves APIv4 output when saving custom pseudo-entities so that it outputs
+  the values saved instead of `[is_error => 0, result => true]`.
 
-- **[REF] Separate and move line-item specific portion of checkTaxAmount to LineItem api ([18294](https://github.com/civicrm/civicrm-core/pull/18294))**
+- **Add ability to enable query logging per process
+  ([18335](https://github.com/civicrm/civicrm-core/pull/18335))**
 
-- **5.29 ([18305](https://github.com/civicrm/civicrm-core/pull/18305))**
+  Makes it possible to enable logging by process as opposed to all processes or
+  no processes.
 
-- **Move LineItem acl handling from v3 api to financialacls core extension ([18293](https://github.com/civicrm/civicrm-core/pull/18293))**
+- **Expose field label to APIv4 and Search creator
+  ([18255](https://github.com/civicrm/civicrm-core/pull/18255) and
+  [18256](https://github.com/civicrm/civicrm-core/pull/18256))**
 
-- **[REF] Fix financial item allocation of negative payments against completed payments ([17810](https://github.com/civicrm/civicrm-core/pull/17810))**
+  Progress towards codifying the difference between a field's title and
+  label in the schema.
 
-- **Remove 'hack' that overwrites result of searchColumns hook in mailings list ([18237](https://github.com/civicrm/civicrm-core/pull/18237))**
+  These changes:
+   - expose labels to APIv4
+   - switch to using labels in the new search extension.
+   - separates titles from labels in exportable fields.
+   - attempts to clarify the difference between titles and labels in the
+   getfields description as:
+     - title: "Technical name of field, shown in API and exports"
+     - label: "User-facing label, shown on most forms and displays"
 
-- **5.29 to master ([18302](https://github.com/civicrm/civicrm-core/pull/18302))**
+- **Metadata fix - phone_type_id, location_type_id, gender_id
+  ([18114](https://github.com/civicrm/civicrm-core/pull/18114))**
 
-- **event#34: allow negative self-service/transfer time ([18067](https://github.com/civicrm/civicrm-core/pull/18067))**
+  Improves metadata for various fields to align with new title and label
+  standards.
 
-- **Add test to check, remove unnecessary lines ([18292](https://github.com/civicrm/civicrm-core/pull/18292))**
+- **CRM_Utils_VersionCheck - respect force param
+  ([18183](https://github.com/civicrm/civicrm-core/pull/18183))**
 
-- **Clean money for non-deductible amount ([18300](https://github.com/civicrm/civicrm-core/pull/18300))**
+  Makes the versionCheck job more consistent with other checks by respecting
+  APIv4's "force" setting to run even if disabled.
 
-- **[REF] [test] Slight increase in test cover & make functions more re-usable ([18291](https://github.com/civicrm/civicrm-core/pull/18291))**
+- **Add Serialize key to payment_processor field for Event & Contribution Page
+  ([18110](https://github.com/civicrm/civicrm-core/pull/18110))**
 
-- **[REF] simplify retrieval of existing membership on membership renewal form ([18296](https://github.com/civicrm/civicrm-core/pull/18296))**
+  Use metatdata rather than code handling to save array of processors. This
+  makes it so that the DAO can handle arrays if it knows the format.
 
-- **Improve robustness of api/class.api.php ([18283](https://github.com/civicrm/civicrm-core/pull/18283))**
+### CiviContribute
 
-- **add serialize data to actionschedule ([18289](https://github.com/civicrm/civicrm-core/pull/18289))**
+- **Shell Financial ACLs extension
+  ([18269](https://github.com/civicrm/civicrm-core/pull/18269))**
 
-- **dev/event#37 Add CONTAINS operator for APIv4 & Search ([18285](https://github.com/civicrm/civicrm-core/pull/18285))**
+  Begins work to move Financial ACL code into an extension.
 
-- **[REF] Extract function to get locations to merge, rename 'operation' … ([17991](https://github.com/civicrm/civicrm-core/pull/17991))**
+- **Add Line Item v4 API (Work Towards
+  [dev/core#1980](https://lab.civicrm.org/dev/core/-/issues/1980):
+  [18275](https://github.com/civicrm/civicrm-core/pull/18275) and
+  [18293](https://github.com/civicrm/civicrm-core/pull/18293))**
 
-- **dev/core#1980 Move (now tested) delete acl check from v3 api to pre delete hook ([18275](https://github.com/civicrm/civicrm-core/pull/18275))**
+  Extends permission handling for LineItem delete and LineItem ACLs from APIv3 to
+  to APIv4 by moving it to the `financialacls` extension.
 
-- **remove dropped tables for activity target and assignment ([18280](https://github.com/civicrm/civicrm-core/pull/18280))**
+- **Book keeping Report : Add Time field for Transaction Date and Receive Date
+  field ([dev/report#47](https://lab.civicrm.org/dev/report/-/issues/47):
+  [18268](https://github.com/civicrm/civicrm-core/pull/18268))**
 
-- **Add line item acl tests ([18274](https://github.com/civicrm/civicrm-core/pull/18274))**
+  Adds a time field to the "Transaction Date" and "Receive Date" filters on the
+  Bookkeeping report.
 
-- **5.29 ([18276](https://github.com/civicrm/civicrm-core/pull/18276))**
+### CiviEvent
 
-- **report#47 Report Bookkeeping add time field for date filter. ([18268](https://github.com/civicrm/civicrm-core/pull/18268))**
+- **Wrap "not you" message in crmRegion
+  ([18236](https://github.com/civicrm/civicrm-core/pull/18236))**
 
-- **Fix regen and update civicrm_generated ([18273](https://github.com/civicrm/civicrm-core/pull/18273))**
+  Wraps the "Not you, do you want to register for someone else" message in a
+  crmRegion so that it can be removed/replaced by the buildForm hook.
 
-- **[REF] Move Auto DSN Switching into a core function ([18270](https://github.com/civicrm/civicrm-core/pull/18270))**
+### CiviMail
 
-- **Shell Financial ACLs extension ([18269](https://github.com/civicrm/civicrm-core/pull/18269))**
+- **Add new columns to mailing summary report
+  ([dev/core#1944](https://lab.civicrm.org/dev/core/-/issues/1944):
+  [18132](https://github.com/civicrm/civicrm-core/pull/18132))**
 
-- **dev/core#912 update payment instrument of main contribution record ([18266](https://github.com/civicrm/civicrm-core/pull/18266))**
+  Adds two new columns to the mailing summary report: "Sender Name" and "Sender
+  Email".
 
-- **Use already determined value for contributionRecurID ([18265](https://github.com/civicrm/civicrm-core/pull/18265))**
+- **Add disable_smarty option to MessageTemplate.send API
+  ([18118](https://github.com/civicrm/civicrm-core/pull/18118))**
 
-- **Remove old dropped items from the schema xml ([18244](https://github.com/civicrm/civicrm-core/pull/18244))**
+  Improves the `MessageTemplate.send` API by adding a new optional parameter
+  "disable_smarty", when "disable_smarty" is set to true smarty is not applied
+  to the contents of the message.
 
-- **Remove 1 of 2 remaining places where relatedObjects is called in completeOrder ([18257](https://github.com/civicrm/civicrm-core/pull/18257))**
+### WordPress Integration
 
-- **dev/core#1971 Caching of domain-specific option values ([18252](https://github.com/civicrm/civicrm-core/pull/18252))**
+- **Switch WP over to new installer
+  ([dev/wordpress#37](https://lab.civicrm.org/dev/wordpress/-/issues/37):
+  [215](https://github.com/civicrm/civicrm-wordpress/pull/215))**
 
-- **Remove last pass-by-reference in completeOrder signature ([18258](https://github.com/civicrm/civicrm-core/pull/18258))**
+  Switch to new CiviCRM Installer.
 
-- **Support more table names for utf8mb4 conversions and database name ([18249](https://github.com/civicrm/civicrm-core/pull/18249))**
+### Drupal Integration
 
-- **[REF] Ensure that the form param _id is set when adding a new group w… ([18250](https://github.com/civicrm/civicrm-core/pull/18250))**
+- **Allow for the setting of an additional constant CIVICRM_DRUSH_DSN
+  ([613](https://github.com/civicrm/civicrm-drupal/pull/613))**
 
-- **Optimise proximity custom search, by reducing addGeocodingData fn call ([18248](https://github.com/civicrm/civicrm-core/pull/18248))**
+  Allows sites to configure CIVICRM_DRUSH_DSN for drush to use to set up
+  database connections.
 
-- **Expose field label to APIv4 and Search creaor ([18255](https://github.com/civicrm/civicrm-core/pull/18255))**
+## <a name="bugs"></a>Bugs resolved
 
-- **Separate titles from labels in exportable fields ([18256](https://github.com/civicrm/civicrm-core/pull/18256))**
+### Core CiviCRM
 
-- **Fix js for case type status change on load ([18254](https://github.com/civicrm/civicrm-core/pull/18254))**
+- **Increase size of mysql field in export table for column with
+  CRM_Utils_Type::T_INT type
+  ([dev/core#1661](https://lab.civicrm.org/dev/core/-/issues/1661):
+  [17956](https://github.com/civicrm/civicrm-core/pull/17956))**
 
-- **Batch Update via Profile does not supply data for editing when custom fields created after participant added to event ([18235](https://github.com/civicrm/civicrm-core/pull/18235))**
+  Fixes some data too long for column errors when exporting.
 
-- **Wrap "not you" message in crmRegion ([18236](https://github.com/civicrm/civicrm-core/pull/18236))**
+- **Improve robustness of api/class.api.php
+  ([18283](https://github.com/civicrm/civicrm-core/pull/18283))**
 
-- **Do not pass by reference for createRelatedMemberships ([18243](https://github.com/civicrm/civicrm-core/pull/18243))**
+  Ensures that the API mode is set to "local" when an empty string is passed
+  as the server.
 
-- **Remove 2019 deprecated function ([18242](https://github.com/civicrm/civicrm-core/pull/18242))**
+- **add serialize data to actionschedule
+  ([18289](https://github.com/civicrm/civicrm-core/pull/18289))**
 
-- **Add disable_smarty option to MessageTemplate.send API ([18118](https://github.com/civicrm/civicrm-core/pull/18118))**
+  Ensures one can create a scheduled reminder via the API that triggers on two
+  different events.
 
-- **dev/core#1950 Update help text and description for the profile add to groups setting ([18153](https://github.com/civicrm/civicrm-core/pull/18153))**
+- **API - Add upgrade-safe checks to ensure table exists before reading
+  ([18135](https://github.com/civicrm/civicrm-core/pull/18135))**
 
-- **Remove ref to logging time ([18221](https://github.com/civicrm/civicrm-core/pull/18221))**
+  Adds efficient checks into the API (v3 and v4) to ensure a DAO table
+  exists before trying to read from it. This prevents hard-crashes in the UI
+  when there are pending updates (or during the upgrade process itself),
 
-- **Replace deprecated Drupal 8 constants ([18240](https://github.com/civicrm/civicrm-core/pull/18240))**
+- **DB_DataObject - Read CIVICRM_DEBUG_LOG_QUERY correctly
+  ([305](https://github.com/civicrm/civicrm-packages/pull/305))**
 
-- **trim white space when checking dedupe ([18234](https://github.com/civicrm/civicrm-core/pull/18234))**
+  Makes The value of `CIVICRM_DEBUG_LOG_QUERY` TRUE-ish or FALSE-ish instead of
+  considering any value true.
 
-- **Spelling mistake "separator" not "seperator" ([18238](https://github.com/civicrm/civicrm-core/pull/18238))**
+- **APIv4 Explorer - Fix possible undefined index
+  ([18093](https://github.com/civicrm/civicrm-core/pull/18093))**
 
-- **[NFC] Some DAO checksums not updated ([18239](https://github.com/civicrm/civicrm-core/pull/18239))**
+- **Option value cache key missing domain ID can result in wrong value retrieved
+  for domain ([dev/core#1971](https://lab.civicrm.org/dev/core/-/issues/1971):
+  [18252](https://github.com/civicrm/civicrm-core/pull/18252))**
 
-- **5.29 ([18231](https://github.com/civicrm/civicrm-core/pull/18231))**
+- **Upgrade screen - show success instead of error if already upgraded
+  ([18181](https://github.com/civicrm/civicrm-core/pull/18181))**
 
-- **5.29 ([18226](https://github.com/civicrm/civicrm-core/pull/18226))**
+- **trim white space when checking dedupe
+  ([18234](https://github.com/civicrm/civicrm-core/pull/18234))**
 
-- **5.29 to master ([18222](https://github.com/civicrm/civicrm-core/pull/18222))**
+### CiviCase
 
-- **[Test framework] - Remove test for deprecated way of calling hook invoke ([18136](https://github.com/civicrm/civicrm-core/pull/18136))**
+- **Fix js for case type status change on load
+  ([18254](https://github.com/civicrm/civicrm-core/pull/18254))**
 
-- **Cleanup contactID variables in event/contribution register buildQuickForm ([18208](https://github.com/civicrm/civicrm-core/pull/18208))**
+### CiviContribute
 
-- **Remove unused variables from repeatTransaction ([18209](https://github.com/civicrm/civicrm-core/pull/18209))**
+- **Clean money for non-deductible amount
+  ([18300](https://github.com/civicrm/civicrm-core/pull/18300))**
 
-- **Metadata fix in activity search ([18216](https://github.com/civicrm/civicrm-core/pull/18216))**
+  Ensures that the Contribution API cleans data entered into the "non-deductible
+  amount" field the same way it cleans the other money fields.
 
-- **Minor code cleanup to Order API ([18217](https://github.com/civicrm/civicrm-core/pull/18217))**
+- **Processors - remove gross_amount param from processors
+  ([18177](https://github.com/civicrm/civicrm-core/pull/18177))**
 
-- **5.29 ([18215](https://github.com/civicrm/civicrm-core/pull/18215))**
+  The gross_amount param is returned by a bunch of processors but is not used so
+  this removes it.
 
-- **(NFC) Add some tests to the `resources` group ([18211](https://github.com/civicrm/civicrm-core/pull/18211))**
+- **{contribution.receipt_date} token does not use any CiviCRM date formatter,
+  output in YYYY-MM-DD HH:MM:SS format and {contribution.receive_date} also uses
+  a non-standard format
+  ([18176](https://github.com/civicrm/civicrm-core/pull/18176))**
 
-- **5.29 ([18210](https://github.com/civicrm/civicrm-core/pull/18210))**
+- **Fix PHP notice on contribution page
+  ([18116](https://github.com/civicrm/civicrm-core/pull/18116))**
 
-- **5.29 ([18203](https://github.com/civicrm/civicrm-core/pull/18203))**
+- **E_NOTICE on contribution page widget tab
+  ([18189](https://github.com/civicrm/civicrm-core/pull/18189))**
 
-- **APIv4 - Fix output of CustomValue create/save/update ([18195](https://github.com/civicrm/civicrm-core/pull/18195))**
+- **change payment instrument when pending payment paid through credit card
+  ([dev/core#912](https://lab.civicrm.org/dev/core/-/issues/912):
+  [18266](https://github.com/civicrm/civicrm-core/pull/18266))**
 
-- **5.29 ([18199](https://github.com/civicrm/civicrm-core/pull/18199))**
+### CiviEvent
 
-- **Remove first_contribution key from repeattransaction ([18197](https://github.com/civicrm/civicrm-core/pull/18197))**
+- **Allow the "Cancellation or transfer time limit (hours)" to be negative
+  ([dev/event#34](https://lab.civicrm.org/dev/event/-/issues/34):
+  [18067](https://github.com/civicrm/civicrm-core/pull/18067))**
 
-- **Remove unnecessary transformation of upgrade msg severity ([18182](https://github.com/civicrm/civicrm-core/pull/18182))**
+  Ensures that entering a negative value into "Cancellation or transfer time
+  limit (hours)" saves correctly and works as expected.
 
-- **Metadata fix - phone_type_id, location_type_id, gender_id ([18114](https://github.com/civicrm/civicrm-core/pull/18114))**
+- **Batch Update via Profile does not supply data for editing when custom fields
+  created after participant added to event
+  ([18235](https://github.com/civicrm/civicrm-core/pull/18235))**
 
-- **Check if $post defined before trying to use its field values. ([18168](https://github.com/civicrm/civicrm-core/pull/18168))**
+- **E_WARNING when saving event fees admin page if there's no discounts set
+  ([18169](https://github.com/civicrm/civicrm-core/pull/18169))**
 
-- **5.29 to master ([18193](https://github.com/civicrm/civicrm-core/pull/18193))**
+### CiviMail
 
-- **Put mysql back in civicrm.settings.php template ([18188](https://github.com/civicrm/civicrm-core/pull/18188))**
+- **Unexpected behavior from api.MailingEventSubscribe.create
+  (Work Towards [dev/mail#24](https://lab.civicrm.org/dev/mail/-/issues/24):
+  [18325](https://github.com/civicrm/civicrm-core/pull/18325))**
 
-- **E_NOTICE on contribution page widget tab ([18189](https://github.com/civicrm/civicrm-core/pull/18189))**
+  Fixes labels for APIv3 `MailingEventSubscribe.create` so that they accurately
+  represent the behavior (unsubscribe v subscribe).
 
-- **CRM_Utils_VersionCheck - respect force param ([18183](https://github.com/civicrm/civicrm-core/pull/18183))**
+- **Mass SMS: Limit group selection to mailing groups
+  ([18154](https://github.com/civicrm/civicrm-core/pull/18154))**
 
-- **5.29 ([18187](https://github.com/civicrm/civicrm-core/pull/18187))**
+  Ensures that the fields "Include Groups" and "Exclude Groups" on the "New SMS" form
+  only list groups of the type "Mailing List".
 
-- **(NFC) Update various DAO checksums ([18184](https://github.com/civicrm/civicrm-core/pull/18184))**
+### Drupal Integration
 
-- **E_WARNING when saving event fees admin page if there's no discounts set ([18169](https://github.com/civicrm/civicrm-core/pull/18169))**
+- **Fix : Enable Drupal Watchdog Logging for Drupal 8
+  ([dev/core#1943](https://lab.civicrm.org/dev/core/-/issues/1943):
+  [18115](https://github.com/civicrm/civicrm-core/pull/18115))**
 
-- **Upgrade screen - show success instead of error if already upgraded ([18181](https://github.com/civicrm/civicrm-core/pull/18181))**
+  Ensure the setting `Enable Drupal Watchdog Logging` works on Drupal 8 sites.
 
-- **Processors - remove gross_amount param from processors ([18177](https://github.com/civicrm/civicrm-core/pull/18177))**
+### WordPress Integration
 
-- **5.29 ([18173](https://github.com/civicrm/civicrm-core/pull/18173))**
+- **Check if $post defined before trying to use its field values.
+  ([18168](https://github.com/civicrm/civicrm-core/pull/18168))**
 
-- **{contribution.receipt_date} token does not use any CiviCRM date formatter, output in YYYY-MM-DD HH:MM:SS format and {contribution.receive_date} also uses a non-standard format ([18176](https://github.com/civicrm/civicrm-core/pull/18176))**
+  This fixes php notices like `PHP Notice:  Trying to get property 'post_name'
+  of non-object in <webroot
+  path>\wp-content\plugins\civicrm\civicrm\CRM\Utils\System\WordPress.php on
+  line 288`
 
-- **Minor cleanup in test class ([18170](https://github.com/civicrm/civicrm-core/pull/18170))**
+## <a name="misc"></a>Miscellany
 
-- **[REF] Deprecate unused SQL temptable functions ([18171](https://github.com/civicrm/civicrm-core/pull/18171))**
+- **Fix regen and update civicrm_generated
+  ([18273](https://github.com/civicrm/civicrm-core/pull/18273))**
 
-- **Mass SMS: Limit group selection to mailing groups ([18154](https://github.com/civicrm/civicrm-core/pull/18154))**
+- **Do not pass by reference for createRelatedMemberships
+  ([18243](https://github.com/civicrm/civicrm-core/pull/18243))**
 
-- **[REF] Update recent replacement for CRM_Utils_Array::value ([18172](https://github.com/civicrm/civicrm-core/pull/18172))**
+- **Typo in groups dropdown on scheduled reminders admin form
+  ([dev/core#1956](https://lab.civicrm.org/dev/core/-/issues/1956):
+  [18323](https://github.com/civicrm/civicrm-core/pull/18323))**
 
-- **5.29 ([18165](https://github.com/civicrm/civicrm-core/pull/18165))**
+- **Replace CRM_Utils_Array::value in contribution/confirm and bao/membership
+  ([18157](https://github.com/civicrm/civicrm-core/pull/18157))**
 
-- **Replace CRM_Utils_Array::value in contribution/confirm and bao/membership ([18157](https://github.com/civicrm/civicrm-core/pull/18157))**
+- **Cleanup contactID variables in event/contribution register buildQuickForm
+  ([18208](https://github.com/civicrm/civicrm-core/pull/18208))**
 
-- **5.29 ([18159](https://github.com/civicrm/civicrm-core/pull/18159))**
+- **Use already determined value for contributionRecurID
+  ([18265](https://github.com/civicrm/civicrm-core/pull/18265))**
 
-- **Remove legacy handling for 'fixing' line_item.entity_id ([18155](https://github.com/civicrm/civicrm-core/pull/18155))**
+- **Minor code cleanup to Order API
+  ([18217](https://github.com/civicrm/civicrm-core/pull/18217))**
 
-- **Remove deprecated code ids['userId'] ([18156](https://github.com/civicrm/civicrm-core/pull/18156))**
+- **CodeGen - Add use statement to extensions DAO files
+  ([18094](https://github.com/civicrm/civicrm-core/pull/18094))**
 
-- **[REF] Remove usages of CRM_Utils_Money::format that pass in a blank s… ([18142](https://github.com/civicrm/civicrm-core/pull/18142))**
+- **Use more appropriate money format function
+  ([18151](https://github.com/civicrm/civicrm-core/pull/18151))**
 
-- **5.29 ([18148](https://github.com/civicrm/civicrm-core/pull/18148))**
+- **Metadata fix in activity search
+  ([18216](https://github.com/civicrm/civicrm-core/pull/18216))**
 
-- **Use more appropriate money format function ([18151](https://github.com/civicrm/civicrm-core/pull/18151))**
+- **Replace deprecated Drupal 8 constants
+  ([18240](https://github.com/civicrm/civicrm-core/pull/18240))**
 
-- **API - Add upgrade-safe checks to ensure table exists before reading ([18135](https://github.com/civicrm/civicrm-core/pull/18135))**
+- **Spelling mistake "separator" not "seperator"
+  ([18238](https://github.com/civicrm/civicrm-core/pull/18238))**
 
-- **Deprecate 'trapException' in DAO::executeQuery ([18138](https://github.com/civicrm/civicrm-core/pull/18138))**
+- **Remove unused variables from repeatTransaction
+  ([18209](https://github.com/civicrm/civicrm-core/pull/18209))**
 
-- **(REF) CRM_Core_Region - Remove unused bits ([18139](https://github.com/civicrm/civicrm-core/pull/18139))**
+- **Remove first_contribution key from repeattransaction
+  ([18197](https://github.com/civicrm/civicrm-core/pull/18197))**
 
-- **dev/core#1661 Allow phones with types longer than 16 chars to export ([17956](https://github.com/civicrm/civicrm-core/pull/17956))**
+- **Remove unnecessary transformation of upgrade msg severity
+  ([18182](https://github.com/civicrm/civicrm-core/pull/18182))**
 
-- **[REF] Move isSSLDSN() function to avoid potential problems ([18131](https://github.com/civicrm/civicrm-core/pull/18131))**
+- **Remove old dropped items from the schema xml
+  ([18244](https://github.com/civicrm/civicrm-core/pull/18244))**
 
-- **Deprecate/remove unused checkVersion() functions ([18134](https://github.com/civicrm/civicrm-core/pull/18134))**
+- **Remove 1 of 2 remaining places where relatedObjects is called in
+  completeOrder ([18257](https://github.com/civicrm/civicrm-core/pull/18257))**
 
-- **(dev/core#1944) Add new columns to mailing summary report ([18132](https://github.com/civicrm/civicrm-core/pull/18132))**
+- **Remove last pass-by-reference in completeOrder signature
+  ([18258](https://github.com/civicrm/civicrm-core/pull/18258))**
 
-- **CodeGen - Add use statement to extensions DAO files ([18094](https://github.com/civicrm/civicrm-core/pull/18094))**
+- **Remove legacy handling for 'fixing' line_item.entity_id
+  ([18155](https://github.com/civicrm/civicrm-core/pull/18155))**
 
-- **5.29 ([18128](https://github.com/civicrm/civicrm-core/pull/18128))**
+- **Remove deprecated code ids['userId']
+  ([18156](https://github.com/civicrm/civicrm-core/pull/18156))**
 
-- **dev/core#1926 - Towards supporting SSL for mysql connections - remove DB::connect that doesn't add anything ([18095](https://github.com/civicrm/civicrm-core/pull/18095))**
+- **Remove 'hack' that overwrites result of searchColumns hook in mailings list
+  ([18237](https://github.com/civicrm/civicrm-core/pull/18237))**
 
-- **5.29 ([18122](https://github.com/civicrm/civicrm-core/pull/18122))**
+- **Remove unused variable
+  ([18108](https://github.com/civicrm/civicrm-core/pull/18108))**
 
-- **Fix PHP notice on contribution page ([18116](https://github.com/civicrm/civicrm-core/pull/18116))**
+- **Remove handling for 4.2 DBs
+  ([612](https://github.com/civicrm/civicrm-drupal/pull/612))**
 
-- **[NFC] Add code comments about hidden but still used buttons ([18119](https://github.com/civicrm/civicrm-core/pull/18119))**
+- **Remove ref to logging time
+  ([18221](https://github.com/civicrm/civicrm-core/pull/18221))**
 
-- **dev/core#1943 add functionality to add civicrm log into Drupal access log ([18115](https://github.com/civicrm/civicrm-core/pull/18115))**
+- **Remove 2019 deprecated function
+  ([18242](https://github.com/civicrm/civicrm-core/pull/18242))**
 
-- **5.29 to master ([18117](https://github.com/civicrm/civicrm-core/pull/18117))**
+- **remove dropped tables for activity target and assignment
+  ([18280](https://github.com/civicrm/civicrm-core/pull/18280))**
 
-- **[NFC] [Test] Initial testing on event payment forms. ([18112](https://github.com/civicrm/civicrm-core/pull/18112))**
+- **Deprecate 'trapException' in DAO::executeQuery
+  ([18138](https://github.com/civicrm/civicrm-core/pull/18138))**
 
-- **Add Serialize key to payment_processor field for Event & Contribution Page ([18110](https://github.com/civicrm/civicrm-core/pull/18110))**
+- **Deprecate/remove unused checkVersion() functions
+  ([18134](https://github.com/civicrm/civicrm-core/pull/18134))**
 
-- **[NFC] Array formatting ([18109](https://github.com/civicrm/civicrm-core/pull/18109))**
+- **[REF] Ensure that the form param _id is set when adding a new group w…
+  ([18250](https://github.com/civicrm/civicrm-core/pull/18250))**
 
-- **Remove unused variable ([18108](https://github.com/civicrm/civicrm-core/pull/18108))**
+- **[REF] Update recent replacement for CRM_Utils_Array::value
+  ([18172](https://github.com/civicrm/civicrm-core/pull/18172))**
 
-- **5.29 ([18104](https://github.com/civicrm/civicrm-core/pull/18104))**
+- **[REF] Remove usages of CRM_Utils_Money::format that pass in a blank s…
+  ([18142](https://github.com/civicrm/civicrm-core/pull/18142))**
 
-- **5.29 ([18100](https://github.com/civicrm/civicrm-core/pull/18100))**
+- **[REF] Move isSSLDSN() function to avoid potential problems
+  ([18131](https://github.com/civicrm/civicrm-core/pull/18131))**
 
-- **There is no "I" in mysqli - oh wait there is ([18097](https://github.com/civicrm/civicrm-core/pull/18097))**
+- **(REF) CRM_Core_Region - Remove unused bits
+  ([18139](https://github.com/civicrm/civicrm-core/pull/18139))**
 
-- **5.29 to master ([18098](https://github.com/civicrm/civicrm-core/pull/18098))**
+- **[REF] Move Auto DSN Switching into a core function
+  ([18270](https://github.com/civicrm/civicrm-core/pull/18270))**
 
-- **[NFC] Update locale over-ride documentation to mention that it is mos… ([17919](https://github.com/civicrm/civicrm-core/pull/17919))**
+- **[REF] Remove DB Package as it is now deployed using composer
+  ([302](https://github.com/civicrm/civicrm-packages/pull/302))**
 
-- **APIv4 Explorer - Fix possible undefined index ([18093](https://github.com/civicrm/civicrm-core/pull/18093))**
+- **[REF] Deploy Pear DB package using composer
+  ([18027](https://github.com/civicrm/civicrm-core/pull/18027))**
 
-- **[REF] Update subtypeInfo function to leverage getAllContactTypes ([17934](https://github.com/civicrm/civicrm-core/pull/17934))**
+- **[REF] Update subtypeInfo function to leverage getAllContactTypes
+  ([17934](https://github.com/civicrm/civicrm-core/pull/17934))**
 
-- **[REF] Fix metadata label for contribution_page_id ([18047](https://github.com/civicrm/civicrm-core/pull/18047))**
+- **[REF] Fix metadata label for contribution_page_id
+  ([18047](https://github.com/civicrm/civicrm-core/pull/18047))**
 
-- **5.29 ([18090](https://github.com/civicrm/civicrm-core/pull/18090))**
+- **REF Remove unused passbyreference and var from ipn_process_transaction
+  ([18311](https://github.com/civicrm/civicrm-core/pull/18311))**
 
-- **APIv4 Explorer: Generate short cv code ([18089](https://github.com/civicrm/civicrm-core/pull/18089))**
+- **[REF] Clean up return variables on updateContributionStatus,
+  updatePendingOnlineContribution
+  ([18303](https://github.com/civicrm/civicrm-core/pull/18303))**
 
-- **[REF] Deploy Pear DB package using composer ([18027](https://github.com/civicrm/civicrm-core/pull/18027))**
+- **[REF] Move function to delete merged contacts to the Merger class and
+  include all instances of the pair
+  ([17980](https://github.com/civicrm/civicrm-core/pull/17980))**
 
-- **Allow for the setting of an additional constant CIVICRM_DRUSH_DSN ([613](https://github.com/civicrm/civicrm-drupal/pull/613))**
+- **[REF] Remove most interaction with $objects in completeOrder
+  ([18315](https://github.com/civicrm/civicrm-core/pull/18315))**
 
-- **7.x 5.29 ([621](https://github.com/civicrm/civicrm-drupal/pull/621))**
+- **[REF] Fix financial item allocation of negative payments against completed
+  payments ([17810](https://github.com/civicrm/civicrm-core/pull/17810))**
 
-- **7.x 5.29 ([616](https://github.com/civicrm/civicrm-drupal/pull/616))**
+- **[REF] Separate and move line-item specific portion of checkTaxAmount to
+  LineItem api ([18294](https://github.com/civicrm/civicrm-core/pull/18294))**
 
-- **[NFC] IDE cleanup - arrays, single quotes ([614](https://github.com/civicrm/civicrm-drupal/pull/614))**
+- **[REF] [test] Slight increase in test cover & make functions more re-usable
+  ([18291](https://github.com/civicrm/civicrm-core/pull/18291))**
 
-- **Remove handling for 4.2 DBs ([612](https://github.com/civicrm/civicrm-drupal/pull/612))**
+- **[REF] simplify retrieval of existing membership on membership renewal form
+  ([18296](https://github.com/civicrm/civicrm-core/pull/18296))**
 
-- **dev/wordpress#37 - Switch unambiguously to new installer UI ([215](https://github.com/civicrm/civicrm-wordpress/pull/215))**
+- **[REF] Extract function to get locations to merge, rename 'operation' …
+  ([17991](https://github.com/civicrm/civicrm-core/pull/17991))**
 
-- **DB_DataObject - Read CIVICRM_DEBUG_LOG_QUERY correctly ([305](https://github.com/civicrm/civicrm-packages/pull/305))**
+- **[REF] Deprecate unused SQL temptable functions
+  ([18171](https://github.com/civicrm/civicrm-core/pull/18171))**
 
-- **[REF] Remove DB Package as it is now deployed using composer ([302](https://github.com/civicrm/civicrm-packages/pull/302))**
+- **Minor cleanup in test class
+  ([18170](https://github.com/civicrm/civicrm-core/pull/18170))**
 
-## <a name="misc"></a>Miscellany
+- **Add line item acl tests
+  ([18274](https://github.com/civicrm/civicrm-core/pull/18274))**
+
+- **Fix test set up to call Order.create to create the correct line items
+  ([18279](https://github.com/civicrm/civicrm-core/pull/18279))**
+
+- **Test & remove handling for max_related in renewal form
+  ([18295](https://github.com/civicrm/civicrm-core/pull/18295))**
+
+- **Add test to check, remove unnecessary lines
+  ([18292](https://github.com/civicrm/civicrm-core/pull/18292))**
+
+- **[Test framework] - Remove test for deprecated way of calling hook invoke
+  ([18136](https://github.com/civicrm/civicrm-core/pull/18136))**
+
+- **(NFC) Update various DAO checksums
+  ([18184](https://github.com/civicrm/civicrm-core/pull/18184))**
+
+- **[NFC] Add code comments about hidden but still used buttons
+  ([18119](https://github.com/civicrm/civicrm-core/pull/18119))**
+
+- **[NFC] [Test] Initial testing on event payment forms.
+  ([18112](https://github.com/civicrm/civicrm-core/pull/18112))**
+
+- **[NFC] Update locale over-ride documentation to mention that it is mos…
+  ([17919](https://github.com/civicrm/civicrm-core/pull/17919))**
+
+- **(NFC) Add some tests to the `resources` group
+  ([18211](https://github.com/civicrm/civicrm-core/pull/18211))**
+
+- **[NFC] Some DAO checksums not updated
+  ([18239](https://github.com/civicrm/civicrm-core/pull/18239))**
+
+- **[NFC] Array formatting
+  ([18109](https://github.com/civicrm/civicrm-core/pull/18109))**
+
+- **[NFC] IDE cleanup - arrays, single quotes
+  ([614](https://github.com/civicrm/civicrm-drupal/pull/614))**
 
 ## <a name="credits"></a>Credits
 
 This release was developed by the following code authors:
 
-AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi Zhang; Circle Interactive - Pradeep Nayak; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Sunil Pawar, Yashodha Chaku; Dave D; Flinders University of South Australia - Tom Anderson; JMA Consulting - Monish Deb, Seamus Lee; John Kingsnorth; Lemniscus - Noah Miller; Lighthouse Consulting and Design - Brian Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil Wijesooriya; MJW Consulting - Matthew Wire; Squiffle Consulting - Aidan Saunders; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight - Lars Sanders-Green
+AGH Strategies - Alice Frumin, Andrew Hunt; Agileware - Justin Freeman, Pengyi
+Zhang; Circle Interactive - Pradeep Nayak; CiviCRM - Coleman Watts, Tim Otten;
+CiviDesk - Sunil Pawar, Yashodha Chaku; Dave D; Flinders University of South
+Australia - Tom Anderson; JMA Consulting - Monish Deb, Seamus Lee; John
+Kingsnorth; Lemniscus - Noah Miller; Lighthouse Consulting and Design - Brian
+Shaughnessy; Megaphone Technology Consulting - Jon Goldberg; MillerTech - Chamil
+Wijesooriya; MJW Consulting - Matthew Wire; Squiffle Consulting - Aidan
+Saunders; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight -
+Lars Sanders-Green
 
 Most authors also reviewed code for this release; in addition, the following
 reviewers contributed their comments:
 
-Artful Robot - Rich Lott; Christian Wach; civibot[bot]; CiviCRM - Coleman Watts, Tim Otten; CiviDesk - Yashodha Chaku; Dave D; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe - Patrick Figel; JMA Consulting - Seamus Lee; John Kingsnorth; Lighthouse Consulting and Design - Brian Shaughnessy; MarshCastle; Megaphone Technology Consulting - Jon Goldberg; MJCO - Mikey O'Toole; MJW Consulting - Matthew Wire; Semper IT - Karin Gerritsen; Squiffle Consulting - Aidan Saunders; Tadpole Collective - Kevin Cristiano; Wikimedia Foundation - Eileen McNaughton, Maggie Epps; Wildsight - Lars Sanders-Green
+Artful Robot - Rich Lott; Christian Wach; Circle Interactive - Martin Castle;
+Dave D; Fuzion - Jitendra Purohit; Greenpeace Central and Eastern Europe -
+Patrick Figel; MJCO - Mikey O'Toole; Semper IT - Karin Gerritsen; Squiffle
+Consulting - Aidan Saunders; Tadpole Collective - Kevin Cristiano;
 
 ## <a name="feedback"></a>Feedback
 

From 919cd6401a3c84a1974a2d8081817851639a33f0 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:04:39 -0400
Subject: [PATCH 185/834] Icons on buttons positioned inline, not absolute

---
 css/civicrm.css | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index a3264938b0ae..3b1ff140e2cf 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2117,20 +2117,13 @@ a.crm-i:hover {
   color: #86c661;
 }
 
-.crm-i-button {
-  position: relative;
-}
-
 .crm-i-button>.crm-i {
-  position: absolute;
-  pointer-events: none;
-  top: .4em;
-  left: .4em;
+  padding-left: 5px;
 }
 
 .crm-container .crm-button.crm-i-button input[type="button"],
 .crm-container .crm-button.crm-i-button input.crm-form-submit {
-  padding-left: 1.6em;
+  padding-left: 0;
 }
 
 .crm-container a.helpicon {

From 7b54b93c77fde3425214b0c910148711bd1e9d3f Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:15:02 -0400
Subject: [PATCH 186/834] No need for crm-i-button class

---
 css/civicrm.css                          | 6 +++---
 templates/CRM/Admin/Page/APIExplorer.tpl | 2 +-
 templates/CRM/common/formButtons.tpl     | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 3b1ff140e2cf..22a6b34bf773 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2117,12 +2117,12 @@ a.crm-i:hover {
   color: #86c661;
 }
 
-.crm-i-button>.crm-i {
+.crm-button>.crm-i {
   padding-left: 5px;
 }
 
-.crm-container .crm-button.crm-i-button input[type="button"],
-.crm-container .crm-button.crm-i-button input.crm-form-submit {
+.crm-container .crm-button .crm-i + input[type="button"],
+.crm-container .crm-button .crm-i + input.crm-form-submit {
   padding-left: 0;
 }
 
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 1e1b8eb497da..ced1f3668dcd 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -285,7 +285,7 @@
         </table>
       </div>
       <div class="crm-submit-buttons">
-        <span class="crm-button crm-i-button">
+        <span class="crm-button">
           <i class="crm-i fa-bolt" aria-hidden="true"></i><input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
         </span>
       </div>
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 92b41f4dff0d..9af85592f3a5 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -41,7 +41,6 @@
     {crmGetAttribute html=$html attr='crm-icon' assign='icon'}
     {capture assign=iconPrefix}{$icon|truncate:3:"":true}{/capture}
     {if $icon && $iconPrefix eq 'fa-'}
-      {assign var='buttonClass' value=' crm-i-button'}
       {capture assign=iconDisp}<i class="crm-i {$icon}" aria-hidden="true"></i>{/capture}
     {elseif $icon}
       {assign var='buttonClass' value=' crm-icon-button'}

From 4bc72ff2e2a895ec11186bbc3a7272054cd3c929 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:24:45 -0400
Subject: [PATCH 187/834] Eliminate support for old jQuery UI based
 crm-button-icon icon buttons

---
 ang/crmMailingAB/EditCtrl/report.html | 2 +-
 ang/crmUi.js                          | 2 +-
 css/civicrm.css                       | 9 ---------
 js/crm.ajax.js                        | 2 +-
 templates/CRM/common/formButtons.tpl  | 5 +----
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/ang/crmMailingAB/EditCtrl/report.html b/ang/crmMailingAB/EditCtrl/report.html
index 18380923c1ee..5e97ae964a5b 100644
--- a/ang/crmMailingAB/EditCtrl/report.html
+++ b/ang/crmMailingAB/EditCtrl/report.html
@@ -83,7 +83,7 @@
           class="crm-hover-button action-item"
           ng-href="{{statUrl(am.mailing, statType, 'report')}}"
           title="{{ts('Reports for \'%1\'', {1: statType.title})}}"
-          crm-icon="clipboard"
+          crm-icon="fa-clipboard"
           ></a>
       </td>
       <td ng-show="abtest.ab.status == 'Testing'"></td>
diff --git a/ang/crmUi.js b/ang/crmUi.js
index c6ba58b1464e..355939c2dcf7 100644
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -908,7 +908,7 @@
     })
 
     // Example for Font Awesome: <button crm-icon="fa-check">Save</button>
-    // Example for jQuery UI (deprecated): <button crm-icon="check">Save</button>
+    // Example for jQuery UI (deprecated): <button crm-icon="fa-check">Save</button>
     .directive('crmIcon', function() {
       return {
         restrict: 'EA',
diff --git a/css/civicrm.css b/css/civicrm.css
index 22a6b34bf773..12b14aab451a 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2062,15 +2062,6 @@ input.crm-form-entityref {
   padding-left: 0;
 }
 
-.crm-container .crm-button-icon {
-  background-image: url("../i/icons/jquery-ui-FFFFFF.png");
-  height: 16px;
-  width: 16px;
-  display: block;
-  position: absolute;
-  pointer-events: none;
-}
-
 .crm-container .delete-icon {
   background-position: -176px -96px;
 }
diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 9a3c3f1ce572..e65bd7b2a22c 100644
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -517,7 +517,7 @@
             added.push(identifier);
           }
           // display:none causes the form to not submit when pressing "enter"
-          $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'}).find('.crm-button-icon').hide();
+          $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'});
         });
         $el.dialog('option', 'buttons', buttons);
       }
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 9af85592f3a5..7af01e646bec 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -42,12 +42,9 @@
     {capture assign=iconPrefix}{$icon|truncate:3:"":true}{/capture}
     {if $icon && $iconPrefix eq 'fa-'}
       {capture assign=iconDisp}<i class="crm-i {$icon}" aria-hidden="true"></i>{/capture}
-    {elseif $icon}
-      {assign var='buttonClass' value=' crm-icon-button'}
-      {capture assign=iconDisp}<span class="crm-button-icon ui-icon-{$icon}"> </span>{/capture}
     {/if}
     {crmGetAttribute html=$html attr='disabled' assign='disabled'}
-    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{$buttonClass}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
+    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
       {$iconDisp}
       {$html}
     </span>

From dd7e23f250720223d8bb742bdbbc0486a8bf710a Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:36:13 -0400
Subject: [PATCH 188/834] Standardize single space (not nbsp) between icon and
 text

---
 CRM/Core/Controller.php                       |  4 ++--
 CRM/Core/Smarty/plugins/block.crmButton.php   |  2 +-
 templates/CRM/Admin/Page/APIExplorer.tpl      |  2 +-
 .../Contact/Form/Search/Custom/FullText.tpl   | 14 ++++++-------
 .../Event/Form/ParticipantFeeSelection.tpl    |  2 +-
 templates/CRM/Event/Page/DashBoard.tpl        |  2 +-
 templates/CRM/Report/Form/Actions.tpl         |  2 +-
 templates/CRM/Tag/Page/Tag.tpl                | 20 +++++++++----------
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php
index 4a4254c25505..68c653185855 100644
--- a/CRM/Core/Controller.php
+++ b/CRM/Core/Controller.php
@@ -568,8 +568,8 @@ public function wizardHeader($currentPageName) {
   public function addWizardStyle(&$wizard) {
     $wizard['style'] = [
       'barClass' => '',
-      'stepPrefixCurrent' => '<i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;',
-      'stepPrefixPast' => '<i class="crm-i fa-check" aria-hidden="true"></i>&nbsp;',
+      'stepPrefixCurrent' => '<i class="crm-i fa-chevron-right" aria-hidden="true"></i> ',
+      'stepPrefixPast' => '<i class="crm-i fa-check" aria-hidden="true"></i> ',
       'stepPrefixFuture' => ' ',
       'subStepPrefixCurrent' => '&nbsp;&nbsp;',
       'subStepPrefixPast' => '&nbsp;&nbsp;',
diff --git a/CRM/Core/Smarty/plugins/block.crmButton.php b/CRM/Core/Smarty/plugins/block.crmButton.php
index 390a8e73030e..64543d595768 100644
--- a/CRM/Core/Smarty/plugins/block.crmButton.php
+++ b/CRM/Core/Smarty/plugins/block.crmButton.php
@@ -47,7 +47,7 @@ function smarty_block_crmButton($params, $text, &$smarty) {
     if (strpos($icon, 'fa-') !== 0) {
       $icon = "fa-$icon";
     }
-    $iconMarkup = "<i class='crm-i $icon' aria-hidden=\"true\"></i>&nbsp; ";
+    $iconMarkup = "<i class='crm-i $icon' aria-hidden=\"true\"></i> ";
   }
   // All other params are treated as html attributes
   CRM_Utils_Array::remove($params, 'icon', 'p', 'q', 'a', 'f', 'h', 'fb', 'fe');
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index ced1f3668dcd..9c127fcb6fca 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -286,7 +286,7 @@
       </div>
       <div class="crm-submit-buttons">
         <span class="crm-button">
-          <i class="crm-i fa-bolt" aria-hidden="true"></i><input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
+          <i class="crm-i fa-bolt" aria-hidden="true"></i> <input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
         </span>
       </div>
 
diff --git a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
index 6a7d8b516a80..51a3c91956d8 100644
--- a/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/FullText.tpl
@@ -62,7 +62,7 @@
     {if !$table and $summary.addShowAllLink.Contact}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Contact&text=$text"}"
-        title="{ts}View all results for contacts{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for contacts{/ts}</a>
+        title="{ts}View all results for contacts{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for contacts{/ts}</a>
       </div>{/if}
     {* note we using location="below" because we don't want to use rows per page for now. And therefore don't put location="bottom" for now. *}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -125,7 +125,7 @@
     {if !$table and $summary.addShowAllLink.Activity}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Activity&text=$text"}"
-        title="{ts}View all results for activities{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for activities{/ts}</a>
+        title="{ts}View all results for activities{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for activities{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -182,7 +182,7 @@
     {if !$table and $summary.addShowAllLink.Case}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Case&text=$text"}"
-        title="{ts}View all results for cases{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for cases{/ts}</a>
+        title="{ts}View all results for cases{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for cases{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -236,7 +236,7 @@
     {if !$table and $summary.addShowAllLink.Contribution}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Contribution&text=$text"}"
-        title="{ts}View all results for contributions{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for contributions{/ts}</a>
+        title="{ts}View all results for contributions{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for contributions{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -293,7 +293,7 @@
     {if !$table and $summary.addShowAllLink.Participant}
       <div class="crm-section full-text-view-all-section"><a
         href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Participant&text=$text"}"
-        title="{ts}View all results for participants{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for participants{/ts}</a>
+        title="{ts}View all results for participants{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for participants{/ts}</a>
       </div>{/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
     {* END Actions/Results section *}
@@ -349,7 +349,7 @@
     {if !$table and $summary.addShowAllLink.Membership}
       <div class="crm-section full-text-view-all-section">
         <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=Membership&text=$text"}"
-        title="{ts}View all results for memberships{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for memberships{/ts}</a>
+        title="{ts}View all results for memberships{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for memberships{/ts}</a>
       </div>
     {/if}
     {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
@@ -395,7 +395,7 @@
   {if !$table and $summary.addShowAllLink.File}
   <div class="crm-section full-text-view-all-section">
     <a href="{crmURL p='civicrm/contact/search/custom' q="csid=`$csID`&reset=1&force=1&table=File&text=$text"}"
-          title="{ts}View all results for files{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;{ts}View all results for files{/ts}</a>
+          title="{ts}View all results for files{/ts}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}View all results for files{/ts}</a>
   </div>{/if}
   {if $table}{include file="CRM/common/pager.tpl" location="below"}{/if}
 {* END Actions/Results section *}
diff --git a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
index 16bb9a1938ac..f91c883be3b4 100644
--- a/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
+++ b/templates/CRM/Event/Form/ParticipantFeeSelection.tpl
@@ -87,7 +87,7 @@ CRM.$(function($) {
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
   {if !$email}
   <div class="messages status no-popup">
-    <i class="crm-i fa-info-circle" aria-hidden="true"></i>&nbsp;{ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
+    <i class="crm-i fa-info-circle" aria-hidden="true"></i> {ts}You will not be able to send an automatic email receipt for this payment because there is no email address recorded for this contact. If you want a receipt to be sent when this payment is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the payment.{/ts}
   </div>
   {/if}
   <table class="form-layout">
diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl
index 3ca364f09329..d01250ee681b 100644
--- a/templates/CRM/Event/Page/DashBoard.tpl
+++ b/templates/CRM/Event/Page/DashBoard.tpl
@@ -87,7 +87,7 @@
       {if $actionColumn}
         <td class="crm-event-isMap">
           {if $values.isMap}
-            <a href="{$values.isMap}" title="{ts}Map event location{/ts}"><i class="crm-i fa-map-marker" aria-hidden="true"></i>&nbsp;{ts}Map{/ts}</a>
+            <a href="{$values.isMap}" title="{ts}Map event location{/ts}"><i class="crm-i fa-map-marker" aria-hidden="true"></i> {ts}Map{/ts}</a>
             &nbsp;|&nbsp;
           {/if}
           {if $values.configure}
diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl
index 9aee8f669585..34690c1d916d 100644
--- a/templates/CRM/Report/Form/Actions.tpl
+++ b/templates/CRM/Report/Form/Actions.tpl
@@ -20,7 +20,7 @@
               <tr>
                 {include file="CRM/common/tasks.tpl" location="botton"}
                 {if $instanceUrl}
-                  <td>&nbsp;&nbsp;<i class="crm-i fa-chevron-right" aria-hidden="true"></i>&nbsp;<a href="{$instanceUrl}">{ts}Existing report(s) from this template{/ts}</a></td>
+                  <td>&nbsp;&nbsp;<i class="crm-i fa-chevron-right" aria-hidden="true"></i> <a href="{$instanceUrl}">{ts}Existing report(s) from this template{/ts}</a></td>
                 {/if}
               </tr>
             </table>
diff --git a/templates/CRM/Tag/Page/Tag.tpl b/templates/CRM/Tag/Page/Tag.tpl
index e59f24246a76..e0ded1e4bcb4 100644
--- a/templates/CRM/Tag/Page/Tag.tpl
+++ b/templates/CRM/Tag/Page/Tag.tpl
@@ -463,16 +463,16 @@
   <% {rdelim} %>
   <div class="crm-submit-buttons">
     <a href="{crmURL p="civicrm/tag/edit" q="action=add&parent_id="}<%= tagset || '' %>" class="button crm-popup">
-      <span><i class="crm-i fa-plus" aria-hidden="true"></i>&nbsp; {ts}Add Tag{/ts}</span>
+      <span><i class="crm-i fa-plus" aria-hidden="true"></i> {ts}Add Tag{/ts}</span>
     </a>
     <% if(tagset && adminTagsets) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/edit" q="action=update&id="}<%= tagset %>" class="button crm-popup tagset-action-update">
-        <span><i class="crm-i fa-pencil" aria-hidden="true"></i>&nbsp; {ts}Edit Set{/ts}</span>
+        <span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit Set{/ts}</span>
       </a>
     <% {rdelim} %>
     <% if(tagset && !length && adminTagsets && (!is_reserved || adminReserved)) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/edit" q="action=delete&id="}<%= tagset %>" class="button crm-popup small-popup tagset-action-delete">
-        <span><i class="crm-i fa-trash" aria-hidden="true"></i>&nbsp; {ts}Delete Set{/ts}</span>
+        <span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete Set{/ts}</span>
       </a>
     <% {rdelim} %>
   </div>
@@ -519,21 +519,21 @@
   <div class="crm-submit-buttons">
     <% if(!tagset) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/edit" q="action=add&parent_id="}<%= id %>" class="button crm-popup" title="{ts}Create new tag under this one{/ts}">
-        <span><i class="crm-i fa-plus" aria-hidden="true"></i>&nbsp; {ts}Add Child{/ts}</span>
+        <span><i class="crm-i fa-plus" aria-hidden="true"></i> {ts}Add Child{/ts}</span>
       </a>
     <% {rdelim} %>
     <a href="{crmURL p="civicrm/tag/edit" q="action=add&clone_from="}<%= id %>" class="button crm-popup" title="{ts}Duplicate this tag{/ts}">
-      <span><i class="crm-i fa-copy" aria-hidden="true"></i>&nbsp; {ts}Clone Tag{/ts}</span>
+      <span><i class="crm-i fa-copy" aria-hidden="true"></i> {ts}Clone Tag{/ts}</span>
     </a>
     <% if(!data.is_reserved || adminReserved) {ldelim} %>
       <% if(tagsetCount) {ldelim} %>
         <a href="#move" class="button move-tag-button" title="{ts}Move to a different tagset{/ts}">
-          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i>&nbsp; {ts}Move Tag{/ts}</span>
+          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i> {ts}Move Tag{/ts}</span>
         </a>
       <% {rdelim} %>
       <% if(!hasChildren) {ldelim} %>
         <a href="{crmURL p="civicrm/tag/edit" q="action=delete&id="}<%= id %>" class="button crm-popup small-popup">
-          <span><i class="crm-i fa-trash" aria-hidden="true"></i>&nbsp; {ts}Delete{/ts}</span>
+          <span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete{/ts}</span>
         </a>
       <% {rdelim} %>
     <% {rdelim} %>
@@ -551,16 +551,16 @@
   <div class="crm-submit-buttons">
     <% if(!reserved || adminReserved) {ldelim} %>
       <a href="{crmURL p="civicrm/tag/merge" q="id="}<%= items.join() %>" class="button crm-popup small-popup" title="{ts}Combine tags into one{/ts}">
-        <span><i class="crm-i fa-compress" aria-hidden="true"></i>&nbsp; {ts}Merge Tags{/ts}</span>
+        <span><i class="crm-i fa-compress" aria-hidden="true"></i> {ts}Merge Tags{/ts}</span>
       </a>
       <% if(tagsetCount) {ldelim} %>
         <a href="#move" class="button move-tag-button" title="{ts}Move to a different tagset{/ts}">
-          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i>&nbsp; {ts}Move Tags{/ts}</span>
+          <span><i class="crm-i fa-share-square-o" aria-hidden="true"></i> {ts}Move Tags{/ts}</span>
         </a>
       <% {rdelim} %>
       <% if(!hasChildren) {ldelim} %>
         <a href="{crmURL p="civicrm/tag/edit" q="action=delete&id="}<%= items.join() %>" class="button crm-popup small-popup">
-          <span><i class="crm-i fa-trash" aria-hidden="true"></i>&nbsp; {ts}Delete All{/ts}</span>
+          <span><i class="crm-i fa-trash" aria-hidden="true"></i> {ts}Delete All{/ts}</span>
         </a>
       <% {rdelim} %>
     <% {rdelim} %>

From 59d00364dba7c11338efb69c49b5cc15f27bef55 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:46:48 -0400
Subject: [PATCH 189/834] Remove weird styling for "Configure CKEditor" button

---
 css/civicrm.css                                  | 8 --------
 templates/CRM/Admin/Form/Preferences/Display.tpl | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 12b14aab451a..10c8760c8cc2 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2046,14 +2046,6 @@ input.crm-form-entityref {
   margin-left: 3px;
 }
 
-.crm-container .crm-button.crm-icon-button {
-  padding: 2px 2px 1px 4px;
-}
-
-.crm-container .crm-button.crm-icon-button input {
-  padding-left: 18px;
-}
-
 .crm-container .crm-button.button-crm-i {
   padding: 2px 0 1px 5px;
 }
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index c79a2d025d9d..e36cc9501fd1 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -161,8 +161,8 @@
       <td>
         {$form.editor_id.html}
         &nbsp;
-        <span class="crm-button crm-icon-button" style="display:inline-block;vertical-align:middle;float:none!important;">
-          <i class="crm-i fa-wrench" style="margin: 0 -18px 0 2px;" aria-hidden="true"></i>
+        <span class="crm-button" style="display:inline-block;vertical-align:middle;float:none!important;">
+          <i class="crm-i fa-wrench" aria-hidden="true"></i>
           {$form.ckeditor_config.html}
         </span>
       </td>

From 98df6d1206c8eabb9e38e8c5c647f84c91cef8ad Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:48:48 -0400
Subject: [PATCH 190/834] Remove unused button-crm-i CSS

---
 css/civicrm.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 10c8760c8cc2..55b4b32dd797 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -2046,14 +2046,6 @@ input.crm-form-entityref {
   margin-left: 3px;
 }
 
-.crm-container .crm-button.button-crm-i {
-  padding: 2px 0 1px 5px;
-}
-
-.crm-container .crm-button.button-crm-i input {
-  padding-left: 0;
-}
-
 .crm-container .delete-icon {
   background-position: -176px -96px;
 }

From d9fc1272c7a904c994c0f41d5474ca31a116a385 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Mon, 3 Aug 2020 19:19:01 -0400
Subject: [PATCH 191/834] remove IE6-only CSS

---
 css/civicrm.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 55b4b32dd797..e0e1353d0322 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1835,8 +1835,6 @@ input.crm-form-entityref {
 
 .crm-container .crm-button input {
   background: none;
-  _background: #6C6C6C;
-  /* IE6 only */
   border: medium none;
   color: #FFF;
   cursor: pointer;
@@ -1895,8 +1893,6 @@ input.crm-form-entityref {
   padding: 3px 5px 2px;
   margin: 0;
   background: none;
-  _background: #6C6C6C;
-  /* IE6 only */
   border: none;
 }
 

From 294a6eebb1d41964952df76c2b1311506003c244 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 14:55:51 -0400
Subject: [PATCH 192/834] Simplify button padding and set consistent line
 height

---
 css/civicrm.css | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index e0e1353d0322..d4574ae5d89d 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1868,11 +1868,19 @@ input.crm-form-entityref {
   border: 1px solid #3e3e3e;
 }
 
+.crm-container a.button,
+.crm-container a.button:link,
+.crm-container a.button:visited,
 .crm-container span.crm-button {
   display: block;
-  float: left !important;
+  float: left;
   overflow: hidden;
-  padding: 1px;
+  line-height: 135%;
+}
+
+/* Preserving the important but not sure why */
+.crm-container span.crm-button {
+  float: left !important;
 }
 
 .crm-container button.crm-button {
@@ -1890,20 +1898,12 @@ input.crm-form-entityref {
 
 .crm-container .crm-button input[type=button],
 .crm-container .crm-button input.crm-form-submit {
-  padding: 3px 5px 2px;
+  padding: 0;
   margin: 0;
   background: none;
   border: none;
 }
 
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container a.button:visited {
-  display: block;
-  float: left;
-  line-height: 135%;
-}
-
 .crm-container .crm-button:hover,
 .crm-container .crm-button:focus,
 .crm-container input[type=submit]:hover,
@@ -2088,15 +2088,6 @@ a.crm-i:hover {
   color: #86c661;
 }
 
-.crm-button>.crm-i {
-  padding-left: 5px;
-}
-
-.crm-container .crm-button .crm-i + input[type="button"],
-.crm-container .crm-button .crm-i + input.crm-form-submit {
-  padding-left: 0;
-}
-
 .crm-container a.helpicon {
   opacity: .8;
 }

From 61d22e947e4b88d4312987e1ae5b600fc5132867 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 30 Jul 2020 15:32:13 -0400
Subject: [PATCH 193/834] Reset button height in the WP backend

---
 css/civicrm.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/css/civicrm.css b/css/civicrm.css
index d4574ae5d89d..70e5a0ef01dd 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1849,6 +1849,12 @@ input.crm-form-entityref {
   margin-left: 20px;
 }
 
+/* Reset WP backend min-height for buttons */
+
+.wp-core-ui .crm-container .button {
+  min-height: 0;
+}
+
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,

From cbd83ddebb3c7e88157f90905c4ac63bf5214c44 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 11:19:56 -0400
Subject: [PATCH 194/834] Swap out button/submit inputs for button elements

---
 CRM/Admin/Form/Preferences/Display.php          |  2 +-
 CRM/Admin/Form/Setting/Smtp.php                 |  6 +++++-
 CRM/Batch/Form/Entry.php                        |  5 +++--
 CRM/Case/Form/CaseView.php                      |  8 ++++++--
 CRM/Contact/Form/Contact.php                    | 15 +++++++++------
 CRM/Contact/Form/Search.php                     |  3 ++-
 CRM/Contact/Form/Task/AddToParentClass.php      |  8 ++++++--
 CRM/Contribute/Form/ContributionPage.php        |  5 ++++-
 CRM/Contribute/Form/ContributionPage/Widget.php |  5 +++--
 CRM/Contribute/Import/Form/DataSource.php       |  5 ++++-
 CRM/Core/BAO/Mapping.php                        | 12 +++++++++---
 CRM/Core/Form.php                               | 11 ++++++++---
 CRM/Custom/Form/Field.php                       |  7 +++++--
 CRM/Custom/Form/Group.php                       |  5 ++++-
 CRM/Custom/Form/Option.php                      |  9 +++++++--
 CRM/Event/Form/ManageEvent/Fee.php              |  7 +++++--
 CRM/Financial/Form/BatchTransaction.php         | 12 +++++++-----
 CRM/Financial/Form/Search.php                   |  3 ++-
 CRM/Price/Form/Field.php                        |  7 +++++--
 CRM/Profile/Form.php                            |  5 +++--
 CRM/Profile/Form/Edit.php                       |  2 +-
 CRM/Report/Form.php                             |  7 +++++--
 CRM/UF/Form/Field.php                           |  7 +++++--
 CRM/UF/Form/Group.php                           |  5 ++++-
 install/template.html                           |  6 +++---
 js/jquery/jquery.dashboard.js                   |  4 ++--
 setup/plugins/blocks/advanced.tpl.php           |  2 +-
 setup/plugins/blocks/install.tpl.php            |  5 ++---
 setup/plugins/blocks/requirements.tpl.php       |  2 +-
 setup/src/Setup/UI/SetupController.php          |  2 +-
 templates/CRM/Block/Add.tpl                     |  2 +-
 templates/CRM/Block/FullTextSearch.tpl          |  2 +-
 templates/CRM/Contact/Page/View/Print.tpl       |  2 +-
 templates/CRM/Mailing/Page/Resubscribe.tpl      |  4 ++--
 templates/CRM/common/navigation.js.tpl          |  2 +-
 35 files changed, 129 insertions(+), 65 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index 775fa2c04ec5..41073eed625e 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -50,7 +50,7 @@ public function buildQuickForm() {
     $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
     $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled());
 
-    $this->addElement('submit', 'ckeditor_config', ts('Configure CKEditor'));
+    $this->addElement('xbutton', 'ckeditor_config', ts('Configure CKEditor'), ['type' => 'submit']);
 
     $editOptions = CRM_Core_OptionGroup::values('contact_edit_options', FALSE, FALSE, FALSE, 'AND v.filter = 0');
     $this->assign('editOptions', $editOptions);
diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php
index da909c7f0877..1c6dc0d46aa8 100644
--- a/CRM/Admin/Form/Setting/Smtp.php
+++ b/CRM/Admin/Form/Setting/Smtp.php
@@ -61,7 +61,11 @@ public function buildQuickForm() {
     $this->addFormRule(['CRM_Admin_Form_Setting_Smtp', 'formRule']);
     parent::buildQuickForm();
     $buttons = $this->getElement('buttons')->getElements();
-    $buttons[] = $this->createElement('submit', $this->_testButtonName, ts('Save & Send Test Email'), ['crm-icon' => 'fa-envelope-o']);
+    $attrs = [
+      'type' => 'submit',
+      'crm-icon' => 'fa-envelope-o',
+    ];
+    $buttons[] = $this->createElement('xbutton', $this->_testButtonName, ts('Save & Send Test Email'), $attrs);
     $this->getElement('buttons')->setElements($buttons);
 
     if (!empty($setStatus)) {
diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index e60ababdb45c..8e1a3022f487 100644
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -173,9 +173,10 @@ public function buildQuickForm() {
     // add the force save button
     $forceSave = $this->getButtonName('upload', 'force');
 
-    $this->addElement('submit',
+    $this->addElement('xbutton',
       $forceSave,
-      ts('Ignore Mismatch & Process the Batch?')
+      ts('Ignore Mismatch & Process the Batch?'),
+      ['type' => 'submit']
     );
 
     $this->addButtons([
diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php
index 7c9724a53c83..f2300dadb23e 100644
--- a/CRM/Case/Form/CaseView.php
+++ b/CRM/Case/Form/CaseView.php
@@ -275,7 +275,10 @@ public function buildQuickForm() {
     // This button is hidden but gets clicked by javascript at
     // https://github.com/civicrm/civicrm-core/blob/bd28ecf8121a85bc069cad3ab912a0c3dff8fdc5/templates/CRM/Case/Form/CaseView.js#L194
     // by the onChange handler for the above timeline_id select.
-    $this->addElement('submit', $this->getButtonName('next'), ' ', ['class' => 'hiddenElement']);
+    $this->addElement('xbutton', $this->getButtonName('next'), ' ', [
+      'class' => 'hiddenElement',
+      'type' => 'submit',
+    ]);
 
     $this->buildMergeCaseForm();
 
@@ -523,11 +526,12 @@ public function buildMergeCaseForm() {
       // This button is hidden but gets clicked by javascript at
       // https://github.com/civicrm/civicrm-core/blob/bd28ecf8121a85bc069cad3ab912a0c3dff8fdc5/templates/CRM/Case/Form/CaseView.js#L55
       // when the mergeCasesDialog is saved.
-      $this->addElement('submit',
+      $this->addElement('xbutton',
         $this->getButtonName('next', 'merge_case'),
         ts('Merge'),
         [
           'class' => 'hiddenElement',
+          'type' => 'submit',
         ]
       );
     }
diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php
index 04e3c8a897e7..5d6ce311bc83 100644
--- a/CRM/Contact/Form/Contact.php
+++ b/CRM/Contact/Form/Contact.php
@@ -808,17 +808,20 @@ public function buildQuickForm() {
     $this->addField('image_URL', ['maxlength' => '255', 'label' => ts('Browse/Upload Image')]);
 
     // add the dedupe button
-    $this->addElement('submit',
+    $this->addElement('xbutton',
       $this->_dedupeButtonName,
-      ts('Check for Matching Contact(s)')
+      ts('Check for Matching Contact(s)'),
+      ['type' => 'submit']
     );
-    $this->addElement('submit',
+    $this->addElement('xbutton',
       $this->_duplicateButtonName,
-      ts('Save Matching Contact')
+      ts('Save Matching Contact'),
+      ['type' => 'submit']
     );
-    $this->addElement('submit',
+    $this->addElement('xbutton',
       $this->getButtonName('next', 'sharedHouseholdDuplicate'),
-      ts('Save With Duplicate Household')
+      ts('Save With Duplicate Household'),
+      ['type' => 'submit']
     );
 
     $buttons = [
diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php
index 25c95ac6b7eb..af5e9f821310 100644
--- a/CRM/Contact/Form/Search.php
+++ b/CRM/Contact/Form/Search.php
@@ -469,8 +469,9 @@ public function buildQuickForm() {
       // also set the group title and freeze the action task with Add Members to Group
       $groupValues = ['id' => $this->_amtgID, 'title' => $this->_group[$this->_amtgID]];
       $this->assign_by_ref('group', $groupValues);
-      $this->add('submit', $this->_actionButtonName, ts('Add Contacts to %1', [1 => $this->_group[$this->_amtgID]]),
+      $this->add('xbutton', $this->_actionButtonName, ts('Add Contacts to %1', [1 => $this->_group[$this->_amtgID]]),
         [
+          'type' => 'submit',
           'class' => 'crm-form-submit',
         ]
       );
diff --git a/CRM/Contact/Form/Task/AddToParentClass.php b/CRM/Contact/Form/Task/AddToParentClass.php
index f98aa34e324f..ac69e5e14254 100644
--- a/CRM/Contact/Form/Task/AddToParentClass.php
+++ b/CRM/Contact/Form/Task/AddToParentClass.php
@@ -65,8 +65,12 @@ public function buildQuickForm() {
     $this->assign('searchCount', $searchCount);
     $this->assign('searchDone', $this->get('searchDone'));
     $this->assign('contact_type_display', $contactType);
-    $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), ['class' => 'crm-form-submit']);
-    $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), ['class' => 'crm-form-submit']);
+    $buttonAttrs = [
+      'type' => 'submit',
+      'class' => 'crm-form-submit',
+    ];
+    $this->addElement('xbutton', $this->getButtonName('refresh'), ts('Search'), $buttonAttrs);
+    $this->addElement('xbutton', $this->getButtonName('cancel'), ts('Cancel'), $buttonAttrs);
     $this->addButtons([
       [
         'type' => 'next',
diff --git a/CRM/Contribute/Form/ContributionPage.php b/CRM/Contribute/Form/ContributionPage.php
index ba8bb64ec087..76e245eabdb7 100644
--- a/CRM/Contribute/Form/ContributionPage.php
+++ b/CRM/Contribute/Form/ContributionPage.php
@@ -222,7 +222,10 @@ public function buildQuickForm() {
     // views are implemented as frozen form
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
-      $this->addElement('button', 'done', ts('Done'), ['onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'"]);
+      $this->addElement('xbutton', 'done', ts('Done'), [
+        'type' => 'button',
+        'onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'",
+      ]);
     }
 
     // don't show option for contribution amounts section if membership price set
diff --git a/CRM/Contribute/Form/ContributionPage/Widget.php b/CRM/Contribute/Form/ContributionPage/Widget.php
index 7c6ee1bb991c..77cdd5094a97 100644
--- a/CRM/Contribute/Form/ContributionPage/Widget.php
+++ b/CRM/Contribute/Form/ContributionPage/Widget.php
@@ -188,9 +188,10 @@ public function buildQuickForm() {
     $this->assign_by_ref('colorFields', $this->_colorFields);
 
     $this->_refreshButtonName = $this->getButtonName('refresh');
-    $this->addElement('submit',
+    $this->addElement('xbutton',
       $this->_refreshButtonName,
-      ts('Save and Preview')
+      ts('Save and Preview'),
+      ['type' => 'submit']
     );
     parent::buildQuickForm();
     $this->addFormRule(['CRM_Contribute_Form_ContributionPage_Widget', 'formRule'], $this);
diff --git a/CRM/Contribute/Import/Form/DataSource.php b/CRM/Contribute/Import/Form/DataSource.php
index f1c72357c7bf..6833eafd0e25 100644
--- a/CRM/Contribute/Import/Form/DataSource.php
+++ b/CRM/Contribute/Import/Form/DataSource.php
@@ -38,7 +38,10 @@ public function buildQuickForm() {
 
     $this->setDefaults(['onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP]);
 
-    $this->addElement('submit', 'loadMapping', ts('Load Mapping'), NULL, ['onclick' => 'checkSelect()']);
+    $this->addElement('xbutton', 'loadMapping', ts('Load Mapping'), [
+      'type' => 'submit',
+      'onclick' => 'checkSelect()',
+    ]);
 
     $this->addContactTypeSelector();
   }
diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index e2e0e7057a29..58b573c3f807 100644
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -318,8 +318,11 @@ public static function buildMappingForm(&$form, $mappingId, $columnNo, $blockCou
     $hasRelationTypes = [];
 
     $columnCount = $columnNo;
-    $form->addElement('submit', 'addBlock', ts('Also include contacts where'),
-      ['class' => 'submit-link']
+    $form->addElement('xbutton', 'addBlock', ts('Also include contacts where'),
+      [
+        'type' => 'submit',
+        'class' => 'submit-link',
+      ]
     );
 
     $contactTypes = CRM_Contact_BAO_ContactType::basicTypes();
@@ -553,7 +556,10 @@ public static function buildMappingForm(&$form, $mappingId, $columnNo, $blockCou
         $form->add('text', "value[$x][$i]", '');
       }
 
-      $form->addElement('submit', "addMore[$x]", ts('Another search field'), ['class' => 'submit-link']);
+      $form->addElement('xbutton', "addMore[$x]", ts('Another search field'), [
+        'type' => 'submit',
+        'class' => 'submit-link',
+      ]);
     }
     //end of block for
 
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 98526b5a8198..8a48473c019a 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -686,7 +686,8 @@ public function addButtons($params) {
       }
 
       if ($button['type'] === 'reset') {
-        $prevnext[] = $this->createElement($button['type'], 'reset', $button['name'], $attrs);
+        $attrs['type'] = 'reset';
+        $prevnext[] = $this->createElement('xbutton', 'reset', $button['name'], $attrs);
       }
       else {
         if (!empty($button['subName'])) {
@@ -709,7 +710,8 @@ public function addButtons($params) {
           $attrs['crm-icon'] = $icon;
         }
         $buttonName = $this->getButtonName($button['type'], CRM_Utils_Array::value('subName', $button));
-        $prevnext[] = $this->createElement('submit', $buttonName, $button['name'], $attrs);
+        $attrs['type'] = 'submit';
+        $prevnext[] = $this->createElement('xbutton', $buttonName, $button['name'], $attrs);
       }
       if (!empty($button['isDefault'])) {
         $this->setDefaultAction($button['type']);
@@ -2448,7 +2450,10 @@ public function addTaskMenu($tasks) {
         $this->_actionButtonName = $this->getButtonName('next', 'action');
       }
       $this->assign('actionButtonName', $this->_actionButtonName);
-      $this->add('submit', $this->_actionButtonName, ts('Go'), ['class' => 'hiddenElement crm-search-go-button']);
+      $this->add('xbutton', $this->_actionButtonName, ts('Go'), [
+        'type' => 'submit',
+        'class' => 'hiddenElement crm-search-go-button',
+      ]);
 
       // Radio to choose "All items" or "Selected items only"
       $selectedRowsRadio = $this->addElement('radio', 'radio_ts', NULL, '', 'ts_sel', ['checked' => 'checked']);
diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index 840650e7d9f7..af6ca363cbe7 100644
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -565,10 +565,13 @@ public function buildQuickForm() {
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
       $url = CRM_Utils_System::url('civicrm/admin/custom/group/field', 'reset=1&action=browse&gid=' . $this->_gid);
-      $this->addElement('button',
+      $this->addElement('xbutton',
         'done',
         ts('Done'),
-        ['onclick' => "location.href='$url'"]
+        [
+          'type' => 'button',
+          'onclick' => "location.href='$url'",
+        ]
       );
     }
   }
diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php
index 0c37d9037416..09cffc753310 100644
--- a/CRM/Custom/Form/Group.php
+++ b/CRM/Custom/Form/Group.php
@@ -351,7 +351,10 @@ public function buildQuickForm() {
     // TODO: Is this condition ever true? Can this code be removed?
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
-      $this->addElement('button', 'done', ts('Done'), ['onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'"]);
+      $this->addElement('xbutton', 'done', ts('Done'), [
+        'type' => 'button',
+        'onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'",
+      ]);
     }
   }
 
diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php
index 3bb6a5fb6c04..054df6252962 100644
--- a/CRM/Custom/Form/Option.php
+++ b/CRM/Custom/Form/Option.php
@@ -201,10 +201,15 @@ public function buildQuickForm() {
           'reset=1&action=browse&fid=' . $this->_fid . '&gid=' . $this->_gid,
           TRUE, NULL, FALSE
         );
-        $this->addElement('button',
+        $this->addElement('xbutton',
           'done',
           ts('Done'),
-          ['onclick' => "location.href='$url'", 'class' => 'crm-form-submit cancel', 'crm-icon' => 'fa-times']
+          [
+            'type' => 'button',
+            'onclick' => "location.href='$url'",
+            'class' => 'crm-form-submit cancel',
+            'crm-icon' => 'fa-times',
+          ]
         );
       }
     }
diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php
index 40b40fc9126e..78fdadaf6230 100644
--- a/CRM/Event/Form/ManageEvent/Fee.php
+++ b/CRM/Event/Form/ManageEvent/Fee.php
@@ -355,8 +355,11 @@ public function buildQuickForm() {
       $this->add('datepicker', 'discount_end_date[' . $i . ']', ts('Discount End Date'), [], FALSE, ['time' => FALSE]);
     }
     $_showHide->addToTemplate();
-    $this->addElement('submit', $this->getButtonName('submit'), ts('Add Discount Set to Fee Table'),
-      ['class' => 'crm-form-submit cancel']
+    $this->addElement('xbutton', $this->getButtonName('submit'), ts('Add Discount Set to Fee Table'),
+      [
+        'type' => 'submit',
+        'class' => 'crm-form-submit cancel',
+      ]
     );
     if (Civi::settings()->get('deferred_revenue_enabled')) {
       $deferredFinancialType = CRM_Financial_BAO_FinancialAccount::getDeferredFinancialType();
diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php
index 408a84e72911..20848b58ecae 100644
--- a/CRM/Financial/Form/BatchTransaction.php
+++ b/CRM/Financial/Form/BatchTransaction.php
@@ -75,7 +75,7 @@ public function preProcess() {
    */
   public function buildQuickForm() {
     if ($this->_batchStatus == 'Closed') {
-      $this->add('submit', 'export_batch', ts('Export Batch'));
+      $this->add('xbutton', 'export_batch', ts('Export Batch'), ['type' => 'submit']);
     }
 
     // do not build rest of form unless it is open/reopened batch
@@ -85,9 +85,9 @@ public function buildQuickForm() {
 
     parent::buildQuickForm();
     if (CRM_Batch_BAO_Batch::checkBatchPermission('close', $this->_values['created_id'])) {
-      $this->add('submit', 'close_batch', ts('Close Batch'));
+      $this->add('xbutton', 'close_batch', ts('Close Batch'), ['type' => 'submit']);
       if (CRM_Batch_BAO_Batch::checkBatchPermission('export', $this->_values['created_id'])) {
-        $this->add('submit', 'export_batch', ts('Close & Export Batch'));
+        $this->add('xbutton', 'export_batch', ts('Close & Export Batch'), ['type' => 'submit']);
       }
     }
 
@@ -99,8 +99,9 @@ public function buildQuickForm() {
       ts('Task'),
       ['' => ts('- actions -')] + ['Remove' => ts('Remove from Batch')]);
 
-    $this->add('submit', 'rSubmit', ts('Go'),
+    $this->add('xbutton', 'rSubmit', ts('Go'),
       [
+        'type' => 'submit',
         'class' => 'crm-form-submit',
         'id' => 'GoRemove',
       ]);
@@ -123,8 +124,9 @@ public function buildQuickForm() {
       ts('Task'),
       ['' => ts('- actions -')] + ['Assign' => ts('Assign to Batch')]);
 
-    $this->add('submit', 'submit', ts('Go'),
+    $this->add('xbutton', 'submit', ts('Go'),
       [
+        'type' => 'submit',
         'class' => 'crm-form-submit',
         'id' => 'Go',
       ]);
diff --git a/CRM/Financial/Form/Search.php b/CRM/Financial/Form/Search.php
index 985d9ddfbb67..069c6e0a9abd 100644
--- a/CRM/Financial/Form/Search.php
+++ b/CRM/Financial/Form/Search.php
@@ -93,8 +93,9 @@ public function buildQuickForm() {
       ts('Task'),
       ['' => ts('- actions -')] + $batchAction);
 
-    $this->add('submit', 'submit', ts('Go'),
+    $this->add('xbutton', 'submit', ts('Go'),
       [
+        'type' => 'submit',
         'class' => 'crm-form-submit',
         'id' => 'Go',
       ]);
diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php
index 571ab77be16e..aed5e90a8d8e 100644
--- a/CRM/Price/Form/Field.php
+++ b/CRM/Price/Form/Field.php
@@ -376,10 +376,13 @@ public function buildQuickForm() {
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
       $url = CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=browse&sid=' . $this->_sid);
-      $this->addElement('button',
+      $this->addElement('xbutton',
         'done',
         ts('Done'),
-        ['onclick' => "location.href='$url'"]
+        [
+          'type' => 'button',
+          'onclick' => "location.href='$url'",
+        ]
       );
     }
   }
diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php
index 8d8f46cd881f..c34f1388dd67 100644
--- a/CRM/Profile/Form.php
+++ b/CRM/Profile/Form.php
@@ -904,9 +904,10 @@ public function buildQuickForm() {
 
     if ($this->_context == 'dialog') {
       $this->addElement(
-        'submit',
+        'xbutton',
         $this->_duplicateButtonName,
-        ts('Save Matching Contact')
+        ts('Save Matching Contact'),
+        ['type' => 'submit']
       );
     }
   }
diff --git a/CRM/Profile/Form/Edit.php b/CRM/Profile/Form/Edit.php
index 7564dc37fc28..16bc4a31eba9 100644
--- a/CRM/Profile/Form/Edit.php
+++ b/CRM/Profile/Form/Edit.php
@@ -209,7 +209,7 @@ public function buildQuickForm() {
 
     if (($this->_multiRecord & CRM_Core_Action::DELETE) && $this->_recordExists) {
       $this->_deleteButtonName = $this->getButtonName('upload', 'delete');
-      $this->addElement('submit', $this->_deleteButtonName, ts('Delete'));
+      $this->addElement('xbutton', $this->_deleteButtonName, ts('Delete'), ['type' => 'submit']);
 
       return;
     }
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index aaf8bb15fd2f..1099be3bb0ec 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -1535,7 +1535,7 @@ public function addChartOptions() {
     if (!empty($this->_charts)) {
       $this->addElement('select', "charts", ts('Chart'), $this->_charts);
       $this->assign('charts', $this->_charts);
-      $this->addElement('submit', $this->_chartButtonName, ts('View'));
+      $this->addElement('xbutton', $this->_chartButtonName, ts('View'), ['type' => 'submit']);
     }
   }
 
@@ -1660,7 +1660,10 @@ public function buildInstanceAndButtons() {
       $this->assign('group', TRUE);
     }
 
-    $this->addElement('submit', $this->_groupButtonName, '', ['style' => 'display: none;']);
+    $this->addElement('xbutton', $this->_groupButtonName, '', [
+      'type' => 'submit',
+      'style' => 'display: none;',
+    ]);
 
     $this->addChartOptions();
     $showResultsLabel = $this->getResultsLabel();
diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
index 4bfcb214af81..997962cd40b1 100644
--- a/CRM/UF/Form/Field.php
+++ b/CRM/UF/Form/Field.php
@@ -467,8 +467,11 @@ public function buildQuickForm() {
     // if view mode pls freeze it with the done button.
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
-      $this->addElement('button', 'done', ts('Done'),
-        ['onclick' => "location.href='civicrm/admin/uf/group/field?reset=1&action=browse&gid=" . $this->_gid . "'"]
+      $this->addElement('xbutton', 'done', ts('Done'),
+        [
+          'type' => 'button',
+          'onclick' => "location.href='civicrm/admin/uf/group/field?reset=1&action=browse&gid=" . $this->_gid . "'",
+        ]
       );
     }
 
diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php
index a9fef4dc8fef..5a4d3dd570a5 100644
--- a/CRM/UF/Form/Group.php
+++ b/CRM/UF/Form/Group.php
@@ -231,7 +231,10 @@ public function buildQuickForm() {
     // views are implemented as frozen form
     if ($this->_action & CRM_Core_Action::VIEW) {
       $this->freeze();
-      $this->addElement('button', 'done', ts('Done'), ['onclick' => "location.href='civicrm/admin/uf/group?reset=1&action=browse'"]);
+      $this->addElement('xbutton', 'done', ts('Done'), [
+        'type' => 'button',
+        'onclick' => "location.href='civicrm/admin/uf/group?reset=1&action=browse'",
+      ]);
     }
 
     $this->addFormRule(['CRM_UF_Form_Group', 'formRule'], $this);
diff --git a/install/template.html b/install/template.html
index e95165536b2e..eb12944d220e 100644
--- a/install/template.html
+++ b/install/template.html
@@ -34,7 +34,7 @@ <h1><?php echo ts("CiviCRM Installer"); ?></h1>
   <?php } ?>
 
   <p>
-  <input id="install_button" type="submit" name="go" value="<?php echo ts('Check Requirements and Install CiviCRM', array('escape' => 'js')); ?>" onclick="document.getElementById('saving_top').style.display = ''; this.value = '<?php echo ts('Installing CiviCRM...', array('escape' => 'js')); ?>'" />
+  <button id="install_button" type="submit" name="go" onclick="document.getElementById('saving_top').style.display = ''; this.innerHTML = '<?php echo ts('Installing CiviCRM...', ['escape' => 'js']); ?>'"><?php echo ts('Check Requirements and Install CiviCRM', ['escape' => 'js']); ?></button>
 
   <span id="saving_top" style="display: none">
   &nbsp;
@@ -73,7 +73,7 @@ <h4><?php echo ts('Language and Region Settings'); ?></h4>
   ?>
 </select>
 <noscript>
-  <input type="submit" name="setlanguage" value="<?php echo ts('Change language', array('escape' => 'js')); ?>" />
+  <button type="submit" name="setlanguage"><?php echo ts('Change language', ['escape' => 'js']); ?></button>
 </noscript>
 <span class="testResults">
   <?php
@@ -135,7 +135,7 @@ <h4><?php echo ts('Other Settings'); ?></h4>
     <span class="testResults">Check this box to pre-populate CiviCRM with sample English contact records, online contribution pages, profile forms, etc. These examples can help you learn about CiviCRM features.</span><br />
 </p>
 
-<p style="margin-left: 2em"><input type="submit" value="<?php echo ts('Re-check requirements', array('escape' => 'js')); ?>" /></p>
+<p style="margin-left: 2em"><button type="submit"><?php echo ts('Re-check requirements', ['escape' => 'js']); ?></button></p>
 
 <a name="dbDetails">
 
diff --git a/js/jquery/jquery.dashboard.js b/js/jquery/jquery.dashboard.js
index 4191285449ba..00c65260ec2f 100644
--- a/js/jquery/jquery.dashboard.js
+++ b/js/jquery/jquery.dashboard.js
@@ -526,8 +526,8 @@
         html += '<form class="widget-settings">';
         html += '  <div class="widget-settings-inner"></div>';
         html += '  <div class="widget-settings-buttons">';
-        html += '    <input id="' + widget.id + '-settings-save" class="widget-settings-save" value="Save" type="submit" />';
-        html += '    <input id="' + widget.id + '-settings-cancel" class="widget-settings-cancel" value="Cancel" type="submit" />';
+        html += '    <button id="' + widget.id + '-settings-save" class="widget-settings-save" type="submit">Save</button>';
+        html += '    <button id="' + widget.id + '-settings-cancel" class="widget-settings-cancel" type="submit">Cancel</button>';
         html += '  </div>';
         html += '</form>';
         return html;
diff --git a/setup/plugins/blocks/advanced.tpl.php b/setup/plugins/blocks/advanced.tpl.php
index 971d22c1fd5a..abfc03926049 100644
--- a/setup/plugins/blocks/advanced.tpl.php
+++ b/setup/plugins/blocks/advanced.tpl.php
@@ -26,7 +26,7 @@
           <div>
 
           <input type="text" name="civisetup[advanced][db]" value="<?php echo htmlentities($model->extras['advanced']['db']); ?>" data-original="<?php echo htmlentities($model->extras['advanced']['db']); ?>">
-          <input id="db_apply_button" type="submit" name="civisetup[action][Start]" value="<?php echo htmlentities(ts('Apply')); ?>" />
+          <button id="db_apply_button" type="submit" name="civisetup[action][Start]"><?php echo htmlentities(ts('Apply')); ?></button>
           <a href="" onclick="civisetupAdvancedDbCancel(); return false;" title="<?php echo htmlentities(ts('Cancel')) ?>"><i class="fa fa-close"></i></a>
           <script type="text/javascript">
             function civisetupAdvancedDbCancel() {
diff --git a/setup/plugins/blocks/install.tpl.php b/setup/plugins/blocks/install.tpl.php
index 81e005f1ab7b..7785ad2aae5e 100644
--- a/setup/plugins/blocks/install.tpl.php
+++ b/setup/plugins/blocks/install.tpl.php
@@ -1,9 +1,8 @@
 <?php if (!defined('CIVI_SETUP')): exit("Installation plugins must only be loaded by the installer.\n");
 endif; ?>
 <div class="action-box">
-  <input id="install_button" type="submit" name="civisetup[action][Install]"
-         value="<?php echo htmlentities(ts('Install CiviCRM')); ?>"
-         onclick="document.getElementById('saving_top').style.display = ''; this.value = '<?php echo ts('Installing CiviCRM...', array('escape' => 'js')); ?>'"/>
+  <button id="install_button" type="submit" name="civisetup[action][Install]"
+         onclick="document.getElementById('saving_top').style.display = ''; this.innerHTML = '<?php echo ts('Installing CiviCRM...', array('escape' => 'js')); ?>'"><?php echo htmlentities(ts('Install CiviCRM')); ?></button>
   <div id="saving_top" style="display: none;">
 &nbsp;   <img src="<?php echo htmlentities($installURLPath . "network-save.gif") ?>"/>
     <?php echo ts('(this will take a few minutes)'); ?>
diff --git a/setup/plugins/blocks/requirements.tpl.php b/setup/plugins/blocks/requirements.tpl.php
index 54979fdf3c87..844406249be3 100644
--- a/setup/plugins/blocks/requirements.tpl.php
+++ b/setup/plugins/blocks/requirements.tpl.php
@@ -46,7 +46,7 @@
 </table>
 
 <div class="action-box">
-  <input id="recheck_button" type="submit" name="civisetup[action][Start]" value="<?php echo htmlentities(ts('Refresh')); ?>" />
+  <button id="recheck_button" type="submit" name="civisetup[action][Start]"><?php echo htmlentities(ts('Refresh')); ?></button>
   <div class="advancedTip">
     <?php echo ts('After updating your system, refresh to test the requirements again.'); ?>
   </div>
diff --git a/setup/src/Setup/UI/SetupController.php b/setup/src/Setup/UI/SetupController.php
index c7e685f9fff8..022929552816 100644
--- a/setup/src/Setup/UI/SetupController.php
+++ b/setup/src/Setup/UI/SetupController.php
@@ -247,7 +247,7 @@ public function setUrls($urls) {
    *
    * @param array $fields
    *   HTTP inputs -- e.g. with a form element like this:
-   *   `<input type="submit" name="civisetup[action][Foo]" value="Do the foo">`
+   *   `<button type="submit" name="civisetup[action][Foo]">Do the foo</button>`
    * @param string $default
    *   The action-name to return if no other action is identified.
    * @return string
diff --git a/templates/CRM/Block/Add.tpl b/templates/CRM/Block/Add.tpl
index dd4f36735a8e..00bf545715ad 100644
--- a/templates/CRM/Block/Add.tpl
+++ b/templates/CRM/Block/Add.tpl
@@ -45,7 +45,7 @@
     <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Form_Contact' addSequence=1}" />
 </div>
 
-<div class="form-item"><input type="submit" name="_qf_Contact_next" value="{ts}Save{/ts}" class="crm-form-submit" /></div>
+<div class="form-item"><button type="submit" name="_qf_Contact_next" class="crm-button crm-form-submit">{ts}Save{/ts}</button></div>
 
 </form>
 </div>
diff --git a/templates/CRM/Block/FullTextSearch.tpl b/templates/CRM/Block/FullTextSearch.tpl
index 4f85ad1ba258..b076bc2f3a1f 100644
--- a/templates/CRM/Block/FullTextSearch.tpl
+++ b/templates/CRM/Block/FullTextSearch.tpl
@@ -24,7 +24,7 @@
 <div class="block-crm crm-container">
     <form method="post" id="id_fulltext_search">
     <div style="margin-bottom: 8px;">
-    <input type="text" name="text" id='text' value="" class="crm-form-text" style="width: 10em;" />&nbsp;<input type="submit" name="submit" id="fulltext_submit" value="{ts}Go{/ts}" class="crm-form-submit"/ onclick='submitForm();'>
+    <input type="text" name="text" id='text' value="" class="crm-form-text" style="width: 10em;" />&nbsp;<button type="submit" name="submit" id="fulltext_submit" class="crm-button crm-form-submit" onclick='submitForm();'>{ts}Go{/ts}</button>
     <input type="hidden" name="qfKey" value="{crmKey name='CRM_Contact_Controller_Search' addSequence=1}" />
   </div>
   <select class="form-select" id="fulltext_table" name="fulltext_table">
diff --git a/templates/CRM/Contact/Page/View/Print.tpl b/templates/CRM/Contact/Page/View/Print.tpl
index 1fb9798cc53f..6031bf210b8f 100644
--- a/templates/CRM/Contact/Page/View/Print.tpl
+++ b/templates/CRM/Contact/Page/View/Print.tpl
@@ -19,7 +19,7 @@
 {/literal}
 <form action="{crmURL p='civicrm/contact/view' q="cid=`$contactId`&reset=1"}" method="post" id="Print1" >
   <div class="form-item">
-       <span class="element-right"><input onclick="window.print(); return false" class="crm-form-submit default" name="_qf_Print_next" value="{ts}Print{/ts}" type="submit" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input class="crm-form-submit" name="_qf_Print_back" value="{ts}Done{/ts}" type="submit" /></span>
+       <span class="element-right"><button onclick="window.print(); return false" class="crm-button crm-form-submit default" name="_qf_Print_next" type="submit">{ts}Print{/ts}</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button class="crm-button crm-form-submit" name="_qf_Print_back" type="submit">{ts}Done{/ts}</button></span>
   </div>
 </form>
 <br />
diff --git a/templates/CRM/Mailing/Page/Resubscribe.tpl b/templates/CRM/Mailing/Page/Resubscribe.tpl
index 47b413d078af..98c0f9f3be00 100644
--- a/templates/CRM/Mailing/Page/Resubscribe.tpl
+++ b/templates/CRM/Mailing/Page/Resubscribe.tpl
@@ -18,9 +18,9 @@
 {ts 1=$display_name 2=$email}Are you sure you want to resubscribe: %1 (%2){/ts}
 <br/>
 <center>
-<input type="submit" name="_qf_resubscribe_next" value="{ts}Resubscribe{/ts}" class="crm-form-submit" />
+<button type="submit" name="_qf_resubscribe_next" class="crm-button crm-form-submit">{ts}Resubscribe{/ts}</button>
 &nbsp;&nbsp;&nbsp;
-<input type="submit" name="_qf_resubscribe_cancel" value="{ts}Cancel{/ts}" class="crm-form-submit" />
+<button type="submit" name="_qf_resubscribe_cancel" class="crm-button crm-form-submit">{ts}Cancel{/ts}</button>
 </center>
 </form>
 </div>
diff --git a/templates/CRM/common/navigation.js.tpl b/templates/CRM/common/navigation.js.tpl
index 866769185c51..5ec824a85e46 100644
--- a/templates/CRM/common/navigation.js.tpl
+++ b/templates/CRM/common/navigation.js.tpl
@@ -17,7 +17,7 @@
             <input type="hidden" name="hidden_location" value="1" />
             <input type="hidden" name="hidden_custom" value="1" />
             <input type="hidden" name="qfKey" value="" />
-            <div style="height:1px; overflow:hidden;"><input type="submit" value="{ts}Go{/ts}" name="_qf_Advanced_refresh" class="crm-form-submit default" /></div>
+            <div style="height:1px; overflow:hidden;"><button type="submit" name="_qf_Advanced_refresh" class="crm-button crm-form-submit default">{ts}Go{/ts}</button></div>
           </div>
         </form>
         <ul>

From 98da7d6747712e0bea2ccba00f5c13912293242c Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 13:12:36 -0400
Subject: [PATCH 195/834] Put icons inside of button elements

---
 CRM/Admin/Form/Preferences/Display.php           |  7 ++++++-
 CRM/Admin/Form/Setting/Smtp.php                  | 11 ++++++-----
 CRM/Core/Form.php                                |  7 ++-----
 CRM/Custom/Form/Option.php                       |  3 +--
 templates/CRM/Admin/Form/Preferences/Display.tpl |  1 -
 templates/CRM/Admin/Page/APIExplorer.tpl         |  4 +++-
 templates/CRM/common/formButtons.tpl             |  6 ------
 7 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index 41073eed625e..c251b4502035 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -50,7 +50,12 @@ public function buildQuickForm() {
     $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
     $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled());
 
-    $this->addElement('xbutton', 'ckeditor_config', ts('Configure CKEditor'), ['type' => 'submit']);
+    $this->addElement(
+      'xbutton',
+      'ckeditor_config',
+      CRM_Core_Page::crmIcon('fa-wrench') . ' ' . ts('Configure CKEditor'),
+      ['type' => 'submit']
+    );
 
     $editOptions = CRM_Core_OptionGroup::values('contact_edit_options', FALSE, FALSE, FALSE, 'AND v.filter = 0');
     $this->assign('editOptions', $editOptions);
diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php
index 1c6dc0d46aa8..79e0da4f7782 100644
--- a/CRM/Admin/Form/Setting/Smtp.php
+++ b/CRM/Admin/Form/Setting/Smtp.php
@@ -61,11 +61,12 @@ public function buildQuickForm() {
     $this->addFormRule(['CRM_Admin_Form_Setting_Smtp', 'formRule']);
     parent::buildQuickForm();
     $buttons = $this->getElement('buttons')->getElements();
-    $attrs = [
-      'type' => 'submit',
-      'crm-icon' => 'fa-envelope-o',
-    ];
-    $buttons[] = $this->createElement('xbutton', $this->_testButtonName, ts('Save & Send Test Email'), $attrs);
+    $buttons[] = $this->createElement(
+      'xbutton',
+      $this->_testButtonName,
+      CRM_Core_Page::crmIcon('fa-envelope-o') . ' ' . ts('Save & Send Test Email'),
+      ['type' => 'submit']
+    );
     $this->getElement('buttons')->setElements($buttons);
 
     if (!empty($setStatus)) {
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 8a48473c019a..610ea053c632 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -705,13 +705,10 @@ public function addButtons($params) {
         if (in_array($button['type'], ['next', 'upload', 'done']) && $button['name'] === ts('Save')) {
           $attrs['accesskey'] = 'S';
         }
-        $icon = CRM_Utils_Array::value('icon', $button, $defaultIcon);
-        if ($icon) {
-          $attrs['crm-icon'] = $icon;
-        }
+        $buttonContents = CRM_Core_Page::crmIcon($button['icon'] ?? $defaultIcon) . ' ' . $button['name'];
         $buttonName = $this->getButtonName($button['type'], CRM_Utils_Array::value('subName', $button));
         $attrs['type'] = 'submit';
-        $prevnext[] = $this->createElement('xbutton', $buttonName, $button['name'], $attrs);
+        $prevnext[] = $this->createElement('xbutton', $buttonName, $buttonContents, $attrs);
       }
       if (!empty($button['isDefault'])) {
         $this->setDefaultAction($button['type']);
diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php
index 054df6252962..05f6dcd81e72 100644
--- a/CRM/Custom/Form/Option.php
+++ b/CRM/Custom/Form/Option.php
@@ -203,12 +203,11 @@ public function buildQuickForm() {
         );
         $this->addElement('xbutton',
           'done',
-          ts('Done'),
+          CRM_Core_Page::crmIcon('fa-times') . ' ' . ts('Done'),
           [
             'type' => 'button',
             'onclick' => "location.href='$url'",
             'class' => 'crm-form-submit cancel',
-            'crm-icon' => 'fa-times',
           ]
         );
       }
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index e36cc9501fd1..6ee7378d315f 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -162,7 +162,6 @@
         {$form.editor_id.html}
         &nbsp;
         <span class="crm-button" style="display:inline-block;vertical-align:middle;float:none!important;">
-          <i class="crm-i fa-wrench" aria-hidden="true"></i>
           {$form.ckeditor_config.html}
         </span>
       </td>
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 9c127fcb6fca..98e6529ca16c 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -286,7 +286,9 @@
       </div>
       <div class="crm-submit-buttons">
         <span class="crm-button">
-          <i class="crm-i fa-bolt" aria-hidden="true"></i> <input type="submit" value="{ts}Execute{/ts}" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}"/>
+          <button type="submit" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}">
+            <i class="crm-i fa-bolt" aria-hidden="true"></i> {ts}Execute{/ts}
+          </button>
         </span>
       </div>
 
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 7af01e646bec..0135fe30d104 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -38,14 +38,8 @@
     {else}
       {assign var='html' value=$form.buttons.$key.html}
     {/if}
-    {crmGetAttribute html=$html attr='crm-icon' assign='icon'}
-    {capture assign=iconPrefix}{$icon|truncate:3:"":true}{/capture}
-    {if $icon && $iconPrefix eq 'fa-'}
-      {capture assign=iconDisp}<i class="crm-i {$icon}" aria-hidden="true"></i>{/capture}
-    {/if}
     {crmGetAttribute html=$html attr='disabled' assign='disabled'}
     <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
-      {$iconDisp}
       {$html}
     </span>
   {/if}

From f70833347b8961a9d549f333b614dcbca4a04445 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 13:55:52 -0400
Subject: [PATCH 196/834] Give buttons a value when the submitted value is used
 to identify them

---
 CRM/Admin/Form/Preferences/Display.php     | 5 ++++-
 CRM/Batch/Form/Entry.php                   | 5 ++++-
 CRM/Contact/Form/Task/AddToParentClass.php | 1 +
 CRM/Core/BAO/Mapping.php                   | 2 ++
 CRM/Core/Form.php                          | 7 +++++++
 CRM/Event/Form/ManageEvent/Fee.php         | 1 +
 CRM/Profile/Form/Edit.php                  | 5 ++++-
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index c251b4502035..af824f1f02ae 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -54,7 +54,10 @@ public function buildQuickForm() {
       'xbutton',
       'ckeditor_config',
       CRM_Core_Page::crmIcon('fa-wrench') . ' ' . ts('Configure CKEditor'),
-      ['type' => 'submit']
+      [
+        'type' => 'submit',
+        'value' => 1,
+      ]
     );
 
     $editOptions = CRM_Core_OptionGroup::values('contact_edit_options', FALSE, FALSE, FALSE, 'AND v.filter = 0');
diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index 8e1a3022f487..ceb3868d28ff 100644
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -176,7 +176,10 @@ public function buildQuickForm() {
     $this->addElement('xbutton',
       $forceSave,
       ts('Ignore Mismatch & Process the Batch?'),
-      ['type' => 'submit']
+      [
+        'type' => 'submit',
+        'value' => 1,
+      ]
     );
 
     $this->addButtons([
diff --git a/CRM/Contact/Form/Task/AddToParentClass.php b/CRM/Contact/Form/Task/AddToParentClass.php
index ac69e5e14254..aee54878d475 100644
--- a/CRM/Contact/Form/Task/AddToParentClass.php
+++ b/CRM/Contact/Form/Task/AddToParentClass.php
@@ -68,6 +68,7 @@ public function buildQuickForm() {
     $buttonAttrs = [
       'type' => 'submit',
       'class' => 'crm-form-submit',
+      'value' => 1,
     ];
     $this->addElement('xbutton', $this->getButtonName('refresh'), ts('Search'), $buttonAttrs);
     $this->addElement('xbutton', $this->getButtonName('cancel'), ts('Cancel'), $buttonAttrs);
diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index 58b573c3f807..3c9bf18beaa7 100644
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -322,6 +322,7 @@ public static function buildMappingForm(&$form, $mappingId, $columnNo, $blockCou
       [
         'type' => 'submit',
         'class' => 'submit-link',
+        'value' => 1,
       ]
     );
 
@@ -559,6 +560,7 @@ public static function buildMappingForm(&$form, $mappingId, $columnNo, $blockCou
       $form->addElement('xbutton', "addMore[$x]", ts('Another search field'), [
         'type' => 'submit',
         'class' => 'submit-link',
+        'value' => 1,
       ]);
     }
     //end of block for
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 610ea053c632..ef81439d24d1 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -668,6 +668,13 @@ public function addButtons($params) {
 
       $attrs = ['class' => 'crm-form-submit'] + (array) CRM_Utils_Array::value('js', $button);
 
+      // A lot of forms use the hacky method of looking at
+      // `$params['button name']` (dating back to them being inputs with a
+      // "value" of the button label) rather than looking at
+      // `$this->controller->getButtonName()`. It makes sense to give buttons a
+      // value by default as a precaution.
+      $attrs['value'] = 1;
+
       if (!empty($button['class'])) {
         $attrs['class'] .= ' ' . $button['class'];
       }
diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php
index 78fdadaf6230..fa96e1a4f6c4 100644
--- a/CRM/Event/Form/ManageEvent/Fee.php
+++ b/CRM/Event/Form/ManageEvent/Fee.php
@@ -359,6 +359,7 @@ public function buildQuickForm() {
       [
         'type' => 'submit',
         'class' => 'crm-form-submit cancel',
+        'value' => 1,
       ]
     );
     if (Civi::settings()->get('deferred_revenue_enabled')) {
diff --git a/CRM/Profile/Form/Edit.php b/CRM/Profile/Form/Edit.php
index 16bc4a31eba9..758e9711279c 100644
--- a/CRM/Profile/Form/Edit.php
+++ b/CRM/Profile/Form/Edit.php
@@ -209,7 +209,10 @@ public function buildQuickForm() {
 
     if (($this->_multiRecord & CRM_Core_Action::DELETE) && $this->_recordExists) {
       $this->_deleteButtonName = $this->getButtonName('upload', 'delete');
-      $this->addElement('xbutton', $this->_deleteButtonName, ts('Delete'), ['type' => 'submit']);
+      $this->addElement('xbutton', $this->_deleteButtonName, ts('Delete'), [
+        'type' => 'submit',
+        'value' => 1,
+      ]);
 
       return;
     }

From 57c59c34d645394f946ceda1b21feda8721268bf Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 14:57:11 -0400
Subject: [PATCH 197/834] No need for crm-button wrappers for real buttons

---
 CRM/Admin/Form/Preferences/Display.php          |  2 ++
 CRM/Batch/Form/Entry.php                        |  1 +
 CRM/Contact/Form/Contact.php                    | 17 ++++++++++++++---
 CRM/Core/Form.php                               |  1 +
 CRM/Profile/Form.php                            |  5 ++++-
 CRM/Profile/Form/Edit.php                       |  1 +
 .../CRM/Admin/Form/Preferences/Display.tpl      |  4 +---
 templates/CRM/Admin/Page/APIExplorer.tpl        |  8 +++-----
 templates/CRM/Batch/Form/Entry.tpl              |  4 +---
 templates/CRM/Contact/Form/Contact.tpl          | 10 +++-------
 templates/CRM/Profile/Form/Dynamic.tpl          |  8 ++++----
 templates/CRM/common/formButtons.tpl            | 11 ++---------
 12 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php
index af824f1f02ae..0716cdebd233 100644
--- a/CRM/Admin/Form/Preferences/Display.php
+++ b/CRM/Admin/Form/Preferences/Display.php
@@ -56,6 +56,8 @@ public function buildQuickForm() {
       CRM_Core_Page::crmIcon('fa-wrench') . ' ' . ts('Configure CKEditor'),
       [
         'type' => 'submit',
+        'class' => 'crm-button',
+        'style' => 'display:inline-block;vertical-align:middle;float:none!important;',
         'value' => 1,
       ]
     );
diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php
index ceb3868d28ff..35c407a79f26 100644
--- a/CRM/Batch/Form/Entry.php
+++ b/CRM/Batch/Form/Entry.php
@@ -179,6 +179,7 @@ public function buildQuickForm() {
       [
         'type' => 'submit',
         'value' => 1,
+        'class' => 'crm-button crm-button_qf_Entry_upload_force-save',
       ]
     );
 
diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php
index 5d6ce311bc83..798050800c35 100644
--- a/CRM/Contact/Form/Contact.php
+++ b/CRM/Contact/Form/Contact.php
@@ -811,17 +811,28 @@ public function buildQuickForm() {
     $this->addElement('xbutton',
       $this->_dedupeButtonName,
       ts('Check for Matching Contact(s)'),
-      ['type' => 'submit']
+      [
+        'type' => 'submit',
+        'value' => 1,
+        'class' => "crm-button crm-button{$this->_dedupeButtonName}",
+      ]
     );
     $this->addElement('xbutton',
       $this->_duplicateButtonName,
       ts('Save Matching Contact'),
-      ['type' => 'submit']
+      [
+        'type' => 'submit',
+        'value' => 1,
+        'class' => "crm-button crm-button{$this->_duplicateButtonName}",
+      ]
     );
     $this->addElement('xbutton',
       $this->getButtonName('next', 'sharedHouseholdDuplicate'),
       ts('Save With Duplicate Household'),
-      ['type' => 'submit']
+      [
+        'type' => 'submit',
+        'value' => 1,
+      ]
     );
 
     $buttons = [
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index ef81439d24d1..fe06bb991528 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -714,6 +714,7 @@ public function addButtons($params) {
         }
         $buttonContents = CRM_Core_Page::crmIcon($button['icon'] ?? $defaultIcon) . ' ' . $button['name'];
         $buttonName = $this->getButtonName($button['type'], CRM_Utils_Array::value('subName', $button));
+        $attrs['class'] .= " crm-button crm-button-type-{$button['type']} crm-button{$buttonName}";
         $attrs['type'] = 'submit';
         $prevnext[] = $this->createElement('xbutton', $buttonName, $buttonContents, $attrs);
       }
diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php
index c34f1388dd67..c6594fd4bd97 100644
--- a/CRM/Profile/Form.php
+++ b/CRM/Profile/Form.php
@@ -907,7 +907,10 @@ public function buildQuickForm() {
         'xbutton',
         $this->_duplicateButtonName,
         ts('Save Matching Contact'),
-        ['type' => 'submit']
+        [
+          'type' => 'submit',
+          'class' => 'crm-button',
+        ]
       );
     }
   }
diff --git a/CRM/Profile/Form/Edit.php b/CRM/Profile/Form/Edit.php
index 758e9711279c..b2cfc16bf447 100644
--- a/CRM/Profile/Form/Edit.php
+++ b/CRM/Profile/Form/Edit.php
@@ -212,6 +212,7 @@ public function buildQuickForm() {
       $this->addElement('xbutton', $this->_deleteButtonName, ts('Delete'), [
         'type' => 'submit',
         'value' => 1,
+        'class' => 'crm-button',
       ]);
 
       return;
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 6ee7378d315f..b06cb53588ac 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -161,9 +161,7 @@
       <td>
         {$form.editor_id.html}
         &nbsp;
-        <span class="crm-button" style="display:inline-block;vertical-align:middle;float:none!important;">
-          {$form.ckeditor_config.html}
-        </span>
+        {$form.ckeditor_config.html}
       </td>
     </tr>
     <tr class="crm-preferences-display-form-block-ajaxPopupsEnabled">
diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl
index 98e6529ca16c..2be5f1f3c4ab 100644
--- a/templates/CRM/Admin/Page/APIExplorer.tpl
+++ b/templates/CRM/Admin/Page/APIExplorer.tpl
@@ -285,11 +285,9 @@
         </table>
       </div>
       <div class="crm-submit-buttons">
-        <span class="crm-button">
-          <button type="submit" class="crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}">
-            <i class="crm-i fa-bolt" aria-hidden="true"></i> {ts}Execute{/ts}
-          </button>
-        </span>
+        <button type="submit" class="crm-button crm-form-submit" accesskey="S" title="{ts}Execute API call and display results{/ts}">
+          <i class="crm-i fa-bolt" aria-hidden="true"></i> {ts}Execute{/ts}
+        </button>
       </div>
 
 <pre id="api-result" class="linenums">
diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
index 70c0a1c35069..14581e634359 100644
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -22,9 +22,7 @@
     <div class="status message status-warning">
       <i class="crm-i fa-exclamation-triangle" aria-hidden="true"></i> {ts}Total for amounts entered below does not match the expected batch total.{/ts}
     </div>
-    <span class="crm-button crm-button_qf_Entry_upload_force-save">
-      {$form._qf_Entry_upload_force.html}
-    </span>
+    {$form._qf_Entry_upload_force.html}
     <div class="clear"></div>
   {/if}
   <table class="form-layout-compressed batch-totals">
diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl
index 2acbff7dccbd..2844d09e35a4 100644
--- a/templates/CRM/Contact/Form/Contact.tpl
+++ b/templates/CRM/Contact/Form/Contact.tpl
@@ -66,14 +66,10 @@
           </table>
 
           {*add dupe buttons *}
-          <span class="crm-button crm-button_qf_Contact_refresh_dedupe">
-            {$form._qf_Contact_refresh_dedupe.html}
-          </span>
+          {$form._qf_Contact_refresh_dedupe.html}
           {if $isDuplicate}
             &nbsp;&nbsp;
-              <span class="crm-button crm-button_qf_Contact_upload_duplicate">
-                {$form._qf_Contact_upload_duplicate.html}
-              </span>
+            {$form._qf_Contact_upload_duplicate.html}
           {/if}
           <div class="spacer"></div>
         </div>
@@ -212,7 +208,7 @@
     loadMultiRecordFields();
 
     {/literal}{if $oldSubtypes}{literal}
-    $('input[name=_qf_Contact_upload_view], input[name=_qf_Contact_upload_new]').click(function() {
+    $('button[name=_qf_Contact_upload_view], button[name=_qf_Contact_upload_new]').click(function() {
       var submittedSubtypes = $('#contact_sub_type').val();
       var oldSubtypes = {/literal}{$oldSubtypes}{literal};
 
diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl
index 2d0240fb886b..09ed9986ddd1 100644
--- a/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/templates/CRM/Profile/Form/Dynamic.tpl
@@ -19,7 +19,7 @@
   </div>
 
   <div class="crm-submit-buttons">
-    <span class="crm-button">{$form._qf_Edit_upload_delete.html}</span>
+    {$form._qf_Edit_upload_delete.html}
     {if $includeCancelButton}
       <a class="button cancel" href="{$cancelURL}">{$cancelButtonText}</a>
     {/if}
@@ -37,7 +37,7 @@
 
   {if $isDuplicate and ( ($action eq 1 and $mode eq 4 ) or ($action eq 2) or ($action eq 8192) ) }
     <div class="crm-submit-buttons">
-      <span class="crm-button">{$form._qf_Edit_upload_duplicate.html}</span>
+      {$form._qf_Edit_upload_duplicate.html}
     </div>
   {/if}
   {if $mode eq 1 || $activeComponent neq "CiviCRM"}
@@ -53,7 +53,7 @@
     {if $action eq 2 and $multiRecordFieldListing}
       <h1>{ts}Edit Details{/ts}</h1>
       <div class="crm-submit-buttons" style='float:right'>
-      {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}<span class="crm-button">{$form._qf_Edit_upload_duplicate.html}</span>{/if}
+      {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
       </div>
     {/if}
 
@@ -209,7 +209,7 @@
         </div>
       {/if}
       <div class="crm-submit-buttons" style='{$floatStyle}'>
-        {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}<span class="crm-button">{$form._qf_Edit_upload_duplicate.html}</span>{/if}
+        {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
         {if $includeCancelButton}
           <a class="button cancel" href="{$cancelURL}">
             <span>
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 0135fe30d104..10b848a154d2 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -28,20 +28,13 @@
   {/foreach}
 {/if}
 
-{* Loops through $form.buttons.html array and assigns separate spans with classes to allow theming by button and name.
- * crmBtnType grabs type keyword from button name (e.g. 'upload', 'next', 'back', 'cancel') so types of buttons can be styled differently via css.
- *}
 {foreach from=$form.buttons item=button key=key name=btns}
   {if $key|substring:0:4 EQ '_qf_'}
     {if $location}
-      {assign var='html' value=$form.buttons.$key.html|crmReplace:id:"$key-$location"}
+      {$form.buttons.$key.html|crmReplace:id:"$key-$location"}
     {else}
-      {assign var='html' value=$form.buttons.$key.html}
+      {$form.buttons.$key.html}
     {/if}
-    {crmGetAttribute html=$html attr='disabled' assign='disabled'}
-    <span class="crm-button crm-button-type-{$key|crmBtnType} crm-button{$key}{if $disabled} crm-button-disabled{/if}"{if $buttonStyle} style="{$buttonStyle}"{/if}>
-      {$html}
-    </span>
   {/if}
 {/foreach}
 {/crmRegion}

From f3ec70ebde50948d984632cc83c3425f833f48ca Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 15:36:47 -0400
Subject: [PATCH 198/834] Remove deprecated submitOnce js function

---
 js/Common.js | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/js/Common.js b/js/Common.js
index 88c8c44b8ea1..65b12c09bd93 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -145,32 +145,6 @@ function showHideByValue(trigger_field_id, trigger_value, target_element_id, tar
 }
 
 var submitcount = 0;
-/**
- * Old submit-once function. Will be removed soon.
- * @deprecated
- */
-function submitOnce(obj, formId, procText) {
-  // if named button clicked, change text
-  if (obj.value != null) {
-    cj('input[name=' + obj.name + ']').val(procText + " ...");
-  }
-  cj(obj).closest('form').attr('data-warn-changes', 'false');
-  if (document.getElementById) { // disable submit button for newer browsers
-    cj('input[name=' + obj.name + ']').attr("disabled", true);
-    document.getElementById(formId).submit();
-    return true;
-  }
-  else { // for older browsers
-    if (submitcount == 0) {
-      submitcount++;
-      return true;
-    }
-    else {
-      alert("Your request is currently being processed ... Please wait.");
-      return false;
-    }
-  }
-}
 
 /**
  * Function to show / hide the row in optionFields

From 15ef6755486645b38e8a89e2fed7210dbc4f4713 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 16:06:56 -0400
Subject: [PATCH 199/834] Fix JS for input buttons that are now button buttons

---
 js/Common.js                                                | 4 ++--
 js/crm.ajax.js                                              | 4 ++--
 js/crm.searchForm.js                                        | 2 +-
 templates/CRM/Contact/Form/Search/Builder.js                | 2 +-
 templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl | 5 ++---
 templates/CRM/Event/Form/ManageEvent/Registration.tpl       | 2 +-
 templates/CRM/Mailing/Page/Event.tpl                        | 2 +-
 templates/CRM/Report/Form/Layout/Graph.tpl                  | 1 +
 templates/CRM/common/TabHeader.js                           | 2 +-
 templates/CRM/common/deferredFinancialType.tpl              | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/js/Common.js b/js/Common.js
index 65b12c09bd93..f42314f6edb8 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -192,7 +192,7 @@ if (!CRM.vars) CRM.vars = {};
   $.propHooks.disabled = {
     set: function (el, value, name) {
       // Sync button enabled status with wrapper css
-      if ($(el).is('span.crm-button > input.crm-form-submit')) {
+      if ($(el).is('.crm-button.crm-form-submit')) {
         $(el).parent().toggleClass('crm-button-disabled', !!value);
       }
       // Sync button enabled status with dialog button
@@ -971,7 +971,7 @@ if (!CRM.vars) CRM.vars = {};
       $('form[data-submit-once]', e.target)
         .submit(submitOnceForm)
         .on('invalid-form', submitFormInvalid);
-      $('form[data-submit-once] input[type=submit]', e.target).click(function(e) {
+      $('form[data-submit-once] button[type=submit]', e.target).click(function(e) {
         submitButton = e.target;
       });
     })
diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index e65bd7b2a22c..757ebef06335 100644
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -498,7 +498,7 @@
         var buttonContainers = '.crm-submit-buttons, .action-link',
           buttons = [],
           added = [];
-        $(buttonContainers, $el).find('input.crm-form-submit, a.button, button').each(function() {
+        $(buttonContainers, $el).find('.crm-form-submit, .crm-form-xbutton, a.button, button').each(function() {
           var $el = $(this),
             label = $el.is('input') ? $el.attr('value') : $el.text(),
             identifier = $el.attr('name') || $el.attr('href');
@@ -522,7 +522,7 @@
         $el.dialog('option', 'buttons', buttons);
       }
       // Allow a button to prevent ajax submit
-      $('input[data-no-ajax-submit=true]').click(function() {
+      $('input[data-no-ajax-submit=true], button[data-no-ajax-submit=true]').click(function() {
         $(this).closest('form').ajaxFormUnbind();
       });
       // For convenience, focus the first field
diff --git a/js/crm.searchForm.js b/js/crm.searchForm.js
index 42a371dcecf4..c84d0f5ec292 100644
--- a/js/crm.searchForm.js
+++ b/js/crm.searchForm.js
@@ -134,7 +134,7 @@
       // When selecting a task
       .on('change', 'select#task', function(e) {
         var $form = $(this).closest('form'),
-        $go = $('input.crm-search-go-button', $form);
+        $go = $('button.crm-search-go-button', $form);
         var $selectedOption = $(this).find(':selected');
         if (!$selectedOption.val()) {
           // do not blank refresh the empty option.
diff --git a/templates/CRM/Contact/Form/Search/Builder.js b/templates/CRM/Contact/Form/Search/Builder.js
index fd6a984c1394..4dc3523571e9 100644
--- a/templates/CRM/Contact/Form/Search/Builder.js
+++ b/templates/CRM/Contact/Form/Search/Builder.js
@@ -293,7 +293,7 @@
       })
       // Add new field - if there's a hidden one, show it
       // Otherwise allow form to submit and fetch more from the server
-      .on('click', 'input[name^=addMore]', function() {
+      .on('click', 'button[name^=addMore]', function() {
         var table = $(this).closest('table');
         if ($('tr:hidden', table).length) {
           $('tr:hidden', table).first().show();
diff --git a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
index 6ca766cc26b3..5a3bd098639c 100644
--- a/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/PremiumBlock.tpl
@@ -62,7 +62,7 @@
               <div class="premium-full-title">{$row.name}</div>
               <div class="premium-full-disabled">
                 {ts 1=$row.min_contribution|crmMoney}You must contribute at least %1 to get this item{/ts}<br/>
-                <input type="button" value="{ts 1=$row.min_contribution|crmMoney}Contribute %1 Instead{/ts}" amount="{$row.min_contribution}" />
+                <button type="button" value="{ts 1=$row.min_contribution|crmMoney}Contribute %1 Instead{/ts}" amount="{$row.min_contribution}" />
               </div>
               <div class="premium-full-description">
                 {$row.description}
@@ -235,7 +235,7 @@
         amounts.sort(function(a,b){return a - b});
 
         // make contribution instead buttons work
-        $('.premium-full-disabled input').click(function(){
+        $('.premium-full-disabled button').click(function(){
           var amount = Number($(this).attr('amount'));
           if (price_sets[amount]) {
             if (!$(price_sets[amount]).length) {
@@ -347,4 +347,3 @@
     {/literal}
   {/if}
 {/if}
-
diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
index 4858e9803259..27c4cdb59b21 100644
--- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl
@@ -396,7 +396,7 @@ invert              = 0
 <script type="text/javascript">
 {literal}    (function($, _) { // Generic Closure
 
-    $(".crm-submit-buttons input").click( function() {
+    $(".crm-submit-buttons button").click( function() {
       $(".dedupenotify .ui-notify-close").click();
     });
 
diff --git a/templates/CRM/Mailing/Page/Event.tpl b/templates/CRM/Mailing/Page/Event.tpl
index 4636f96d5e12..e54646eaf4cf 100644
--- a/templates/CRM/Mailing/Page/Event.tpl
+++ b/templates/CRM/Mailing/Page/Event.tpl
@@ -56,7 +56,7 @@
   <script type="text/javascript">
     var totalPages = {/literal}{$pager->_totalPages}{literal};
     CRM.$(function($) {
-      $("#crm-container .crm-pager input.crm-form-submit").click(function () {
+      $("#crm-container .crm-pager button.crm-form-submit").click(function () {
         submitPagerData(this);
       });
     });
diff --git a/templates/CRM/Report/Form/Layout/Graph.tpl b/templates/CRM/Report/Form/Layout/Graph.tpl
index 508d39ca48f2..33eedecb86a4 100644
--- a/templates/CRM/Report/Form/Layout/Graph.tpl
+++ b/templates/CRM/Report/Form/Layout/Graph.tpl
@@ -35,6 +35,7 @@
            createChart( chartID, divName, chartValues.size.xSize, chartValues.size.ySize, allData[chartID].object );
          });
 
+         // FIXME
          $("input[id$='submit_print'],input[id$='submit_pdf']").bind('click', function(e){
            // image creator php file path and append image name
            var url = CRM.url('civicrm/report/chart', 'name=' + '{/literal}{$chartId}{literal}' + '.png');
diff --git a/templates/CRM/common/TabHeader.js b/templates/CRM/common/TabHeader.js
index e816f0baacd4..ba514b81268f 100644
--- a/templates/CRM/common/TabHeader.js
+++ b/templates/CRM/common/TabHeader.js
@@ -23,7 +23,7 @@ CRM.$(function($) {
           params.autoClose = params.openInline = params.cancelButton = params.refreshAction = false;
           ui.panel.on('crmFormLoad', function() {
             // Hack: "Save and done" and "Cancel" buttons submit without ajax
-            $('.cancel.crm-form-submit, input[name$=upload_done]', this).on('click', function(e) {
+            $('.cancel.crm-form-submit, button[name$=upload_done]', this).on('click', function(e) {
               $(this).closest('form').ajaxFormUnbind();
             });
           });
diff --git a/templates/CRM/common/deferredFinancialType.tpl b/templates/CRM/common/deferredFinancialType.tpl
index 0b8f6645c158..10c9628b2dbd 100644
--- a/templates/CRM/common/deferredFinancialType.tpl
+++ b/templates/CRM/common/deferredFinancialType.tpl
@@ -12,7 +12,7 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-  var more = $('.crm-button input.validate').click(function(e) {
+  var more = $('.crm-button.validate').click(function(e) {
     var message = "{/literal} {if $context eq 'Event'}
         {ts escape='js'}Note: Revenue for this event registration will not be deferred as the financial type does not have a deferred revenue account setup for it. If you want the revenue to be deferred, please select a different Financial Type with a Deferred Revenue account setup for it, or setup a Deferred Revenue account for this Financial Type.{/ts}
       {else if $context eq 'MembershipType'}

From f563a06b507f3a62a0a406cb189ebf8715079ffd Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 18:00:58 -0400
Subject: [PATCH 200/834] Fix CSS for new buttons

---
 css/civicrm.css        | 62 +++++++++++++-----------------------------
 css/joomla.css         |  4 +--
 setup/res/template.css | 11 ++++----
 3 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 70e5a0ef01dd..1026874be479 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1173,7 +1173,7 @@ input.crm-form-entityref {
   cursor: pointer;
 }
 
-#crm-container input.submit-link {
+#crm-container button.submit-link {
   color: #285286;
   background: none transparent;
   border: none;
@@ -1833,17 +1833,6 @@ input.crm-form-entityref {
   margin-left: .5em;
 }
 
-.crm-container .crm-button input {
-  background: none;
-  border: medium none;
-  color: #FFF;
-  cursor: pointer;
-  font-size: 13px;
-  font-weight: normal;
-  margin: 0;
-  padding: 1px 8px 2px 4px;
-}
-
 .crm-container .crm-button-type-cancel,
 .crm-container .crm-button-type-back {
   margin-left: 20px;
@@ -1855,12 +1844,14 @@ input.crm-form-entityref {
   min-height: 0;
 }
 
+/* A few of these are redundant: pretty much all buttons have the crm-button
+class.  It can't hurt, though. */
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
-.crm-container input.crm-form-submit,
+.crm-container button.crm-form-submit,
 .crm-container .ui-dialog-buttonset .ui-button,
-.crm-container input[type=button],
+.crm-container button[type=button],
 .crm-container .crm-button {
   text-shadow: 0 1px 0 black;
   background: #696969;
@@ -1877,7 +1868,7 @@ input.crm-form-entityref {
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
-.crm-container span.crm-button {
+.crm-container .crm-button {
   display: block;
   float: left;
   overflow: hidden;
@@ -1897,23 +1888,11 @@ input.crm-form-entityref {
   margin-bottom: -4px;
 }
 
-.crm-container input.crm-form-submit,
-.crm-container input[type=button] {
-  padding: 2px 6px;
-}
-
-.crm-container .crm-button input[type=button],
-.crm-container .crm-button input.crm-form-submit {
-  padding: 0;
-  margin: 0;
-  background: none;
-  border: none;
-}
-
+/* Also redundant, see above */
 .crm-container .crm-button:hover,
 .crm-container .crm-button:focus,
-.crm-container input[type=submit]:hover,
-.crm-container input[type=button]:hover,
+.crm-container button[type=submit]:hover,
+.crm-container button[type=button]:hover,
 .crm-container .ui-dialog-buttonset .ui-button:hover,
 .crm-container .ui-dialog-buttonset .ui-button:focus,
 .crm-container a.button:hover,
@@ -1921,18 +1900,24 @@ input.crm-form-entityref {
   background: #3e3e3e;
 }
 
+/* Also redundant, see above */
 .crm-container .crm-button-disabled,
 .crm-container .crm-button.crm-button-disabled,
 .crm-container .ui-dialog-buttonset .ui-button[disabled],
-.crm-container input.crm-form-submit[disabled],
-.crm-container input[type=button][disabled],
+.crm-container button.crm-form-submit[disabled],
+.crm-container button[type=button][disabled],
 .crm-container .crm-button[disabled] {
   opacity: .6;
   cursor: default;
 }
 
-.crm-container .crm-button-disabled input[disabled] {
-  opacity: 1;
+/* Also redundant, see above */
+.crm-container .crm-button,
+.crm-container a.button,
+.crm-container a.button:link,
+.crm-container button.crm-form-submit,
+.crm-container button[type=button] {
+  border-radius: 3px;
 }
 
 .crm-container .ui-dialog-buttonpane {
@@ -2889,15 +2874,6 @@ tbody.scrollContent tr.alternateRow {
 }
 
 /* rounded corners */
-.crm-container .crm-button,
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container input.crm-form-submit,
-.crm-container input[type=button] {
-  border-radius: 3px;
-}
-
-
 .crm-container div.status,
 .crm-container #help,
 .crm-container .help,
diff --git a/css/joomla.css b/css/joomla.css
index a59b3a047ad5..80b9ad96f053 100644
--- a/css/joomla.css
+++ b/css/joomla.css
@@ -352,7 +352,7 @@ div#toolbar-box, div#toolbar-box div.m{
 .crm-container input {
   height: auto;
 }
-.crm-container input[type=submit] {
+.crm-container button[type=submit] {
   height: auto;
 }
 
@@ -377,7 +377,7 @@ div#toolbar-box, div#toolbar-box div.m{
 }
 
 /* Remove Joomla subhead toolbar & whitespace border */
-	
+
 body.admin.com_civicrm .subhead-collapse {
 	display:none;
 }
diff --git a/setup/res/template.css b/setup/res/template.css
index 5a2b3ea10608..a06f97a2b844 100644
--- a/setup/res/template.css
+++ b/setup/res/template.css
@@ -15,7 +15,7 @@ body {
   float: left;
   margin-left: 10%;
   margin-top: 50px;
-  margin-right: 20%; 
+  margin-right: 20%;
   display: inline-flex;
 }
 
@@ -39,7 +39,7 @@ body {
     100% { left: 0; color: #555;}
 }
 
-  
+
 .civicrm-setup-header hr{
   border-bottom: 2px solid #fff;
   border-top: 2px solid #ddd;
@@ -217,7 +217,7 @@ body {
   text-align: center;
   margin: 2em 0.5em;
 }
-.civicrm-setup-body input[type=submit] {
+.civicrm-setup-body button[type=submit] {
   padding:15px 25px;
   background:#82C459;
   color: white;
@@ -227,10 +227,10 @@ body {
   border-radius: 5px;
   font-size: 20px;
 }
-.civicrm-setup-body input[type=submit]:hover {
+.civicrm-setup-body button[type=submit]:hover {
   background: #60A237;
 }
-.civicrm-setup-body input[type=submit]:disabled {
+.civicrm-setup-body button[type=submit]:disabled {
   background: #888;
   cursor: not-allowed;
 }
@@ -267,4 +267,3 @@ body {
     width: 95%;
   }
 }
-

From 40564bf4cf7a9163141fb2e8cb0d2c1b3035a6c0 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Thu, 6 Aug 2020 18:17:31 -0400
Subject: [PATCH 201/834] More radical cleanup of button CSS

---
 css/civicrm.css | 47 ++++++-----------------------------------------
 1 file changed, 6 insertions(+), 41 deletions(-)

diff --git a/css/civicrm.css b/css/civicrm.css
index 1026874be479..1a685a272970 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -1844,14 +1844,10 @@ input.crm-form-entityref {
   min-height: 0;
 }
 
-/* A few of these are redundant: pretty much all buttons have the crm-button
-class.  It can't hurt, though. */
 .crm-container a.button,
 .crm-container a.button:link,
 .crm-container a.button:visited,
-.crm-container button.crm-form-submit,
 .crm-container .ui-dialog-buttonset .ui-button,
-.crm-container button[type=button],
 .crm-container .crm-button {
   text-shadow: 0 1px 0 black;
   background: #696969;
@@ -1863,36 +1859,15 @@ class.  It can't hurt, though. */
   text-decoration: none;
   cursor: pointer;
   border: 1px solid #3e3e3e;
-}
-
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container a.button:visited,
-.crm-container .crm-button {
   display: block;
   float: left;
   overflow: hidden;
   line-height: 135%;
+  border-radius: 3px;
 }
 
-/* Preserving the important but not sure why */
-.crm-container span.crm-button {
-  float: left !important;
-}
-
-.crm-container button.crm-button {
-  padding: 3px 6px;
-}
-
-.crm-container button.crm-button .icon {
-  margin-bottom: -4px;
-}
-
-/* Also redundant, see above */
 .crm-container .crm-button:hover,
 .crm-container .crm-button:focus,
-.crm-container button[type=submit]:hover,
-.crm-container button[type=button]:hover,
 .crm-container .ui-dialog-buttonset .ui-button:hover,
 .crm-container .ui-dialog-buttonset .ui-button:focus,
 .crm-container a.button:hover,
@@ -1900,37 +1875,27 @@ class.  It can't hurt, though. */
   background: #3e3e3e;
 }
 
-/* Also redundant, see above */
 .crm-container .crm-button-disabled,
 .crm-container .crm-button.crm-button-disabled,
 .crm-container .ui-dialog-buttonset .ui-button[disabled],
-.crm-container button.crm-form-submit[disabled],
-.crm-container button[type=button][disabled],
 .crm-container .crm-button[disabled] {
   opacity: .6;
   cursor: default;
 }
 
-/* Also redundant, see above */
-.crm-container .crm-button,
-.crm-container a.button,
-.crm-container a.button:link,
-.crm-container button.crm-form-submit,
-.crm-container button[type=button] {
-  border-radius: 3px;
-}
-
 .crm-container .ui-dialog-buttonpane {
   background: linear-gradient(to bottom, #f2f2f2 0%,#ffffff 35%);
 }
 
-.crm-container .ui-dialog-buttonset .ui-button {
-  padding: 0;
-}
 .crm-container .ui-dialog-buttonset .ui-button .ui-icon {
   background-image: url("../i/icons/jquery-ui-FFFFFF.png");
 }
 
+/* Override of a line in crm-i.css that may not be important anymore */
+.crm-container .ui-dialog-buttonset .ui-button .ui-icon[class*=" fa-"] {
+  margin-top: 0;
+}
+
 /* No crm-button styling for PayPal Express buttons */
 .crm-container input#_qf_Register_upload_express,
 .crm-container input#_qf_Payment_upload_express,

From c976334772411df95d0f9be98a31fdc5361c11ec Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 9 Sep 2020 07:36:32 +1200
Subject: [PATCH 202/834] Fix formatLocaleNumericRoundedByCurrency

The function was rounding by a max of 2 regardless of the number of places passed - it
was only tested for 2 so seemed to work
---
 CRM/Utils/Money.php                   | 39 +++++++++++++++++++++++++--
 tests/phpunit/CRM/Utils/MoneyTest.php | 32 ++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/CRM/Utils/Money.php b/CRM/Utils/Money.php
index 9da7a98fe9ab..45d2d3fd79cb 100644
--- a/CRM/Utils/Money.php
+++ b/CRM/Utils/Money.php
@@ -201,7 +201,7 @@ protected static function formatLocaleNumeric($amount) {
    * @return string
    */
   protected static function formatLocaleNumericRounded($amount, $numberOfPlaces) {
-    return self::formatLocaleNumeric(round($amount, $numberOfPlaces));
+    return self::formatNumericByFormat($amount, '%!.' . $numberOfPlaces . 'i');
   }
 
   /**
@@ -216,7 +216,42 @@ protected static function formatLocaleNumericRounded($amount, $numberOfPlaces) {
    *   Formatted amount.
    */
   public static function formatLocaleNumericRoundedByCurrency($amount, $currency) {
-    $amount = self::formatLocaleNumericRounded($amount, self::getCurrencyPrecision($currency));
+    return self::formatLocaleNumericRoundedByPrecision($amount, self::getCurrencyPrecision($currency));
+  }
+
+  /**
+   * Format money for display (just numeric part) according to the current locale with rounding to the supplied precision.
+   *
+   * This handles both rounding & replacement of the currency separators for the locale.
+   *
+   * @param string $amount
+   * @param int $precision
+   *
+   * @return string
+   *   Formatted amount.
+   */
+  public static function formatLocaleNumericRoundedByPrecision($amount, $precision) {
+    $amount = self::formatLocaleNumericRounded($amount, $precision);
+    return self::replaceCurrencySeparators($amount);
+  }
+
+  /**
+   * Format money for display with rounding to the supplied precision but without padding.
+   *
+   * If the string is shorter than the precision trailing zeros are not added to reach the precision
+   * beyond the 2 required for normally currency formatting.
+   *
+   * This handles both rounding & replacement of the currency separators for the locale.
+   *
+   * @param string $amount
+   * @param int $precision
+   *
+   * @return string
+   *   Formatted amount.
+   */
+  public static function formatLocaleNumericRoundedByOptionalPrecision($amount, $precision) {
+    $decimalPlaces = strlen(substr($amount, strpos($amount, '.') + 1));
+    $amount = self::formatLocaleNumericRounded($amount, $precision > $decimalPlaces ? $decimalPlaces : $precision);
     return self::replaceCurrencySeparators($amount);
   }
 
diff --git a/tests/phpunit/CRM/Utils/MoneyTest.php b/tests/phpunit/CRM/Utils/MoneyTest.php
index 7b97b20b2f7e..82cca12ca821 100644
--- a/tests/phpunit/CRM/Utils/MoneyTest.php
+++ b/tests/phpunit/CRM/Utils/MoneyTest.php
@@ -72,6 +72,38 @@ public function testFormatLocaleNumericRoundedByCurrencyEuroThousand() {
     $this->setCurrencySeparators(',');
   }
 
+  /**
+   * Test rounded by currency function with specified precision.
+   *
+   * @param string $thousandSeparator
+   *
+   * @dataProvider getThousandSeparators
+   */
+  public function testFormatLocaleNumericRoundedByPrecision($thousandSeparator) {
+    $this->setCurrencySeparators($thousandSeparator);
+    $result = CRM_Utils_Money::formatLocaleNumericRoundedByPrecision(8950.3678, 3);
+    $expected = ($thousandSeparator === ',') ? '8,950.368' : '8.950,368';
+    $this->assertEquals($expected, $result);
+  }
+
+  /**
+   * Test rounded by currency function with specified precision but without padding to reach it.
+   *
+   * @param string $thousandSeparator
+   *
+   * @dataProvider getThousandSeparators
+   */
+  public function testFormatLocaleNumericRoundedByOptionalPrecision($thousandSeparator) {
+    $this->setCurrencySeparators($thousandSeparator);
+    $result = CRM_Utils_Money::formatLocaleNumericRoundedByOptionalPrecision(8950.3678, 8);
+    $expected = ($thousandSeparator === ',') ? '8,950.3678' : '8.950,3678';
+    $this->assertEquals($expected, $result);
+
+    $result = CRM_Utils_Money::formatLocaleNumericRoundedByOptionalPrecision(123456789.987654321, 9);
+    $expected = ($thousandSeparator === ',') ? '123,456,789.98765' : '123.456.789,98765';
+    $this->assertEquals($result, $expected);
+  }
+
   /**
    * Test that using the space character as a currency works
    */

From 14120ba9f4aa2714c30d0fd8d85e8c8098fe9524 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Tue, 8 Sep 2020 15:59:23 -0400
Subject: [PATCH 203/834] Remove obsolete OFC flash-to-image code

---
 templates/CRM/Report/Form/Layout/Graph.tpl | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/templates/CRM/Report/Form/Layout/Graph.tpl b/templates/CRM/Report/Form/Layout/Graph.tpl
index 33eedecb86a4..0add07e2ea18 100644
--- a/templates/CRM/Report/Form/Layout/Graph.tpl
+++ b/templates/CRM/Report/Form/Layout/Graph.tpl
@@ -34,15 +34,6 @@
            var divName = {/literal}"chart_{$uniqueId}"{literal};
            createChart( chartID, divName, chartValues.size.xSize, chartValues.size.ySize, allData[chartID].object );
          });
-
-         // FIXME
-         $("input[id$='submit_print'],input[id$='submit_pdf']").bind('click', function(e){
-           // image creator php file path and append image name
-           var url = CRM.url('civicrm/report/chart', 'name=' + '{/literal}{$chartId}{literal}' + '.png');
-
-           //fetch object and 'POST' image
-           swfobject.getObjectById("chart_{/literal}{$uniqueId}{literal}").post_image(url, true, false);
-         });
        });
 
     </script>

From 09e6f54112d5091826792bd29dc36d0e196d79fd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 31 Aug 2020 18:28:20 +1200
Subject: [PATCH 204/834] dev/core#1603 fix tangental bug on form handling of
 long options

This fixes the bug that derailed the fix for https://lab.civicrm.org/dev/core/-/issues/1603

On further testing I agree with Jitendra that the price field form was mis-saving the longer values (I only
tested with Euro style decimal separators but maybe on both) and it was bad data caused by this
that made the merged fix look like a regression.

I also observed that the Money functions intended to round only appeared to since it was rounding
just fine to 2 places, as tested, but it was still rounding to 2 places when we wanted more.

This fixes both the New Price field screen (when options are entered) and the edit options screen
---
 CRM/Price/Form/Field.php  | 3 +++
 CRM/Price/Form/Option.php | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php
index 571ab77be16e..023066db68b5 100644
--- a/CRM/Price/Form/Field.php
+++ b/CRM/Price/Form/Field.php
@@ -642,6 +642,9 @@ public function postProcess() {
     // store the submitted values in an array
     $params = $this->controller->exportValues('Field');
     $params['price'] = CRM_Utils_Rule::cleanMoney($params['price']);
+    foreach ($params['option_amount'] as $key => $amount) {
+      $params['option_amount'][$key] = CRM_Utils_Rule::cleanMoney($amount);
+    }
 
     $params['is_display_amounts'] = CRM_Utils_Array::value('is_display_amounts', $params, FALSE);
     $params['is_required'] = CRM_Utils_Array::value('is_required', $params, FALSE);
diff --git a/CRM/Price/Form/Option.php b/CRM/Price/Form/Option.php
index e5f7fc1aaac8..adf22e19a862 100644
--- a/CRM/Price/Form/Option.php
+++ b/CRM/Price/Form/Option.php
@@ -75,6 +75,9 @@ public function setDefaultValues() {
 
       // fix the display of the monetary value, CRM-4038
       foreach ($this->_moneyFields as $field) {
+        // @todo use formatLocaleNumericRoundedByOptionalPrecision - but note that there is an issue where php doesn't handle
+        // money strings beyond a certain total length - per https://github.com/civicrm/civicrm-core/pull/18409
+        // & https://github.com/civicrm/civicrm-core/pull/18409
         $defaults[$field] = CRM_Utils_Money::format(CRM_Utils_Array::value($field, $defaults), NULL, '%a');
       }
     }
@@ -326,7 +329,6 @@ public function postProcess() {
       return NULL;
     }
     else {
-      $params = $ids = [];
       $params = $this->controller->exportValues('Option');
       $fieldLabel = CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceField', $this->_fid, 'label');
 

From 3741f351db785a5ed1f1459962b7e40696713996 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Thu, 18 Jun 2020 14:27:17 -0400
Subject: [PATCH 205/834] core#1590: Don't send reminders to add'l recipients
 on deleted/inactive/template events

support reminders with event types/templates and multiple event/type/template IDs

fix
---
 CRM/Activity/ActionMapping.php           |  8 +++++
 CRM/Contact/ActionMapping.php            |  8 +++++
 CRM/Contribute/ActionMapping/ByPage.php  |  8 +++++
 CRM/Contribute/ActionMapping/ByType.php  |  8 +++++
 CRM/Event/ActionMapping.php              | 46 ++++++++++++++++++++++++
 CRM/Member/ActionMapping.php             |  8 +++++
 Civi/ActionSchedule/Mapping.php          |  6 ++++
 Civi/ActionSchedule/MappingInterface.php |  6 ++++
 Civi/ActionSchedule/RecipientBuilder.php | 25 ++-----------
 tests/phpunit/api/v3/JobTest.php         | 35 ++++++++++++++++++
 10 files changed, 135 insertions(+), 23 deletions(-)

diff --git a/CRM/Activity/ActionMapping.php b/CRM/Activity/ActionMapping.php
index 05abcf9e24c9..9f73592644b7 100644
--- a/CRM/Activity/ActionMapping.php
+++ b/CRM/Activity/ActionMapping.php
@@ -118,4 +118,12 @@ public function createQuery($schedule, $phase, $defaultParams) {
     return $query;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool {
+    return TRUE;
+  }
+
 }
diff --git a/CRM/Contact/ActionMapping.php b/CRM/Contact/ActionMapping.php
index f4aee154e830..ea96b5da7863 100644
--- a/CRM/Contact/ActionMapping.php
+++ b/CRM/Contact/ActionMapping.php
@@ -139,4 +139,12 @@ public function createQuery($schedule, $phase, $defaultParams) {
     return $query;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool {
+    return TRUE;
+  }
+
 }
diff --git a/CRM/Contribute/ActionMapping/ByPage.php b/CRM/Contribute/ActionMapping/ByPage.php
index 8c09c81cc274..6dcab6e2a7ae 100644
--- a/CRM/Contribute/ActionMapping/ByPage.php
+++ b/CRM/Contribute/ActionMapping/ByPage.php
@@ -216,4 +216,12 @@ public function resetOnTriggerDateChange($schedule) {
     return FALSE;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool {
+    return TRUE;
+  }
+
 }
diff --git a/CRM/Contribute/ActionMapping/ByType.php b/CRM/Contribute/ActionMapping/ByType.php
index ea259901a569..88d60e49c767 100644
--- a/CRM/Contribute/ActionMapping/ByType.php
+++ b/CRM/Contribute/ActionMapping/ByType.php
@@ -235,4 +235,12 @@ public function resetOnTriggerDateChange($schedule) {
     return FALSE;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool {
+    return TRUE;
+  }
+
 }
diff --git a/CRM/Event/ActionMapping.php b/CRM/Event/ActionMapping.php
index 77fa8d77edfb..9c8aaae7a507 100644
--- a/CRM/Event/ActionMapping.php
+++ b/CRM/Event/ActionMapping.php
@@ -159,6 +159,7 @@ public function createQuery($schedule, $phase, $defaultParams) {
     }
 
     // build where clause
+    // FIXME: This handles scheduled reminder of type "Event Name" and "Event Type", gives incorrect result on "Event Template".
     if (!empty($selectedValues)) {
       $valueField = ($this->id == \CRM_Event_ActionMapping::EVENT_TYPE_MAPPING_ID) ? 'event_type_id' : 'id';
       $query->where("r.{$valueField} IN (@selectedValues)")
@@ -186,4 +187,49 @@ public function createQuery($schedule, $phase, $defaultParams) {
     return $query;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   *
+   * @param string $entityId Either an event ID/event type ID, or a set of event IDs/types separated
+   *  by the separation character.
+   */
+  public function sendToAdditional($entityId): bool {
+    $selectedValues = (array) \CRM_Utils_Array::explodePadded($entityId);
+    switch ($this->id) {
+      case self::EVENT_TYPE_MAPPING_ID:
+        $valueTable = 'e';
+        $valueField = 'event_type_id';
+        $templateReminder = FALSE;
+        break;
+
+      case self::EVENT_NAME_MAPPING_ID:
+        $valueTable = 'e';
+        $valueField = 'id';
+        $templateReminder = FALSE;
+        break;
+
+      case self::EVENT_TPL_MAPPING_ID:
+        $valueTable = 't';
+        $valueField = 'id';
+        $templateReminder = TRUE;
+        break;
+    }
+    // Don't send to additional recipients if this event is deleted or a template.
+    $query = new \CRM_Utils_SQL_Select('civicrm_event e');
+    $query
+      ->select('e.id')
+      ->where("e.is_template = 0")
+      ->where("e.is_active = 1");
+    if ($templateReminder) {
+      $query->join('r', 'INNER JOIN civicrm_event t ON e.template_title = t.template_title AND t.is_template = 1');
+    }
+    $sql = $query
+      ->where("{$valueTable}.{$valueField} IN (@selectedValues)")
+      ->param('selectedValues', $selectedValues)
+      ->toSQL();
+    $dao = \CRM_Core_DAO::executeQuery($sql);
+    return (bool) $dao->N;
+  }
+
 }
diff --git a/CRM/Member/ActionMapping.php b/CRM/Member/ActionMapping.php
index 56db7eef4148..e42add868298 100644
--- a/CRM/Member/ActionMapping.php
+++ b/CRM/Member/ActionMapping.php
@@ -168,4 +168,12 @@ public function resetOnTriggerDateChange($schedule) {
     }
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool {
+    return TRUE;
+  }
+
 }
diff --git a/Civi/ActionSchedule/Mapping.php b/Civi/ActionSchedule/Mapping.php
index f6c1450d5644..fc0e667b4d85 100644
--- a/Civi/ActionSchedule/Mapping.php
+++ b/Civi/ActionSchedule/Mapping.php
@@ -337,4 +337,10 @@ public function resetOnTriggerDateChange($schedule) {
     return FALSE;
   }
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  abstract public function sendToAdditional($entityId): bool;
+
 }
diff --git a/Civi/ActionSchedule/MappingInterface.php b/Civi/ActionSchedule/MappingInterface.php
index 3dcd04fea133..f551fc11c196 100644
--- a/Civi/ActionSchedule/MappingInterface.php
+++ b/Civi/ActionSchedule/MappingInterface.php
@@ -139,4 +139,10 @@ public function createQuery($schedule, $phase, $defaultParams);
    */
   public function resetOnTriggerDateChange($schedule);
 
+  /**
+   * Determine whether a schedule based on this mapping should
+   * send to additional contacts.
+   */
+  public function sendToAdditional($entityId): bool;
+
 }
diff --git a/Civi/ActionSchedule/RecipientBuilder.php b/Civi/ActionSchedule/RecipientBuilder.php
index c8a32dd97e37..c52f64adbb65 100644
--- a/Civi/ActionSchedule/RecipientBuilder.php
+++ b/Civi/ActionSchedule/RecipientBuilder.php
@@ -138,7 +138,7 @@ public function __construct($now, $actionSchedule, $mapping) {
   public function build() {
     $this->buildRelFirstPass();
 
-    if ($this->prepareAddlFilter('c.id') && $this->notTemplate()) {
+    if ($this->prepareAddlFilter('c.id') && $this->mapping->sendToAdditional($this->actionSchedule->entity_value)) {
       $this->buildAddlFirstPass();
     }
 
@@ -146,7 +146,7 @@ public function build() {
       $this->buildRelRepeatPass();
     }
 
-    if ($this->actionSchedule->is_repeat && $this->prepareAddlFilter('c.id')) {
+    if ($this->actionSchedule->is_repeat && $this->prepareAddlFilter('c.id') && $this->mapping->sendToAdditional($this->actionSchedule->entity_value)) {
       $this->buildAddlRepeatPass();
     }
   }
@@ -603,25 +603,4 @@ protected function resetOnTriggerDateChange() {
     return $this->mapping->resetOnTriggerDateChange($this->actionSchedule);
   }
 
-  /**
-   * Confirm this object isn't attached to a template.
-   * Returns TRUE if this action schedule isn't attached to a template.
-   * Templates are (currently) unique to events, so we only evaluate those.
-   *
-   * @return bool;
-   */
-  private function notTemplate() {
-    if ($this->mapping->getEntity() === 'civicrm_participant') {
-      $entityId = $this->actionSchedule->entity_value;
-      $query = new \CRM_Utils_SQL_Select('civicrm_event e');
-      $sql = $query
-        ->select('is_template')
-        ->where("e.id = {$entityId}")
-        ->toSQL();
-      $dao = \CRM_Core_DAO::executeQuery($sql);
-      return !(bool) $dao->fetchValue();
-    }
-    return TRUE;
-  }
-
 }
diff --git a/tests/phpunit/api/v3/JobTest.php b/tests/phpunit/api/v3/JobTest.php
index 444714204ab9..08a0188f6ef6 100644
--- a/tests/phpunit/api/v3/JobTest.php
+++ b/tests/phpunit/api/v3/JobTest.php
@@ -330,6 +330,41 @@ public function testTemplateRemindAddlContacts() {
     $this->assertEquals(0, $successfulCronCount);
   }
 
+  /**
+   * Deleted events should not send reminders to additional contacts.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function testDeletedEventRemindAddlContacts() {
+    $contactId = $this->individualCreate();
+    $groupId = $this->groupCreate(['name' => 'Additional Contacts', 'title' => 'Additional Contacts']);
+    $this->callAPISuccess('GroupContact', 'create', [
+      'contact_id' => $contactId,
+      'group_id' => $groupId,
+    ]);
+    $event = $this->eventCreate(['title' => 'delete this event']);
+    $eventId = $event['id'];
+
+    $this->callAPISuccess('action_schedule', 'create', [
+      'title' => 'Do not send me',
+      'subject' => 'I am a reminder attached to a (soon to be) deleted event.',
+      'entity_value' => $eventId,
+      'mapping_id' => CRM_Event_ActionMapping::EVENT_NAME_MAPPING_ID,
+      'start_action_date' => 'start_date',
+      'start_action_offset' => 1,
+      'start_action_condition' => 'before',
+      'start_action_unit' => 'day',
+      'group_id' => $groupId,
+      'limit_to' => FALSE,
+      'mode' => 'Email',
+    ]);
+    $this->callAPISuccess('event', 'delete', ['id' => $eventId]);
+
+    $this->callAPISuccess('job', 'send_reminder', []);
+    $successfulCronCount = CRM_Core_DAO::singleValueQuery('SELECT count(*) FROM civicrm_action_log');
+    $this->assertEquals(0, $successfulCronCount);
+  }
+
   /**
    * Test scheduled reminders respect limit to (since above identified addition_to handling issue).
    *

From a475741355ec2dc1ae7ffbcc5cdc507ba42a99c5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 9 Sep 2020 16:18:45 +1200
Subject: [PATCH 206/834] [REF] Minor readability fix

None of the table names in this query are localisable so we don't need to use variables
to refer to them.

Note the legacy dao->query() would require it if they were localisable whereas CRM_Core_DAO::executeQuery()
does not
---
 CRM/ACL/BAO/ACL.php | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index 988340c94d42..873e6d55b7a7 100644
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -206,30 +206,25 @@ protected static function getGroupACLRoles($contact_id) {
 
     $rule = new CRM_ACL_BAO_ACL();
 
-    $aclRole = 'civicrm_acl_role';
-
-    $aclER = CRM_ACL_DAO_EntityRole::getTableName();
-    $c2g = CRM_Contact_BAO_GroupContact::getTableName();
-
     $query = "   SELECT          acl.*
                         FROM            civicrm_acl acl
                         INNER JOIN      civicrm_option_group og
                                 ON      og.name = 'acl_role'
                         INNER JOIN      civicrm_option_value ov
-                                ON      acl.entity_table   = '$aclRole'
+                                ON      acl.entity_table   = 'civicrm_acl_role'
                                 AND     ov.option_group_id  = og.id
                                 AND     acl.entity_id      = ov.value
                                 AND     ov.is_active        = 1
-                        INNER JOIN      $aclER
-                                ON      $aclER.acl_role_id = acl.entity_id
-                                AND     $aclER.is_active    = 1
-                        INNER JOIN  $c2g
-                                ON      $aclER.entity_id      = $c2g.group_id
-                                AND     $aclER.entity_table   = 'civicrm_group'
-                        WHERE       acl.entity_table       = '$aclRole'
+                        INNER JOIN      civicrm_acl_entity_role acl_entity_role
+                                ON      acl_entity_role.acl_role_id = acl.entity_id
+                                AND     acl_entity_role.is_active    = 1
+                        INNER JOIN  civicrm_group_contact group_contact
+                                ON      acl_entity_role.entity_id      = group_contact.group_id
+                                AND     acl_entity_role.entity_table   = 'civicrm_group'
+                        WHERE       acl.entity_table       = 'civicrm_acl_role'
                             AND     acl.is_active          = 1
-                            AND     $c2g.contact_id         = $contact_id
-                            AND     $c2g.status             = 'Added'";
+                            AND     group_contact.contact_id         = $contact_id
+                            AND     group_contact.status             = 'Added'";
 
     $results = [];
 

From 0931f8018a05ff2c60e8f1a05d21ef717ea8aa2c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 9 Sep 2020 14:29:47 +1200
Subject: [PATCH 207/834] Membership form test cleanup, date cleanup on form

This converts the test set up to use the api and also does some mild date clean up on the form.

Supports https://github.com/civicrm/civicrm-core/pull/18395
---
 CRM/Member/Form/Membership.php                |  16 +-
 .../CRM/Member/Form/MembershipTest.php        | 168 +++++++++++-------
 .../phpunit/CRM/Member/Form/dataset/data.xml  |  81 ---------
 3 files changed, 110 insertions(+), 155 deletions(-)
 delete mode 100644 tests/phpunit/CRM/Member/Form/dataset/data.xml

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 3c98b8570b9f..733cafbc37d2 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1058,7 +1058,7 @@ public function submit() {
     $isTest = ($this->_mode === 'test') ? 1 : 0;
     $this->storeContactFields($this->_params);
     $this->beginPostProcess();
-    $joinDate = $startDate = $endDate = NULL;
+    $endDate = NULL;
     $membershipTypes = $membership = $calcDate = [];
     $membershipType = NULL;
     $paymentInstrumentID = $this->_paymentProcessor['object']->getPaymentInstrumentID();
@@ -1177,15 +1177,9 @@ public function submit() {
       $params['exclude_is_admin'] = TRUE;
     }
 
-    // process date params to mysql date format.
-    $dateTypes = [
-      'join_date' => 'joinDate',
-      'start_date' => 'startDate',
-      'end_date' => 'endDate',
-    ];
-    foreach ($dateTypes as $dateField => $dateVariable) {
-      $$dateVariable = CRM_Utils_Date::processDate($formValues[$dateField]);
-    }
+    $joinDate = $formValues['join_date'];
+    $startDate = $formValues['start_date'];
+    $endDate = $formValues['end_date'];
 
     $memTypeNumTerms = empty($termsByType) ? CRM_Utils_Array::value('num_terms', $formValues) : NULL;
 
@@ -1200,7 +1194,7 @@ public function submit() {
     }
 
     foreach ($calcDates as $memType => $calcDate) {
-      foreach (array_keys($dateTypes) as $d) {
+      foreach (['join_date', 'start_date', 'end_date'] as $d) {
         //first give priority to form values then calDates.
         $date = $formValues[$d] ?? NULL;
         if (!$date) {
diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 593efc1152a6..0f28c333720c 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -81,24 +81,66 @@ public function setUp() {
     $this->_individualId = $this->individualCreate();
     $this->_paymentProcessorID = $this->processorCreate();
 
-    $this->loadXMLDataSet(__DIR__ . '/dataset/data.xml');
-
-    $membershipTypeAnnualFixed = $this->callAPISuccess('membership_type', 'create', [
+    $this->ids['contact']['organization'] = $this->organizationCreate();
+    $this->ids['contact']['organization2'] = $this->organizationCreate();
+    $this->ids['relationship_type']['member'] = $this->callAPISuccess('RelationshipType', 'create', [
+      'name_a_b' => 'Member of',
+      'label_a_b' => 'Member of',
+      'name_b_a' => 'Member is',
+      'label_b_a' => 'Member is',
+      'contact_type_a' => 'Individual',
+      'contact_type_b' => 'Organization',
+    ])['id'];
+    $membershipTypeAnnualFixed = $this->callAPISuccess('MembershipType', 'create', [
       'domain_id' => 1,
       'name' => 'AnnualFixed',
-      'member_of_contact_id' => 23,
+      'member_of_contact_id' => $this->ids['contact']['organization'],
       'duration_unit' => 'year',
       'minimum_fee' => 50,
       'duration_interval' => 1,
       'period_type' => 'fixed',
       'fixed_period_start_day' => '101',
       'fixed_period_rollover_day' => '1231',
-      'relationship_type_id' => 20,
+      'relationship_type_id' => [$this->ids['relationship_type']['member']],
+      'relationship_direction' => ['b_a'],
       'financial_type_id' => 2,
     ]);
     $this->membershipTypeAnnualFixedID = $membershipTypeAnnualFixed['id'];
 
-    $instruments = $this->callAPISuccess('contribution', 'getoptions', ['field' => 'payment_instrument_id']);
+    $this->ids['membership_type']['AnnualRolling'] = $this->callAPISuccess('MembershipType', 'create', [
+      'name' => 'AnnualRolling',
+      'member_of_contact_id' => $this->ids['contact']['organization'],
+      'duration_unit' => 'year',
+      'duration_interval' => 1,
+      'period_type' => 'rolling',
+      'relationship_type_id' => [$this->ids['relationship_type']['member']],
+      'relationship_direction' => ['b_a'],
+      'financial_type_id' => 'Member Dues',
+    ])['id'];
+
+    $this->ids['membership_type']['AnnualRollingOrg2'] = $this->callAPISuccess('MembershipType', 'create', [
+      'name' => 'AnnualRolling1',
+      'member_of_contact_id' => $this->ids['contact']['organization2'],
+      'duration_unit' => 'year',
+      'duration_interval' => 1,
+      'period_type' => 'rolling',
+      'relationship_type_id' => [$this->ids['relationship_type']['member']],
+      'relationship_direction' => ['b_a'],
+      'financial_type_id' => 'Member Dues',
+    ])['id'];
+
+    $this->ids['membership_type']['lifetime'] = $this->callAPISuccess('MembershipType', 'create', [
+      'name' => 'Lifetime',
+      'member_of_contact_id' => $this->ids['contact']['organization'],
+      'duration_unit' => 'lifetime',
+      'duration_interval' => 1,
+      'relationship_type_id' => $this->ids['relationship_type']['member'],
+      'relationship_direction' => 'b_a',
+      'financial_type_id' => 'Member Dues',
+      'period_type' => 'rolling',
+    ])['id'];
+
+    $instruments = $this->callAPISuccess('Contribution', 'getoptions', ['field' => 'payment_instrument_id']);
     $this->paymentInstruments = $instruments['values'];
   }
 
@@ -118,10 +160,8 @@ public function tearDown() {
         'civicrm_email',
       ]
     );
-    foreach ([17, 18, 23, 32] as $contactID) {
-      $this->callAPISuccess('contact', 'delete', ['id' => $contactID, 'skip_undelete' => TRUE]);
-    }
-    $this->callAPISuccess('relationship_type', 'delete', ['id' => 20]);
+    $this->callAPISuccess('Contact', 'delete', ['id' => $this->ids['contact']['organization'], 'skip_undelete' => TRUE]);
+    $this->callAPISuccess('RelationshipType', 'delete', ['id' => $this->ids['relationship_type']['member']]);
   }
 
   /**
@@ -129,6 +169,7 @@ public function tearDown() {
    *  that has an empty contact_select_id value
    *
    * @throws \CiviCRM_API3_Exception
+   * @throws \CRM_Core_Exception
    */
   public function testFormRuleEmptyContact() {
     $params = [
@@ -162,7 +203,7 @@ public function testFormRuleRollingEarlyStart() {
       'join_date' => date('Y-m-d'),
       'start_date' => $ymdYesterday,
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
@@ -186,7 +227,7 @@ public function testFormRuleRollingEarlyEnd() {
       'join_date' => date('Y-m-d'),
       'start_date' => date('Y-m-d'),
       'end_date' => $ymdYesterday,
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
@@ -206,11 +247,11 @@ public function testFormRuleRollingEndNoStart() {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => $ymdYearFromNow,
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
     $this->assertType('array', $rc);
     $this->assertTrue(array_key_exists('start_date', $rc));
   }
@@ -228,11 +269,11 @@ public function testFormRuleRollingLifetimeEnd() {
       'end_date' => date('Y-m-d',
         $unixYearFromNow
       ),
-      'membership_type_id' => ['23', '25'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['lifetime']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
     $this->assertType('array', $rc);
     $this->assertTrue(array_key_exists('status_id', $rc));
   }
@@ -242,16 +283,17 @@ public function testFormRuleRollingLifetimeEnd() {
    *  that has permanent override and no status
    *
    * @throws \CiviCRM_API3_Exception
+   * @throws \CRM_Core_Exception
    */
   public function testFormRulePermanentOverrideWithNoStatus() {
     $params = [
       'join_date' => date('Y-m-d'),
-      'membership_type_id' => ['23', '25'],
+      'membership_type_id' => [$this->ids['contact']['organization'], '$this->membershipTypeAnnualFixedID'],
       'is_override' => TRUE,
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
     $this->assertType('array', $rc);
     $this->assertTrue(array_key_exists('status_id', $rc));
   }
@@ -259,7 +301,7 @@ public function testFormRulePermanentOverrideWithNoStatus() {
   public function testFormRuleUntilDateOverrideWithValidOverrideEndDate() {
     $params = [
       'join_date' => date('Y-m-d'),
-      'membership_type_id' => ['23', '25'],
+      'membership_type_id' => [$this->ids['contact']['organization'], '$this->membershipTypeAnnualFixedID'],
       'is_override' => TRUE,
       'status_id' => 1,
       'status_override_end_date' => date('Y-m-d'),
@@ -273,7 +315,7 @@ public function testFormRuleUntilDateOverrideWithValidOverrideEndDate() {
   public function testFormRuleUntilDateOverrideWithNoOverrideEndDate() {
     $params = [
       'join_date' => date('Y-m-d'),
-      'membership_type_id' => ['23', '25'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'is_override' => CRM_Member_StatusOverrideTypes::UNTIL_DATE,
       'status_id' => 1,
     ];
@@ -295,11 +337,11 @@ public function testFormRuleRollingJoin1MonthFromNow() {
       'join_date' => date('Y-m-d', $unix1MFmNow),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     // Should have found no valid membership status.
     $this->assertType('array', $rc);
@@ -314,11 +356,11 @@ public function testFormRuleRollingJoinToday() {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     //  Should have found New membership status
     $this->assertTrue($rc);
@@ -335,11 +377,11 @@ public function testFormRuleRollingJoin1MonthAgo() {
       'join_date' => date('Y-m-d', $unix1MAgo),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     // Should have found New membership status.
     $this->assertTrue($rc);
@@ -355,11 +397,11 @@ public function testFormRuleRollingJoin6MonthsAgo() {
       'join_date' => date('Y-m-d', $unix6MAgo),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     // Should have found Current membership status.
     $this->assertTrue($rc);
@@ -376,11 +418,11 @@ public function testFormRuleRollingJoin1YearAgo() {
       'join_date' => date('Y-m-d', $unix1YAgo),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     //  Should have found Grace membership status
     $this->assertTrue($rc);
@@ -397,11 +439,11 @@ public function testFormRuleRollingJoin2YearsAgo() {
       'join_date' => date('Y-m-d', $unix2YAgo),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '15'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->ids['membership_type']['AnnualRolling']],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     //  Should have found Expired membership status
     $this->assertTrue($rc);
@@ -418,11 +460,11 @@ public function testFormRuleFixedJoin6MonthsAgo() {
       'join_date' => date('Y-m-d', $unix6MAgo),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => ['23', '7'],
+      'membership_type_id' => [$this->ids['contact']['organization'], '7'],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = $obj->formRule($params, $files, $obj);
+    $rc = $obj::formRule($params, $files, $obj);
 
     //  Should have found Current membership status
     $this->assertTrue($rc);
@@ -449,8 +491,8 @@ public function testSubmit($thousandSeparator) {
       'join_date' => date('2/d/Y'),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the organisation & then the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
       'max_related' => '',
       'num_terms' => '1',
@@ -552,8 +594,8 @@ public function testContributionUpdateOnMembershipTypeChange() {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the first being the organisation & the $this->membershipTypeAnnualFixedID being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'record_contribution' => 1,
       'total_amount' => 50,
       'receive_date' => date('Y-m-d', time()) . ' 20:36:00',
@@ -579,7 +621,7 @@ public function testContributionUpdateOnMembershipTypeChange() {
     $secondMembershipType = $this->callAPISuccess('membership_type', 'create', [
       'domain_id' => 1,
       'name' => 'Second Test Membership',
-      'member_of_contact_id' => 23,
+      'member_of_contact_id' => $this->ids['contact']['organization'],
       'duration_unit' => 'month',
       'minimum_fee' => 25,
       'duration_interval' => 1,
@@ -601,8 +643,8 @@ public function testContributionUpdateOnMembershipTypeChange() {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $secondMembershipType['id']],
+      // This format reflects the first number being the organisation & the 25 being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $secondMembershipType['id']],
       'record_contribution' => 1,
       'status_id' => 1,
       'total_amount' => 25,
@@ -619,8 +661,8 @@ public function testContributionUpdateOnMembershipTypeChange() {
     $contribution = $this->callAPISuccessGetSingle('Contribution', [
       'contact_id' => $this->_individualId,
     ]);
-    $payment = CRM_Contribute_BAO_Contribution::getPaymentInfo($membership['id'], 'membership', FALSE, TRUE);
-    // Check the contribution status on membership type change whose minimum fee was less than earlier memebership
+    $payment = CRM_Contribute_BAO_Contribution::getPaymentInfo($membership['id'], 'membership', FALSE);
+    // Check the contribution status on membership type change whose minimum fee was less than earlier membership
     $this->assertEquals('Pending refund', $contribution['contribution_status']);
     // Earlier paid amount
     $this->assertEquals(50, $payment['paid']);
@@ -655,8 +697,8 @@ public function testSubmitPartialPayment($thousandSeparator) {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the first number being the organisation & the second being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'receive_date' => date('Y-m-d', time()) . ' 20:36:00',
       'record_contribution' => 1,
       'total_amount' => $this->formatMoneyInput(50),
@@ -827,8 +869,8 @@ public function testSubmitPayLaterWithBilling() {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the first number being the organisation & the second being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '0',
       'max_related' => '',
       'num_terms' => '2',
@@ -1029,10 +1071,10 @@ public function testFormWithFailedContribution() {
   public function testTwoInheritedMembershipsViaPriceSetInBackend() {
     // Create an organization and give it a "Member of" relationship to $this->_individualId.
     $orgID = $this->organizationCreate();
-    $relationship = $this->callAPISuccess('relationship', 'create', [
+    $relationship = $this->callAPISuccess('Relationship', 'create', [
       'contact_id_a' => $this->_individualId,
       'contact_id_b' => $orgID,
-      'relationship_type_id' => 20,
+      'relationship_type_id' => $this->ids['relationship_type']['member'],
       'is_active' => 1,
     ]);
 
@@ -1043,7 +1085,7 @@ public function testTwoInheritedMembershipsViaPriceSetInBackend() {
     $orgMembershipResult = $this->callAPISuccess('membership', 'get', [
       'contact_id' => $orgID,
     ]);
-    $this->assertEquals(2, $orgMembershipResult['count'], "2 primary memberships should have been created on the organization.");
+    $this->assertEquals(2, $orgMembershipResult['count'], '2 primary memberships should have been created on the organization.');
     $primaryMembershipIds = [];
     foreach ($orgMembershipResult['values'] as $membership) {
       $primaryMembershipIds[] = $membership['id'];
@@ -1140,7 +1182,7 @@ public function buildAmountMembershipDiscount($pageType, &$form, &$amount) {
     foreach ($amount as $id => $priceField) {
       if (is_array($priceField['options'])) {
         foreach ($priceField['options'] as $optionId => $option) {
-          if ($option['membership_type_id'] == 15) {
+          if ($option['membership_type_id'] == $this->ids['membership_type']['AnnualRolling']) {
             // Long Haired Goat membership discount.
             $amount[$id]['options'][$optionId]['amount'] = $option['amount'] * 0.75;
             $amount[$id]['options'][$optionId]['label'] = $option['label'] . ' - one leg free!';
@@ -1179,8 +1221,8 @@ protected function getBaseSubmitParams() {
       'start_date' => '',
       'end_date' => '',
       'campaign_id' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the first number being the organisation & the second being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'auto_renew' => '1',
       'is_recur' => 1,
       'max_related' => 0,
@@ -1249,7 +1291,7 @@ protected function createTwoMembershipsViaPriceSetInBackEnd($contactId) {
       'label' => 'Long Haired Goat',
       'amount' => 20,
       'financial_type_id' => 'Donation',
-      'membership_type_id' => 15,
+      'membership_type_id' => $this->ids['membership_type']['AnnualRolling'],
       'membership_num_terms' => 1,
     ]);
     $pfvIDs = [$priceFieldValue['id'] => 1];
@@ -1259,7 +1301,7 @@ protected function createTwoMembershipsViaPriceSetInBackEnd($contactId) {
       'label' => 'Shoe-eating Goat',
       'amount' => 10,
       'financial_type_id' => 'Donation',
-      'membership_type_id' => 35,
+      'membership_type_id' => $this->ids['membership_type']['AnnualRollingOrg2'],
       'membership_num_terms' => 2,
     ]);
     $pfvIDs[$priceFieldValue['id']] = 1;
@@ -1272,7 +1314,7 @@ protected function createTwoMembershipsViaPriceSetInBackEnd($contactId) {
       'end_date' => '',
       // This format reflects the 23 being the organisation & the 25 being the type.
       "price_$priceFieldID" => $pfvIDs,
-      "price_set_id" => $priceSetID,
+      'price_set_id' => $priceSetID,
       'membership_type_id' => [1 => 0],
       'auto_renew' => '0',
       'max_related' => '',
@@ -1367,7 +1409,7 @@ public function testLineItemAmountOnSalesTax() {
     $priceSet = $this->callAPISuccess('PriceSet', 'Get', ['extends' => 'CiviMember']);
     $form->set('priceSetId', $priceSet['id']);
     // we are simulating the creation of a Price Set in Administer -> CiviContribute -> Manage Price Sets so set is_quick_config = 0
-    $this->callAPISuccess('PriceSet', 'Create', ["id" => $priceSet['id'], 'is_quick_config' => 0]);
+    $this->callAPISuccess('PriceSet', 'Create', ['id' => $priceSet['id'], 'is_quick_config' => 0]);
     // clean the price options static variable to repopulate the options, in order to fetch tax information
     \Civi::$statics['CRM_Price_BAO_PriceField']['priceOptions'] = NULL;
     CRM_Price_BAO_PriceSet::buildPriceSet($form);
@@ -1378,8 +1420,8 @@ public function testLineItemAmountOnSalesTax() {
       'join_date' => date('Y-m-d'),
       'start_date' => '',
       'end_date' => '',
-      // This format reflects the 23 being the organisation & the 25 being the type.
-      'membership_type_id' => [23, $this->membershipTypeAnnualFixedID],
+      // This format reflects the first number being the organisation & the second being the type.
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'record_contribution' => 1,
       'total_amount' => 55,
       'receive_date' => date('Y-m-d') . ' 20:36:00',
@@ -1452,11 +1494,11 @@ public function testCreatePendingWithMultipleTerms() {
     $membershipTypeAnnualRolling = $this->callAPISuccess('membership_type', 'create', [
       'domain_id' => 1,
       'name' => 'AnnualRollingNew',
-      'member_of_contact_id' => 23,
-      'duration_unit' => "year",
+      'member_of_contact_id' => $this->ids['contact']['organization'],
+      'duration_unit' => 'year',
       'minimum_fee' => 50,
       'duration_interval' => 1,
-      'period_type' => "rolling",
+      'period_type' => 'rolling',
       'relationship_type_id' => 20,
       'relationship_direction' => 'b_a',
       'financial_type_id' => 2,
@@ -1467,7 +1509,7 @@ public function testCreatePendingWithMultipleTerms() {
       'start_date' => '',
       'end_date' => '',
       'contribution_status_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending'),
-      'membership_type_id' => [23, $membershipTypeAnnualRolling['id']],
+      'membership_type_id' => [$this->ids['contact']['organization'], $membershipTypeAnnualRolling['id']],
       'max_related' => '',
       'num_terms' => '3',
       'record_contribution' => 1,
diff --git a/tests/phpunit/CRM/Member/Form/dataset/data.xml b/tests/phpunit/CRM/Member/Form/dataset/data.xml
deleted file mode 100644
index 852719316b80..000000000000
--- a/tests/phpunit/CRM/Member/Form/dataset/data.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--  $Id: data.xml 43570 2012-11-09 12:03:45Z deepak $ -->
-<dataset>
-  <civicrm_contact
-    id="17"
-    contact_type="Individual"
-    is_opt_out="0"
-    display_name="Joe Blow"
-    sort_name="Blow, Joe"
-    first_name="Joe"
-    last_name="Blow"
-  />
-  <civicrm_contact
-    id="18"
-    contact_type="Individual"
-    is_opt_out="0"
-    display_name="Alex Blow"
-    sort_name="Blow, Alex"
-    first_name="Alex"
-    last_name="Blow"
-  />
-  <civicrm_contact
-    id="23"
-    contact_type="Organization"
-    is_opt_out="0"
-    display_name="Save The Dollars"
-    organization_name="Save The Dollars"
-  />
-  <civicrm_contact
-    id="32"
-    contact_type="Organization"
-    is_opt_out="0"
-    display_name="Save The Rupees"
-    organization_name="Save The Rupees"
-  />
-
-  <civicrm_relationship_type
-    id="20"
-    name_a_b="Member of"
-    label_a_b="Member of"
-    name_b_a="Member is"
-    label_b_a="Member is"
-    contact_type_a="Individual"
-    contact_type_b="Organization"
-    is_active="1"
-  />
-  <civicrm_membership_type
-    id="15"
-    domain_id="1"
-    name="AnnualRolling"
-    member_of_contact_id="23"
-    duration_unit="year"
-    duration_interval="1"
-    period_type="rolling"
-    relationship_type_id="20"
-    relationship_direction="b_a"
-    financial_type_id="2"
-  />
-  <civicrm_membership_type
-    id="25"
-    domain_id="1"
-    name="Lifetime"
-    member_of_contact_id="23"
-    duration_unit="lifetime"
-    relationship_type_id="20"
-    relationship_direction="b_a"
-    financial_type_id="2"
-  />
-  <civicrm_membership_type
-    id="35"
-    domain_id="1"
-    name="AnnualRolling1"
-    member_of_contact_id="32"
-    duration_unit="year"
-    duration_interval="1"
-    period_type="rolling"
-    relationship_type_id="20"
-    relationship_direction="b_a"
-    financial_type_id="2"
-  />
-</dataset>

From f961a8cde5f2c4d696315b8ebe2126b86969f5f6 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 9 Sep 2020 13:08:52 +1000
Subject: [PATCH 208/834] [REF] Refactor price field form to allow for unit
 testing of the form

Set the assert equals to be an actual float number
---
 CRM/Price/Form/Field.php                   | 44 +++++++++++++---------
 tests/phpunit/CRM/Price/Form/FieldTest.php | 30 +++++++++++++++
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php
index 023066db68b5..de3b607e3b98 100644
--- a/CRM/Price/Form/Field.php
+++ b/CRM/Price/Form/Field.php
@@ -77,6 +77,13 @@ public function getEntityId() {
    */
   protected $_useForMember;
 
+  /**
+   * Set the price Set Id (only used in tests)
+   */
+  public function setPriceSetId($priceSetId) {
+    $this->_sid = $priceSetId;
+  }
+
   /**
    * Set variables up before form is built.
    */
@@ -641,6 +648,25 @@ public static function formRule($fields, $files, $form) {
   public function postProcess() {
     // store the submitted values in an array
     $params = $this->controller->exportValues('Field');
+    $params['id'] = $this->getEntityId();
+    $priceField = $this->submit($params);
+    if (!is_a($priceField, 'CRM_Core_Error')) {
+      // Required by extensions implementing the postProcess hook (to get the ID of new entities)
+      $this->setEntityId($priceField->id);
+      CRM_Core_Session::setStatus(ts('Price Field \'%1\' has been saved.', [1 => $priceField->label]), ts('Saved'), 'success');
+    }
+    $buttonName = $this->controller->getButtonName();
+    $session = CRM_Core_Session::singleton();
+    if ($buttonName == $this->getButtonName('next', 'new')) {
+      CRM_Core_Session::setStatus(ts(' You can add another price set field.'), '', 'info');
+      $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=add&sid=' . $this->_sid));
+    }
+    else {
+      $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=browse&sid=' . $this->_sid));
+    }
+  }
+
+  public function submit($params) {
     $params['price'] = CRM_Utils_Rule::cleanMoney($params['price']);
     foreach ($params['option_amount'] as $key => $amount) {
       $params['option_amount'][$key] = CRM_Utils_Rule::cleanMoney($amount);
@@ -686,26 +712,10 @@ public function postProcess() {
       $params['option_visibility_id'] = [1 => CRM_Utils_Array::value('visibility_id', $params)];
     }
 
-    $params['id'] = $this->getEntityId();
-
     $params['membership_num_terms'] = (!empty($params['membership_type_id'])) ? CRM_Utils_Array::value('membership_num_terms', $params, 1) : NULL;
 
     $priceField = CRM_Price_BAO_PriceField::create($params);
-
-    if (!is_a($priceField, 'CRM_Core_Error')) {
-      // Required by extensions implementing the postProcess hook (to get the ID of new entities)
-      $this->setEntityId($priceField->id);
-      CRM_Core_Session::setStatus(ts('Price Field \'%1\' has been saved.', [1 => $priceField->label]), ts('Saved'), 'success');
-    }
-    $buttonName = $this->controller->getButtonName();
-    $session = CRM_Core_Session::singleton();
-    if ($buttonName == $this->getButtonName('next', 'new')) {
-      CRM_Core_Session::setStatus(ts(' You can add another price set field.'), '', 'info');
-      $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=add&sid=' . $this->_sid));
-    }
-    else {
-      $session->replaceUserContext(CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=browse&sid=' . $this->_sid));
-    }
+    return $priceField;
   }
 
 }
diff --git a/tests/phpunit/CRM/Price/Form/FieldTest.php b/tests/phpunit/CRM/Price/Form/FieldTest.php
index f7ba89f11d17..e4c71d881900 100644
--- a/tests/phpunit/CRM/Price/Form/FieldTest.php
+++ b/tests/phpunit/CRM/Price/Form/FieldTest.php
@@ -57,6 +57,35 @@ public function testAdminFieldDoesNotAllowPublicOptions() {
     $this->assertTrue(array_key_exists('visibility_id', $validationResult));
   }
 
+  /**
+   * Test submitting a large float value is stored correctly in the db.
+   *
+   * @param string $thousandSeparator
+   *   punctuation used to refer to thousands.
+   *
+   * @dataProvider getThousandSeparators
+   */
+  public function testLargeFloatOptionValue($thousandSeparator) {
+    $this->setCurrencySeparators($thousandSeparator);
+    $thousands = Civi::settings()->get('monetaryThousandSeparator');
+    $decimal = Civi::settings()->get('monetaryDecimalPoint');
+    $paramsSet['title'] = 'Price Set' . substr(sha1(rand()), 0, 7);
+    $paramsSet['name'] = CRM_Utils_String::titleToVar($paramsSet['title']);
+    $paramsSet['is_active'] = TRUE;
+    $paramsSet['financial_type_id'] = 'Event Fee';
+    $paramsSet['extends'] = 1;
+    $priceSet = $this->callAPISuccess('price_set', 'create', $paramsSet);
+    $form = new CRM_Price_Form_Field();
+    $form->_action = CRM_Core_Action::ADD;
+    $form->setPriceSetId($priceSet['id']);
+    $this->publicFieldParams['option_label'][1] = 'Large Float';
+    $this->publicFieldParams['option_amount'][1] = '123' . $thousands . '456' . $thousands . '789' . $decimal . '987654321';
+    $this->publicFieldParams['option_visibility_id'][1] = $this->visibilityOptionsKeys['public'];
+    $priceField = $form->submit($this->publicFieldParams);
+    $priceOptions = $this->callAPISuccess('PriceFieldValue', 'get', ['price_field_id' => $priceField->id]);
+    $this->assertEquals(123456789.987654321, $priceOptions['values'][$priceOptions['id']]['amount']);
+  }
+
   private function initializeFieldParameters($params) {
     $defaultParams = [
       'label' => 'Price Field',
@@ -68,6 +97,7 @@ private function initializeFieldParameters($params) {
       'is_enter_qty' => 1,
       'financial_type_id' => $this->getFinancialTypeId('Event Fee'),
       'visibility_id' => $this->visibilityOptionsKeys['public'],
+      'price' => 10,
     ];
 
     for ($index = 1; $index <= CRM_Price_Form_Field::NUM_OPTION; $index++) {

From 4cbe461a4d4c66220fd91c5609945ac042c9fcfa Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 9 Sep 2020 18:15:18 +1200
Subject: [PATCH 209/834] dev/financial#86 Make 'Record Payment' & 'Record
 Refund' visible regardless of whether the balance 'requires' one

This was agreed about a year ago - might as well do it
---
 CRM/Contribute/BAO/Contribution.php | 34 +++++++++++------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 3de7326172e1..018e99b27a31 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -5201,35 +5201,27 @@ protected static function getContributionPaymentLinks($id, $balance, $contributi
       'title' => ts('Record Payment'),
     ];
 
-    if ((int) $balance > 0) {
-      // @todo - this should be possible even if not > 0 - test & remove this if.
-      // it is possible to 'overpay' in the real world & we honor that.
-      if (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
-        $actionLinks[] = [
-          'url' => CRM_Utils_System::url('civicrm/payment', [
-            'action' => 'add',
-            'reset' => 1,
-            'is_refund' => 0,
-            'id' => $id,
-            'mode' => 'live',
-          ]),
-          'title' => ts('Submit Credit Card payment'),
-        ];
-      }
-    }
-    elseif ((int) $balance < 0) {
-      // @todo - in the future remove this IF - OK to refund money even when not due since
-      // ... life.
+    if (CRM_Core_Config::isEnabledBackOfficeCreditCardPayments()) {
       $actionLinks[] = [
         'url' => CRM_Utils_System::url('civicrm/payment', [
           'action' => 'add',
           'reset' => 1,
+          'is_refund' => 0,
           'id' => $id,
-          'is_refund' => 1,
+          'mode' => 'live',
         ]),
-        'title' => ts('Record Refund'),
+        'title' => ts('Submit Credit Card payment'),
       ];
     }
+    $actionLinks[] = [
+      'url' => CRM_Utils_System::url('civicrm/payment', [
+        'action' => 'add',
+        'reset' => 1,
+        'id' => $id,
+        'is_refund' => 1,
+      ]),
+      'title' => ts('Record Refund'),
+    ];
     return $actionLinks;
   }
 

From 0dcc88fc1b54e4e36ee685782c0fa93feccd8d35 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 9 Sep 2020 19:24:52 +1200
Subject: [PATCH 210/834] Extract failContribution code

Basic extraction
---
 CRM/Contribute/BAO/Contribution.php | 118 +++++++++++++++++-----------
 1 file changed, 73 insertions(+), 45 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 62f101260e6b..fa268614ffb2 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -1350,6 +1350,78 @@ protected static function isEmailReceipt(array $input, $contributionPageID, $rec
     return TRUE;
   }
 
+  /**
+   * Process failed contribution.
+   *
+   * @param $processContributionObject
+   * @param $memberships
+   * @param $contributionId
+   * @param array $membershipStatuses
+   * @param array $updateResult
+   * @param $participant
+   * @param $pledgePayment
+   * @param $pledgeID
+   * @param array $pledgePaymentIDs
+   * @param $contributionStatusId
+   *
+   * @return array
+   * @throws \CRM_Core_Exception
+   */
+  protected static function processFail($processContributionObject, $memberships, $contributionId, array $membershipStatuses, array $updateResult, $participant, $pledgePayment, $pledgeID, array $pledgePaymentIDs, $contributionStatusId): array {
+    $processContribution = FALSE;
+    if (is_array($memberships)) {
+      foreach ($memberships as $membership) {
+        $update = TRUE;
+        //Update Membership status if there is no other completed contribution associated with the membership.
+        $relatedContributions = CRM_Member_BAO_Membership::getMembershipContributionId($membership->id, TRUE);
+        foreach ($relatedContributions as $contriId) {
+          if ($contriId == $contributionId) {
+            continue;
+          }
+          $statusId = CRM_Core_DAO::getFieldValue('CRM_Contribute_BAO_Contribution', $contriId, 'contribution_status_id');
+          if (CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $statusId) === 'Completed') {
+            $update = FALSE;
+          }
+        }
+        if ($membership && $update) {
+          $membership->status_id = array_search('Expired', $membershipStatuses);
+          $membership->is_override = TRUE;
+          $membership->status_override_end_date = 'null';
+          $membership->save();
+
+          $updateResult['updatedComponents']['CiviMember'] = $membership->status_id;
+          if ($processContributionObject) {
+            $processContribution = TRUE;
+          }
+        }
+      }
+    }
+    if ($participant) {
+      $oldStatus = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant',
+        $participant->id,
+        'status_id'
+      );
+      $participantStatuses = CRM_Event_PseudoConstant::participantStatus();
+      $updatedStatusId = array_search('Cancelled', $participantStatuses);
+      CRM_Event_BAO_Participant::updateParticipantStatus($participant->id, $oldStatus, $updatedStatusId, TRUE);
+
+      $updateResult['updatedComponents']['CiviEvent'] = $updatedStatusId;
+      if ($processContributionObject) {
+        $processContribution = TRUE;
+      }
+    }
+
+    if ($pledgePayment) {
+      CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID, $pledgePaymentIDs, $contributionStatusId);
+
+      $updateResult['updatedComponents']['CiviPledge'] = $contributionStatusId;
+      if ($processContributionObject) {
+        $processContribution = TRUE;
+      }
+    }
+    return [$updateResult, $processContribution];
+  }
+
   /**
    * @inheritDoc
    */
@@ -2161,51 +2233,7 @@ public static function transitionComponents($params, $processContributionObject
       list($updateResult, $processContribution) = self::cancel($processContributionObject, $memberships, $contributionId, $membershipStatuses, $updateResult, $participant, $oldStatus, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId);
     }
     elseif ($contributionStatusId == array_search('Failed', $contributionStatuses)) {
-      if (is_array($memberships)) {
-        foreach ($memberships as $membership) {
-          $update = TRUE;
-          //Update Membership status if there is no other completed contribution associated with the membership.
-          $relatedContributions = CRM_Member_BAO_Membership::getMembershipContributionId($membership->id, TRUE);
-          foreach ($relatedContributions as $contriId) {
-            if ($contriId == $contributionId) {
-              continue;
-            }
-            $statusId = CRM_Core_DAO::getFieldValue('CRM_Contribute_BAO_Contribution', $contriId, 'contribution_status_id');
-            if (CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $statusId) === 'Completed') {
-              $update = FALSE;
-            }
-          }
-          if ($membership && $update) {
-            $membership->status_id = array_search('Expired', $membershipStatuses);
-            $membership->is_override = TRUE;
-            $membership->status_override_end_date = 'null';
-            $membership->save();
-
-            $updateResult['updatedComponents']['CiviMember'] = $membership->status_id;
-            if ($processContributionObject) {
-              $processContribution = TRUE;
-            }
-          }
-        }
-      }
-      if ($participant) {
-        $updatedStatusId = array_search('Cancelled', $participantStatuses);
-        CRM_Event_BAO_Participant::updateParticipantStatus($participant->id, $oldStatus, $updatedStatusId, TRUE);
-
-        $updateResult['updatedComponents']['CiviEvent'] = $updatedStatusId;
-        if ($processContributionObject) {
-          $processContribution = TRUE;
-        }
-      }
-
-      if ($pledgePayment) {
-        CRM_Pledge_BAO_PledgePayment::updatePledgePaymentStatus($pledgeID, $pledgePaymentIDs, $contributionStatusId);
-
-        $updateResult['updatedComponents']['CiviPledge'] = $contributionStatusId;
-        if ($processContributionObject) {
-          $processContribution = TRUE;
-        }
-      }
+      list($updateResult, $processContribution) = self::processFail($processContributionObject, $memberships, $contributionId, $membershipStatuses, $updateResult, $participant, $pledgePayment, $pledgeID, $pledgePaymentIDs, $contributionStatusId);
     }
     elseif ($contributionStatusId == array_search('Completed', $contributionStatuses)) {
 

From 8d30e9c75b9342171784d06b703e7b7e9365701f Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Wed, 9 Sep 2020 15:48:32 -0400
Subject: [PATCH 211/834] add custom fields to contribution details

---
 CRM/Report/Form/Member/ContributionDetail.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
index 69dd87b8c872..882e80d903fa 100644
--- a/CRM/Report/Form/Member/ContributionDetail.php
+++ b/CRM/Report/Form/Member/ContributionDetail.php
@@ -22,6 +22,9 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form {
     'Contribution',
     'Membership',
     'Contact',
+    'Individual',
+    'Household',
+    'Organization',
   ];
 
   /**

From 0524826d4001746250211eb772f6412c5266311a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 7 Sep 2020 14:03:50 +1200
Subject: [PATCH 212/834] Make period_type mandatory for MembershipType

We have a test ensuring period_type is mandatory at the api level. However, it isn't for api
v4 - the error is a different issue (handling of pseudoconstants when mapping v3 to v4). This
fixes that separate issue & declares required to re-fix for v4
---
 CRM/Core/DAO/CustomField.php                  |  2 +-
 CRM/Member/DAO/MembershipType.php             |  3 +-
 .../Incremental/sql/5.31.alpha1.mysql.tpl     |  5 +++
 Civi/Test/Api3TestTrait.php                   |  3 ++
 tests/phpunit/CiviTest/CiviUnitTestCase.php   | 24 ++++++------
 tests/phpunit/api/v3/MembershipTypeTest.php   |  2 +-
 .../api/v3/PaymentProcessorTypeTest.php       | 38 +++++++++++++------
 xml/schema/Member/MembershipType.xml          |  1 +
 8 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 6cae23bea076..698d34a4956d 100644
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1acb9b3538bd3005b99e6af6d9ec062f)
+ * (GenCodeChecksum:4ded3c0d1a8e34502a5957ee74c4480a)
  */
 
 /**
diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php
index 4b1d6ce509eb..4f5cad0e296a 100644
--- a/CRM/Member/DAO/MembershipType.php
+++ b/CRM/Member/DAO/MembershipType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:713057d2c1a6dcb6cbd6449b8934d28c)
+ * (GenCodeChecksum:7c5220444512f1aa499454e977f27814)
  */
 
 /**
@@ -376,6 +376,7 @@ public static function &fields() {
           'type' => CRM_Utils_Type::T_STRING,
           'title' => ts('Membership Type Plan'),
           'description' => ts('Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'),
+          'required' => TRUE,
           'maxlength' => 8,
           'size' => CRM_Utils_Type::EIGHT,
           'where' => 'civicrm_membership_type.period_type',
diff --git a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
index 663ae49a2678..e87793f05151 100644
--- a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
@@ -3,3 +3,8 @@
 {* Remove Country & State special select fields *}
 UPDATE civicrm_custom_field SET html_type = 'Select'
 WHERE html_type IN ('Select Country', 'Select State/Province');
+
+{* make period_type required - it already is so the update is precautionary *}
+UPDATE civicrm_membership_type SET period_type = 'rolling' WHERE period_type IS NULL;
+ALTER TABLE civicrm_membership_type MODIFY `period_type` varchar(8) NOT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'
+
diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php
index ed3557babe96..2ce8d75d0e58 100644
--- a/Civi/Test/Api3TestTrait.php
+++ b/Civi/Test/Api3TestTrait.php
@@ -405,6 +405,9 @@ public function runApi4Legacy($v3Entity, $v3Action, $v3Params = []) {
         $v3Params['option_group.name'] = $v3Params['option_group_id'];
         unset($v3Params['option_group_id']);
       }
+      if (isset($field['pseudoconstant'], $v3Params[$name]) && $field['type'] === \CRM_Utils_Type::T_INT && !is_numeric($v3Params[$name])) {
+        $v3Params[$name] = \CRM_Core_PseudoConstant::getKey(\CRM_Core_DAO_AllCoreTables::getFullName($v3Entity), $name, $v3Params[$name]);
+      }
     }
 
     switch ($v3Action) {
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index cf2f3fbffb14..0930fb4f1e50 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -727,19 +727,17 @@ public function relationshipTypeDelete($relationshipTypeID) {
    * @return mixed
    * @throws \CRM_Core_Exception
    */
-  public function paymentProcessorTypeCreate($params = NULL) {
-    if (is_null($params)) {
-      $params = [
-        'name' => 'API_Test_PP',
-        'title' => 'API Test Payment Processor',
-        'class_name' => 'CRM_Core_Payment_APITest',
-        'billing_mode' => 'form',
-        'is_recur' => 0,
-        'is_reserved' => 1,
-        'is_active' => 1,
-      ];
-    }
-    $result = $this->callAPISuccess('payment_processor_type', 'create', $params);
+  public function paymentProcessorTypeCreate($params = []) {
+    $params = array_merge([
+      'name' => 'API_Test_PP',
+      'title' => 'API Test Payment Processor',
+      'class_name' => 'CRM_Core_Payment_APITest',
+      'billing_mode' => 'form',
+      'is_recur' => 0,
+      'is_reserved' => 1,
+      'is_active' => 1,
+    ], $params);
+    $result = $this->callAPISuccess('PaymentProcessorType', 'create', $params);
 
     CRM_Core_PseudoConstant::flush('paymentProcessorType');
 
diff --git a/tests/phpunit/api/v3/MembershipTypeTest.php b/tests/phpunit/api/v3/MembershipTypeTest.php
index d20a639b6f16..cb25518fc8c4 100644
--- a/tests/phpunit/api/v3/MembershipTypeTest.php
+++ b/tests/phpunit/api/v3/MembershipTypeTest.php
@@ -171,7 +171,7 @@ public function testCreateWithoutDomainId($version) {
    *
    * @param bool $version
    */
-  public function testMemberTypePeriodiTypeRequired($version) {
+  public function testMemberTypePeriodTypeRequired($version) {
     $this->_apiversion = $version;
     $this->callAPIFailure('MembershipType', 'create', [
       'domain_id' => 'Default Domain Name',
diff --git a/tests/phpunit/api/v3/PaymentProcessorTypeTest.php b/tests/phpunit/api/v3/PaymentProcessorTypeTest.php
index 13b0362a5114..cd5760a5ac73 100644
--- a/tests/phpunit/api/v3/PaymentProcessorTypeTest.php
+++ b/tests/phpunit/api/v3/PaymentProcessorTypeTest.php
@@ -48,7 +48,10 @@ public function testPaymentProcessorTypeCreateWithoutName($version) {
 
   /**
    * Create payment processor type.
+   *
    * @dataProvider versionThreeAndFour
+   *
+   * @param int $version
    */
   public function testPaymentProcessorTypeCreate($version) {
     $this->_apiversion = $version;
@@ -60,7 +63,7 @@ public function testPaymentProcessorTypeCreate($version) {
       'billing_mode' => 'form',
       'is_recur' => 0,
     ];
-    $result = $this->callAPIAndDocument('payment_processor_type', 'create', $params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument('PaymentProcessorType', 'create', $params, __FUNCTION__, __FILE__);
     $this->assertNotNull($result['values'][0]['id']);
 
     // mutate $params to match expected return value
@@ -84,17 +87,22 @@ public function testPaymentProcessorTypeCreateExample() {
 
   /**
    * Check with empty array.
+   *
    * @dataProvider versionThreeAndFour
+   *
+   * @param int $version
    */
   public function testPaymentProcessorTypeDeleteEmpty($version) {
     $this->_apiversion = $version;
-    $params = [];
-    $result = $this->callAPIFailure('payment_processor_type', 'delete', $params);
+    $this->callAPIFailure('PaymentProcessorType', 'delete', []);
   }
 
   /**
    * Check if required fields are not passed.
+   *
    * @dataProvider versionThreeAndFour
+   *
+   * @param int $version
    */
   public function testPaymentProcessorTypeDeleteWithoutRequired($version) {
     $this->_apiversion = $version;
@@ -110,37 +118,43 @@ public function testPaymentProcessorTypeDeleteWithoutRequired($version) {
 
   /**
    * Check with incorrect required fields.
+   *
    * @dataProvider versionThreeAndFour
+   *
+   * @param int $version
    */
   public function testPaymentProcessorTypeDeleteWithIncorrectData($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPIFailure('payment_processor_type', 'delete', ['id' => 'abcd']);
+    $this->callAPIFailure('payment_processor_type', 'delete', ['id' => 'abcd']);
   }
 
   /**
    * Check payment processor type delete.
+   *
    * @dataProvider versionThreeAndFour
+   *
+   * @param $version
+   *
+   * @throws \CRM_Core_Exception
    */
   public function testPaymentProcessorTypeDelete($version) {
     $this->_apiversion = $version;
-    $payProcType = $this->paymentProcessorTypeCreate();
-    $params = [
-      'id' => $payProcType,
-    ];
-
-    $result = $this->callAPIAndDocument('payment_processor_type', 'delete', $params, __FUNCTION__, __FILE__);
+    $this->callAPIAndDocument('PaymentProcessorType', 'delete', ['id' => $this->paymentProcessorTypeCreate()], __FUNCTION__, __FILE__);
   }
 
   ///////////////// civicrm_payment_processor_type_update
 
   /**
    * Check with empty array.
+   *
    * @dataProvider versionThreeAndFour
+   *
+   * @param int $version
    */
   public function testPaymentProcessorTypeUpdateEmpty($version) {
     $this->_apiversion = $version;
     $params = [];
-    $result = $this->callAPIFailure('payment_processor_type', 'create', $params);
+    $result = $this->callAPIFailure('PaymentProcessorType', 'create', $params);
     $this->assertContains('name, title, class_name, billing_mode', $result['error_message']);
   }
 
@@ -151,7 +165,7 @@ public function testPaymentProcessorTypeUpdateEmpty($version) {
   public function testPaymentProcessorTypeUpdate($version) {
     $this->_apiversion = $version;
     // create sample payment processor type.
-    $this->_ppTypeID = $this->paymentProcessorTypeCreate(NULL);
+    $this->_ppTypeID = $this->paymentProcessorTypeCreate();
 
     $params = [
       'id' => $this->_ppTypeID,
diff --git a/xml/schema/Member/MembershipType.xml b/xml/schema/Member/MembershipType.xml
index cd528adaf26f..fbae25e8d494 100644
--- a/xml/schema/Member/MembershipType.xml
+++ b/xml/schema/Member/MembershipType.xml
@@ -145,6 +145,7 @@
     <title>Membership Type Plan</title>
     <type>varchar</type>
     <length>8</length>
+    <required>true</required>
     <comment>Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.</comment>
     <html>
       <type>Select</type>

From 508511d1a7096084f96d5ff365869c2570e1827a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 08:53:26 +1200
Subject: [PATCH 213/834] dev/core#1921 Remove more instances of civi 4.2 date
 handling

Per https://lab.civicrm.org/dev/core/-/issues/1921
---
 CRM/Member/BAO/Membership.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 3ccda33cf0a3..0022d417d367 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1161,9 +1161,6 @@ public static function fixMembershipStatusBeforeRenew(&$currentMembership, $chan
       $memberDAO->find(TRUE);
 
       $memberDAO->status_id = $status['id'];
-      $memberDAO->join_date = CRM_Utils_Date::isoToMysql($memberDAO->join_date);
-      $memberDAO->start_date = CRM_Utils_Date::isoToMysql($memberDAO->start_date);
-      $memberDAO->end_date = CRM_Utils_Date::isoToMysql($memberDAO->end_date);
       $memberDAO->save();
       CRM_Core_DAO::storeValues($memberDAO, $currentMembership);
 

From 0a81c1832a4bb34921cf7d7dafc586ad40b2c0a0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 09:48:59 +1200
Subject: [PATCH 214/834] Remove CRM_Contact_BAO_Contact::getPrimaryOpenId

It seems it's only ever called from aa test now
---
 CRM/Contact/BAO/Contact.php                   | 27 -------------------
 tests/phpunit/CRM/Contact/BAO/ContactTest.php | 24 -----------------
 2 files changed, 51 deletions(-)

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index a0e84b6b6de0..138b9569bb8d 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -2568,33 +2568,6 @@ public static function getPrimaryEmail($contactID, $polite = FALSE) {
     return $email;
   }
 
-  /**
-   * Function to get primary OpenID of the contact.
-   *
-   * @param int $contactID
-   *   Contact id.
-   *
-   * @return string
-   *   >openid   OpenID if present else null
-   */
-  public static function getPrimaryOpenId($contactID) {
-    // fetch the primary OpenID
-    $query = "
-SELECT    civicrm_openid.openid as openid
-FROM      civicrm_contact
-LEFT JOIN civicrm_openid ON ( civicrm_contact.id = civicrm_openid.contact_id )
-WHERE     civicrm_contact.id = %1
-AND       civicrm_openid.is_primary = 1";
-    $p = [1 => [$contactID, 'Integer']];
-    $dao = CRM_Core_DAO::executeQuery($query, $p);
-
-    $openId = NULL;
-    if ($dao->fetch()) {
-      $openId = $dao->openid;
-    }
-    return $openId;
-  }
-
   /**
    * Fetch the object and store the values in the values array.
    *
diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
index a4948fcf47b9..8c6e925b064a 100644
--- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
@@ -1186,30 +1186,6 @@ public function testGetPrimaryEmail() {
     $this->quickCleanup(['civicrm_contact']);
   }
 
-  /**
-   * Test case for getPrimaryOpenId( ).
-   */
-  public function testGetPrimaryOpenId() {
-    //get the contact params
-    $params = $this->contactParams();
-    $params['openid'][2] = $params['openid'][1];
-    $params['openid'][2]['location_type_id'] = 2;
-    $params['openid'][2]['openid'] = 'http://primaryopenid.org/';
-    unset($params['openid'][1]['is_primary']);
-
-    //create contact
-    $contact = CRM_Contact_BAO_Contact::create($params);
-    $contactId = $contact->id;
-    //get the primary openid
-    $openID = CRM_Contact_BAO_Contact::getPrimaryOpenId($contactId);
-
-    //Now check the primary openid
-    $this->assertEquals($openID, strtolower($params['openid'][2]['openid']), 'Check Primary OpenID');
-
-    //cleanup DB by deleting the contact
-    $this->contactDelete($contactId);
-  }
-
   /**
    * Test case for matchContactOnEmail( ).
    */

From 2cb6497039fde605f5d64b2fe4fa0548cd5d1e07 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 08:24:40 +1200
Subject: [PATCH 215/834] Minor code simplification on date handling in
 getMembershipStatusByDate

This deprecates 'today' as a synonym for 'now' as the latter is more standard and slightly simplifies the date handling
---
 CRM/Contribute/BAO/Contribution.php                  |  4 ++--
 CRM/Member/BAO/Membership.php                        |  8 ++++----
 CRM/Member/BAO/MembershipStatus.php                  | 12 ++++++------
 CRM/Member/Form/Membership.php                       |  2 +-
 CRM/Member/Import/Parser/Membership.php              |  4 ++--
 api/v3/MembershipStatus.php                          |  2 +-
 .../phpunit/CRM/Member/BAO/MembershipStatusTest.php  |  2 +-
 tests/phpunit/CRM/Member/Form/MembershipTest.php     |  1 +
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index fa268614ffb2..fbee1bb38662 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2328,7 +2328,7 @@ public static function transitionComponents($params, $processContributionObject
             $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dates['start_date'],
               $dates['end_date'],
               $dates['join_date'],
-              'today',
+              'now',
               TRUE,
               $membership->membership_type_id,
               (array) $membership
@@ -5180,7 +5180,7 @@ public static function updateMembershipBasedOnCompletionOfContribution($contribu
       $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dates['start_date'],
         $dates['end_date'],
         $dates['join_date'],
-        'today',
+        'now',
         TRUE,
         $membershipParams['membership_type_id'],
         $membershipParams
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 3ccda33cf0a3..925b70744a41 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -265,7 +265,7 @@ public static function create(&$params, &$ids = []) {
       }
 
       $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($params['start_date'], $params['end_date'], $params['join_date'],
-        'today', $excludeIsAdmin, $params['membership_type_id'] ?? NULL, $params
+        'now', $excludeIsAdmin, $params['membership_type_id'] ?? NULL, $params
       );
       if (empty($calcStatus)) {
         throw new CRM_Core_Exception(ts("The membership cannot be saved because the status cannot be calculated for start_date: {$params['start_date']} end_date {$params['end_date']} join_date {$params['join_date']} as at " . date('Y-m-d H:i:s')));
@@ -1133,7 +1133,7 @@ public static function updateRecurMembership(CRM_Member_DAO_Membership $membersh
    * @throws \CRM_Core_Exception
    */
   public static function fixMembershipStatusBeforeRenew(&$currentMembership, $changeToday) {
-    $today = NULL;
+    $today = 'now';
     if ($changeToday) {
       $today = CRM_Utils_Date::processDate($changeToday, NULL, FALSE, 'Y-m-d');
     }
@@ -1915,7 +1915,7 @@ public static function processMembership($contactID, $membershipTypeID, $is_test
           CRM_Utils_Date::customFormat($dates['join_date'],
             $statusFormat
           ),
-          'today',
+          'now',
           TRUE,
           $membershipTypeID,
           $memParams
@@ -2675,7 +2675,7 @@ public static function mergeMemberships($mainContactID, $otherContactID, &$sqlQu
             $updates["start_date"] ?? $newMembership->start_date,
             $updates["end_date"] ?? $newMembership->end_date,
             $updates["join_date"] ?? $newMembership->join_date,
-            'today',
+            'now',
             FALSE,
             $newMembershipId,
             $newMembership
diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php
index fa4a7665f8d5..6dd327e5b076 100644
--- a/CRM/Member/BAO/MembershipStatus.php
+++ b/CRM/Member/BAO/MembershipStatus.php
@@ -225,17 +225,17 @@ public static function del($membershipStatusId) {
    */
   public static function getMembershipStatusByDate(
     $startDate, $endDate, $joinDate,
-    $statusDate = 'today', $excludeIsAdmin = FALSE, $membershipTypeID = NULL, $membership = []
+    $statusDate = 'now', $excludeIsAdmin = FALSE, $membershipTypeID = NULL, $membership = []
   ) {
     $membershipDetails = [];
 
-    if (!$statusDate || $statusDate == 'today') {
-      $statusDate = date('Ymd');
-    }
-    else {
-      $statusDate = CRM_Utils_Date::customFormat($statusDate, '%Y%m%d');
+    if (!$statusDate || $statusDate === 'today') {
+      $statusDate = 'now';
+      CRM_Core_Error::deprecatedFunctionWarning('pass now rather than today in');
     }
 
+    $statusDate = date('Ymd', strtotime($statusDate));
+
     //fix for CRM-3570, if we have statuses with is_admin=1,
     //exclude these statuses from calculatation during import.
     $where = "is_active = 1";
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 733cafbc37d2..3537d0c83348 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -822,7 +822,7 @@ public static function formRule($params, $files, $self) {
           $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($startDate,
             $endDate,
             $joinDate,
-            'today',
+            'now',
             TRUE,
             $memType,
             $params
diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php
index 50e75e19ee31..5acd0d716691 100644
--- a/CRM/Member/Import/Parser/Membership.php
+++ b/CRM/Member/Import/Parser/Membership.php
@@ -428,7 +428,7 @@ public function import($onDuplicate, &$values) {
             $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($startDate,
               $endDate,
               $joinDate,
-              'today',
+              'now',
               $excludeIsAdmin,
               $formatted['membership_type_id'],
               $formatted
@@ -518,7 +518,7 @@ public function import($onDuplicate, &$values) {
         $calcStatus = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($startDate,
           $endDate,
           $joinDate,
-          'today',
+          'now',
           $excludeIsAdmin,
           $formatted['membership_type_id'],
           $formatted
diff --git a/api/v3/MembershipStatus.php b/api/v3/MembershipStatus.php
index f49c269435f8..906d9f364340 100644
--- a/api/v3/MembershipStatus.php
+++ b/api/v3/MembershipStatus.php
@@ -150,7 +150,7 @@ function civicrm_api3_membership_status_calc($membershipParams) {
   $dao = CRM_Core_DAO::executeQuery($query, $params);
   if ($dao->fetch()) {
     $membershipTypeID = empty($membershipParams['membership_type_id']) ? $dao->membership_type_id : $membershipParams['membership_type_id'];
-    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dao->start_date, $dao->end_date, $dao->join_date, 'today', CRM_Utils_Array::value('ignore_admin_only', $membershipParams), $membershipTypeID, $membershipParams);
+    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($dao->start_date, $dao->end_date, $dao->join_date, 'now', CRM_Utils_Array::value('ignore_admin_only', $membershipParams), $membershipTypeID, $membershipParams);
     //make is error zero only when valid status found.
     if (!empty($result['id'])) {
       $result['is_error'] = 0;
diff --git a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
index 09bf5353f555..e33f916c9aa6 100644
--- a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
@@ -178,7 +178,7 @@ public function testGetMembershipStatusByDate() {
     $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
     $toDate = date('Ymd');
 
-    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($toDate, $toDate, $toDate, 'today', TRUE, NULL, $params);
+    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatusByDate($toDate, $toDate, $toDate, 'now', TRUE, NULL, $params);
     $this->assertEquals($result['name'], 'Current', 'Verify membership status record.');
 
     $this->callAPISuccess('MembershipStatus', 'Delete', ['id' => $membershipStatus->id]);
diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 0f28c333720c..8c5d42578ea3 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -477,6 +477,7 @@ public function testFormRuleFixedJoin6MonthsAgo() {
    *
    * @dataProvider getThousandSeparators
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function testSubmit($thousandSeparator) {
     CRM_Core_Session::singleton()->getStatus(TRUE);

From ba5e66f74649dcff0884aee170a7ce41c76a2acc Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 7 Sep 2020 08:25:44 +1200
Subject: [PATCH 216/834] Add v4 api LineItem entity

---
 Civi/Api4/LineItem.php                | 28 +++++++++++++++++++++++++
 tests/phpunit/api/v3/LineItemTest.php | 30 +++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 Civi/Api4/LineItem.php

diff --git a/Civi/Api4/LineItem.php b/Civi/Api4/LineItem.php
new file mode 100644
index 000000000000..c630346a4b25
--- /dev/null
+++ b/Civi/Api4/LineItem.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+namespace Civi\Api4;
+
+/**
+ * LineItem entity.
+ *
+ * @package Civi\Api4
+ */
+class LineItem extends Generic\DAOEntity {
+
+}
diff --git a/tests/phpunit/api/v3/LineItemTest.php b/tests/phpunit/api/v3/LineItemTest.php
index 4993cf48352f..48b44d3a6406 100644
--- a/tests/phpunit/api/v3/LineItemTest.php
+++ b/tests/phpunit/api/v3/LineItemTest.php
@@ -52,8 +52,13 @@ public function setUp() {
 
   /**
    * Test tax is calculated correctly on the line item.
+   *
+   * @param int $version
+   *
+   * @dataProvider versionThreeAndFour
    */
-  public function testCreateLineItemWithTax() {
+  public function testCreateLineItemWithTax($version) {
+    $this->_apiversion = $version;
     $this->enableSalesTaxOnFinancialType('Donation');
     $this->params['financial_type_id'] = 'Donation';
     $result = $this->callAPISuccess('LineItem', 'create', $this->params);
@@ -67,6 +72,8 @@ public function testCreateLineItemWithTax() {
    *
    * @todo move to a trait, share.
    *
+   * @dataProvider versionThreeAndFour
+   *
    * @param string $type
    */
   public function enableSalesTaxOnFinancialType($type) {
@@ -77,9 +84,14 @@ public function enableSalesTaxOnFinancialType($type) {
   /**
    * Test basic create line item.
    *
+   * @param int $version
+   *
+   * @dataProvider versionThreeAndFour
+   *
    * @throws \CRM_Core_Exception
    */
-  public function testCreateLineItem() {
+  public function testCreateLineItem($version) {
+    $this->_apiversion = $version;
     $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__)['values'];
     $this->assertCount(1, $result);
     $this->getAndCheck($this->params, key($result), $this->_entity);
@@ -87,8 +99,13 @@ public function testCreateLineItem() {
 
   /**
    * Test basic get line item.
+   *
+   * @param int $version
+   *
+   * @dataProvider versionThreeAndFour
    */
-  public function testGetBasicLineItem() {
+  public function testGetBasicLineItem($version) {
+    $this->_apiversion = $version;
     $getParams = [
       'entity_table' => 'civicrm_contribution',
     ];
@@ -99,9 +116,14 @@ public function testGetBasicLineItem() {
   /**
    * Test delete line item.
    *
+   * @param int $version
+   *
+   * @dataProvider versionThreeAndFour
+   *
    * @throws \CRM_Core_Exception
    */
-  public function testDeleteLineItem() {
+  public function testDeleteLineItem($version) {
+    $this->_apiversion = $version;
     $getParams = [
       'entity_table' => 'civicrm_contribution',
     ];

From 8eacd5221c7d4d26c5b959b0ef0b636f76097ba4 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 7 Sep 2020 16:32:18 +0100
Subject: [PATCH 217/834] Clarify what getMembershipCount does

---
 CRM/Price/BAO/PriceSet.php                   | 10 +++++++---
 tests/phpunit/CRM/Price/BAO/PriceSetTest.php |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php
index d2c1643071a2..7481dd09fae0 100644
--- a/CRM/Price/BAO/PriceSet.php
+++ b/CRM/Price/BAO/PriceSet.php
@@ -1234,16 +1234,20 @@ public static function getPricesetCount($sid, $onlyActive = TRUE) {
   }
 
   /**
-   * @param $ids
+   * Return a count of priceFieldValueIDs that are memberships by organisation and membership type
+   *
+   * @param string $priceFieldValueIDs
+   *   Comma separated string of priceFieldValue IDs
    *
    * @return array
+   *   Returns an array of counts by membership organisation
    */
-  public static function getMembershipCount($ids) {
+  public static function getMembershipCount($priceFieldValueIDs) {
     $queryString = "
 SELECT       count( pfv.id ) AS count, mt.member_of_contact_id AS id
 FROM         civicrm_price_field_value pfv
 INNER JOIN    civicrm_membership_type mt ON mt.id = pfv.membership_type_id
-WHERE        pfv.id IN ( $ids )
+WHERE        pfv.id IN ( $priceFieldValueIDs )
 GROUP BY     mt.member_of_contact_id ";
 
     $crmDAO = CRM_Core_DAO::executeQuery($queryString);
diff --git a/tests/phpunit/CRM/Price/BAO/PriceSetTest.php b/tests/phpunit/CRM/Price/BAO/PriceSetTest.php
index 1c311ed327f7..36e1e19285cc 100644
--- a/tests/phpunit/CRM/Price/BAO/PriceSetTest.php
+++ b/tests/phpunit/CRM/Price/BAO/PriceSetTest.php
@@ -82,7 +82,7 @@ public function testCopyPriceSet() {
 
   /**
    * Test CRM_Price_BAO_PriceSet::getMembershipCount() that return correct number of
-   *   membership type occurances against it's corresponding member orgaisation
+   *   membership type occurrences against it's corresponding member organisation
    *
    * @throws \CRM_Core_Exception
    */

From db2be805220ef9197e1db2233047613bd30f4f26 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 13 Jun 2020 10:50:44 +1200
Subject: [PATCH 218/834] Revert "PropertyBag - add cardNumber to getters"

This reverts commit 194ae0f4206d0de00dea44553ac8a679cd771ea4.
---
 Civi/Payment/PropertyBag.php | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/Civi/Payment/PropertyBag.php b/Civi/Payment/PropertyBag.php
index 7b11524e9892..49a4ea4e8c99 100644
--- a/Civi/Payment/PropertyBag.php
+++ b/Civi/Payment/PropertyBag.php
@@ -34,14 +34,12 @@ class PropertyBag implements \ArrayAccess {
     'billingPostalCode'           => TRUE,
     'billingCounty'               => TRUE,
     'billingCountry'              => TRUE,
-    'cardNumber'                  => TRUE,
     'contactID'                   => TRUE,
     'contact_id'                  => 'contactID',
     'contributionID'              => TRUE,
     'contribution_id'             => 'contributionID',
     'contributionRecurID'         => TRUE,
     'contribution_recur_id'       => 'contributionRecurID',
-    'credit_card_number'          => 'cardNumber',
     'currency'                    => TRUE,
     'currencyID'                  => 'currency',
     'description'                 => TRUE,
@@ -594,29 +592,6 @@ public function setBillingCountry($input, $label = 'default') {
   }
 
   /**
-   * Get the (generally credit) card number.
-   *
-   * @param string $label
-   *
-   * @return string
-   */
-  public function getCardNumber($label = 'default'): string {
-    return $this->get('cardNumber', $label);
-  }
-
-  /**
-   * @param string $cardNumber
-   * @param string $label
-   *
-   * @return \Civi\Payment\PropertyBag
-   */
-  public function setCardNumber($cardNumber, $label = 'default'): PropertyBag {
-    return $this->set('cardNumber', $label, (string) $cardNumber);
-  }
-
-  /**
-   * @param string $label
-   *
    * @return int
    */
   public function getContactID($label = 'default'): int {
@@ -626,8 +601,6 @@ public function getContactID($label = 'default'): int {
   /**
    * @param int $contactID
    * @param string $label
-   *
-   * @return \Civi\Payment\PropertyBag
    */
   public function setContactID($contactID, $label = 'default') {
     // We don't use this because it counts zero as positive: CRM_Utils_Type::validate($contactID, 'Positive');

From df1ebfea8e38ef4acd15e2ba799c07109782bafd Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 7 Sep 2020 16:31:28 +0100
Subject: [PATCH 219/834] Switch backend membership form to use
 non-deprecated/cached functions to get membership types

---
 CRM/Member/Form/Membership.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 3537d0c83348..8c2af0302b07 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -225,7 +225,9 @@ public function preProcess() {
           $cMemTypes[] = $mem['membership_type_id'];
         }
         if (count($cMemTypes) > 0) {
-          $memberorgs = CRM_Member_BAO_MembershipType::getMemberOfContactByMemTypes($cMemTypes);
+          foreach ($cMemTypes as $memTypeID) {
+            $memberorgs[$memTypeID] = CRM_Member_BAO_MembershipType::getMembershipType($memTypeID)['member_of_contact_id'];
+          }
           $mems_by_org = [];
           foreach ($contactMemberships as $mem) {
             $mem['member_of_contact_id'] = $memberorgs[$mem['membership_type_id']] ?? NULL;
@@ -759,8 +761,7 @@ public static function formRule($params, $files, $self) {
           $endDate = CRM_Utils_Date::processDate($params['end_date']);
         }
 
-        $membershipDetails = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($memType);
-
+        $membershipDetails = CRM_Member_BAO_MembershipType::getMembershipType($memType);
         if ($startDate && CRM_Utils_Array::value('period_type', $membershipDetails) === 'rolling') {
           if ($startDate < $joinDate) {
             $errors['start_date'] = ts('Start date must be the same or later than Member since.');

From 7d9f60daadc66ca356862fbeeab6d72d61637422 Mon Sep 17 00:00:00 2001
From: Brian Shaughnessy <brian@lcdservices.biz>
Date: Thu, 10 Sep 2020 15:10:09 -0400
Subject: [PATCH 220/834] dev/core#2009 filter grant dashboard to exclude
 trashed contacts

---
 CRM/Grant/BAO/Grant.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CRM/Grant/BAO/Grant.php b/CRM/Grant/BAO/Grant.php
index d38aeb5c41b4..e203d546f558 100644
--- a/CRM/Grant/BAO/Grant.php
+++ b/CRM/Grant/BAO/Grant.php
@@ -25,8 +25,13 @@ class CRM_Grant_BAO_Grant extends CRM_Grant_DAO_Grant {
    */
   public static function getGrantSummary($admin = FALSE) {
     $query = "
-            SELECT status_id, count(id) as status_total
-            FROM civicrm_grant  GROUP BY status_id";
+      SELECT status_id, count(g.id) as status_total
+      FROM civicrm_grant g
+      JOIN civicrm_contact c
+        ON g.contact_id = c.id
+      WHERE c.is_deleted = 0
+      GROUP BY status_id
+    ";
 
     $dao = CRM_Core_DAO::executeQuery($query);
 

From 01a5d8d498a250e73c11089c392c6587a8907706 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 7 Sep 2020 11:00:15 +1200
Subject: [PATCH 221/834] Simplify parameters passed to completeOrder

Now that completeOrder has had most interaction with objects var cleaned up
we know only 2 objects are actually used
- contribution - which we can fetch in-function
- paymentProcessor - which we were actually only guessing

This alters it to only load & pass contribution. The value of passing in
processor seems lost in time. This code can only be reached for pay_later contributions - see

CRM_Contribute_BAO_Contribution::checkOnlinePendingContribution
and specifically
https://github.com/civicrm/civicrm-core/blob/318c63045e82d30ed7fe8cdacb91a6d31fc5331b/CRM/Contribute/BAO/Contribution.php#L2033

and only when submitted via an online event (same function) so by definition there IS NO PAYMENT PROCESSOR that applies.

Given that we can just do the minimum to load the contribution and pass that in.
---
 CRM/Event/Form/Task/Batch.php | 42 ++++++-----------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

diff --git a/CRM/Event/Form/Task/Batch.php b/CRM/Event/Form/Task/Batch.php
index 11341b917da8..395feda8652f 100644
--- a/CRM/Event/Form/Task/Batch.php
+++ b/CRM/Event/Form/Task/Batch.php
@@ -312,43 +312,15 @@ public static function updatePendingOnlineContribution($participantId, $statusId
    *
    */
   public static function updateContributionStatus($params) {
-    // get minimum required values.
-    $componentId = $params['component_id'] ?? NULL;
-    $contributionId = $params['contribution_id'] ?? NULL;
-
-    $input = $ids = $objects = [];
-
-    //get the required ids.
-    $ids['contribution'] = $contributionId;
-    $ids['participant'] = $params['component_id'];
-
-    if (!$ids['contact'] = CRM_Utils_Array::value('contact_id', $params)) {
-      $ids['contact'] = CRM_Core_DAO::getFieldValue('CRM_Contribute_DAO_Contribution',
-        $contributionId,
-        'contact_id'
-      );
-    }
-
-    if (!$ids['event'] = CRM_Utils_Array::value('event_id', $params)) {
-      $ids['event'] = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Participant',
-        $componentId,
-        'event_id'
-      );
-    }
-
-    $input['component'] = 'event';
-
-    $baseIPN = new CRM_Core_Payment_BaseIPN();
+    $input = ['component' => 'event'];
 
     // reset template values.
     $template = CRM_Core_Smarty::singleton();
     $template->clearTemplateVars();
 
-    if (!$baseIPN->validateData($input, $ids, $objects, FALSE)) {
-      throw new CRM_Core_Exception('validation error');
-    }
-
-    $contribution = &$objects['contribution'];
+    $contribution = new CRM_Contribute_BAO_Contribution();
+    $contribution->id = $params['contribution_id'];
+    $contribution->fetch();
 
     $contributionStatuses = CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'contribution_status_id', [
       'labelColumn' => 'name',
@@ -387,10 +359,10 @@ public static function updateContributionStatus($params) {
     // @todo use the api - ie civicrm_api3('Contribution', 'completetransaction', $input);
     // as this method is not preferred / supported.
     CRM_Contribute_BAO_Contribution::completeOrder($input, [
-      'related_contact' => $ids['related_contact'] ?? NULL,
-      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'related_contact' => NULL,
+      'participant' => $params['component_id'],
       'contributionRecur' => NULL,
-    ], $objects);
+    ], ['contribution' => $contribution]);
 
     // reset template values before processing next transactions
     $template->clearTemplateVars();

From ffdc26b86f8821db7640dc8f864353c61d3e7e60 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 11 Sep 2020 20:59:09 +1200
Subject: [PATCH 222/834] dev/core#2017 Remove unused function
 OpenID::isAllowedToLogin

---
 CRM/Core/BAO/OpenID.php                   | 17 ---------
 tests/phpunit/CRM/Core/BAO/OpenIDTest.php | 45 -----------------------
 2 files changed, 62 deletions(-)

diff --git a/CRM/Core/BAO/OpenID.php b/CRM/Core/BAO/OpenID.php
index 34326a756257..365b60060391 100644
--- a/CRM/Core/BAO/OpenID.php
+++ b/CRM/Core/BAO/OpenID.php
@@ -43,23 +43,6 @@ public static function &getValues($entityBlock) {
     return CRM_Core_BAO_Block::getValues('openid', $entityBlock);
   }
 
-  /**
-   * Returns whether or not this OpenID is allowed to login.
-   *
-   * @param string $identity_url
-   *   The OpenID to check.
-   *
-   * @return bool
-   */
-  public static function isAllowedToLogin($identity_url) {
-    $openId = new CRM_Core_DAO_OpenID();
-    $openId->openid = $identity_url;
-    if ($openId->find(TRUE)) {
-      return $openId->allowed_to_login == 1;
-    }
-    return FALSE;
-  }
-
   /**
    * Get all the openids for a specified contact_id, with the primary openid being first
    *
diff --git a/tests/phpunit/CRM/Core/BAO/OpenIDTest.php b/tests/phpunit/CRM/Core/BAO/OpenIDTest.php
index 1d0886b5c461..0e4446635893 100644
--- a/tests/phpunit/CRM/Core/BAO/OpenIDTest.php
+++ b/tests/phpunit/CRM/Core/BAO/OpenIDTest.php
@@ -62,51 +62,6 @@ public function testAdd() {
     $this->assertDBRowNotExist('CRM_Contact_DAO_Contact', $contactId);
   }
 
-  /**
-   * IfAllowedToLogin() method (set and reset allowed_to_login)
-   */
-  public function testIfAllowedToLogin() {
-    $contactId = $this->individualCreate();
-    $this->assertDBRowExist('CRM_Contact_DAO_Contact', $contactId);
-    $openIdURL = "http://test-username.civicrm.org/";
-
-    $params = [
-      'contact_id' => $contactId,
-      'location_type_id' => 1,
-      'openid' => $openIdURL,
-      'is_primary' => 1,
-    ];
-
-    $openObject = CRM_Core_BAO_OpenID::add($params);
-
-    $openId = $openObject->id;
-    $this->assertDBNotNull('CRM_Core_DAO_OpenID', $openIdURL, 'id', 'openid',
-      'Database check for created OpenID.'
-    );
-
-    $allowedToLogin = CRM_Core_BAO_OpenID::isAllowedToLogin($openIdURL);
-    $this->assertEquals($allowedToLogin, FALSE, 'Verify allowed_to_login value is 0.');
-
-    // Now call add() to modify an existing open-id record
-
-    $params = [
-      'id' => $openId,
-      'contact_id' => $contactId,
-      'openid' => $openIdURL,
-      'is_bulkmail' => 1,
-      'allowed_to_login' => 1,
-    ];
-
-    CRM_Core_BAO_OpenID::add($params);
-
-    $allowedToLogin = CRM_Core_BAO_OpenID::isAllowedToLogin($openIdURL);
-
-    $this->assertEquals($allowedToLogin, TRUE, 'Verify allowed_to_login value is 1.');
-    $this->contactDelete($contactId);
-    //domain contact doesn't really get deleted //
-    $this->assertDBRowNotExist('CRM_Contact_DAO_Contact', $contactId);
-  }
-
   /**
    * AllOpenIDs() method - get all OpenIDs for the given contact
    */

From 7c326e9ee9c47cb0ab7a3701d2062f715a290a8a Mon Sep 17 00:00:00 2001
From: Rich Lott / Artful Robot <forums@artfulrobot.uk>
Date: Fri, 11 Sep 2020 14:30:33 +0100
Subject: [PATCH 223/834] Add tests for PropertyBag::setAmount()

---
 Civi/Payment/PropertyBag.php                  | 15 +++++-
 .../phpunit/Civi/Payment/PropertyBagTest.php  | 50 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/Civi/Payment/PropertyBag.php b/Civi/Payment/PropertyBag.php
index f8817b8c4ecb..73179edb78ce 100644
--- a/Civi/Payment/PropertyBag.php
+++ b/Civi/Payment/PropertyBag.php
@@ -417,7 +417,20 @@ public function getAmount($label = 'default') {
   }
 
   /**
-   * Get the monetary amount.
+   * Set the monetary amount.
+   *
+   * - We expect to be called with a string amount with optional decimals using
+   *   a '.' as the decimal point (not a ',').
+   *
+   * - We're ok with floats/ints being passed in, too, but we'll cast them to a
+   *   string.
+   *
+   * - Negatives are fine.
+   *
+   * @see https://github.com/civicrm/civicrm-core/pull/18219
+   *
+   * @param string|float|int $value
+   * @param string $label
    */
   public function setAmount($value, $label = 'default') {
     if (!is_numeric($value)) {
diff --git a/tests/phpunit/Civi/Payment/PropertyBagTest.php b/tests/phpunit/Civi/Payment/PropertyBagTest.php
index 0a66c6dd7ce5..b127f10ee4f3 100644
--- a/tests/phpunit/Civi/Payment/PropertyBagTest.php
+++ b/tests/phpunit/Civi/Payment/PropertyBagTest.php
@@ -44,6 +44,56 @@ public function testSetContactID() {
     $this->assertEquals(456, $propertyBag->getContactID('new'));
   }
 
+  /**
+   * Test we can set an amount.
+   *
+   * @see https://github.com/civicrm/civicrm-core/pull/18219
+   *
+   * @dataProvider setAmountDataProvider
+   *
+   * @param mixed $value input
+   * @param mixed $expect output expected. Typically a string like '1.23' or NULL
+   * @param string $expectedExceptionMessage if there is one expected.
+   */
+  public function testSetAmount($value, $expect, $expectedExceptionMessage = '') {
+    $propertyBag = new PropertyBag();
+    try {
+      $propertyBag->setAmount($value);
+    }
+    catch (\Exception $e) {
+      if ($expectedExceptionMessage) {
+        $this->assertEquals($expectedExceptionMessage, $e->getMessage(), 'Expected a different exception.');
+        // OK.
+        return;
+      }
+      // not expecting an exception, re-throw it.
+      throw $e;
+    }
+    $got = $propertyBag->getAmount();
+    $this->assertInternalType('string', $got);
+    $this->assertEquals($expect, $got);
+  }
+
+  /**
+   *
+   */
+  public function setAmountDataProvider() {
+    return [
+      [1, '1'],
+      [1.23, '1.23'],
+      [1.234, '1.234'],
+      [-1.23, '-1.23'],
+      ['1', '1'],
+      ['1.23', '1.23'],
+      ['1.234', '1.234'],
+      ['-1.23', '-1.23'],
+      ['1,000.23', NULL, 'setAmount requires a numeric amount value'],
+      ['1,000', NULL, 'setAmount requires a numeric amount value'],
+      ['1,23', NULL, 'setAmount requires a numeric amount value'],
+      ['1.230,12', NULL, 'setAmount requires a numeric amount value'],
+    ];
+  }
+
   /**
    * Test we cannot set an invalid contact ID.
    *

From 1684bccdd7b88b229a883a605d9c95f73650f0ed Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 8 Sep 2020 12:42:58 +0100
Subject: [PATCH 224/834] Replace & to and in button label

---
 CRM/Financial/Form/BatchTransaction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php
index 20848b58ecae..ef90e96c026a 100644
--- a/CRM/Financial/Form/BatchTransaction.php
+++ b/CRM/Financial/Form/BatchTransaction.php
@@ -87,7 +87,7 @@ public function buildQuickForm() {
     if (CRM_Batch_BAO_Batch::checkBatchPermission('close', $this->_values['created_id'])) {
       $this->add('xbutton', 'close_batch', ts('Close Batch'), ['type' => 'submit']);
       if (CRM_Batch_BAO_Batch::checkBatchPermission('export', $this->_values['created_id'])) {
-        $this->add('xbutton', 'export_batch', ts('Close & Export Batch'), ['type' => 'submit']);
+        $this->add('xbutton', 'export_batch', ts('Close and Export Batch'), ['type' => 'submit']);
       }
     }
 

From 721c9da1a14e155e13d528106ca32690f171b515 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 3 Sep 2020 17:50:07 -0400
Subject: [PATCH 225/834] CustomField - Reformat data when modifying field
 serialize property.

Adds or removes CRM_Core_DAO::VALUE_SEPARATOR from custom values when switching a field from single to muti-valued.
---
 CRM/Core/BAO/CustomField.php                  |  27 +++++
 CRM/Core/DAO/AllCoreTables.php                |   4 +-
 Civi/Api4/Generic/AbstractAction.php          |   6 +-
 Civi/Api4/Generic/Traits/DAOActionTrait.php   |  28 +++--
 Civi/Api4/Query/Api4SelectQuery.php           |   2 +-
 .../Schema/Joinable/CustomGroupJoinable.php   |  11 +-
 .../Api4/Service/Schema/Joinable/Joinable.php |  18 +--
 Civi/Api4/Utils/FormattingUtil.php            |  18 ++-
 .../api/v4/Action/CustomFieldAlterTest.php    | 114 ++++++++++++++++++
 9 files changed, 187 insertions(+), 41 deletions(-)
 create mode 100644 tests/phpunit/api/v4/Action/CustomFieldAlterTest.php

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 107242a5155c..c67b60f7a9c5 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -1696,6 +1696,25 @@ public static function getAlterFieldSQL($field, $operation) {
     return CRM_Core_BAO_SchemaHandler::getFieldAlterSQL($params, $indexExist);
   }
 
+  /**
+   * Reformat existing values for a field when changing its serialize attribute
+   *
+   * @param CRM_Core_DAO_CustomField $field
+   * @throws CRM_Core_Exception
+   */
+  private static function alterSerialize($field) {
+    $table = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $field->custom_group_id, 'table_name');
+    $col = $field->column_name;
+    $sp = CRM_Core_DAO::VALUE_SEPARATOR;
+    if ($field->serialize) {
+      $sql = "UPDATE `$table` SET `$col` = CONCAT('$sp', `$col`, '$sp') WHERE `$col` IS NOT NULL AND `$col` NOT LIKE '$sp%' AND `$col` != ''";
+    }
+    else {
+      $sql = "UPDATE `$table` SET `$col` = SUBSTRING_INDEX(SUBSTRING(`$col`, 2), '$sp', 1) WHERE `$col` LIKE '$sp%'";
+    }
+    CRM_Core_DAO::executeQuery($sql);
+  }
+
   /**
    * Determine whether it would be safe to move a field.
    *
@@ -1989,6 +2008,9 @@ protected static function createCustomFieldRecord($params) {
     $transaction = new CRM_Core_Transaction();
     $params = self::prepareCreate($params);
 
+    $alterSerialize = isset($params['serialize']) && !empty($params['id'])
+      && ($params['serialize'] != CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $params['id'], 'serialize'));
+
     $customField = new CRM_Core_DAO_CustomField();
     $customField->copyValues($params);
     $customField->save();
@@ -2008,6 +2030,11 @@ protected static function createCustomFieldRecord($params) {
 
     // make sure all values are present in the object for further processing
     $customField->find(TRUE);
+
+    if ($alterSerialize) {
+      self::alterSerialize($customField);
+    }
+
     return $customField;
   }
 
diff --git a/CRM/Core/DAO/AllCoreTables.php b/CRM/Core/DAO/AllCoreTables.php
index 5b9ffe5ef671..9e4970c301d4 100644
--- a/CRM/Core/DAO/AllCoreTables.php
+++ b/CRM/Core/DAO/AllCoreTables.php
@@ -280,7 +280,7 @@ public static function getClasses() {
    * Get the classname for the table.
    *
    * @param string $tableName
-   * @return string
+   * @return string|CRM_Core_DAO|NULL
    */
   public static function getClassForTable($tableName) {
     //CRM-19677: on multilingual setup, trim locale from $tableName to fetch class name
@@ -296,7 +296,7 @@ public static function getClassForTable($tableName) {
    *
    * @param string $daoName
    *   Ex: 'Contact'.
-   * @return CRM_Core_DAO|NULL
+   * @return string|CRM_Core_DAO|NULL
    *   Ex: 'CRM_Contact_DAO_Contact'.
    */
   public static function getFullName($daoName) {
diff --git a/Civi/Api4/Generic/AbstractAction.php b/Civi/Api4/Generic/AbstractAction.php
index 8d0111e6b35d..ea17309053a9 100644
--- a/Civi/Api4/Generic/AbstractAction.php
+++ b/Civi/Api4/Generic/AbstractAction.php
@@ -494,7 +494,7 @@ protected function formatWriteValues(&$record) {
         if ($field) {
           $optionFields[$fieldName] = [
             'val' => $record[$expr],
-            'name' => empty($field['custom_field_id']) ? $field['name'] : 'custom_' . $field['custom_field_id'],
+            'field' => $field,
             'suffix' => substr($expr, $suffix + 1),
             'depends' => $field['input_attrs']['controlField'] ?? NULL,
           ];
@@ -504,11 +504,11 @@ protected function formatWriteValues(&$record) {
     }
     // Sort option lookups by dependency, so e.g. country_id is processed first, then state_province_id, then county_id
     uasort($optionFields, function ($a, $b) {
-      return $a['name'] === $b['depends'] ? -1 : 1;
+      return $a['field']['name'] === $b['depends'] ? -1 : 1;
     });
     // Replace pseudoconstants. Note this is a reverse lookup as we are evaluating input not output.
     foreach ($optionFields as $fieldName => $info) {
-      $options = FormattingUtil::getPseudoconstantList($this->_entityName, $info['name'], $info['suffix'], $record, 'create');
+      $options = FormattingUtil::getPseudoconstantList($info['field'], $info['suffix'], $record, 'create');
       $record[$fieldName] = FormattingUtil::replacePseudoconstant($options, $info['val'], TRUE);
     }
   }
diff --git a/Civi/Api4/Generic/Traits/DAOActionTrait.php b/Civi/Api4/Generic/Traits/DAOActionTrait.php
index 6497168a3d95..9404b11ecf6f 100644
--- a/Civi/Api4/Generic/Traits/DAOActionTrait.php
+++ b/Civi/Api4/Generic/Traits/DAOActionTrait.php
@@ -13,6 +13,7 @@
 namespace Civi\Api4\Generic\Traits;
 
 use Civi\Api4\CustomField;
+use Civi\Api4\Service\Schema\Joinable\CustomGroupJoinable;
 use Civi\Api4\Utils\FormattingUtil;
 
 /**
@@ -178,7 +179,7 @@ protected function formatCustomParams(&$params, $entityId) {
       if (NULL !== $value) {
 
         if ($field['suffix']) {
-          $options = FormattingUtil::getPseudoconstantList($this->getEntityName(), 'custom_' . $field['id'], $field['suffix'], $params, $this->getActionName());
+          $options = FormattingUtil::getPseudoconstantList($field, $field['suffix'], $params, $this->getActionName());
           $value = FormattingUtil::replacePseudoconstant($options, $value, TRUE);
         }
 
@@ -210,24 +211,33 @@ protected function formatCustomParams(&$params, $entityId) {
   /**
    * Gets field info needed to save custom data
    *
-   * @param string $name
+   * @param string $fieldExpr
    *   Field identifier with possible suffix, e.g. MyCustomGroup.MyField1:label
    * @return array|NULL
    */
-  protected function getCustomFieldInfo($name) {
-    if (strpos($name, '.') === FALSE) {
+  protected function getCustomFieldInfo(string $fieldExpr) {
+    if (strpos($fieldExpr, '.') === FALSE) {
       return NULL;
     }
-    list($groupName, $fieldName) = explode('.', $name);
+    list($groupName, $fieldName) = explode('.', $fieldExpr);
     list($fieldName, $suffix) = array_pad(explode(':', $fieldName), 2, NULL);
-    if (empty(\Civi::$statics['APIv4_Custom_Fields'][$groupName])) {
-      \Civi::$statics['APIv4_Custom_Fields'][$groupName] = (array) CustomField::get(FALSE)
+    $cacheKey = "APIv4_Custom_Fields-$groupName";
+    $info = \Civi::cache('metadata')->get($cacheKey);
+    if (!isset($info[$fieldName])) {
+      $info = [];
+      $fields = CustomField::get(FALSE)
         ->addSelect('id', 'name', 'html_type', 'custom_group.extends')
         ->addWhere('custom_group.name', '=', $groupName)
         ->execute()->indexBy('name');
+      foreach ($fields as $name => $field) {
+        $field['custom_field_id'] = $field['id'];
+        $field['name'] = $groupName . '.' . $name;
+        $field['entity'] = CustomGroupJoinable::getEntityFromExtends($field['custom_group.extends']);
+        $info[$name] = $field;
+      }
+      \Civi::cache('metadata')->set($cacheKey, $info);
     }
-    $info = \Civi::$statics['APIv4_Custom_Fields'][$groupName][$fieldName] ?? NULL;
-    return $info ? ['suffix' => $suffix] + $info : NULL;
+    return isset($info[$fieldName]) ? ['suffix' => $suffix] + $info[$fieldName] : NULL;
   }
 
   /**
diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php
index e4f8ceb187fc..009095ebc91d 100644
--- a/Civi/Api4/Query/Api4SelectQuery.php
+++ b/Civi/Api4/Query/Api4SelectQuery.php
@@ -275,7 +275,7 @@ protected function buildOrderBy() {
       $suffix = strstr($item, ':');
       if ($suffix && $expr->getType() === 'SqlField') {
         $field = $this->getField($item);
-        $options = FormattingUtil::getPseudoconstantList($field['entity'], $field['name'], substr($suffix, 1));
+        $options = FormattingUtil::getPseudoconstantList($field, substr($suffix, 1));
         if ($options) {
           asort($options);
           $column = "FIELD($column,'" . implode("','", array_keys($options)) . "')";
diff --git a/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php b/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php
index a8ed4042b062..510ff78826c6 100644
--- a/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php
+++ b/Civi/Api4/Service/Schema/Joinable/CustomGroupJoinable.php
@@ -56,16 +56,19 @@ public function __construct($targetTable, $alias, $isMultiRecord, $columns) {
    * @inheritDoc
    */
   public function getEntityFields() {
-    if (!$this->entityFields) {
+    $cacheKey = 'APIv4_CustomGroupJoinable-' . $this->getTargetTable();
+    $entityFields = (array) \Civi::cache('metadata')->get($cacheKey);
+    if (!$entityFields) {
       $fields = CustomField::get(FALSE)
         ->setSelect(['custom_group.name', 'custom_group.extends', 'custom_group.table_name', '*'])
         ->addWhere('custom_group.table_name', '=', $this->getTargetTable())
         ->execute();
       foreach ($fields as $field) {
-        $this->entityFields[] = \Civi\Api4\Service\Spec\SpecFormatter::arrayToField($field, $this->getEntityFromExtends($field['custom_group.extends']));
+        $entityFields[] = \Civi\Api4\Service\Spec\SpecFormatter::arrayToField($field, self::getEntityFromExtends($field['custom_group.extends']));
       }
+      \Civi::cache('metadata')->set($cacheKey, $entityFields);
     }
-    return $this->entityFields;
+    return $entityFields;
   }
 
   /**
@@ -102,7 +105,7 @@ public function getSqlColumn($fieldName) {
    * @throws \API_Exception
    * @throws \Civi\API\Exception\UnauthorizedException
    */
-  private function getEntityFromExtends($extends) {
+  public static function getEntityFromExtends($extends) {
     if (strpos($extends, 'Participant') === 0) {
       return 'Participant';
     }
diff --git a/Civi/Api4/Service/Schema/Joinable/Joinable.php b/Civi/Api4/Service/Schema/Joinable/Joinable.php
index 0375fa0c2a05..8e6d4e711680 100644
--- a/Civi/Api4/Service/Schema/Joinable/Joinable.php
+++ b/Civi/Api4/Service/Schema/Joinable/Joinable.php
@@ -78,11 +78,6 @@ class Joinable {
    */
   protected $entity;
 
-  /**
-   * @var array
-   */
-  protected $entityFields;
-
   /**
    * @param $targetTable
    * @param $targetColumn
@@ -268,15 +263,14 @@ public function toArray() {
    * @return \Civi\Api4\Service\Spec\FieldSpec[]
    */
   public function getEntityFields() {
-    if (!$this->entityFields) {
-      $bao = AllCoreTables::getClassForTable($this->getTargetTable());
-      if ($bao) {
-        foreach ($bao::fields() as $field) {
-          $this->entityFields[] = \Civi\Api4\Service\Spec\SpecFormatter::arrayToField($field, $this->getEntity());
-        }
+    $entityFields = [];
+    $bao = AllCoreTables::getClassForTable($this->getTargetTable());
+    if ($bao) {
+      foreach ($bao::getSupportedFields() as $field) {
+        $entityFields[] = \Civi\Api4\Service\Spec\SpecFormatter::arrayToField($field, $this->getEntity());
       }
     }
-    return $this->entityFields;
+    return $entityFields;
   }
 
   /**
diff --git a/Civi/Api4/Utils/FormattingUtil.php b/Civi/Api4/Utils/FormattingUtil.php
index 900df21ccfe8..f170969a7fda 100644
--- a/Civi/Api4/Utils/FormattingUtil.php
+++ b/Civi/Api4/Utils/FormattingUtil.php
@@ -88,7 +88,7 @@ public static function formatInputValue(&$value, $fieldName, $fieldSpec, $action
     // Evaluate pseudoconstant suffix
     $suffix = strpos($fieldName, ':');
     if ($suffix) {
-      $options = self::getPseudoconstantList($fieldSpec['entity'], $fieldSpec['name'], substr($fieldName, $suffix + 1), $action);
+      $options = self::getPseudoconstantList($fieldSpec, substr($fieldName, $suffix + 1), $action);
       $value = self::replacePseudoconstant($options, $value, TRUE);
       return;
     }
@@ -148,8 +148,7 @@ public static function formatOutputValues(&$results, $fields, $entity, $action =
           // Evaluate pseudoconstant suffixes
           $suffix = strrpos($fieldExpr, ':');
           if ($suffix) {
-            $fieldName = empty($field['custom_field_id']) ? $field['name'] : 'custom_' . $field['custom_field_id'];
-            $fieldOptions[$fieldExpr] = $fieldOptions[$fieldExpr] ?? self::getPseudoconstantList($field['entity'], $fieldName, substr($fieldExpr, $suffix + 1), $result, $action);
+            $fieldOptions[$fieldExpr] = $fieldOptions[$fieldExpr] ?? self::getPseudoconstantList($field, substr($fieldExpr, $suffix + 1), $result, $action);
             $dataType = NULL;
           }
           if (!empty($field['serialize'])) {
@@ -178,9 +177,7 @@ public static function formatOutputValues(&$results, $fields, $entity, $action =
   /**
    * Retrieves pseudoconstant option list for a field.
    *
-   * @param string $entity
-   *   Name of api entity
-   * @param string $fieldName
+   * @param array $field
    * @param string $valueType
    *   name|label|abbr from self::$pseudoConstantContexts
    * @param array $params
@@ -189,27 +186,28 @@ public static function formatOutputValues(&$results, $fields, $entity, $action =
    * @return array
    * @throws \API_Exception
    */
-  public static function getPseudoconstantList($entity, $fieldName, $valueType, $params = [], $action = 'get') {
+  public static function getPseudoconstantList($field, $valueType, $params = [], $action = 'get') {
     $context = self::$pseudoConstantContexts[$valueType] ?? NULL;
     // For create actions, only unique identifiers can be used.
     // For get actions any valid suffix is ok.
     if (($action === 'create' && !$context) || !in_array($valueType, self::$pseudoConstantSuffixes, TRUE)) {
       throw new \API_Exception('Illegal expression');
     }
-    $baoName = $context ? CoreUtil::getBAOFromApiName($entity) : NULL;
+    $baoName = $context ? CoreUtil::getBAOFromApiName($field['entity']) : NULL;
     // Use BAO::buildOptions if possible
     if ($baoName) {
+      $fieldName = empty($field['custom_field_id']) ? $field['name'] : 'custom_' . $field['custom_field_id'];
       $options = $baoName::buildOptions($fieldName, $context, $params);
     }
     // Fallback for option lists that exist in the api but not the BAO
     if (!isset($options) || $options === FALSE) {
-      $options = civicrm_api4($entity, 'getFields', ['action' => $action, 'loadOptions' => ['id', $valueType], 'where' => [['name', '=', $fieldName]]])[0]['options'] ?? NULL;
+      $options = civicrm_api4($field['entity'], 'getFields', ['action' => $action, 'loadOptions' => ['id', $valueType], 'where' => [['name', '=', $field['name']]]])[0]['options'] ?? NULL;
       $options = $options ? array_column($options, $valueType, 'id') : $options;
     }
     if (is_array($options)) {
       return $options;
     }
-    throw new \API_Exception("No option list found for '$fieldName'");
+    throw new \API_Exception("No option list found for '{$field['name']}'");
   }
 
   /**
diff --git a/tests/phpunit/api/v4/Action/CustomFieldAlterTest.php b/tests/phpunit/api/v4/Action/CustomFieldAlterTest.php
new file mode 100644
index 000000000000..3e44ca82e2d5
--- /dev/null
+++ b/tests/phpunit/api/v4/Action/CustomFieldAlterTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+
+namespace api\v4\Action;
+
+use Civi\Api4\Activity;
+use Civi\Api4\CustomField;
+use Civi\Api4\CustomGroup;
+
+/**
+ * @group headless
+ */
+class CustomFieldAlterTest extends BaseCustomValueTest {
+
+  public function testChangeSerialize() {
+    $contact = $this->createEntity(['type' => 'Individual']);
+
+    $customGroup = CustomGroup::create(FALSE)
+      ->addValue('title', 'MyFieldsToAlter')
+      ->addValue('extends', 'Activity')
+      ->addChain('field1', CustomField::create()
+        ->addValue('custom_group_id', '$id')
+        ->addValue('label', 'TestOptions')
+        ->addValue('html_type', 'Select')
+        ->addValue('option_values', [
+          1 => 'One',
+          2 => 'Two',
+          3 => 'Three',
+          4 => 'Four',
+        ]), 0
+      )
+      ->addChain('field2', CustomField::create()
+        ->addValue('custom_group_id', '$id')
+        ->addValue('label', 'TestText')
+        ->addValue('html_type', 'Text'), 0
+      )
+      ->execute()
+      ->first();
+
+    Activity::save(FALSE)
+      ->setDefaults(['activity_type_id' => 1, 'source_contact_id' => $contact['id']])
+      ->addRecord(['subject' => 'A1', 'MyFieldsToAlter.TestText' => 'A1', 'MyFieldsToAlter.TestOptions' => '1'])
+      ->addRecord(['subject' => 'A2', 'MyFieldsToAlter.TestText' => 'A2', 'MyFieldsToAlter.TestOptions' => '2'])
+      ->addRecord(['subject' => 'A3', 'MyFieldsToAlter.TestText' => 'A3', 'MyFieldsToAlter.TestOptions' => ''])
+      ->addRecord(['subject' => 'A4', 'MyFieldsToAlter.TestText' => 'A4'])
+      ->execute();
+
+    $result = Activity::get(FALSE)
+      ->addWhere('MyFieldsToAlter.TestText', 'IS NOT NULL')
+      ->addSelect('custom.*', 'subject', 'MyFieldsToAlter.TestOptions:label')
+      ->execute()->indexBy('subject');
+
+    $this->assertCount(4, $result);
+    $this->assertEquals(1, $result['A1']['MyFieldsToAlter.TestOptions']);
+    $this->assertEquals(2, $result['A2']['MyFieldsToAlter.TestOptions']);
+    $this->assertEquals('One', $result['A1']['MyFieldsToAlter.TestOptions:label']);
+    $this->assertEquals('Two', $result['A2']['MyFieldsToAlter.TestOptions:label']);
+    $this->assertTrue(empty($result['A3']['MyFieldsToAlter.TestOptions']));
+    $this->assertTrue(empty($result['A4']['MyFieldsToAlter.TestOptions']));
+
+    // Change field to multiselect
+    CustomField::update(FALSE)
+      ->addWhere('id', '=', $customGroup['field1']['id'])
+      ->addValue('serialize', TRUE)
+      ->execute();
+
+    $result = Activity::get(FALSE)
+      ->addWhere('MyFieldsToAlter.TestText', 'IS NOT NULL')
+      ->addSelect('custom.*', 'subject', 'MyFieldsToAlter.TestOptions:label')
+      ->execute()->indexBy('subject');
+
+    $this->assertEquals([1], $result['A1']['MyFieldsToAlter.TestOptions']);
+    $this->assertEquals([2], $result['A2']['MyFieldsToAlter.TestOptions']);
+    $this->assertEquals(['One'], $result['A1']['MyFieldsToAlter.TestOptions:label']);
+    $this->assertTrue(empty($result['A3']['MyFieldsToAlter.TestOptions']));
+    $this->assertTrue(empty($result['A4']['MyFieldsToAlter.TestOptions']));
+
+    // Change back to single-select
+    CustomField::update(FALSE)
+      ->addWhere('id', '=', $customGroup['field1']['id'])
+      ->addValue('serialize', FALSE)
+      ->execute();
+
+    $result = Activity::get(FALSE)
+      ->addWhere('MyFieldsToAlter.TestText', 'IS NOT NULL')
+      ->addSelect('custom.*', 'subject', 'MyFieldsToAlter.TestOptions:label')
+      ->execute()->indexBy('subject');
+
+    $this->assertCount(4, $result);
+    $this->assertEquals(1, $result['A1']['MyFieldsToAlter.TestOptions']);
+    $this->assertEquals(2, $result['A2']['MyFieldsToAlter.TestOptions']);
+    $this->assertEquals('One', $result['A1']['MyFieldsToAlter.TestOptions:label']);
+    $this->assertEquals('Two', $result['A2']['MyFieldsToAlter.TestOptions:label']);
+    $this->assertTrue(empty($result['A3']['MyFieldsToAlter.TestOptions']));
+    $this->assertTrue(empty($result['A4']['MyFieldsToAlter.TestOptions']));
+  }
+
+}

From 9aea3ced3b1d81536d8ffe5183086c7d75655ccb Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 8 Sep 2020 11:27:32 -0400
Subject: [PATCH 226/834] Custom Field Form - Cleanup country/state leftover
 cruft

---
 CRM/Custom/Form/ChangeFieldType.php |  1 -
 CRM/Custom/Form/Field.php           | 25 ++++++++-----------------
 templates/CRM/Custom/Form/Field.tpl |  6 +++---
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php
index 8ba794c5cc56..54f9197ea853 100644
--- a/CRM/Custom/Form/ChangeFieldType.php
+++ b/CRM/Custom/Form/ChangeFieldType.php
@@ -225,7 +225,6 @@ public static function fieldTypeTransitions($dataType, $htmlType) {
 
       case 'Int':
       case 'Float':
-      case 'Int':
       case 'Money':
         if (in_array($htmlType, array_keys($singleValueOps))) {
           unset($singleValueOps[$htmlType]);
diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index af6ca363cbe7..2bbc8e0c073d 100644
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -158,8 +158,8 @@ public function preProcess() {
         ['TextArea' => ts('TextArea'), 'RichTextEditor' => ts('Rich Text Editor')],
         ['Date' => ts('Select Date')],
         ['Radio' => ts('Radio')],
-        ['StateProvince' => ts('Select')],
-        ['Country' => ts('Select')],
+        ['Select' => ts('Select')],
+        ['Select' => ts('Select')],
         ['File' => ts('Select File')],
         ['Link' => ts('Link')],
         ['ContactReference' => ts('Autocomplete-Select')],
@@ -180,17 +180,14 @@ public function setDefaultValues() {
     if ($this->_id) {
       $this->assign('id', $this->_id);
       $this->_gid = $defaults['custom_group_id'];
+      $defaultValue = $defaults['default_value'] ?? NULL;
 
       //get the value for state or country
-      if ($defaults['data_type'] == 'StateProvince' &&
-        $stateId = CRM_Utils_Array::value('default_value', $defaults)
-      ) {
-        $defaults['default_value'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $stateId);
+      if ($defaults['data_type'] == 'StateProvince' && $defaultValue) {
+        $defaults['default_value'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $defaultValue);
       }
-      elseif ($defaults['data_type'] == 'Country' &&
-        $countryId = CRM_Utils_Array::value('default_value', $defaults)
-      ) {
-        $defaults['default_value'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Country', $countryId);
+      elseif ($defaults['data_type'] == 'Country' && $defaultValue) {
+        $defaults['default_value'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Country', $defaultValue);
       }
 
       if ($defaults['data_type'] == 'ContactReference' && !empty($defaults['filter'])) {
@@ -259,13 +256,6 @@ public function setDefaultValues() {
       $defaults['is_view'] = 0;
     }
 
-    if (!empty($defaults['html_type'])) {
-      $dontShowLink = substr($defaults['html_type'], -14) == 'State/Province' || substr($defaults['html_type'], -7) == 'Country' ? 1 : 0;
-    }
-
-    if (isset($dontShowLink)) {
-      $this->assign('dontShowLink', $dontShowLink);
-    }
     if ($this->_action & CRM_Core_Action::ADD &&
       CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_multiple', 'id')
     ) {
@@ -330,6 +320,7 @@ public function buildQuickForm() {
     if ($this->_action == CRM_Core_Action::UPDATE) {
       $this->freeze('data_type');
       if (!empty($this->_values['option_group_id'])) {
+        $this->assign('hasOptionGroup', TRUE);
         // Before dev/core#155 we didn't set the is_reserved flag properly, which should be handled by the upgrade script...
         //  but it is still possible that existing installs may have optiongroups linked to custom fields that are marked reserved.
         $optionGroupParams['id'] = $this->_values['option_group_id'];
diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index fe0d6914825e..5dd62613b9ca 100644
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -272,7 +272,7 @@
 
       $("#noteColumns, #noteRows, #noteLength", $form).toggle(dataType === 'Memo');
 
-      $(".crm-custom-field-form-block-serialize", $form).toggle(htmlType === 'Select' || htmlType === 'Country' || htmlType === 'StateProvince');
+      $(".crm-custom-field-form-block-serialize", $form).toggle(htmlType === 'Select');
     }
 
     $('[name^="data_type"]', $form).change(customOptionHtmlType);
@@ -282,8 +282,8 @@
   });
 </script>
 {/literal}
-{* Give link to view/edit choice options if in edit mode and html_type is one of the multiple choice types *}
-{if $action eq 2 AND ($form.data_type.value.1.0 eq 'CheckBox' OR ($form.data_type.value.1.0 eq 'Radio' AND $form.data_type.value.0.0 neq 6) OR $form.data_type.value.1.0 eq 'Select' OR ($form.data_type.value.1.0 eq 'Multi-Select' AND $dontShowLink neq 1 ) ) }
+{* Give link to view/edit option group *}
+{if $action eq 2 && !empty($hasOptionGroup) }
   <div class="action-link">
     {crmButton p="civicrm/admin/custom/group/field/option" q="reset=1&action=browse&fid=`$id`&gid=`$gid`" icon="pencil"}{ts}View / Edit Multiple Choice Options{/ts}{/crmButton}
   </div>

From 9b85cd33d84cbd8ca53fe346c8b1fc1cf8c90fe0 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 9 Sep 2020 09:47:23 -0400
Subject: [PATCH 227/834] Custom field admin form reform

This overhauls the custom field administration form:
- Gets rid of the difficult-to-use hierarchcal select
- Removes changeFieldType as a separate form
- Allows changing field type on the main form, with improved validation
- Fixes up some metadata
- Improves choosing default values
---
 CRM/Core/BAO/CustomField.php                  |   4 +-
 CRM/Core/DAO/CustomField.php                  |   7 +-
 CRM/Core/SelectValues.php                     |   1 -
 CRM/Core/xml/Menu/Admin.xml                   |   5 -
 CRM/Custom/Form/ChangeFieldType.php           | 309 ----------------
 CRM/Custom/Form/Field.php                     | 344 ++++++------------
 js/Common.js                                  |  11 +
 templates/CRM/Custom/Form/ChangeFieldType.tpl |  46 ---
 templates/CRM/Custom/Form/Field.tpl           | 157 +++++---
 tests/phpunit/api/v3/CustomFieldTest.php      |  15 +-
 tests/phpunit/api/v3/CustomValueTest.php      |  12 +-
 xml/schema/Core/CustomField.xml               |   5 +
 12 files changed, 247 insertions(+), 669 deletions(-)
 delete mode 100644 CRM/Custom/Form/ChangeFieldType.php
 delete mode 100644 templates/CRM/Custom/Form/ChangeFieldType.tpl

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index c67b60f7a9c5..55e1b786bbc7 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -157,13 +157,13 @@ public static function bulkSave($bulkParams, $defaults = []) {
    * Fetch object based on array of properties.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
+   *   An assoc array of name/value pairs.
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
    * @return CRM_Core_DAO_CustomField
    */
-  public static function retrieve(&$params, &$defaults) {
+  public static function retrieve($params, &$defaults) {
     return CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_CustomField', $params, $defaults);
   }
 
diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 698d34a4956d..5edafdf5c6e1 100644
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4ded3c0d1a8e34502a5957ee74c4480a)
+ * (GenCodeChecksum:b74179ea5553c544931562d6aac5641e)
  */
 
 /**
@@ -365,6 +365,7 @@ public static function &fields() {
           'localizable' => 0,
           'html' => [
             'type' => 'Select',
+            'label' => ts("Data Type"),
           ],
           'pseudoconstant' => [
             'callback' => 'CRM_Core_BAO_CustomField::dataType',
@@ -384,6 +385,10 @@ public static function &fields() {
           'entity' => 'CustomField',
           'bao' => 'CRM_Core_BAO_CustomField',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Select',
+            'label' => ts("Field Input Type"),
+          ],
           'pseudoconstant' => [
             'callback' => 'CRM_Core_SelectValues::customHtmlType',
           ],
diff --git a/CRM/Core/SelectValues.php b/CRM/Core/SelectValues.php
index 7adcd178c528..b81422698ff8 100644
--- a/CRM/Core/SelectValues.php
+++ b/CRM/Core/SelectValues.php
@@ -177,7 +177,6 @@ public static function customHtmlType() {
       'RichTextEditor' => ts('Rich Text Editor'),
       'Autocomplete-Select' => ts('Autocomplete-Select'),
       'Link' => ts('Link'),
-      'ContactReference' => ts('Autocomplete-Select'),
     ];
   }
 
diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index df4d108a1d47..245b7ae549bd 100644
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -36,11 +36,6 @@
      <title>Custom Field - Move</title>
      <page_callback>CRM_Custom_Form_MoveField</page_callback>
   </item>
-  <item>
-     <path>civicrm/admin/custom/group/field/changetype</path>
-     <title>Custom Field - Change Type</title>
-     <page_callback>CRM_Custom_Form_ChangeFieldType</page_callback>
-  </item>
   <item>
      <path>civicrm/admin/uf/group</path>
      <title>Profiles</title>
diff --git a/CRM/Custom/Form/ChangeFieldType.php b/CRM/Custom/Form/ChangeFieldType.php
deleted file mode 100644
index 54f9197ea853..000000000000
--- a/CRM/Custom/Form/ChangeFieldType.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class is to build the form for Deleting Group
- */
-class CRM_Custom_Form_ChangeFieldType extends CRM_Core_Form {
-
-  /**
-   * The field id
-   *
-   * @var int
-   */
-  protected $_id;
-
-  /**
-   * Array of custom field values
-   * @var array
-   */
-  protected $_values;
-
-  /**
-   * Mapper array of valid field type
-   * @var array
-   */
-  protected $_htmlTypeTransitions;
-
-  /**
-   * Set up variables to build the form.
-   *
-   * @return void
-   * @access protected
-   */
-  public function preProcess() {
-    $this->_id = CRM_Utils_Request::retrieve('id', 'Positive',
-      $this, TRUE
-    );
-
-    $this->_values = [];
-    $params = ['id' => $this->_id];
-    CRM_Core_BAO_CustomField::retrieve($params, $this->_values);
-
-    if ($this->_values['html_type'] == 'Select' && $this->_values['serialize']) {
-      $this->_values['html_type'] = 'Multi-Select';
-    }
-    $this->_htmlTypeTransitions = self::fieldTypeTransitions(CRM_Utils_Array::value('data_type', $this->_values),
-      CRM_Utils_Array::value('html_type', $this->_values)
-    );
-
-    if (empty($this->_values) || empty($this->_htmlTypeTransitions)) {
-      CRM_Core_Error::statusBounce(ts("Invalid custom field or can't change input type of this custom field."));
-    }
-
-    $url = CRM_Utils_System::url('civicrm/admin/custom/group/field/update',
-      "action=update&reset=1&gid={$this->_values['custom_group_id']}&id={$this->_id}"
-    );
-    $session = CRM_Core_Session::singleton();
-    $session->pushUserContext($url);
-
-    CRM_Utils_System::setTitle(ts('Change Field Type: %1',
-      [1 => $this->_values['label']]
-    ));
-  }
-
-  /**
-   * Build the form object.
-   *
-   * @return void
-   */
-  public function buildQuickForm() {
-
-    $srcHtmlType = $this->add('select',
-      'src_html_type',
-      ts('Current HTML Type'),
-      [$this->_values['html_type'] => $this->_values['html_type']],
-      TRUE
-    );
-
-    $srcHtmlType->setValue($this->_values['html_type']);
-    $srcHtmlType->freeze();
-
-    $this->assign('srcHtmlType', $this->_values['html_type']);
-
-    $dstHtmlType = $this->add('select',
-      'dst_html_type',
-      ts('New HTML Type'),
-      [
-        '' => ts('- select -'),
-      ] + $this->_htmlTypeTransitions,
-      TRUE
-    );
-
-    $this->addButtons([
-      [
-        'type' => 'next',
-        'name' => ts('Change Field Type'),
-        'isDefault' => TRUE,
-        'js' => ['onclick' => 'return checkCustomDataField();'],
-      ],
-      [
-        'type' => 'cancel',
-        'name' => ts('Cancel'),
-      ],
-    ]);
-  }
-
-  /**
-   * Process the form when submitted.
-   *
-   * @return void
-   */
-  public function postProcess() {
-    $params = $this->controller->exportValues($this->_name);
-
-    $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup',
-      $this->_values['custom_group_id'],
-      'table_name'
-    );
-
-    $singleValueOps = [
-      'Text',
-      'Select',
-      'Radio',
-      'Autocomplete-Select',
-    ];
-
-    $mutliValueOps = [
-      'CheckBox',
-      'Multi-Select',
-    ];
-
-    $srcHtmlType = $this->_values['html_type'];
-    $dstHtmlType = $params['dst_html_type'];
-
-    $customField = new CRM_Core_DAO_CustomField();
-    $customField->id = $this->_id;
-    $customField->find(TRUE);
-    $customField->serialize = in_array($dstHtmlType, $mutliValueOps, TRUE);
-
-    if ($dstHtmlType == 'Text' && in_array($srcHtmlType, [
-      'Select',
-      'Radio',
-      'Autocomplete-Select',
-    ])) {
-      $customField->option_group_id = 'NULL';
-      CRM_Core_BAO_CustomField::checkOptionGroup($this->_values['option_group_id']);
-    }
-
-    if (in_array($srcHtmlType, $mutliValueOps) &&
-      in_array($dstHtmlType, $singleValueOps)) {
-      $this->flattenToFirstValue($tableName, $this->_values['column_name']);
-    }
-    elseif (in_array($srcHtmlType, $singleValueOps) &&
-      in_array($dstHtmlType, $mutliValueOps)) {
-      $this->firstValueToFlatten($tableName, $this->_values['column_name']);
-    }
-
-    $customField->html_type = ($dstHtmlType === 'Multi-Select') ? 'Select' : $dstHtmlType;
-    $customField->save();
-
-    // Reset cache for custom fields
-    Civi::cache('fields')->flush();
-    // reset ACL and system caches.
-    CRM_Core_BAO_Cache::resetCaches();
-
-    CRM_Core_Session::setStatus(ts('Input type of custom field \'%1\' has been successfully changed to \'%2\'.',
-      [1 => $this->_values['label'], 2 => $dstHtmlType]
-    ), ts('Field Type Changed'), 'success');
-  }
-
-  /**
-   * @param $dataType
-   * @param $htmlType
-   *
-   * @return array|null
-   */
-  public static function fieldTypeTransitions($dataType, $htmlType) {
-    // Text field is single value field,
-    // can not be change to other single value option which contains option group
-    if ($htmlType == 'Text') {
-      return NULL;
-    }
-
-    $singleValueOps = [
-      'Text' => 'Text',
-      'Select' => 'Select',
-      'Radio' => 'Radio',
-      'Autocomplete-Select' => 'Autocomplete-Select',
-    ];
-
-    $mutliValueOps = [
-      'CheckBox' => 'CheckBox',
-      'Multi-Select' => 'Multi-Select',
-    ];
-
-    switch ($dataType) {
-      case 'String':
-        if (in_array($htmlType, array_keys($singleValueOps))) {
-          unset($singleValueOps[$htmlType]);
-          return array_merge($singleValueOps, $mutliValueOps);
-        }
-        elseif (in_array($htmlType, array_keys($mutliValueOps))) {
-          unset($singleValueOps['Text']);
-          foreach ($singleValueOps as $type => $label) {
-            $singleValueOps[$type] = "{$label} ( " . ts('Not Safe') . " )";
-          }
-          unset($mutliValueOps[$htmlType]);
-          return array_merge($mutliValueOps, $singleValueOps);
-        }
-        break;
-
-      case 'Int':
-      case 'Float':
-      case 'Money':
-        if (in_array($htmlType, array_keys($singleValueOps))) {
-          unset($singleValueOps[$htmlType]);
-          return $singleValueOps;
-        }
-        break;
-
-      case 'Memo':
-        $ops = [
-          'TextArea' => 'TextArea',
-          'RichTextEditor' => 'RichTextEditor',
-        ];
-        if (in_array($htmlType, array_keys($ops))) {
-          unset($ops[$htmlType]);
-          return $ops;
-        }
-        break;
-    }
-
-    return NULL;
-  }
-
-  /**
-   * Take a single-value column (eg: a Radio or Select etc ) and convert
-   * value to the multi listed value (eg:"^Foo^")
-   *
-   * @param string $table
-   * @param string $column
-   */
-  public function firstValueToFlatten($table, $column) {
-    $selectSql = "SELECT id, $column FROM $table WHERE $column IS NOT NULL";
-    $updateSql = "UPDATE $table SET $column = %1 WHERE id = %2";
-    $dao = CRM_Core_DAO::executeQuery($selectSql);
-    while ($dao->fetch()) {
-      if (!$dao->{$column}) {
-        continue;
-      }
-      $value = CRM_Core_DAO::VALUE_SEPARATOR . $dao->{$column} . CRM_Core_DAO::VALUE_SEPARATOR;
-      $params = [
-        1 => [(string) $value, 'String'],
-        2 => [$dao->id, 'Integer'],
-      ];
-      CRM_Core_DAO::executeQuery($updateSql, $params);
-    }
-  }
-
-  /**
-   * Take a multi-value column (e.g. a Multi-Select or CheckBox column), and convert
-   * all values (of the form "^^" or "^Foo^" or "^Foo^Bar^") to the first listed value ("Foo")
-   *
-   * @param string $table
-   * @param string $column
-   */
-  public function flattenToFirstValue($table, $column) {
-    $selectSql = "SELECT id, $column FROM $table WHERE $column IS NOT NULL";
-    $updateSql = "UPDATE $table SET $column = %1 WHERE id = %2";
-    $dao = CRM_Core_DAO::executeQuery($selectSql);
-    while ($dao->fetch()) {
-      $values = self::explode($dao->{$column});
-      $params = [
-        1 => [(string) array_shift($values), 'String'],
-        2 => [$dao->id, 'Integer'],
-      ];
-      CRM_Core_DAO::executeQuery($updateSql, $params);
-    }
-  }
-
-  /**
-   * @param $str
-   *
-   * @return array
-   */
-  public static function explode($str) {
-    if (empty($str) || $str == CRM_Core_DAO::VALUE_SEPARATOR . CRM_Core_DAO::VALUE_SEPARATOR) {
-      return [];
-    }
-    else {
-      return explode(CRM_Core_DAO::VALUE_SEPARATOR, trim($str, CRM_Core_DAO::VALUE_SEPARATOR));
-    }
-  }
-
-}
diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php
index 2bbc8e0c073d..ba68cc706a72 100644
--- a/CRM/Custom/Form/Field.php
+++ b/CRM/Custom/Form/Field.php
@@ -39,13 +39,6 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
    */
   protected $_id;
 
-  /**
-   * The default custom data/input types, when editing the field
-   *
-   * @var array
-   */
-  protected $_defaultDataType;
-
   /**
    * Array of custom field values if update mode.
    * @var array
@@ -57,36 +50,26 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
    *
    * @var array
    */
-  private static $_dataTypeValues = NULL;
-  private static $_dataTypeKeys = NULL;
-
-  private static $_dataToLabels = NULL;
+  public static $htmlTypesWithOptions = ['Select', 'Radio', 'CheckBox', 'Autocomplete-Select'];
 
   /**
-   * Used for mapping data types to html type options.
+   * Maps each data_type to allowed html_type options
    *
-   * Each item in this array corresponds to the same index in the dataType array
-   * @var array
+   * @var array[]
    */
   public static $_dataToHTML = [
-    [
-      'Text' => 'Text',
-      'Select' => 'Select',
-      'Radio' => 'Radio',
-      'CheckBox' => 'CheckBox',
-      'Autocomplete-Select' => 'Autocomplete-Select',
-    ],
-    ['Text' => 'Text', 'Select' => 'Select', 'Radio' => 'Radio'],
-    ['Text' => 'Text', 'Select' => 'Select', 'Radio' => 'Radio'],
-    ['Text' => 'Text', 'Select' => 'Select', 'Radio' => 'Radio'],
-    ['TextArea' => 'TextArea', 'RichTextEditor' => 'RichTextEditor'],
-    ['Date' => 'Select Date'],
-    ['Radio' => 'Radio'],
-    ['StateProvince' => 'Select'],
-    ['Country' => 'Select'],
-    ['File' => 'File'],
-    ['Link' => 'Link'],
-    ['ContactReference' => 'Autocomplete-Select'],
+    'String' => ['Text', 'Select', 'Radio', 'CheckBox', 'Autocomplete-Select'],
+    'Int' => ['Text', 'Select', 'Radio'],
+    'Float' => ['Text', 'Select', 'Radio'],
+    'Money' => ['Text', 'Select', 'Radio'],
+    'Memo' => ['TextArea', 'RichTextEditor'],
+    'Date' => ['Select Date'],
+    'Boolean' => ['Radio'],
+    'StateProvince' => ['Select'],
+    'Country' => ['Select'],
+    'File' => ['File'],
+    'Link' => ['Link'],
+    'ContactReference' => ['Autocomplete-Select'],
   ];
 
   /**
@@ -95,19 +78,15 @@ class CRM_Custom_Form_Field extends CRM_Core_Form {
    * @return void
    */
   public function preProcess() {
-    if (!(self::$_dataTypeKeys)) {
-      self::$_dataTypeKeys = array_keys(CRM_Core_BAO_CustomField::dataType());
-      self::$_dataTypeValues = array_values(CRM_Core_BAO_CustomField::dataType());
-    }
-
     //custom field id
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
 
+    $this->assign('dataToHTML', self::$_dataToHTML);
+
     $this->_values = [];
     //get the values form db if update.
     if ($this->_id) {
-      $params = ['id' => $this->_id];
-      CRM_Core_BAO_CustomField::retrieve($params, $this->_values);
+      CRM_Core_BAO_CustomField::retrieve(['id' => $this->_id], $this->_values);
       // note_length is an alias for the text_length field
       $this->_values['note_length'] = $this->_values['text_length'] ?? NULL;
       // custom group id
@@ -130,41 +109,6 @@ public function preProcess() {
       $session = CRM_Core_Session::singleton();
       $session->pushUserContext($url);
     }
-
-    if (self::$_dataToLabels == NULL) {
-      self::$_dataToLabels = [
-        [
-          'Text' => ts('Text'),
-          'Select' => ts('Select'),
-          'Radio' => ts('Radio'),
-          'CheckBox' => ts('CheckBox'),
-          'Autocomplete-Select' => ts('Autocomplete-Select'),
-        ],
-        [
-          'Text' => ts('Text'),
-          'Select' => ts('Select'),
-          'Radio' => ts('Radio'),
-        ],
-        [
-          'Text' => ts('Text'),
-          'Select' => ts('Select'),
-          'Radio' => ts('Radio'),
-        ],
-        [
-          'Text' => ts('Text'),
-          'Select' => ts('Select'),
-          'Radio' => ts('Radio'),
-        ],
-        ['TextArea' => ts('TextArea'), 'RichTextEditor' => ts('Rich Text Editor')],
-        ['Date' => ts('Select Date')],
-        ['Radio' => ts('Radio')],
-        ['Select' => ts('Select')],
-        ['Select' => ts('Select')],
-        ['File' => ts('Select File')],
-        ['Link' => ts('Link')],
-        ['ContactReference' => ts('Autocomplete-Select')],
-      ];
-    }
   }
 
   /**
@@ -177,19 +121,12 @@ public function preProcess() {
   public function setDefaultValues() {
     $defaults = $this->_values;
 
+    // Defaults for update mode
     if ($this->_id) {
       $this->assign('id', $this->_id);
       $this->_gid = $defaults['custom_group_id'];
       $defaultValue = $defaults['default_value'] ?? NULL;
 
-      //get the value for state or country
-      if ($defaults['data_type'] == 'StateProvince' && $defaultValue) {
-        $defaults['default_value'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_StateProvince', $defaultValue);
-      }
-      elseif ($defaults['data_type'] == 'Country' && $defaultValue) {
-        $defaults['default_value'] = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Country', $defaultValue);
-      }
-
       if ($defaults['data_type'] == 'ContactReference' && !empty($defaults['filter'])) {
         $contactRefFilter = 'Advance';
         if (strpos($defaults['filter'], 'action=lookup') !== FALSE &&
@@ -215,51 +152,32 @@ public function setDefaultValues() {
         $defaults['filter_selected'] = $contactRefFilter;
       }
 
-      if (!empty($defaults['data_type'])) {
-        $defaultDataType = array_search($defaults['data_type'],
-          self::$_dataTypeKeys
-        );
-        $defaultHTMLType = array_search($defaults['html_type'],
-          self::$_dataToHTML[$defaultDataType]
-        );
-        $defaults['data_type'] = [
-          '0' => $defaultDataType,
-          '1' => $defaultHTMLType,
-        ];
-        $this->_defaultDataType = $defaults['data_type'];
-      }
-
       $defaults['option_type'] = 2;
-
-      $this->assign('changeFieldType', CRM_Custom_Form_ChangeFieldType::fieldTypeTransitions($this->_values['data_type'], $this->_values['html_type']));
     }
-    else {
+
+    // Defaults for create mode
+    if ($this->_action & CRM_Core_Action::ADD) {
+      $defaults['data_type'] = 'String';
+      $defaults['html_type'] = 'Text';
       $defaults['is_active'] = 1;
       $defaults['option_type'] = 1;
       $defaults['is_search_range'] = 1;
-    }
-
-    // set defaults for weight.
-    for ($i = 1; $i <= self::NUM_OPTION; $i++) {
-      $defaults['option_status[' . $i . ']'] = 1;
-      $defaults['option_weight[' . $i . ']'] = $i;
-      $defaults['option_value[' . $i . ']'] = $i;
-    }
-
-    if ($this->_action & CRM_Core_Action::ADD) {
-      $fieldValues = ['custom_group_id' => $this->_gid];
-      $defaults['weight'] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_CustomField', $fieldValues);
-
+      $defaults['weight'] = CRM_Utils_Weight::getDefaultWeight('CRM_Core_DAO_CustomField', ['custom_group_id' => $this->_gid]);
       $defaults['text_length'] = 255;
       $defaults['note_columns'] = 60;
       $defaults['note_rows'] = 4;
       $defaults['is_view'] = 0;
+
+      if (CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_multiple')) {
+        $defaults['in_selector'] = 1;
+      }
     }
 
-    if ($this->_action & CRM_Core_Action::ADD &&
-      CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_multiple', 'id')
-    ) {
-      $defaults['in_selector'] = 1;
+    // Set defaults for option values.
+    for ($i = 1; $i <= self::NUM_OPTION; $i++) {
+      $defaults['option_status[' . $i . ']'] = 1;
+      $defaults['option_weight[' . $i . ']'] = $i;
+      $defaults['option_value[' . $i . ']'] = $i;
     }
 
     return $defaults;
@@ -277,8 +195,6 @@ public function buildQuickForm() {
       $this->assign('gid', $this->_gid);
     }
 
-    $this->assign('dataTypeKeys', self::$_dataTypeKeys);
-
     // lets trim all the whitespace
     $this->applyFilter('__ALL__', 'trim');
 
@@ -292,17 +208,11 @@ public function buildQuickForm() {
       TRUE
     );
 
-    $dt = &self::$_dataTypeValues;
-    $it = [];
-    foreach ($dt as $key => $value) {
-      $it[$key] = self::$_dataToLabels[$key];
-    }
-    $sel = &$this->addElement('hierselect',
-      'data_type',
-      ts('Data and Input Field Type'),
-      '&nbsp;&nbsp;&nbsp;'
-    );
-    $sel->setOptions([$dt, $it]);
+    // FIXME: Switch addField to use APIv4 so we don't get those legacy options from v3
+    $htmlOptions = CRM_Core_BAO_CustomField::buildOptions('html_type', 'create');
+
+    $this->addField('data_type', ['class' => 'twenty'], TRUE);
+    $this->addField('html_type', ['class' => 'twenty', 'options' => $htmlOptions], TRUE);
 
     if (CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'is_multiple')) {
       $this->add('checkbox', 'in_selector', ts('Display in Table?'));
@@ -320,12 +230,17 @@ public function buildQuickForm() {
     if ($this->_action == CRM_Core_Action::UPDATE) {
       $this->freeze('data_type');
       if (!empty($this->_values['option_group_id'])) {
-        $this->assign('hasOptionGroup', TRUE);
+        $this->assign('hasOptionGroup', in_array($this->_values['html_type'], self::$htmlTypesWithOptions));
         // Before dev/core#155 we didn't set the is_reserved flag properly, which should be handled by the upgrade script...
         //  but it is still possible that existing installs may have optiongroups linked to custom fields that are marked reserved.
         $optionGroupParams['id'] = $this->_values['option_group_id'];
         $optionGroupParams['options']['or'] = [["is_reserved", "id"]];
       }
+      $this->assign('originalHtmlType', $this->_values['html_type']);
+      $this->assign('originalSerialize', $this->_values['serialize']);
+      if (!empty($this->_values['serialize'])) {
+        $this->assign('existingMultiValueCount', $this->getMultiValueCount());
+      }
     }
 
     // Retrieve optiongroups for selection list
@@ -531,8 +446,7 @@ public function buildQuickForm() {
     // is searchable by range?
     $this->addRadio('is_search_range', ts('Search by Range?'), [ts('No'), ts('Yes')]);
 
-    // add buttons
-    $this->addButtons([
+    $buttons = [
       [
         'type' => 'done',
         'name' => ts('Save'),
@@ -547,7 +461,14 @@ public function buildQuickForm() {
         'type' => 'cancel',
         'name' => ts('Cancel'),
       ],
-    ]);
+    ];
+    // Save & new only applies to adding a field
+    if ($this->_id) {
+      unset($buttons[1]);
+    }
+
+    // add buttons
+    $this->addButtons($buttons);
 
     // add a form rule to check default value
     $this->addFormRule(['CRM_Custom_Form_Field', 'formRule'], $this);
@@ -617,11 +538,7 @@ public static function formRule($fields, $files, $self) {
       $errors['label'] = ts("You cannot use 'id' as a field label.");
     }
 
-    if (!isset($fields['data_type'][0]) || !isset($fields['data_type'][1])) {
-      $errors['_qf_default'] = ts('Please enter valid - Data and Input Field Type.');
-    }
-
-    $dataType = self::$_dataTypeKeys[$fields['data_type'][0]];
+    $dataType = $fields['data_type'];
 
     if ($default || $dataType == 'ContactReference') {
       switch ($dataType) {
@@ -663,8 +580,8 @@ public static function formRule($fields, $files, $self) {
 
         case 'Country':
           if (!empty($default)) {
-            $query = "SELECT count(*) FROM civicrm_country WHERE name = %1 OR iso_code = %1";
-            $params = [1 => [$fields['default_value'], 'String']];
+            $query = "SELECT count(*) FROM civicrm_country WHERE id = %1";
+            $params = [1 => [$fields['default_value'], 'Int']];
             if (CRM_Core_DAO::singleValueQuery($query, $params) <= 0) {
               $errors['default_value'] = ts('Invalid default value for country.');
             }
@@ -676,9 +593,8 @@ public static function formRule($fields, $files, $self) {
             $query = "
 SELECT count(*)
   FROM civicrm_state_province
- WHERE name = %1
-    OR abbreviation = %1";
-            $params = [1 => [$fields['default_value'], 'String']];
+ WHERE id = %1";
+            $params = [1 => [$fields['default_value'], 'Int']];
             if (CRM_Core_DAO::singleValueQuery($query, $params) <= 0) {
               $errors['default_value'] = ts('The invalid default value for State/Province data type');
             }
@@ -699,7 +615,7 @@ public static function formRule($fields, $files, $self) {
       }
     }
 
-    if (self::$_dataTypeKeys[$fields['data_type'][0]] == 'Date') {
+    if ($dataType == 'Date') {
       if (!$fields['date_format']) {
         $errors['date_format'] = ts('Please select a date format.');
       }
@@ -711,11 +627,7 @@ public static function formRule($fields, $files, $self) {
      */
     $_flagOption = $_rowError = 0;
     $_showHide = new CRM_Core_ShowHideBlocks('', '');
-    $dataType = self::$_dataTypeKeys[$fields['data_type'][0]];
-    if (isset($fields['data_type'][1])) {
-      $dataField = $fields['data_type'][1];
-    }
-    $optionFields = ['Select', 'CheckBox', 'Radio'];
+    $htmlType = $fields['html_type'];
 
     if (isset($fields['option_type']) && $fields['option_type'] == 1) {
       //capture duplicate Custom option values
@@ -827,8 +739,7 @@ public static function formRule($fields, $files, $self) {
         $_flagOption = $_emptyRow = 0;
       }
     }
-    elseif (isset($dataField) &&
-      in_array($dataField, $optionFields) &&
+    elseif (in_array($htmlType, self::$htmlTypesWithOptions) &&
       !in_array($dataType, ['Boolean', 'Country', 'StateProvince'])
     ) {
       if (!$fields['option_group_id']) {
@@ -841,10 +752,7 @@ public static function formRule($fields, $files, $self) {
 WHERE  data_type != %1
 AND    option_group_id = %2";
         $params = [
-          1 => [
-            self::$_dataTypeKeys[$fields['data_type'][0]],
-            'String',
-          ],
+          1 => [$dataType, 'String'],
           2 => [$fields['option_group_id'], 'Integer'],
         ];
         $count = CRM_Core_DAO::singleValueQuery($query, $params);
@@ -860,18 +768,10 @@ public static function formRule($fields, $files, $self) {
       $assignError->assign('optionRowError', $_rowError);
     }
     else {
-      if (isset($fields['data_type'][1])) {
-        switch (self::$_dataToHTML[$fields['data_type'][0]][$fields['data_type'][1]]) {
+      if (isset($htmlType)) {
+        switch ($htmlType) {
           case 'Radio':
-            $_fieldError = 1;
-            $assignError->assign('fieldError', $_fieldError);
-            break;
-
-          case 'Checkbox':
-            $_fieldError = 1;
-            $assignError->assign('fieldError', $_fieldError);
-            break;
-
+          case 'CheckBox':
           case 'Select':
             $_fieldError = 1;
             $assignError->assign('fieldError', $_fieldError);
@@ -900,6 +800,27 @@ public static function formRule($fields, $files, $self) {
       $errors['is_view'] = ts('Can not set this field Required and View Only at the same time.');
     }
 
+    // If switching to a new option list, validate existing data
+    if (empty($errors) && $self->_id && in_array($htmlType, self::$htmlTypesWithOptions)) {
+      $oldHtmlType = $self->_values['html_type'];
+      $oldOptionGroup = $self->_values['option_group_id'];
+      if ($oldHtmlType === 'Text' || $oldOptionGroup != $fields['option_group_id'] || $fields['option_type'] == 1) {
+        if ($fields['option_type'] == 2) {
+          $optionQuery = "SELECT value FROM civicrm_option_value WHERE option_group_id = " . (int) $fields['option_group_id'];
+        }
+        else {
+          $options = array_map(['CRM_Core_DAO', 'escapeString'], array_filter($fields['option_value'], 'strlen'));
+          $optionQuery = '"' . implode('","', $options) . '"';
+        }
+        $table = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $self->_gid, 'table_name');
+        $column = $self->_values['column_name'];
+        $invalid = CRM_Core_DAO::singleValueQuery("SELECT COUNT(*) FROM `$table` WHERE `$column` NOT IN ($optionQuery)");
+        if ($invalid) {
+          $errors['html_type'] = ts('Cannot impose option list because there is existing data which does not match the options.');
+        }
+      }
+    }
+
     return empty($errors) ? TRUE : $errors;
   }
 
@@ -912,24 +833,9 @@ public function postProcess() {
     // store the submitted values in an array
     $params = $this->controller->exportValues($this->_name);
     self::clearEmptyOptions($params);
-    if ($this->_action == CRM_Core_Action::UPDATE) {
-      $dataTypeKey = $this->_defaultDataType[0];
-      $params['data_type'] = self::$_dataTypeKeys[$this->_defaultDataType[0]];
-      $params['html_type'] = self::$_dataToHTML[$this->_defaultDataType[0]][$this->_defaultDataType[1]];
-    }
-    else {
-      $dataTypeKey = $params['data_type'][0];
-      $params['html_type'] = self::$_dataToHTML[$params['data_type'][0]][$params['data_type'][1]];
-      $params['data_type'] = self::$_dataTypeKeys[$params['data_type'][0]];
-    }
 
     //fix for 'is_search_range' field.
-    if (in_array($dataTypeKey, [
-      1,
-      2,
-      3,
-      5,
-    ])) {
+    if (in_array($params['data_type'], ['Int', 'Float', 'Money', 'Date'])) {
       if (empty($params['is_searchable'])) {
         $params['is_search_range'] = 0;
       }
@@ -938,11 +844,7 @@ public function postProcess() {
       $params['is_search_range'] = 0;
     }
 
-    // Serialization cannot be changed on update
-    if ($this->_id) {
-      unset($params['serialize']);
-    }
-    elseif (strpos($params['html_type'], 'Select') === 0) {
+    if ($params['html_type'] === 'Select') {
       $params['serialize'] = $params['serialize'] ? CRM_Core_DAO::SERIALIZE_SEPARATOR_BOOKEND : 'null';
     }
     else {
@@ -950,12 +852,11 @@ public function postProcess() {
     }
 
     $filter = 'null';
-    if ($dataTypeKey == 11 && !empty($params['filter_selected'])) {
+    if ($params['data_type'] == 'ContactReference' && !empty($params['filter_selected'])) {
       if ($params['filter_selected'] == 'Advance' && trim(CRM_Utils_Array::value('filter', $params))) {
         $filter = trim($params['filter']);
       }
       elseif ($params['filter_selected'] == 'Group' && !empty($params['group_id'])) {
-
         $filter = 'action=lookup&group=' . implode(',', $params['group_id']);
       }
     }
@@ -971,43 +872,6 @@ public function postProcess() {
       $params['weight'] = CRM_Utils_Weight::updateOtherWeights('CRM_Core_DAO_CustomField', $oldWeight, $params['weight'], $fieldValues);
     }
 
-    $strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
-
-    //store the primary key for State/Province or Country as default value.
-    if (strlen(trim($params['default_value']))) {
-      switch ($params['data_type']) {
-        case 'StateProvince':
-          $fieldStateProvince = $strtolower($params['default_value']);
-
-          // LOWER in query below roughly translates to 'hurt my database without deriving any benefit' See CRM-19811.
-          $query = "
-SELECT id
-  FROM civicrm_state_province
- WHERE LOWER(name) = '$fieldStateProvince'
-    OR abbreviation = '$fieldStateProvince'";
-          $dao = CRM_Core_DAO::executeQuery($query);
-          if ($dao->fetch()) {
-            $params['default_value'] = $dao->id;
-          }
-          break;
-
-        case 'Country':
-          $fieldCountry = $strtolower($params['default_value']);
-
-          // LOWER in query below roughly translates to 'hurt my database without deriving any benefit' See CRM-19811.
-          $query = "
-SELECT id
-  FROM civicrm_country
- WHERE LOWER(name) = '$fieldCountry'
-    OR iso_code = '$fieldCountry'";
-          $dao = CRM_Core_DAO::executeQuery($query);
-          if ($dao->fetch()) {
-            $params['default_value'] = $dao->id;
-          }
-          break;
-      }
-    }
-
     // The text_length attribute for Memo fields is in a different input as there
     // are different label, help text and default value than for other type fields
     if ($params['data_type'] == "Memo") {
@@ -1062,4 +926,32 @@ public static function clearEmptyOptions(&$fields) {
     }
   }
 
+  /**
+   * Get number of existing records for this field that contain more than one serialized value.
+   *
+   * @return int
+   * @throws CRM_Core_Exception
+   */
+  public function getMultiValueCount() {
+    $table = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $this->_gid, 'table_name');
+    $column = $this->_values['column_name'];
+    $sp = CRM_Core_DAO::VALUE_SEPARATOR;
+    $sql = "SELECT COUNT(*) FROM `$table` WHERE `$column` LIKE '{$sp}%{$sp}%{$sp}'";
+    return (int) CRM_Core_DAO::singleValueQuery($sql);
+  }
+
+  /**
+   * @return string
+   */
+  public function getDefaultContext() {
+    return 'create';
+  }
+
+  /**
+   * @return string
+   */
+  public function getDefaultEntity() {
+    return 'CustomField';
+  }
+
 }
diff --git a/js/Common.js b/js/Common.js
index f42314f6edb8..881dda124d0a 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -289,6 +289,17 @@ if (!CRM.vars) CRM.vars = {};
     return rendered;
   };
 
+  CRM.utils.getOptions = function(select) {
+    var options = [];
+    $('option', select).each(function() {
+      var option = {key: $(this).attr('value'), value: $(this).text()};
+      if (option.key !== '') {
+        options.push(option);
+      }
+    });
+    return options;
+  };
+
   function chainSelect() {
     var $form = $(this).closest('form'),
       $target = $('select[data-name="' + $(this).data('target') + '"]', $form),
diff --git a/templates/CRM/Custom/Form/ChangeFieldType.tpl b/templates/CRM/Custom/Form/ChangeFieldType.tpl
deleted file mode 100644
index e87067ea8447..000000000000
--- a/templates/CRM/Custom/Form/ChangeFieldType.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
-*}
-<div class="crm-block crm-form-block crm-custom-field-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    <div class='status'>{icon icon="fa-info-circle"}{/icon}
-        &nbsp;{ts}Warning: This functionality is currently in beta stage. Consider backing up your database before using it. Click "Cancel" to return to the "edit custom field" form without making changes.{/ts}
-    </div>
-    <table class="form-layout">
-        <tr class="crm-custom-src-field-form-block-label">
-            <td class="label">{$form.src_html_type.label}</td>
-            <td class="html-adjust">{$form.src_html_type.html}</td>
-        </tr>
-        <tr class="crm-custom-dst-field-form-block-label">
-            <td class="label">{$form.dst_html_type.label}</td>
-            <td class="html-adjust">{$form.dst_html_type.html}</td>
-        </tr>
-    </table>
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-</div>
-{literal}
-<script type="text/Javascript">
-  function checkCustomDataField( ) {
-    var srcHtmlType = {/literal}{$srcHtmlType|@json_encode}{literal};
-    var singleValOps = ['Text', 'Select', 'Radio', 'Autocomplete-Select'];
-    var multiValOps  = ['CheckBox', 'Multi-Select'];
-    var dstHtmlType = cj('#dst_html_type').val( );
-    if ( !dstHtmlType ) {
-      return true;
-    }
-
-    if ( ( cj.inArray(srcHtmlType, multiValOps) > -1 ) &&
-         ( cj.inArray(dstHtmlType, singleValOps) > -1 ) ) {
-    return confirm( "{/literal}{ts escape='js'}Changing a 'multi option' html type to a 'single option' html type, might results in a data loss. Please consider to take db backup before change the html type. Click 'Ok' to continue.{/ts}{literal}" );
-    }
-    return true;
-  }
-</script>
-{/literal}
-
diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index 5dd62613b9ca..aeb56d695bc6 100644
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -20,29 +20,16 @@
     </tr>
     <tr class="crm-custom-field-form-block-data_type">
       <td class="label">{$form.data_type.label}</td>
-      <td class="html-adjust">{$form.data_type.html}
-        {if $action neq 1 && $form.data_type.value[1][0] eq "Select" && $form.serialize.value}
-          <span>({ts}Multi-Select{/ts})</span>
-        {/if}
-        {if $action neq 4 and $action neq 2}
-          <br /><span class="description">{ts}Select the type of data you want to collect and store for this contact. Then select from the available HTML input field types (choices are based on the type of data being collected).{/ts}</span>
-        {/if}
-        {if $action eq 2 and $changeFieldType}
-          <br />
-          <a class="action-item crm-hover-button" href='{crmURL p="civicrm/admin/custom/group/field/changetype" q="reset=1&id=`$id`"}'>
-            <i class="crm-i fa-wrench" aria-hidden="true"></i>
-            {ts}Change Input Field Type{/ts}
-          </a>
-          <div class='clear'></div>
-        {/if}
-      </td>
+      <td class="html-adjust">{$form.data_type.html}</td>
+    </tr>
+    <tr class="crm-custom-field-form-block-html_type">
+      <td class="label">{$form.html_type.label}</td>
+      <td class="html-adjust">{$form.html_type.html}</td>
+    </tr>
+    <tr class="crm-custom-field-form-block-serialize">
+      <td class="label">{$form.serialize.label}</td>
+      <td class="html-adjust">{$form.serialize.html}</td>
     </tr>
-    {if $action eq 1}
-      <tr class="crm-custom-field-form-block-serialize">
-        <td class="label">{$form.serialize.label}</td>
-        <td class="html-adjust">{$form.serialize.html}</td>
-      </tr>
-    {/if}
     {if $form.in_selector}
       <tr class='crm-custom-field-form-block-in_selector'>
         <td class='label'>{$form.in_selector.label}</td>
@@ -176,19 +163,45 @@
 {literal}
 <script type="text/javascript">
   CRM.$(function($) {
-    var $form = $('form.{/literal}{$form.formClass}{literal}'),
-      dataTypes = {/literal}{$dataTypeKeys|@json_encode}{literal};
+    var _ = CRM._,
+      $form = $('form.{/literal}{$form.formClass}{literal}'),
+      dataToHTML = {/literal}{$dataToHTML|@json_encode}{literal},
+      originalHtmlType = '{/literal}{$originalHtmlType}{literal}',
+      existingMultiValueCount = {/literal}{if empty($existingMultiValueCount)}null{else}{$existingMultiValueCount}{/if}{literal},
+      originalSerialize = {/literal}{if empty($originalSerialize)}false{else}true{/if}{literal},
+      htmlTypes = CRM.utils.getOptions($('#html_type', $form));
 
-    function showSearchRange() {
-      var htmlType = $("[name='data_type[1]']", $form).val(),
-       dataType = dataTypes[$("[name='data_type[0]']", $form).val()];
+    function onChangeDataType() {
+      var dataType = $(this).val(),
+        allowedHtmlTypes = _.filter(htmlTypes, function(type) {
+          return _.includes(dataToHTML[dataType], type.key);
+        });
+      CRM.utils.setOptions($('#html_type', $form), allowedHtmlTypes);
+      if (!$('#html_type', $form).val()) {
+        $('#html_type', $form).val(dataToHTML[dataType][0]).change();
+      }
+      customOptionHtmlType(dataType);
+      makeDefaultValueField(dataType);
+    }
 
-      if (dataType === 'Int' || dataType === 'Float' || dataType === 'Money' || dataType === 'Date') {
-        if ($('#is_searchable', $form).is(':checked')) {
-          $("#searchByRange", $form).show();
-        } else {
-          $("#searchByRange", $form).hide();
-        }
+    function onChangeHtmlType() {
+      var htmlType = $(this).val(),
+        dataType = $('#data_type', $form).val();
+
+      if (htmlType === 'CheckBox' || htmlType === 'Radio') {
+        $('#serialize', $form).prop('checked', htmlType === 'CheckBox');
+      }
+
+      showSearchRange(dataType);
+      customOptionHtmlType(dataType);
+    }
+
+    $('#data_type', $form).each(onChangeDataType).change(onChangeDataType);
+    $('#html_type', $form).each(onChangeHtmlType).change(onChangeHtmlType);
+
+    function showSearchRange(dataType) {
+      if (_.includes(['Date', 'Int', 'Float', 'Money'], dataType)) {
+        $("#searchByRange", $form).toggle($('#is_searchable', $form).is(':checked'));
       } else {
         $("#searchByRange", $form).hide();
       }
@@ -212,13 +225,11 @@
     }
     $('.toggle-contact-ref-mode', $form).click(toggleContactRefFilter);
 
-    function customOptionHtmlType() {
-      var htmlType = $("[name='data_type[1]']", $form).val(),
-        dataTypeId = $("[name='data_type[0]']", $form).val(),
-        dataType = dataTypes[dataTypeId],
-        radioOption, checkBoxOption;
+    function customOptionHtmlType(dataType) {
+      var htmlType = $("#html_type", $form).val(),
+        serialize = $("#serialize", $form).is(':checked');
 
-      if (!htmlType && !dataTypeId) {
+      if (!htmlType) {
         return;
       }
 
@@ -228,7 +239,7 @@
         $('#field_advance_filter, #contact_reference_group', $form).hide();
       }
 
-      if (dataTypeId < 4) {
+      if (_.includes(['String', 'Int', 'Float', 'Money'], dataType)) {
         if (htmlType !== "Text") {
           $("#showoption, #searchable", $form).show();
           $("#hideDefault, #hideDesc, #searchByRange", $form).hide();
@@ -248,23 +259,17 @@
         $("#showoption").hide();
       }
 
-      for (var i=1; i<=11; i++) {
-        radioOption = 'radio'+i;
-        checkBoxOption = 'checkbox'+i;
-        if (dataTypeId < 4) {
-          if (htmlType != "Text") {
-            if (htmlType == "CheckBox" || htmlType == "Multi-Select") {
-              $("#"+checkBoxOption, $form).show();
-              $("#"+radioOption, $form).hide();
-            } else {
-              $("#"+radioOption, $form).show();
-              $("#"+checkBoxOption, $form).hide();
-            }
-          }
+      if (_.includes(['String', 'Int', 'Float', 'Money'], dataType) && htmlType !== 'Text') {
+        if (serialize) {
+          $('div[id^=checkbox]', '#optionField').show();
+          $('div[id^=radio]', '#optionField').hide();
+        } else {
+          $('div[id^=radio]', '#optionField').show();
+          $('div[id^=checkbox]', '#optionField').hide();
         }
       }
 
-      $("#optionsPerLine", $form).toggle((htmlType == "CheckBox" || htmlType == "Radio") && dataType !== 'Boolean');
+      $("#optionsPerLine", $form).toggle((htmlType === "CheckBox" || htmlType === "Radio") && dataType !== 'Boolean');
 
       $("#startDateRange, #endDateRange, #includedDatePart", $form).toggle(dataType === 'Date');
 
@@ -275,10 +280,46 @@
       $(".crm-custom-field-form-block-serialize", $form).toggle(htmlType === 'Select');
     }
 
-    $('[name^="data_type"]', $form).change(customOptionHtmlType);
-    customOptionHtmlType();
-    $('#is_searchable, [name^="data_type"]', $form).change(showSearchRange);
-    showSearchRange();
+    function makeDefaultValueField(dataType) {
+      var field = $('#default_value', $form);
+      field.crmDatepicker('destroy');
+      field.crmSelect2('destroy');
+      switch (dataType) {
+        case 'Date':
+          field.crmDatepicker({date: 'yy-mm-dd', time: false});
+          break;
+
+        case 'Boolean':
+          field.crmSelect2({data: [{id: '1', text: ts('Yes')}, {id: '0', text: ts('No')}], placeholder: ' '});
+          break;
+
+        case 'Country':
+          field.crmEntityRef({entity: 'Country'});
+          break;
+
+        case 'StateProvince':
+          field.crmEntityRef({entity: 'StateProvince', api: {description_field: ['country_id.name']}});
+          break;
+      }
+    }
+
+    $('#is_searchable, #serialize', $form).change(onChangeHtmlType);
+
+    $form.submit(function() {
+      var htmlType = $('#html_type', $form).val(),
+        serialize = $("#serialize", $form).is(':checked'),
+        htmlTypeLabel = (serialize && htmlType === 'Select') ? ts('Multi-Select') : _.find(htmlTypes, {key: htmlType}).value;
+      if (originalHtmlType && (originalHtmlType !== htmlType || originalSerialize !== serialize)) {
+        var origHtmlTypeLabel = (originalSerialize && originalHtmlType === 'Select') ? ts('Multi-Select') : _.find(htmlTypes, {key: originalHtmlType}).value;
+        if (originalSerialize && !serialize && existingMultiValueCount) {
+          return confirm(ts('WARNING: Changing this multivalued field to singular will result in the loss of data!')
+            + "\n" + ts('%1 existing records contain multiple values - the data in each of these fields will be truncated to a single value.', {1: existingMultiValueCount})
+          )
+        } else {
+          return confirm(ts('Change this field from %1 to %2? Existing data will be preserved.', {1: origHtmlTypeLabel, 2: htmlTypeLabel}));
+        }
+      }
+    });
   });
 </script>
 {/literal}
diff --git a/tests/phpunit/api/v3/CustomFieldTest.php b/tests/phpunit/api/v3/CustomFieldTest.php
index e5c900dd245f..cfa7894fe48d 100644
--- a/tests/phpunit/api/v3/CustomFieldTest.php
+++ b/tests/phpunit/api/v3/CustomFieldTest.php
@@ -108,22 +108,13 @@ public function testCustomFieldCreateAllAvailableFormInputs() {
     $htype = CRM_Custom_Form_Field::$_dataToHTML;
 
     // Legacy html types returned by v3
-    foreach ($htype as &$item) {
-      if (isset($item['StateProvince'])) {
-        $item['StateProvince'] = 'Select State/Province';
-      }
-      if (isset($item['Country'])) {
-        $item['Country'] = 'Select Country';
-      }
-    }
+    $htype['StateProvince'] = ['Select State/Province'];
+    $htype['Country'] = ['Select Country'];
 
-    $n = 0;
     foreach ($dtype as $dkey => $dvalue) {
-      foreach ($htype[$n] as $hkey => $hvalue) {
-        //echo $dkey."][".$hvalue."\n";
+      foreach ($htype[$dkey] as $hvalue) {
         $this->_loopingCustomFieldCreateTest($this->_buildParams($gid['id'], $hvalue, $dkey));
       }
-      $n++;
     }
   }
 
diff --git a/tests/phpunit/api/v3/CustomValueTest.php b/tests/phpunit/api/v3/CustomValueTest.php
index 02c16401c41c..96ce2e42c0c6 100644
--- a/tests/phpunit/api/v3/CustomValueTest.php
+++ b/tests/phpunit/api/v3/CustomValueTest.php
@@ -95,11 +95,11 @@ public function testCreateCustomValue() {
 
     $customFieldDataType = CRM_Core_BAO_CustomField::dataType();
     $dataToHtmlTypes = CRM_Custom_Form_Field::$_dataToHTML;
-    $count = 0;
-    $optionSupportingHTMLTypes = ['Select', 'Radio', 'CheckBox', 'Autocomplete-Select', 'Multi-Select'];
+    $optionSupportingHTMLTypes = CRM_Custom_Form_Field::$htmlTypesWithOptions;
 
     foreach ($customFieldDataType as $dataType => $label) {
       switch ($dataType) {
+        // skipping File data-type & state province due to caching issues
         // case 'Country':
         // case 'StateProvince':
         case 'String':
@@ -139,7 +139,7 @@ public function testCreateCustomValue() {
           }
 
           //Create custom field of $dataType and html-type $html
-          foreach ($dataToHtmlTypes[$count] as $html) {
+          foreach ($dataToHtmlTypes[$dataType] as $html) {
             // per CRM-18568 the like operator does not currently work for fields with options.
             // the LIKE operator could potentially bypass ACLs (as could IS NOT NULL) and some thought needs to be given
             // to it.
@@ -160,13 +160,7 @@ public function testCreateCustomValue() {
             //Now test with $validSQLOperator SQL operators against its custom value(s)
             $this->_testCustomValue($customField['values'][$customField['id']], $validSQLOperators, $type);
           }
-          $count++;
-          break;
 
-        default:
-          // skipping File data-type & state province due to caching issues
-          $count++;
-          break;
       }
     }
   }
diff --git a/xml/schema/Core/CustomField.xml b/xml/schema/Core/CustomField.xml
index 44c632256010..54cd5c5d7454 100644
--- a/xml/schema/Core/CustomField.xml
+++ b/xml/schema/Core/CustomField.xml
@@ -73,6 +73,7 @@
     <add>1.1</add>
     <html>
       <type>Select</type>
+      <label>Data Type</label>
     </html>
   </field>
   <field>
@@ -85,6 +86,10 @@
     <pseudoconstant>
       <callback>CRM_Core_SelectValues::customHtmlType</callback>
     </pseudoconstant>
+    <html>
+      <type>Select</type>
+      <label>Field Input Type</label>
+    </html>
     <add>1.1</add>
   </field>
   <field>

From 5f0a0a71ae47507556fe735f13c9a37b270a20db Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 10 Sep 2020 11:39:25 -0400
Subject: [PATCH 228/834] [REF] Simplify array construction

In trying to interpret https://github.com/civicrm/civicrm-core/pull/17992

I realised that the code copies values from the dao to an array, copies the array
to another array, unsets most of the variables and then uses that second array.

This simplifies.

The easiest way to work through this code is in a debugger running

testProcessMembershipUpdateStatus
---
 CRM/Member/BAO/Membership.php | 42 +++++++----------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 5260b31c2722..3a98f1d58776 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -2284,21 +2284,6 @@ public static function updateAllMembershipStatus($params = []) {
     while ($dao2->fetch()) {
       $processCount++;
 
-      // Put common parameters into array for easy access
-      $memberParams = [
-        'id' => $dao2->membership_id,
-        'status_id' => $dao2->status_id,
-        'contact_id' => $dao2->contact_id,
-        'membership_type_id' => $dao2->membership_type_id,
-        'membership_type' => $allMembershipTypes[$dao2->membership_type_id]['name'],
-        'join_date' => $dao2->join_date,
-        'start_date' => $dao2->start_date,
-        'end_date' => $dao2->end_date,
-        'source' => $dao2->source,
-        'skipStatusCal' => TRUE,
-        'skipRecentView' => TRUE,
-      ];
-
       // CRM-7248: added excludeIsAdmin param to the following fn call to prevent moving to admin statuses
       //get the membership status as per id.
       $newStatus = civicrm_api3('membership_status', 'calc',
@@ -2313,27 +2298,16 @@ public static function updateAllMembershipStatus($params = []) {
       if ($statusId &&
         $statusId != $dao2->status_id
       ) {
-        //take all params that need to save.
-        $memParams = $memberParams;
-        $memParams['status_id'] = $statusId;
-        $memParams['createActivity'] = TRUE;
-
-        // Unset columns which should remain unchanged from their current saved
-        // values. This avoids race condition in which these values may have
-        // been changed by other processes.
-        unset(
-          $memParams['contact_id'],
-          $memParams['membership_type_id'],
-          $memParams['membership_type'],
-          $memParams['join_date'],
-          $memParams['start_date'],
-          $memParams['end_date'],
-          $memParams['source']
-        );
-        //since there is change in status.
+        $memberParams = [
+          'id' => $dao2->membership_id,
+          'skipStatusCal' => TRUE,
+          'skipRecentView' => TRUE,
+          'status_id' => $statusId,
+          'createActivity' => TRUE,
+        ];
 
         //process member record.
-        civicrm_api3('membership', 'create', $memParams);
+        civicrm_api3('membership', 'create', $memberParams);
         $updateCount++;
       }
     }

From 6fa2a892457cab50a0f68b7876907dace806b975 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 12 Sep 2020 08:43:55 +1200
Subject: [PATCH 229/834] Remove unused property, null constructor

---
 CRM/Member/BAO/MembershipStatus.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php
index 6dd327e5b076..535f51ed9560 100644
--- a/CRM/Member/BAO/MembershipStatus.php
+++ b/CRM/Member/BAO/MembershipStatus.php
@@ -16,19 +16,6 @@
  */
 class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
 
-  /**
-   * Static holder for the default LT.
-   * @var int
-   */
-  public static $_defaultMembershipStatus = NULL;
-
-  /**
-   * Class constructor.
-   */
-  public function __construct() {
-    parent::__construct();
-  }
-
   /**
    * Fetch object based on array of properties.
    *

From e021e985fe46d5141c418c5ca9225aa37398e31a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 12 Sep 2020 10:02:12 +1200
Subject: [PATCH 230/834] [REF] minor tidy up on membershipStatus::create & add

We have been deprecating & removing the  array from BAO create & add actions - this continues that
(long slow) process'
---
 CRM/Member/BAO/MembershipStatus.php           | 23 +++----
 .../CRM/Member/BAO/MembershipStatusTest.php   | 69 ++++++++-----------
 2 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php
index 6dd327e5b076..de34eec19801 100644
--- a/CRM/Member/BAO/MembershipStatus.php
+++ b/CRM/Member/BAO/MembershipStatus.php
@@ -68,26 +68,21 @@ public static function setIsActive($id, $is_active) {
    * Takes an associative array and creates a membership Status object.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
+   *   Array of name/value pairs.
    *
-   * @throws Exception
-   * @return CRM_Member_BAO_MembershipStatus
+   * @throws CRM_Core_Exception
+   * @return CRM_Member_DAO_MembershipStatus
    */
   public static function create($params) {
-    $ids = [];
-    if (!empty($params['id'])) {
-      $ids['membershipStatus'] = $params['id'];
-    }
-    else {
+    if (empty($params['id'])) {
       //don't allow duplicate names - if id not set
       $status = new CRM_Member_DAO_MembershipStatus();
       $status->name = $params['name'];
       if ($status->find(TRUE)) {
-        throw new Exception('A membership status with this name already exists.');
+        throw new CRM_Core_Exception('A membership status with this name already exists.');
       }
     }
-    $membershipStatusBAO = CRM_Member_BAO_MembershipStatus::add($params, $ids);
-    return $membershipStatusBAO;
+    return self::add($params);
   }
 
   /**
@@ -98,10 +93,12 @@ public static function create($params) {
    * @param array $ids
    *   Array contains the id - this param is deprecated.
    *
-   *
-   * @return object
+   * @return CRM_Member_DAO_MembershipStatus
    */
   public static function add(&$params, $ids = []) {
+    if (!empty($ids)) {
+      CRM_Core_Error::deprecatedFunctionWarning('ids is a deprecated parameter');
+    }
     $id = $params['id'] ?? $ids['membershipStatus'] ?? NULL;
     if (!$id) {
       CRM_Core_DAO::setCreateDefaults($params, self::getDefaults());
diff --git a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
index e33f916c9aa6..f413ffd22b7c 100644
--- a/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
+++ b/tests/phpunit/CRM/Member/BAO/MembershipStatusTest.php
@@ -15,8 +15,13 @@
  */
 class CRM_Member_BAO_MembershipStatusTest extends CiviUnitTestCase {
 
-  public function setUp() {
-    parent::setUp();
+  protected function tearDown() {
+    foreach ($this->ids as $entity => $ids) {
+      foreach ($ids as $id) {
+        $this->callAPISuccess($entity, 'Delete', ['id' => $id]);
+      }
+    }
+    parent::tearDown();
   }
 
   /**
@@ -24,33 +29,27 @@ public function setUp() {
    */
   public function testAdd() {
     $params = [
-      'name' => 'pending',
+      'name' => 'added',
       'is_active' => 1,
     ];
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
+    $this->ids['MembershipStatus'][0] = $this->callAPISuccess('MembershipStatus', 'create', $params)['id'];
 
-    $result = $this->assertDBNotNull('CRM_Member_BAO_MembershipStatus', $membershipStatus->id,
+    $result = $this->assertDBNotNull('CRM_Member_BAO_MembershipStatus', $this->ids['MembershipStatus'][0],
       'name', 'id',
       'Database check on updated membership status record.'
     );
-    $this->assertEquals($result, 'pending', 'Verify membership status is_active.');
-
-    $this->callAPISuccess('MembershipStatus', 'Delete', ['id' => $membershipStatus->id]);
+    $this->assertEquals($result, 'added', 'Verify membership status is_active.');
   }
 
   public function testRetrieve() {
 
-    $params = [
-      'name' => 'testStatus',
-      'is_active' => 1,
-    ];
+    $params = ['name' => 'testStatus', 'is_active' => 1];
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
+    $this->ids['MembershipStatus'][0] = $this->callAPISuccess('MembershipStatus', 'create', $params)['id'];
     $defaults = [];
     $result = CRM_Member_BAO_MembershipStatus::retrieve($params, $defaults);
     $this->assertEquals($result->name, 'testStatus', 'Verify membership status name.');
-    CRM_Member_BAO_MembershipStatus::del($membershipStatus->id);
   }
 
   public function testPseudoConstantflush() {
@@ -58,66 +57,58 @@ public function testPseudoConstantflush() {
       'name' => 'testStatus',
       'is_active' => 1,
     ];
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
+    $this->ids['MembershipStatus'][0] = $this->callAPISuccess('MembershipStatus', 'create', $params)['id'];
     $defaults = [];
     $result = CRM_Member_BAO_MembershipStatus::retrieve($params, $defaults);
     $this->assertEquals($result->name, 'testStatus', 'Verify membership status name.');
     $updateParams = [
-      'id' => $membershipStatus->id,
+      'id' => $this->ids['MembershipStatus'][0],
       'name' => 'testStatus',
       'label' => 'Changed Status',
       'is_active' => 1,
     ];
-    $membershipStatus2 = CRM_Member_BAO_MembershipStatus::add($updateParams);
-    $result = CRM_Member_PseudoConstant::membershipStatus($membershipStatus->id, NULL, 'label', FALSE, FALSE);
+    $this->callAPISuccess('MembershipStatus', 'create', $updateParams)['id'];
+    $result = CRM_Member_PseudoConstant::membershipStatus($this->ids['MembershipStatus'][0], NULL, 'label', FALSE, FALSE);
     $this->assertEquals($result, 'Changed Status', 'Verify updated membership status label From PseudoConstant.');
-    CRM_Member_BAO_MembershipStatus::del($membershipStatus->id);
   }
 
   public function testSetIsActive() {
 
     $params = [
-      'name' => 'pending',
+      'name' => 'added',
       'is_active' => 1,
     ];
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
-    $result = CRM_Member_BAO_MembershipStatus::setIsActive($membershipStatus->id, 0);
-    $this->assertEquals($result, TRUE, 'Verify membership status record updation.');
+    $this->ids['MembershipStatus'][0] = $this->callAPISuccess('MembershipStatus', 'create', $params)['id'];
+    $result = CRM_Member_BAO_MembershipStatus::setIsActive($this->ids['MembershipStatus'][0], 0);
+    $this->assertEquals($result, TRUE, 'Verify membership status record updated.');
 
-    $isActive = $this->assertDBNotNull('CRM_Member_BAO_MembershipStatus', $membershipStatus->id,
+    $isActive = $this->assertDBNotNull('CRM_Member_BAO_MembershipStatus', $this->ids['MembershipStatus'][0],
       'is_active', 'id',
       'Database check on updated membership status record.'
     );
     $this->assertEquals($isActive, 0, 'Verify membership status is_active.');
-
-    $this->callAPISuccess('MembershipStatus', 'Delete', ['id' => $membershipStatus->id]);
   }
 
   public function testGetMembershipStatus() {
     $params = [
-      'name' => 'pending',
+      'name' => 'added',
       'is_active' => 1,
     ];
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
-    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatus($membershipStatus->id);
-    $this->assertEquals($result['name'], 'pending', 'Verify membership status name.');
-
-    $this->callAPISuccess('MembershipStatus', 'Delete', ['id' => $membershipStatus->id]);
+    $this->ids['MembershipStatus'][0] = $this->callAPISuccess('MembershipStatus', 'create', $params)['id'];
+    $result = CRM_Member_BAO_MembershipStatus::getMembershipStatus($this->ids['MembershipStatus'][0]);
+    $this->assertEquals($result['name'], 'added', 'Verify membership status name.');
   }
 
   public function testDel() {
-    $params = [
-      'name' => 'testStatus',
-      'is_active' => 1,
-    ];
+    $params = ['name' => 'testStatus', 'is_active' => 1];
 
-    $membershipStatus = CRM_Member_BAO_MembershipStatus::add($params);
-    CRM_Member_BAO_MembershipStatus::del($membershipStatus->id);
+    $membershipID = $this->callAPISuccess('MembershipStatus', 'create', $params)['id'];
+    CRM_Member_BAO_MembershipStatus::del($membershipID);
     $defaults = [];
     $result = CRM_Member_BAO_MembershipStatus::retrieve($params, $defaults);
-    $this->assertEquals(empty($result), TRUE, 'Verify membership status record deletion.');
+    $this->assertEquals($result === NULL, TRUE, 'Verify membership status record deletion.');
   }
 
   /**

From 737bd87c577641305476feb17f2e318e78862920 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 12 Sep 2020 18:37:51 +1200
Subject: [PATCH 231/834] [REF] Folllow up cleanup - remove now unused param

In a recent regression fix we stopped returning  from getLine. This fully removes the, now unused,
parameter. The functions that call getLine calculate the total now
---
 CRM/Financial/BAO/Order.php | 2 +-
 CRM/Price/BAO/PriceSet.php  | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/CRM/Financial/BAO/Order.php b/CRM/Financial/BAO/Order.php
index 80cf3b66ec58..ffe8af8ff973 100644
--- a/CRM/Financial/BAO/Order.php
+++ b/CRM/Financial/BAO/Order.php
@@ -238,7 +238,7 @@ protected function calculateLineItems(): array {
       }
       $throwAwayArray = [];
       // @todo - still using getLine for now but better to bring it to this class & do a better job.
-      $newLines = CRM_Price_BAO_PriceSet::getLine($params, $throwAwayArray, $this->getPriceSetID(), $this->getPriceFieldSpec($fieldID), $fieldID, 0)[1];
+      $newLines = CRM_Price_BAO_PriceSet::getLine($params, $throwAwayArray, $this->getPriceSetID(), $this->getPriceFieldSpec($fieldID), $fieldID)[1];
       foreach ($newLines as $newLine) {
         $lineItems[$newLine['price_field_value_id']] = $newLine;
       }
diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php
index 7481dd09fae0..4bbf042d6c4a 100644
--- a/CRM/Price/BAO/PriceSet.php
+++ b/CRM/Price/BAO/PriceSet.php
@@ -673,7 +673,7 @@ public static function processAmount($fields, &$params, &$lineItem, $priceSetID
         continue;
       }
 
-      list($params, $lineItem) = self::getLine($params, $lineItem, $priceSetID, $field, $id, $totalPrice);
+      list($params, $lineItem) = self::getLine($params, $lineItem, $priceSetID, $field, $id);
     }
 
     $amount_level = [];
@@ -1694,11 +1694,10 @@ protected static function reformatUsedByFormsWithEntityData($forms) {
    * @param int $priceSetID
    * @param array $field
    * @param int $id
-   * @param float $totalPrice
    *
    * @return array
    */
-  public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id, $totalPrice): array {
+  public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id): array {
     $totalTax = 0;
     switch ($field['html_type']) {
       case 'Text':
@@ -1718,7 +1717,6 @@ public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id, $
         if (!empty($field['options'][$optionValueId]['tax_rate'])) {
           $lineItem = self::setLineItem($field, $lineItem, $optionValueId, $totalTax);
         }
-        $totalPrice += $lineItem[$firstOption['id']]['line_total'] + CRM_Utils_Array::value('tax_amount', $lineItem[key($field['options'])]);
         break;
 
       case 'Radio':
@@ -1748,7 +1746,6 @@ public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id, $
             $lineItem[$optionValueId]['line_total'] = $lineItem[$optionValueId]['unit_price'] = CRM_Utils_Rule::cleanMoney($lineItem[$optionValueId]['line_total'] - $lineItem[$optionValueId]['tax_amount']);
           }
         }
-        $totalPrice += $lineItem[$optionValueId]['line_total'] + CRM_Utils_Array::value('tax_amount', $lineItem[$optionValueId]);
         break;
 
       case 'Select':
@@ -1759,7 +1756,6 @@ public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id, $
         if (!empty($field['options'][$optionValueId]['tax_rate'])) {
           $lineItem = self::setLineItem($field, $lineItem, $optionValueId, $totalTax);
         }
-        $totalPrice += $lineItem[$optionValueId]['line_total'] + CRM_Utils_Array::value('tax_amount', $lineItem[$optionValueId]);
         break;
 
       case 'CheckBox':
@@ -1769,7 +1765,6 @@ public static function getLine(&$params, &$lineItem, $priceSetID, $field, $id, $
           if (!empty($field['options'][$optionId]['tax_rate'])) {
             $lineItem = self::setLineItem($field, $lineItem, $optionId, $totalTax);
           }
-          $totalPrice += $lineItem[$optionId]['line_total'] + CRM_Utils_Array::value('tax_amount', $lineItem[$optionId]);
         }
         break;
     }

From d1961207361fb5b4f39e0ad2ee7c290eade50876 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 11 Sep 2020 21:03:36 -0400
Subject: [PATCH 232/834] APIv4 - Map specific action names to more generic
 versions

---
 Civi/Api4/Generic/AbstractAction.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Civi/Api4/Generic/AbstractAction.php b/Civi/Api4/Generic/AbstractAction.php
index 8d0111e6b35d..fa995ce0d8d4 100644
--- a/Civi/Api4/Generic/AbstractAction.php
+++ b/Civi/Api4/Generic/AbstractAction.php
@@ -407,13 +407,15 @@ public function getPermissions() {
       'default' => ['administer CiviCRM'],
     ];
     $action = $this->getActionName();
-    if (isset($permissions[$action])) {
-      return $permissions[$action];
-    }
-    elseif (in_array($action, ['getActions', 'getFields'])) {
-      return $permissions['meta'];
-    }
-    return $permissions['default'];
+    // Map specific action names to more generic versions
+    $map = [
+      'getActions' => 'meta',
+      'getFields' => 'meta',
+      'replace' => 'delete',
+      'save' => 'create',
+    ];
+    $generic = $map[$action] ?? 'default';
+    return $permissions[$action] ?? $permissions[$generic] ?? $permissions['default'];
   }
 
   /**

From e5c6b3cd9fe4245e125f2582d435d02712f5d65d Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sat, 12 Sep 2020 18:42:49 -0400
Subject: [PATCH 233/834] make service public like in symfony 2.x

---
 Civi/Core/Container.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index d898c61fde3b..acedf8a78024 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -239,7 +239,7 @@ public function createContainer() {
       ))
         ->setFactory([$class, 'singleton'])->setPublic(TRUE);
     }
-    $container->setAlias('cache.short', 'cache.default');
+    $container->setAlias('cache.short', 'cache.default')->setPublic(TRUE);
 
     $container->setDefinition('resources', new Definition(
       'CRM_Core_Resources',

From e4cba171cbe08291fef5b4a7e02241ca050c57c0 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 13 Sep 2020 09:08:10 -0400
Subject: [PATCH 234/834] Remove unnecessary debug from tests which messes up
 array output

GetValue and debug can't really be used together. If the output is scalar,
then there's no place for the debug info to go. If the output is an array of values,
the debug info will be injected into the values, messing up the test.
---
 Civi/Test/Api3TestTrait.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Civi/Test/Api3TestTrait.php b/Civi/Test/Api3TestTrait.php
index 2ce8d75d0e58..176564a68663 100644
--- a/Civi/Test/Api3TestTrait.php
+++ b/Civi/Test/Api3TestTrait.php
@@ -260,7 +260,6 @@ public function callAPISuccessGetSingle($entity, $params, $checkAgainst = NULL)
   public function callAPISuccessGetValue($entity, $params, $type = NULL) {
     $params += [
       'version' => $this->_apiversion,
-      'debug' => 1,
     ];
     $result = $this->civicrm_api($entity, 'getvalue', $params);
     if (is_array($result) && (!empty($result['is_error']) || isset($result['values']))) {

From 8c9643b3c40a305232c598e87ef3fc0092cb37b8 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@symbiotic.coop>
Date: Sun, 13 Sep 2020 10:38:46 -0400
Subject: [PATCH 235/834] dev/translation#51 Fix inheritLocale regression

---
 CRM/Core/BAO/ConfigSetting.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 45e037897490..54ad2e1a74d1 100644
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -178,7 +178,7 @@ public static function applyLocale($settings, $activatedLocales) {
        * If the language is specified via "lcMessages" we skip this, since the
        * intention of the URL query var is to override all other sources.
        */
-      if ($settings->get('inheritLocale') && empty($chosenLocale)) {
+      if ($settings->get('inheritLocale')) {
 
         /*
          * FIXME: On multi-language installs, CRM_Utils_System::getUFLocale() in

From 7b66c3b57753e74e46815ce9d9367126a19acee8 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Fri, 11 Sep 2020 16:46:17 -0400
Subject: [PATCH 236/834] DAOs with singular/plural options for entity titles

---
 CRM/ACL/DAO/ACL.php                          |  9 ++++++---
 CRM/ACL/DAO/ACLCache.php                     |  9 ++++++---
 CRM/ACL/DAO/EntityRole.php                   |  9 ++++++---
 CRM/Activity/DAO/Activity.php                |  9 ++++++---
 CRM/Activity/DAO/ActivityContact.php         |  9 ++++++---
 CRM/Batch/DAO/Batch.php                      |  9 ++++++---
 CRM/Batch/DAO/EntityBatch.php                |  9 ++++++---
 CRM/Campaign/DAO/Campaign.php                |  9 ++++++---
 CRM/Campaign/DAO/CampaignGroup.php           |  9 ++++++---
 CRM/Campaign/DAO/Survey.php                  |  9 ++++++---
 CRM/Case/DAO/Case.php                        |  9 ++++++---
 CRM/Case/DAO/CaseActivity.php                |  9 ++++++---
 CRM/Case/DAO/CaseContact.php                 |  9 ++++++---
 CRM/Case/DAO/CaseType.php                    |  9 ++++++---
 CRM/Contact/DAO/ACLContactCache.php          |  9 ++++++---
 CRM/Contact/DAO/Contact.php                  |  9 ++++++---
 CRM/Contact/DAO/ContactType.php              |  9 ++++++---
 CRM/Contact/DAO/DashboardContact.php         |  9 ++++++---
 CRM/Contact/DAO/Group.php                    |  9 ++++++---
 CRM/Contact/DAO/GroupContact.php             |  9 ++++++---
 CRM/Contact/DAO/GroupContactCache.php        |  9 ++++++---
 CRM/Contact/DAO/GroupNesting.php             |  9 ++++++---
 CRM/Contact/DAO/GroupOrganization.php        |  9 ++++++---
 CRM/Contact/DAO/Relationship.php             |  9 ++++++---
 CRM/Contact/DAO/RelationshipCache.php        |  9 ++++++---
 CRM/Contact/DAO/RelationshipType.php         |  9 ++++++---
 CRM/Contact/DAO/SavedSearch.php              |  9 ++++++---
 CRM/Contact/DAO/SubscriptionHistory.php      |  9 ++++++---
 CRM/Contribute/DAO/Contribution.php          |  9 ++++++---
 CRM/Contribute/DAO/ContributionPage.php      |  9 ++++++---
 CRM/Contribute/DAO/ContributionProduct.php   |  9 ++++++---
 CRM/Contribute/DAO/ContributionRecur.php     |  9 ++++++---
 CRM/Contribute/DAO/ContributionSoft.php      |  9 ++++++---
 CRM/Contribute/DAO/Premium.php               |  9 ++++++---
 CRM/Contribute/DAO/PremiumsProduct.php       |  9 ++++++---
 CRM/Contribute/DAO/Product.php               |  9 ++++++---
 CRM/Contribute/DAO/Widget.php                |  9 ++++++---
 CRM/Core/CodeGen/Specification.php           | 15 +++------------
 CRM/Core/DAO.php                             |  3 ++-
 CRM/Core/DAO/ActionLog.php                   |  9 ++++++---
 CRM/Core/DAO/ActionMapping.php               |  9 ++++++---
 CRM/Core/DAO/ActionSchedule.php              |  9 ++++++---
 CRM/Core/DAO/Address.php                     |  9 ++++++---
 CRM/Core/DAO/AddressFormat.php               |  9 ++++++---
 CRM/Core/DAO/Cache.php                       |  9 ++++++---
 CRM/Core/DAO/Component.php                   |  9 ++++++---
 CRM/Core/DAO/Country.php                     |  9 ++++++---
 CRM/Core/DAO/County.php                      |  9 ++++++---
 CRM/Core/DAO/CustomField.php                 |  9 ++++++---
 CRM/Core/DAO/CustomGroup.php                 |  9 ++++++---
 CRM/Core/DAO/Dashboard.php                   |  9 ++++++---
 CRM/Core/DAO/Discount.php                    |  9 ++++++---
 CRM/Core/DAO/Domain.php                      |  9 ++++++---
 CRM/Core/DAO/Email.php                       |  9 ++++++---
 CRM/Core/DAO/EntityFile.php                  |  9 ++++++---
 CRM/Core/DAO/EntityTag.php                   |  9 ++++++---
 CRM/Core/DAO/Extension.php                   |  9 ++++++---
 CRM/Core/DAO/File.php                        |  9 ++++++---
 CRM/Core/DAO/IM.php                          |  9 ++++++---
 CRM/Core/DAO/Job.php                         |  9 ++++++---
 CRM/Core/DAO/JobLog.php                      |  9 ++++++---
 CRM/Core/DAO/LocBlock.php                    |  9 ++++++---
 CRM/Core/DAO/LocationType.php                |  9 ++++++---
 CRM/Core/DAO/Log.php                         |  9 ++++++---
 CRM/Core/DAO/MailSettings.php                |  9 ++++++---
 CRM/Core/DAO/Managed.php                     |  9 ++++++---
 CRM/Core/DAO/Mapping.php                     |  9 ++++++---
 CRM/Core/DAO/MappingField.php                |  9 ++++++---
 CRM/Core/DAO/Menu.php                        |  9 ++++++---
 CRM/Core/DAO/MessageTemplate.php             |  9 ++++++---
 CRM/Core/DAO/Navigation.php                  |  9 ++++++---
 CRM/Core/DAO/Note.php                        |  9 ++++++---
 CRM/Core/DAO/OpenID.php                      |  9 ++++++---
 CRM/Core/DAO/OptionGroup.php                 |  9 ++++++---
 CRM/Core/DAO/OptionValue.php                 |  9 ++++++---
 CRM/Core/DAO/Phone.php                       |  9 ++++++---
 CRM/Core/DAO/PreferencesDate.php             |  9 ++++++---
 CRM/Core/DAO/PrevNextCache.php               |  9 ++++++---
 CRM/Core/DAO/PrintLabel.php                  |  9 ++++++---
 CRM/Core/DAO/RecurringEntity.php             |  9 ++++++---
 CRM/Core/DAO/Setting.php                     |  9 ++++++---
 CRM/Core/DAO/StateProvince.php               |  9 ++++++---
 CRM/Core/DAO/StatusPreference.php            |  9 ++++++---
 CRM/Core/DAO/SystemLog.php                   |  9 ++++++---
 CRM/Core/DAO/Tag.php                         |  9 ++++++---
 CRM/Core/DAO/Timezone.php                    |  9 ++++++---
 CRM/Core/DAO/UFField.php                     |  9 ++++++---
 CRM/Core/DAO/UFGroup.php                     |  9 ++++++---
 CRM/Core/DAO/UFJoin.php                      |  9 ++++++---
 CRM/Core/DAO/UFMatch.php                     |  9 ++++++---
 CRM/Core/DAO/Website.php                     |  9 ++++++---
 CRM/Core/DAO/WordReplacement.php             |  9 ++++++---
 CRM/Core/DAO/Worldregion.php                 |  9 ++++++---
 CRM/Cxn/DAO/Cxn.php                          |  9 ++++++---
 CRM/Dedupe/DAO/Exception.php                 |  9 ++++++---
 CRM/Dedupe/DAO/Rule.php                      |  9 ++++++---
 CRM/Dedupe/DAO/RuleGroup.php                 |  9 ++++++---
 CRM/Event/Cart/DAO/Cart.php                  |  9 ++++++---
 CRM/Event/Cart/DAO/EventInCart.php           |  9 ++++++---
 CRM/Event/DAO/Event.php                      |  9 ++++++---
 CRM/Event/DAO/Participant.php                |  9 ++++++---
 CRM/Event/DAO/ParticipantPayment.php         |  9 ++++++---
 CRM/Event/DAO/ParticipantStatusType.php      |  9 ++++++---
 CRM/Export/Controller/Standalone.php         |  2 +-
 CRM/Financial/DAO/Currency.php               |  9 ++++++---
 CRM/Financial/DAO/EntityFinancialAccount.php |  9 ++++++---
 CRM/Financial/DAO/EntityFinancialTrxn.php    |  9 ++++++---
 CRM/Financial/DAO/FinancialAccount.php       |  9 ++++++---
 CRM/Financial/DAO/FinancialItem.php          |  9 ++++++---
 CRM/Financial/DAO/FinancialTrxn.php          |  9 ++++++---
 CRM/Financial/DAO/FinancialType.php          |  9 ++++++---
 CRM/Financial/DAO/PaymentProcessor.php       |  9 ++++++---
 CRM/Financial/DAO/PaymentProcessorType.php   |  9 ++++++---
 CRM/Financial/DAO/PaymentToken.php           |  9 ++++++---
 CRM/Friend/DAO/Friend.php                    |  9 ++++++---
 CRM/Grant/DAO/Grant.php                      |  9 ++++++---
 CRM/Mailing/DAO/BouncePattern.php            |  9 ++++++---
 CRM/Mailing/DAO/BounceType.php               |  9 ++++++---
 CRM/Mailing/DAO/Mailing.php                  |  9 ++++++---
 CRM/Mailing/DAO/MailingAB.php                |  9 ++++++---
 CRM/Mailing/DAO/MailingComponent.php         |  9 ++++++---
 CRM/Mailing/DAO/MailingGroup.php             |  9 ++++++---
 CRM/Mailing/DAO/MailingJob.php               |  9 ++++++---
 CRM/Mailing/DAO/Recipients.php               |  9 ++++++---
 CRM/Mailing/DAO/Spool.php                    |  9 ++++++---
 CRM/Mailing/DAO/TrackableURL.php             |  9 ++++++---
 CRM/Mailing/Event/DAO/Bounce.php             |  9 ++++++---
 CRM/Mailing/Event/DAO/Confirm.php            |  9 ++++++---
 CRM/Mailing/Event/DAO/Delivered.php          |  9 ++++++---
 CRM/Mailing/Event/DAO/Forward.php            |  9 ++++++---
 CRM/Mailing/Event/DAO/Opened.php             |  9 ++++++---
 CRM/Mailing/Event/DAO/Queue.php              |  9 ++++++---
 CRM/Mailing/Event/DAO/Reply.php              |  9 ++++++---
 CRM/Mailing/Event/DAO/Subscribe.php          |  9 ++++++---
 CRM/Mailing/Event/DAO/TrackableURLOpen.php   |  9 ++++++---
 CRM/Mailing/Event/DAO/Unsubscribe.php        |  9 ++++++---
 CRM/Member/DAO/Membership.php                |  9 ++++++---
 CRM/Member/DAO/MembershipBlock.php           |  9 ++++++---
 CRM/Member/DAO/MembershipLog.php             |  9 ++++++---
 CRM/Member/DAO/MembershipPayment.php         |  9 ++++++---
 CRM/Member/DAO/MembershipStatus.php          |  9 ++++++---
 CRM/Member/DAO/MembershipType.php            |  9 ++++++---
 CRM/PCP/DAO/PCP.php                          |  9 ++++++---
 CRM/PCP/DAO/PCPBlock.php                     |  9 ++++++---
 CRM/Pledge/DAO/Pledge.php                    |  9 ++++++---
 CRM/Pledge/DAO/PledgeBlock.php               |  9 ++++++---
 CRM/Pledge/DAO/PledgePayment.php             |  9 ++++++---
 CRM/Price/DAO/LineItem.php                   |  9 ++++++---
 CRM/Price/DAO/PriceField.php                 |  9 ++++++---
 CRM/Price/DAO/PriceFieldValue.php            |  9 ++++++---
 CRM/Price/DAO/PriceSet.php                   |  9 ++++++---
 CRM/Price/DAO/PriceSetEntity.php             |  9 ++++++---
 CRM/Queue/DAO/QueueItem.php                  |  9 ++++++---
 CRM/Report/DAO/ReportInstance.php            |  9 ++++++---
 CRM/SMS/DAO/Provider.php                     |  9 ++++++---
 Civi/Api4/Generic/AbstractEntity.php         |  5 ++++-
 Civi/Api4/Generic/DAOEntity.php              |  6 ++++--
 xml/schema/Contribute/ContributionRecur.xml  |  2 +-
 xml/schema/Core/IM.xml                       |  1 +
 xml/schema/Report/ReportInstance.xml         |  2 +-
 xml/templates/dao.tpl                        |  7 +++++--
 161 files changed, 934 insertions(+), 477 deletions(-)

diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php
index fa06cf96c5e2..57934d13036c 100644
--- a/CRM/ACL/DAO/ACL.php
+++ b/CRM/ACL/DAO/ACL.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f75eaa0ee87675c14a224ec22b2c30a7)
+ * (GenCodeChecksum:54e8c75c28c9dd74192f60bbcf1605f6)
  */
 
 /**
@@ -117,9 +117,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('ACLs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('ACLs') : ts('ACL');
   }
 
   /**
diff --git a/CRM/ACL/DAO/ACLCache.php b/CRM/ACL/DAO/ACLCache.php
index 7e3ac8429f16..671354acb388 100644
--- a/CRM/ACL/DAO/ACLCache.php
+++ b/CRM/ACL/DAO/ACLCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cbf36d56ce734a5f7ceeb2071b68ebf8)
+ * (GenCodeChecksum:cec3d7c7aced95902840b72829550156)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('ACLCaches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('ACLCaches') : ts('ACLCache');
   }
 
   /**
diff --git a/CRM/ACL/DAO/EntityRole.php b/CRM/ACL/DAO/EntityRole.php
index 9130d307ae4c..4e31bd8466f9 100644
--- a/CRM/ACL/DAO/EntityRole.php
+++ b/CRM/ACL/DAO/EntityRole.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/EntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d985c951ef9a8872008576b41c1f2b9c)
+ * (GenCodeChecksum:c1087517beb5b266d4a1a0a1a342ced0)
  */
 
 /**
@@ -75,9 +75,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Roles');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Roles') : ts('Entity Role');
   }
 
   /**
diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php
index 03ad751cd6b7..26f50e0b5f65 100644
--- a/CRM/Activity/DAO/Activity.php
+++ b/CRM/Activity/DAO/Activity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/Activity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cbcbcbb6720f015deae4097b01196c9a)
+ * (GenCodeChecksum:c1b4cc908c0220abf69f57d281eeda95)
  */
 
 /**
@@ -226,9 +226,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Activities');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Activities') : ts('Activity');
   }
 
   /**
diff --git a/CRM/Activity/DAO/ActivityContact.php b/CRM/Activity/DAO/ActivityContact.php
index 61676f395b5f..fd6633a19111 100644
--- a/CRM/Activity/DAO/ActivityContact.php
+++ b/CRM/Activity/DAO/ActivityContact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Activity/ActivityContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:777598f3625dfeaf37a81de282808c60)
+ * (GenCodeChecksum:60851972b9f03efb52350929e557c768)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Activity Contacts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Activity Contacts') : ts('Activity Contact');
   }
 
   /**
diff --git a/CRM/Batch/DAO/Batch.php b/CRM/Batch/DAO/Batch.php
index f2571b674f83..7e153f47861e 100644
--- a/CRM/Batch/DAO/Batch.php
+++ b/CRM/Batch/DAO/Batch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Batch/Batch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8169fc2f338afc4a163214c0018030be)
+ * (GenCodeChecksum:29e187971d03eba3ce5e3848f2ea1a5b)
  */
 
 /**
@@ -157,9 +157,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Batches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Batches') : ts('Batch');
   }
 
   /**
diff --git a/CRM/Batch/DAO/EntityBatch.php b/CRM/Batch/DAO/EntityBatch.php
index 6c697fb37073..f7e2fffb74bd 100644
--- a/CRM/Batch/DAO/EntityBatch.php
+++ b/CRM/Batch/DAO/EntityBatch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Batch/EntityBatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6b6bd1337d9011c2a262de0e62c1e8e1)
+ * (GenCodeChecksum:aaeb317f89d831d683f53e7c45e1b175)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Batches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Batches') : ts('Entity Batch');
   }
 
   /**
diff --git a/CRM/Campaign/DAO/Campaign.php b/CRM/Campaign/DAO/Campaign.php
index 742996a6bde2..8dc0245910ea 100644
--- a/CRM/Campaign/DAO/Campaign.php
+++ b/CRM/Campaign/DAO/Campaign.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Campaign.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cfa77579eb9b91b31b6c5618b52c6e87)
+ * (GenCodeChecksum:a5a49e13e66a5d32b690835a49baf535)
  */
 
 /**
@@ -166,9 +166,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Campaigns');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Campaigns') : ts('Campaign');
   }
 
   /**
diff --git a/CRM/Campaign/DAO/CampaignGroup.php b/CRM/Campaign/DAO/CampaignGroup.php
index 97d4abd5af18..581ab4e5052b 100644
--- a/CRM/Campaign/DAO/CampaignGroup.php
+++ b/CRM/Campaign/DAO/CampaignGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/CampaignGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:74c02a4708ef706860d023c1635b98c4)
+ * (GenCodeChecksum:55b3974bbc1aa8405d11a5c396401fa9)
  */
 
 /**
@@ -75,9 +75,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Campaign Groups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Campaign Groups') : ts('Campaign Group');
   }
 
   /**
diff --git a/CRM/Campaign/DAO/Survey.php b/CRM/Campaign/DAO/Survey.php
index 9c9626b6be8c..b6bc19126061 100644
--- a/CRM/Campaign/DAO/Survey.php
+++ b/CRM/Campaign/DAO/Survey.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Campaign/Survey.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e955546c8081852591bc08b1fdee4213)
+ * (GenCodeChecksum:afb7cfcccd2a6177b2b10e07afa92e8e)
  */
 
 /**
@@ -187,9 +187,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Surveys');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Surveys') : ts('Survey');
   }
 
   /**
diff --git a/CRM/Case/DAO/Case.php b/CRM/Case/DAO/Case.php
index 946c992f4b6a..ebf2311f678e 100644
--- a/CRM/Case/DAO/Case.php
+++ b/CRM/Case/DAO/Case.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/Case.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8b18140da75bbf971a143c205f2af1cd)
+ * (GenCodeChecksum:bae905b3b253acc0df005cc66dd9b717)
  */
 
 /**
@@ -115,9 +115,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Cases');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Cases') : ts('Case');
   }
 
   /**
diff --git a/CRM/Case/DAO/CaseActivity.php b/CRM/Case/DAO/CaseActivity.php
index 9efe7b4af3e5..e0d65cb58b8d 100644
--- a/CRM/Case/DAO/CaseActivity.php
+++ b/CRM/Case/DAO/CaseActivity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseActivity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:974d18e84d3416c98293bedd66c3384c)
+ * (GenCodeChecksum:565c78ce07c94d858e5e6e400c4d1ad6)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Case Activities');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Case Activities') : ts('Case Activity');
   }
 
   /**
diff --git a/CRM/Case/DAO/CaseContact.php b/CRM/Case/DAO/CaseContact.php
index 788b1e58f948..d5b524ae02b4 100644
--- a/CRM/Case/DAO/CaseContact.php
+++ b/CRM/Case/DAO/CaseContact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b315f42d7c886c123c9e87c9713c4911)
+ * (GenCodeChecksum:57c93b00e00d0a48d5071d5a991289ab)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Case Contacts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Case Contacts') : ts('Case Contact');
   }
 
   /**
diff --git a/CRM/Case/DAO/CaseType.php b/CRM/Case/DAO/CaseType.php
index dbafcb30a8db..246edc51fd66 100644
--- a/CRM/Case/DAO/CaseType.php
+++ b/CRM/Case/DAO/CaseType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Case/CaseType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cde81a56b0e8201eac521b92ded6fb45)
+ * (GenCodeChecksum:52f839e38c020cd422ef99dff4ab5f1b)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Case Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Case Types') : ts('Case Type');
   }
 
   /**
diff --git a/CRM/Contact/DAO/ACLContactCache.php b/CRM/Contact/DAO/ACLContactCache.php
index 6b319f9636ce..d5383fbc1d58 100644
--- a/CRM/Contact/DAO/ACLContactCache.php
+++ b/CRM/Contact/DAO/ACLContactCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ACLContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:97d9be5e13ece64b6c9ad1722d9bca68)
+ * (GenCodeChecksum:ff86d1eed99d09ea6768d93b3cc39973)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('ACLContact Caches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('ACLContact Caches') : ts('ACLContact Cache');
   }
 
   /**
diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php
index f91dc3264b1e..c585b127039b 100644
--- a/CRM/Contact/DAO/Contact.php
+++ b/CRM/Contact/DAO/Contact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Contact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f58884560d4f49764182cd97f1bbbcdf)
+ * (GenCodeChecksum:f118596cceae71668861504b7316afa7)
  */
 
 /**
@@ -397,9 +397,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Contacts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Contacts') : ts('Contact');
   }
 
   /**
diff --git a/CRM/Contact/DAO/ContactType.php b/CRM/Contact/DAO/ContactType.php
index 41d8b8780369..4f7f63f5a3ed 100644
--- a/CRM/Contact/DAO/ContactType.php
+++ b/CRM/Contact/DAO/ContactType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ContactType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0f7546e10f09f7637d50f7a34c632cb5)
+ * (GenCodeChecksum:9719ec84435a76decf1937f7a389ac7f)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Contact Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Contact Types') : ts('Contact Type');
   }
 
   /**
diff --git a/CRM/Contact/DAO/DashboardContact.php b/CRM/Contact/DAO/DashboardContact.php
index 16c0b3b59379..f8f4e87daa3c 100644
--- a/CRM/Contact/DAO/DashboardContact.php
+++ b/CRM/Contact/DAO/DashboardContact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/DashboardContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:67153c09e74eda2febf15986f9c04439)
+ * (GenCodeChecksum:ef3a393d20b6654dcef952f21df8072d)
  */
 
 /**
@@ -80,9 +80,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Dashboard Contacts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Dashboard Contacts') : ts('Dashboard Contact');
   }
 
   /**
diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php
index cdae40198635..81f335ad6022 100644
--- a/CRM/Contact/DAO/Group.php
+++ b/CRM/Contact/DAO/Group.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Group.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6a2a222c5fa5b461727bb95379723b08)
+ * (GenCodeChecksum:9d3fc8fbc20e3b8068d5989828341c66)
  */
 
 /**
@@ -185,9 +185,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Groups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Groups') : ts('Group');
   }
 
   /**
diff --git a/CRM/Contact/DAO/GroupContact.php b/CRM/Contact/DAO/GroupContact.php
index 52c66fd638c9..3cee7b7e0790 100644
--- a/CRM/Contact/DAO/GroupContact.php
+++ b/CRM/Contact/DAO/GroupContact.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupContact.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:143ba4d95cae73fc81c8e932970cbc1f)
+ * (GenCodeChecksum:69e994c5047ecf8d68700c694047720f)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Group Contacts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Group Contacts') : ts('Group Contact');
   }
 
   /**
diff --git a/CRM/Contact/DAO/GroupContactCache.php b/CRM/Contact/DAO/GroupContactCache.php
index 3ee02aa7e209..e4310747a9db 100644
--- a/CRM/Contact/DAO/GroupContactCache.php
+++ b/CRM/Contact/DAO/GroupContactCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a169b776ec9bfc8864a05750d4ae6b95)
+ * (GenCodeChecksum:424f49d5c972e05144c327cf7ba0992c)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Group Contact Caches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Group Contact Caches') : ts('Group Contact Cache');
   }
 
   /**
diff --git a/CRM/Contact/DAO/GroupNesting.php b/CRM/Contact/DAO/GroupNesting.php
index 90624a6e98fd..6262c1f5a44f 100644
--- a/CRM/Contact/DAO/GroupNesting.php
+++ b/CRM/Contact/DAO/GroupNesting.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupNesting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0ca7da77b0229b439c9c3a4c4c2e4326)
+ * (GenCodeChecksum:396dffdb22106c85cc4832b61307c264)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Group Nestings');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Group Nestings') : ts('Group Nesting');
   }
 
   /**
diff --git a/CRM/Contact/DAO/GroupOrganization.php b/CRM/Contact/DAO/GroupOrganization.php
index 407ea31d83f5..0553dff9ec64 100644
--- a/CRM/Contact/DAO/GroupOrganization.php
+++ b/CRM/Contact/DAO/GroupOrganization.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/GroupOrganization.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dfe8edf8f786790af95f09f456d1cbe7)
+ * (GenCodeChecksum:0ae83aef7dbfb877f46a92f27001dd6b)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Group Organizations');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Group Organizations') : ts('Group Organization');
   }
 
   /**
diff --git a/CRM/Contact/DAO/Relationship.php b/CRM/Contact/DAO/Relationship.php
index 14b10a52802e..8ad5e40702fd 100644
--- a/CRM/Contact/DAO/Relationship.php
+++ b/CRM/Contact/DAO/Relationship.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Relationship.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:25faea8225f483ae95cf29af08a8542d)
+ * (GenCodeChecksum:7fed0ad7c2ed2b072582b55afdb6469f)
  */
 
 /**
@@ -124,9 +124,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Relationships');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Relationships') : ts('Relationship');
   }
 
   /**
diff --git a/CRM/Contact/DAO/RelationshipCache.php b/CRM/Contact/DAO/RelationshipCache.php
index cfa5a75bc2e0..1e874cb2bd9a 100644
--- a/CRM/Contact/DAO/RelationshipCache.php
+++ b/CRM/Contact/DAO/RelationshipCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/RelationshipCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b40781c15c3351a766a6083522f0e5e4)
+ * (GenCodeChecksum:6de8ba08019ff8821fd4e09f14db6da9)
  */
 
 /**
@@ -124,9 +124,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Relationship Caches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Relationship Caches') : ts('Relationship Cache');
   }
 
   /**
diff --git a/CRM/Contact/DAO/RelationshipType.php b/CRM/Contact/DAO/RelationshipType.php
index e703e2fe849b..3ac981c81f84 100644
--- a/CRM/Contact/DAO/RelationshipType.php
+++ b/CRM/Contact/DAO/RelationshipType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/RelationshipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6e9767fcd0fc6eba8fcd408588fe0755)
+ * (GenCodeChecksum:258f862b2238ae69432d8955ae8df803)
  */
 
 /**
@@ -124,9 +124,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Relationship Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Relationship Types') : ts('Relationship Type');
   }
 
   /**
diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php
index a5fb2d460375..c532997a2a3d 100644
--- a/CRM/Contact/DAO/SavedSearch.php
+++ b/CRM/Contact/DAO/SavedSearch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SavedSearch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4b2f292a8196a5dc4a73afc078cd11cb)
+ * (GenCodeChecksum:d863f8b0b8659633bc84578e1d6cbf10)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Saved Searches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Saved Searches') : ts('Saved Search');
   }
 
   /**
diff --git a/CRM/Contact/DAO/SubscriptionHistory.php b/CRM/Contact/DAO/SubscriptionHistory.php
index 421ea3381555..cbdab5b5352a 100644
--- a/CRM/Contact/DAO/SubscriptionHistory.php
+++ b/CRM/Contact/DAO/SubscriptionHistory.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SubscriptionHistory.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7c033b0631f14da30172883b14686574)
+ * (GenCodeChecksum:c38d68dcab2d037fc65d4e59bd30d1d4)
  */
 
 /**
@@ -89,9 +89,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Subscription Histories');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Subscription Histories') : ts('Subscription History');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php
index 45f51b756cad..174e9bf69591 100644
--- a/CRM/Contribute/DAO/Contribution.php
+++ b/CRM/Contribute/DAO/Contribution.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Contribution.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cc3bcdbce84066823084f71e30f6990b)
+ * (GenCodeChecksum:d937ea0497be1a1aeb1bac09986dd802)
  */
 
 /**
@@ -252,9 +252,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Contributions');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Contributions') : ts('Contribution');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/ContributionPage.php b/CRM/Contribute/DAO/ContributionPage.php
index 80ec08d3acf6..be85752fb787 100644
--- a/CRM/Contribute/DAO/ContributionPage.php
+++ b/CRM/Contribute/DAO/ContributionPage.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionPage.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:902bfa164280b9ba21a7cb5a38aceba8)
+ * (GenCodeChecksum:4910b973830834fcb2ce5bb3637070d6)
  */
 
 /**
@@ -362,9 +362,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Contribution Pages');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Contribution Pages') : ts('Contribution Page');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/ContributionProduct.php b/CRM/Contribute/DAO/ContributionProduct.php
index e5a0f053702a..9837f2b8c084 100644
--- a/CRM/Contribute/DAO/ContributionProduct.php
+++ b/CRM/Contribute/DAO/ContributionProduct.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionProduct.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e76d9dc75f5bc1b1141645c8ee5e2e4)
+ * (GenCodeChecksum:a2a4170ca2004a1630e27ba83e5edff3)
  */
 
 /**
@@ -100,9 +100,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Contribution Products');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Contribution Products') : ts('Contribution Product');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php
index 2ccd7486d6c3..f61c44705145 100644
--- a/CRM/Contribute/DAO/ContributionRecur.php
+++ b/CRM/Contribute/DAO/ContributionRecur.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:decf43c002d0e4ded0fe5f2a2e2f7bd0)
+ * (GenCodeChecksum:ba5f7682a5f99b682f70cd45097feb56)
  */
 
 /**
@@ -239,9 +239,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Recurring Contributions');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Recurring Contributions') : ts('Recurring Contribution');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php
index 3a1a9b7af760..fa78630bad12 100644
--- a/CRM/Contribute/DAO/ContributionSoft.php
+++ b/CRM/Contribute/DAO/ContributionSoft.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:caa58722ef865c7342fdff08f24d86ee)
+ * (GenCodeChecksum:e37496d0b9938151e5bcf9e6dad23c0a)
  */
 
 /**
@@ -104,9 +104,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Contribution Softs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Contribution Softs') : ts('Contribution Soft');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/Premium.php b/CRM/Contribute/DAO/Premium.php
index 7e0020c13492..ebbafd660e65 100644
--- a/CRM/Contribute/DAO/Premium.php
+++ b/CRM/Contribute/DAO/Premium.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Premium.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cd1826e777cea80450636ef175aaab7f)
+ * (GenCodeChecksum:b35b6fb4895df990a55d9015bb82a852)
  */
 
 /**
@@ -111,9 +111,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Premiums');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Premiums') : ts('Premium');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/PremiumsProduct.php b/CRM/Contribute/DAO/PremiumsProduct.php
index b153adb27496..f99e9ddf30b8 100644
--- a/CRM/Contribute/DAO/PremiumsProduct.php
+++ b/CRM/Contribute/DAO/PremiumsProduct.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/PremiumsProduct.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4831cb4c7e0611db0f4312f6522d2c20)
+ * (GenCodeChecksum:84fea8d6a2a852495da5ed86232d42d1)
  */
 
 /**
@@ -73,9 +73,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Premiums Products');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Premiums Products') : ts('Premiums Product');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/Product.php b/CRM/Contribute/DAO/Product.php
index 8433e1820ad0..7b481641af4d 100644
--- a/CRM/Contribute/DAO/Product.php
+++ b/CRM/Contribute/DAO/Product.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Product.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dea1c7db61776456a70f752fe9f93f06)
+ * (GenCodeChecksum:d6c90aacbe802ff244a6a4bbaecad4d3)
  */
 
 /**
@@ -170,9 +170,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Products');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Products') : ts('Product');
   }
 
   /**
diff --git a/CRM/Contribute/DAO/Widget.php b/CRM/Contribute/DAO/Widget.php
index 5da47438da53..a49f0a9471d9 100644
--- a/CRM/Contribute/DAO/Widget.php
+++ b/CRM/Contribute/DAO/Widget.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/Widget.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e24eaf675b793969d408fbc0f847a9ed)
+ * (GenCodeChecksum:bb99920b9b2c2a8b7419ecd94dcbf577)
  */
 
 /**
@@ -141,9 +141,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Widgets');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Widgets') : ts('Widget');
   }
 
   /**
diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php
index 4d2be52ad41a..6a96e0d7c2ab 100644
--- a/CRM/Core/CodeGen/Specification.php
+++ b/CRM/Core/CodeGen/Specification.php
@@ -204,13 +204,15 @@ public function getTable($tableXML, &$database, &$tables) {
       }
     }
 
+    $titleFromClass = preg_replace('/([a-z])([A-Z])/', '$1 $2', $klass);
     $table = [
       'name' => $name,
       'base' => $daoPath,
       'sourceFile' => $sourceFile,
       'fileName' => $klass . '.php',
       'objectName' => $klass,
-      'title' => $tableXML->title ?? self::nameToTitle($klass),
+      'title' => $tableXML->title ?? $titleFromClass,
+      'titlePlural' => $tableXML->titlePlural ?? CRM_Utils_String::pluralize($tableXML->title ?? $titleFromClass),
       'icon' => $tableXML->icon ?? NULL,
       'add' => $tableXML->add ?? NULL,
       'labelName' => substr($name, 8),
@@ -746,15 +748,4 @@ protected function getSize($fieldXML) {
     return 'CRM_Utils_Type::HUGE';
   }
 
-  /**
-   * Converts an entity name to a user friendly string.
-   *
-   * @param string $name
-   * return string
-   */
-  public static function nameToTitle(string $name) {
-    $name = preg_replace('/([a-z])([A-Z])/', '$1 $2', $name);
-    return CRM_Utils_String::pluralize($name);
-  }
-
 }
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index d62fba1401e7..ee3cfaeebb6d 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -121,11 +121,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
    * @return string
    */
   public static function getEntityTitle() {
     $className = static::class;
-    Civi::log()->warning("$className needs to be regeneraged. Missing getEntityTitle method.", ['civi.tag' => 'deprecated']);
+    Civi::log()->warning("$className needs to be regenerated. Missing getEntityTitle method.", ['civi.tag' => 'deprecated']);
     return CRM_Core_DAO_AllCoreTables::getBriefName($className);
   }
 
diff --git a/CRM/Core/DAO/ActionLog.php b/CRM/Core/DAO/ActionLog.php
index f725a2558a18..8eb9523e50a5 100644
--- a/CRM/Core/DAO/ActionLog.php
+++ b/CRM/Core/DAO/ActionLog.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2ccef6f7cc6a43d833301e93a2a0d61f)
+ * (GenCodeChecksum:a449765feaf80c56214be9fce2f118b4)
  */
 
 /**
@@ -108,9 +108,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Action Logs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Action Logs') : ts('Action Log');
   }
 
   /**
diff --git a/CRM/Core/DAO/ActionMapping.php b/CRM/Core/DAO/ActionMapping.php
index 8a61ce5bbc49..3224bc1269fa 100644
--- a/CRM/Core/DAO/ActionMapping.php
+++ b/CRM/Core/DAO/ActionMapping.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionMapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:037a3f26719a4774957814f28c499e60)
+ * (GenCodeChecksum:7db8e13984f33629f584a8a54c37fd4a)
  */
 
 /**
@@ -101,9 +101,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Action Mappings');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Action Mappings') : ts('Action Mapping');
   }
 
   /**
diff --git a/CRM/Core/DAO/ActionSchedule.php b/CRM/Core/DAO/ActionSchedule.php
index 666f773ba859..181a1bdee506 100644
--- a/CRM/Core/DAO/ActionSchedule.php
+++ b/CRM/Core/DAO/ActionSchedule.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/ActionSchedule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d05639de89f460efbb3474dcaf5acd27)
+ * (GenCodeChecksum:77bfa18590c85ad7b6430c018acd508c)
  */
 
 /**
@@ -300,9 +300,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Action Schedules');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Action Schedules') : ts('Action Schedule');
   }
 
   /**
diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php
index 7151847db2f9..257de9924f39 100644
--- a/CRM/Core/DAO/Address.php
+++ b/CRM/Core/DAO/Address.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Address.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a6b8f21dd3839de1ce1273e0910f0c8c)
+ * (GenCodeChecksum:01b95dc4df972f40d718b61c77cd3b58)
  */
 
 /**
@@ -250,9 +250,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Addresses');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Addresses') : ts('Address');
   }
 
   /**
diff --git a/CRM/Core/DAO/AddressFormat.php b/CRM/Core/DAO/AddressFormat.php
index 762b90b6a177..d1c1d088427b 100644
--- a/CRM/Core/DAO/AddressFormat.php
+++ b/CRM/Core/DAO/AddressFormat.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/AddressFormat.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1ce11647576d05acfc364969eddfcce4)
+ * (GenCodeChecksum:7cc2864a78be48031ca829de49afeef6)
  */
 
 /**
@@ -54,9 +54,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Address Formats');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Address Formats') : ts('Address Format');
   }
 
   /**
diff --git a/CRM/Core/DAO/Cache.php b/CRM/Core/DAO/Cache.php
index 01bc33ea91c5..f8366cb2d037 100644
--- a/CRM/Core/DAO/Cache.php
+++ b/CRM/Core/DAO/Cache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Cache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:af1401f844c699c6ad35366a32a8db03)
+ * (GenCodeChecksum:bafe6ce2f7fd94b2581bfc4dad813130)
  */
 
 /**
@@ -89,9 +89,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Caches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Caches') : ts('Cache');
   }
 
   /**
diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php
index f9b7b077f9ad..f1d560b656b6 100644
--- a/CRM/Core/DAO/Component.php
+++ b/CRM/Core/DAO/Component.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Component.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6c3fd2c8e875746c0ceffa499624f77c)
+ * (GenCodeChecksum:a5136517000cfab182cdacc3130bc29c)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Components');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Components') : ts('Component');
   }
 
   /**
diff --git a/CRM/Core/DAO/Country.php b/CRM/Core/DAO/Country.php
index 24d458b99cef..b91e0062fb23 100644
--- a/CRM/Core/DAO/Country.php
+++ b/CRM/Core/DAO/Country.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Country.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cdd80b394924586274cf4b91183d3637)
+ * (GenCodeChecksum:2215bb79c9fe62c60700f232598a9462)
  */
 
 /**
@@ -103,9 +103,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Countries');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Countries') : ts('Country');
   }
 
   /**
diff --git a/CRM/Core/DAO/County.php b/CRM/Core/DAO/County.php
index 97d2fae58ea1..9b05e4bee6cc 100644
--- a/CRM/Core/DAO/County.php
+++ b/CRM/Core/DAO/County.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/County.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:96f94dbbafff9a4e1f0ff276799fcbbd)
+ * (GenCodeChecksum:5620d2136c764c786eef1c15853eaf9b)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Counties');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Counties') : ts('County');
   }
 
   /**
diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 5edafdf5c6e1..a453096360b9 100644
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b74179ea5553c544931562d6aac5641e)
+ * (GenCodeChecksum:3a8f6978ec00d7e2cff93f2915ac1f48)
  */
 
 /**
@@ -257,9 +257,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Custom Fields');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Custom Fields') : ts('Custom Field');
   }
 
   /**
diff --git a/CRM/Core/DAO/CustomGroup.php b/CRM/Core/DAO/CustomGroup.php
index 12dd47769ebc..8be9d28b2426 100644
--- a/CRM/Core/DAO/CustomGroup.php
+++ b/CRM/Core/DAO/CustomGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:494d883be861157d8067e6a6c50c23f6)
+ * (GenCodeChecksum:3436e2a4cf99bd9b7c859170db37bce3)
  */
 
 /**
@@ -194,9 +194,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Custom Groups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Custom Groups') : ts('Custom Group');
   }
 
   /**
diff --git a/CRM/Core/DAO/Dashboard.php b/CRM/Core/DAO/Dashboard.php
index a9d40d32437c..57773da9dfce 100644
--- a/CRM/Core/DAO/Dashboard.php
+++ b/CRM/Core/DAO/Dashboard.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Dashboard.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2d134bfa6938d2e8a8d8e25e99769823)
+ * (GenCodeChecksum:262213759ac6f4c9943f4ebd454256ae)
  */
 
 /**
@@ -115,9 +115,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Dashboards');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Dashboards') : ts('Dashboard');
   }
 
   /**
diff --git a/CRM/Core/DAO/Discount.php b/CRM/Core/DAO/Discount.php
index ed2f53e1e1d5..a18cacfb6003 100644
--- a/CRM/Core/DAO/Discount.php
+++ b/CRM/Core/DAO/Discount.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Discount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a23716379d3cccf678a9d8e423690e7c)
+ * (GenCodeChecksum:5fbe08bc556f5b913860a55c6d0cedc4)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Discounts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Discounts') : ts('Discount');
   }
 
   /**
diff --git a/CRM/Core/DAO/Domain.php b/CRM/Core/DAO/Domain.php
index 82ccf0f5a8f9..ce6b480508f9 100644
--- a/CRM/Core/DAO/Domain.php
+++ b/CRM/Core/DAO/Domain.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Domain.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:57a526de0b2bc02fed832a22dc50ad80)
+ * (GenCodeChecksum:99a50c29878792b8864e20d184ce9bbb)
  */
 
 /**
@@ -89,9 +89,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Domains');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Domains') : ts('Domain');
   }
 
   /**
diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php
index 7c0a55b812bd..4f890d5cf0b0 100644
--- a/CRM/Core/DAO/Email.php
+++ b/CRM/Core/DAO/Email.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Email.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:866b627595adac9091080a4e4ab146bc)
+ * (GenCodeChecksum:2736b767bcd747315f0382f4e298ad35)
  */
 
 /**
@@ -131,9 +131,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Emails');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Emails') : ts('Email');
   }
 
   /**
diff --git a/CRM/Core/DAO/EntityFile.php b/CRM/Core/DAO/EntityFile.php
index 0d32257d1e18..e405a0d0d6a6 100644
--- a/CRM/Core/DAO/EntityFile.php
+++ b/CRM/Core/DAO/EntityFile.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/EntityFile.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f2d4dfec2466ad664b4949983b1c7e58)
+ * (GenCodeChecksum:70221552c8c9532b2aaf9cd89e73a68d)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Files');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Files') : ts('Entity File');
   }
 
   /**
diff --git a/CRM/Core/DAO/EntityTag.php b/CRM/Core/DAO/EntityTag.php
index eb2be19b6666..6db35b547c23 100644
--- a/CRM/Core/DAO/EntityTag.php
+++ b/CRM/Core/DAO/EntityTag.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/EntityTag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:58f15f695b38fa4cacfdf82d2734e0f0)
+ * (GenCodeChecksum:82e27d87178a408cd0a1c201f3501dd2)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Tags');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Tags') : ts('Entity Tag');
   }
 
   /**
diff --git a/CRM/Core/DAO/Extension.php b/CRM/Core/DAO/Extension.php
index c666e3ab0222..b1fc0de3f60f 100644
--- a/CRM/Core/DAO/Extension.php
+++ b/CRM/Core/DAO/Extension.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Extension.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:08d2151b75e68f334bd88475b58fab7b)
+ * (GenCodeChecksum:46f6ff725b1ad9909d2340d728438d36)
  */
 
 /**
@@ -94,9 +94,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Extensions');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Extensions') : ts('Extension');
   }
 
   /**
diff --git a/CRM/Core/DAO/File.php b/CRM/Core/DAO/File.php
index dc6508d4a6e4..620734811c1e 100644
--- a/CRM/Core/DAO/File.php
+++ b/CRM/Core/DAO/File.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/File.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:aa0883a815a43dd250612348f3ec470e)
+ * (GenCodeChecksum:dd8a70727f67481339dd514fdca6aae5)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Files');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Files') : ts('File');
   }
 
   /**
diff --git a/CRM/Core/DAO/IM.php b/CRM/Core/DAO/IM.php
index 958b4dda190c..fdc40df188c4 100644
--- a/CRM/Core/DAO/IM.php
+++ b/CRM/Core/DAO/IM.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/IM.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:da6b080a31b208a71635d272fabab7ec)
+ * (GenCodeChecksum:f64b9a15f4a240d7a137cb5655feb696)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Instant Messaging');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Instant Messaging') : ts('Instant Messaging');
   }
 
   /**
diff --git a/CRM/Core/DAO/Job.php b/CRM/Core/DAO/Job.php
index ebdb62818e4e..cbc870082e44 100644
--- a/CRM/Core/DAO/Job.php
+++ b/CRM/Core/DAO/Job.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Job.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6e3a5de515fda550b1b5aeb493c50f0b)
+ * (GenCodeChecksum:bbc36abe96310ec5cf23d46d2d1728cb)
  */
 
 /**
@@ -117,9 +117,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Jobs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Jobs') : ts('Job');
   }
 
   /**
diff --git a/CRM/Core/DAO/JobLog.php b/CRM/Core/DAO/JobLog.php
index b59a98b1f5b2..51db9714637f 100644
--- a/CRM/Core/DAO/JobLog.php
+++ b/CRM/Core/DAO/JobLog.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/JobLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:eca8e7af1026dbfaf7beecb95ce02361)
+ * (GenCodeChecksum:74e191eba977eb496bae109ca9720ab7)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Job Logs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Job Logs') : ts('Job Log');
   }
 
   /**
diff --git a/CRM/Core/DAO/LocBlock.php b/CRM/Core/DAO/LocBlock.php
index 154a2e776c61..2eca88b4b625 100644
--- a/CRM/Core/DAO/LocBlock.php
+++ b/CRM/Core/DAO/LocBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/LocBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8459c5a6d25e5c70e44de49b109a82fa)
+ * (GenCodeChecksum:801a2e7e05f688cf38882b466f22a292)
  */
 
 /**
@@ -87,9 +87,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Loc Blocks');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Loc Blocks') : ts('Loc Block');
   }
 
   /**
diff --git a/CRM/Core/DAO/LocationType.php b/CRM/Core/DAO/LocationType.php
index 70648f67db31..3427ba89b38b 100644
--- a/CRM/Core/DAO/LocationType.php
+++ b/CRM/Core/DAO/LocationType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/LocationType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:325ccb933339bc909efc7d6b60c7186b)
+ * (GenCodeChecksum:450719aeeb146b60007152d03e0b6faf)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Location Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Location Types') : ts('Location Type');
   }
 
   /**
diff --git a/CRM/Core/DAO/Log.php b/CRM/Core/DAO/Log.php
index 182d42f5d40e..b550b04515c6 100644
--- a/CRM/Core/DAO/Log.php
+++ b/CRM/Core/DAO/Log.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Log.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5dfdb2863ba1bc7b84288a522cdaef51)
+ * (GenCodeChecksum:3b97d17eeaa407d9f7f7aa6e1d819090)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Logs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Logs') : ts('Log');
   }
 
   /**
diff --git a/CRM/Core/DAO/MailSettings.php b/CRM/Core/DAO/MailSettings.php
index acc8278c1904..6c3c02f70d60 100644
--- a/CRM/Core/DAO/MailSettings.php
+++ b/CRM/Core/DAO/MailSettings.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MailSettings.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b43716d8c8e362738d8d3420e8fbe03d)
+ * (GenCodeChecksum:310f3c60fe656e8ef27a67234d6fa80c)
  */
 
 /**
@@ -145,9 +145,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mail Settingses');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mail Settingses') : ts('Mail Settings');
   }
 
   /**
diff --git a/CRM/Core/DAO/Managed.php b/CRM/Core/DAO/Managed.php
index 212817ec7860..a67271247cbe 100644
--- a/CRM/Core/DAO/Managed.php
+++ b/CRM/Core/DAO/Managed.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Managed.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e6146e35f8c8321e600a4198cbd6949e)
+ * (GenCodeChecksum:119de7e386aa83b1ca5038a1e409aafe)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Manageds');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Manageds') : ts('Managed');
   }
 
   /**
diff --git a/CRM/Core/DAO/Mapping.php b/CRM/Core/DAO/Mapping.php
index 59505d1d5fb0..3c7639a857d5 100644
--- a/CRM/Core/DAO/Mapping.php
+++ b/CRM/Core/DAO/Mapping.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Mapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c97b13ea2aaccdf8ba13b6552ccb59f2)
+ * (GenCodeChecksum:49336d40a24f0312944123741932dd25)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mappings');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mappings') : ts('Mapping');
   }
 
   /**
diff --git a/CRM/Core/DAO/MappingField.php b/CRM/Core/DAO/MappingField.php
index cd5f06e741b4..bfe139eda992 100644
--- a/CRM/Core/DAO/MappingField.php
+++ b/CRM/Core/DAO/MappingField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MappingField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3702a3c3cb9cd696eb829d15f4676439)
+ * (GenCodeChecksum:7197da108e5452be6ab8b419a1506aec)
  */
 
 /**
@@ -137,9 +137,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mapping Fields');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mapping Fields') : ts('Mapping Field');
   }
 
   /**
diff --git a/CRM/Core/DAO/Menu.php b/CRM/Core/DAO/Menu.php
index 98f3f4ad1491..3fb9a797c3e0 100644
--- a/CRM/Core/DAO/Menu.php
+++ b/CRM/Core/DAO/Menu.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Menu.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8be7941b4dccb08266109e3e1599159f)
+ * (GenCodeChecksum:b94ecc10dafe21deb7e5067ef46f32af)
  */
 
 /**
@@ -190,9 +190,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Menus');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Menus') : ts('Menu');
   }
 
   /**
diff --git a/CRM/Core/DAO/MessageTemplate.php b/CRM/Core/DAO/MessageTemplate.php
index 5c7965c83f83..f3da47e578b7 100644
--- a/CRM/Core/DAO/MessageTemplate.php
+++ b/CRM/Core/DAO/MessageTemplate.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MessageTemplate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:68dd4ac3c9f098e3577dbed8d5a2a105)
+ * (GenCodeChecksum:6881b34cbbefc06722c58fe7f20b1c58)
  */
 
 /**
@@ -120,9 +120,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Message Templates');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Message Templates') : ts('Message Template');
   }
 
   /**
diff --git a/CRM/Core/DAO/Navigation.php b/CRM/Core/DAO/Navigation.php
index b567777810a4..ed52b19610f3 100644
--- a/CRM/Core/DAO/Navigation.php
+++ b/CRM/Core/DAO/Navigation.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Navigation.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:34c3d3b834400b49f1b8c6c99a08c99e)
+ * (GenCodeChecksum:8cc5473f0cd98bf289dc455eefb0af76)
  */
 
 /**
@@ -122,9 +122,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Navigations');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Navigations') : ts('Navigation');
   }
 
   /**
diff --git a/CRM/Core/DAO/Note.php b/CRM/Core/DAO/Note.php
index 748d1076f18e..3c730b47ee70 100644
--- a/CRM/Core/DAO/Note.php
+++ b/CRM/Core/DAO/Note.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Note.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:86e72396a497a58c1568d0d081435e75)
+ * (GenCodeChecksum:75161cdedcd719f035387c9c1d0d83dd)
  */
 
 /**
@@ -103,9 +103,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Notes');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Notes') : ts('Note');
   }
 
   /**
diff --git a/CRM/Core/DAO/OpenID.php b/CRM/Core/DAO/OpenID.php
index 1a61aba15603..dfe13c489d5c 100644
--- a/CRM/Core/DAO/OpenID.php
+++ b/CRM/Core/DAO/OpenID.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OpenID.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4d60933113e2b5330dd8194e7ebe6ae4)
+ * (GenCodeChecksum:7af55174e40a30da959ad7734573eb9a)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Open IDs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Open IDs') : ts('Open ID');
   }
 
   /**
diff --git a/CRM/Core/DAO/OptionGroup.php b/CRM/Core/DAO/OptionGroup.php
index 9feb9fd8f107..76ef9a0bcff1 100644
--- a/CRM/Core/DAO/OptionGroup.php
+++ b/CRM/Core/DAO/OptionGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d0011ad2bb6c090eeb86d25916c5624b)
+ * (GenCodeChecksum:e9bb68e874d377a0c30b433103d438d4)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Option Groups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Option Groups') : ts('Option Group');
   }
 
   /**
diff --git a/CRM/Core/DAO/OptionValue.php b/CRM/Core/DAO/OptionValue.php
index 7f0c3644f208..5fb8ddb4521f 100644
--- a/CRM/Core/DAO/OptionValue.php
+++ b/CRM/Core/DAO/OptionValue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OptionValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e51b16ecfe5f8302c8610b7f5dfd55e5)
+ * (GenCodeChecksum:f47024ac081427ddadce4c569934f8a6)
  */
 
 /**
@@ -164,9 +164,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Option Values');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Option Values') : ts('Option Value');
   }
 
   /**
diff --git a/CRM/Core/DAO/Phone.php b/CRM/Core/DAO/Phone.php
index 9a6b668620a6..5c0b7816a5c2 100644
--- a/CRM/Core/DAO/Phone.php
+++ b/CRM/Core/DAO/Phone.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Phone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:efdb60e03b54f246e73588b6eb99611d)
+ * (GenCodeChecksum:f77d3ef5985c8945730c2fe22bb3fa45)
  */
 
 /**
@@ -117,9 +117,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Phones');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Phones') : ts('Phone');
   }
 
   /**
diff --git a/CRM/Core/DAO/PreferencesDate.php b/CRM/Core/DAO/PreferencesDate.php
index b1d08e7cd045..78fa11538f44 100644
--- a/CRM/Core/DAO/PreferencesDate.php
+++ b/CRM/Core/DAO/PreferencesDate.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PreferencesDate.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:21383b05b8c8e98ed1721aab06031907)
+ * (GenCodeChecksum:d0de29e655d17a479ec8cfc762582c39)
  */
 
 /**
@@ -87,9 +87,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Preferences Dates');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Preferences Dates') : ts('Preferences Date');
   }
 
   /**
diff --git a/CRM/Core/DAO/PrevNextCache.php b/CRM/Core/DAO/PrevNextCache.php
index a39549db9e6c..258e3ef5c403 100644
--- a/CRM/Core/DAO/PrevNextCache.php
+++ b/CRM/Core/DAO/PrevNextCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrevNextCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8086ffe55554b0fba698136fd6dee894)
+ * (GenCodeChecksum:325d605774498631dd0a2742963d1032)
  */
 
 /**
@@ -85,9 +85,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Prev Next Caches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Prev Next Caches') : ts('Prev Next Cache');
   }
 
   /**
diff --git a/CRM/Core/DAO/PrintLabel.php b/CRM/Core/DAO/PrintLabel.php
index 129e80804da9..97575a87dd91 100644
--- a/CRM/Core/DAO/PrintLabel.php
+++ b/CRM/Core/DAO/PrintLabel.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/PrintLabel.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:484a16ebc1b881e7718bfcf139024ee7)
+ * (GenCodeChecksum:9612aababed43ba4eaacc71a727c5ed9)
  */
 
 /**
@@ -115,9 +115,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Print Labels');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Print Labels') : ts('Print Label');
   }
 
   /**
diff --git a/CRM/Core/DAO/RecurringEntity.php b/CRM/Core/DAO/RecurringEntity.php
index d22aa96ac773..1cffe8c273d4 100644
--- a/CRM/Core/DAO/RecurringEntity.php
+++ b/CRM/Core/DAO/RecurringEntity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/RecurringEntity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b78474c715335f7689a9a5fcdcb5718e)
+ * (GenCodeChecksum:2667b60a5f917352d52964de09cf85fa)
  */
 
 /**
@@ -73,9 +73,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Recurring Entities');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Recurring Entities') : ts('Recurring Entity');
   }
 
   /**
diff --git a/CRM/Core/DAO/Setting.php b/CRM/Core/DAO/Setting.php
index 160f781cda0f..4fb42fd82a45 100644
--- a/CRM/Core/DAO/Setting.php
+++ b/CRM/Core/DAO/Setting.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Setting.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c1fda2807e8265021ffaa490325a7e4f)
+ * (GenCodeChecksum:24ec63102452f5cdff8424b5caf8b679)
  */
 
 /**
@@ -101,9 +101,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Settings');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Settings') : ts('Setting');
   }
 
   /**
diff --git a/CRM/Core/DAO/StateProvince.php b/CRM/Core/DAO/StateProvince.php
index 80a91c2e1f15..7342cb6e69a6 100644
--- a/CRM/Core/DAO/StateProvince.php
+++ b/CRM/Core/DAO/StateProvince.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StateProvince.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2dced9a7a3e6be3d05ea7b7babe4b113)
+ * (GenCodeChecksum:ca396996ffd11fc0b89e34657679a9ad)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('State Provinces');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('State Provinces') : ts('State Province');
   }
 
   /**
diff --git a/CRM/Core/DAO/StatusPreference.php b/CRM/Core/DAO/StatusPreference.php
index b06b206f2483..e5654e60147c 100644
--- a/CRM/Core/DAO/StatusPreference.php
+++ b/CRM/Core/DAO/StatusPreference.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StatusPreference.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1fa80acc24bcb14df3947cba2daa930f)
+ * (GenCodeChecksum:7c7deea1bd07dccee5a5bae0b1d6c4c7)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Status Preferences');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Status Preferences') : ts('Status Preference');
   }
 
   /**
diff --git a/CRM/Core/DAO/SystemLog.php b/CRM/Core/DAO/SystemLog.php
index c18ee55ebca7..d3cc2ec35880 100644
--- a/CRM/Core/DAO/SystemLog.php
+++ b/CRM/Core/DAO/SystemLog.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/SystemLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:46d7f317ffb5d01d9cb22898ce38abb3)
+ * (GenCodeChecksum:3765c5a89ca1e9ff224fbd49e31a4037)
  */
 
 /**
@@ -89,9 +89,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('System Logs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('System Logs') : ts('System Log');
   }
 
   /**
diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php
index 65ae7a378b80..15078e57da7e 100644
--- a/CRM/Core/DAO/Tag.php
+++ b/CRM/Core/DAO/Tag.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Tag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7a2eb010fd96445604104b6ada9c0b99)
+ * (GenCodeChecksum:8a5eeefa40273898a4e3661b1ef43b3d)
  */
 
 /**
@@ -118,9 +118,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Tags');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Tags') : ts('Tag');
   }
 
   /**
diff --git a/CRM/Core/DAO/Timezone.php b/CRM/Core/DAO/Timezone.php
index 5f9abdfc6c34..bae04f5e2d28 100644
--- a/CRM/Core/DAO/Timezone.php
+++ b/CRM/Core/DAO/Timezone.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Timezone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:fb1089cb65c1587b1242b9d250c664f7)
+ * (GenCodeChecksum:b49b5541f20c732fc7ff4cdc3687899b)
  */
 
 /**
@@ -80,9 +80,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Timezones');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Timezones') : ts('Timezone');
   }
 
   /**
diff --git a/CRM/Core/DAO/UFField.php b/CRM/Core/DAO/UFField.php
index a112e1c6f32f..87cde6f32d88 100644
--- a/CRM/Core/DAO/UFField.php
+++ b/CRM/Core/DAO/UFField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e717ec384cfe13629b4fc440af2a99d5)
+ * (GenCodeChecksum:1cf845aa31eed1a29bffcd4404862f6a)
  */
 
 /**
@@ -173,9 +173,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('UFFields');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('UFFields') : ts('UFField');
   }
 
   /**
diff --git a/CRM/Core/DAO/UFGroup.php b/CRM/Core/DAO/UFGroup.php
index ae79d22da8e8..89d25b997ee0 100644
--- a/CRM/Core/DAO/UFGroup.php
+++ b/CRM/Core/DAO/UFGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1cac6e6b80a630f69ce25f709a20e4a3)
+ * (GenCodeChecksum:e33df676b4e3ae50e18f1c44e437e3ea)
  */
 
 /**
@@ -227,9 +227,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('UFGroups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('UFGroups') : ts('UFGroup');
   }
 
   /**
diff --git a/CRM/Core/DAO/UFJoin.php b/CRM/Core/DAO/UFJoin.php
index 98639423b142..28f3f56340ba 100644
--- a/CRM/Core/DAO/UFJoin.php
+++ b/CRM/Core/DAO/UFJoin.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFJoin.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:191143bced279d48cf34cdf6cf85a5fb)
+ * (GenCodeChecksum:4bcf2b3e5905f98d83d449b1226903da)
  */
 
 /**
@@ -96,9 +96,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('UFJoins');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('UFJoins') : ts('UFJoin');
   }
 
   /**
diff --git a/CRM/Core/DAO/UFMatch.php b/CRM/Core/DAO/UFMatch.php
index fa08f60b222f..6a5d32b772a0 100644
--- a/CRM/Core/DAO/UFMatch.php
+++ b/CRM/Core/DAO/UFMatch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/UFMatch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4fca2151c2ecbd762ac9e2f067f0030f)
+ * (GenCodeChecksum:613e38722266d0117e69f521e4f0d140)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('UFMatches');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('UFMatches') : ts('UFMatch');
   }
 
   /**
diff --git a/CRM/Core/DAO/Website.php b/CRM/Core/DAO/Website.php
index e9415359c114..aed21d3676e1 100644
--- a/CRM/Core/DAO/Website.php
+++ b/CRM/Core/DAO/Website.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Website.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9e449b1f3a997b63c79066bd5cd782ae)
+ * (GenCodeChecksum:1d9c6cf4e3d809a3b3f5963ccb189e83)
  */
 
 /**
@@ -75,9 +75,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Websites');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Websites') : ts('Website');
   }
 
   /**
diff --git a/CRM/Core/DAO/WordReplacement.php b/CRM/Core/DAO/WordReplacement.php
index 65ac087b5543..691291abcfc1 100644
--- a/CRM/Core/DAO/WordReplacement.php
+++ b/CRM/Core/DAO/WordReplacement.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/WordReplacement.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f4afc331da543068dba6d243d98b8e39)
+ * (GenCodeChecksum:104090c38770547ffa491fccdf299765)
  */
 
 /**
@@ -80,9 +80,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Word Replacements');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Word Replacements') : ts('Word Replacement');
   }
 
   /**
diff --git a/CRM/Core/DAO/Worldregion.php b/CRM/Core/DAO/Worldregion.php
index 1dd866013d60..0974aecff55c 100644
--- a/CRM/Core/DAO/Worldregion.php
+++ b/CRM/Core/DAO/Worldregion.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Worldregion.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0312ba4169a285839ec54d655ff5ceb3)
+ * (GenCodeChecksum:af9fba05839764ec479cc5fad738390a)
  */
 
 /**
@@ -54,9 +54,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Worldregions');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Worldregions') : ts('Worldregion');
   }
 
   /**
diff --git a/CRM/Cxn/DAO/Cxn.php b/CRM/Cxn/DAO/Cxn.php
index b0b70337bd8a..03e9fc8ef045 100644
--- a/CRM/Cxn/DAO/Cxn.php
+++ b/CRM/Cxn/DAO/Cxn.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Cxn/Cxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:059dd4994211085d728a9fc8b7d80803)
+ * (GenCodeChecksum:10e6547299a52750abd62b96dfacc9de)
  */
 
 /**
@@ -117,9 +117,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Cxns');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Cxns') : ts('Cxn');
   }
 
   /**
diff --git a/CRM/Dedupe/DAO/Exception.php b/CRM/Dedupe/DAO/Exception.php
index cdbb87cc90c7..ca488f4208b1 100644
--- a/CRM/Dedupe/DAO/Exception.php
+++ b/CRM/Dedupe/DAO/Exception.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/Exception.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f4bc21b42b1b5c9cfb0ffa7d3eb46e65)
+ * (GenCodeChecksum:95d83f44443d6ddfed8758214c46ff1b)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Exceptions');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Exceptions') : ts('Exception');
   }
 
   /**
diff --git a/CRM/Dedupe/DAO/Rule.php b/CRM/Dedupe/DAO/Rule.php
index dea3d38759d4..a09f6a7f4be5 100644
--- a/CRM/Dedupe/DAO/Rule.php
+++ b/CRM/Dedupe/DAO/Rule.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/Rule.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:56abeb7ada5e3dfde910bc5033ca047d)
+ * (GenCodeChecksum:1c0c64573702774a043ea32c73f05bd8)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Rules');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Rules') : ts('Rule');
   }
 
   /**
diff --git a/CRM/Dedupe/DAO/RuleGroup.php b/CRM/Dedupe/DAO/RuleGroup.php
index 366ff64246d5..62c6a4b2d017 100644
--- a/CRM/Dedupe/DAO/RuleGroup.php
+++ b/CRM/Dedupe/DAO/RuleGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Dedupe/RuleGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:87a385df0b5bca8150117411f2c31a4a)
+ * (GenCodeChecksum:5fb31b058249567562ab0a30a739fda2)
  */
 
 /**
@@ -89,9 +89,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Rule Groups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Rule Groups') : ts('Rule Group');
   }
 
   /**
diff --git a/CRM/Event/Cart/DAO/Cart.php b/CRM/Event/Cart/DAO/Cart.php
index 38da6b32272d..bf8ece70d43a 100644
--- a/CRM/Event/Cart/DAO/Cart.php
+++ b/CRM/Event/Cart/DAO/Cart.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/Cart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b4aacbeb6deddb31e520ce700e774db5)
+ * (GenCodeChecksum:b7a4ad0bbb09a64b8afefd7a1a2d6a9b)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Carts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Carts') : ts('Cart');
   }
 
   /**
diff --git a/CRM/Event/Cart/DAO/EventInCart.php b/CRM/Event/Cart/DAO/EventInCart.php
index d1550cd54ad6..61f42ceb2254 100644
--- a/CRM/Event/Cart/DAO/EventInCart.php
+++ b/CRM/Event/Cart/DAO/EventInCart.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Cart/EventInCart.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b1cb9524ae26740c93dda80d0cb4ff91)
+ * (GenCodeChecksum:ef07999cbb7872dc9c1cfa6a0055bee1)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Event In Carts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Event In Carts') : ts('Event In Cart');
   }
 
   /**
diff --git a/CRM/Event/DAO/Event.php b/CRM/Event/DAO/Event.php
index a7febe5bfe94..553ddd7e1f39 100644
--- a/CRM/Event/DAO/Event.php
+++ b/CRM/Event/DAO/Event.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Event.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:82ba48cbb804cf6f4b26fa50f07d44db)
+ * (GenCodeChecksum:3514f838a27ddbf9bdf6e63ea20aabec)
  */
 
 /**
@@ -528,9 +528,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Events');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Events') : ts('Event');
   }
 
   /**
diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php
index 94db537c3abe..3d7a2fa49dbd 100644
--- a/CRM/Event/DAO/Participant.php
+++ b/CRM/Event/DAO/Participant.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/Participant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bf8ed42264e81ccaef0ae236242990d0)
+ * (GenCodeChecksum:97d6a90c8b1f973347dc8decd97f84ee)
  */
 
 /**
@@ -177,9 +177,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Participants');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Participants') : ts('Participant');
   }
 
   /**
diff --git a/CRM/Event/DAO/ParticipantPayment.php b/CRM/Event/DAO/ParticipantPayment.php
index ee0070dfc213..44cff71fabed 100644
--- a/CRM/Event/DAO/ParticipantPayment.php
+++ b/CRM/Event/DAO/ParticipantPayment.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantPayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0c828890e84b791e0432445eb2d01086)
+ * (GenCodeChecksum:767fb54121e25d39d9b82cfbb4a5355b)
  */
 
 /**
@@ -61,9 +61,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Participant Payments');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Participant Payments') : ts('Participant Payment');
   }
 
   /**
diff --git a/CRM/Event/DAO/ParticipantStatusType.php b/CRM/Event/DAO/ParticipantStatusType.php
index 2b6e4f8f030f..cf410c357bcd 100644
--- a/CRM/Event/DAO/ParticipantStatusType.php
+++ b/CRM/Event/DAO/ParticipantStatusType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Event/ParticipantStatusType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4a3012f88c67826cb4264a3340e908ec)
+ * (GenCodeChecksum:6bf827c56f673a914923346816449255)
  */
 
 /**
@@ -103,9 +103,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Participant Status Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Participant Status Types') : ts('Participant Status Type');
   }
 
   /**
diff --git a/CRM/Export/Controller/Standalone.php b/CRM/Export/Controller/Standalone.php
index f4bb8ca534f6..f95f4b8d84cf 100644
--- a/CRM/Export/Controller/Standalone.php
+++ b/CRM/Export/Controller/Standalone.php
@@ -50,7 +50,7 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
     // add all the actions
     $this->addActions();
     $dao = CRM_Core_DAO_AllCoreTables::getFullName($entity);
-    CRM_Utils_System::setTitle(ts('Export %1', [1 => $dao::getEntityTitle()]));
+    CRM_Utils_System::setTitle(ts('Export %1', [1 => $dao::getEntityTitle(TRUE)]));
   }
 
   /**
diff --git a/CRM/Financial/DAO/Currency.php b/CRM/Financial/DAO/Currency.php
index f96650badc59..868495d6d782 100644
--- a/CRM/Financial/DAO/Currency.php
+++ b/CRM/Financial/DAO/Currency.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/Currency.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5501c59b453dedfb8bba1f2fab44d9ea)
+ * (GenCodeChecksum:0347ed61e0dc585d250a83f9fa162f2d)
  */
 
 /**
@@ -75,9 +75,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Currencies');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Currencies') : ts('Currency');
   }
 
   /**
diff --git a/CRM/Financial/DAO/EntityFinancialAccount.php b/CRM/Financial/DAO/EntityFinancialAccount.php
index 973a99ca8330..6474da983064 100644
--- a/CRM/Financial/DAO/EntityFinancialAccount.php
+++ b/CRM/Financial/DAO/EntityFinancialAccount.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c1d51696dd326b61f65fd064a355e7fb)
+ * (GenCodeChecksum:04ae90cfa08b3e1380f48c64e0bcc1ce)
  */
 
 /**
@@ -75,9 +75,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Financial Accounts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Financial Accounts') : ts('Entity Financial Account');
   }
 
   /**
diff --git a/CRM/Financial/DAO/EntityFinancialTrxn.php b/CRM/Financial/DAO/EntityFinancialTrxn.php
index 1f959ad6117b..4935cf9f2c31 100644
--- a/CRM/Financial/DAO/EntityFinancialTrxn.php
+++ b/CRM/Financial/DAO/EntityFinancialTrxn.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/EntityFinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:12eb23afdf6c1208bdc01aa7db52770a)
+ * (GenCodeChecksum:bbf884307aab01daa88aa7f3c06c2624)
  */
 
 /**
@@ -71,9 +71,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Entity Financial Trxns');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Entity Financial Trxns') : ts('Entity Financial Trxn');
   }
 
   /**
diff --git a/CRM/Financial/DAO/FinancialAccount.php b/CRM/Financial/DAO/FinancialAccount.php
index d8f161e9437b..30be03ce47cf 100644
--- a/CRM/Financial/DAO/FinancialAccount.php
+++ b/CRM/Financial/DAO/FinancialAccount.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialAccount.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b9f200ff95d9186180eff484dcd12a57)
+ * (GenCodeChecksum:09d2e3d6a970fa2413b6f29ab1f580e0)
  */
 
 /**
@@ -145,9 +145,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Financial Accounts');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Financial Accounts') : ts('Financial Account');
   }
 
   /**
diff --git a/CRM/Financial/DAO/FinancialItem.php b/CRM/Financial/DAO/FinancialItem.php
index a59dc38e6613..dd75f2405a5d 100644
--- a/CRM/Financial/DAO/FinancialItem.php
+++ b/CRM/Financial/DAO/FinancialItem.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8bb63ebee681c2eb4acbf8650b224dc2)
+ * (GenCodeChecksum:a70adfdd0e2248a7583c5c49ad0a5b85)
  */
 
 /**
@@ -115,9 +115,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Financial Items');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Financial Items') : ts('Financial Item');
   }
 
   /**
diff --git a/CRM/Financial/DAO/FinancialTrxn.php b/CRM/Financial/DAO/FinancialTrxn.php
index 157984607fb3..e94ee652f483 100644
--- a/CRM/Financial/DAO/FinancialTrxn.php
+++ b/CRM/Financial/DAO/FinancialTrxn.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialTrxn.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5a4324ffe222bf724ab9d4cde26eb4c2)
+ * (GenCodeChecksum:857c64b471d1872d98141aefa56aecb6)
  */
 
 /**
@@ -164,9 +164,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Financial Trxns');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Financial Trxns') : ts('Financial Trxn');
   }
 
   /**
diff --git a/CRM/Financial/DAO/FinancialType.php b/CRM/Financial/DAO/FinancialType.php
index cd99c56281eb..d9b1ce7f58e4 100644
--- a/CRM/Financial/DAO/FinancialType.php
+++ b/CRM/Financial/DAO/FinancialType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/FinancialType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:024b000d94adcc65200c00d7cef5e624)
+ * (GenCodeChecksum:36875c58b3267bdc2def295713858868)
  */
 
 /**
@@ -82,9 +82,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Financial Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Financial Types') : ts('Financial Type');
   }
 
   /**
diff --git a/CRM/Financial/DAO/PaymentProcessor.php b/CRM/Financial/DAO/PaymentProcessor.php
index 7f1e8334a967..f882e0d0b174 100644
--- a/CRM/Financial/DAO/PaymentProcessor.php
+++ b/CRM/Financial/DAO/PaymentProcessor.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessor.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7e296728147d44cb68a9231c4995e461)
+ * (GenCodeChecksum:8277056355c9f16ae28f69ba3298730e)
  */
 
 /**
@@ -181,9 +181,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Payment Processors');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Payment Processors') : ts('Payment Processor');
   }
 
   /**
diff --git a/CRM/Financial/DAO/PaymentProcessorType.php b/CRM/Financial/DAO/PaymentProcessorType.php
index 597b8d27f0ff..3b0144587633 100644
--- a/CRM/Financial/DAO/PaymentProcessorType.php
+++ b/CRM/Financial/DAO/PaymentProcessorType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentProcessorType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:624a9a001f451b6eb17930a9abcceb3e)
+ * (GenCodeChecksum:62dd4d3229f289de4afb3c5e3e39db66)
  */
 
 /**
@@ -175,9 +175,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Payment Processor Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Payment Processor Types') : ts('Payment Processor Type');
   }
 
   /**
diff --git a/CRM/Financial/DAO/PaymentToken.php b/CRM/Financial/DAO/PaymentToken.php
index cb2498f0832c..1608dab55d72 100644
--- a/CRM/Financial/DAO/PaymentToken.php
+++ b/CRM/Financial/DAO/PaymentToken.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Financial/PaymentToken.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ce51f1e6eaf6b29f3adeb67828e85507)
+ * (GenCodeChecksum:2923b7966bbe25d435eb7b909d35541f)
  */
 
 /**
@@ -129,9 +129,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Payment Tokens');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Payment Tokens') : ts('Payment Token');
   }
 
   /**
diff --git a/CRM/Friend/DAO/Friend.php b/CRM/Friend/DAO/Friend.php
index 1513ab9dccc5..690419d0b962 100644
--- a/CRM/Friend/DAO/Friend.php
+++ b/CRM/Friend/DAO/Friend.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Friend/Friend.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3f1c976d43e312175e85da0427f5210d)
+ * (GenCodeChecksum:1452e2f2b01782f26a30e94bd6af3783)
  */
 
 /**
@@ -106,9 +106,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Friends');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Friends') : ts('Friend');
   }
 
   /**
diff --git a/CRM/Grant/DAO/Grant.php b/CRM/Grant/DAO/Grant.php
index 91b816359a75..05d6701011e6 100644
--- a/CRM/Grant/DAO/Grant.php
+++ b/CRM/Grant/DAO/Grant.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Grant/Grant.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a2e43b7f0fb8547daf5ed874bf6174c5)
+ * (GenCodeChecksum:91aecd5b45ba8c5cd6636bb95ddbbfee)
  */
 
 /**
@@ -152,9 +152,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Grants');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Grants') : ts('Grant');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/BouncePattern.php b/CRM/Mailing/DAO/BouncePattern.php
index 43822bf7c5e3..8c74d99ecffa 100644
--- a/CRM/Mailing/DAO/BouncePattern.php
+++ b/CRM/Mailing/DAO/BouncePattern.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/BouncePattern.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:90abbaf8e68b5749a084a74d77dcc3b7)
+ * (GenCodeChecksum:65ffd17da4de88b093e578fc52d42800)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Bounce Patterns');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Bounce Patterns') : ts('Bounce Pattern');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/BounceType.php b/CRM/Mailing/DAO/BounceType.php
index a31f8324f4fe..6511adf6d2d7 100644
--- a/CRM/Mailing/DAO/BounceType.php
+++ b/CRM/Mailing/DAO/BounceType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/BounceType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4e77659bd433033396e84b6de32c99af)
+ * (GenCodeChecksum:41a2f33a589d43ba388d36dcf8f9e54f)
  */
 
 /**
@@ -66,9 +66,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Bounce Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Bounce Types') : ts('Bounce Type');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/Mailing.php b/CRM/Mailing/DAO/Mailing.php
index 084489593dcb..95b4563035c6 100644
--- a/CRM/Mailing/DAO/Mailing.php
+++ b/CRM/Mailing/DAO/Mailing.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Mailing.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6a9dc5aaff7aa7f5dcfe3f892255e357)
+ * (GenCodeChecksum:9cd784dc86cf4f54983f14440be05239)
  */
 
 /**
@@ -342,9 +342,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mailings');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mailings') : ts('Mailing');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/MailingAB.php b/CRM/Mailing/DAO/MailingAB.php
index 0e2215e1fc5f..1932930dc264 100644
--- a/CRM/Mailing/DAO/MailingAB.php
+++ b/CRM/Mailing/DAO/MailingAB.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingAB.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:af0f7d34ddde7f3971aaac5abccfcd8c)
+ * (GenCodeChecksum:075e135a610dcb619ab3ddc8c23944e1)
  */
 
 /**
@@ -130,9 +130,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mailing ABs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mailing ABs') : ts('Mailing AB');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/MailingComponent.php b/CRM/Mailing/DAO/MailingComponent.php
index f1b81f15629d..b544c0ea2ef9 100644
--- a/CRM/Mailing/DAO/MailingComponent.php
+++ b/CRM/Mailing/DAO/MailingComponent.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingComponent.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ca95f8566048836c03e1dc58eb51ac11)
+ * (GenCodeChecksum:bb6ab1e7538409ecfa1e72a45bb287a1)
  */
 
 /**
@@ -92,9 +92,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mailing Components');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mailing Components') : ts('Mailing Component');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/MailingGroup.php b/CRM/Mailing/DAO/MailingGroup.php
index 220bfd13cb08..0d3497c6cdeb 100644
--- a/CRM/Mailing/DAO/MailingGroup.php
+++ b/CRM/Mailing/DAO/MailingGroup.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingGroup.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a253e806fcb595ede70c812a10c0dbba)
+ * (GenCodeChecksum:4ab3dccb8706ec8f03072118ff2e9c12)
  */
 
 /**
@@ -87,9 +87,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mailing Groups');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mailing Groups') : ts('Mailing Group');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/MailingJob.php b/CRM/Mailing/DAO/MailingJob.php
index bde7e35f391e..edbd20cd5f9a 100644
--- a/CRM/Mailing/DAO/MailingJob.php
+++ b/CRM/Mailing/DAO/MailingJob.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/MailingJob.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:0c6e76df20fe3579056c287aeed27cdb)
+ * (GenCodeChecksum:eb066e39ba2501608759e6ac3dfbcaaf)
  */
 
 /**
@@ -115,9 +115,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Mailing Jobs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Mailing Jobs') : ts('Mailing Job');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/Recipients.php b/CRM/Mailing/DAO/Recipients.php
index 1852c7ac022a..7e6bb43ab156 100644
--- a/CRM/Mailing/DAO/Recipients.php
+++ b/CRM/Mailing/DAO/Recipients.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Recipients.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ebd2ec177861f8f82a4bc6bc8b33fd9b)
+ * (GenCodeChecksum:3fb8b7a18899cd7dba958e9e08a944a7)
  */
 
 /**
@@ -73,9 +73,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Recipientses');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Recipientses') : ts('Recipients');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/Spool.php b/CRM/Mailing/DAO/Spool.php
index 6027afd1676c..6329553862b5 100644
--- a/CRM/Mailing/DAO/Spool.php
+++ b/CRM/Mailing/DAO/Spool.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Spool.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7bd4a9b64175915a43f602f4f9cfb721)
+ * (GenCodeChecksum:f2aa2d8c8ee3203bf674e6c193818dda)
  */
 
 /**
@@ -87,9 +87,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Spools');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Spools') : ts('Spool');
   }
 
   /**
diff --git a/CRM/Mailing/DAO/TrackableURL.php b/CRM/Mailing/DAO/TrackableURL.php
index 3d3963439726..0452ac93ba61 100644
--- a/CRM/Mailing/DAO/TrackableURL.php
+++ b/CRM/Mailing/DAO/TrackableURL.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/TrackableURL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:74f858b4e9e666e05416be884002408b)
+ * (GenCodeChecksum:ac0ae37c12d442071e726deb75e8a7ba)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Trackable URLs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Trackable URLs') : ts('Trackable URL');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Bounce.php b/CRM/Mailing/Event/DAO/Bounce.php
index 1cd4024fb4d6..7252307252f7 100644
--- a/CRM/Mailing/Event/DAO/Bounce.php
+++ b/CRM/Mailing/Event/DAO/Bounce.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Bounce.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8e0590dde97f57494203397255fd4604)
+ * (GenCodeChecksum:dc1c97304810848da9a9c4255456799f)
  */
 
 /**
@@ -73,9 +73,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Bounces');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Bounces') : ts('Bounce');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Confirm.php b/CRM/Mailing/Event/DAO/Confirm.php
index 343430c1579d..3c757f302d5c 100644
--- a/CRM/Mailing/Event/DAO/Confirm.php
+++ b/CRM/Mailing/Event/DAO/Confirm.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Confirm.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:827b011dc50d032e8b74d6d164314d83)
+ * (GenCodeChecksum:3d1dae89470e79336dab7506dd173499)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Confirms');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Confirms') : ts('Confirm');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Delivered.php b/CRM/Mailing/Event/DAO/Delivered.php
index 147d70fcf82f..93bb85e2d534 100644
--- a/CRM/Mailing/Event/DAO/Delivered.php
+++ b/CRM/Mailing/Event/DAO/Delivered.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Delivered.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c983e11b4de5a1c4e6d9765eb7d12755)
+ * (GenCodeChecksum:6a81ffa6ed10a254979274ea5edbd855)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Delivereds');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Delivereds') : ts('Delivered');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Forward.php b/CRM/Mailing/Event/DAO/Forward.php
index ac1c8d89670b..6650dd0c0cb9 100644
--- a/CRM/Mailing/Event/DAO/Forward.php
+++ b/CRM/Mailing/Event/DAO/Forward.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Forward.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:359e0b700860c29a1e809fd4acbf7598)
+ * (GenCodeChecksum:16bd96b998ed8316250158886d0dc7c8)
  */
 
 /**
@@ -66,9 +66,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Forwards');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Forwards') : ts('Forward');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Opened.php b/CRM/Mailing/Event/DAO/Opened.php
index cbd24372dfa0..9ce62afcf5c2 100644
--- a/CRM/Mailing/Event/DAO/Opened.php
+++ b/CRM/Mailing/Event/DAO/Opened.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Opened.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:dddc76ba8461f8b0c1f3c1cdccddd111)
+ * (GenCodeChecksum:d636f34b01a876a72874c4b86abacff4)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Openeds');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Openeds') : ts('Opened');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Queue.php b/CRM/Mailing/Event/DAO/Queue.php
index 073ef521c997..4dd92f1047ee 100644
--- a/CRM/Mailing/Event/DAO/Queue.php
+++ b/CRM/Mailing/Event/DAO/Queue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Queue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:091cb300f1b0a67dfaf40f988806e6cf)
+ * (GenCodeChecksum:f37d1a6e35b4f827ed7daf29b3005fad)
  */
 
 /**
@@ -80,9 +80,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Queues');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Queues') : ts('Queue');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Reply.php b/CRM/Mailing/Event/DAO/Reply.php
index 8fc31b3eb359..3c3cb9cff782 100644
--- a/CRM/Mailing/Event/DAO/Reply.php
+++ b/CRM/Mailing/Event/DAO/Reply.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Reply.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b1d572f3d42f6480dc98a2e6f9710fa3)
+ * (GenCodeChecksum:e4f80247fbee550b68997bd9f264dc66)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Replies');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Replies') : ts('Reply');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Subscribe.php b/CRM/Mailing/Event/DAO/Subscribe.php
index ce577b24d76a..6659fcca1de2 100644
--- a/CRM/Mailing/Event/DAO/Subscribe.php
+++ b/CRM/Mailing/Event/DAO/Subscribe.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Subscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9e1dec99f17dcccde7feeca30b880a85)
+ * (GenCodeChecksum:b5a2a60211ad6eb943a6aa0db5f88840)
  */
 
 /**
@@ -73,9 +73,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Subscribes');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Subscribes') : ts('Subscribe');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/TrackableURLOpen.php b/CRM/Mailing/Event/DAO/TrackableURLOpen.php
index 88c84b0b9201..85f4b96810e1 100644
--- a/CRM/Mailing/Event/DAO/TrackableURLOpen.php
+++ b/CRM/Mailing/Event/DAO/TrackableURLOpen.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/TrackableURLOpen.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:b543a83312f2069a45872939517aa480)
+ * (GenCodeChecksum:6e1eb0a358ed16c691ea25a741ce6f8c)
  */
 
 /**
@@ -66,9 +66,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Trackable URLOpens');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Trackable URLOpens') : ts('Trackable URLOpen');
   }
 
   /**
diff --git a/CRM/Mailing/Event/DAO/Unsubscribe.php b/CRM/Mailing/Event/DAO/Unsubscribe.php
index e5a230b66dc7..71432c59ab11 100644
--- a/CRM/Mailing/Event/DAO/Unsubscribe.php
+++ b/CRM/Mailing/Event/DAO/Unsubscribe.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Mailing/Event/Unsubscribe.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:2d080a63032c9dce0331a6ed4f6c3cd2)
+ * (GenCodeChecksum:48ace30af145c288185e356b721a22d1)
  */
 
 /**
@@ -66,9 +66,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Unsubscribes');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Unsubscribes') : ts('Unsubscribe');
   }
 
   /**
diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php
index 384c69ae6b58..86173b83afcc 100644
--- a/CRM/Member/DAO/Membership.php
+++ b/CRM/Member/DAO/Membership.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/Membership.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:835c63ea0a55b78d6d115a7a6db5dde2)
+ * (GenCodeChecksum:d80be256fb175b763047883b8694559c)
  */
 
 /**
@@ -153,9 +153,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Memberships');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Memberships') : ts('Membership');
   }
 
   /**
diff --git a/CRM/Member/DAO/MembershipBlock.php b/CRM/Member/DAO/MembershipBlock.php
index 91e65e6eeb2b..9bfff5263961 100644
--- a/CRM/Member/DAO/MembershipBlock.php
+++ b/CRM/Member/DAO/MembershipBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8eb2f3a6c818d449da875421b54de619)
+ * (GenCodeChecksum:6a38472a1103f6f5de9e33fed620060d)
  */
 
 /**
@@ -131,9 +131,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Membership Blocks');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Membership Blocks') : ts('Membership Block');
   }
 
   /**
diff --git a/CRM/Member/DAO/MembershipLog.php b/CRM/Member/DAO/MembershipLog.php
index bd0b4f7924e5..1619acbedb59 100644
--- a/CRM/Member/DAO/MembershipLog.php
+++ b/CRM/Member/DAO/MembershipLog.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipLog.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4d5744b433ca7bb5385b11945cc0fe10)
+ * (GenCodeChecksum:d1e55c6d7f0e93b21778fdd36dd6e022)
  */
 
 /**
@@ -101,9 +101,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Membership Logs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Membership Logs') : ts('Membership Log');
   }
 
   /**
diff --git a/CRM/Member/DAO/MembershipPayment.php b/CRM/Member/DAO/MembershipPayment.php
index ac386eee5571..67e9bc605714 100644
--- a/CRM/Member/DAO/MembershipPayment.php
+++ b/CRM/Member/DAO/MembershipPayment.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipPayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:39168603c262c909ebeee2ce821f0f0d)
+ * (GenCodeChecksum:e9764dc46ae261f8cad8ef1383063d61)
  */
 
 /**
@@ -59,9 +59,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Membership Payments');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Membership Payments') : ts('Membership Payment');
   }
 
   /**
diff --git a/CRM/Member/DAO/MembershipStatus.php b/CRM/Member/DAO/MembershipStatus.php
index 5b780e4a5b9d..5857dca3cf5d 100644
--- a/CRM/Member/DAO/MembershipStatus.php
+++ b/CRM/Member/DAO/MembershipStatus.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipStatus.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f0c470d5aca6e3696a0ad8345531f8b8)
+ * (GenCodeChecksum:6bdad135e9f0e94f085296d68ca59253)
  */
 
 /**
@@ -143,9 +143,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Membership Statuses');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Membership Statuses') : ts('Membership Status');
   }
 
   /**
diff --git a/CRM/Member/DAO/MembershipType.php b/CRM/Member/DAO/MembershipType.php
index 4f5cad0e296a..d904024ac477 100644
--- a/CRM/Member/DAO/MembershipType.php
+++ b/CRM/Member/DAO/MembershipType.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/MembershipType.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7c5220444512f1aa499454e977f27814)
+ * (GenCodeChecksum:db300e3a7f5ca29a1b6ca43e0885bcb5)
  */
 
 /**
@@ -181,9 +181,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Membership Types');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Membership Types') : ts('Membership Type');
   }
 
   /**
diff --git a/CRM/PCP/DAO/PCP.php b/CRM/PCP/DAO/PCP.php
index eb5656967545..bd3fedb7800f 100644
--- a/CRM/PCP/DAO/PCP.php
+++ b/CRM/PCP/DAO/PCP.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCP.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:286225e46c4e2f3c12b17cd5f83b210d)
+ * (GenCodeChecksum:2232571099c216fb7a823556f5bd8328)
  */
 
 /**
@@ -138,9 +138,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('PCPs');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('PCPs') : ts('PCP');
   }
 
   /**
diff --git a/CRM/PCP/DAO/PCPBlock.php b/CRM/PCP/DAO/PCPBlock.php
index 74f5204bebd1..711dc584c959 100644
--- a/CRM/PCP/DAO/PCPBlock.php
+++ b/CRM/PCP/DAO/PCPBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/PCP/PCPBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ea1b4158570c5a79356b1dc0ad80db6a)
+ * (GenCodeChecksum:2039aecf7902bf0fda7f91081778b1c8)
  */
 
 /**
@@ -129,9 +129,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('PCPBlocks');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('PCPBlocks') : ts('PCPBlock');
   }
 
   /**
diff --git a/CRM/Pledge/DAO/Pledge.php b/CRM/Pledge/DAO/Pledge.php
index 5f5a7632ed42..2a2f80900d68 100644
--- a/CRM/Pledge/DAO/Pledge.php
+++ b/CRM/Pledge/DAO/Pledge.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/Pledge.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:27003a5c2de79b60b4114bc92b65cc07)
+ * (GenCodeChecksum:0447b8be2ab956b77d0d6be123e0bdb4)
  */
 
 /**
@@ -206,9 +206,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Pledges');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Pledges') : ts('Pledge');
   }
 
   /**
diff --git a/CRM/Pledge/DAO/PledgeBlock.php b/CRM/Pledge/DAO/PledgeBlock.php
index 989b14383d7a..111d085910e9 100644
--- a/CRM/Pledge/DAO/PledgeBlock.php
+++ b/CRM/Pledge/DAO/PledgeBlock.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgeBlock.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bf3640355f445e127c25402500d79668)
+ * (GenCodeChecksum:2b02296af6d4e280950d483d222b20b9)
  */
 
 /**
@@ -117,9 +117,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Pledge Blocks');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Pledge Blocks') : ts('Pledge Block');
   }
 
   /**
diff --git a/CRM/Pledge/DAO/PledgePayment.php b/CRM/Pledge/DAO/PledgePayment.php
index 234a5342b2f7..bb88db54a733 100644
--- a/CRM/Pledge/DAO/PledgePayment.php
+++ b/CRM/Pledge/DAO/PledgePayment.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Pledge/PledgePayment.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c47a2cbc83c672a8209bc5e725b2f81a)
+ * (GenCodeChecksum:b3b6719f4f4a8c441f271213ff7f52db)
  */
 
 /**
@@ -106,9 +106,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Pledge Payments');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Pledge Payments') : ts('Pledge Payment');
   }
 
   /**
diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php
index 2ad0da2b2957..7e9b779089b6 100644
--- a/CRM/Price/DAO/LineItem.php
+++ b/CRM/Price/DAO/LineItem.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/LineItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7403b3615b0225350d893750a547061a)
+ * (GenCodeChecksum:5a365a7d4b14c9b5963aeb61576395e4)
  */
 
 /**
@@ -138,9 +138,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Line Items');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Line Items') : ts('Line Item');
   }
 
   /**
diff --git a/CRM/Price/DAO/PriceField.php b/CRM/Price/DAO/PriceField.php
index e14f60999bfe..2f5d0d653ae9 100644
--- a/CRM/Price/DAO/PriceField.php
+++ b/CRM/Price/DAO/PriceField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1492c6421f1c3cb49dcab88bc411075c)
+ * (GenCodeChecksum:fdebc45a7d5c35abb0c9c480dbf201b2)
  */
 
 /**
@@ -157,9 +157,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Price Fields');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Price Fields') : ts('Price Field');
   }
 
   /**
diff --git a/CRM/Price/DAO/PriceFieldValue.php b/CRM/Price/DAO/PriceFieldValue.php
index c7c8e0913e40..2057dd655d56 100644
--- a/CRM/Price/DAO/PriceFieldValue.php
+++ b/CRM/Price/DAO/PriceFieldValue.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceFieldValue.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:a1acc613daec86c6049e545af5fc7fd1)
+ * (GenCodeChecksum:16987d2cc463a2d9290339ad37070f16)
  */
 
 /**
@@ -166,9 +166,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Price Field Values');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Price Field Values') : ts('Price Field Value');
   }
 
   /**
diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php
index 1dd84351706a..26fa13809836 100644
--- a/CRM/Price/DAO/PriceSet.php
+++ b/CRM/Price/DAO/PriceSet.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSet.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:52d1fb1b25eaa8f1c157012bfec0eaae)
+ * (GenCodeChecksum:c4db3cbda4900e01aeba098a4578b563)
  */
 
 /**
@@ -131,9 +131,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Price Sets');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Price Sets') : ts('Price Set');
   }
 
   /**
diff --git a/CRM/Price/DAO/PriceSetEntity.php b/CRM/Price/DAO/PriceSetEntity.php
index 78e479a53a75..4b1d3749a55d 100644
--- a/CRM/Price/DAO/PriceSetEntity.php
+++ b/CRM/Price/DAO/PriceSetEntity.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSetEntity.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:f2d6aeda95e4bde969d5ccebe9f26791)
+ * (GenCodeChecksum:0284d1a184dd635d93dd170e94451e86)
  */
 
 /**
@@ -68,9 +68,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Price Set Entities');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Price Set Entities') : ts('Price Set Entity');
   }
 
   /**
diff --git a/CRM/Queue/DAO/QueueItem.php b/CRM/Queue/DAO/QueueItem.php
index a78b613e154d..7ee05fcafa74 100644
--- a/CRM/Queue/DAO/QueueItem.php
+++ b/CRM/Queue/DAO/QueueItem.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Queue/QueueItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7e484400a7f8cf682b9c85e8b10c7bc7)
+ * (GenCodeChecksum:32350e9450942f29e7785ceaaed7a1b9)
  */
 
 /**
@@ -78,9 +78,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Queue Items');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Queue Items') : ts('Queue Item');
   }
 
   /**
diff --git a/CRM/Report/DAO/ReportInstance.php b/CRM/Report/DAO/ReportInstance.php
index 08a380c76fd3..f4ab9447035f 100644
--- a/CRM/Report/DAO/ReportInstance.php
+++ b/CRM/Report/DAO/ReportInstance.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Report/ReportInstance.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d0c9e5593f161f18e7979012c4c13724)
+ * (GenCodeChecksum:9c05a0739ee0b8250fdc0418b5fb247d)
  */
 
 /**
@@ -192,9 +192,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Reports');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Reports') : ts('Report');
   }
 
   /**
diff --git a/CRM/SMS/DAO/Provider.php b/CRM/SMS/DAO/Provider.php
index 3aa49ab0a6da..afdd808359ac 100644
--- a/CRM/SMS/DAO/Provider.php
+++ b/CRM/SMS/DAO/Provider.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/SMS/Provider.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6ecda65bd52b36e04764cec8ee81e1b8)
+ * (GenCodeChecksum:478e0d0caeb2d2a81068db6ad2db67aa)
  */
 
 /**
@@ -107,9 +107,12 @@ public function __construct() {
 
   /**
    * Returns localized title of this entity.
+   *
+   * @param bool $plural
+   *   Whether to return the plural version of the title.
    */
-  public static function getEntityTitle() {
-    return ts('Providers');
+  public static function getEntityTitle($plural = FALSE) {
+    return $plural ? ts('Providers') : ts('Provider');
   }
 
   /**
diff --git a/Civi/Api4/Generic/AbstractEntity.php b/Civi/Api4/Generic/AbstractEntity.php
index 269bcc31b3c9..8084614b14ef 100644
--- a/Civi/Api4/Generic/AbstractEntity.php
+++ b/Civi/Api4/Generic/AbstractEntity.php
@@ -81,9 +81,11 @@ protected static function getEntityName() {
   /**
    * Overridable function to return a localized title for this entity.
    *
+   * @param bool $plural
+   *   Whether to return a plural title.
    * @return string
    */
-  protected static function getEntityTitle() {
+  protected static function getEntityTitle($plural = FALSE) {
     return static::getEntityName();
   }
 
@@ -121,6 +123,7 @@ public static function getInfo() {
     $info = [
       'name' => static::getEntityName(),
       'title' => static::getEntityTitle(),
+      'titlePlural' => static::getEntityTitle(TRUE),
       'type' => self::stripNamespace(get_parent_class(static::class)),
     ];
     $reflection = new \ReflectionClass(static::class);
diff --git a/Civi/Api4/Generic/DAOEntity.php b/Civi/Api4/Generic/DAOEntity.php
index a7c47ee2e9a1..c27aac4ce0c3 100644
--- a/Civi/Api4/Generic/DAOEntity.php
+++ b/Civi/Api4/Generic/DAOEntity.php
@@ -91,12 +91,14 @@ public static function replace($checkPermissions = TRUE) {
   }
 
   /**
+   * @param bool $plural
+   *   Whether to return a plural title.
    * @return string
    */
-  protected static function getEntityTitle() {
+  protected static function getEntityTitle($plural = FALSE) {
     $name = static::getEntityName();
     $dao = \CRM_Core_DAO_AllCoreTables::getFullName($name);
-    return $dao ? $dao::getEntityTitle() : $name;
+    return $dao ? $dao::getEntityTitle($plural) : $name;
   }
 
   /**
diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index 11e70b6afc49..00411d639be8 100644
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -5,7 +5,7 @@
   <name>civicrm_contribution_recur</name>
   <add>1.6</add>
   <log>true</log>
-  <title>Recurring Contributions</title>
+  <title>Recurring Contribution</title>
   <field>
     <name>id</name>
     <uniqueName>contribution_recur_id</uniqueName>
diff --git a/xml/schema/Core/IM.xml b/xml/schema/Core/IM.xml
index f7738d969cbc..58ca90324dc4 100644
--- a/xml/schema/Core/IM.xml
+++ b/xml/schema/Core/IM.xml
@@ -8,6 +8,7 @@
   <add>1.1</add>
   <log>true</log>
   <title>Instant Messaging</title>
+  <titlePlural>Instant Messaging</titlePlural>
   <icon>fa-comments-o</icon>
   <field>
     <name>id</name>
diff --git a/xml/schema/Report/ReportInstance.xml b/xml/schema/Report/ReportInstance.xml
index 028c6fb722e8..d85b605c5d91 100644
--- a/xml/schema/Report/ReportInstance.xml
+++ b/xml/schema/Report/ReportInstance.xml
@@ -6,7 +6,7 @@
   <name>civicrm_report_instance</name>
   <comment>Users can save their report instance and put in a cron tab etc.</comment>
   <add>2.2</add>
-  <title>Reports</title>
+  <title>Report</title>
   <icon>fa-bar-chart</icon>
   <field>
     <name>id</name>
diff --git a/xml/templates/dao.tpl b/xml/templates/dao.tpl
index 87a3463531c9..034137433ed4 100644
--- a/xml/templates/dao.tpl
+++ b/xml/templates/dao.tpl
@@ -61,9 +61,12 @@ class {$table.className} extends CRM_Core_DAO {ldelim}
 
     /**
      * Returns localized title of this entity.
+     *
+     * @param bool $plural
+     *   Whether to return the plural version of the title.
      */
-    public static function getEntityTitle() {ldelim}
-        return {$tsFunctionName}('{$table.title}');
+    public static function getEntityTitle($plural = FALSE) {ldelim}
+        return $plural ? {$tsFunctionName}('{$table.titlePlural}') : {$tsFunctionName}('{$table.title}');
     {rdelim}
 
 

From f2425270f169759c09d159bc9dfa1d65530cf0f5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 13 Sep 2020 13:21:16 -0400
Subject: [PATCH 237/834] Search ext: update to plural entity titles

---
 ext/search/CRM/Search/Page/Ang.php                  |  4 ++--
 ext/search/ang/search/crmSearch.component.js        | 10 +++++-----
 ext/search/ang/search/crmSearch.html                |  2 +-
 ext/search/ang/search/crmSearchActions.component.js |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index b6a03e2bbf76..2549f622d5b0 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -83,9 +83,9 @@ private function getOperators() {
    */
   private function getSchema() {
     $schema = \Civi\Api4\Entity::get()
-      ->addSelect('name', 'title', 'description', 'icon')
+      ->addSelect('name', 'titlePlural', 'description', 'icon')
       ->addWhere('name', '!=', 'Entity')
-      ->addOrderBy('title')
+      ->addOrderBy('titlePlural')
       ->setChain([
         'get' => ['$name', 'getActions', ['where' => [['name', '=', 'get']]], ['params']],
       ])->execute();
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 51f2532bc49a..66a14f0f2c10 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -23,7 +23,7 @@
 
       $scope.controls = {};
       $scope.joinTypes = [{k: false, v: ts('Optional')}, {k: true, v: ts('Required')}];
-      $scope.entities = formatForSelect2(CRM.vars.search.schema, 'name', 'title', ['description', 'icon']);
+      $scope.entities = formatForSelect2(CRM.vars.search.schema, 'name', 'titlePlural', ['description', 'icon']);
       this.perm = {
         editGroups: CRM.checkPerm('edit groups')
       };
@@ -40,7 +40,7 @@
           if (entity) {
             joinEntities.push({
               id: link.entity + ' AS ' + link.alias,
-              text: entity.title,
+              text: entity.titlePlural,
               description: '(' + link.alias + ')',
               icon: entity.icon
             });
@@ -408,7 +408,7 @@
 
         var mainEntity = searchMeta.getEntity(ctrl.entity),
           result = [{
-            text: mainEntity.title,
+            text: mainEntity.titlePlural,
             icon: mainEntity.icon,
             children: formatFields(ctrl.entity, '')
           }];
@@ -416,7 +416,7 @@
           var joinName = join[0].split(' AS '),
             joinEntity = searchMeta.getEntity(joinName[0]);
           result.push({
-            text: joinEntity.title + ' (' + joinName[1] + ')',
+            text: joinEntity.titlePlural + ' (' + joinName[1] + ')',
             icon: joinEntity.icon,
             children: formatFields(joinEntity.name, joinName[1] + '.')
           });
@@ -529,7 +529,7 @@
       $scope.saveGroup = function() {
         var selectField = ctrl.entity === 'Contact' ? 'id' : 'contact_id';
         if (ctrl.entity !== 'Contact' && !searchMeta.getField('contact_id')) {
-          CRM.alert(ts('Cannot create smart group from %1.', {1: searchMeta.getEntity(true).title}), ts('Missing contact_id'), 'error', {expires: 5000});
+          CRM.alert(ts('Cannot create smart group from %1.', {1: searchMeta.getEntity(true).titlePlural}), ts('Missing contact_id'), 'error', {expires: 5000});
           return;
         }
         var model = {
diff --git a/ext/search/ang/search/crmSearch.html b/ext/search/ang/search/crmSearch.html
index bd0feabcba10..3500ef31c7a8 100644
--- a/ext/search/ang/search/crmSearch.html
+++ b/ext/search/ang/search/crmSearch.html
@@ -1,5 +1,5 @@
 <div id="bootstrap-theme" class="crm-search">
-  <h1 crm-page-title>{{:: ts('Create Search for %1', {1: $ctrl.getEntity($ctrl.entity).title}) }}</h1>
+  <h1 crm-page-title>{{:: ts('Create Search for %1', {1: $ctrl.getEntity($ctrl.entity).titlePlural}) }}</h1>
 
   <!--This warning will show if bootstrap is unavailable. Normally it will be hidden by the bootstrap .collapse class.-->
   <div class="messages warning no-popup collapse">
diff --git a/ext/search/ang/search/crmSearchActions.component.js b/ext/search/ang/search/crmSearchActions.component.js
index 138cb089a925..6711ea135ba7 100644
--- a/ext/search/ang/search/crmSearchActions.component.js
+++ b/ext/search/ang/search/crmSearchActions.component.js
@@ -12,7 +12,7 @@
     templateUrl: '~/search/crmSearchActions.html',
     controller: function($scope, crmApi4, dialogService, searchMeta) {
       var ts = $scope.ts = CRM.ts(),
-        entityTitle = searchMeta.getEntity(this.entity).title,
+        entityTitle = searchMeta.getEntity(this.entity).titlePlural,
         ctrl = this;
 
       this.init = function() {

From 75ae745c394fcc771e614f8984efb3d6e0c47894 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 09:30:05 +1200
Subject: [PATCH 238/834] Pass in activity type rather than calculate it

This line is hit in CRM_Event_BAO_ParticipantTest.testCreate
api_v3_ContributionTest.testCompleteTransactionWithParticipantRecord

I think we should be moving the logic back to the calling functions in general - to the point of them
just callling the v4 api directly, but this just clarifies on tiny bit
---
 CRM/Event/BAO/Participant.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Event/BAO/Participant.php b/CRM/Event/BAO/Participant.php
index f18198b20961..c68f021c9a59 100644
--- a/CRM/Event/BAO/Participant.php
+++ b/CRM/Event/BAO/Participant.php
@@ -191,7 +191,7 @@ public static function create(&$params) {
     ) {
       // Default status if not specified
       $participant->status_id = $participant->status_id ?: self::fields()['participant_status_id']['default'];
-      CRM_Activity_BAO_Activity::addActivity($participant);
+      CRM_Activity_BAO_Activity::addActivity($participant, 'Event Registration');
     }
 
     //CRM-5403

From 1c2a69e94dabef916652d60d839d75690f18e3a2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 09:54:59 +1200
Subject: [PATCH 239/834] [REF] Consolidate input params that are primarily
 used for the membership entity action to an array

This simplifies the params for the function. In general we are very used to seeing params in the format used for the
api so this seems simpler when a lot of the function is just compiling them for that purpose
---
 CRM/Member/Form/MembershipRenewal.php | 51 +++++++++++----------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index e7ea29422939..cf52166281e9 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -589,11 +589,19 @@ protected function submit() {
 
     $pending = ($this->_params['contribution_status_id'] == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Pending'));
 
-    $membership = $this->processMembership(
-      $this->_contactID, $this->_params['membership_type_id'][1], $isTestMembership,
-      $renewalDate, $customFieldsFormatted, $numRenewTerms, $this->_membershipId,
-      $pending,
-      $contributionRecurID, $this->_params['is_pay_later']);
+    $membershipParams = [
+      'id' => $this->_membershipId,
+      'membership_type_id' => $this->_params['membership_type_id'][1],
+      'modified_id' => $this->_contactID,
+      'custom' => $customFieldsFormatted,
+      'membership_activity_status' => ($pending || $this->_params['is_pay_later']) ? 'Scheduled' : 'Completed',
+      // Since we are renewing, make status override false.
+      'is_override' => FALSE,
+    ];
+    if ($contributionRecurID) {
+      $membershipParams['contribution_recur_id'] = $contributionRecurID;
+    }
+    $membership = $this->processMembership($membershipParams, $renewalDate, $numRenewTerms, $pending);
 
     $this->endDate = CRM_Utils_Date::processDate($membership->end_date);
 
@@ -731,38 +739,21 @@ protected function sendReceipt($membership) {
    * This is duplicated from the BAO class - on the basis that it's actually easier to divide & conquer when
    * it comes to clearing up really bad code.
    *
-   * @param int $contactID
-   * @param int $membershipTypeID
-   * @param bool $is_test
-   * @param string $changeToday
-   * @param $customFieldsFormatted
+   * @param array $memParams
+   * @param bool $changeToday
    * @param $numRenewTerms
-   * @param int $membershipID
-   * @param $pending
-   * @param int $contributionRecurID
-   * @param $isPayLater
+   * @param bool $pending
    *
    * @return CRM_Member_BAO_Membership
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public function processMembership($contactID, $membershipTypeID, $is_test, $changeToday, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $contributionRecurID, $isPayLater) {
+  public function processMembership($memParams, $changeToday, $numRenewTerms, $pending) {
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
     $ids = [];
-    $currentMembership = civicrm_api3('Membership', 'getsingle', ['id' => $membershipID]);
-    $memParams = [
-      'id' => $currentMembership['id'],
-      'membership_type_id' => $membershipTypeID,
-      'join_date' => $currentMembership['join_date'],
-      'modified_id' => $contactID,
-      'custom' => $customFieldsFormatted,
-      'membership_activity_status' => ($pending || $isPayLater) ? 'Scheduled' : 'Completed',
-      // Since we are renewing, make status override false.
-      'is_override' => FALSE,
-    ];
-    if ($contributionRecurID) {
-      $memParams['contribution_recur_id'] = $contributionRecurID;
-    }
+    $currentMembership = civicrm_api3('Membership', 'getsingle', ['id' => $memParams['id']]);
+
+    $memParams['join_date'] = $currentMembership['join_date'];
     // Do NOT do anything.
     //1. membership with status : PENDING/CANCELLED (CRM-2395)
     //2. Paylater/IPN renew. CRM-4556.
@@ -787,7 +778,7 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan
     // CRM-7297 Membership Upsell - calculate dates based on new membership type
     $dates = CRM_Member_BAO_MembershipType::getRenewalDatesForMembershipType($currentMembership['id'],
       $changeToday,
-      $membershipTypeID,
+      $memParams['membership_type_id'],
       $numRenewTerms
     );
     $memParams = array_merge($memParams, [

From fba045e1d152968400b6916099ae01319a289591 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 13 Sep 2020 19:54:30 +1200
Subject: [PATCH 240/834] [Ref] Code simplification - remove conditional chunk

All this calculation of component is only to insert it into an error messaage that we don't expect to see
(ie it's an 'unknown error' error message, not an anticipated one.

Given that, it's hard to see why we would use so many lines of code to calculate it
---
 CRM/Activity/BAO/Activity.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 40f6fdc90665..ac7cac12fd1a 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -1699,16 +1699,10 @@ public static function addActivity(
     $params = []
   ) {
     $date = date('YmdHis');
-    if ($activity->__table == 'civicrm_membership') {
-      $component = 'Membership';
+    if ($activity->__table === 'civicrm_participant' && $activityType !== 'Email') {
+      $activityType = 'Event Registration';
     }
-    elseif ($activity->__table == 'civicrm_participant') {
-      if ($activityType != 'Email') {
-        $activityType = 'Event Registration';
-      }
-      $component = 'Event';
-    }
-    elseif ($activity->__table == 'civicrm_contribution') {
+    if ($activity->__table == 'civicrm_contribution') {
       // create activity record only for Completed Contributions
       $contributionCompletedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
       if ($activity->contribution_status_id != $contributionCompletedStatusId) {
@@ -1718,7 +1712,7 @@ public static function addActivity(
         }
         $params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Scheduled');
       }
-      $activityType = $component = 'Contribution';
+      $activityType = 'Contribution';
 
       // retrieve existing activity based on source_record_id and activity_type
       if (empty($params['id'])) {
@@ -1772,7 +1766,7 @@ public static function addActivity(
     // @todo - use api - remove lots of wrangling above. Remove deprecated fatal & let form layer
     // deal with any exceptions.
     if (is_a(self::create($activityParams), 'CRM_Core_Error')) {
-      throw new CRM_Core_Exception("Failed creating Activity for $component of id {$activity->id}");
+      throw new CRM_Core_Exception("Failed creating Activity of type $activityType for entity id {$activity->id}");
     }
   }
 

From 2627f4ba7fec035a313290972a5d593792f2a1cd Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sun, 13 Sep 2020 18:40:35 -0400
Subject: [PATCH 241/834] missing ?? when converted from Array::value

---
 CRM/Contribute/Form/Contribution/Confirm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index a9a2988d4d97..93a210a5530c 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -485,7 +485,7 @@ public function buildQuickForm() {
       $fieldTypes[] = CRM_Core_BAO_UFGroup::getContactType($this->_values['honoree_profile_id']);
       $this->buildCustom($this->_values['honoree_profile_id'], 'honoreeProfileFields', TRUE, 'honor', $fieldTypes);
     }
-    $this->assign('receiptFromEmail', $this->_values['receipt_from_email']);
+    $this->assign('receiptFromEmail', $this->_values['receipt_from_email'] ?? NULL);
     $amount_block_is_active = $this->get('amount_block_is_active');
     $this->assign('amount_block_is_active', $amount_block_is_active);
 

From bf30261088cf844f63c31e5e6530ff05f2f97a36 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 11:14:54 +1200
Subject: [PATCH 242/834] dev/financial#149 Add permission = false to apiv4
 call to address regression

This retrieves payment processors using FALSE for get permissions. I was able to replicate the bug in the test.

I also updated one line that I passed through when stepping through the test that related to the addActivity.
It just passes in activityType rather than leaving addActivity to figure that out
---
 CRM/Contribute/BAO/Contribution.php             |  2 +-
 CRM/Contribute/Form/Contribution/Confirm.php    |  2 +-
 .../Form/Contribution/ConfirmTest.php           |  9 +++++----
 .../CRM/Event/Form/Registration/ConfirmTest.php | 17 ++++++++++-------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 7ae760f23e13..10eb9ca186d5 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4437,7 +4437,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
     $contributionParams['payment_processor'] = $paymentProcessorId;
 
     if (empty($contributionParams['payment_instrument_id']) && isset($contribution->_relatedObjects['paymentProcessor']['payment_instrument_id'])) {
-      $contributionParams['payment_instrument_id'] = PaymentProcessor::get()->addWhere('id', '=', $paymentProcessorId)->addSelect('payment_instrument_id')->execute()->first()['payment_instrument_id'];
+      $contributionParams['payment_instrument_id'] = PaymentProcessor::get(FALSE)->addWhere('id', '=', $paymentProcessorId)->addSelect('payment_instrument_id')->execute()->first()['payment_instrument_id'];
     }
 
     if ($recurringContributionID) {
diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index fff962e7058f..774ca50b4b4d 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1020,7 +1020,7 @@ public static function processFormContribution(
 
     // create an activity record
     if ($contribution) {
-      CRM_Activity_BAO_Activity::addActivity($contribution, NULL, $targetContactID, $actParams);
+      CRM_Activity_BAO_Activity::addActivity($contribution, 'Contribution', $targetContactID, $actParams);
     }
 
     $transaction->commit();
diff --git a/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php b/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
index 7e8cc08a3bb1..c5ab5f7f175e 100644
--- a/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/Contribution/ConfirmTest.php
@@ -28,9 +28,10 @@ public function tearDown() {
   /**
    * CRM-21200: Test that making online payment for pending contribution doesn't overwite the contribution details
    */
-  public function testPaynowPayment() {
+  public function testPayNowPayment() {
     $contactID = $this->individualCreate();
     $paymentProcessorID = $this->paymentProcessorCreate(['payment_processor_type_id' => 'Dummy']);
+    CRM_Core_Config::singleton()->userPermissionClass->permissions = [];
 
     // create a contribution page which is later used to make pay-later contribution
     $result = $this->callAPISuccess('ContributionPage', 'create', [
@@ -80,7 +81,7 @@ public function testPaynowPayment() {
       'payment_instrument_id' => CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'payment_instrument_id', 'Credit card'),
     ];
     $form->_params = [
-      'qfKey' => 'donotcare',
+      'qfKey' => 'do not care',
       'contribution_id' => $contribution['id'],
       'credit_card_number' => 4111111111111111,
       'cvv2' => 234,
@@ -154,7 +155,7 @@ public function testPaynowPayment() {
       'relationship_type_id' => 5,
       'is_current_employer' => 1,
     ]);
-    $processConfirmResult = CRM_Contribute_BAO_Contribution_Utils::processConfirm($form,
+    CRM_Contribute_BAO_Contribution_Utils::processConfirm($form,
       $form->_params,
       $form->_params['onbehalf_contact_id'],
       $form->_values['financial_type_id'],
@@ -169,7 +170,7 @@ public function testPaynowPayment() {
       'sequential' => 1,
       'source_record_id' => $contribution['id'],
       'contact_id' => $form->_params['onbehalf_contact_id'],
-      'activity_type_id' => "Contribution",
+      'activity_type_id' => 'Contribution',
     ]);
     $this->assertEquals(1, $activity['count']);
   }
diff --git a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
index 030228424165..7278eacafc1d 100644
--- a/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
+++ b/tests/phpunit/CRM/Event/Form/Registration/ConfirmTest.php
@@ -76,6 +76,7 @@ public function testSubmit() {
         ],
       ],
     ]);
+
     $participant = $this->callAPISuccessGetSingle('Participant', []);
     $mut->checkMailLog([
       'Dear Logged In,  Thank you for your registration.  This is a confirmation that your registration has been received and your status has been updated to Registered.',
@@ -415,9 +416,10 @@ public function testAssignProfiles() {
   /**
    * Submit event registration with a note field
    *
-   * @param  array $event
+   * @param array $event
    * @param int $contact_id
    *
+   * @return array
    * @throws \Exception
    */
   private function submitWithNote($event, $contact_id) {
@@ -532,8 +534,10 @@ private function creatEventWithProfile($event) {
    * @param string $field_name
    * @param string $field_type
    * @param string $field_label
+   *
    * @return array
    *   API result array
+   * @throws \CRM_Core_Exception
    */
   private function uf_field_add($uf_group_id, $field_name, $field_type, $field_label) {
     $params = [
@@ -546,8 +550,7 @@ private function uf_field_add($uf_group_id, $field_name, $field_type, $field_lab
       'is_active' => 1,
       'uf_group_id' => $uf_group_id,
     ];
-    $result = civicrm_api3('UFField', 'create', $params);
-    return $result;
+    return $this->callAPISuccess('UFField', 'create', $params);
   }
 
   /**
@@ -559,7 +562,7 @@ public function testNoteSubmission() {
     //create an event with an attached profile containing a note
     $event = $this->creatEventWithProfile(NULL);
     $event['custom_pre_id'] = $this->ids["UFGroup"]["our profile"];
-    $event['note'] = "This is note 1";
+    $event['note'] = 'This is note 1';
     list($contact_id, $participant_id) = $this->submitWithNote($event, NULL);
     civicrm_api3('Participant', 'delete', ['id' => $participant_id]);
 
@@ -567,15 +570,15 @@ public function testNoteSubmission() {
     //and confirm that the note shown in the email is the current one
     $event = $this->creatEventWithProfile($event);
     $event['custom_pre_id'] = $this->ids["UFGroup"]["our profile"];
-    $event['note'] = "This is note 2";
+    $event['note'] = 'This is note 2';
     list($contact_id, $participant_id) = $this->submitWithNote($event, $contact_id);
     civicrm_api3('Participant', 'delete', ['id' => $participant_id]);
 
     //finally, submit a blank note and confirm that the note shown in the email is blank
     $event = $this->creatEventWithProfile($event);
     $event['custom_pre_id'] = $this->ids["UFGroup"]["our profile"];
-    $event['note'] = "";
-    list($contact_id, $participant_id) = $this->submitWithNote($event, $contact_id);
+    $event['note'] = '';
+    $this->submitWithNote($event, $contact_id);
   }
 
 }

From 5266e7b8f572764cc90611b5bc061d90e91ef465 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 10:12:54 +1200
Subject: [PATCH 243/834] Move definition of userName to where it is used and
 remove an unused paramter

---
 CRM/Member/Form/MembershipRenewal.php             |  4 ++--
 .../CRM/Member/Form/MembershipRenewalTest.php     | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index e7ea29422939..7d22be90dc4b 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -495,7 +495,7 @@ protected function submit() {
     $now = CRM_Utils_Date::getToday(NULL, 'YmdHis');
     $this->assign('receive_date', CRM_Utils_Array::value('receive_date', $this->_params, date('Y-m-d H:i:s')));
     $this->processBillingAddress();
-    list($userName) = CRM_Contact_BAO_Contact_Location::getEmailDetails(CRM_Core_Session::singleton()->get('userID'));
+
     $this->_params['total_amount'] = CRM_Utils_Array::value('total_amount', $this->_params,
       CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType', $this->_memType, 'minimum_fee')
     );
@@ -602,10 +602,10 @@ protected function submit() {
 
     if (!empty($this->_params['record_contribution']) || $this->_mode) {
       // set the source
+      list($userName) = CRM_Contact_BAO_Contact_Location::getEmailDetails(CRM_Core_Session::singleton()->get('userID'));
       $this->_params['contribution_source'] = "{$this->membershipTypeName} Membership: Offline membership renewal (by {$userName})";
 
       //create line items
-      $lineItem = [];
       $this->_params = $this->setPriceSetParameters($this->_params);
 
       $order = new CRM_Financial_BAO_Order();
diff --git a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
index f13fdf4c5291..8a8b26d31af4 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipRenewalTest.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Contact;
+
 /**
  *  Test CRM_Member_Form_Membership functions.
  *
@@ -132,7 +134,8 @@ public function tearDown() {
    */
   public function testSubmit() {
     $form = $this->getForm();
-    $this->createLoggedInUser();
+    $loggedInUserID = $this->createLoggedInUser();
+    $loggedInUserDisplayName = Contact::get()->addWhere('id', '=', $loggedInUserID)->addSelect('display_name')->execute()->first()['display_name'];
     $params = $this->getBaseSubmitParams();
     $form->_contactID = $this->_individualId;
 
@@ -140,10 +143,12 @@ public function testSubmit() {
     $form->setRenewalMessage();
     $membership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $this->_individualId]);
     $this->callAPISuccessGetCount('ContributionRecur', ['contact_id' => $this->_individualId], 0);
-    $contribution = $this->callAPISuccess('Contribution', 'get', [
+    $contribution = $this->callAPISuccessGetSingle('Contribution', [
       'contact_id' => $this->_individualId,
       'is_test' => TRUE,
     ]);
+    $expectedContributionSource = 'AnnualFixed Membership: Offline membership renewal (by ' . $loggedInUserDisplayName . ')';
+    $this->assertEquals($expectedContributionSource, $contribution['contribution_source']);
 
     $this->callAPISuccessGetCount('LineItem', [
       'entity_id' => $membership['id'],
@@ -234,7 +239,7 @@ public function testSubmitRecur() {
     $params = [
       'cid' => $this->_individualId,
       'price_set_id' => 0,
-      'join_date' => date('m/d/Y', time()),
+      'join_date' => date('m/d/Y'),
       'start_date' => '',
       'end_date' => '',
       'campaign_id' => '',
@@ -443,7 +448,7 @@ public function testSubmitPayLater() {
     $originalMembership = $this->callAPISuccessGetSingle('membership', []);
     $params = [
       'cid' => $this->_individualId,
-      'join_date' => date('m/d/Y', time()),
+      'join_date' => date('m/d/Y'),
       'start_date' => '',
       'end_date' => '',
       // This format reflects the 23 being the organisation & the 25 being the type.
@@ -554,7 +559,7 @@ public function testSubmitComplete() {
     $originalMembership = $this->callAPISuccessGetSingle('membership', []);
     $params = [
       'cid' => $this->_individualId,
-      'join_date' => date('m/d/Y', time()),
+      'join_date' => date('m/d/Y'),
       'start_date' => '',
       'end_date' => '',
       // This format reflects the 23 being the organisation & the 25 being the type.

From f1518315c4efa5e66e7abd72cecc483215d1a15c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 11:57:50 +1200
Subject: [PATCH 244/834] dev/core#1921 remove isoToMysql

The test testPaymentDontChangeReceiveDate passes through these 2 lines of code - which
I think is probably about the most we can confirm testing wise as we expect there
to be no reason to cast to mysql anymore
---
 CRM/Activity/BAO/Activity.php       | 2 +-
 CRM/Financial/BAO/FinancialItem.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 40f6fdc90665..378b9d6b5719 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -1732,7 +1732,7 @@ public static function addActivity(
         $params['campaign_id'] = $activity->campaign_id;
       }
 
-      $date = CRM_Utils_Date::isoToMysql($activity->receive_date);
+      $date = $activity->receive_date;
     }
 
     $activityParams = [
diff --git a/CRM/Financial/BAO/FinancialItem.php b/CRM/Financial/BAO/FinancialItem.php
index fb5dca3d1655..d63db1dbb8cf 100644
--- a/CRM/Financial/BAO/FinancialItem.php
+++ b/CRM/Financial/BAO/FinancialItem.php
@@ -74,7 +74,7 @@ public static function add($lineItem, $contribution, $taxTrxnID = FALSE, $trxnId
       $itemStatus = array_search('Partially paid', $financialItemStatus);
     }
     $params = [
-      'transaction_date' => CRM_Utils_Date::isoToMysql($contribution->receive_date),
+      'transaction_date' => $contribution->receive_date,
       'contact_id' => $contribution->contact_id,
       'amount' => $lineItem->line_total,
       'currency' => $contribution->currency,

From dc4db2607dd633e23c88a158c47e191857b56245 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 12:09:23 +1200
Subject: [PATCH 245/834] dev/core#1921 remove isoToMysql

Overview
----------------------------------------
Remove unnecessary isoToDate function

Before
----------------------------------------
Code compatible with packages code of 6 years ago

After
----------------------------------------
will break if you revert 6 year old fix....

Technical Details
----------------------------------------
The test testMailerStats passes through this line of code - which
I think is probably about the most we can confirm testing wise as we expect there
to be no reason to cast to mysql anymore

Comments
----------------------------------------
https://lab.civicrm.org/dev/core/-/issues/1921
---
 CRM/Mailing/BAO/MailingJob.php       |  2 +-
 tests/phpunit/api/v3/MailingTest.php | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php
index 4b1d5c6656a4..7868dfb85ffe 100644
--- a/CRM/Mailing/BAO/MailingJob.php
+++ b/CRM/Mailing/BAO/MailingJob.php
@@ -499,7 +499,7 @@ public function deliver(&$mailer, $testParams = NULL) {
       $swapLang = CRM_Utils_AutoClean::swap('global://dbLocale?getter', 'call://i18n/setLocale', $mailing->language);
     }
 
-    $job_date = CRM_Utils_Date::isoToMysql($this->scheduled_date);
+    $job_date = $this->scheduled_date;
     $fields = [];
 
     if (!empty($testParams)) {
diff --git a/tests/phpunit/api/v3/MailingTest.php b/tests/phpunit/api/v3/MailingTest.php
index c132b77cbf94..962101dc59d4 100644
--- a/tests/phpunit/api/v3/MailingTest.php
+++ b/tests/phpunit/api/v3/MailingTest.php
@@ -745,7 +745,7 @@ public function testMailerStats() {
 
     //Create and send test mail first and change the mail job to live,
     //because stats api only works on live mail
-    $mail = $this->callAPISuccess('mailing', 'create', $this->_params);
+    $mail = $this->callAPISuccess('Mailing', 'create', $this->_params);
     $params = ['mailing_id' => $mail['id'], 'test_email' => NULL, 'test_group' => $this->_groupID];
     $deliveredInfo = $this->callAPISuccess($this->_entity, 'send_test', $params);
     $deliveredIds = implode(',', array_keys($deliveredInfo['values']));
@@ -761,7 +761,7 @@ public function testMailerStats() {
          ORDER BY RAND() LIMIT 0,20");
       $temporaryTableName = $temporaryTable->getName();
 
-      if ($type == 'unsubscribe') {
+      if ($type === 'unsubscribe') {
         $sql = "INSERT INTO civicrm_mailing_event_{$type} (event_queue_id, time_stamp, org_unsubscribe)
 SELECT event_queue_id, time_stamp, 1 FROM {$temporaryTableName}";
       }
@@ -801,8 +801,8 @@ public function testMailerDeleteSuccess() {
    * Test Mailing.gettokens.
    */
   public function testMailGetTokens() {
-    $description = "Demonstrates fetching tokens for one or more entities (in this case \"Contact\" and \"Mailing\").
-      Optionally pass sequential=1 to have output ready-formatted for the select2 widget.";
+    $description = 'Demonstrates fetching tokens for one or more entities (in this case "Contact" and "Mailing").
+      Optionally pass sequential=1 to have output ready-formatted for the select2 widget.';
     $result = $this->callAPIAndDocument($this->_entity, 'gettokens', ['entity' => ['Contact', 'Mailing']], __FUNCTION__, __FILE__, $description);
     $this->assertContains('Contact Type', $result['values']);
 
@@ -838,14 +838,14 @@ public function testClone() {
     // END SAMPLE DATA
 
     $create = $this->callAPISuccess('Mailing', 'create', $params);
-    $created = $this->callAPISuccess('Mailing', 'get', []);
+    $this->callAPISuccess('Mailing', 'get');
     $createId = $create['id'];
     $this->createLoggedInUser();
     $clone = $this->callAPIAndDocument('Mailing', 'clone', ['id' => $create['id']], __FUNCTION__, __FILE__);
     $cloneId = $clone['id'];
 
     $this->assertNotEquals($createId, $cloneId, 'Create and clone should return different records');
-    $this->assertTrue(is_numeric($cloneId));
+    $this->assertInternalType('numeric', $cloneId);
 
     $this->assertNotEmpty($clone['values'][$cloneId]['subject']);
     $this->assertEquals($params['subject'], $clone['values'][$cloneId]['subject'], "Cloned subject should match");
@@ -953,12 +953,14 @@ public function testMailerForwardWrongParams() {
   /**
    * @param array $params
    *   Extra parameters for the draft mailing.
+   *
    * @return array|int
+   * @throws \CRM_Core_Exception
    */
   public function createDraftMailing($params = []) {
     $createParams = array_merge($this->_params, $params);
     $createResult = $this->callAPISuccess('mailing', 'create', $createParams, __FUNCTION__, __FILE__);
-    $this->assertTrue(is_numeric($createResult['id']));
+    $this->assertInternalType('numeric', $createResult['id']);
     $this->assertDBQuery(0, 'SELECT count(*) FROM civicrm_mailing_job WHERE mailing_id = %1', [
       1 => [$createResult['id'], 'Integer'],
     ]);

From 9e60c4e14504bd2305219c6aaba5db5c1e872045 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 12:39:16 +1200
Subject: [PATCH 246/834] Move function only used by bin/ContributionProcessor
 to that class

We should find a way to move this out of core - it seems likely it's never used but since being moved out
of svn it's had about 40 commits - all of which are just 'general maintenance' - licensing, coding standards etc.

There is an overhead in maintaining it....
---
 CRM/Contribute/BAO/Contribution/Utils.php | 72 ---------------------
 bin/ContributionProcessor.php             | 76 ++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index 683b92c6a618..af50415499f9 100644
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -345,78 +345,6 @@ public static function createCMSUser(&$params, $contactID, $mail) {
     }
   }
 
-  /**
-   * @param array $params
-   * @param string $type
-   *
-   * @return bool
-   */
-  public static function _fillCommonParams(&$params, $type = 'paypal') {
-    if (array_key_exists('transaction', $params)) {
-      $transaction = &$params['transaction'];
-    }
-    else {
-      $transaction = &$params;
-    }
-
-    $params['contact_type'] = 'Individual';
-
-    $billingLocTypeId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_LocationType', 'Billing', 'id', 'name');
-    if (!$billingLocTypeId) {
-      $billingLocTypeId = 1;
-    }
-    if (!CRM_Utils_System::isNull($params['address'])) {
-      $params['address'][1]['is_primary'] = 1;
-      $params['address'][1]['location_type_id'] = $billingLocTypeId;
-    }
-    if (!CRM_Utils_System::isNull($params['email'])) {
-      $params['email'] = [
-        1 => [
-          'email' => $params['email'],
-          'location_type_id' => $billingLocTypeId,
-        ],
-      ];
-    }
-
-    if (isset($transaction['trxn_id'])) {
-      // set error message if transaction has already been processed.
-      $contribution = new CRM_Contribute_DAO_Contribution();
-      $contribution->trxn_id = $transaction['trxn_id'];
-      if ($contribution->find(TRUE)) {
-        $params['error'][] = ts('transaction already processed.');
-      }
-    }
-    else {
-      // generate a new transaction id, if not already exist
-      $transaction['trxn_id'] = md5(uniqid(rand(), TRUE));
-    }
-
-    if (!isset($transaction['financial_type_id'])) {
-      $contributionTypes = array_keys(CRM_Contribute_PseudoConstant::financialType());
-      $transaction['financial_type_id'] = $contributionTypes[0];
-    }
-
-    if (($type == 'paypal') && (!isset($transaction['net_amount']))) {
-      $transaction['net_amount'] = $transaction['total_amount'] - CRM_Utils_Array::value('fee_amount', $transaction, 0);
-    }
-
-    if (!isset($transaction['invoice_id'])) {
-      $transaction['invoice_id'] = $transaction['trxn_id'];
-    }
-
-    $source = ts('ContributionProcessor: %1 API',
-      [1 => ucfirst($type)]
-    );
-    if (isset($transaction['source'])) {
-      $transaction['source'] = $source . ':: ' . $transaction['source'];
-    }
-    else {
-      $transaction['source'] = $source;
-    }
-
-    return TRUE;
-  }
-
   /**
    * @param int $contactID
    *
diff --git a/bin/ContributionProcessor.php b/bin/ContributionProcessor.php
index a3a22d632cbe..a6c7bee51d01 100644
--- a/bin/ContributionProcessor.php
+++ b/bin/ContributionProcessor.php
@@ -353,7 +353,7 @@ public static function formatAPIParams($apiParams, $mapper, $type = 'paypal', $c
         $params += $transaction;
       }
 
-      CRM_Contribute_BAO_Contribution_Utils::_fillCommonParams($params, $type);
+      self::_fillCommonParams($params, $type);
 
       return $params;
     }
@@ -383,7 +383,7 @@ public static function formatAPIParams($apiParams, $mapper, $type = 'paypal', $c
         $params += $transaction;
       }
 
-      CRM_Contribute_BAO_Contribution_Utils::_fillCommonParams($params, $type);
+      self::_fillCommonParams($params, $type);
 
       return $params;
     }
@@ -457,6 +457,78 @@ public static function processAPIContribution($params) {
     return TRUE;
   }
 
+  /**
+   * @param array $params
+   * @param string $type
+   *
+   * @return bool
+   */
+  public static function _fillCommonParams(&$params, $type = 'paypal') {
+    if (array_key_exists('transaction', $params)) {
+      $transaction = &$params['transaction'];
+    }
+    else {
+      $transaction = &$params;
+    }
+
+    $params['contact_type'] = 'Individual';
+
+    $billingLocTypeId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_LocationType', 'Billing', 'id', 'name');
+    if (!$billingLocTypeId) {
+      $billingLocTypeId = 1;
+    }
+    if (!CRM_Utils_System::isNull($params['address'])) {
+      $params['address'][1]['is_primary'] = 1;
+      $params['address'][1]['location_type_id'] = $billingLocTypeId;
+    }
+    if (!CRM_Utils_System::isNull($params['email'])) {
+      $params['email'] = [
+        1 => [
+          'email' => $params['email'],
+          'location_type_id' => $billingLocTypeId,
+        ],
+      ];
+    }
+
+    if (isset($transaction['trxn_id'])) {
+      // set error message if transaction has already been processed.
+      $contribution = new CRM_Contribute_DAO_Contribution();
+      $contribution->trxn_id = $transaction['trxn_id'];
+      if ($contribution->find(TRUE)) {
+        $params['error'][] = ts('transaction already processed.');
+      }
+    }
+    else {
+      // generate a new transaction id, if not already exist
+      $transaction['trxn_id'] = md5(uniqid(rand(), TRUE));
+    }
+
+    if (!isset($transaction['financial_type_id'])) {
+      $contributionTypes = array_keys(CRM_Contribute_PseudoConstant::financialType());
+      $transaction['financial_type_id'] = $contributionTypes[0];
+    }
+
+    if (($type == 'paypal') && (!isset($transaction['net_amount']))) {
+      $transaction['net_amount'] = $transaction['total_amount'] - CRM_Utils_Array::value('fee_amount', $transaction, 0);
+    }
+
+    if (!isset($transaction['invoice_id'])) {
+      $transaction['invoice_id'] = $transaction['trxn_id'];
+    }
+
+    $source = ts('ContributionProcessor: %1 API',
+      [1 => ucfirst($type)]
+    );
+    if (isset($transaction['source'])) {
+      $transaction['source'] = $source . ':: ' . $transaction['source'];
+    }
+    else {
+      $transaction['source'] = $source;
+    }
+
+    return TRUE;
+  }
+
 }
 
 // bootstrap the environment and run the processor

From 67afda37e09d0af8071bb07349203163be13e356 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 14 Sep 2020 10:59:28 +1000
Subject: [PATCH 247/834] dev/financial#147 Ensure that jQuery Validation
 doesn't execute when we click the paypal express button and ensure the style
 of the button doesn't change

---
 CRM/Core/Payment/PayPalImpl.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php
index be3f794b11ef..b1833a8752ca 100644
--- a/CRM/Core/Payment/PayPalImpl.php
+++ b/CRM/Core/Payment/PayPalImpl.php
@@ -160,12 +160,22 @@ protected function addPaypalExpressCode(&$form) {
         $form->_expressButtonName = $form->getButtonName('upload', 'express');
       }
       $form->assign('expressButtonName', $form->_expressButtonName);
-      $form->add(
-        'image',
-        $form->_expressButtonName,
-        $this->_paymentProcessor['url_button'],
-        ['class' => 'crm-form-submit']
-      );
+      $form->add('xbutton', $form->_expressButtonName, ts('Pay using PayPal'), [
+        'type' => 'submit',
+        'formnovalidate' => 'formnovalidate',
+        'class' => 'crm-form-submit',
+      ]);
+      CRM_Core_Resources::singleton()->addStyle('
+        button#' . $form->_expressButtonName . '{
+         background-image: url(' . $this->_paymentProcessor['url_button'] . ');
+         color: transparent;
+         background-repeat: no-repeat;
+         background-color: transparent;
+         background-position: center;
+         min-width: 150px;
+         min-height: 50px;
+         border: none;
+       ');
     }
   }
 
@@ -1108,7 +1118,6 @@ protected function isPaypalExpress($params) {
     if ($this->isPayPalType($this::PAYPAL_EXPRESS)) {
       return TRUE;
     }
-
     // This would occur postProcess.
     if (!empty($params['token'])) {
       return TRUE;
@@ -1122,6 +1131,7 @@ protected function isPaypalExpress($params) {
     $possibleExpressFields = [
       '_qf_Register_upload_express_x',
       '_qf_Payment_upload_express_x',
+      '_qf_Main_upload_express',
     ];
     if (array_intersect_key($params, array_fill_keys($possibleExpressFields, 1))) {
       return TRUE;

From b505922618b2d7ecc9539815faf33dfffad58479 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sat, 12 Sep 2020 23:48:03 -0400
Subject: [PATCH 248/834] drupal 9 deprecations

---
 CRM/Utils/System/Drupal8.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
index feb6dc58e5a7..85d0468296e9 100644
--- a/CRM/Utils/System/Drupal8.php
+++ b/CRM/Utils/System/Drupal8.php
@@ -34,7 +34,7 @@ public function createUser(&$params, $mail) {
     }
 
     /** @var \Drupal\user\Entity\User $account */
-    $account = entity_create('user');
+    $account = \Drupal::entityTypeManager()->getStorage('user')->create();
     $account->setUsername($params['cms_name'])->setEmail($params[$mail]);
 
     // Allow user to set password only if they are an admin or if
@@ -109,7 +109,7 @@ public function createUser(&$params, $mail) {
    * @inheritDoc
    */
   public function updateCMSName($ufID, $email) {
-    $user = entity_load('user', $ufID);
+    $user = \Drupal::entityTypeManager()->getStorage('user')->load($ufID);
     if ($user && $user->getEmail() != $email) {
       $user->setEmail($email);
 
@@ -134,7 +134,7 @@ public static function checkUserNameEmailExists(&$params, &$errors, $emailName =
     if (!empty($params['name'])) {
       $name = $params['name'];
 
-      $user = entity_create('user');
+      $user = \Drupal::entityTypeManager()->getStorage('user')->create();
       $user->setUsername($name);
 
       // This checks for both username uniqueness and validity.
@@ -152,7 +152,7 @@ public static function checkUserNameEmailExists(&$params, &$errors, $emailName =
     if (!empty($params['mail'])) {
       $mail = $params['mail'];
 
-      $user = entity_create('user');
+      $user = \Drupal::entityTypeManager()->getStorage('user')->create();
       $user->setEmail($mail);
 
       // This checks for both email uniqueness.
@@ -172,7 +172,7 @@ public static function checkUserNameEmailExists(&$params, &$errors, $emailName =
    */
   public function getLoginURL($destination = '') {
     $query = $destination ? ['destination' => $destination] : [];
-    return \Drupal::url('user.login', [], ['query' => $query]);
+    return \Drupal\Core\Url::fromRoute('user.login', [], ['query' => $query])->toString();
   }
 
   /**
@@ -430,7 +430,7 @@ public function loadBootStrap($params = [], $loadUser = TRUE, $throwError = TRUE
     CRM_Utils_Hook::config($config);
 
     if ($loadUser) {
-      if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($params['uid'])->getUsername()) {
+      if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($params['uid'])->getAccountName()) {
         $this->loadUser($username);
       }
       elseif (!empty($params['name']) && !empty($params['pass']) && \Drupal::service('user.auth')->authenticate($params['name'], $params['pass'])) {

From 415e7323b6b9582dfddb40f9d961c6498e6dd1fd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 12:57:17 +1200
Subject: [PATCH 249/834] Update code comments

Making these a little less paypal specific
---
 CRM/Contribute/Form/ContributionBase.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php
index 6822a355f6f5..7bb940637f2b 100644
--- a/CRM/Contribute/Form/ContributionBase.php
+++ b/CRM/Contribute/Form/ContributionBase.php
@@ -154,8 +154,18 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
   public $_action;
 
   /**
-   * Contribution mode e.g express for payment express, notify for off-site + notification back to CiviCRM
+   * Contribution mode.
+   *
+   * In general we are trying to deprecate this parameter but some templates and processors still
+   * require it to denote whether the processor redirects offsite (notify) or not.
+   *
+   * The intent is that this knowledge should not be required and all contributions should
+   * be created in a pending state and updated based on the payment result without needing to be
+   * aware of the processor workings.
+   *
    * @var string
+   *
+   * @deprecated
    */
   public $_contributeMode;
 
@@ -179,8 +189,10 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
   public $_emailExists = FALSE;
 
   /**
-   * Is this a backoffice form
-   * (this will affect whether paypal express code is displayed)
+   * Is this a backoffice form.
+   *
+   * Processors may display different options to backoffice users.
+   *
    * @var bool
    */
   public $isBackOffice = FALSE;

From 9a0fec655f8a81dde9344a35d75395617f437e35 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 16:44:43 +1200
Subject: [PATCH 250/834] dev/core#2017 remove unused SearchTaskHookSample.php

This appears to be unused demo code. Interested to see if any intrepid sleuths can fix any
alternate explanation
---
 .../Form/Task/SearchTaskHookSample.php        | 73 -------------------
 CRM/Case/Form/Task/SearchTaskHookSample.php   | 68 -----------------
 .../Form/Task/SearchTaskHookSample.php        | 68 -----------------
 CRM/Event/Form/Task/SearchTaskHookSample.php  | 71 ------------------
 CRM/Grant/Form/Task/SearchTaskHookSample.php  | 72 ------------------
 CRM/Member/Form/Task/SearchTaskHookSample.php | 71 ------------------
 CRM/Pledge/Form/Task/SearchTaskHookSample.php | 65 -----------------
 .../Case/Form/Task/SearchTaskHookSample.tpl   | 36 ---------
 .../Form/Task/SearchTaskHookSample.tpl        | 38 ----------
 .../Event/Form/Task/SearchTaskHookSample.tpl  | 36 ---------
 .../Grant/Form/Task/SearchTaskHookSample.tpl  | 34 ---------
 11 files changed, 632 deletions(-)
 delete mode 100644 CRM/Activity/Form/Task/SearchTaskHookSample.php
 delete mode 100644 CRM/Case/Form/Task/SearchTaskHookSample.php
 delete mode 100644 CRM/Contribute/Form/Task/SearchTaskHookSample.php
 delete mode 100644 CRM/Event/Form/Task/SearchTaskHookSample.php
 delete mode 100644 CRM/Grant/Form/Task/SearchTaskHookSample.php
 delete mode 100644 CRM/Member/Form/Task/SearchTaskHookSample.php
 delete mode 100644 CRM/Pledge/Form/Task/SearchTaskHookSample.php
 delete mode 100644 templates/CRM/Case/Form/Task/SearchTaskHookSample.tpl
 delete mode 100644 templates/CRM/Contribute/Form/Task/SearchTaskHookSample.tpl
 delete mode 100644 templates/CRM/Event/Form/Task/SearchTaskHookSample.tpl
 delete mode 100644 templates/CRM/Grant/Form/Task/SearchTaskHookSample.tpl

diff --git a/CRM/Activity/Form/Task/SearchTaskHookSample.php b/CRM/Activity/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index 003dd58c7e2b..000000000000
--- a/CRM/Activity/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Activity_Form_Task_SearchTaskHookSample extends CRM_Activity_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and activity details of all selected contacts
-    $activityIDs = implode(',', $this->_activityHolderIds);
-
-    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
-    $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
-    $query = "
-    SELECT at.subject      as subject,
-           ov.label        as activity_type,
-           at.activity_date_time as activity_date,
-           ct.display_name as display_name
-      FROM civicrm_activity at
-LEFT JOIN  civicrm_activity_contact ac ON ( ac.activity_id = at.id AND ac.record_type_id = {$sourceID} )
-INNER JOIN civicrm_contact ct ON ( ac.contact_id = ct.id )
- LEFT JOIN civicrm_option_group og ON ( og.name = 'activity_type' )
- LEFT JOIN civicrm_option_value ov ON (at.activity_type_id = ov.value AND og.id = ov.option_group_id )
-     WHERE at.id IN ( $activityIDs )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-
-    while ($dao->fetch()) {
-      $rows[] = [
-        'subject' => $dao->subject,
-        'activity_type' => $dao->activity_type,
-        'activity_date' => $dao->activity_date,
-        'display_name' => $dao->display_name,
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-      [
-        'type' => 'done',
-        'name' => ts('Done'),
-        'isDefault' => TRUE,
-      ],
-    ]);
-  }
-
-}
diff --git a/CRM/Case/Form/Task/SearchTaskHookSample.php b/CRM/Case/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index df83772a1ff0..000000000000
--- a/CRM/Case/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Case_Form_Task_SearchTaskHookSample extends CRM_Case_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and email of all contact ids
-    $caseIDs = implode(',', $this->_entityIds);
-    $statusId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', 'case_status', 'id', 'name');
-    $query = "
-SELECT ct.display_name as display_name,
-       cs.start_date   as start_date,
-       ov.label as status
-
-FROM  civicrm_case cs
-INNER JOIN civicrm_case_contact cc ON ( cs.id = cc.case_id)
-INNER JOIN civicrm_contact ct ON ( cc.contact_id = ct.id)
-LEFT  JOIN civicrm_option_value ov ON (cs.status_id = ov.value AND ov.option_group_id = {$statusId} )
-WHERE cs.id IN ( {$caseIDs} )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-    while ($dao->fetch()) {
-      $rows[] = [
-        'display_name' => $dao->display_name,
-        'start_date' => CRM_Utils_Date::customFormat($dao->start_date),
-        'status' => $dao->status,
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-      [
-        'type' => 'done',
-        'name' => ts('Done'),
-        'isDefault' => TRUE,
-      ],
-    ]);
-  }
-
-}
diff --git a/CRM/Contribute/Form/Task/SearchTaskHookSample.php b/CRM/Contribute/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index 0e081647bb22..000000000000
--- a/CRM/Contribute/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Contribute_Form_Task_SearchTaskHookSample extends CRM_Contribute_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and contribution details of all selected contacts
-    $contribIDs = implode(',', $this->_contributionIds);
-
-    $query = "
-    SELECT co.total_amount as amount,
-           co.receive_date as receive_date,
-           co.source       as source,
-           ct.display_name as display_name
-      FROM civicrm_contribution co
-INNER JOIN civicrm_contact ct ON ( co.contact_id = ct.id )
-     WHERE co.id IN ( $contribIDs )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-
-    while ($dao->fetch()) {
-      $rows[] = [
-        'display_name' => $dao->display_name,
-        'amount' => $dao->amount,
-        'source' => $dao->source,
-        'receive_date' => $dao->receive_date,
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-      [
-        'type' => 'done',
-        'name' => ts('Done'),
-        'isDefault' => TRUE,
-      ],
-    ]);
-  }
-
-}
diff --git a/CRM/Event/Form/Task/SearchTaskHookSample.php b/CRM/Event/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index efc940e57437..000000000000
--- a/CRM/Event/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Event_Form_Task_SearchTaskHookSample extends CRM_Event_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   *
-   * @return void
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and participation details of participants
-    $participantIDs = implode(',', $this->_participantIds);
-
-    $query = "
-     SELECT p.fee_amount as amount,
-            p.register_date as register_date,
-            p.source as source,
-            ct.display_name as display_name
-       FROM civicrm_participant p
- INNER JOIN civicrm_contact ct ON ( p.contact_id = ct.id )
-      WHERE p.id IN ( $participantIDs )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-    while ($dao->fetch()) {
-      $rows[] = [
-        'display_name' => $dao->display_name,
-        'amount' => $dao->amount,
-        'register_date' => CRM_Utils_Date::customFormat($dao->register_date),
-        'source' => $dao->source,
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   *
-   * @return void
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-      [
-        'type' => 'done',
-        'name' => ts('Done'),
-        'isDefault' => TRUE,
-      ],
-    ]);
-  }
-
-}
diff --git a/CRM/Grant/Form/Task/SearchTaskHookSample.php b/CRM/Grant/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index 01ce981f4531..000000000000
--- a/CRM/Grant/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Grant_Form_Task_SearchTaskHookSample extends CRM_Grant_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   *
-   * @return void
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and grant details of all selectced contacts
-    $grantIDs = implode(',', $this->_grantIds);
-
-    $query = "
-    SELECT grt.decision_date  as decision_date,
-           grt.amount_total   as amount_total,
-           grt.amount_granted as amount_granted,
-           ct.display_name    as display_name
-      FROM civicrm_grant grt
-INNER JOIN civicrm_contact ct ON ( grt.contact_id = ct.id )
-     WHERE grt.id IN ( $grantIDs )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-
-    while ($dao->fetch()) {
-      $rows[] = [
-        'display_name' => $dao->display_name,
-        'decision_date' => $dao->decision_date,
-        'amount_requested' => $dao->amount_total,
-        'amount_granted' => $dao->amount_granted,
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   *
-   * @return void
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-      [
-        'type' => 'done',
-        'name' => ts('Done'),
-        'isDefault' => TRUE,
-      ],
-    ]);
-  }
-
-}
diff --git a/CRM/Member/Form/Task/SearchTaskHookSample.php b/CRM/Member/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index d73ffc549f09..000000000000
--- a/CRM/Member/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Member_Form_Task_SearchTaskHookSample extends CRM_Member_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   *
-   * @return void
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and membership details of all selected contacts
-    $memberIDs = implode(',', $this->_memberIds);
-
-    $query = "
-    SELECT mem.start_date  as start_date,
-           mem.end_date    as end_date,
-           mem.source      as source,
-           ct.display_name as display_name
-FROM       civicrm_membership mem
-INNER JOIN civicrm_contact ct ON ( mem.contact_id = ct.id )
-WHERE      mem.id IN ( $memberIDs )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-    while ($dao->fetch()) {
-      $rows[] = [
-        'display_name' => $dao->display_name,
-        'start_date' => CRM_Utils_Date::customFormat($dao->start_date),
-        'end_date' => CRM_Utils_Date::customFormat($dao->end_date),
-        'source' => $dao->source,
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   *
-   * @return void
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-      [
-        'type' => 'done',
-        'name' => ts('Done'),
-        'isDefault' => TRUE,
-      ],
-    ]);
-  }
-
-}
diff --git a/CRM/Pledge/Form/Task/SearchTaskHookSample.php b/CRM/Pledge/Form/Task/SearchTaskHookSample.php
deleted file mode 100644
index 5af8bf1e5bd0..000000000000
--- a/CRM/Pledge/Form/Task/SearchTaskHookSample.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * This class provides the functionality to save a search
- * Saved Searches are used for saving frequently used queries
- */
-class CRM_Pledge_Form_Task_SearchTaskHookSample extends CRM_Pledge_Form_Task {
-
-  /**
-   * Build all the data structures needed to build the form.
-   */
-  public function preProcess() {
-    parent::preProcess();
-    $rows = [];
-    // display name and pledge details of all selected contacts
-    $pledgeIDs = implode(',', $this->_pledgeIds);
-
-    $query = "
-    SELECT plg.amount      as amount,
-           plg.create_date as create_date,
-           ct.display_name as display_name
-      FROM civicrm_pledge plg
-INNER JOIN civicrm_contact ct ON ( plg.contact_id = ct.id )
-     WHERE plg.id IN ( $pledgeIDs )";
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-    while ($dao->fetch()) {
-      $rows[] = [
-        'display_name' => $dao->display_name,
-        'amount' => $dao->amount,
-        'create_date' => CRM_Utils_Date::customFormat($dao->create_date),
-      ];
-    }
-    $this->assign('rows', $rows);
-  }
-
-  /**
-   * Build the form object.
-   */
-  public function buildQuickForm() {
-    $this->addButtons([
-        [
-          'type' => 'done',
-          'name' => ts('Done'),
-          'isDefault' => TRUE,
-        ],
-    ]);
-  }
-
-}
diff --git a/templates/CRM/Case/Form/Task/SearchTaskHookSample.tpl b/templates/CRM/Case/Form/Task/SearchTaskHookSample.tpl
deleted file mode 100644
index cff2cc5fb098..000000000000
--- a/templates/CRM/Case/Form/Task/SearchTaskHookSample.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{if $rows}
-<div class="crm-submit-buttons">
-     <span class="element-right">{include file="CRM/common/formButtons.tpl" location="top"}</span>
-</div>
-
-<div class="spacer"></div>
-
-<div>
-<br />
-<table>
-  <tr class="columnheader">
-    <th>{ts}Display Name{/ts}</th>
-    <th>{ts}Start Date{/ts}</th>
-    <th>{ts}Status{/ts}</th>
-  </tr>
-
-  {foreach from=$rows item=row}
-    <tr class="{cycle values="odd-row,even-row"}">
-        <td class="crm-case-searchtaskhooksample-display_name">{$row.display_name}</td>
-        <td class="crm-case-searchtaskhooksample-start_date">{$row.start_date}</td>
-        <td class="crm-case-searchtaskhooksample-status">{$row.status}</td>
-    </tr>
-  {/foreach}
-</table>
-</div>
-
-<div class="crm-submit-buttons">
-     <span class="element-right">{include file="CRM/common/formButtons.tpl" location="bottom"}</span>
-</div>
-
-{else}
-   <div class="messages status no-popup">
-      {icon icon="fa-info-circle"}{/icon}
-          {ts}There are no records selected.{/ts}
-      </div>
-{/if}
diff --git a/templates/CRM/Contribute/Form/Task/SearchTaskHookSample.tpl b/templates/CRM/Contribute/Form/Task/SearchTaskHookSample.tpl
deleted file mode 100644
index a14a183b1774..000000000000
--- a/templates/CRM/Contribute/Form/Task/SearchTaskHookSample.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{if $rows}
-<div class="form-item crm-block crm-form-block crm-contribution-form-block">
-     <span class="element-right">{$form.buttons.html}</span>
-</div>
-
-<div class="spacer"></div>
-
-<div>
-<br />
-<table>
-  <tr class="columnheader">
-    <th>{ts}Display Name{/ts}</th>
-    <th>{ts}Amount{/ts}</th>
-    <th>{ts}Source{/ts}</th>
-    <th>{ts}Receive Date{/ts}</th>
-  </tr>
-
-  {foreach from=$rows item=row}
-    <tr class="{cycle values="odd-row,even-row"}">
-        <td>{$row.display_name}</td>
-        <td>{$row.amount}</td>
-        <td>{$row.source}</td>
-        <td>{$row.receive_date}</td>
-    </tr>
-  {/foreach}
-</table>
-</div>
-
-<div class="form-item">
-     <span class="element-right">{$form.buttons.html}</span>
-</div>
-
-{else}
-   <div class="messages status no-popup">
-    {icon icon="fa-info-circle"}{/icon}
-    {ts}There are no records selected.{/ts}
-   </div>
-{/if}
diff --git a/templates/CRM/Event/Form/Task/SearchTaskHookSample.tpl b/templates/CRM/Event/Form/Task/SearchTaskHookSample.tpl
deleted file mode 100644
index 9cfdab000893..000000000000
--- a/templates/CRM/Event/Form/Task/SearchTaskHookSample.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{if $rows}
-<div class="crm-submit-buttons">
-     <span class="element-right">{include file="CRM/common/formButtons.tpl" location="top"}</span>
-</div>
-
-<div class="spacer"></div>
-<div>
-<br />
-<table>
-  <tr class="columnheader">
-    <th>{ts}Display Name{/ts}</th>
-    <th>{ts}Amount{/ts}</th>
-    <th>{ts}Register Date{/ts}</th>
-    <th>{ts}Source{/ts}</th>
-  </tr>
-
-  {foreach from=$rows item=row}
-    <tr class="{cycle values="odd-row,even-row"}">
-        <td class="crm-event-searchtaskhooksample-display_name">{$row.display_name}</td>
-        <td class="crm-event-searchtaskhooksample-amount">{$row.amount}</td>
-        <td class="crm-event-searchtaskhooksample-register_date">{$row.register_date}</td>
-        <td class="crm-event-searchtaskhooksample-source">{$row.source}</td>
-    </tr>
-  {/foreach}
-</table>
-</div>
-
-<div class="crm-submit-buttons">
-     <span class="element-right">{include file="CRM/common/formButtons.tpl" location="bottom"}</span>
-</div>
-
-{else}
-   <div class="messages status no-popup">
-      {icon icon="fa-info-circle"}{/icon}{ts}There are no records selected.{/ts}
-   </div>
-{/if}
diff --git a/templates/CRM/Grant/Form/Task/SearchTaskHookSample.tpl b/templates/CRM/Grant/Form/Task/SearchTaskHookSample.tpl
deleted file mode 100644
index 144ad174ca59..000000000000
--- a/templates/CRM/Grant/Form/Task/SearchTaskHookSample.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{if $rows}
-<div class="crm-submit-buttons element-right">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-
-<div class="spacer"></div>
-
-<div>
-<br />
-<table>
-  <tr class="columnheader">
-    <td>{ts}Display Name{/ts}</td>
-    <td>{ts}Decision Date{/ts}</td>
-    <td>{ts}Amount Requested{/ts}</td>
-    <td>{ts}Amount Granted{/ts}</td>
-  </tr>
-
-  {foreach from=$rows item=row}
-    <tr class="{cycle values="odd-row,even-row"} crm-grant">
-        <td class="crm-grant-task-SearchTaskHookSample-form-block-display_name">{$row.display_name}</td>
-        <td class="crm-grant-task-SearchTaskHookSample-form-block-decision_date">{$row.decision_date}</td>
-        <td class="crm-grant-task-SearchTaskHookSample-form-block-amount_requested">{$row.amount_requested}</td>
-        <td class="crm-grant-task-SearchTaskHookSample-form-block-amount_granted">{$row.amount_granted}</td>
-    </tr>
-  {/foreach}
-</table>
-</div>
-
-<div class="crm-submit-buttons element-right">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-
-{else}
-   <div class="messages status no-popup">
-          {icon icon="fa-info-circle"}{/icon}
-            {ts}There are no records selected.{/ts}
-   </div>
-{/if}

From 8535cf1ca1962c9623d7c16acdc932f3bceabfcb Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 14 Sep 2020 20:18:09 +1200
Subject: [PATCH 251/834] [REF] Start the process of separating the search
 action from the participant form.

A lot code nastiness stems from the overloading of the participant registration form with the search task to register
multiples. A more logical structure would be some shared functionality but separate classes. This starts that
process, but with only the one property now separated to be a class property rather than a derived one. Later efforts
can disentangle which functionality belongs to which class
---
 CRM/Contact/Task.php                          |  2 +-
 CRM/Event/Form/EventFees.php                  |  3 +-
 CRM/Event/Form/Participant.php                | 11 ++---
 CRM/Event/Form/Registration.php               |  2 +-
 CRM/Event/Form/Registration/Register.php      |  7 ++--
 CRM/Event/Form/Task/Register.php              | 40 +++++++++++++++++++
 CRM/Price/BAO/PriceSet.php                    |  2 +-
 .../CRM/Event/Form/Task/RegisterTest.php      | 22 ++++++++++
 8 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 CRM/Event/Form/Task/Register.php
 create mode 100644 tests/phpunit/CRM/Event/Form/Task/RegisterTest.php

diff --git a/CRM/Contact/Task.php b/CRM/Contact/Task.php
index 06696a295305..8832759e3cc0 100644
--- a/CRM/Contact/Task.php
+++ b/CRM/Contact/Task.php
@@ -234,7 +234,7 @@ public static function tasks() {
       if (CRM_Core_Permission::access('CiviEvent')) {
         self::$_tasks[self::ADD_EVENT] = array(
           'title' => ts('Register participants for event'),
-          'class' => 'CRM_Event_Form_Participant',
+          'class' => 'CRM_Event_Form_Task_Register',
         );
       }
 
diff --git a/CRM/Event/Form/EventFees.php b/CRM/Event/Form/EventFees.php
index 14be8ec5f6e8..2b15c288cef9 100644
--- a/CRM/Event/Form/EventFees.php
+++ b/CRM/Event/Form/EventFees.php
@@ -159,6 +159,7 @@ public static function setDefaultValues(&$form) {
       if (in_array(get_class($form),
         [
           'CRM_Event_Form_Participant',
+          'CRM_Event_Form_Task_Register',
           'CRM_Event_Form_Registration_Register',
           'CRM_Event_Form_Registration_AdditionalParticipant',
         ]
@@ -173,7 +174,7 @@ public static function setDefaultValues(&$form) {
         foreach ($form->_priceSet['fields'] as $key => $val) {
           foreach ($val['options'] as $keys => $values) {
             if ($values['is_default']) {
-              if (get_class($form) != 'CRM_Event_Form_Participant' && !empty($values['is_full'])) {
+              if (!in_array(get_class($form), ['CRM_Event_Form_Participant', 'CRM_Event_Form_Task_Register']) && !empty($values['is_full'])) {
                 continue;
               }
 
diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index 5bf815072a32..5697924b8799 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -99,11 +99,14 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment
 
   /**
    * Are we operating in "single mode", i.e. adding / editing only
-   * one participant record, or is this a batch add operation
+   * one participant record, or is this a batch add operation.
+   *
+   * Note the goal is to disentangle all the non-single stuff
+   * to CRM_Event_Form_Task_Register and discontinue this param.
    *
    * @var bool
    */
-  public $_single = FALSE;
+  public $_single = TRUE;
 
   /**
    * If event is paid or unpaid.
@@ -337,8 +340,7 @@ public function preProcess() {
 
     //check the mode when this form is called either single or as
     //search task action
-    if ($this->_id || $this->_contactId || $this->_context == 'standalone') {
-      $this->_single = TRUE;
+    if ($this->_single) {
       $this->assign('urlPath', 'civicrm/contact/view/participant');
       if (!$this->_id && !$this->_contactId) {
         $breadCrumbs = [
@@ -379,7 +381,6 @@ public function preProcess() {
       }
       CRM_Contact_Form_Task::preProcessCommon($this);
 
-      $this->_single = FALSE;
       $this->_contactId = NULL;
 
       //set ajax path, this used for custom data building
diff --git a/CRM/Event/Form/Registration.php b/CRM/Event/Form/Registration.php
index 4b2692e67b51..2d481e486efc 100644
--- a/CRM/Event/Form/Registration.php
+++ b/CRM/Event/Form/Registration.php
@@ -657,7 +657,7 @@ public static function initEventFee(&$form, $eventID, $includeExpiredFields = TR
       }
     }
     if ($isPaidEvent && empty($form->_values['fee'])) {
-      if (CRM_Utils_System::getClassName($form) != 'CRM_Event_Form_Participant') {
+      if (!in_array(CRM_Utils_System::getClassName($form), ['CRM_Event_Form_Participant', 'CRM_Event_Form_Task_Register'])) {
         CRM_Core_Error::statusBounce(ts('No Fee Level(s) or Price Set is configured for this event.<br />Click <a href=\'%1\'>CiviEvent >> Manage Event >> Configure >> Event Fees</a> to configure the Fee Level(s) or Price Set for this event.', [1 => CRM_Utils_System::url('civicrm/event/manage/fee', 'reset=1&action=update&id=' . $form->_eventId)]));
       }
     }
diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php
index 88cea65ebddf..5d39b2a126dc 100644
--- a/CRM/Event/Form/Registration/Register.php
+++ b/CRM/Event/Form/Registration/Register.php
@@ -577,6 +577,7 @@ public static function buildAmount(&$form, $required = TRUE, $discountId = NULL)
         if (CRM_Utils_Array::value('visibility', $field) == 'public' ||
           (CRM_Utils_Array::value('visibility', $field) == 'admin' && $adminFieldVisible == TRUE) ||
           $className == 'CRM_Event_Form_Participant' ||
+          $className === 'CRM_Event_Form_Task_Register' ||
           $className == 'CRM_Event_Form_ParticipantFeeSelection'
         ) {
           $fieldId = $field['id'];
@@ -589,7 +590,7 @@ public static function buildAmount(&$form, $required = TRUE, $discountId = NULL)
 
           //user might modified w/ hook.
           $options = $field['options'] ?? NULL;
-          $formClasses = ['CRM_Event_Form_Participant', 'CRM_Event_Form_ParticipantFeeSelection'];
+          $formClasses = ['CRM_Event_Form_Participant', 'CRM_Event_Form_Task_Register', 'CRM_Event_Form_ParticipantFeeSelection'];
 
           if (!is_array($options)) {
             continue;
@@ -636,7 +637,7 @@ public static function buildAmount(&$form, $required = TRUE, $discountId = NULL)
 
           //CRM-7632, CRM-6201
           $totalAmountJs = NULL;
-          if ($className == 'CRM_Event_Form_Participant') {
+          if ($className == 'CRM_Event_Form_Participant' || $className === 'CRM_Event_Form_Task_Register') {
             $totalAmountJs = ['onClick' => "fillTotalAmount(" . $fee['value'] . ")"];
           }
 
@@ -755,7 +756,7 @@ public static function formatFieldsForOptionFull(&$form) {
       }
 
       //ignore option full for offline registration.
-      if ($className == 'CRM_Event_Form_Participant') {
+      if ($className == 'CRM_Event_Form_Participant' || $className === 'CRM_Event_Form_Task_Register') {
         $optionFullIds = [];
       }
 
diff --git a/CRM/Event/Form/Task/Register.php b/CRM/Event/Form/Task/Register.php
new file mode 100644
index 000000000000..af434f4fd456
--- /dev/null
+++ b/CRM/Event/Form/Task/Register.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * This class provides the register functionality from a search context.
+ *
+ * Originally the functionality was all munged into the main Participant form.
+ *
+ * Ideally it would be entirely separated but for now this overrides the main form,
+ * just providing a better separation of the functionality for the search vs main form.
+ */
+class CRM_Event_Form_Task_Register extends CRM_Event_Form_Participant {
+
+
+  /**
+   * Are we operating in "single mode", i.e. adding / editing only
+   * one participant record, or is this a batch add operation
+   *
+   * ote the goal is to disentangle all the non-single stuff
+   * into this form and discontinue this param.
+   *
+   * @var bool
+   */
+  public $_single = FALSE;
+
+}
diff --git a/CRM/Price/BAO/PriceSet.php b/CRM/Price/BAO/PriceSet.php
index 4bbf042d6c4a..e12716861383 100644
--- a/CRM/Price/BAO/PriceSet.php
+++ b/CRM/Price/BAO/PriceSet.php
@@ -574,7 +574,7 @@ public static function initSet(&$form, $entityTable = 'civicrm_event', $validOnl
         switch ($entityTable) {
           case 'civicrm_event':
             $entity = 'participant';
-            if (CRM_Utils_System::getClassName($form) == 'CRM_Event_Form_Participant') {
+            if (in_array(CRM_Utils_System::getClassName($form), ['CRM_Event_Form_Participant', 'CRM_Event_Form_Task_Register'])) {
               $entityId = $form->_id;
             }
             else {
diff --git a/tests/phpunit/CRM/Event/Form/Task/RegisterTest.php b/tests/phpunit/CRM/Event/Form/Task/RegisterTest.php
new file mode 100644
index 000000000000..8af60e2d2fc0
--- /dev/null
+++ b/tests/phpunit/CRM/Event/Form/Task/RegisterTest.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ *  Test CRM_Event_Form_Registration functions.
+ *
+ * @package   CiviCRM
+ * @group headless
+ */
+class CRM_Event_Form_Task_RegisterTest extends CiviUnitTestCase {
+
+  /**
+   * Initial test of form class.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function testGet() {
+    /* @var CRM_Event_Form_Task_Register $form */
+    $form = $this->getFormObject('CRM_Event_Form_Task_Register');
+    $this->assertEquals(FALSE, $form->_single);
+  }
+
+}

From 9fa2c2ff90f07eb9ce5a7f60f94ca3a249fae16c Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Mon, 14 Sep 2020 18:13:45 +0530
Subject: [PATCH 252/834] Add CC as EntityRef Field, Correct Layout of Email
 invoice, same as downloaded invoice, ADD CC Contact in Activity Details field

---
 CRM/Contribute/Form/Task/Invoice.php | 36 +++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index 419cf483eb05..639872030831 100644
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -15,6 +15,7 @@
  * @copyright CiviCRM LLC https://civicrm.org/licensing
  */
 
+use Civi\Api4\Email;
 /**
  * This class provides the functionality to email a group of
  * contacts.
@@ -144,7 +145,10 @@ public function buildQuickForm() {
     }
 
     $attributes = ['class' => 'huge'];
-    $this->add('text', 'cc_id', ts('CC'), $attributes);
+    $this->addEntityRef('cc_id', ts('CC'), [
+      'entity' => 'Email',
+      'multiple' => TRUE,
+    ]);
     $this->add('text', 'subject', ts('Subject'), $attributes + ['placeholder' => ts('Optional')]);
     $this->add('wysiwyg', 'email_comment', ts('If you would like to add personal message to email please add it here. (If sending to more then one receipient the same message will be sent to each contact.)'), [
       'rows' => 2,
@@ -417,7 +421,27 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
       // from email address
       $fromEmailAddress = $params['from_email_address'] ?? NULL;
       if (!empty($params['cc_id'])) {
-        $values['cc_receipt'] = $params['cc_id'];
+        // get contacts and their emails from email id
+        $emailIDs = $params['cc_id'] ? explode(',', $params['cc_id']) : [];
+        $emails = Email::get()
+          ->addWhere('id', 'IN', $emailIDs)
+          ->setCheckPermissions(FALSE)
+          ->setSelect(['contact_id', 'email', 'contact.sort_name', 'contact.display_name'])->execute();
+        $emailStrings = $contactUrlStrings = [];
+        foreach ($emails as $email) {
+          $emailStrings[] = '"' . $email['contact.sort_name'] . '" <' . $email['email'] . '>';
+          // generate the contact url to put in Activity
+          $contactURL = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'force' => 1, 'cid' => $email['contact_id']], TRUE);
+          $contactUrlStrings[] = "<a href='{$contactURL}'>" . $email['contact.display_name'] . '</a>';
+        }
+        $cc_emails = implode(',', $emailStrings);
+        $values['cc_receipt'] = $cc_emails;
+        $ccContactsDetails = implode(',', $contactUrlStrings);
+        // add CC emails as activity details
+        $params['activity_details'] = "\ncc : " . $ccContactsDetails;
+
+        // unset bcc to avoid unknown email come from online page configuration.
+        unset($values['bcc_receipt']);
       }
 
       // get subject from UI
@@ -456,7 +480,12 @@ public static function printPDF($contribIDs, &$params, $contactIds) {
 
         list($sent, $subject, $message, $html) = CRM_Core_BAO_MessageTemplate::sendTemplate($sendTemplateParams);
         // functions call for adding activity with attachment
-        $fileName = self::putFile($html, $pdfFileName);
+        // make sure page layout is same for email and download invoices.
+        $fileName = self::putFile($html, $pdfFileName, [
+          'margin_top' => 10,
+          'margin_left' => 65,
+          'metric' => 'px',
+        ]);
         self::addActivities($subject, $contribution->contact_id, $fileName, $params, $contribution->id);
       }
       elseif ($contribution->_component == 'event') {
@@ -546,6 +575,7 @@ public static function addActivities($subject, $contactIds, $fileName, $params,
       'target_contact_id' => $contactIds,
       'activity_type_id' => $activityType,
       'activity_date_time' => date('YmdHis'),
+      'details' => $params['activity_details'] ?? NULL,
       'attachFile_1' => [
         'uri' => $fileName,
         'type' => 'application/pdf',

From e80988e1f9304c9e20cc195401075ed87ef1c99f Mon Sep 17 00:00:00 2001
From: Sunil Pawar <sunil@skvare.com>
Date: Mon, 14 Sep 2020 18:27:19 +0530
Subject: [PATCH 253/834] small correction

---
 CRM/Contribute/Form/Task/Invoice.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index 639872030831..41d64d851da7 100644
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -16,6 +16,7 @@
  */
 
 use Civi\Api4\Email;
+
 /**
  * This class provides the functionality to email a group of
  * contacts.

From 73bf38128c9799b1a0ee07287eb845fdbdccf6a2 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 14 Sep 2020 17:03:08 +0100
Subject: [PATCH 254/834] Fix parameters for MembershipTest

---
 tests/phpunit/CRM/Member/Form/MembershipTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 8c5d42578ea3..bc7fad299b8a 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -288,7 +288,7 @@ public function testFormRuleRollingLifetimeEnd() {
   public function testFormRulePermanentOverrideWithNoStatus() {
     $params = [
       'join_date' => date('Y-m-d'),
-      'membership_type_id' => [$this->ids['contact']['organization'], '$this->membershipTypeAnnualFixedID'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'is_override' => TRUE,
     ];
     $files = [];
@@ -301,7 +301,7 @@ public function testFormRulePermanentOverrideWithNoStatus() {
   public function testFormRuleUntilDateOverrideWithValidOverrideEndDate() {
     $params = [
       'join_date' => date('Y-m-d'),
-      'membership_type_id' => [$this->ids['contact']['organization'], '$this->membershipTypeAnnualFixedID'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
       'is_override' => TRUE,
       'status_id' => 1,
       'status_override_end_date' => date('Y-m-d'),

From 8afb20472e567795b65db7fd7becdd3737c9df66 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 10 Sep 2020 11:39:25 -0400
Subject: [PATCH 255/834] Search ext: improve debug output

---
 ext/search/ang/search/crmSearch.component.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 66a14f0f2c10..039e74d99a76 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -169,7 +169,10 @@
         })
           .finally(function() {
             if (ctrl.debug) {
-              ctrl.debug.params = JSON.stringify(ctrl.params, null, 2);
+              ctrl.debug.params = JSON.stringify(_.extend({version: 4}, ctrl.params), null, 2);
+              if (ctrl.debug.timeIndex) {
+                ctrl.debug.timeIndex = Number.parseFloat(ctrl.debug.timeIndex).toPrecision(2);
+              }
             }
           });
       }

From 2c7e2f4b6b195988da15a99566b5f1e3041b9089 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 11 Sep 2020 11:58:52 -0400
Subject: [PATCH 256/834] Search ext: load saved searches

---
 ext/search/CRM/Search/Page/Ang.php            |  2 +-
 ext/search/ang/search.module.js               | 56 ++++++++++++++++---
 ext/search/ang/search/SaveSmartGroup.ctrl.js  | 14 +++--
 ext/search/ang/search/crmSearch.component.js  | 27 +++++++--
 ext/search/ang/search/crmSearch/criteria.html |  8 ++-
 5 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index 2549f622d5b0..e38271a694cd 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -49,7 +49,7 @@ public function run() {
     $loader->setModules(['search']);
     $loader->setPageName('civicrm/search');
     $loader->useApp([
-      'defaultRoute' => '/Contact',
+      'defaultRoute' => '/create/Contact',
     ]);
     $loader->load();
     parent::run();
diff --git a/ext/search/ang/search.module.js b/ext/search/ang/search.module.js
index 3b2eeb34ffe1..ed60680e0020 100644
--- a/ext/search/ang/search.module.js
+++ b/ext/search/ang/search.module.js
@@ -2,27 +2,67 @@
   "use strict";
 
   // Shared between router and searchMeta service
-  var searchEntity;
+  var searchEntity,
+    // For loading saved search
+    savedSearch,
+    undefined;
 
   // Declare module and route/controller/services
   angular.module('search', CRM.angRequires('search'))
 
     .config(function($routeProvider) {
-      $routeProvider.when('/:entity', {
+      $routeProvider.when('/:mode/:entity/:name?', {
         controller: 'searchRoute',
-        template: '<div id="bootstrap-theme" class="crm-search"><crm-search entity="entity"></crm-search></div>',
-        reloadOnSearch: false
+        template: '<div id="bootstrap-theme" class="crm-search"><crm-search ng-if="$ctrl.mode === \'create\'" entity="$ctrl.entity" load=":: $ctrl.savedSearch"></crm-search></div>',
+        reloadOnSearch: false,
+        resolve: {
+          // For paths like /load/Group/MySmartGroup, load the group, stash it in the savedSearch variable, and then redirect
+          // For paths like /create/Contact, return the stashed savedSearch if present
+          savedSearch: function($route, $location, $timeout, crmApi4) {
+            var retrievedSearch = savedSearch,
+              params = $route.current.params;
+            savedSearch = undefined;
+            switch (params.mode) {
+              case 'create':
+                return retrievedSearch;
+
+              case 'load':
+                // In theory savedSearches could be attached to something other than groups, but for now that's not supported
+                if (params.entity !== 'Group' || !params.name) {
+                  throw 'Failed to load ' + params.entity;
+                }
+                return crmApi4(params.entity, 'get', {
+                  select: ['id', 'title', 'saved_search_id', 'saved_search.api_entity', 'saved_search.api_params'],
+                  where: [['name', '=', params.name]]
+                }, 0).then(function(retrieved) {
+                  savedSearch = {
+                    type: params.entity,
+                    id: retrieved.id,
+                    title: retrieved.title,
+                    saved_search_id: retrieved.saved_search_id,
+                    api_params: retrieved['saved_search.api_params']
+                  };
+                  $timeout(function() {
+                    $location.url('/create/' + retrieved['saved_search.api_entity']);
+                  });
+                });
+            }
+          }
+        }
       });
     })
 
     // Controller binds entity to route
-    .controller('searchRoute', function($scope, $routeParams, $location) {
-      searchEntity = $scope.entity = $routeParams.entity;
+    .controller('searchRoute', function($scope, $routeParams, $location, savedSearch) {
+      searchEntity = this.entity = $routeParams.entity;
+      this.mode = $routeParams.mode;
+      this.savedSearch = savedSearch;
+      $scope.$ctrl = this;
 
       // Changing entity will refresh the angular page
-      $scope.$watch('entity', function(newEntity, oldEntity) {
+      $scope.$watch('$ctrl.entity', function(newEntity, oldEntity) {
         if (newEntity && oldEntity && newEntity !== oldEntity) {
-          $location.url('/' + newEntity);
+          $location.url('/create/' + newEntity);
         }
       });
     })
diff --git a/ext/search/ang/search/SaveSmartGroup.ctrl.js b/ext/search/ang/search/SaveSmartGroup.ctrl.js
index 74401b984731..18b0298e96f7 100644
--- a/ext/search/ang/search/SaveSmartGroup.ctrl.js
+++ b/ext/search/ang/search/SaveSmartGroup.ctrl.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
   "use strict";
 
-  angular.module('search').controller('SaveSmartGroup', function ($scope, crmApi4, dialogService) {
+  angular.module('search').controller('SaveSmartGroup', function ($scope, $element, crmApi4, dialogService) {
     var ts = $scope.ts = CRM.ts(),
       model = $scope.model;
     $scope.groupEntityRefParams = {
@@ -23,9 +23,15 @@
       administerReservedGroups: CRM.checkPerm('administer reserved groups')
     };
     $scope.groupFields = _.indexBy(_.find(CRM.vars.search.schema, {name: 'Group'}).fields, 'name');
-    $scope.$watch('model.id', function (id) {
-      if (id) {
-        _.assign(model, $('#api-save-search-select-group').select2('data').extra);
+    $element.on('change', '#api-save-search-select-group', function() {
+      if ($(this).val()) {
+        $scope.$apply(function() {
+          var group = $('#api-save-search-select-group').select2('data').extra;
+          model.saved_search_id = group.saved_search_id;
+          model.description = group.description || '';
+          model.group_type = group.group_type || [];
+          model.visibility = group.visibility;
+        });
       }
     });
     $scope.cancel = function () {
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 039e74d99a76..30ebfa99c352 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -3,7 +3,8 @@
 
   angular.module('search').component('crmSearch', {
     bindings: {
-      entity: '='
+      entity: '=',
+      load: '<'
     },
     templateUrl: '~/search/crmSearch.html',
     controller: function($scope, $element, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
@@ -244,6 +245,9 @@
             ctrl.stale = true;
           }
         }
+        if (ctrl.load) {
+          ctrl.load.saved = false;
+        }
       }
 
       function onChangeOrderBy() {
@@ -255,6 +259,9 @@
       function onChangeFilters() {
         ctrl.stale = true;
         ctrl.selectedRows.length = 0;
+        if (ctrl.load) {
+          ctrl.load.saved = false;
+        }
         if (ctrl.autoSearch) {
           ctrl.refreshAll();
         }
@@ -526,6 +533,13 @@
         }
         $scope.$watch('$ctrl.params.having', onChangeFilters, true);
 
+        if (this.load) {
+          this.params = this.load.api_params;
+          $timeout(function() {
+            ctrl.load.saved = true;
+          });
+        }
+
         loadFieldOptions();
       };
 
@@ -540,16 +554,21 @@
           description: '',
           visibility: 'User and User Admin Only',
           group_type: [],
-          id: null,
+          id: ctrl.load ? ctrl.load.id : null,
           entity: ctrl.entity,
-          params: angular.extend({}, ctrl.params, {version: 4, select: [selectField]})
+          params: angular.extend({}, ctrl.params, {version: 4})
         };
         delete model.params.orderBy;
         var options = CRM.utils.adjustDialogDefaults({
           autoOpen: false,
           title: ts('Save smart group')
         });
-        dialogService.open('saveSearchDialog', '~/search/saveSmartGroup.html', model, options);
+        dialogService.open('saveSearchDialog', '~/search/saveSmartGroup.html', model, options)
+          .then(function() {
+            if (ctrl.load) {
+              ctrl.load.saved = true;
+            }
+          });
       };
     }
   });
diff --git a/ext/search/ang/search/crmSearch/criteria.html b/ext/search/ang/search/crmSearch/criteria.html
index 6bb500a7419f..a142e498c597 100644
--- a/ext/search/ang/search/crmSearch/criteria.html
+++ b/ext/search/ang/search/crmSearch/criteria.html
@@ -2,7 +2,7 @@
   <div>
     <div class="form-inline">
       <label for="crm-search-main-entity">{{:: ts('Search for') }}</label>
-      <input id="crm-search-main-entity" class="form-control" ng-model="$ctrl.entity" crm-ui-select="::{allowClear: false, data: entities}" ng-change="changeEntity()" />
+      <input id="crm-search-main-entity" class="form-control" ng-model="$ctrl.entity" crm-ui-select="::{allowClear: false, data: entities}" />
     </div>
     <div ng-if=":: $ctrl.paramExists('join')">
       <fieldset ng-repeat="join in $ctrl.params.join">
@@ -40,6 +40,12 @@
     </fieldset>
   </div>
   <div>
+    <div class="navbar-form clearfix" ng-if="$ctrl.load">
+      <div class="form-group pull-right">
+        <label>{{ $ctrl.load.title }}</label>
+        <button class="btn btn-default" ng-disabled="$ctrl.load.saved" ng-click="saveGroup()">{{ $ctrl.load.saved ? ts('Saved') : ts('Save') }}</button>
+      </div>
+    </div>
     <fieldset class="api4-clause-fieldset" crm-search-clause="{format: 'string', clauses: $ctrl.params.where, op: 'AND', label: ts('Where'), fields: fieldsForWhere}">
     </fieldset>
     <fieldset ng-if="$ctrl.paramExists('having') && $ctrl.params.groupBy.length" class="api4-clause-fieldset" crm-search-clause="{format: 'string', clauses: $ctrl.params.having, op: 'AND', label: ts('Filter'), fields: fieldsForHaving}">

From 4cb27797ea99ca5e8b6318d3a45f56048d0d7bdf Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 11 Sep 2020 13:58:43 -0400
Subject: [PATCH 257/834] Update links to APIv4 smart groups to point to the
 new search ext

---
 CRM/Contact/BAO/SavedSearch.php               | 33 +++++++++++++++++--
 CRM/Contact/Form/Search.php                   |  5 ++-
 CRM/Group/Form/Edit.php                       |  9 +----
 templates/CRM/Contact/Form/Search/Basic.hlp   | 13 --------
 templates/CRM/Contact/Form/Search/Intro.tpl   | 11 +------
 .../CRM/Contact/Form/Search/ResultTasks.tpl   |  2 +-
 templates/CRM/Group/Form/Edit.tpl             | 11 ++-----
 7 files changed, 38 insertions(+), 46 deletions(-)

diff --git a/CRM/Contact/BAO/SavedSearch.php b/CRM/Contact/BAO/SavedSearch.php
index c5cd15e6e4df..d2ed700e7dcd 100644
--- a/CRM/Contact/BAO/SavedSearch.php
+++ b/CRM/Contact/BAO/SavedSearch.php
@@ -54,9 +54,9 @@ public function getAll() {
    * @param array $defaults
    *   (reference ) an assoc array to hold the flattened values.
    *
-   * @return CRM_Contact_BAO_SavedSearch
+   * @return CRM_Contact_DAO_SavedSearch
    */
-  public static function retrieve(&$params, &$defaults) {
+  public static function retrieve($params, &$defaults = []) {
     $savedSearch = new CRM_Contact_DAO_SavedSearch();
     $savedSearch->copyValues($params);
     if ($savedSearch->find(TRUE)) {
@@ -422,4 +422,33 @@ public static function decodeRelativeFields(&$formValues, $fieldName, $op, $valu
     }
   }
 
+  /**
+   * Generate a url to the appropriate search form for a given savedSearch
+   *
+   * @param int $id
+   *   Saved search id
+   * @return string
+   */
+  public static function getEditSearchUrl($id) {
+    $savedSearch = self::retrieve(['id' => $id]);
+    // APIv4 search
+    if (!empty($savedSearch->api_entity)) {
+      $groupName = self::getName($id);
+      return CRM_Utils_System::url('civicrm/search', NULL, FALSE, "/load/Group/$groupName");
+    }
+    // Classic search builder
+    if (!empty($savedSearch->mapping_id)) {
+      $path = 'civicrm/contact/search/builder';
+    }
+    // Classic custom search
+    elseif (!empty($savedSearch->search_custom_id)) {
+      $path = 'civicrm/contact/search/custom';
+    }
+    // Classic advanced search
+    else {
+      $path = 'civicrm/contact/search/advanced';
+    }
+    return CRM_Utils_System::url($path, ['reset' => 1, 'ssID' => $id]);
+  }
+
 }
diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php
index af5e9f821310..d41d16bb6cd8 100644
--- a/CRM/Contact/Form/Search.php
+++ b/CRM/Contact/Form/Search.php
@@ -429,11 +429,10 @@ public function buildQuickForm() {
         $ssID = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Group', $this->_groupID, 'saved_search_id');
         $this->assign('ssID', $ssID);
 
-        //get the saved search mapping id
+        //get the saved search edit link
         if ($ssID) {
           $this->_ssID = $ssID;
-          $ssMappingId = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_SavedSearch', $ssID, 'mapping_id');
-          $this->assign('ssMappingID', $ssMappingId);
+          $this->assign('editSmartGroupURL', CRM_Contact_BAO_SavedSearch::getEditSearchUrl($ssID));
         }
 
         // Set dynamic page title for 'Show Members of Group'
diff --git a/CRM/Group/Form/Edit.php b/CRM/Group/Form/Edit.php
index e384dc36cc7f..2fb7d2199d88 100644
--- a/CRM/Group/Form/Edit.php
+++ b/CRM/Group/Form/Edit.php
@@ -137,14 +137,7 @@ public function preProcess() {
           'saved_search_id' => $this->_groupValues['saved_search_id'] ?? '',
         );
         if (isset($this->_groupValues['saved_search_id'])) {
-          $groupValues['mapping_id'] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_SavedSearch',
-            $this->_groupValues['saved_search_id'],
-            'mapping_id'
-          );
-          $groupValues['search_custom_id'] = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_SavedSearch',
-            $this->_groupValues['saved_search_id'],
-            'search_custom_id'
-          );
+          $this->assign('editSmartGroupURL', CRM_Contact_BAO_SavedSearch::getEditSearchUrl($this->_groupValues['saved_search_id']));
         }
         if (!empty($this->_groupValues['created_id'])) {
           $groupValues['created_by'] = CRM_Core_DAO::getFieldValue("CRM_Contact_DAO_Contact", $this->_groupValues['created_id'], 'sort_name', 'id');
diff --git a/templates/CRM/Contact/Form/Search/Basic.hlp b/templates/CRM/Contact/Form/Search/Basic.hlp
index 4fceec8fc9c9..5d84d1f7f717 100644
--- a/templates/CRM/Contact/Form/Search/Basic.hlp
+++ b/templates/CRM/Contact/Form/Search/Basic.hlp
@@ -26,19 +26,6 @@
         <li>{ts}Use the 'Group Status...' checkboxes to view contacts with 'Pending' status and/or contacts who have been 'Removed' from this group.{/ts}</li>
       </ul>
     </p>
-    {if $params.permissionedForGroup}
-        {capture assign=addMembersURL}{crmURL q="context=amtg&amtgID=`$params.group_id`&reset=1"}{/capture}
-        <p>{ts 1=$addMembersURL 2=$params.group_title}Click <a href='%1'>Add Contacts to %2</a> if you want to add contacts to this group.{/ts}
-        {if !empty($params.ssID)}
-            {if $params.ssMappingID}
-                {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/builder" q="reset=1&force=1&ssID=`$params.ssID`"}{/capture}
-            {else}
-                {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&force=1&ssID=`$params.ssID`"}{/capture}
-            {/if} 
-            {ts 1=$editSmartGroupURL}Click <a href='%1'>Edit Smart Group Search Criteria...</a> to change the search query used for this 'smart' group.{/ts}
-        {/if}
-        </p>
-    {/if}
 {/htxt}
 
 {htxt id="id-amtg-criteria-title"}
diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl
index adc70018d03a..8cbfb012cf7b 100644
--- a/templates/CRM/Contact/Form/Search/Intro.tpl
+++ b/templates/CRM/Contact/Form/Search/Intro.tpl
@@ -11,20 +11,11 @@
 {* smog = 'show members of group'; amtg = 'add members to group' *}
 {if $context EQ 'smog'}
   {* Provide link to modify smart group search criteria if we are viewing a smart group (ssID = saved search ID) *}
-  {if $permissionEditSmartGroup}
-    {if !empty($ssID)}
-      {if $ssMappingID}
-        {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/builder" q="reset=1&ssID=`$ssID`"}{/capture}
-      {elseif $savedSearch.search_custom_id}
-        {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/custom" q="reset=1&ssID=`$ssID`"}{/capture}
-      {else}
-        {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&ssID=`$ssID`"}{/capture}
-      {/if}
+  {if $permissionEditSmartGroup && !empty($editSmartGroupURL)}
       <div class="crm-submit-buttons">
         <a href="{$editSmartGroupURL}" class="button no-popup"><span><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts}</span></a>
         {help id="id-edit-smartGroup"}
       </div>
-    {/if}
   {/if}
 
   {if $permissionedForGroup}
diff --git a/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/templates/CRM/Contact/Form/Search/ResultTasks.tpl
index 1e3e0df3cca7..28ca892fa15e 100644
--- a/templates/CRM/Contact/Form/Search/ResultTasks.tpl
+++ b/templates/CRM/Contact/Form/Search/ResultTasks.tpl
@@ -23,7 +23,7 @@
             <a href="{$searchBuilderURL}"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Search Builder{/ts}</a><br />
         {/if}
         {if $context eq 'smog'}
-            {help id="id-smog-criteria" group_id=$group.id group_title=$group.title ssID=$ssID ssMappingID=$ssMappingID permissionedForGroup=$permissionedForGroup}
+            {help id="id-smog-criteria" group_title=$group.title}
         {elseif $context eq 'amtg'}
             {help id="id-amtg-criteria" group_title=$group.title}
         {else}
diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl
index 42b82ac93e79..fb46c69e9bc9 100644
--- a/templates/CRM/Group/Form/Edit.tpl
+++ b/templates/CRM/Group/Form/Edit.tpl
@@ -83,16 +83,9 @@
   {if $action neq 1}
     <div class="action-link">
       <a {$crmURL}><i class="crm-i fa-users" aria-hidden="true"></i> {ts}Contacts in this Group{/ts}</a>
-      {if $group.saved_search_id}
+      {if $editSmartGroupURL}
         <br />
-        {if $group.mapping_id}
-          <a class="no-popup" href="{crmURL p="civicrm/contact/search/builder" q="reset=1&ssID=`$group.saved_search_id`"}"><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit Smart Group Criteria{/ts}</a>
-        {elseif $group.search_custom_id}
-          <a class="no-popup" href="{crmURL p="civicrm/contact/search/custom" q="reset=1&ssID=`$group.saved_search_id`"}"><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit Smart Group Criteria{/ts}</a>
-        {else}
-          <a class="no-popup" href="{crmURL p="civicrm/contact/search/advanced" q="reset=1&ssID=`$group.saved_search_id`"}"><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit Smart Group Criteria{/ts}</a>
-        {/if}
-
+        <a class="no-popup" href="{$editSmartGroupURL}"><i class="crm-i fa-pencil" aria-hidden="true"></i> {ts}Edit Smart Group Criteria{/ts}</a>
       {/if}
     </div>
   {/if}

From 3495fe676d93f71ea41054f192af1e9e7f65a142 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 11 Sep 2020 14:18:11 -0400
Subject: [PATCH 258/834] APIv4 Explorer: Only show result length if result is
 array

---
 ang/api4Explorer/Explorer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ang/api4Explorer/Explorer.js b/ang/api4Explorer/Explorer.js
index 41750691c61c..7c64b6e6671c 100644
--- a/ang/api4Explorer/Explorer.js
+++ b/ang/api4Explorer/Explorer.js
@@ -791,7 +791,7 @@
           $scope.debug = debugFormat(resp.data);
           $scope.result = [
             formatMeta(resp.data),
-            prettyPrintOne('(' + resp.data.values.length + ') ' + _.escape(JSON.stringify(resp.data.values, null, 2)), 'js', 1)
+            prettyPrintOne((_.isArray(resp.data.values) ? '(' + resp.data.values.length + ') ' : '') + _.escape(JSON.stringify(resp.data.values, null, 2)), 'js', 1)
           ];
         }, function(resp) {
           $scope.loading = false;

From 9573d2c52f5a32b7f3dd6ee8c6f9caebda2a871f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 15 Sep 2020 08:49:07 +1200
Subject: [PATCH 259/834] dev/core#1921 Remove iso convert

relevant tests
api_v3_CaseTest.testCaseActivityUpdate_Tracked
api_v3_CaseTest.testCaseActivityUpdateCustom
---
 CRM/Activity/Page/AJAX.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php
index 65262d50f96f..f61df22bb478 100644
--- a/CRM/Activity/Page/AJAX.php
+++ b/CRM/Activity/Page/AJAX.php
@@ -275,7 +275,7 @@ public static function _convertToCaseActivity($params) {
     if (!$otherActivity->find(TRUE)) {
       return (['error_msg' => 'activity record is missing.']);
     }
-    $actDateTime = CRM_Utils_Date::isoToMysql($otherActivity->activity_date_time);
+    $actDateTime = $otherActivity->activity_date_time;
 
     // Create new activity record.
     $mainActivity = new CRM_Activity_DAO_Activity();

From 629c4d302f478ea7591f6d21b212cad55b5d3a15 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 15 Sep 2020 08:55:42 +1200
Subject: [PATCH 260/834] dev/core#1921 Further removal of iso date handling

Overview
----------------------------------------
Same deal as https://github.com/civicrm/civicrm-core/pull/18359

Before
----------------------------------------
Casting to ISO date to avoid 2014 bug

After
----------------------------------------
We are stuck in 2020

Technical Details
----------------------------------------

Comments
----------------------------------------
relevant tests
api_v3_CaseTest::testCaseMerge
---
 CRM/Case/BAO/Case.php             | 2 +-
 tests/phpunit/api/v3/CaseTest.php | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php
index e78e55923653..96a511e69bc9 100644
--- a/CRM/Case/BAO/Case.php
+++ b/CRM/Case/BAO/Case.php
@@ -2070,7 +2070,7 @@ public static function mergeCases(
         CRM_Core_DAO::storeValues($otherActivity, $mainActVals);
         $mainActivity->copyValues($mainActVals);
         $mainActivity->id = NULL;
-        $mainActivity->activity_date_time = CRM_Utils_Date::isoToMysql($otherActivity->activity_date_time);
+        $mainActivity->activity_date_time = $otherActivity->activity_date_time;
         $mainActivity->source_record_id = CRM_Utils_Array::value($mainActivity->source_record_id,
           $activityMappingIds
         );
diff --git a/tests/phpunit/api/v3/CaseTest.php b/tests/phpunit/api/v3/CaseTest.php
index efd080234293..a362e8592928 100644
--- a/tests/phpunit/api/v3/CaseTest.php
+++ b/tests/phpunit/api/v3/CaseTest.php
@@ -1003,19 +1003,17 @@ public function testCaseAddtimeline($enableRevisions) {
    * Test the case merge function.
    *
    * 2 cases should be mergeable into 1
-   *
-   * @throws \Exception
    */
   public function testCaseMerge() {
     $contact1 = $this->individualCreate([], 1);
     $case1 = $this->callAPISuccess('Case', 'create', [
       'contact_id' => $contact1,
-      'subject' => "Test case 1",
+      'subject' => 'Test case 1',
       'case_type_id' => $this->caseTypeId,
     ]);
     $case2 = $this->callAPISuccess('Case', 'create', [
       'contact_id' => $contact1,
-      'subject' => "Test case 2",
+      'subject' => 'Test case 2',
       'case_type_id' => $this->caseTypeId,
     ]);
     $result = $this->callAPISuccess('Case', 'getcount', ['contact_id' => $contact1]);

From a51ff74119e5da9bb0a8225615d45da65a9e6aa7 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 15 Sep 2020 13:16:52 +1200
Subject: [PATCH 261/834] dev/core#2032 Add potential to vary query log files
 per process

This might be  a bit too hacky but I thought I'd put it up for consideration. Basically we have 3 existing
options for CIVICRM_DEBUG_LOG_QUERY

1) FALSE = do nothing (5.30 + or same as TRUE for earlier versions
2) backtrace = log a full backtrace
3) anything else - log the sql query

This takes a bit of leeway with the 'everything else' and includes the value a part of the
prefix for writing to the query log - allowing something like

``
env CIVICRM_DEBUG_LOG_QUERY=test_2 drush mycommand
``

Which would result in the created log file having a name like
```
CiviCRM.sql_log_test_2.7a880382d2e1d80611365ce1.log
```
---
 CRM/Core/Error.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index 98d1a29ded92..aced775beedd 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -608,7 +608,7 @@ public static function debug_query($string) {
       CRM_Core_Error::backtrace($string, TRUE);
     }
     elseif (CIVICRM_DEBUG_LOG_QUERY) {
-      CRM_Core_Error::debug_var('Query', $string, TRUE, TRUE, 'sql_log', PEAR_LOG_DEBUG);
+      CRM_Core_Error::debug_var('Query', $string, TRUE, TRUE, 'sql_log' . CIVICRM_DEBUG_LOG_QUERY, PEAR_LOG_DEBUG);
     }
   }
 

From 8a5f52de3df220f7f4e1bab73cafc4b6b0925f0c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 20:59:01 -0700
Subject: [PATCH 262/834] dev/core#1393, dev/core#1990 - Assert that
 Drupal-style tarballs have no symlinks

---
 distmaker/dists/backdrop_php5.sh  |  1 +
 distmaker/dists/common.sh         | 12 ++++++++++++
 distmaker/dists/drupal6_php5.sh   |  1 +
 distmaker/dists/drupal_php5.sh    |  1 +
 distmaker/dists/drupal_sk_php5.sh |  1 +
 5 files changed, 16 insertions(+)

diff --git a/distmaker/dists/backdrop_php5.sh b/distmaker/dists/backdrop_php5.sh
index 65d8fb899d9f..59f85c14e110 100644
--- a/distmaker/dists/backdrop_php5.sh
+++ b/distmaker/dists/backdrop_php5.sh
@@ -28,6 +28,7 @@ dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball
 cd $TRG/..
+dm_assert_no_symlinks civicrm
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-backdrop.tar.gz civicrm
 
 # clean up
diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index cf6bcd9350a9..dc2cd9a65a41 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -10,6 +10,18 @@ function dm_reset_dirs() {
   mkdir -p "$@"
 }
 
+## Assert that a folder contains no symlinks
+##
+## ex: dev/core#1393, dev/core#1990
+## usage: dm_assert_no_symlinks <basedir>
+function dm_assert_no_symlinks() {
+  local SYMLINKS=$( find "$1" -type l )
+  if [ -n "$SYMLINKS" ]; then
+    echo "ERROR: Folder $1 contains unexpected symlink(s): $SYMLINKS"
+    exit 10
+  fi
+}
+
 ## Copy files from one dir into another dir
 ## usage: dm_install_dir <from-dir> <to-dir>
 function dm_install_dir() {
diff --git a/distmaker/dists/drupal6_php5.sh b/distmaker/dists/drupal6_php5.sh
index 2ecb1a2b1447..6c9d94cc7893 100755
--- a/distmaker/dists/drupal6_php5.sh
+++ b/distmaker/dists/drupal6_php5.sh
@@ -28,6 +28,7 @@ dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball
 cd $TRG/..
+dm_assert_no_symlinks civicrm
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-drupal6.tar.gz civicrm
 
 # clean up
diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index 7245be3fe847..64e5f9aa4bbb 100755
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -28,6 +28,7 @@ dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
 
 # gen tarball
 cd $TRG/..
+dm_assert_no_symlinks civicrm
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-drupal.tar.gz civicrm
 
 # clean up
diff --git a/distmaker/dists/drupal_sk_php5.sh b/distmaker/dists/drupal_sk_php5.sh
index b375d2ad2837..4419053ac0a5 100755
--- a/distmaker/dists/drupal_sk_php5.sh
+++ b/distmaker/dists/drupal_sk_php5.sh
@@ -36,6 +36,7 @@ rm -rf $TRG/packages/tinymce
 
 # gen tarball
 cd $TRG/..
+dm_assert_no_symlinks civicrm
 tar czf $DM_TARGETDIR/civicrm-$DM_VERSION-starterkit.tgz civicrm
 
 # clean up

From 48cd94bb6cb73dcbc98c7f20732c76d9cb9f69ae Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 19:58:36 -0700
Subject: [PATCH 263/834] dev/core#1393, dev/core#1990 - Exclude README.rst
 symlink

---
 distmaker/dists/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index dc2cd9a65a41..0b7e42ed5dfe 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -200,7 +200,7 @@ function dm_install_vendor() {
 
   local excludes_rsync=""
   ## CRM-21729 - .idea test-cases unit-test come from phpquery package.
-  for exclude in .git .svn {T,t}est{,s} {D,d}oc{,s} {E,e}xample{,s} .idea test-cases unit-test; do
+  for exclude in .git .svn {T,t}est{,s} {D,d}oc{,s} {E,e}xample{,s} .idea test-cases unit-test README.rst; do
     excludes_rsync="--exclude=${exclude} ${excludes_rsync}"
   done
 

From b667ca8be1a7cd0016dc99a3f571d5a56130abe9 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Tue, 15 Sep 2020 13:57:24 -0400
Subject: [PATCH 264/834] DB is no longer in packages, now autoloaded from
 vendor

---
 install/civicrm.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/install/civicrm.php b/install/civicrm.php
index e68861340392..5b6dcb263a61 100644
--- a/install/civicrm.php
+++ b/install/civicrm.php
@@ -131,8 +131,6 @@ function civicrm_main(&$config) {
 function civicrm_source($dsn, $fileName, $lineMode = FALSE) {
   global $crmPath;
 
-  require_once "$crmPath/packages/DB.php";
-
   // CRM-19699 See also CRM_Core_DAO for PHP7 mysqli compatiblity.
   // Duplicated here because this is not using CRM_Core_DAO directly
   // and this function may be called directly from Drush.

From 98d31ddf9c8bcfa50dae8d4baaa9df56a1b394a6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 11:08:24 +1200
Subject: [PATCH 265/834] [NFC] Remove trailing whitespace

---
 sql/test_data_second_domain.mysql | 402 +++++++++++++++---------------
 1 file changed, 201 insertions(+), 201 deletions(-)

diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql
index f87b4519b797..c9dd5008dac2 100644
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -87,32 +87,32 @@ SET @searchlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
-    ( @domainID, 'civicrm/contact/search&reset=1',                          'Find Contacts',      'Find Contacts', NULL, '',                      @searchlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/contact/search/advanced&reset=1',                 'Advanced Search',    'Advanced Search', NULL, '', @searchlastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/contact/search/custom&csid=15&reset=1',           'Full-text Search',   'Full-text Search', NULL, '',                   @searchlastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/contact/search/builder&reset=1',                  'Search Builder',     'Search Builder', NULL, '',                     @searchlastID, '1', '1',  4 ), 
-    ( @domainID, 'civicrm/case/search&reset=1',                             'Find Cases',         'Find Cases', 'access my cases and activities,access all cases and activities', 'OR',            @searchlastID, '1', NULL, 5 ), 
-    ( @domainID, 'civicrm/contribute/search&reset=1',                       'Find Contributions', 'Find Contributions', 'access CiviContribute', '',  @searchlastID, '1', NULL, 6 ), 
-    ( @domainID, 'civicrm/mailing&reset=1',                                 'Find Mailings',      'Find Mailings', 'access CiviMail', '',         @searchlastID, '1', NULL, 7 ), 
-    ( @domainID, 'civicrm/member/search&reset=1',                           'Find Memberships',   'Find Memberships', 'access CiviMember', '',        @searchlastID, '1', NULL, 8 ), 
-    ( @domainID, 'civicrm/event/search&reset=1',                            'Find Participants',  'Find Participants',  'access CiviEvent', '',   @searchlastID, '1', NULL, 9 ), 
+    ( @domainID, 'civicrm/contact/search&reset=1',                          'Find Contacts',      'Find Contacts', NULL, '',                      @searchlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/contact/search/advanced&reset=1',                 'Advanced Search',    'Advanced Search', NULL, '', @searchlastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/contact/search/custom&csid=15&reset=1',           'Full-text Search',   'Full-text Search', NULL, '',                   @searchlastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/contact/search/builder&reset=1',                  'Search Builder',     'Search Builder', NULL, '',                     @searchlastID, '1', '1',  4 ),
+    ( @domainID, 'civicrm/case/search&reset=1',                             'Find Cases',         'Find Cases', 'access my cases and activities,access all cases and activities', 'OR',            @searchlastID, '1', NULL, 5 ),
+    ( @domainID, 'civicrm/contribute/search&reset=1',                       'Find Contributions', 'Find Contributions', 'access CiviContribute', '',  @searchlastID, '1', NULL, 6 ),
+    ( @domainID, 'civicrm/mailing&reset=1',                                 'Find Mailings',      'Find Mailings', 'access CiviMail', '',         @searchlastID, '1', NULL, 7 ),
+    ( @domainID, 'civicrm/member/search&reset=1',                           'Find Memberships',   'Find Memberships', 'access CiviMember', '',        @searchlastID, '1', NULL, 8 ),
+    ( @domainID, 'civicrm/event/search&reset=1',                            'Find Participants',  'Find Participants',  'access CiviEvent', '',   @searchlastID, '1', NULL, 9 ),
     ( @domainID, 'civicrm/pledge/search&reset=1',                           'Find Pledges',       'Find Pledges', 'access CiviPledge', '',        @searchlastID, '1', NULL, 10 ),
     ( @domainID, 'civicrm/activity/search&reset=1',                         'Find Activities',    'Find Activities', NULL,  '',                   @searchlastID, '1', '1',  11 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, 'civicrm/contact/search/custom/list&reset=1',              'Custom Searches', 'Custom Searches', NULL, '',                 @searchlastID, '1', NULL, 12 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES 
+VALUES
     ( @domainID, NULL,  'Contacts', 'Contacts', NULL, '', NULL, '1', NULL, 20 );
 
 SET @contactlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES        
+VALUES
     ( @domainID, 'civicrm/contact/add&reset=1&ct=Individual',       'New Individual',         'New Individual',       'add contacts',     '',             @contactlastID, '1', NULL,  1 ),
     ( @domainID, 'civicrm/contact/add&reset=1&ct=Household',        'New Household',          'New Household',        'add contacts',     '',             @contactlastID, '1', NULL,  2 ),
        ( @domainID, 'civicrm/contact/add&reset=1&ct=Organization',  'New Organization',       'New Organization',     'add contacts',     '',             @contactlastID, '1', 1,     3 );
@@ -121,100 +121,100 @@ VALUES
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
-    ( @domainID, 'civicrm/activity&reset=1&action=add&context=standalone',  'New Activity',           'New Activity',         NULL,               '',             @contactlastID, '1', NULL,  4 ), 
-    ( @domainID, 'civicrm/activity/email/add&atype=3&action=add&reset=1&context=standalone', 'New Email',   'New Email',      NULL,               '',             @contactlastID, '1', '1',   5 ), 
-    ( @domainID, 'civicrm/import/contact&reset=1',                          'Import Contacts',        'Import Contacts',      'import contacts',  '',             @contactlastID, '1', NULL,  6 ), 
-    ( @domainID, 'civicrm/import/activity&reset=1',                         'Import Activities',      'Import Activities',    'import contacts',  '',             @contactlastID, '1', '1',   7 ), 
-    ( @domainID, 'civicrm/group/add&reset=1',                               'New Group',              'New Group',            'edit groups',      '',             @contactlastID, '1', NULL,  8 ), 
-    ( @domainID, 'civicrm/group&reset=1',                                   'Manage Groups',          'Manage Groups',        'access CiviCRM',   '',             @contactlastID, '1', '1',   9 ), 
-    ( @domainID, 'civicrm/admin/tag&reset=1&action=add',                    'New Tag',                'New Tag',              'administer CiviCRM', '',           @contactlastID, '1', NULL, 10 ), 
+    ( @domainID, 'civicrm/activity&reset=1&action=add&context=standalone',  'New Activity',           'New Activity',         NULL,               '',             @contactlastID, '1', NULL,  4 ),
+    ( @domainID, 'civicrm/activity/email/add&atype=3&action=add&reset=1&context=standalone', 'New Email',   'New Email',      NULL,               '',             @contactlastID, '1', '1',   5 ),
+    ( @domainID, 'civicrm/import/contact&reset=1',                          'Import Contacts',        'Import Contacts',      'import contacts',  '',             @contactlastID, '1', NULL,  6 ),
+    ( @domainID, 'civicrm/import/activity&reset=1',                         'Import Activities',      'Import Activities',    'import contacts',  '',             @contactlastID, '1', '1',   7 ),
+    ( @domainID, 'civicrm/group/add&reset=1',                               'New Group',              'New Group',            'edit groups',      '',             @contactlastID, '1', NULL,  8 ),
+    ( @domainID, 'civicrm/group&reset=1',                                   'Manage Groups',          'Manage Groups',        'access CiviCRM',   '',             @contactlastID, '1', '1',   9 ),
+    ( @domainID, 'civicrm/admin/tag&reset=1&action=add',                    'New Tag',                'New Tag',              'administer CiviCRM', '',           @contactlastID, '1', NULL, 10 ),
     ( @domainID, 'civicrm/admin/tag&reset=1',                               'Manage Tags (Categories)', 'Manage Tags (Categories)', 'administer CiviCRM', '',     @contactlastID, '1','1', 11 ),
     ( @domainID, 'civicrm/contact/deduperules&reset=1',  'Find and Merge Duplicate Contacts', 'Find and Merge Duplicate Contacts', 'administer dedupe rules,merge duplicate contacts', 'OR', @contactlastID, '1', NULL, 12 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL,  'Contributions', 'Contributions', 'access CiviContribute', '',      NULL,           '1', NULL,  30 );
 
 SET @contributionlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
-    ( @domainID, 'civicrm/contribute&reset=1',                              'Dashboard',              'Dashboard',              'access CiviContribute', '', @contributionlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/contribute/add&reset=1&action=add&context=standalone', 'New Contribution',  'New Contribution',       'access CiviContribute,edit contributions', 'AND', @contributionlastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/contribute/search&reset=1',                       'Find Contributions',     'Find Contributions',     'access CiviContribute', '', @contributionlastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/batch&reset=1',                       'Batches',     'Batches',             'access CiviContribute,access CiviMember', '', @contributionlastID, '1', NULL, 4 ), 
+VALUES
+    ( @domainID, 'civicrm/contribute&reset=1',                              'Dashboard',              'Dashboard',              'access CiviContribute', '', @contributionlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/contribute/add&reset=1&action=add&context=standalone', 'New Contribution',  'New Contribution',       'access CiviContribute,edit contributions', 'AND', @contributionlastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/contribute/search&reset=1',                       'Find Contributions',     'Find Contributions',     'access CiviContribute', '', @contributionlastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/batch&reset=1',                       'Batches',     'Batches',             'access CiviContribute,access CiviMember', '', @contributionlastID, '1', NULL, 4 ),
     ( @domainID, 'civicrm/contribute/import&reset=1',                       'Import Contributions',   'Import Contributions',   'access CiviContribute,edit contributions', 'AND', @contributionlastID, '1', '1',  5 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES 
+VALUES
     ( @domainID,NULL, 'Pledges',  'Pledges', 'access CiviPledge', '', @contributionlastID, '1',  1,   5 );
-    
+
 SET @pledgelastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/pledge&reset=1',                                  'Dashboard',                  'Dashboard',                 'access CiviPledge',  '',  @pledgelastID,       '1', NULL, 1 ), 
+VALUES
+    ( @domainID, 'civicrm/pledge&reset=1',                                  'Dashboard',                  'Dashboard',                 'access CiviPledge',  '',  @pledgelastID,       '1', NULL, 1 ),
     ( @domainID, 'civicrm/pledge/add&reset=1&action=add&context=standalone', 'New Pledge',                'New Pledge',                'access CiviPledge,edit pledges',  'AND',  @pledgelastID,       '1', NULL, 2 ),
-    ( @domainID, 'civicrm/pledge/search&reset=1',                           'Find Pledges',               'Find Pledges',              'access CiviPledge',  '',  @pledgelastID,       '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/admin/contribute/add&reset=1&action=add',         'New Contribution Page',      'New Contribution Page',     'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', NULL, 6 ), 
-    ( @domainID, 'civicrm/admin/contribute&reset=1',                        'Manage Contribution Pages',  'Manage Contribution Pages', 'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', '1',  7 ), 
-    ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=contribute',          'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', NULL, 8 ), 
+    ( @domainID, 'civicrm/pledge/search&reset=1',                           'Find Pledges',               'Find Pledges',              'access CiviPledge',  '',  @pledgelastID,       '1', NULL, 3 ),
+    ( @domainID, 'civicrm/admin/contribute/add&reset=1&action=add',         'New Contribution Page',      'New Contribution Page',     'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', NULL, 6 ),
+    ( @domainID, 'civicrm/admin/contribute&reset=1',                        'Manage Contribution Pages',  'Manage Contribution Pages', 'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', '1',  7 ),
+    ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=contribute',          'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', NULL, 8 ),
     ( @domainID, 'civicrm/admin/contribute/managePremiums&reset=1',         'Premiums (Thank-you Gifts)', 'Premiums',                  'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', 1,    9 ),
     ( @domainID, 'civicrm/admin/price&reset=1&action=add',                  'New Price Set',              'New Price Set',             'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', NULL, 10 ),
     ( @domainID, 'civicrm/admin/price&reset=1',                             'Manage Price Sets',          'Manage Price Sets',         'access CiviContribute,administer CiviCRM', 'AND',  @contributionlastID, '1', NULL, 11 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Events',  'Events', 'access CiviEvent', '', NULL, '1', NULL, 40 );
 
 SET @eventlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/event&reset=1',                                   'Dashboard',          'CiviEvent Dashboard',  'access CiviEvent', '',    @eventlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/participant/add&reset=1&action=add&context=standalone', 'Register Event Participant', 'Register Event Participant', 'access CiviEvent,edit event participants', 'AND', @eventlastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/event/search&reset=1',                            'Find Participants',  'Find Participants',    'access CiviEvent', '',    @eventlastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/event/import&reset=1',                            'Import Participants','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  4 ), 
-    ( @domainID, 'civicrm/event/add&reset=1&action=add',                    'New Event',          'New Event',            'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', NULL, 5 ), 
-    ( @domainID, 'civicrm/event/manage&reset=1',                            'Manage Events',      'Manage Events',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 6 ), 
+VALUES
+    ( @domainID, 'civicrm/event&reset=1',                                   'Dashboard',          'CiviEvent Dashboard',  'access CiviEvent', '',    @eventlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/participant/add&reset=1&action=add&context=standalone', 'Register Event Participant', 'Register Event Participant', 'access CiviEvent,edit event participants', 'AND', @eventlastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/event/search&reset=1',                            'Find Participants',  'Find Participants',    'access CiviEvent', '',    @eventlastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/event/import&reset=1',                            'Import Participants','Import Participants',  'access CiviEvent,edit event participants', 'AND',    @eventlastID, '1', '1',  4 ),
+    ( @domainID, 'civicrm/event/add&reset=1&action=add',                    'New Event',          'New Event',            'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', NULL, 5 ),
+    ( @domainID, 'civicrm/event/manage&reset=1',                            'Manage Events',      'Manage Events',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 6 ),
     ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event',               'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviEvent,administer CiviCRM', 'AND', @eventlastID, '1', 1, 7 ),
-    ( @domainID, 'civicrm/admin/eventTemplate&reset=1',                     'Event Templates',    'Event Templates',      'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 8 ), 
-    ( @domainID, 'civicrm/admin/price&reset=1&action=add',                  'New Price Set',      'New Price Set',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', NULL, 9 ), 
+    ( @domainID, 'civicrm/admin/eventTemplate&reset=1',                     'Event Templates',    'Event Templates',      'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', 1, 8 ),
+    ( @domainID, 'civicrm/admin/price&reset=1&action=add',                  'New Price Set',      'New Price Set',        'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', NULL, 9 ),
     ( @domainID, 'civicrm/admin/price&reset=1',                             'Manage Price Sets',  'Manage Price Sets',    'access CiviEvent,edit all events', 'AND',    @eventlastID, '1', NULL, 10 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES 
+VALUES
     ( @domainID, NULL, 'Mailings', 'Mailings', 'access CiviMail,create mailings,approve mailings,schedule mailings', 'OR', NULL, '1', NULL, 50 );
 
 SET @mailinglastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/mailing/send&reset=1',                            'New Mailing', 'New Mailing',                                          'access CiviMail,create mailings', 'OR', @mailinglastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/mailing/browse/unscheduled&reset=1&scheduled=false', 'Draft and Unscheduled Mailings', 'Draft and Unscheduled Mailings', 'access CiviMail,create mailings,schedule mailings', 'OR', @mailinglastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/mailing/browse/scheduled&reset=1&scheduled=true', 'Scheduled and Sent Mailings', 'Scheduled and Sent Mailings',          'access CiviMail,approve mailings,create mailings,schedule mailings', 'OR', @mailinglastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/mailing/browse/archived&reset=1',                 'Archived Mailings', 'Archived Mailings',                              'access CiviMail,create mailings', 'OR', @mailinglastID, '1', 1,    4 ), 
+VALUES
+    ( @domainID, 'civicrm/mailing/send&reset=1',                            'New Mailing', 'New Mailing',                                          'access CiviMail,create mailings', 'OR', @mailinglastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/mailing/browse/unscheduled&reset=1&scheduled=false', 'Draft and Unscheduled Mailings', 'Draft and Unscheduled Mailings', 'access CiviMail,create mailings,schedule mailings', 'OR', @mailinglastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/mailing/browse/scheduled&reset=1&scheduled=true', 'Scheduled and Sent Mailings', 'Scheduled and Sent Mailings',          'access CiviMail,approve mailings,create mailings,schedule mailings', 'OR', @mailinglastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/mailing/browse/archived&reset=1',                 'Archived Mailings', 'Archived Mailings',                              'access CiviMail,create mailings', 'OR', @mailinglastID, '1', 1,    4 ),
     ( @domainID, 'civicrm/admin/component&reset=1',                         'Headers, Footers, and Automated Messages', 'Headers, Footers, and Automated Messages', 'access CiviMail,administer CiviCRM', 'AND', @mailinglastID, '1', NULL, 5 ),
     ( @domainID, 'civicrm/admin/messageTemplates&reset=1',                  'Message Templates', 'Message Templates',                 'administer CiviCRM', '', @mailinglastID, '1', NULL, 6 ),
     ( @domainID, 'civicrm/admin/options/from_email&group=from_email_address&reset=1', 'From Email Addresses', 'From Email Addresses', 'administer CiviCRM', '', @mailinglastID, '1', 1, 7 ),
     ( @domainID, 'civicrm/sms/send?reset=1', 'New SMS', 'New SMS', 'administer CiviCRM', NULL, @mailinglastID, '1', 1, 8 );
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES 
+VALUES
     ( @domainID, NULL, 'Memberships', 'Memberships', 'access CiviMember', '', NULL, '1', NULL, 60 );
 
 SET @memberlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/member&reset=1',                              'Dashboard',           'Dashboard',       'access CiviMember', '', @memberlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/member/add&reset=1&action=add&context=standalone', 'New Membership', 'New Membership',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/member/search&reset=1',                       'Find Memberships',    'Find Memberships','access CiviMember', '', @memberlastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/batch&reset=1',                       'Batches',    'Batches','access CiviMember,access CiviContribute', '', @memberlastID, '1', NULL, 4 ), 
+VALUES
+    ( @domainID, 'civicrm/member&reset=1',                              'Dashboard',           'Dashboard',       'access CiviMember', '', @memberlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/member/add&reset=1&action=add&context=standalone', 'New Membership', 'New Membership',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/member/search&reset=1',                       'Find Memberships',    'Find Memberships','access CiviMember', '', @memberlastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/batch&reset=1',                       'Batches',    'Batches','access CiviMember,access CiviContribute', '', @memberlastID, '1', NULL, 4 ),
     ( @domainID, 'civicrm/member/import&reset=1',                       'Import Memberships',  'Import Members',  'access CiviMember,edit memberships', 'AND', @memberlastID, '1', 1, 5 ),
     ( @domainID, 'civicrm/admin/price&reset=1&action=add',              'New Price Set',       'New Price Set',   'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '1', NULL, 6 ),
     ( @domainID, 'civicrm/admin/price&reset=1',                         'Manage Price Sets',   'Manage Price Sets', 'access CiviMember,administer CiviCRM', 'AND',  @memberlastID, '1', NULL, 7 );
@@ -228,16 +228,16 @@ VALUES
 SET @campaignlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, 'civicrm/campaign&reset=1',        'Dashboard', 'Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 1 );
 SET @campaigndashboardlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/campaign&reset=1&subPage=survey',        'Surveys', 'Survey Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/campaign&reset=1&subPage=petition',        'Petitions', 'Petition Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/campaign&reset=1&subPage=campaign',        'Campaigns', 'Campaign Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/campaign/add&reset=1',        'New Campaign', 'New Campaign', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 2 ), 
+VALUES
+    ( @domainID, 'civicrm/campaign&reset=1&subPage=survey',        'Surveys', 'Survey Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/campaign&reset=1&subPage=petition',        'Petitions', 'Petition Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/campaign&reset=1&subPage=campaign',        'Campaigns', 'Campaign Dashboard', 'manage campaign,administer CiviCampaign', 'OR', @campaigndashboardlastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/campaign/add&reset=1',        'New Campaign', 'New Campaign', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/survey/add&reset=1',        'New Survey', 'New Survey', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/petition/add&reset=1',        'New Petition', 'New Petition', 'manage campaign,administer CiviCampaign', 'OR', @campaignlastID, '1', NULL, 4 ),
     ( @domainID, 'civicrm/survey/search&reset=1&op=reserve', 'Reserve Respondents', 'Reserve Respondents', 'administer CiviCampaign,manage campaign,reserve campaign contacts', 'OR', @campaignlastID, '1', NULL, 5 ),
@@ -254,80 +254,80 @@ VALUES
 SET @caselastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/case&reset=1',        'Dashboard', 'Dashboard', 'access my cases and activities,access all cases and activities', 'OR',       @caselastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/case/add&reset=1&action=add&atype=13&context=standalone', 'New Case', 'New Case', 'add cases,access all cases and activities', 'OR', @caselastID, '1', NULL, 2 ), 
+VALUES
+    ( @domainID, 'civicrm/case&reset=1',        'Dashboard', 'Dashboard', 'access my cases and activities,access all cases and activities', 'OR',       @caselastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/case/add&reset=1&action=add&atype=13&context=standalone', 'New Case', 'New Case', 'add cases,access all cases and activities', 'OR', @caselastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/case/search&reset=1', 'Find Cases', 'Find Cases', 'access my cases and activities,access all cases and activities', 'OR',     @caselastID, '1', 1, 3 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Grants', 'Grants', 'access CiviGrant', '', NULL, '1', NULL, 90 );
 
 SET @grantlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES        
-    ( @domainID, 'civicrm/grant&reset=1',           'Dashboard', 'Dashboard', 'access CiviGrant', '',       @grantlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/grant/add&reset=1&action=add&context=standalone', 'New Grant', 'New Grant', 'access CiviGrant,edit grants', 'AND', @grantlastID, '1', NULL, 2 ), 
+VALUES
+    ( @domainID, 'civicrm/grant&reset=1',           'Dashboard', 'Dashboard', 'access CiviGrant', '',       @grantlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/grant/add&reset=1&action=add&context=standalone', 'New Grant', 'New Grant', 'access CiviGrant,edit grants', 'AND', @grantlastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/grant/search&reset=1',    'Find Grants', 'Find Grants', 'access CiviGrant', '',   @grantlastID, '1', 1, 3 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES 
+VALUES
     ( @domainID, NULL, 'Administer', 'Administer', 'administer CiviCRM', '', NULL, '1', NULL, 100 );
 
 SET @adminlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, 'civicrm/admin&reset=1', 'Administration Console', 'Administration Console', 'administer CiviCRM', '', @adminlastID, '1', NULL, 1 );
 
 SET @adminConsolelastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, 'civicrm/admin/configtask&reset=1', 'Configuration Checklist', 'Configuration Checklist', 'administer CiviCRM', '', @adminConsolelastID, '1', NULL, 1 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Customize Data and Screens', 'Customize Data and Screens', 'administer CiviCRM', '', @adminlastID, '1', NULL, 3 );
 
 SET @CustomizelastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
-    ( @domainID, 'civicrm/admin/custom/group&reset=1',      'Custom Fields', 'Custom Fields',                             'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/admin/uf/group&reset=1',          'Profiles', 'Profiles',                                       'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/admin/tag&reset=1',               'Tags (Categories)', 'Tags (Categories)',                     'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/admin/options/activity_type&reset=1&group=activity_type', 'Activity Types', 'Activity Types',   'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 4 ), 
-    ( @domainID, 'civicrm/admin/reltype&reset=1',           'Relationship Types', 'Relationship Types',                   'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 5 ), 
+    ( @domainID, 'civicrm/admin/custom/group&reset=1',      'Custom Fields', 'Custom Fields',                             'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/admin/uf/group&reset=1',          'Profiles', 'Profiles',                                       'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/admin/tag&reset=1',               'Tags (Categories)', 'Tags (Categories)',                     'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/admin/options/activity_type&reset=1&group=activity_type', 'Activity Types', 'Activity Types',   'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 4 ),
+    ( @domainID, 'civicrm/admin/reltype&reset=1',           'Relationship Types', 'Relationship Types',                   'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 5 ),
     ( @domainID, 'civicrm/admin/options/subtype&reset=1',   'Contact Types','Contact Types',                              'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 6 ),
-    ( @domainID, 'civicrm/admin/setting/preferences/display&reset=1',   'Display Preferences', 'Display Preferences',     'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 9 ), 
-    ( @domainID, 'civicrm/admin/setting/search&reset=1',    'Search Preferences',    'Search Preferences',                'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 10 ), 
-    ( @domainID, 'civicrm/admin/menu&reset=1',              'Navigation Menu', 'Navigation Menu',                         'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 11 ), 
+    ( @domainID, 'civicrm/admin/setting/preferences/display&reset=1',   'Display Preferences', 'Display Preferences',     'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 9 ),
+    ( @domainID, 'civicrm/admin/setting/search&reset=1',    'Search Preferences',    'Search Preferences',                'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 10 ),
+    ( @domainID, 'civicrm/admin/menu&reset=1',              'Navigation Menu', 'Navigation Menu',                         'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 11 ),
     ( @domainID, 'civicrm/admin/options/wordreplacements&reset=1','Word Replacements','Word Replacements',                'administer CiviCRM', '',   @CustomizelastID, '1', NULL, 12 ),
     ( @domainID, 'civicrm/admin/options/custom_search&reset=1&group=custom_search', 'Manage Custom Searches', 'Manage Custom Searches', 'administer CiviCRM', '', @CustomizelastID, '1', NULL, 13 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Dropdown Options', 'Dropdown Options', 'administer CiviCRM', '', @CustomizelastID, '1', NULL, 8 );
-    
+
 SET @optionListlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES         
-    ( @domainID, 'civicrm/admin/options/gender&reset=1&group=gender',                                                  'Gender Options',         'Gender Options',                           'administer CiviCRM', '',   @optionListlastID, '1', NULL,  1 ), 
-    ( @domainID, 'civicrm/admin/options/individual_prefix&group=individual_prefix&reset=1',                            'Individual Prefixes (Ms, Mr...)', 'Individual Prefixes (Ms, Mr...)', 'administer CiviCRM', '',   @optionListlastID, '1', NULL,  2 ), 
-    ( @domainID, 'civicrm/admin/options/individual_suffix&group=individual_suffix&reset=1',                            'Individual Suffixes (Jr, Sr...)', 'Individual Suffixes (Jr, Sr...)', 'administer CiviCRM', '',   @optionListlastID, '1', NULL,  3 ), 
-    ( @domainID, 'civicrm/admin/options/instant_messenger_service&group=instant_messenger_service&reset=1',            'Instant Messenger Services',     'Instant Messenger Services',       'administer CiviCRM', '',   @optionListlastID, '1', NULL,  4 ), 
-    ( @domainID, 'civicrm/admin/locationType&reset=1',                                                                 'Location Types (Home, Work...)', 'Location Types (Home, Work...)',   'administer CiviCRM', '',   @optionListlastID, '1', NULL,  5 ), 
-    ( @domainID, 'civicrm/admin/options/mobile_provider&group=mobile_provider&reset=1',                                'Mobile Phone Providers', 'Mobile Phone Providers',                   'administer CiviCRM', '',   @optionListlastID, '1', NULL,  6 ), 
-    ( @domainID, 'civicrm/admin/options/phone_type&group=phone_type&reset=1',                                          'Phone Types',            'Phone Types',                              'administer CiviCRM', '',   @optionListlastID, '1', NULL,  7 ),  
+VALUES
+    ( @domainID, 'civicrm/admin/options/gender&reset=1&group=gender',                                                  'Gender Options',         'Gender Options',                           'administer CiviCRM', '',   @optionListlastID, '1', NULL,  1 ),
+    ( @domainID, 'civicrm/admin/options/individual_prefix&group=individual_prefix&reset=1',                            'Individual Prefixes (Ms, Mr...)', 'Individual Prefixes (Ms, Mr...)', 'administer CiviCRM', '',   @optionListlastID, '1', NULL,  2 ),
+    ( @domainID, 'civicrm/admin/options/individual_suffix&group=individual_suffix&reset=1',                            'Individual Suffixes (Jr, Sr...)', 'Individual Suffixes (Jr, Sr...)', 'administer CiviCRM', '',   @optionListlastID, '1', NULL,  3 ),
+    ( @domainID, 'civicrm/admin/options/instant_messenger_service&group=instant_messenger_service&reset=1',            'Instant Messenger Services',     'Instant Messenger Services',       'administer CiviCRM', '',   @optionListlastID, '1', NULL,  4 ),
+    ( @domainID, 'civicrm/admin/locationType&reset=1',                                                                 'Location Types (Home, Work...)', 'Location Types (Home, Work...)',   'administer CiviCRM', '',   @optionListlastID, '1', NULL,  5 ),
+    ( @domainID, 'civicrm/admin/options/mobile_provider&group=mobile_provider&reset=1',                                'Mobile Phone Providers', 'Mobile Phone Providers',                   'administer CiviCRM', '',   @optionListlastID, '1', NULL,  6 ),
+    ( @domainID, 'civicrm/admin/options/phone_type&group=phone_type&reset=1',                                          'Phone Types',            'Phone Types',                              'administer CiviCRM', '',   @optionListlastID, '1', NULL,  7 ),
     ( @domainID, 'civicrm/admin/options/website_type&group=website_type&reset=1',                                      'Website Types',          'Website Types',                            'administer CiviCRM', '',   @optionListlastID, '1', NULL,  8 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
@@ -336,41 +336,41 @@ VALUES
 SET @communicationslastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/admin/domain&action=update&reset=1',         'Organization Address and Contact Info', 'Organization Address and Contact Info',                                      'administer CiviCRM', '', @communicationslastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/admin/options/from_email_address&group=from_email_address&reset=1', 'FROM Email Addresses', 'FROM Email Addresses',                                                 'administer CiviCRM', '', @communicationslastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/admin/messageTemplates&reset=1',             'Message Templates',      'Message Templates',                                                                         'administer CiviCRM', '', @communicationslastID, '1', NULL, 3 ), 
+VALUES
+    ( @domainID, 'civicrm/admin/domain&action=update&reset=1',         'Organization Address and Contact Info', 'Organization Address and Contact Info',                                      'administer CiviCRM', '', @communicationslastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/admin/options/from_email_address&group=from_email_address&reset=1', 'FROM Email Addresses', 'FROM Email Addresses',                                                 'administer CiviCRM', '', @communicationslastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/admin/messageTemplates&reset=1',             'Message Templates',      'Message Templates',                                                                         'administer CiviCRM', '', @communicationslastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/admin/scheduleReminders&reset=1',              'Schedule Reminders',    'Schedule Reminders',                                                                       'administer CiviCRM', '', @communicationslastID, '1', NULL, 4 ),
     ( @domainID, 'civicrm/admin/options/preferred_communication_method&group=preferred_communication_method&reset=1',  'Preferred Communication Methods', 'Preferred Communication Methods',  'administer CiviCRM', '', @communicationslastID, '1', NULL, 5 ),
     ( @domainID, 'civicrm/admin/labelFormats&reset=1',                                  'Label Formats',                 'Label Formats',                                                     'administer CiviCRM', '', @communicationslastID, '1', NULL, 6 ),
-    ( @domainID, 'civicrm/admin/pdfFormats&reset=1',                                    'Print Page (PDF) Formats',      'Print Page (PDF) Formats',                                          'administer CiviCRM', '', @communicationslastID, '1', NULL, 7 ), 
-    ( @domainID, 'civicrm/admin/options/email_greeting&group=email_greeting&reset=1',   'Email Greeting Formats',        'Email Greeting Formats',                                            'administer CiviCRM', '', @communicationslastID, '1', NULL, 8 ), 
-    ( @domainID, 'civicrm/admin/options/postal_greeting&group=postal_greeting&reset=1', 'Postal Greeting Formats',       'Postal Greeting Formats',                                           'administer CiviCRM', '', @communicationslastID, '1', NULL, 9 ), 
+    ( @domainID, 'civicrm/admin/pdfFormats&reset=1',                                    'Print Page (PDF) Formats',      'Print Page (PDF) Formats',                                          'administer CiviCRM', '', @communicationslastID, '1', NULL, 7 ),
+    ( @domainID, 'civicrm/admin/options/email_greeting&group=email_greeting&reset=1',   'Email Greeting Formats',        'Email Greeting Formats',                                            'administer CiviCRM', '', @communicationslastID, '1', NULL, 8 ),
+    ( @domainID, 'civicrm/admin/options/postal_greeting&group=postal_greeting&reset=1', 'Postal Greeting Formats',       'Postal Greeting Formats',                                           'administer CiviCRM', '', @communicationslastID, '1', NULL, 9 ),
     ( @domainID, 'civicrm/admin/options/addressee&group=addressee&reset=1',             'Addressee Formats',             'Addressee Formats',                                                 'administer CiviCRM', '', @communicationslastID, '1', NULL, 10 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Localization', 'Localization', 'administer CiviCRM', '', @adminlastID, '1', NULL, 6 );
 
 SET @locallastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/admin/setting/localization&reset=1',          'Languages, Currency, Locations', 'Languages, Currency, Locations',   'administer CiviCRM', '', @locallastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/admin/setting/preferences/address&reset=1',   'Address Settings',               'Address Settings',                 'administer CiviCRM', '', @locallastID, '1', NULL, 2 ), 
+VALUES
+    ( @domainID, 'civicrm/admin/setting/localization&reset=1',          'Languages, Currency, Locations', 'Languages, Currency, Locations',   'administer CiviCRM', '', @locallastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/admin/setting/preferences/address&reset=1',   'Address Settings',               'Address Settings',                 'administer CiviCRM', '', @locallastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/admin/setting/date&reset=1',                  'Date Formats',                   'Date Formats',                     'administer CiviCRM', '', @locallastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/admin/options/languages&group=languages&reset=1', 'Preferred Language Options', 'Preferred Language Options',       'administer CiviCRM', '', @locallastID, '1', NULL, 4 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL,                                                  'Users and Permissions',          'Users and Permissions',            'administer CiviCRM', '', @adminlastID, '1', NULL, 7 );
 
 SET @usersPermslastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, 'civicrm/admin/access&reset=1',       'Permissions (Access Control)',    'Permissions (Access Control)',     'administer CiviCRM', '', @usersPermslastID, '1', NULL, 1 ),
     ( @domainID, 'civicrm/admin/synchUser&reset=1',    'Synchronize Users to Contacts',   'Synchronize Users to Contacts',    'administer CiviCRM', '', @usersPermslastID, '1', NULL, 2 );
 
@@ -383,19 +383,19 @@ SET @systemSettingslastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
-    ( @domainID, 'civicrm/admin/setting/component&reset=1', 'Enable CiviCRM Components', 'Enable Components',                                 'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 1 ), 
+    ( @domainID, 'civicrm/admin/setting/component&reset=1', 'Enable CiviCRM Components', 'Enable Components',                                 'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 1 ),
     ( @domainID, 'civicrm/admin/extensions&reset=1',        'Manage Extensions', 'Manage Extensions', 'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 2 ),
-    ( @domainID, 'civicrm/admin/setting/smtp&reset=1',                  'Outbound Email (SMTP/Sendmail)', 'Outbound Email',                   'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 3 ), 
-    ( @domainID, 'civicrm/admin/paymentProcessor&reset=1',              'Payment Processors', 'Payment Processors',                           'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 4 ), 
-    ( @domainID, 'civicrm/admin/setting/mapping&reset=1',               'Mapping and Geocoding', 'Mapping and Geocoding',                     'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 5 ), 
-    ( @domainID, 'civicrm/admin/setting/misc&reset=1',                  'Undelete, Logging and ReCAPTCHA', 'Undelete, Logging and ReCAPTCHA', 'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 6 ), 
-    ( @domainID, 'civicrm/admin/setting/path&reset=1',                  'Directories',        'Directories',                                  'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 7 ), 
-    ( @domainID, 'civicrm/admin/setting/url&reset=1',                   'Resource URLs',      'Resource URLs',                                'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 8 ), 
+    ( @domainID, 'civicrm/admin/setting/smtp&reset=1',                  'Outbound Email (SMTP/Sendmail)', 'Outbound Email',                   'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 3 ),
+    ( @domainID, 'civicrm/admin/paymentProcessor&reset=1',              'Payment Processors', 'Payment Processors',                           'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 4 ),
+    ( @domainID, 'civicrm/admin/setting/mapping&reset=1',               'Mapping and Geocoding', 'Mapping and Geocoding',                     'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 5 ),
+    ( @domainID, 'civicrm/admin/setting/misc&reset=1',                  'Undelete, Logging and ReCAPTCHA', 'Undelete, Logging and ReCAPTCHA', 'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 6 ),
+    ( @domainID, 'civicrm/admin/setting/path&reset=1',                  'Directories',        'Directories',                                  'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 7 ),
+    ( @domainID, 'civicrm/admin/setting/url&reset=1',                   'Resource URLs',      'Resource URLs',                                'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 8 ),
     ( @domainID, 'civicrm/admin/setting/updateConfigBackend&reset=1',   'Cleanup Caches and Update Paths', 'Cleanup Caches and Update Paths', 'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 9 ),
-    ( @domainID, 'civicrm/admin/setting/uf&reset=1',                    'CMS Database Integration',    'CMS Integration',                     'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 10 ), 
-    ( @domainID, 'civicrm/admin/options/safe_file_extension&group=safe_file_extension&reset=1', 'Safe File Extensions', 'Safe File Extensions','administer CiviCRM', '',@systemSettingslastID, '1', NULL, 11 ), 
-    ( @domainID, 'civicrm/admin/options?reset=1',                       'Option Groups', 'Option Groups',                                     'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 12 ), 
-    ( @domainID, 'civicrm/admin/mapping&reset=1',                       'Import/Export Mappings', 'Import/Export Mappings',                   'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 13 ), 
+    ( @domainID, 'civicrm/admin/setting/uf&reset=1',                    'CMS Database Integration',    'CMS Integration',                     'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 10 ),
+    ( @domainID, 'civicrm/admin/options/safe_file_extension&group=safe_file_extension&reset=1', 'Safe File Extensions', 'Safe File Extensions','administer CiviCRM', '',@systemSettingslastID, '1', NULL, 11 ),
+    ( @domainID, 'civicrm/admin/options?reset=1',                       'Option Groups', 'Option Groups',                                     'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 12 ),
+    ( @domainID, 'civicrm/admin/mapping&reset=1',                       'Import/Export Mappings', 'Import/Export Mappings',                   'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 13 ),
     ( @domainID, 'civicrm/admin/setting/debug&reset=1',                 'Debugging and Error Handling','Debugging and Error Handling',        'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 14 ),
     ( @domainID, 'civicrm/admin/setting/preferences/multisite&reset=1', 'Multi Site Settings', 'Multi Site Settings',                         'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 15 ),
     ( @domainID, 'civicrm/admin/job&reset=1',                           'Scheduled Jobs', 'Scheduled Jobs',                                   'administer CiviCRM', '', @systemSettingslastID, '1', NULL, 16 ),
@@ -405,13 +405,13 @@ VALUES
 -- begin component admin menus
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL,                                             'CiviCampaign',              'CiviCampaign',              'administer CiviCampaign,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 9 );
 
 SET @adminCampaignlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, 'civicrm/admin/campaign/surveyType&reset=1',                            'Survey Types',  'Survey Types', 'administer CiviCampaign',    '', @adminCampaignlastID, '1', NULL, 1 ),
     ( @domainID, 'civicrm/admin/options/campaign_type&group=campaign_type&reset=1',      'Campaign Types',  'Campaign Types', 'administer CiviCampaign',    '', @adminCampaignlastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/admin/options/campaign_status&group=campaign_status&reset=1',  'Campaign Status',  'Campaign Status', 'administer CiviCampaign',    '', @adminCampaignlastID, '1', NULL, 3 ),
@@ -420,33 +420,33 @@ VALUES
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL,  'CiviCase', 'CiviCase', 'administer CiviCase', NULL, @adminlastID, '1', NULL, 10 );
 
 SET @adminCaselastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/admin/options/case_type&group=case_type&reset=1',            'Case Types',      'Case Types',      'administer CiviCase', NULL, @adminCaselastID, '1', NULL, 1 ), 
+VALUES
+    ( @domainID, 'civicrm/admin/options/case_type&group=case_type&reset=1',            'Case Types',      'Case Types',      'administer CiviCase', NULL, @adminCaselastID, '1', NULL, 1 ),
     ( @domainID, 'civicrm/admin/options/redaction_rule&group=redaction_rule&reset=1',  'Redaction Rules', 'Redaction Rules', 'administer CiviCase', NULL, @adminCaselastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/admin/options/case_status&group=case_status&reset=1',  'Case Statuses', 'Case Statuses', 'administer CiviCase', NULL, @adminCaselastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/admin/options/encounter_medium&group=encounter_medium&reset=1',  'Encounter Medium', 'Encounter Medium', 'administer CiviCase', NULL, @adminCaselastID, '1', NULL, 4 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES 
+VALUES
     ( @domainID, NULL,  'CiviContribute', 'CiviContribute', 'access CiviContribute,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 11 );
-    
+
 SET @adminContributelastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
 VALUES
-    ( @domainID, 'civicrm/admin/contribute&reset=1&action=add',            'New Contribution Page',      'New Contribution Page',     'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 6 ), 
-    ( @domainID, 'civicrm/admin/contribute&reset=1',                       'Manage Contribution Pages',  'Manage Contribution Pages', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', '1',  7 ), 
-    ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=contribute',                              'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 8 ), 
-    ( @domainID, 'civicrm/admin/contribute/managePremiums&reset=1',        'Premiums (Thank-you Gifts)', 'Premiums',                  'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', 1,    9 ), 
-    ( @domainID, 'civicrm/admin/contribute/contributionType&reset=1',      'Contribution Types',         'Contribution Types',        'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 10), 
-    ( @domainID, 'civicrm/admin/options/payment_instrument&group=payment_instrument&reset=1',  'Payment Instruments',    'Payment Instruments',   'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 11 ), 
+    ( @domainID, 'civicrm/admin/contribute&reset=1&action=add',            'New Contribution Page',      'New Contribution Page',     'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 6 ),
+    ( @domainID, 'civicrm/admin/contribute&reset=1',                       'Manage Contribution Pages',  'Manage Contribution Pages', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', '1',  7 ),
+    ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=contribute',                              'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 8 ),
+    ( @domainID, 'civicrm/admin/contribute/managePremiums&reset=1',        'Premiums (Thank-you Gifts)', 'Premiums',                  'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', 1,    9 ),
+    ( @domainID, 'civicrm/admin/contribute/contributionType&reset=1',      'Contribution Types',         'Contribution Types',        'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 10),
+    ( @domainID, 'civicrm/admin/options/payment_instrument&group=payment_instrument&reset=1',  'Payment Instruments',    'Payment Instruments',   'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 11 ),
     ( @domainID, 'civicrm/admin/options/accept_creditcard&group=accept_creditcard&reset=1',    'Accepted Credit Cards',  'Accepted Credit Cards', 'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', 1, 12 ),
     ( @domainID, 'civicrm/admin/price&reset=1&action=add',                  'New Price Set',              'New Price Set',             'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 13 ),
     ( @domainID, 'civicrm/admin/price&reset=1',                             'Manage Price Sets',          'Manage Price Sets',         'access CiviContribute,administer CiviCRM', 'AND', @adminContributelastID, '1', NULL, 14 ),
@@ -454,64 +454,64 @@ VALUES
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES         
+VALUES
     ( @domainID, NULL, 'CiviEvent', 'CiviEvent', 'access CiviEvent,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 12 );
 
 SET @adminEventlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/event/add&reset=1&action=add',                   'New Event',          'New Event',                        'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/event/manage&reset=1',                           'Manage Events',      'Manage Events',                    'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1,    2 ), 
+VALUES
+    ( @domainID, 'civicrm/event/add&reset=1&action=add',                   'New Event',          'New Event',                        'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/event/manage&reset=1',                           'Manage Events',      'Manage Events',                    'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1,    2 ),
     ( @domainID, 'civicrm/admin/pcp?reset=1&page_type=event',                              'Personal Campaign Pages',    'Personal Campaign Pages',   'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1, 3 ),
-    ( @domainID, 'civicrm/admin/eventTemplate&reset=1',                    'Event Templates',    'Event Templates',                  'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1,    4 ), 
-    ( @domainID, 'civicrm/admin/price&reset=1&action=add',                 'New Price Set',      'New Price Set',                    'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 5 ), 
+    ( @domainID, 'civicrm/admin/eventTemplate&reset=1',                    'Event Templates',    'Event Templates',                  'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1,    4 ),
+    ( @domainID, 'civicrm/admin/price&reset=1&action=add',                 'New Price Set',      'New Price Set',                    'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 5 ),
     ( @domainID, 'civicrm/admin/price&reset=1',                            'Manage Price Sets',  'Manage Price Sets',                'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', 1,    6 ),
-    ( @domainID, 'civicrm/admin/options/event_type&group=event_type&reset=1',  'Event Types',    'Event Types',                      'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 7 ), 
-    ( @domainID, 'civicrm/admin/participant_status&reset=1',                   'Participant Statuses', 'Participant Statuses',       'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 8 ), 
+    ( @domainID, 'civicrm/admin/options/event_type&group=event_type&reset=1',  'Event Types',    'Event Types',                      'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 7 ),
+    ( @domainID, 'civicrm/admin/participant_status&reset=1',                   'Participant Statuses', 'Participant Statuses',       'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 8 ),
     ( @domainID, 'civicrm/admin/options/participant_role&group=participant_role&reset=1', 'Participant Roles', 'Participant Roles',  'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 9 ),
-    ( @domainID, 'civicrm/admin/options/participant_listing&group=participant_listing&reset=1', 'Participant Listing Options', 'Participant Listing Options', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 10 ), 
-    ( @domainID, 'civicrm/admin/options/event_badge&group=event_badge&reset=1', 'Event Badge Formats', 'Event Badge Formats', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 11 ), 
+    ( @domainID, 'civicrm/admin/options/participant_listing&group=participant_listing&reset=1', 'Participant Listing Options', 'Participant Listing Options', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 10 ),
+    ( @domainID, 'civicrm/admin/options/event_badge&group=event_badge&reset=1', 'Event Badge Formats', 'Event Badge Formats', 'access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 11 ),
     ( @domainID, 'civicrm/admin/paymentProcessor&reset=1',                  'Payment Processors', 'Payment Processors',              'administer CiviCRM', '',                     @adminEventlastID, '1', NULL, 12),
     ( @domainID, 'civicrm/admin/setting/preferences/event&reset=1',         'CiviEvent Component Settings', 'CiviEvent Component Settings','access CiviEvent,administer CiviCRM', 'AND', @adminEventlastID, '1', NULL, 13 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'CiviGrant', 'CiviGrant', 'access CiviGrant,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 13 );
 
 SET @adminGrantlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, 'civicrm/admin/options/grant_type&group=grant_type&reset=1', 'Grant Types', 'Grant Types', 'access CiviGrant,administer CiviCRM', 'AND', @adminGrantlastID, '1', NULL, 1 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'CiviMail', 'CiviMail', 'access CiviMail,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 14 );
 
 SET @adminMailinglastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'civicrm/admin/component&reset=1',            'Headers, Footers, and Automated Messages', 'Headers, Footers, and Automated Messages', 'access CiviMail,administer CiviCRM', 'AND', @adminMailinglastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/admin/messageTemplates&reset=1',     'Message Templates', 'Message Templates', 'administer CiviCRM', '',   @adminMailinglastID, '1', NULL, 2 ), 
-    ( @domainID, 'civicrm/admin/options/from_email&group=from_email_address&reset=1', 'From Email Addresses', 'From Email Addresses', 'administer CiviCRM', '', @adminMailinglastID, '1', NULL, 3 ), 
+VALUES
+    ( @domainID, 'civicrm/admin/component&reset=1',            'Headers, Footers, and Automated Messages', 'Headers, Footers, and Automated Messages', 'access CiviMail,administer CiviCRM', 'AND', @adminMailinglastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/admin/messageTemplates&reset=1',     'Message Templates', 'Message Templates', 'administer CiviCRM', '',   @adminMailinglastID, '1', NULL, 2 ),
+    ( @domainID, 'civicrm/admin/options/from_email&group=from_email_address&reset=1', 'From Email Addresses', 'From Email Addresses', 'administer CiviCRM', '', @adminMailinglastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/admin/mailSettings&reset=1',         'Mail Accounts', 'Mail Accounts', 'access CiviMail,administer CiviCRM', 'AND',           @adminMailinglastID, '1', NULL, 4 ),
     ( @domainID, 'civicrm/admin/mail&reset=1',                 'Mailer Settings', 'Mailer Settings', 'access CiviMail,administer CiviCRM', 'AND',           @adminMailinglastID, '1', NULL, 5 ),
     ( @domainID, 'civicrm/admin/setting/preferences/mailing&reset=1', 'CiviMail Component Settings', 'CiviMail Component Settings','access CiviMail,administer CiviCRM', 'AND', @adminMailinglastID, '1', NULL, 6 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'CiviMember', 'CiviMember', 'access CiviMember,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 15 );
 
 SET @adminMemberlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
-    ( @domainID, 'civicrm/admin/member/membershipType&reset=1',    'Membership Types',        'Membership Types',        'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 1 ), 
+VALUES
+    ( @domainID, 'civicrm/admin/member/membershipType&reset=1',    'Membership Types',        'Membership Types',        'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 1 ),
     ( @domainID, 'civicrm/admin/member/membershipStatus&reset=1',  'Membership Status Rules', 'Membership Status Rules', 'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', 1, 2 ),
     ( @domainID, 'civicrm/admin/price&reset=1&action=add',         'New Price Set',           'New Price Set',           'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/admin/price&reset=1',                    'Manage Price Sets',       'Manage Price Sets',       'access CiviMember,administer CiviCRM', 'AND', @adminMemberlastID, '1', NULL, 4 ),
@@ -519,48 +519,48 @@ VALUES
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL,                                             'CiviReport',              'CiviReport',              'access CiviReport,administer CiviCRM', 'AND', @adminlastID, '1', NULL, 16 );
 
 SET @adminReportlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
-    ( @domainID, 'civicrm/report/list&reset=1',                            'Reports Listing',  'Reports Listing', 'access CiviReport',    '', @adminReportlastID, '1', NULL, 1 ), 
-    ( @domainID, 'civicrm/admin/report/template/list&reset=1',             'Create Reports from Templates', 'Create Reports from Templates', 'administer Reports', '', @adminReportlastID, '1', NULL, 2 ), 
+VALUES
+    ( @domainID, 'civicrm/report/list&reset=1',                            'Reports Listing',  'Reports Listing', 'access CiviReport',    '', @adminReportlastID, '1', NULL, 1 ),
+    ( @domainID, 'civicrm/admin/report/template/list&reset=1',             'Create Reports from Templates', 'Create Reports from Templates', 'administer Reports', '', @adminReportlastID, '1', NULL, 2 ),
     ( @domainID, 'civicrm/admin/report/options/report_template&reset=1',   'Manage Templates', 'Manage Templates', 'administer Reports',  '', @adminReportlastID, '1', NULL, 3 ),
     ( @domainID, 'civicrm/admin/report/register&reset=1',                  'Register Report',  'Register Report',  'administer Reports',  '', @adminReportlastID, '1', NULL, 4 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Help', 'Help', NULL, '',  NULL, '1', NULL, 110);
 
 SET @adminHelplastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
-    ( @domainID, 'http://documentation.civicrm.org',   'Documentation',      'Documentation',    NULL, 'AND', @adminHelplastID, '1', NULL, 1 ), 
-    ( @domainID, 'http://forum.civicrm.org',           'Community Forums',   'Community Forums', NULL, 'AND', @adminHelplastID, '1', NULL, 2 ), 
-    ( @domainID, 'http://civicrm.org/participate',     'Participate',        'Participate',      NULL, 'AND', @adminHelplastID, '1', NULL, 3 ), 
+VALUES
+    ( @domainID, 'http://documentation.civicrm.org',   'Documentation',      'Documentation',    NULL, 'AND', @adminHelplastID, '1', NULL, 1 ),
+    ( @domainID, 'http://forum.civicrm.org',           'Community Forums',   'Community Forums', NULL, 'AND', @adminHelplastID, '1', NULL, 2 ),
+    ( @domainID, 'http://civicrm.org/participate',     'Participate',        'Participate',      NULL, 'AND', @adminHelplastID, '1', NULL, 3 ),
     ( @domainID, 'http://civicrm.org/aboutcivicrm',    'About',              'About',            NULL, 'AND', @adminHelplastID, '1', NULL, 4 );
 
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES     
+VALUES
     ( @domainID, NULL, 'Reports', 'Reports', 'access CiviReport', '',  NULL, '1', NULL, 95 );
 
 SET @reportlastID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, 'civicrm/report/list&reset=1', 'Reports Listing', 'Reports Listing', 'access CiviReport', '', @reportlastID, '1', 1,    1 );
-    
+
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, 'civicrm/admin/report/template/list&reset=1',  'Create Reports from Templates',  'Create Reports from Templates', 'administer Reports',  '', @reportlastID, '1', 1, 2 );
-    
+
 -- sample reports with navigation menus
 
 INSERT INTO `civicrm_report_instance`
@@ -588,12 +588,12 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Activity Report ', 'activity', 'Provides a list of constituent activity including activity statistics for one/all contacts during a given date range(required)', 'administer CiviCRM', 'a:26:{s:6:"fields";a:6:{s:16:"contact_assignee";s:1:"1";s:14:"contact_target";s:1:"1";s:16:"activity_type_id";s:1:"1";s:16:"activity_subject";s:1:"1";s:18:"activity_date_time";s:1:"1";s:9:"status_id";s:1:"1";}s:17:"contact_source_op";s:3:"has";s:20:"contact_source_value";s:0:"";s:19:"contact_assignee_op";s:3:"has";s:22:"contact_assignee_value";s:0:"";s:17:"contact_target_op";s:3:"has";s:20:"contact_target_value";s:0:"";s:15:"current_user_op";s:2:"eq";s:18:"current_user_value";s:1:"0";s:27:"activity_date_time_relative";s:10:"this.month";s:23:"activity_date_time_from";s:0:"";s:21:"activity_date_time_to";s:0:"";s:19:"activity_subject_op";s:3:"has";s:22:"activity_subject_value";s:0:"";s:19:"activity_type_id_op";s:2:"in";s:22:"activity_type_id_value";a:0:{}s:12:"status_id_op";s:2:"in";s:15:"status_id_value";a:0:{}s:11:"description";s:126:"Provides a list of constituent activity including activity statistics for one/all contacts during a given date range(required)";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:18:"administer CiviCRM";s:6:"groups";s:0:"";s:9:"group_bys";N;s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Activity Report',                    'activity',                                            'administer CiviCRM',       '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
@@ -604,7 +604,7 @@ VALUES
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Current Employer Report',                    'Current Employer Report',  'administer CiviCRM',       '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
@@ -671,52 +671,52 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'LYBUNT Report', 'contribute/lybunt', 'Last year but not this year. Provides a list of constituents who donated last year but did not donate during the time period you specify as the current year.', 'access CiviContribute', 'a:19:{s:6:"fields";a:3:{s:9:"sort_name";s:1:"1";s:5:"email";s:1:"1";s:5:"phone";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"yid_op";s:2:"eq";s:9:"yid_value";s:4:"2011";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:157:"Last year but not this year. Provides a list of constituents who donated last year but did not donate during the time period you specify as the current year.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:6:"charts";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),     'LYBUNT Report',                      'LYBUNT Report',                                       'access CiviContribute',    '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Contributions by Organization Report', 'contribute/organizationSummary', 'Displays a detailed list of contributions grouped by organization, which includes contributions made by employees for the organisation.', 'access CiviContribute', 'a:20:{s:6:"fields";a:5:{s:17:"organization_name";s:1:"1";s:9:"sort_name";s:1:"1";s:12:"total_amount";s:1:"1";s:22:"contribution_status_id";s:1:"1";s:12:"receive_date";s:1:"1";}s:20:"organization_name_op";s:3:"has";s:23:"organization_name_value";s:0:"";s:23:"relationship_type_id_op";s:2:"eq";s:26:"relationship_type_id_value";s:5:"4_b_a";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:11:"description";s:193:"Displays a detailed contribution report for Organization relationships with contributors, as to if contribution done was  from an employee of some organization or from that Organization itself.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Contributions by Organization Report', 'Contributions by Organization Report', 'access CiviContribute', '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Contributions by Household Report', 'contribute/householdSummary', 'Displays a detailed list of contributions grouped by household which includes contributions made by members of the household.', 'access CiviContribute', 'a:21:{s:6:"fields";a:5:{s:14:"household_name";s:1:"1";s:9:"sort_name";s:1:"1";s:12:"total_amount";s:1:"1";s:22:"contribution_status_id";s:1:"1";s:12:"receive_date";s:1:"1";}s:17:"household_name_op";s:3:"has";s:20:"household_name_value";s:0:"";s:23:"relationship_type_id_op";s:2:"eq";s:26:"relationship_type_id_value";s:5:"6_b_a";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:11:"description";s:213:"Provides a detailed report for Contributions made by contributors(Or Household itself) who are having a relationship with household (For ex a Contributor is Head of Household for some household or is a member of.)";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Contributions by Household Report',    'Contributions by Household Report',    'access CiviContribute', '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Top Donors Report', 'contribute/topDonor', 'Provides a list of the top donors during a time period you define. You can include as many donors as you want (for example, top 100 of your donors).', 'access CiviContribute', 'a:20:{s:6:"fields";a:2:{s:12:"display_name";s:1:"1";s:12:"total_amount";s:1:"1";}s:21:"receive_date_relative";s:9:"this.year";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:15:"total_range_min";s:0:"";s:15:"total_range_max";s:0:"";s:14:"total_range_op";s:2:"eq";s:17:"total_range_value";s:0:"";s:23:"contribution_type_id_op";s:2:"in";s:26:"contribution_type_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:11:"description";s:148:"Provides a list of the top donors during a time period you define. You can include as many donors as you want (for example, top 100 of your donors).";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Top Donors Report',                  'Top Donors Report',            'access CiviContribute',   '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Soft Credit Report', 'contribute/softcredit', 'Shows contributions made by contacts that have been soft-credited to other contacts.', 'access CiviContribute', 'a:23:{s:6:"fields";a:5:{s:21:"display_name_creditor";s:1:"1";s:24:"display_name_constituent";s:1:"1";s:14:"email_creditor";s:1:"1";s:14:"phone_creditor";s:1:"1";s:12:"total_amount";s:1:"1";}s:5:"id_op";s:2:"in";s:8:"id_value";a:0:{}s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:20:"Soft Credit details.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
@@ -728,7 +728,7 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Personal Campaign Page Summary', 'contribute/pcp', 'Summarizes amount raised and number of contributors for each Personal Campaign Page.', 'access CiviContribute', 'a:22:{s:6:"fields";a:8:{s:9:"sort_name";s:1:"1";s:10:"page_title";s:1:"1";s:5:"title";s:1:"1";s:11:"goal_amount";s:1:"1";s:8:"amount_1";s:1:"1";s:8:"amount_2";s:1:"1";s:7:"soft_id";s:1:"1";s:12:"receive_date";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:13:"page_title_op";s:3:"has";s:16:"page_title_value";s:0:"";s:8:"title_op";s:3:"has";s:11:"title_value";s:0:"";s:12:"amount_2_min";s:0:"";s:12:"amount_2_max";s:0:"";s:11:"amount_2_op";s:3:"lte";s:14:"amount_2_value";s:0:"";s:11:"description";s:35:"Shows Personal Campaign Page Report";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
@@ -740,29 +740,29 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Pledge Summary Report', 'pledge/detail', 'Summary of pledges including amount pledged, pledge status, next payment date, balance due, total amount paid etc.', 'access CiviPledge', 'a:27:{s:6:"fields";a:4:{s:9:"sort_name";s:1:"1";s:10:"country_id";s:1:"1";s:6:"amount";s:1:"1";s:9:"status_id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:27:"pledge_create_date_relative";s:1:"0";s:23:"pledge_create_date_from";s:0:"";s:21:"pledge_create_date_to";s:0:"";s:17:"pledge_amount_min";s:0:"";s:17:"pledge_amount_max";s:0:"";s:16:"pledge_amount_op";s:3:"lte";s:19:"pledge_amount_value";s:0:"";s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:13:"Pledge Report";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviPledge";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Pledge Summary Report',              'Pledge Summary Report',        'access CiviPledge',       '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Pledged But not Paid Report', 'pledge/pbnp', 'Pledged but not Paid Report', 'access CiviPledge', 'a:17:{s:6:"fields";a:5:{s:9:"sort_name";s:1:"1";s:18:"pledge_create_date";s:1:"1";s:6:"amount";s:1:"1";s:14:"scheduled_date";s:1:"1";s:10:"country_id";s:1:"1";}s:27:"pledge_create_date_relative";s:1:"0";s:23:"pledge_create_date_from";s:0:"";s:21:"pledge_create_date_to";s:0:"";s:23:"contribution_type_id_op";s:2:"in";s:26:"contribution_type_id_value";a:0:{}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:27:"Pledged but not Paid Report";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviPledge";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Pledged But not Paid Report',        'Pledged But not Paid Report',  'access CiviPledge',       '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES 
+VALUES
     ( @domainID, 'Bookkeeping Transactions Report', 'contribute/bookkeeping', 'Shows Bookkeeping Transactions Report', 'access CiviContribute', 'a:25:{s:6:"fields";a:10:{s:9:"sort_name";s:1:"1";s:12:"receive_date";s:1:"1";s:12:"total_amount";s:1:"1";s:20:"contribution_type_id";s:1:"1";s:7:"trxn_id";s:1:"1";s:10:"invoice_id";s:1:"1";s:12:"check_number";s:1:"1";s:21:"payment_instrument_id";s:1:"1";s:22:"contribution_status_id";s:1:"1";s:2:"id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:23:"contribution_type_id_op";s:2:"in";s:26:"contribution_type_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:1:{i:0;s:1:"1";}s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:11:"description";s:37:"Shows Bookkeeping Transactions Report";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:21:"access CiviContribute";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
@@ -775,7 +775,7 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Membership Report (Summary)', 'member/summary', 'Provides a summary of memberships by type and join date.', 'access CiviMember', 'a:18:{s:6:"fields";a:2:{s:18:"membership_type_id";s:1:"1";s:12:"total_amount";s:1:"1";}s:18:"join_date_relative";s:1:"0";s:14:"join_date_from";s:0:"";s:12:"join_date_to";s:0:"";s:21:"membership_type_id_op";s:2:"in";s:24:"membership_type_id_value";a:0:{}s:12:"status_id_op";s:2:"in";s:15:"status_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:0:{}s:9:"group_bys";a:2:{s:9:"join_date";s:1:"1";s:18:"membership_type_id";s:1:"1";}s:14:"group_bys_freq";a:1:{s:9:"join_date";s:5:"MONTH";}s:11:"description";s:56:"Provides a summary of memberships by type and join date.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
@@ -787,19 +787,19 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Membership Report (Detail)', 'member/detail', 'Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date). Can also display contributions (payments) associated with each membership.', 'access CiviMember', 'a:28:{s:6:"fields";a:5:{s:9:"sort_name";s:1:"1";s:18:"membership_type_id";s:1:"1";s:21:"membership_start_date";s:1:"1";s:19:"membership_end_date";s:1:"1";s:4:"name";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:18:"join_date_relative";s:1:"0";s:14:"join_date_from";s:0:"";s:12:"join_date_to";s:0:"";s:23:"owner_membership_id_min";s:0:"";s:23:"owner_membership_id_max";s:0:"";s:22:"owner_membership_id_op";s:3:"lte";s:25:"owner_membership_id_value";s:0:"";s:6:"tid_op";s:2:"in";s:9:"tid_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:119:"Provides a list of members along with their membership status and membership details (Join Date, Start Date, End Date).";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Membership Report (Detail)',         'Membership Report (Detail)',       'access CiviMember',        '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 -- contribution and membership report
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES 
+VALUES
     ( @domainID, 'Contribution and Membership Details', 'member/contributionDetail', 'Contribution details for any type of contribution, plus associated membership information for contributions which are in payment for memberships.', '', 'a:67:{s:6:"fields";a:12:{s:9:"sort_name";s:1:"1";s:5:"email";s:1:"1";s:5:"phone";s:1:"1";s:20:"contribution_type_id";s:1:"1";s:12:"receive_date";s:1:"1";s:12:"total_amount";s:1:"1";s:18:"membership_type_id";s:1:"1";s:21:"membership_start_date";s:1:"1";s:19:"membership_end_date";s:1:"1";s:9:"join_date";s:1:"1";s:22:"membership_status_name";s:1:"1";s:10:"country_id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:23:"contribution_type_id_op";s:2:"in";s:26:"contribution_type_id_value";a:0:{}s:24:"payment_instrument_id_op";s:2:"in";s:27:"payment_instrument_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:0:{}s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:13:"ordinality_op";s:2:"in";s:16:"ordinality_value";a:0:{}s:18:"join_date_relative";s:1:"0";s:14:"join_date_from";s:0:"";s:12:"join_date_to";s:0:"";s:30:"membership_start_date_relative";s:1:"0";s:26:"membership_start_date_from";s:0:"";s:24:"membership_start_date_to";s:0:"";s:28:"membership_end_date_relative";s:1:"0";s:24:"membership_end_date_from";s:0:"";s:22:"membership_end_date_to";s:0:"";s:23:"owner_membership_id_min";s:0:"";s:23:"owner_membership_id_max";s:0:"";s:22:"owner_membership_id_op";s:3:"lte";s:25:"owner_membership_id_value";s:0:"";s:6:"tid_op";s:2:"in";s:9:"tid_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:12:"county_id_op";s:2:"in";s:15:"county_id_value";a:0:{}s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:35:"Contribution and Membership Details";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:1:"0";s:9:"domain_id";i:1;}{s:6:"fields";a:12:{s:9:"sort_name";s:1:"1";s:5:"email";s:1:"1";s:5:"phone";s:1:"1";s:20:"contribution_type_id";s:1:"1";s:12:"receive_date";s:1:"1";s:12:"total_amount";s:1:"1";s:18:"membership_type_id";s:1:"1";s:21:"membership_start_date";s:1:"1";s:19:"membership_end_date";s:1:"1";s:9:"join_date";s:1:"1";s:22:"membership_status_name";s:1:"1";s:10:"country_id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:21:"receive_date_relative";s:1:"0";s:17:"receive_date_from";s:0:"";s:15:"receive_date_to";s:0:"";s:23:"contribution_type_id_op";s:2:"in";s:26:"contribution_type_id_value";a:0:{}s:24:"payment_instrument_id_op";s:2:"in";s:27:"payment_instrument_id_value";a:0:{}s:25:"contribution_status_id_op";s:2:"in";s:28:"contribution_status_id_value";a:0:{}s:16:"total_amount_min";s:0:"";s:16:"total_amount_max";s:0:"";s:15:"total_amount_op";s:3:"lte";s:18:"total_amount_value";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:13:"ordinality_op";s:2:"in";s:16:"ordinality_value";a:0:{}s:18:"join_date_relative";s:1:"0";s:14:"join_date_from";s:0:"";s:12:"join_date_to";s:0:"";s:30:"membership_start_date_relative";s:1:"0";s:26:"membership_start_date_from";s:0:"";s:24:"membership_start_date_to";s:0:"";s:28:"membership_end_date_relative";s:1:"0";s:24:"membership_end_date_from";s:0:"";s:22:"membership_end_date_to";s:0:"";s:23:"owner_membership_id_min";s:0:"";s:23:"owner_membership_id_max";s:0:"";s:22:"owner_membership_id_op";s:3:"lte";s:25:"owner_membership_id_value";s:0:"";s:6:"tid_op";s:2:"in";s:9:"tid_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:12:"county_id_op";s:2:"in";s:15:"county_id_value";a:0:{}s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:35:"Contribution and Membership Details";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:1:"0";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
@@ -810,67 +810,67 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Membership Report (Lapsed)', 'member/lapse', 'Provides a list of memberships that lapsed or will lapse before the date you specify.', 'access CiviMember', 'a:16:{s:6:"fields";a:5:{s:9:"sort_name";s:1:"1";s:18:"membership_type_id";s:1:"1";s:19:"membership_end_date";s:1:"1";s:4:"name";s:1:"1";s:10:"country_id";s:1:"1";}s:6:"tid_op";s:2:"in";s:9:"tid_value";a:0:{}s:28:"membership_end_date_relative";s:1:"0";s:24:"membership_end_date_from";s:0:"";s:22:"membership_end_date_to";s:0:"";s:6:"gid_op";s:2:"in";s:9:"gid_value";a:0:{}s:8:"tagid_op";s:2:"in";s:11:"tagid_value";a:0:{}s:11:"description";s:85:"Provides a list of memberships that lapsed or will lapse before the date you specify.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviMember";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Membership Report (Lapsed)',         'Membership Report (Lapsed)',       'access CiviMember',        '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Event Participant Report (List)', 'event/participantListing', 'Provides lists of participants for an event.', 'access CiviEvent', 'a:27:{s:6:"fields";a:4:{s:9:"sort_name";s:1:"1";s:8:"event_id";s:1:"1";s:9:"status_id";s:1:"1";s:7:"role_id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:8:"email_op";s:3:"has";s:11:"email_value";s:0:"";s:11:"event_id_op";s:2:"in";s:14:"event_id_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:6:"rid_op";s:2:"in";s:9:"rid_value";a:0:{}s:34:"participant_register_date_relative";s:1:"0";s:30:"participant_register_date_from";s:0:"";s:28:"participant_register_date_to";s:0:"";s:6:"eid_op";s:2:"in";s:9:"eid_value";a:0:{}s:11:"custom_4_op";s:2:"in";s:14:"custom_4_value";a:0:{}s:16:"blank_column_end";s:0:"";s:11:"description";s:44:"Provides lists of participants for an event.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:16:"access CiviEvent";s:6:"groups";s:0:"";s:7:"options";N;s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Event Participant Report (List)',    'Event Participant Report (List)',  'access CiviEvent',         '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Event Income Report (Summary)', 'event/summary', 'Provides an overview of event income. You can include key information such as event ID, registration, attendance, and income generated to help you determine the success of an event.', 'access CiviEvent', 'a:18:{s:6:"fields";a:2:{s:5:"title";s:1:"1";s:13:"event_type_id";s:1:"1";}s:5:"id_op";s:2:"in";s:8:"id_value";a:0:{}s:16:"event_type_id_op";s:2:"in";s:19:"event_type_id_value";a:0:{}s:25:"event_start_date_relative";s:1:"0";s:21:"event_start_date_from";s:0:"";s:19:"event_start_date_to";s:0:"";s:23:"event_end_date_relative";s:1:"0";s:19:"event_end_date_from";s:0:"";s:17:"event_end_date_to";s:0:"";s:11:"description";s:181:"Provides an overview of event income. You can include key information such as event ID, registration, attendance, and income generated to help you determine the success of an event.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:16:"access CiviEvent";s:6:"charts";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Event Income Report (Summary)',      'Event Income Report (Summary)',    'access CiviEvent',         '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES 
+VALUES
     ( @domainID, 'Event Income Report (Detail)', 'event/income', 'Helps you to analyze the income generated by an event. The report can include details by participant type, status and payment method.', 'access CiviEvent', 'a:7:{s:5:"id_op";s:2:"in";s:8:"id_value";N;s:11:"description";s:133:"Helps you to analyze the income generated by an event. The report can include details by participant type, status and payment method.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:16:"access CiviEvent";}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Event Income Report (Detail)',       'Event Income Report (Detail)',     'access CiviEvent',         '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES    
+VALUES
     ( @domainID, 'Attendee List', 'event/participantListing', 'Provides lists of event attendees.', 'access CiviEvent', 'a:27:{s:6:"fields";a:4:{s:9:"sort_name";s:1:"1";s:8:"event_id";s:1:"1";s:9:"status_id";s:1:"1";s:7:"role_id";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:8:"email_op";s:3:"has";s:11:"email_value";s:0:"";s:11:"event_id_op";s:2:"in";s:14:"event_id_value";a:0:{}s:6:"sid_op";s:2:"in";s:9:"sid_value";a:0:{}s:6:"rid_op";s:2:"in";s:9:"rid_value";a:0:{}s:34:"participant_register_date_relative";s:1:"0";s:30:"participant_register_date_from";s:0:"";s:28:"participant_register_date_to";s:0:"";s:6:"eid_op";s:2:"in";s:9:"eid_value";a:0:{}s:11:"custom_4_op";s:2:"in";s:14:"custom_4_value";a:0:{}s:16:"blank_column_end";s:0:"";s:11:"description";s:44:"Provides lists of participants for an event.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:16:"access CiviEvent";s:6:"groups";s:0:"";s:7:"options";N;s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID();
 INSERT INTO civicrm_navigation
     ( domain_id, url, label, name, permission, permission_operator, parent_id, is_active, has_separator, weight )
-VALUES    
+VALUES
     ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'),    'Attendee List',                      'Attendee List',                                       'access CiviEvent',         '',  @reportlastID,  '1', NULL, @instanceID+2 );
 UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
 
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES 
+VALUES
     ( @domainID, 'Grant Report (Detail)', 'grant/detail', 'Grant Report Detail', 'access CiviGrant', 'a:40:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:25:"application_received_date";s:1:"1";}s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:12:"gender_id_op";s:2:"in";s:15:"gender_id_value";a:0:{}s:6:"id_min";s:0:"";s:6:"id_max";s:0:"";s:5:"id_op";s:3:"lte";s:8:"id_value";s:0:"";s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"grant_type_op";s:2:"in";s:16:"grant_type_value";a:0:{}s:12:"status_id_op";s:2:"in";s:15:"status_id_value";a:0:{}s:18:"amount_granted_min";s:0:"";s:18:"amount_granted_max";s:0:"";s:17:"amount_granted_op";s:3:"lte";s:20:"amount_granted_value";s:0:"";s:20:"amount_requested_min";s:0:"";s:20:"amount_requested_max";s:0:"";s:19:"amount_requested_op";s:3:"lte";s:22:"amount_requested_value";s:0:"";s:34:"application_received_date_relative";s:1:"0";s:30:"application_received_date_from";s:0:"";s:28:"application_received_date_to";s:0:"";s:28:"money_transfer_date_relative";s:1:"0";s:24:"money_transfer_date_from";s:0:"";s:22:"money_transfer_date_to";s:0:"";s:23:"grant_due_date_relative";s:1:"0";s:19:"grant_due_date_from";s:0:"";s:17:"grant_due_date_to";s:0:"";s:11:"description";s:19:"Grant Report Detail";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:16:"access CiviGrant";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID( );
 INSERT INTO civicrm_navigation
@@ -882,7 +882,7 @@ UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @
 
 INSERT INTO `civicrm_report_instance`
     ( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
-VALUES 
+VALUES
     ( @domainID, 'Grant Report (Statistics)', 'grant/statistics', 'Grant Report Statistics', 'access CiviGrant', 'a:42:{s:6:"fields";a:2:{s:18:"summary_statistics";s:1:"1";s:13:"grant_type_id";s:1:"1";}s:34:"application_received_date_relative";s:1:"0";s:30:"application_received_date_from";s:0:"";s:28:"application_received_date_to";s:0:"";s:22:"decision_date_relative";s:1:"0";s:18:"decision_date_from";s:0:"";s:16:"decision_date_to";s:0:"";s:28:"money_transfer_date_relative";s:1:"0";s:24:"money_transfer_date_from";s:0:"";s:22:"money_transfer_date_to";s:0:"";s:23:"grant_due_date_relative";s:1:"0";s:19:"grant_due_date_from";s:0:"";s:17:"grant_due_date_to";s:0:"";s:13:"grant_type_op";s:2:"in";s:16:"grant_type_value";a:0:{}s:12:"status_id_op";s:2:"in";s:15:"status_id_value";a:0:{}s:20:"amount_requested_min";s:0:"";s:20:"amount_requested_max";s:0:"";s:19:"amount_requested_op";s:3:"lte";s:22:"amount_requested_value";s:0:"";s:18:"amount_granted_min";s:0:"";s:18:"amount_granted_max";s:0:"";s:17:"amount_granted_op";s:3:"lte";s:20:"amount_granted_value";s:0:"";s:24:"grant_report_received_op";s:2:"eq";s:27:"grant_report_received_value";s:0:"";s:12:"gender_id_op";s:2:"in";s:15:"gender_id_value";a:0:{}s:15:"contact_type_op";s:2:"in";s:18:"contact_type_value";a:0:{}s:12:"region_id_op";s:2:"in";s:15:"region_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:11:"description";s:23:"Grant Report Statistics";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:1:"0";s:9:"parent_id";s:0:"";s:9:"domain_id";i:1;}');
 SET @instanceID:=LAST_INSERT_ID( );
 INSERT INTO civicrm_navigation

From d551d3d6abd6baebd5df4b44edaa119d439b4157 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 8 Sep 2020 11:35:40 +1000
Subject: [PATCH 266/834] dev/core#1486 Remove Foreign Keys relating to
 contacts from ACL Cache tables and replace one with an index on contact_id

Create index on upgrade
---
 CRM/ACL/DAO/ACLCache.php                      | 12 +++++++++---
 CRM/Contact/DAO/ACLContactCache.php           | 18 +-----------------
 CRM/Core/BAO/SchemaHandler.php                |  4 ++--
 CRM/Core/DAO/AllCoreTables.data.php           | 10 +++++-----
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php |  8 ++++++++
 xml/schema/ACL/Cache.xml                      |  6 ++++++
 xml/schema/Contact/ACLContactCache.xml        |  1 +
 7 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/CRM/ACL/DAO/ACLCache.php b/CRM/ACL/DAO/ACLCache.php
index 671354acb388..4418878c769b 100644
--- a/CRM/ACL/DAO/ACLCache.php
+++ b/CRM/ACL/DAO/ACLCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:cec3d7c7aced95902840b72829550156)
+ * (GenCodeChecksum:7faa5879056a56b463304bd81829afda)
  */
 
 /**
@@ -85,7 +85,6 @@ public static function getEntityTitle($plural = FALSE) {
   public static function getReferenceColumns() {
     if (!isset(Civi::$statics[__CLASS__]['links'])) {
       Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
-      Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id');
       Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'acl_id', 'civicrm_acl', 'id');
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
     }
@@ -123,7 +122,6 @@ public static function &fields() {
           'entity' => 'ACLCache',
           'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
-          'FKClassName' => 'CRM_Contact_DAO_Contact',
           'html' => [
             'type' => 'EntityRef',
           ],
@@ -231,6 +229,14 @@ public static function &export($prefix = FALSE) {
    */
   public static function indices($localize = TRUE) {
     $indices = [
+      'index_contact_id' => [
+        'name' => 'index_contact_id',
+        'field' => [
+          0 => 'contact_id',
+        ],
+        'localizable' => FALSE,
+        'sig' => 'civicrm_acl_cache::0::contact_id',
+      ],
       'index_acl_id' => [
         'name' => 'index_acl_id',
         'field' => [
diff --git a/CRM/Contact/DAO/ACLContactCache.php b/CRM/Contact/DAO/ACLContactCache.php
index d5383fbc1d58..eb34f360002d 100644
--- a/CRM/Contact/DAO/ACLContactCache.php
+++ b/CRM/Contact/DAO/ACLContactCache.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/ACLContactCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ff86d1eed99d09ea6768d93b3cc39973)
+ * (GenCodeChecksum:4eaf1e99ce247c430fc280cc6ce68538)
  */
 
 /**
@@ -76,21 +76,6 @@ public static function getEntityTitle($plural = FALSE) {
     return $plural ? ts('ACLContact Caches') : ts('ACLContact Cache');
   }
 
-  /**
-   * Returns foreign keys and entity references.
-   *
-   * @return array
-   *   [CRM_Core_Reference_Interface]
-   */
-  public static function getReferenceColumns() {
-    if (!isset(Civi::$statics[__CLASS__]['links'])) {
-      Civi::$statics[__CLASS__]['links'] = static::createReferenceColumns(__CLASS__);
-      Civi::$statics[__CLASS__]['links'][] = new CRM_Core_Reference_Basic(self::getTableName(), 'contact_id', 'civicrm_contact', 'id');
-      CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'links_callback', Civi::$statics[__CLASS__]['links']);
-    }
-    return Civi::$statics[__CLASS__]['links'];
-  }
-
   /**
    * Returns all the column names of this table
    *
@@ -135,7 +120,6 @@ public static function &fields() {
           'entity' => 'ACLContactCache',
           'bao' => 'CRM_Contact_DAO_ACLContactCache',
           'localizable' => 0,
-          'FKClassName' => 'CRM_Contact_DAO_Contact',
           'add' => '3.1',
         ],
         'operation' => [
diff --git a/CRM/Core/BAO/SchemaHandler.php b/CRM/Core/BAO/SchemaHandler.php
index a6c9845a224d..5a8d4fa93fa9 100644
--- a/CRM/Core/BAO/SchemaHandler.php
+++ b/CRM/Core/BAO/SchemaHandler.php
@@ -365,9 +365,9 @@ public static function changeUniqueToIndex($tableName, $dropUnique = TRUE) {
    *
    * @param $tables
    *   Tables to create index for in the format:
-   *     array('civicrm_entity_table' => 'entity_id')
+   *     ['civicrm_entity_table' => ['entity_id']]
    *     OR
-   *     array('civicrm_entity_table' => array('entity_id', 'entity_table'))
+   *     array['civicrm_entity_table' => array['entity_id', 'entity_table']]
    *   The latter will create a combined index on the 2 keys (in order).
    *
    *  Side note - when creating combined indexes the one with the most variation
diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
index fcf35a9eed48..fdbda3a704c3 100644
--- a/CRM/Core/DAO/AllCoreTables.data.php
+++ b/CRM/Core/DAO/AllCoreTables.data.php
@@ -77,6 +77,11 @@
     'class' => 'CRM_ACL_DAO_ACL',
     'table' => 'civicrm_acl',
   ],
+  'CRM_ACL_DAO_ACLCache' => [
+    'name' => 'ACLCache',
+    'class' => 'CRM_ACL_DAO_ACLCache',
+    'table' => 'civicrm_acl_cache',
+  ],
   'CRM_ACL_DAO_EntityRole' => [
     'name' => 'EntityRole',
     'class' => 'CRM_ACL_DAO_EntityRole',
@@ -392,11 +397,6 @@
     'class' => 'CRM_Core_DAO_StatusPreference',
     'table' => 'civicrm_status_pref',
   ],
-  'CRM_ACL_DAO_ACLCache' => [
-    'name' => 'ACLCache',
-    'class' => 'CRM_ACL_DAO_ACLCache',
-    'table' => 'civicrm_acl_cache',
-  ],
   'CRM_Contact_DAO_Group' => [
     'name' => 'Group',
     'class' => 'CRM_Contact_DAO_Group',
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 50c35a60e80c..0f4ba135ebcf 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -73,6 +73,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
   public function upgrade_5_31_alpha1($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Remove Eway Single Currency Payment Processor type if not used or install the new extension for it', 'enableEwaySingleExtension');
+    $this->addTask('dev/core#1486 Remove FKs from ACL Cache tables', 'removeFKsFromACLCacheTables');
   }
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
@@ -106,4 +107,11 @@ public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
     return TRUE;
   }
 
+  public static function removeFKsFromACLCacheTables(CRM_Queue_TaskContext $ctx) {
+    CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_acl_contact_cache', 'FK_civicrm_acl_contact_cache_contact_id');
+    CRM_Core_BAO_SchemaHandler::safeRemoveFK('civicrm_acl_cache', 'FK_civicrm_acl_cache_contact_id');
+    CRM_Core_BAO_SchemaHandler::createIndexes(['civicrm_acl_cache' => ['contact_id']]);
+    return TRUE;
+  }
+
 }
diff --git a/xml/schema/ACL/Cache.xml b/xml/schema/ACL/Cache.xml
index 869eadb96189..8b54897737ae 100644
--- a/xml/schema/ACL/Cache.xml
+++ b/xml/schema/ACL/Cache.xml
@@ -33,8 +33,14 @@
     <table>civicrm_contact</table>
     <key>id</key>
     <add>1.6</add>
+    <drop>5.31</drop>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
+  <index>
+    <name>index_contact_id</name>
+    <fieldName>contact_id</fieldName>
+    <add>5.31</add>
+  </index>
   <field>
     <name>acl_id</name>
     <title>Cache ACL</title>
diff --git a/xml/schema/Contact/ACLContactCache.xml b/xml/schema/Contact/ACLContactCache.xml
index 450b56b693eb..75603bdf57a9 100644
--- a/xml/schema/Contact/ACLContactCache.xml
+++ b/xml/schema/Contact/ACLContactCache.xml
@@ -38,6 +38,7 @@
     <table>civicrm_contact</table>
     <key>id</key>
     <add>3.1</add>
+    <drop>5.31</drop>
     <onDelete>CASCADE</onDelete>
   </foreignKey>
   <field>

From 4de6742ddc78d629d0df2ec1d2efc2a88b4c92e6 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 16 Sep 2020 10:16:03 +1000
Subject: [PATCH 267/834] [NFC] Enable APIv4 testing on the Fin ACL Extension
 Line Item test

---
 ext/financialacls/tests/phpunit/LineItemTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/financialacls/tests/phpunit/LineItemTest.php b/ext/financialacls/tests/phpunit/LineItemTest.php
index 573847299487..0c4c4b9c720f 100644
--- a/ext/financialacls/tests/phpunit/LineItemTest.php
+++ b/ext/financialacls/tests/phpunit/LineItemTest.php
@@ -39,8 +39,9 @@ public function setUpHeadless() {
 
   /**
    * Test api applies permissions on line item actions (delete & get).
+   * @dataProvider versionThreeAndFour
    */
-  public function testLineItemApiPermissions() {
+  public function testLineItemApiPermissions($version) {
     $contact1 = $this->individualCreate();
     $defaultPriceFieldID = $this->getDefaultPriceFieldID();
     $order = $this->callAPISuccess('Order', 'create', [
@@ -65,6 +66,7 @@ public function testLineItemApiPermissions() {
         ],
       ],
     ]);
+    $this->_apiversion = $version;
 
     $this->setPermissions([
       'access CiviCRM',

From ea8b123fb18c91ec62e00c6bf79328434983454c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Sep 2020 18:28:47 -0700
Subject: [PATCH 268/834] release-notes/5.29.1.md

---
 release-notes.md        |  9 +++++++++
 release-notes/5.29.1.md | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 release-notes/5.29.1.md

diff --git a/release-notes.md b/release-notes.md
index 0171d9a5981c..970335ce2d46 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -26,6 +26,15 @@ Released October 7, 2020
 - **[Credits](release-notes/5.30.0.md#credits)**
 - **[Feedback](release-notes/5.30.0.md#feedback)**
 
+## CiviCRM 5.29.1
+
+Released September 15, 2020
+
+- **[Synopsis](release-notes/5.29.1.md#synopsis)**
+- **[Bugs resolved](release-notes/5.29.1.md#bugs)**
+- **[Credits](release-notes/5.29.1.md#credits)**
+- **[Feedback](release-notes/5.29.1.md#feedback)**
+
 ## CiviCRM 5.29.0
 
 Released September 2, 2020
diff --git a/release-notes/5.29.1.md b/release-notes/5.29.1.md
new file mode 100644
index 000000000000..5ad7bbbc81d7
--- /dev/null
+++ b/release-notes/5.29.1.md
@@ -0,0 +1,41 @@
+# CiviCRM 5.29.1
+
+Released September 15, 2020
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |          |
+| --------------------------------------------------------------- | -------- |
+| Change the database schema?                                     | no       |
+| Alter the API?                                                  | no       |
+| Require attention to configuration options?                     | no       |
+| Fix problems installing or upgrading to a previous version?     | no       |
+| Introduce features?                                             | no       |
+| **Fix bugs?**                                                   | **yes**  |
+
+## <a name="bugs"></a>Bugs resolved
+
+* **_APIv3_: Searching list of custom-fields using traditional field-types ([dev/core#1996](https://lab.civicrm.org/dev/core/-/issues/1996): [#18347](https://github.com/civicrm/civicrm-core/pull/18347))**
+* **_Dedupe_: Merging contacts with "Dashboard" settings produces error ([dev/core#1998](https://lab.civicrm.org/dev/core/-/issues/1998): [#18353](https://github.com/civicrm/civicrm-core/pull/18353))**
+* **_Message Templates_: Permission error affects some authorized users ([dev/core#2008](https://lab.civicrm.org/dev/core/-/issues/2008): [#18437](https://github.com/civicrm/civicrm-core/pull/18437))**
+* **_PayPal Pro_: Validation error prevents payment submission ([dev/financial#147](https://lab.civicrm.org/dev/financial/-/issues/147): [#18459](https://github.com/civicrm/civicrm-core/pull/18459))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin Cristiano; Samuele Masetto;
+SYSTOPIA Organisationsberatung - Björn Endres; Maynard Smith; Korlon - Stuart Gaston; JMA
+Consulting - Seamus Lee; CiviCoop - Jaap Jansma; CiviCRM - Coleman Watts, Tim Otten; Circle
+Interactive - Pradeep Nayak
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.

From 66aa0f5e2415b70ad5da5e51484b8e1b94754ad7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 14:15:28 -0700
Subject: [PATCH 269/834] Import skeletal code

---
 ext/afform/LICENSE.txt           | 667 +++++++++++++++++++++++++++++++
 ext/afform/README.md             |  44 ++
 ext/afform/afform.civix.php      | 460 +++++++++++++++++++++
 ext/afform/afform.php            | 163 ++++++++
 ext/afform/images/screenshot.png | Bin 0 -> 11775 bytes
 ext/afform/info.xml              |  27 ++
 6 files changed, 1361 insertions(+)
 create mode 100644 ext/afform/LICENSE.txt
 create mode 100644 ext/afform/README.md
 create mode 100644 ext/afform/afform.civix.php
 create mode 100644 ext/afform/afform.php
 create mode 100644 ext/afform/images/screenshot.png
 create mode 100644 ext/afform/info.xml

diff --git a/ext/afform/LICENSE.txt b/ext/afform/LICENSE.txt
new file mode 100644
index 000000000000..1cb1cd35cefe
--- /dev/null
+++ b/ext/afform/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: org.civicrm.afform
+Copyright (C) 2018, CiviCRM LLC <info@civicrm.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/afform/README.md b/ext/afform/README.md
new file mode 100644
index 000000000000..bd0e8541632e
--- /dev/null
+++ b/ext/afform/README.md
@@ -0,0 +1,44 @@
+# org.civicrm.afform
+
+![Screenshot](/images/screenshot.png)
+
+(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+
+The extension is licensed under [AGPL-3.0](LICENSE.txt).
+
+## Requirements
+
+* PHP v5.4+
+* CiviCRM (*FIXME: Version number*)
+
+## Installation (Web UI)
+
+This extension has not yet been published for installation via the web UI.
+
+## Installation (CLI, Zip)
+
+Sysadmins and developers may download the `.zip` file for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+cd <extension-dir>
+cv dl org.civicrm.afform@https://github.com/FIXME/org.civicrm.afform/archive/master.zip
+```
+
+## Installation (CLI, Git)
+
+Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+git clone https://github.com/FIXME/org.civicrm.afform.git
+cv en afform
+```
+
+## Usage
+
+(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+
+## Known Issues
+
+(* FIXME *)
diff --git a/ext/afform/afform.civix.php b/ext/afform/afform.civix.php
new file mode 100644
index 000000000000..2d7c1c54b8e5
--- /dev/null
+++ b/ext/afform/afform.civix.php
@@ -0,0 +1,460 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_Afform_ExtensionUtil {
+  const SHORT_NAME = "afform";
+  const LONG_NAME = "org.civicrm.afform";
+  const CLASS_PREFIX = "CRM_Afform";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = array()) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = array(self::LONG_NAME, NULL);
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function _afform_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = array($extDir, $template->template_dir);
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function _afform_civix_civicrm_xmlMenu(&$files) {
+  foreach (_afform_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function _afform_civix_civicrm_install() {
+  _afform_civix_civicrm_config();
+  if ($upgrader = _afform_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function _afform_civix_civicrm_postInstall() {
+  _afform_civix_civicrm_config();
+  if ($upgrader = _afform_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onPostInstall'))) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function _afform_civix_civicrm_uninstall() {
+  _afform_civix_civicrm_config();
+  if ($upgrader = _afform_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function _afform_civix_civicrm_enable() {
+  _afform_civix_civicrm_config();
+  if ($upgrader = _afform_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onEnable'))) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @return mixed
+ */
+function _afform_civix_civicrm_disable() {
+  _afform_civix_civicrm_config();
+  if ($upgrader = _afform_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onDisable'))) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *                for 'enqueue', returns void
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function _afform_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _afform_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_Afform_Upgrader
+ */
+function _afform_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/Afform/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_Afform_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param $dir string, base dir
+ * @param $pattern string, glob pattern, eg "*.txt"
+ * @return array(string)
+ */
+function _afform_civix_find_files($dir, $pattern) {
+  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = array($dir);
+  $result = array();
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_afform_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry{0} == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function _afform_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _afform_civix_find_files(__DIR__, '*.mgd.php');
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      $entities[] = $e;
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function _afform_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_afform_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      CRM_Core_Error::fatal($errorMessage);
+      // throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = array(
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    );
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function _afform_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _afform_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ * @return array, possibly empty
+ */
+function _afform_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : array();
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ */
+function _afform_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = array(
+      'attributes' => array_merge(array(
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ), $item),
+    );
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = array();
+        }
+        $found = _afform_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _afform_civix_navigationMenu(&$nodes) {
+  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+    _afform_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _afform_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _afform_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _afform_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _afform_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function _afform_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+
+function _afform_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, array (
+  ));
+}
diff --git a/ext/afform/afform.php b/ext/afform/afform.php
new file mode 100644
index 000000000000..0e8192e7a615
--- /dev/null
+++ b/ext/afform/afform.php
@@ -0,0 +1,163 @@
+<?php
+
+require_once 'afform.civix.php';
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function afform_civicrm_config(&$config) {
+  _afform_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function afform_civicrm_xmlMenu(&$files) {
+  _afform_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function afform_civicrm_install() {
+  _afform_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function afform_civicrm_postInstall() {
+  _afform_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function afform_civicrm_uninstall() {
+  _afform_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function afform_civicrm_enable() {
+  _afform_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ */
+function afform_civicrm_disable() {
+  _afform_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function afform_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _afform_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function afform_civicrm_managed(&$entities) {
+  _afform_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function afform_civicrm_caseTypes(&$caseTypes) {
+  _afform_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function afform_civicrm_angularModules(&$angularModules) {
+  _afform_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function afform_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _afform_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+function afform_civicrm_entityTypes(&$entityTypes) {
+  _afform_civix_civicrm_entityTypes($entityTypes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
+ *
+function afform_civicrm_preProcess($formName, &$form) {
+
+} // */
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
+ *
+function afform_civicrm_navigationMenu(&$menu) {
+  _afform_civix_insert_navigation_menu($menu, 'Mailings', array(
+    'label' => E::ts('New subliminal message'),
+    'name' => 'mailing_subliminal_message',
+    'url' => 'civicrm/mailing/subliminal',
+    'permission' => 'access CiviMail',
+    'operator' => 'OR',
+    'separator' => 0,
+  ));
+  _afform_civix_navigationMenu($menu);
+} // */
diff --git a/ext/afform/images/screenshot.png b/ext/afform/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6765b696fa03249ac2cd605d5f0e4aa000ad6dad
GIT binary patch
literal 11775
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
IrTdTn0|#irRsaA1

literal 0
HcmV?d00001

diff --git a/ext/afform/info.xml b/ext/afform/info.xml
new file mode 100644
index 000000000000..5a7b802b9dfb
--- /dev/null
+++ b/ext/afform/info.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<extension key="org.civicrm.afform" type="module">
+  <file>afform</file>
+  <name>FIXME</name>
+  <description>FIXME</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>CiviCRM LLC</author>
+    <email>info@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://FIXME</url>
+    <url desc="Documentation">http://FIXME</url>
+    <url desc="Support">http://FIXME</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2018-06-12</releaseDate>
+  <version>1.0</version>
+  <develStage>alpha</develStage>
+  <compatibility>
+    <ver>4.7</ver>
+  </compatibility>
+  <comments>This is a new, undeveloped module</comments>
+  <civix>
+    <namespace>CRM/Afform</namespace>
+  </civix>
+</extension>

From 6bbb80bafac2c1b17a987449cdd28563c99fcb35 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 17:47:06 -0700
Subject: [PATCH 270/834] Proof-of-concept - Array<=>Html mapper

---
 ext/afform/CRM/Afform/ArrayHtml.php | 109 ++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 ext/afform/CRM/Afform/ArrayHtml.php

diff --git a/ext/afform/CRM/Afform/ArrayHtml.php b/ext/afform/CRM/Afform/ArrayHtml.php
new file mode 100644
index 000000000000..c6dd28e8c5f6
--- /dev/null
+++ b/ext/afform/CRM/Afform/ArrayHtml.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * Class CRM_Afform_ArrayHtml
+ *
+ * FIXME This a quick-and-dirty array<=>html mapping.
+ */
+class CRM_Afform_ArrayHtml {
+
+  const DEFAULT_TAG = 'div';
+
+  /**
+   * @param array $array
+   *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
+   * @return string
+   *   Ex: '<div class="greeting">Hello world</div>'
+   */
+  public function convertArrayToHtml($array) {
+    $tag = empty($array['#tag']) ? self::DEFAULT_TAG : $array['#tag'];
+    unset($array['#tag']);
+    $children = empty($array['#children']) ? self::DEFAULT_TAG : $array['#children'];
+    unset($array['#children']);
+
+    $buf = '<' . $tag;
+    foreach ($array as $attrName => $attrValue) {
+      if ($attrName{0} === '#') {
+        continue;
+      }
+      if (!preg_match('/^[a-zA-Z0-9\-]+$/', $attrName)) {
+        throw new \RuntimeException("Malformed HTML attribute");
+      }
+      if (is_string($attrValue)) {
+        $buf .= sprintf(' %s="%s"', $attrName, htmlentities($attrValue)); // FIXME attribute encoding
+      }
+      elseif (is_array($attrValue) && $this->allowStructuredAttribute($tag, $attrName)) {
+        $buf .= sprintf(' %s="%s"', $attrName, htmlentities(json_encode($attrValue))); // FIXME attribute encoding
+      }
+    }
+    $buf .= '>';
+
+    foreach ($children as $child) {
+      if (is_string($child)) {
+        $buf .= htmlentities($child);
+      }
+      elseif (is_array($child)) {
+        $buf .= $this->convertArrayToHtml($child);
+      }
+    }
+
+    $buf .= '</' . $tag . '>';
+    return $buf;
+  }
+
+  /**
+   * @param string $html
+   *   Ex: '<div class="greeting">Hello world</div>'
+   * @return array
+   *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
+   */
+  public function convertHtmlToArray($html) {
+    $doc = new DOMDocument();
+    $doc->loadHTML("<html><body>$html</body></html>");
+
+    // FIXME: Valid expected number of child nodes
+
+    foreach ($doc->childNodes as $htmlNode) {
+      if ($htmlNode instanceof DOMElement && $htmlNode->tagName === 'html') {
+        return $this->convertNodeToArray($htmlNode->firstChild->firstChild);
+      }
+    }
+
+    return NULL;
+  }
+
+  /**
+   * @param \DOMNode $node
+   * @return array|string
+   */
+  public function convertNodeToArray($node) {
+    if ($node instanceof DOMElement) {
+      $arr = ['#tag' => $node->tagName];
+      foreach ($node->attributes as $attribute) {
+        $txt = $attribute->textContent;
+        if ($txt{0} === '{' && $txt{1} !== '{' && $this->allowStructuredAttribute($node->tagName, $attribute->name)) {
+          $arr[$attribute->name] = sprintf('PARSE-ME(%s)', $txt);
+        }
+        else {
+          $arr[$attribute->name] = $txt;
+        }
+      }
+      foreach ($node->childNodes as $childNode) {
+        $arr['#children'][] = $this->convertNodeToArray($childNode);
+      }
+      return $arr;
+    }
+    elseif ($node instanceof DOMText) {
+      return $node->textContent;
+    }
+    else {
+      throw new \RuntimeException("Unrecognized DOM node");
+    }
+  }
+
+  public function allowStructuredAttribute($tag, $attr) {
+    // FIXME: use whitelist of allowed angular directives
+    return FALSE;
+  }
+
+}

From a6db0d804101fffc3fdeaab7547c05db06232fd4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 17:47:23 -0700
Subject: [PATCH 271/834] Proof-of-concept - File scanner

---
 ext/afform/CRM/Afform/AfformScanner.php | 169 ++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 ext/afform/CRM/Afform/AfformScanner.php

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/CRM/Afform/AfformScanner.php
new file mode 100644
index 000000000000..d15cc855d7f6
--- /dev/null
+++ b/ext/afform/CRM/Afform/AfformScanner.php
@@ -0,0 +1,169 @@
+<?php
+
+/**
+ * Class CRM_Afform_AfformScanner
+ *
+ * The AfformScanner searches the extensions and `civicrm.files` for subfolders
+ * named `afform`. Each item in there is interpreted as a form instance.
+ *
+ * To reduce file-scanning, we keep a cache of file paths.
+ */
+class CRM_Afform_AfformScanner {
+
+  const METADATA_FILE = 'meta.json';
+
+  const DEFAULT_REQUIRES = 'afformCore';
+
+  /**
+   * @var CRM_Utils_Cache_Interface
+   */
+  protected $cache;
+
+  /**
+   * CRM_Afform_AfformScanner constructor.
+   */
+  public function __construct() {
+    // TODO Manage this is a service, and inject the cache service.
+    $this->cache = new CRM_Utils_Cache_SqlGroup([
+      'group' => md5('afform_' . CRM_Core_Config_Runtime::getId() . $this->getSiteLocalPath()),
+      'prefetch' => FALSE,
+    ]);
+  }
+
+  /**
+   * @return array
+   *   Ex: ['view-individual' => ['/var/www/foo/afform/view-individual']]
+   */
+  public function findFilePaths() {
+    if (!CRM_Core_Config::singleton()->debug) {
+      // FIXME: Use a separate setting. Maybe use the asset-builder cache setting?
+      $paths = $this->cache->get('allPaths');
+      if ($paths !== NULL) {
+        return $paths;
+      }
+    }
+
+    $paths = array();
+
+    $mapper = CRM_Extension_System::singleton()->getMapper();
+    foreach ($mapper->getModules() as $module) {
+      /** @var $module CRM_Core_Module */
+      if ($module->is_active) {
+        $this->appendFilePaths($paths, dirname($mapper->keyToPath($module->name)) . DIRECTORY_SEPARATOR . 'afform', 20);
+      }
+    }
+
+    $this->appendFilePaths($paths, $this->getSiteLocalPath(), 10);
+
+    $this->cache->set('allPaths', $paths);
+    return $paths;
+  }
+
+  /**
+   * Get the full path to the given file.
+   *
+   * @param string $formName
+   *   Ex: 'view-individual'
+   * @param string $subFile
+   *   Ex: 'meta.json'
+   * @return string|NULL
+   *   Ex: '/var/www/sites/default/files/civicrm/afform/view-individual'
+   */
+  public function findFilePath($formName, $subFile) {
+    $paths = $this->findFilePaths();
+
+    if (isset($paths[$formName])) {
+      foreach ($paths[$formName] as $path) {
+        if (file_exists($path . DIRECTORY_SEPARATOR . $subFile)) {
+          return $path . DIRECTORY_SEPARATOR . $subFile;
+        }
+      }
+    }
+
+    return NULL;
+  }
+
+  /**
+   * Determine the path where we can write our own customized/overriden
+   * version of a file.
+   *
+   * @param string $formName
+   *   Ex: 'view-individual'
+   * @param string $file
+   *   Ex: 'meta.json'
+   * @return string|NULL
+   *   Ex: '/var/www/sites/default/files/civicrm/afform/view-individual'
+   */
+  public function createSiteLocalPath($formName, $file) {
+    return $this->getSiteLocalPath() . DIRECTORY_SEPARATOR . $formName . DIRECTORY_SEPARATOR . $file;
+  }
+
+  public function clear() {
+    $this->cache->flush();
+  }
+
+  /**
+   * Get the effective metadata for a form.
+   *
+   * @param string $name
+   *   Ex: 'view-individual'
+   * @return array
+   *   An array with some mix of the following keys: name, title, description, route, requires
+   *   Ex: [
+   *     'name' => 'view-individual',
+   *     'title' => 'View an individual contact',
+   *     'route' => 'civicrm/view-individual',
+   *     'requires' => ['afform'],
+   *   ]
+   */
+  public function getMeta($name) {
+    // FIXME error checking
+    $metaFile = $this->findFilePath($name, self::METADATA_FILE);
+    if (!$metaFile) {
+      return NULL;
+    }
+
+    $defaults = [
+      'name' => $name,
+      'requires' => explode(',', self::DEFAULT_REQUIRES),
+      'title' => '',
+      'description' => '',
+    ];
+
+    return array_merge($defaults, json_decode(file_get_contents($metaFile), 1));
+  }
+
+  /**
+   * @param array $formPaths
+   *   List of all form paths.
+   *   Ex: ['foo' => [0 => '/var/www/org.example.foobar/afform//foo']]
+   * @param string $parent
+   *   Ex: '/var/www/org.example.foobar/afform/'
+   * @param int $priority
+   *   Lower priority files override higher priority files.
+   */
+  private function appendFilePaths(&$formPaths, $parent, $priority) {
+    $parent = CRM_Utils_File::addTrailingSlash($parent);
+    if (is_dir($parent) && $handle = opendir($parent)) {
+      while (FALSE !== ($entry = readdir($handle))) {
+        if ($entry{0} !== '.' && is_dir($parent . $entry)) {
+          $formPaths[$entry][$priority] = $parent . $entry;
+          ksort($formPaths[$entry]);
+        }
+      }
+    }
+  }
+
+  /**
+   * Get the path where site-local form customizations are stored.
+   *
+   * @return mixed|string
+   *   Ex: '/var/www/sites/default/files/civicrm/afform'.
+   */
+  private function getSiteLocalPath() {
+    // TODO Allow a setting override.
+    // return Civi::paths()->getPath(Civi::settings()->get('afformPath'));
+    return Civi::paths()->getPath('[civicrm.files]/afform');
+  }
+
+}

From e691f0696e760e40094ae1d291fdf540cacb4864 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 18:05:26 -0700
Subject: [PATCH 272/834] Add phpunit skeleton

---
 ext/afform/phpunit.xml.dist            | 18 ++++++++
 ext/afform/tests/phpunit/bootstrap.php | 62 ++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 ext/afform/phpunit.xml.dist
 create mode 100644 ext/afform/tests/phpunit/bootstrap.php

diff --git a/ext/afform/phpunit.xml.dist b/ext/afform/phpunit.xml.dist
new file mode 100644
index 000000000000..0f9f25d307a9
--- /dev/null
+++ b/ext/afform/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="false" bootstrap="tests/phpunit/bootstrap.php">
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <directory>./tests/phpunit</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./</directory>
+    </whitelist>
+  </filter>
+  <listeners>
+    <listener class="Civi\Test\CiviTestListener">
+      <arguments/>
+    </listener>
+  </listeners>
+</phpunit>
diff --git a/ext/afform/tests/phpunit/bootstrap.php b/ext/afform/tests/phpunit/bootstrap.php
new file mode 100644
index 000000000000..afa827e95ae8
--- /dev/null
+++ b/ext/afform/tests/phpunit/bootstrap.php
@@ -0,0 +1,62 @@
+<?php
+
+ini_set('memory_limit', '2G');
+ini_set('safe_mode', 0);
+eval(cv('php:boot --level=classloader', 'phpcode'));
+
+// Allow autoloading of PHPUnit helper classes in this extension.
+$loader = new \Composer\Autoload\ClassLoader();
+$loader->add('CRM_', __DIR__);
+$loader->add('Civi\\', __DIR__);
+$loader->add('api_', __DIR__);
+$loader->add('api\\', __DIR__);
+$loader->register();
+
+/**
+ * Call the "cv" command.
+ *
+ * @param string $cmd
+ *   The rest of the command to send.
+ * @param string $decode
+ *   Ex: 'json' or 'phpcode'.
+ * @return string
+ *   Response output (if the command executed normally).
+ * @throws \RuntimeException
+ *   If the command terminates abnormally.
+ */
+function cv($cmd, $decode = 'json') {
+  $cmd = 'cv ' . $cmd;
+  $descriptorSpec = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => STDERR);
+  $oldOutput = getenv('CV_OUTPUT');
+  putenv("CV_OUTPUT=json");
+
+  // Execute `cv` in the original folder. This is a work-around for
+  // phpunit/codeception, which seem to manipulate PWD.
+  $cmd = sprintf('cd %s; %s', escapeshellarg(getenv('PWD')), $cmd);
+
+  $process = proc_open($cmd, $descriptorSpec, $pipes, __DIR__);
+  putenv("CV_OUTPUT=$oldOutput");
+  fclose($pipes[0]);
+  $result = stream_get_contents($pipes[1]);
+  fclose($pipes[1]);
+  if (proc_close($process) !== 0) {
+    throw new RuntimeException("Command failed ($cmd):\n$result");
+  }
+  switch ($decode) {
+    case 'raw':
+      return $result;
+
+    case 'phpcode':
+      // If the last output is /*PHPCODE*/, then we managed to complete execution.
+      if (substr(trim($result), 0, 12) !== "/*BEGINPHP*/" || substr(trim($result), -10) !== "/*ENDPHP*/") {
+        throw new \RuntimeException("Command failed ($cmd):\n$result");
+      }
+      return $result;
+
+    case 'json':
+      return json_decode($result, 1);
+
+    default:
+      throw new RuntimeException("Bad decoder format ($decode)");
+  }
+}

From bc3b7c5b0a5df5faaf20d0d8e7f2111c674fda82 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 18:13:11 -0700
Subject: [PATCH 273/834] Proof-of-concept - Afform.get

---
 ext/afform/afform.php                         | 20 ++++++
 ext/afform/api/v3/Afform/Get.php              | 64 +++++++++++++++++++
 .../tests/phpunit/api/v3/Afform/GetTest.php   | 49 ++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 ext/afform/api/v3/Afform/Get.php
 create mode 100644 ext/afform/tests/phpunit/api/v3/Afform/GetTest.php

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 0e8192e7a615..59b22af5a4ee 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -3,6 +3,26 @@
 require_once 'afform.civix.php';
 use CRM_Afform_ExtensionUtil as E;
 
+function _afform_fields() {
+  return ['name', 'title', 'description', 'requires', 'layout'];
+}
+
+/**
+ * Filter the content of $params to only have supported afform fields.
+ *
+ * @param array $params
+ * @return array
+ */
+function _afform_fields_filter($params) {
+  $result = array();
+  foreach (_afform_fields() as $field) {
+    if (isset($params[$field])) {
+      $result[$field] = $params[$field];
+    }
+  }
+  return $result;
+}
+
 /**
  * Implements hook_civicrm_config().
  *
diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
new file mode 100644
index 000000000000..a8702e0d1780
--- /dev/null
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -0,0 +1,64 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Afform.Get API specification (optional)
+ * This is used for documentation and validation.
+ *
+ * @param array $spec description of fields supported by this API call
+ * @return void
+ * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
+ */
+function _civicrm_api3_afform_get_spec(&$spec) {
+  $spec['name'] = array(
+    'name' => 'name',
+    'type' => CRM_Utils_Type::T_STRING,
+    'title' => ts('Form name'),
+    'description' => 'Form name',
+    'maxlength' => 128,
+    'size' => CRM_Utils_Type::HUGE,
+    'api.required' => 1,
+  );
+  $spec['description'] = array(
+    'name' => 'description',
+    'type' => CRM_Utils_Type::T_TEXT,
+    'title' => ts('Description'),
+    'description' => 'Description',
+  );
+
+  // FIXME: title, requires, layout
+}
+
+/**
+ * Afform.Get API
+ *
+ * @param array $params
+ * @return array API result descriptor
+ * @see civicrm_api3_create_success
+ * @see civicrm_api3_create_error
+ * @throws API_Exception
+ */
+function civicrm_api3_afform_get($params) {
+  $scanner = new CRM_Afform_AfformScanner();
+  $converter = new CRM_Afform_ArrayHtml();
+  $records = [];
+
+  if (isset($params['name']) && is_string($params['name'])) {
+    $names = [$params['name']];
+  }
+  else {
+    $names = array_keys($scanner->findFilePaths());
+  }
+
+  foreach ($names as $name) {
+    $record = $scanner->getMeta($name);
+    $layout = $scanner->findFilePath($name, 'layout.html');
+    if ($layout) {
+      // FIXME check for file existence+substance+validity
+      $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
+    }
+    $records[$name] = $record;
+  }
+
+  return _civicrm_api3_basic_array_get('CxnApp', $params, $records, 'name', _afform_fields());
+}
diff --git a/ext/afform/tests/phpunit/api/v3/Afform/GetTest.php b/ext/afform/tests/phpunit/api/v3/Afform/GetTest.php
new file mode 100644
index 000000000000..6fd87013bc31
--- /dev/null
+++ b/ext/afform/tests/phpunit/api/v3/Afform/GetTest.php
@@ -0,0 +1,49 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Afform.Get API Test Case
+ * This is a generic test class implemented with PHPUnit.
+ * @group headless
+ */
+class api_v3_Afform_GetTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->apply();
+  }
+
+  /**
+   * The setup() method is executed before the test is executed (optional).
+   */
+  public function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * The tearDown() method is executed after the test was executed (optional)
+   * This can be used for cleanup.
+   */
+  public function tearDown() {
+    parent::tearDown();
+  }
+
+  /**
+   * Simple example test case.
+   *
+   * Note how the function name begins with the word "test".
+   */
+  public function testApiExample() {
+    $result = civicrm_api3('Afform', 'Get', array('magicword' => 'sesame'));
+    $this->assertEquals('Twelve', $result['values'][12]['name']);
+  }
+
+}

From 7c166c4757279cfdc5f85e10cc6f5aa786b82209 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 18:40:18 -0700
Subject: [PATCH 274/834] Proof-of-concept - Afform.create

---
 ext/afform/api/v3/Afform/Create.php           | 66 +++++++++++++++++++
 .../phpunit/api/v3/Afform/CreateTest.php      | 49 ++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 ext/afform/api/v3/Afform/Create.php
 create mode 100644 ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php

diff --git a/ext/afform/api/v3/Afform/Create.php b/ext/afform/api/v3/Afform/Create.php
new file mode 100644
index 000000000000..8381482432b0
--- /dev/null
+++ b/ext/afform/api/v3/Afform/Create.php
@@ -0,0 +1,66 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Afform.Create API specification (optional)
+ * This is used for documentation and validation.
+ *
+ * @param array $spec description of fields supported by this API call
+ * @return void
+ * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
+ */
+function _civicrm_api3_afform_create_spec(&$spec) {
+  require_once __DIR__ . DIRECTORY_SEPARATOR . 'Get.php';
+  _civicrm_api3_afform_get_spec($spec);
+}
+
+/**
+ * Afform.Create API
+ *
+ * @param array $params
+ * @return array API result descriptor
+ * @see civicrm_api3_create_success
+ * @see civicrm_api3_create_error
+ * @throws API_Exception
+ */
+function civicrm_api3_afform_create($params) {
+  $scanner = new CRM_Afform_AfformScanner();
+  $converter = new CRM_Afform_ArrayHtml();
+
+  if (empty($params['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $params['name'])) {
+    throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
+  }
+  $name = $params['name'];
+
+  // FIXME validate all field data.
+  $updates = _afform_fields_filter($params);
+
+  // Create or update layout.html.
+  if (isset($updates['layout'])) {
+    $layoutPath = $scanner->createSiteLocalPath($name, 'layout.html');
+    // printf("[%s] Update layout %s\n", $name, $layoutPath);
+    CRM_Utils_File::createDir(dirname($layoutPath));
+    file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
+    // FIXME check for writability then success. Report errors.
+  }
+
+  // Create or update meta.json.
+  $orig = civicrm_api('afform', 'get', ['name' => $name, 'sequential' => 1]);
+  if (is_array($orig['values'][0])) {
+    $meta = _afform_fields_filter(array_merge($orig['values'][0], $updates));
+  }
+  else {
+    $meta = $updates;
+  }
+  unset($meta['definition']);
+  unset($meta['name']);
+  if (!empty($meta)) {
+    $metaPath = $scanner->createSiteLocalPath($name, CRM_Afform_AfformScanner::METADATA_FILE);
+    // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
+    CRM_Utils_File::createDir(dirname($metaPath));
+    file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
+    // FIXME check for writability then success. Report errors.
+  }
+
+  return civicrm_api3_create_success($updates, $params, 'Afform', 'create');
+}
diff --git a/ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php b/ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php
new file mode 100644
index 000000000000..5fe2c9f8c845
--- /dev/null
+++ b/ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php
@@ -0,0 +1,49 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Afform.Create API Test Case
+ * This is a generic test class implemented with PHPUnit.
+ * @group headless
+ */
+class api_v3_Afform_CreateTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->apply();
+  }
+
+  /**
+   * The setup() method is executed before the test is executed (optional).
+   */
+  public function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * The tearDown() method is executed after the test was executed (optional)
+   * This can be used for cleanup.
+   */
+  public function tearDown() {
+    parent::tearDown();
+  }
+
+  /**
+   * Simple example test case.
+   *
+   * Note how the function name begins with the word "test".
+   */
+  public function testApiExample() {
+    $result = civicrm_api3('Afform', 'Create', array('magicword' => 'sesame'));
+    $this->assertEquals('Twelve', $result['values'][12]['name']);
+  }
+
+}

From 1e03a3c1bc9308d40397b28a2b4c0bb250a4ccc7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 18:48:20 -0700
Subject: [PATCH 275/834] README.md - Example dev tasks

---
 ext/afform/README.md | 56 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index bd0e8541632e..4e95873a002d 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -35,9 +35,61 @@ git clone https://github.com/FIXME/org.civicrm.afform.git
 cv en afform
 ```
 
-## Usage
+## Usage (Developers): Create a form
 
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+As an upstream publisher of a form, you can define the default, canonical
+substance of the form by creating a folder named `afform/<MY-FORM>`. In
+this example, we create a form named `foobar`:
+
+```
+$ cd /path/to/my/own/extension
+$ mkdir -p afform/foobar
+$ echo '{"route": "civicrm/foobar"}' > afform/foobar/meta.json
+$ echo '<div>Hello {{param.name}}</div>' > afform/foobar/layout.html
+$ cv flush
+$ cv url civicrm/foobar?name=world
+```
+
+You can open the given URL in a web-browser.
+
+## Usage (Developers): Programmatically read and write forms
+
+Downstream, administrators may customize the form.
+
+```
+$ cv api afform.getsingle name=foobar
+{
+    "name": "foobar",
+    "requires": [
+        "afform",
+        "crmUi",
+        "crmUtil"
+    ],
+    "title": "",
+    "description": "",
+    "layout": {
+        "#tag": "div",
+        "#children": [
+            "Hello {{param.name}}"
+        ]
+    },
+    "id": "foobar"
+}
+$ cv api afform.create name=foobar title="The Foo Bar Screen"
+{
+    "is_error": 0,
+    "version": 3,
+    "count": 2,
+    "values": {
+        "name": "foobar",
+        "title": "The Foo Bar Screen"
+    }
+}
+```
+
+## Usage (Developers): Render a form
+
+(* FIXME *)
 
 ## Known Issues
 

From 0034006a3ad8eb8c688f810b3375aeed03c03823 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 18:51:54 -0700
Subject: [PATCH 276/834] Proof-of-concept - Add afformCore AngularJS module

---
 ext/afform/ang/afformCore.ang.php | 17 +++++++++++++++++
 ext/afform/ang/afformCore.js      |  6 ++++++
 2 files changed, 23 insertions(+)
 create mode 100644 ext/afform/ang/afformCore.ang.php
 create mode 100644 ext/afform/ang/afformCore.js

diff --git a/ext/afform/ang/afformCore.ang.php b/ext/afform/ang/afformCore.ang.php
new file mode 100644
index 000000000000..c8b2a48d9b67
--- /dev/null
+++ b/ext/afform/ang/afformCore.ang.php
@@ -0,0 +1,17 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+
+return array(
+  'js' => array(
+    0 => 'ang/afformCore.js',
+    1 => 'ang/afformCore/*.js',
+    2 => 'ang/afformCore/*/*.js',
+  ),
+  'css' => array(),
+  'requires' => array('crmUi', 'crmUtil'),
+  'partials' => array('ang/afformCore'),
+  'settings' => array(),
+  'basePages' => [],
+);
diff --git a/ext/afform/ang/afformCore.js b/ext/afform/ang/afformCore.js
new file mode 100644
index 000000000000..d29921bc1ef8
--- /dev/null
+++ b/ext/afform/ang/afformCore.js
@@ -0,0 +1,6 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('afformCore', [
+    'crmUi', 'crmUtil', 'ngRoute'
+  ]);
+})(angular, CRM.$, CRM._);

From bb56ac7825fc810d04faff70d4a23463c2f98cce Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 19:25:58 -0700
Subject: [PATCH 277/834] Proof-of-concept - Autogenerate AngularJS
 modules+directives for each form

---
 ext/afform/README.md                          | 10 ++++
 ext/afform/afform.php                         | 51 +++++++++++++++++++
 .../templates/afform/FormAsDirective.tpl      | 26 ++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 ext/afform/templates/afform/FormAsDirective.tpl

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 4e95873a002d..8ddd872dcabc 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -91,6 +91,16 @@ $ cv api afform.create name=foobar title="The Foo Bar Screen"
 
 (* FIXME *)
 
+## Usage (Developers): Include a customizable subform in your own page
+
+Suppose you've created an AngularJS UI based on [the developer
+documentation](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/).  You'd like to use the
+customizable `foobar` form as part of your UI.  Fortunately, `foobar` is available as an AngularJS module named
+`afformFoobar`.  You can use it with two steps:
+
+1. In your module metadata (`ang/MYMODULE.ang.php`), update the `requires` to include `afformFoobar`.
+2. In your HTML template, use the directive `<div afform-foobar="..."></div>`.
+
 ## Known Issues
 
 (* FIXME *)
diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 59b22af5a4ee..5eaaa6ca13b2 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -132,6 +132,23 @@ function afform_civicrm_caseTypes(&$caseTypes) {
  */
 function afform_civicrm_angularModules(&$angularModules) {
   _afform_civix_civicrm_angularModules($angularModules);
+
+  $scanner = new CRM_Afform_AfformScanner();
+  $names = array_keys($scanner->findFilePaths());
+  foreach ($names as $name) {
+    $meta = $scanner->getMeta($name);
+    $angularModules[_afform_angular_module_name($name)] = [
+      'ext' => E::LONG_NAME,
+      'js' => ['assetBuilder://afform.js?name=' . urlencode($name)],
+      'requires' => $meta['requires'],
+      'basePages' => [],
+    ];
+
+    // FIXME: The HTML layout template is embedded in the JS asset.
+    // This works at runtime for basic usage, but it bypasses
+    // the hook_alterAngular infrastructure, and I'm not sure translation works.
+    // We should update core so that 'partials' can be specified more dynamically.
+  }
 }
 
 /**
@@ -156,6 +173,40 @@ function afform_civicrm_entityTypes(&$entityTypes) {
 
 // --- Functions below this ship commented out. Uncomment as required. ---
 
+/**
+ * Implements hook_civicrm_buildAsset().
+ */
+function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
+  if ($asset !== 'afform.js') {
+    return;
+  }
+
+  if (empty($params['name'])) {
+    throw new RuntimeException("Missing required parameter: afform.js?name=NAME");
+  }
+
+  $name = $params['name'];
+  $meta = civicrm_api3('Afform', 'getsingle', ['name' => $name]);
+  $scanner = new CRM_Afform_AfformScanner();
+
+  $smarty = CRM_Core_Smarty::singleton();
+  $smarty->assign('afform', [
+    'camel' => _afform_angular_module_name($name),
+    'meta' => $meta,
+    'layout' => file_get_contents($scanner->findFilePath($name, 'layout.html'))
+  ]);
+  $mimeType = 'text/javascript';
+  $content = $smarty->fetch('afform/FormAsDirective.tpl');
+}
+
+/**
+ * @param $name
+ * @return string
+ */
+function _afform_angular_module_name($name) {
+  return 'afform' . strtoupper($name{0}) . substr($name, 1);
+}
+
 /**
  * Implements hook_civicrm_preProcess().
  *
diff --git a/ext/afform/templates/afform/FormAsDirective.tpl b/ext/afform/templates/afform/FormAsDirective.tpl
new file mode 100644
index 000000000000..75eb2a15baad
--- /dev/null
+++ b/ext/afform/templates/afform/FormAsDirective.tpl
@@ -0,0 +1,26 @@
+{* This takes an $afform and generates an AngularJS directive.
+
+ @param string $afform.camel The full camel-case name of the AngularJS module being created
+ @param string $afform.meta  The full metadata record of the form
+ @param string $afform.layout  The template content
+ *}
+{literal}
+(function(angular, $, _) {
+  angular.module('{/literal}{$afform.camel}{literal}', CRM.angRequires('{/literal}{$afform.camel}{literal}'));
+  angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function() {
+    return {
+      restrict: 'AE',
+      template: {/literal}{$afform.layout|json}{literal},
+      scope: {
+        {/literal}{$afform.camel}{literal}: '='
+      },
+      link: function($scope, $el, $attr) {
+        var ts = $scope.ts = CRM.ts('{/literal}{$afform.camel}{literal}');
+        $scope.$watch('{/literal}{$afform.camel}{literal}', function(newValue){
+          $scope.myOptions = newValue;
+        });
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);
+{/literal}
\ No newline at end of file

From 6f175b5c7575e89b01d7b7cb3e07007ed2bc3894 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:11:45 -0700
Subject: [PATCH 278/834] Rename 'route' to 'server_route'

---
 ext/afform/CRM/Afform/AfformScanner.php | 4 ++--
 ext/afform/README.md                    | 2 +-
 ext/afform/afform.php                   | 2 +-
 ext/afform/api/v3/Afform/Get.php        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/CRM/Afform/AfformScanner.php
index d15cc855d7f6..b6bf50a4c87a 100644
--- a/ext/afform/CRM/Afform/AfformScanner.php
+++ b/ext/afform/CRM/Afform/AfformScanner.php
@@ -108,11 +108,11 @@ public function clear() {
    * @param string $name
    *   Ex: 'view-individual'
    * @return array
-   *   An array with some mix of the following keys: name, title, description, route, requires
+   *   An array with some mix of the following keys: name, title, description, client_route, server_route, requires
    *   Ex: [
    *     'name' => 'view-individual',
    *     'title' => 'View an individual contact',
-   *     'route' => 'civicrm/view-individual',
+   *     'server_route' => 'civicrm/view-individual',
    *     'requires' => ['afform'],
    *   ]
    */
diff --git a/ext/afform/README.md b/ext/afform/README.md
index 8ddd872dcabc..9ddd4b3b2af5 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -44,7 +44,7 @@ this example, we create a form named `foobar`:
 ```
 $ cd /path/to/my/own/extension
 $ mkdir -p afform/foobar
-$ echo '{"route": "civicrm/foobar"}' > afform/foobar/meta.json
+$ echo '{"server_route": "civicrm/foobar"}' > afform/foobar/meta.json
 $ echo '<div>Hello {{param.name}}</div>' > afform/foobar/layout.html
 $ cv flush
 $ cv url civicrm/foobar?name=world
diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 5eaaa6ca13b2..084a2cd3cfc6 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -4,7 +4,7 @@
 use CRM_Afform_ExtensionUtil as E;
 
 function _afform_fields() {
-  return ['name', 'title', 'description', 'requires', 'layout'];
+  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'client_route'];
 }
 
 /**
diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
index a8702e0d1780..b4b3e9a398ab 100644
--- a/ext/afform/api/v3/Afform/Get.php
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -26,7 +26,7 @@ function _civicrm_api3_afform_get_spec(&$spec) {
     'description' => 'Description',
   );
 
-  // FIXME: title, requires, layout
+  // FIXME: title, requires, layout, server_route, client_route
 }
 
 /**

From b5563e853c13afe43c4159129eefa177ee1912c5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:13:53 -0700
Subject: [PATCH 279/834] info.xml - Fill in some FIXME's

---
 ext/afform/info.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/afform/info.xml b/ext/afform/info.xml
index 5a7b802b9dfb..d162aa31b1a7 100644
--- a/ext/afform/info.xml
+++ b/ext/afform/info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.afform" type="module">
   <file>afform</file>
-  <name>FIXME</name>
-  <description>FIXME</description>
+  <name>Afform</name>
+  <description>Afform is the Affable Administrative AngularJS Form Framework</description>
   <license>AGPL-3.0</license>
   <maintainer>
     <author>CiviCRM LLC</author>
@@ -18,7 +18,7 @@
   <version>1.0</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>4.7</ver>
+    <ver>5.3</ver>
   </compatibility>
   <comments>This is a new, undeveloped module</comments>
   <civix>

From 145fc64b916657c339800c269a01ccb558044b0b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:31:36 -0700
Subject: [PATCH 280/834] AfformScanner - Add getMetas()

---
 ext/afform/CRM/Afform/AfformScanner.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/CRM/Afform/AfformScanner.php
index b6bf50a4c87a..03cc44642d74 100644
--- a/ext/afform/CRM/Afform/AfformScanner.php
+++ b/ext/afform/CRM/Afform/AfformScanner.php
@@ -31,6 +31,8 @@ public function __construct() {
   }
 
   /**
+   * Get a list of all forms and their file paths.
+   *
    * @return array
    *   Ex: ['view-individual' => ['/var/www/foo/afform/view-individual']]
    */
@@ -108,7 +110,8 @@ public function clear() {
    * @param string $name
    *   Ex: 'view-individual'
    * @return array
-   *   An array with some mix of the following keys: name, title, description, client_route, server_route, requires
+   *   An array with some mix of the following keys: name, title, description, client_route, server_route, requires.
+   *   NOTE: This is only data available in meta.json. It does *NOT* include layout.
    *   Ex: [
    *     'name' => 'view-individual',
    *     'title' => 'View an individual contact',
@@ -133,6 +136,22 @@ public function getMeta($name) {
     return array_merge($defaults, json_decode(file_get_contents($metaFile), 1));
   }
 
+  /**
+   * Get the effective metadata for all forms.
+   *
+   * @return array
+   *   A list of all forms, keyed by form name.
+   *   NOTE: This is only data available in meta.json. It does *NOT* include layout.
+   *   Ex: ['view-individual' => ['title' => 'View an individual contact', ...]]
+   */
+  public function getMetas() {
+    $result = array();
+    foreach (array_keys($this->findFilePaths()) as $name) {
+      $result[$name] = $this->getMeta($name);
+    }
+    return $result;
+  }
+
   /**
    * @param array $formPaths
    *   List of all form paths.

From 47009540f3159210dc56b1676adba4d654628f1d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:31:54 -0700
Subject: [PATCH 281/834] Afform.get API - Allow calls without `name`

---
 ext/afform/api/v3/Afform/Get.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
index b4b3e9a398ab..d5e52563ae01 100644
--- a/ext/afform/api/v3/Afform/Get.php
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -17,7 +17,6 @@ function _civicrm_api3_afform_get_spec(&$spec) {
     'description' => 'Form name',
     'maxlength' => 128,
     'size' => CRM_Utils_Type::HUGE,
-    'api.required' => 1,
   );
   $spec['description'] = array(
     'name' => 'description',

From 3978bd7c05b4d862620c02cd9546c29e3377331b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:32:19 -0700
Subject: [PATCH 282/834] ArrayHtml - Improve comments and warnings

---
 ext/afform/CRM/Afform/ArrayHtml.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/afform/CRM/Afform/ArrayHtml.php b/ext/afform/CRM/Afform/ArrayHtml.php
index c6dd28e8c5f6..fa9089a66d26 100644
--- a/ext/afform/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/CRM/Afform/ArrayHtml.php
@@ -35,6 +35,11 @@ public function convertArrayToHtml($array) {
       elseif (is_array($attrValue) && $this->allowStructuredAttribute($tag, $attrName)) {
         $buf .= sprintf(' %s="%s"', $attrName, htmlentities(json_encode($attrValue))); // FIXME attribute encoding
       }
+      else {
+        Civi::log()->warning('Afform: Cannot serialize attribute {attrName}', [
+          'attrName' => $attrName,
+        ]);
+      }
     }
     $buf .= '>';
 
@@ -61,7 +66,7 @@ public function convertHtmlToArray($html) {
     $doc = new DOMDocument();
     $doc->loadHTML("<html><body>$html</body></html>");
 
-    // FIXME: Valid expected number of child nodes
+    // FIXME: Validate expected number of child nodes
 
     foreach ($doc->childNodes as $htmlNode) {
       if ($htmlNode instanceof DOMElement && $htmlNode->tagName === 'html') {

From 8775c48a8eb772fd8d48e62be4e70caa1cf04241 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:34:31 -0700
Subject: [PATCH 283/834] Generate skeletal base-page based on `server_route`
 values

---
 ext/afform/CRM/Afform/Page/AfformBase.php     | 21 +++++++++++++++++++
 ext/afform/afform.php                         | 18 ++++++++++++++++
 .../templates/CRM/Afform/Page/AfformBase.tpl  |  9 ++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 ext/afform/CRM/Afform/Page/AfformBase.php
 create mode 100644 ext/afform/templates/CRM/Afform/Page/AfformBase.tpl

diff --git a/ext/afform/CRM/Afform/Page/AfformBase.php b/ext/afform/CRM/Afform/Page/AfformBase.php
new file mode 100644
index 000000000000..bfea8a8540f6
--- /dev/null
+++ b/ext/afform/CRM/Afform/Page/AfformBase.php
@@ -0,0 +1,21 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+class CRM_Afform_Page_AfformBase extends CRM_Core_Page {
+
+  public function run() {
+    //    echo '<pre>';print_r(func_get_args());exit();
+    list ($pagePath, $pageArgs) = func_get_args();
+
+    // Example: Set the page-title dynamically; alternatively, declare a static title in xml/Menu/*.xml
+    CRM_Utils_System::setTitle(E::ts('AfformBase'));
+
+    // Example: Assign a variable for use in a template
+    $this->assign('currentTime', date('Y-m-d H:i:s'));
+
+    $this->assign('afform', $pageArgs['afform']);
+
+    parent::run();
+  }
+
+}
diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 084a2cd3cfc6..01305db2e8fc 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -199,6 +199,24 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   $content = $smarty->fetch('afform/FormAsDirective.tpl');
 }
 
+/**
+ * Implements hook_civicrm_alterMenu().
+ */
+function afform_civicrm_alterMenu(&$items) {
+  $scanner = new CRM_Afform_AfformScanner();
+  foreach ($scanner->getMetas() as $name => $meta) {
+    if (!empty($meta['server_route'])) {
+      $items[$meta['server_route']] = [
+        'page_callback' => 'CRM_Afform_Page_AfformBase',
+        'page_arguments' => 'afform=' . urlencode($name),
+        'title' => CRM_Utils_Array::value('title', $meta, ''),
+        'access_arguments' => [['access CiviCRM'], 'and'] // FIXME
+      ];
+    }
+  }
+  print_r($items);
+}
+
 /**
  * @param $name
  * @return string
diff --git a/ext/afform/templates/CRM/Afform/Page/AfformBase.tpl b/ext/afform/templates/CRM/Afform/Page/AfformBase.tpl
new file mode 100644
index 000000000000..4beb737db3e9
--- /dev/null
+++ b/ext/afform/templates/CRM/Afform/Page/AfformBase.tpl
@@ -0,0 +1,9 @@
+<h3>This new page is generated by CRM/Afform/Page/AfformBase.php</h3>
+
+{* Example: Display a variable directly *}
+<p>The current time is {$currentTime}</p>
+
+{* Example: Display a translated string -- which happens to include a variable *}
+<p>{ts 1=$currentTime}(In your native language) The current time is %1.{/ts}</p>
+
+<p>Please open "{$afform}"</p>
\ No newline at end of file

From 83291832d853800db037a26f241fcc9bb9101100 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 20:44:02 -0700
Subject: [PATCH 284/834] README.md - Fill in some FIXME's

---
 ext/afform/README.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 9ddd4b3b2af5..81afea183263 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -2,14 +2,18 @@
 
 ![Screenshot](/images/screenshot.png)
 
-(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+The Affable Administrative Angular Form Framework (`afform`) is a system for administering AngularJS-based forms
+in CiviCRM which:
+
+1. Allows developers to declaratively define a canonical, baseline form.
+2. Allows administrators (or administrative tools) to use the API to revise the forms.
 
 The extension is licensed under [AGPL-3.0](LICENSE.txt).
 
 ## Requirements
 
 * PHP v5.4+
-* CiviCRM (*FIXME: Version number*)
+* CiviCRM v5.3+
 
 ## Installation (Web UI)
 
@@ -103,4 +107,7 @@ customizable `foobar` form as part of your UI.  Fortunately, `foobar` is availab
 
 ## Known Issues
 
-(* FIXME *)
+* The code is currently written as a proof-of-concept. There are several `FIXME`/`TODO` declarations in the code
+  for checking pre-conditions, reporting errors, handling edge-cases, etc.
+* Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
+  and `hook_civicrm_alterAngular`. We'll need a core patch to allow that.

From 841850b13232d8b3eab48274e8ff53d0b9a4df7c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:18:15 -0700
Subject: [PATCH 285/834] _afform_angular_module_name - Accept `$format` option

---
 ext/afform/afform.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 01305db2e8fc..a1a46e121eb1 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -218,11 +218,25 @@ function afform_civicrm_alterMenu(&$items) {
 }
 
 /**
- * @param $name
+ * @param string $name
+ *   Ex: fooBar
+ * @param string $format
+ *   'camel' or 'dash'.
  * @return string
+ *   Ex: 'FooBar' or 'foo-bar'.
  */
-function _afform_angular_module_name($name) {
-  return 'afform' . strtoupper($name{0}) . substr($name, 1);
+function _afform_angular_module_name($name, $format = 'camel') {
+  switch ($format) {
+    case 'camel':
+      return 'afform' . strtoupper($name{0}) . substr($name, 1);
+
+    case 'dash':
+      $camel = _afform_angular_module_name($name, 'camel');
+      return strtolower(implode('-', array_filter(preg_split('/(?=[A-Z])/', $camel))));
+
+    default:
+      throw new \Exception("Unrecognized format");
+  }
 }
 
 /**

From b39a7f5ac097f5dab98617d55b2c6cceb742779c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:18:35 -0700
Subject: [PATCH 286/834] afform.php - Remove debugging code

---
 ext/afform/afform.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index a1a46e121eb1..2ec594afa971 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -214,7 +214,6 @@ function afform_civicrm_alterMenu(&$items) {
       ];
     }
   }
-  print_r($items);
 }
 
 /**

From 84ae185820727a7418d93b134a0f0ee393fb9e47 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:19:21 -0700
Subject: [PATCH 287/834] Afform.create API - More FIXMEs

---
 ext/afform/api/v3/Afform/Create.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/afform/api/v3/Afform/Create.php b/ext/afform/api/v3/Afform/Create.php
index 8381482432b0..412e721b1918 100644
--- a/ext/afform/api/v3/Afform/Create.php
+++ b/ext/afform/api/v3/Afform/Create.php
@@ -62,5 +62,8 @@ function civicrm_api3_afform_create($params) {
     // FIXME check for writability then success. Report errors.
   }
 
+  // FIXME if `server_route` changes, then flush the menu cache.
+  // FIXME if asset-caching is enabled, then flush the asset cache.
+
   return civicrm_api3_create_success($updates, $params, 'Afform', 'create');
 }

From ddae34c0096114d4cd47b330b31837e53e74e001 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:21:21 -0700
Subject: [PATCH 288/834] afformCore - Move default directive logic from *.tpl
 to *.js

---
 ext/afform/ang/afformCore.js                   | 18 ++++++++++++++++++
 .../templates/afform/FormAsDirective.tpl       | 18 ++++--------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ext/afform/ang/afformCore.js b/ext/afform/ang/afformCore.js
index d29921bc1ef8..c8de4b61580e 100644
--- a/ext/afform/ang/afformCore.js
+++ b/ext/afform/ang/afformCore.js
@@ -3,4 +3,22 @@
   angular.module('afformCore', [
     'crmUi', 'crmUtil', 'ngRoute'
   ]);
+
+  // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
+  angular.module('afformCore').service('afformCoreDirective', function($routeParams){
+    return function(camelName, d){
+      d.restrict = 'AE';
+      d.scope = {};
+      d.scope.options = '=' + camelName;
+      d.link = function($scope, $el, $attr) {
+        $scope.ts = CRM.ts(camelName);
+        $scope.routeParams = $routeParams;
+        console.log('$routeParams', $routeParams);
+        // $scope.$watch(camelName, function(newValue){
+        //   $scope.options = newValue;
+        // });
+      };
+      return d;
+    };
+  });
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/templates/afform/FormAsDirective.tpl b/ext/afform/templates/afform/FormAsDirective.tpl
index 75eb2a15baad..f448ad4406ae 100644
--- a/ext/afform/templates/afform/FormAsDirective.tpl
+++ b/ext/afform/templates/afform/FormAsDirective.tpl
@@ -7,20 +7,10 @@
 {literal}
 (function(angular, $, _) {
   angular.module('{/literal}{$afform.camel}{literal}', CRM.angRequires('{/literal}{$afform.camel}{literal}'));
-  angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function() {
-    return {
-      restrict: 'AE',
-      template: {/literal}{$afform.layout|json}{literal},
-      scope: {
-        {/literal}{$afform.camel}{literal}: '='
-      },
-      link: function($scope, $el, $attr) {
-        var ts = $scope.ts = CRM.ts('{/literal}{$afform.camel}{literal}');
-        $scope.$watch('{/literal}{$afform.camel}{literal}', function(newValue){
-          $scope.myOptions = newValue;
-        });
-      }
-    };
+  angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function(afformCoreDirective) {
+    return afformCoreDirective({/literal}{$afform.camel|json}{literal}, {
+      template: {/literal}{$afform.layout|json}{literal}
+    });
   });
 })(angular, CRM.$, CRM._);
 {/literal}
\ No newline at end of file

From 266e7ad1c90bd93c30937458f57200c85a5b613b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:21:59 -0700
Subject: [PATCH 289/834] Implement standalone page support

---
 ext/afform/CRM/Afform/Page/AfformBase.php   | 17 +++++++++++------
 ext/afform/ang/afformStandalone.ang.php     | 18 ++++++++++++++++++
 ext/afform/ang/afformStandalone.js          |  4 ++++
 ext/afform/ang/afformStandalone/PageCtrl.js | 13 +++++++++++++
 4 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 ext/afform/ang/afformStandalone.ang.php
 create mode 100644 ext/afform/ang/afformStandalone.js
 create mode 100644 ext/afform/ang/afformStandalone/PageCtrl.js

diff --git a/ext/afform/CRM/Afform/Page/AfformBase.php b/ext/afform/CRM/Afform/Page/AfformBase.php
index bfea8a8540f6..75daf17cba74 100644
--- a/ext/afform/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/CRM/Afform/Page/AfformBase.php
@@ -7,13 +7,18 @@ public function run() {
     //    echo '<pre>';print_r(func_get_args());exit();
     list ($pagePath, $pageArgs) = func_get_args();
 
-    // Example: Set the page-title dynamically; alternatively, declare a static title in xml/Menu/*.xml
-    CRM_Utils_System::setTitle(E::ts('AfformBase'));
+    $module = _afform_angular_module_name($pageArgs['afform']);
 
-    // Example: Assign a variable for use in a template
-    $this->assign('currentTime', date('Y-m-d H:i:s'));
-
-    $this->assign('afform', $pageArgs['afform']);
+    $loader = new \Civi\Angular\AngularLoader();
+    $loader->setModules([$module, 'afformStandalone']);
+    $loader->setPageName(implode('/', $pagePath));
+    $loader->useApp();
+    $loader->getRes()->addSetting([
+      'afform' => [
+        'open' => _afform_angular_module_name($pageArgs['afform'], 'dash'),
+      ],
+    ]);
+    $loader->load();
 
     parent::run();
   }
diff --git a/ext/afform/ang/afformStandalone.ang.php b/ext/afform/ang/afformStandalone.ang.php
new file mode 100644
index 000000000000..2fbf67d02fad
--- /dev/null
+++ b/ext/afform/ang/afformStandalone.ang.php
@@ -0,0 +1,18 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+
+return array(
+  'js' => array(
+    'ang/afformStandalone.js',
+    'ang/afformStandalone/*.js',
+    'ang/afformStandalone/*/*.js',
+  ),
+  'css' => array(),
+  'partials' => array(
+    'ang/afformStandalone',
+  ),
+  'settings' => array(),
+  'requires' => ['ngRoute'],
+);
diff --git a/ext/afform/ang/afformStandalone.js b/ext/afform/ang/afformStandalone.js
new file mode 100644
index 000000000000..c7b03a2a86d9
--- /dev/null
+++ b/ext/afform/ang/afformStandalone.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('afformStandalone', CRM.angRequires('afformStandalone'));
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/ang/afformStandalone/PageCtrl.js b/ext/afform/ang/afformStandalone/PageCtrl.js
new file mode 100644
index 000000000000..8c39fc4055c0
--- /dev/null
+++ b/ext/afform/ang/afformStandalone/PageCtrl.js
@@ -0,0 +1,13 @@
+(function(angular, $, _) {
+
+  angular.module('afformStandalone').config(function($routeProvider) {
+      $routeProvider.when('/', {
+        controller: 'AfformStandalonePageCtrl',
+        template: function() {return '<div ' + CRM.afform.open + '="{}"></div>'; }
+      });
+    }
+  );
+
+  angular.module('afformStandalone').controller('AfformStandalonePageCtrl', function($scope) {});
+
+})(angular, CRM.$, CRM._);

From 76a5831d993b2ae0744757c8bc630a6c190736c7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:22:19 -0700
Subject: [PATCH 290/834] README.md - Multiple updates

---
 ext/afform/README.md | 77 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 81afea183263..d86f289465a1 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -39,7 +39,7 @@ git clone https://github.com/FIXME/org.civicrm.afform.git
 cv en afform
 ```
 
-## Usage (Developers): Create a form
+## Development: Quick Start
 
 As an upstream publisher of a form, you can define the default, canonical
 substance of the form by creating a folder named `afform/<MY-FORM>`. In
@@ -48,17 +48,34 @@ this example, we create a form named `foobar`:
 ```
 $ cd /path/to/my/own/extension
 $ mkdir -p afform/foobar
-$ echo '{"server_route": "civicrm/foobar"}' > afform/foobar/meta.json
-$ echo '<div>Hello {{param.name}}</div>' > afform/foobar/layout.html
+$ echo '{"server_route": "civicrm/pretty-page"}' > afform/foobar/meta.json
+$ echo '<div>Hello {{routeParams.name}}</div>' > afform/foobar/layout.html
 $ cv flush
-$ cv url civicrm/foobar?name=world
+```
+
+A few things to note:
+
+* The file `layout.html` is an AngularJS HTML document. It has access to all the general templating features, such as variable substition
+  (`{{routeParams.name}}`) and the standard library of directives (`ng-if`, `ng-style`, `ng-repeat`, etc).
+* After creating a new form or file, we should flush the cache.
+* If you're going to actively edit/revise the content of the file, then you should navigate
+  to **Administer > System Settings > Debugging** and disable asset caching.
+
+Now that we've created a form, we'll want to determine its URL:
+
+```
+$ cv url civicrm/pretty-page
+"http://dmaster.localhost/civicrm/pretty-page"
+$ cv url civicrm/pretty-page/#/?name=world
+"http://dmaster.localhost/civicrm/pretty-page/#/?name=world"
 ```
 
 You can open the given URL in a web-browser.
 
-## Usage (Developers): Programmatically read and write forms
+## Development: Form CRUD API
 
-Downstream, administrators may customize the form.
+Now that we've defined a baseline form, it's possible for administrators and
+GUI applications to inspect and revise this form using the API.
 
 ```
 $ cv api afform.getsingle name=foobar
@@ -74,7 +91,7 @@ $ cv api afform.getsingle name=foobar
     "layout": {
         "#tag": "div",
         "#children": [
-            "Hello {{param.name}}"
+            "Hello {{routeParams.name}}"
         ]
     },
     "id": "foobar"
@@ -91,19 +108,46 @@ $ cv api afform.create name=foobar title="The Foo Bar Screen"
 }
 ```
 
-## Usage (Developers): Render a form
+## Development: Scope variables and functions
+
+In AngularJS, every component has its own *scope* -- which defines a list of variables you can access.
+
+By default, `afform` provides a few variables in the scope of every form:
+
+* `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
+  service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
+* `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
 
-(* FIXME *)
+## Development: Every form is an AngularJS directive
 
-## Usage (Developers): Include a customizable subform in your own page
+In the quick-start example, we registered a new route (`"server_route": "civicrm/pretty-page"`) -- this created a
+standalone page with the sole purpose of displaying the `foobar` form.
 
-Suppose you've created an AngularJS UI based on [the developer
-documentation](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/).  You'd like to use the
-customizable `foobar` form as part of your UI.  Fortunately, `foobar` is available as an AngularJS module named
-`afformFoobar`.  You can use it with two steps:
+However, there's no obligation to use the `foobar` form in a standalone fashion.  Think of `foobar` as a *re-usable
+sub-form* or as a *directive*.  If you've created an AngluarJS application, then you can embed `foobar` with
+two small steps:
 
-1. In your module metadata (`ang/MYMODULE.ang.php`), update the `requires` to include `afformFoobar`.
-2. In your HTML template, use the directive `<div afform-foobar="..."></div>`.
+1. In your application, declare a dependency on module `afformFoobar`. This is usually done in `ang/MYMODULE.ang.php`
+   and/or `ang/MYMODULE.js`.
+2. In your HTML template, use the directive `<div afform-foobar=""></div>`.
+
+This technique is particularly useful if you want to provide extra data for the form author to use.  For example, your
+application might pass in the current phase of the moon:
+
+```html
+<div afform-foobar="{phaseOfMoon: 'waxing'}"></div>
+```
+
+Now, in `afform/foobar/layout.html`, you can use the `phaseOfMoon`:
+
+```html
+Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
+```
+
+
+```html
+Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is currently {{options.phaseOfMoon ? options.phaseOfMoon : 'on hiatus'}}.
+```
 
 ## Known Issues
 
@@ -111,3 +155,4 @@ customizable `foobar` form as part of your UI.  Fortunately, `foobar` is availab
   for checking pre-conditions, reporting errors, handling edge-cases, etc.
 * Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
   and `hook_civicrm_alterAngular`. We'll need a core patch to allow that.
+* We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).

From 3dc7610dfb7bfcfe231616b3b0b6cedbb0cb8ee9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:44:16 -0700
Subject: [PATCH 291/834] README.md

---
 ext/afform/README.md | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index d86f289465a1..2f36f41e6157 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -6,7 +6,9 @@ The Affable Administrative Angular Form Framework (`afform`) is a system for adm
 in CiviCRM which:
 
 1. Allows developers to declaratively define a canonical, baseline form.
-2. Allows administrators (or administrative tools) to use the API to revise the forms.
+2. Allows administrators (or administrative tools) to use the CRUD API to customize the forms.
+3. Allows developers to embed these forms in other AngularJS apps.
+4. (WIP; pending upstream support) Allow developers to apply [change sets](https://docs.civicrm.org/dev/en/latest/framework/angular/changeset/).
 
 The extension is licensed under [AGPL-3.0](LICENSE.txt).
 
@@ -41,8 +43,8 @@ cv en afform
 
 ## Development: Quick Start
 
-As an upstream publisher of a form, you can define the default, canonical
-substance of the form by creating a folder named `afform/<MY-FORM>`. In
+As an extension author, you can define a form along with its default,
+canonical content. Simply create a folder named  `afform/<MY-FORM>`. In
 this example, we create a form named `foobar`:
 
 ```
@@ -55,6 +57,7 @@ $ cv flush
 
 A few things to note:
 
+* We defined a route `civicrm/pretty-page`. This is defined in the same routing system used by CiviCRM forms.
 * The file `layout.html` is an AngularJS HTML document. It has access to all the general templating features, such as variable substition
   (`{{routeParams.name}}`) and the standard library of directives (`ng-if`, `ng-style`, `ng-repeat`, etc).
 * After creating a new form or file, we should flush the cache.
@@ -75,16 +78,14 @@ You can open the given URL in a web-browser.
 ## Development: Form CRUD API
 
 Now that we've defined a baseline form, it's possible for administrators and
-GUI applications to inspect and revise this form using the API.
+GUI applications to inspect the form using the API:
 
 ```
 $ cv api afform.getsingle name=foobar
 {
     "name": "foobar",
     "requires": [
-        "afform",
-        "crmUi",
-        "crmUtil"
+        "afformCore"
     ],
     "title": "",
     "description": "",
@@ -96,6 +97,11 @@ $ cv api afform.getsingle name=foobar
     },
     "id": "foobar"
 }
+```
+
+Additionally, you can also update the forms:
+
+```
 $ cv api afform.create name=foobar title="The Foo Bar Screen"
 {
     "is_error": 0,
@@ -108,6 +114,15 @@ $ cv api afform.create name=foobar title="The Foo Bar Screen"
 }
 ```
 
+A few important things to note about this:
+
+* The changes are only applied on this site.
+* Once you make a change with the CRUD API, there will be two copies of the form:
+    * `[myextension]/afform/foobar/` is the default, canonical version.
+    * `[civicrm.files]/afform/foobar/` is the locally customized version.
+* The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
+  normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
+
 ## Development: Scope variables and functions
 
 In AngularJS, every component has its own *scope* -- which defines a list of variables you can access.
@@ -121,11 +136,11 @@ By default, `afform` provides a few variables in the scope of every form:
 ## Development: Every form is an AngularJS directive
 
 In the quick-start example, we registered a new route (`"server_route": "civicrm/pretty-page"`) -- this created a
-standalone page with the sole purpose of displaying the `foobar` form.
+simple, standalone page with the sole purpose of displaying the `foobar` form. But that had very limited information.
+What if we want control the environment a bit more?
 
-However, there's no obligation to use the `foobar` form in a standalone fashion.  Think of `foobar` as a *re-usable
-sub-form* or as a *directive*.  If you've created an AngluarJS application, then you can embed `foobar` with
-two small steps:
+There's no obligation to use the simple, standalone version of `foobar`.  Think of `foobar` as a *re-usable sub-form*
+or as a *directive*.  If you've created an AngluarJS application, then you can embed `foobar` with two small steps:
 
 1. In your application, declare a dependency on module `afformFoobar`. This is usually done in `ang/MYMODULE.ang.php`
    and/or `ang/MYMODULE.js`.
@@ -156,3 +171,5 @@ Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is curren
 * Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
   and `hook_civicrm_alterAngular`. We'll need a core patch to allow that.
 * We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
+* Need to implement the `Afform.revert` API to undo local cusotmizations.
+* To allow full support for change-sets, we'll need to patch `civicrm-core`.

From 02051df8b611e9f22f84d4bb55b0638e1747b937 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:45:43 -0700
Subject: [PATCH 292/834] README.md

---
 ext/afform/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 2f36f41e6157..8a2760e00850 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -1,4 +1,4 @@
-# org.civicrm.afform
+# org.civicrm.afform (Early Proof of Concept)
 
 ![Screenshot](/images/screenshot.png)
 

From cbfbb5cf204bddc0b7dafc8b5727e41e2ff01d66 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 22:46:55 -0700
Subject: [PATCH 293/834] README.md

---
 ext/afform/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 8a2760e00850..32602fac0066 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -7,7 +7,7 @@ in CiviCRM which:
 
 1. Allows developers to declaratively define a canonical, baseline form.
 2. Allows administrators (or administrative tools) to use the CRUD API to customize the forms.
-3. Allows developers to embed these forms in other AngularJS apps.
+3. Allows developers to embed these forms in other CiviCRM-AngularJS apps.
 4. (WIP; pending upstream support) Allow developers to apply [change sets](https://docs.civicrm.org/dev/en/latest/framework/angular/changeset/).
 
 The extension is licensed under [AGPL-3.0](LICENSE.txt).

From 8d090187c9677ddb283a784da13b77442bd81518 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:00:53 -0700
Subject: [PATCH 294/834] Remove debug codes

---
 ext/afform/ang/afformCore.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ext/afform/ang/afformCore.js b/ext/afform/ang/afformCore.js
index c8de4b61580e..2488968454aa 100644
--- a/ext/afform/ang/afformCore.js
+++ b/ext/afform/ang/afformCore.js
@@ -13,10 +13,6 @@
       d.link = function($scope, $el, $attr) {
         $scope.ts = CRM.ts(camelName);
         $scope.routeParams = $routeParams;
-        console.log('$routeParams', $routeParams);
-        // $scope.$watch(camelName, function(newValue){
-        //   $scope.options = newValue;
-        // });
       };
       return d;
     };

From a429f440d93faa642cf048ddc1a6ed0f00738df5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:10:16 -0700
Subject: [PATCH 295/834] Import Api3Ctrl

---
 ext/afform/ang/afformCore/Api3Ctrl.js | 51 +++++++++++++++++++
 ext/afform/ang/afformCore/Api3Ctrl.md | 73 +++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 ext/afform/ang/afformCore/Api3Ctrl.js
 create mode 100644 ext/afform/ang/afformCore/Api3Ctrl.md

diff --git a/ext/afform/ang/afformCore/Api3Ctrl.js b/ext/afform/ang/afformCore/Api3Ctrl.js
new file mode 100644
index 000000000000..e1f7506f3356
--- /dev/null
+++ b/ext/afform/ang/afformCore/Api3Ctrl.js
@@ -0,0 +1,51 @@
+(function(angular, $, _) {
+
+  angular.module('afformCore').directive('afformApi3Ctrl', function() {
+    return {
+      restrict: 'EA',
+      scope: {
+        afformApi3Ctrl: '=',
+        afformApi3: '@',
+        afformApi3Refresh: '@',
+        onRefresh: '@'
+      },
+      controllerAs: 'afformApi3Ctrl',
+      controller: function($scope, $parse, crmThrottle, crmApi) {
+        var ctrl = this;
+
+        // CONSIDER: Trade-offs of upfront vs ongoing evaluation.
+        var parts = $parse($scope.afformApi3)($scope.$parent);
+        ctrl.entity = parts[0];
+        ctrl.action = parts[1];
+        ctrl.params = parts[2];
+        ctrl.result = {};
+        ctrl.loading = ctrl.firstLoad = true;
+
+        ctrl.refresh = function refresh() {
+          ctrl.loading = true;
+          crmThrottle(function () {
+            return crmApi(ctrl.entity, ctrl.action, ctrl.params)
+              .then(function (response) {
+                ctrl.result = response;
+                ctrl.loading = ctrl.firstLoad = false;
+                if ($scope.onRefresh) {
+                  $scope.$parent.$eval($scope.onRefresh, ctrl);
+                }
+              });
+          });
+        };
+
+        $scope.afformApi3Ctrl = this;
+
+        var mode = $scope.afformApi3Refresh ? $scope.afformApi3Refresh : 'auto';
+        switch (mode) {
+          case 'auto': $scope.$watchCollection('afformApi3Ctrl.params', ctrl.refresh); break;
+          case 'init': ctrl.refresh(); break;
+          case 'manual': break;
+          default: throw 'Unrecognized refresh mode: '+ mode;
+        }
+      }
+    };
+  });
+
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/ang/afformCore/Api3Ctrl.md b/ext/afform/ang/afformCore/Api3Ctrl.md
new file mode 100644
index 000000000000..0b328eca5b96
--- /dev/null
+++ b/ext/afform/ang/afformCore/Api3Ctrl.md
@@ -0,0 +1,73 @@
+# afform-api3-ctrl
+
+This directive is designed for querying and displaying data from APIv3. Each API call is represented with an object like this:
+
+```js
+{
+  entity: 'Contact',
+  action: 'get',
+  params: {display_name: 'alice'},
+  result: {
+    is_error: 0,
+    count: 10,
+    values: {...}
+  },
+  refresh: function(){...}
+}
+```
+
+You can initialize this object using `<afform-api3-ctrl>` and `<afform-api3>`, as in:
+
+```html
+<div
+  afform-api3-ctrl="apiData"
+  afform-api3="['Contact','get', {display_name: ''}]">
+
+    <div crm-ui-debug="apiData"></div>
+
+    <div>
+      Filter by name: <input ng-model="apiData.params.display_name" />
+    </div>
+
+    <ul>
+      <li ng-repeat="value in apiData.result.values">{{value.display_name}}</li>
+    </ul>
+</div>
+```
+
+By default, the API call will refresh its results automatically - as soon as the filter parameters change.
+
+If you'd rather wait and trigger the refresh another way, then set the `afform-api3-refresh` policy to `init` or `manual`. Don't forget to fire the refresh some other way, such as `ng-click`:
+
+```html
+<div
+  afform-api3-ctrl="apiData"
+  afform-api3="['Contact','get', {display_name: ''}]"
+  afform-api3-refresh="init">
+
+    <div crm-ui-debug="apiData"></div>
+
+    <div>
+      Filter by name: <input ng-model="apiData.params.display_name" />
+      <button ng-click="apiData.refresh()">Search</button>
+    </div>
+
+    <ul>
+      <li ng-repeat="value in apiData.result.values">{{value.display_name}}</li>
+    </ul>
+
+</div>
+```
+
+And you conditionally execute some logic whenever a refresh occurs -- use
+`on-refresh`. Within the scope of this statement, you have access to the
+properties of the API object (`entity`, `action`, `params`, `result`).
+
+```html
+<div
+  afform-api3-ctrl="apiData"
+  afform-api3="['Contact','get', {display_name: ''}]"
+  on-refresh="doSomething(result)">
+  ...
+</div>
+```

From 033b665b6554504dd1aa1b7db6b095e29df5ea71 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:10:28 -0700
Subject: [PATCH 296/834] README.md

---
 ext/afform/README.md | 49 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 32602fac0066..2fb50ce59776 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -75,6 +75,46 @@ $ cv url civicrm/pretty-page/#/?name=world
 
 You can open the given URL in a web-browser.
 
+## Development: Scope variables and functions
+
+In AngularJS, every component has its own *scope* -- which defines a list of variables you can access.
+
+By default, `afform` provides a few variables in the scope of every form:
+
+* `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
+  service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
+* `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
+
+## Development: Display a contact record
+
+Let's say we want `foobar` to become a basic "View Contact" page. A user
+would request a URL like:
+
+```
+http://dmaster.localhost/civicrm/pretty-page/#/?cid=123
+```
+
+How do we use the `cid` to get information about the contact? Update `layout.html` to call APIv3:
+
+```html
+<div ng-if="routeParams.cid" afform-api3="['Contact', 'get', {id: routeParams.cid}]" afform-api3-ctrl="apiData">
+  <div ng-repeat="contact in apiData.result.values">
+
+    <h3>Key Contact Fields</h3>
+
+    <div><strong>Contact ID</strong>: {{contact.contact_id}}</div>
+    <div><strong>Contact Type</strong>: {{contact.contact_type}}</div>
+    <div><strong>Display Name</strong>: {{contact.display_name}}</div>
+    <div><strong>First Name</strong>: {{contact.first_name}}</div>
+    <div><strong>Last Name</strong>: {{contact.last_name}}</div>
+
+    <h3>Full Contact record</h3>
+
+    <pre>{{contact|json}}</pre>
+  </div>
+</div>
+```
+
 ## Development: Form CRUD API
 
 Now that we've defined a baseline form, it's possible for administrators and
@@ -123,15 +163,6 @@ A few important things to note about this:
 * The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
   normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
 
-## Development: Scope variables and functions
-
-In AngularJS, every component has its own *scope* -- which defines a list of variables you can access.
-
-By default, `afform` provides a few variables in the scope of every form:
-
-* `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
-  service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
-* `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
 
 ## Development: Every form is an AngularJS directive
 

From a53a1bd271aa5eda7b23b389afd58b7d5e681c2f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:29:23 -0700
Subject: [PATCH 297/834] ArrayHtml - Avoid warning

---
 ext/afform/CRM/Afform/ArrayHtml.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/afform/CRM/Afform/ArrayHtml.php b/ext/afform/CRM/Afform/ArrayHtml.php
index fa9089a66d26..b20c1e0fb09d 100644
--- a/ext/afform/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/CRM/Afform/ArrayHtml.php
@@ -4,6 +4,7 @@
  * Class CRM_Afform_ArrayHtml
  *
  * FIXME This a quick-and-dirty array<=>html mapping.
+ * FIXME: Comment mapping.
  */
 class CRM_Afform_ArrayHtml {
 
@@ -86,7 +87,7 @@ public function convertNodeToArray($node) {
       $arr = ['#tag' => $node->tagName];
       foreach ($node->attributes as $attribute) {
         $txt = $attribute->textContent;
-        if ($txt{0} === '{' && $txt{1} !== '{' && $this->allowStructuredAttribute($node->tagName, $attribute->name)) {
+        if ($txt && $txt{0} === '{' && $txt{1} !== '{' && $this->allowStructuredAttribute($node->tagName, $attribute->name)) {
           $arr[$attribute->name] = sprintf('PARSE-ME(%s)', $txt);
         }
         else {

From f4017340788eeec281739a34f5dd53868764b080 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:40:26 -0700
Subject: [PATCH 298/834] Expose the `meta` field in the form scope

---
 ext/afform/afform.php                           | 4 +++-
 ext/afform/ang/afformCore.js                    | 3 ++-
 ext/afform/templates/afform/FormAsDirective.tpl | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 2ec594afa971..a0566f066df6 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -186,13 +186,15 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   }
 
   $name = $params['name'];
-  $meta = civicrm_api3('Afform', 'getsingle', ['name' => $name]);
+  $scanner = new CRM_Afform_AfformScanner();
+  $meta = $scanner->getMeta($name);
   $scanner = new CRM_Afform_AfformScanner();
 
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
     'camel' => _afform_angular_module_name($name),
     'meta' => $meta,
+    'metaJson' => json_encode($meta),
     'layout' => file_get_contents($scanner->findFilePath($name, 'layout.html'))
   ]);
   $mimeType = 'text/javascript';
diff --git a/ext/afform/ang/afformCore.js b/ext/afform/ang/afformCore.js
index 2488968454aa..7548db1f5c8c 100644
--- a/ext/afform/ang/afformCore.js
+++ b/ext/afform/ang/afformCore.js
@@ -6,13 +6,14 @@
 
   // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
   angular.module('afformCore').service('afformCoreDirective', function($routeParams){
-    return function(camelName, d){
+    return function(camelName, meta, d){
       d.restrict = 'AE';
       d.scope = {};
       d.scope.options = '=' + camelName;
       d.link = function($scope, $el, $attr) {
         $scope.ts = CRM.ts(camelName);
         $scope.routeParams = $routeParams;
+        $scope.meta = meta;
       };
       return d;
     };
diff --git a/ext/afform/templates/afform/FormAsDirective.tpl b/ext/afform/templates/afform/FormAsDirective.tpl
index f448ad4406ae..ec8511c82a53 100644
--- a/ext/afform/templates/afform/FormAsDirective.tpl
+++ b/ext/afform/templates/afform/FormAsDirective.tpl
@@ -8,7 +8,7 @@
 (function(angular, $, _) {
   angular.module('{/literal}{$afform.camel}{literal}', CRM.angRequires('{/literal}{$afform.camel}{literal}'));
   angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function(afformCoreDirective) {
-    return afformCoreDirective({/literal}{$afform.camel|json}{literal}, {
+    return afformCoreDirective({/literal}{$afform.camel|json},{$afform.metaJson}{literal}, {
       template: {/literal}{$afform.layout|json}{literal}
     });
   });

From 304ead2486715a619ea89c5db884cb8bba79ced9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:40:50 -0700
Subject: [PATCH 299/834] README.md

---
 ext/afform/README.md | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 2fb50ce59776..67789e9b80ba 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -58,33 +58,45 @@ $ cv flush
 A few things to note:
 
 * We defined a route `civicrm/pretty-page`. This is defined in the same routing system used by CiviCRM forms.
-* The file `layout.html` is an AngularJS HTML document. It has access to all the general templating features, such as variable substition
-  (`{{routeParams.name}}`) and the standard library of directives (`ng-if`, `ng-style`, `ng-repeat`, etc).
+* The file `layout.html` is an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
 * After creating a new form or file, we should flush the cache.
 * If you're going to actively edit/revise the content of the file, then you should navigate
   to **Administer > System Settings > Debugging** and disable asset caching.
 
-Now that we've created a form, we'll want to determine its URL:
+Now that we've created a form, we'll want to determine its URL. As with most
+CiviCRM forms, the URL depends on the CMS configuration. Here is an example
+from a local Drupal 7 site:
 
 ```
-$ cv url civicrm/pretty-page
+$ cv url "civicrm/pretty-page"
 "http://dmaster.localhost/civicrm/pretty-page"
-$ cv url civicrm/pretty-page/#/?name=world
+$ cv url "civicrm/pretty-page/#/?name=world"
 "http://dmaster.localhost/civicrm/pretty-page/#/?name=world"
 ```
 
-You can open the given URL in a web-browser.
+Open the URLs and see what you get.
 
-## Development: Scope variables and functions
+## Development: Scopes, variables, and directives - oh my!
 
-In AngularJS, every component has its own *scope* -- which defines a list of variables you can access.
+In AngularJS, the primary language for orchestrating a screen is HTML. You can embed code in here.
 
-By default, `afform` provides a few variables in the scope of every form:
+One key concept *scope* -- the *scope* defines the list of variables which you can access.  By default, `afform`
+provides a few variables within the scope of every form:
 
 * `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
   service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
+* `meta`: The stored meta data (`meta.json`) for this form.
 * `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
 
+Additionally, AngularJS allows *directives* -- these are extra HTML attributes and HTML tags. For example:
+
+* `ng-if` will conditionally create or destroy elements in the page.
+* `ng-repeat` will loop through data.
+* `ng-style` and `ng-class` will conditionally apply styling.
+
+A full explanation of these features is out-of-scope for this document, but the key point is that you can use standard
+AngularJS features.
+
 ## Development: Display a contact record
 
 Let's say we want `foobar` to become a basic "View Contact" page. A user
@@ -94,11 +106,15 @@ would request a URL like:
 http://dmaster.localhost/civicrm/pretty-page/#/?cid=123
 ```
 
-How do we use the `cid` to get information about the contact? Update `layout.html` to call APIv3:
+How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv33:
 
 ```html
-<div ng-if="routeParams.cid" afform-api3="['Contact', 'get', {id: routeParams.cid}]" afform-api3-ctrl="apiData">
+<div ng-if="routeParams.cid"
+  afform-api3="['Contact', 'get', {id: routeParams.cid}]"
+  afform-api3-ctrl="apiData">
+
   <div ng-repeat="contact in apiData.result.values">
+    <h1 crm-page-title="">{{contact.display_name}}</h1>
 
     <h3>Key Contact Fields</h3>
 

From 7f44f781ab25dc3ab544500e3736fb5c66865f01 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 12 Jun 2018 23:46:27 -0700
Subject: [PATCH 300/834] README.md

---
 ext/afform/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 67789e9b80ba..6e353004c128 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -206,6 +206,7 @@ Now, in `afform/foobar/layout.html`, you can use the `phaseOfMoon`:
 Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
 ```
 
+Or if you're not sure data will actually be provided:
 
 ```html
 Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is currently {{options.phaseOfMoon ? options.phaseOfMoon : 'on hiatus'}}.
@@ -216,7 +217,6 @@ Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is curren
 * The code is currently written as a proof-of-concept. There are several `FIXME`/`TODO` declarations in the code
   for checking pre-conditions, reporting errors, handling edge-cases, etc.
 * Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
-  and `hook_civicrm_alterAngular`. We'll need a core patch to allow that.
+  and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that.
 * We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
 * Need to implement the `Afform.revert` API to undo local cusotmizations.
-* To allow full support for change-sets, we'll need to patch `civicrm-core`.

From 9ec944f2bec975038f12aa2d6c326a4f11c22a8e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 10:49:41 -0700
Subject: [PATCH 301/834] Rename FormAsDirective.tpl to AfformAngularModule.tpl

---
 ext/afform/afform.php                                           | 2 +-
 .../afform/{FormAsDirective.tpl => AfformAngularModule.tpl}     | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ext/afform/templates/afform/{FormAsDirective.tpl => AfformAngularModule.tpl} (100%)

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index a0566f066df6..9690db244c2c 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -198,7 +198,7 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     'layout' => file_get_contents($scanner->findFilePath($name, 'layout.html'))
   ]);
   $mimeType = 'text/javascript';
-  $content = $smarty->fetch('afform/FormAsDirective.tpl');
+  $content = $smarty->fetch('afform/AfformAngularModule.tpl');
 }
 
 /**
diff --git a/ext/afform/templates/afform/FormAsDirective.tpl b/ext/afform/templates/afform/AfformAngularModule.tpl
similarity index 100%
rename from ext/afform/templates/afform/FormAsDirective.tpl
rename to ext/afform/templates/afform/AfformAngularModule.tpl

From 01e92c8a9eb6f01cffac01fd9d9ff78051a51077 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 10:52:00 -0700
Subject: [PATCH 302/834] AfformAngularModule.tpl - Tweak docblock

---
 ext/afform/templates/afform/AfformAngularModule.tpl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ext/afform/templates/afform/AfformAngularModule.tpl b/ext/afform/templates/afform/AfformAngularModule.tpl
index ec8511c82a53..2853b8412558 100644
--- a/ext/afform/templates/afform/AfformAngularModule.tpl
+++ b/ext/afform/templates/afform/AfformAngularModule.tpl
@@ -1,8 +1,9 @@
-{* This takes an $afform and generates an AngularJS directive.
+{* This takes an $afform and generates an AngularJS module.
 
- @param string $afform.camel The full camel-case name of the AngularJS module being created
- @param string $afform.meta  The full metadata record of the form
- @param string $afform.layout  The template content
+ @param string $afform.camel     The full camel-case name of the AngularJS module being created
+ @param array  $afform.meta      The full metadata record of the form
+ @param string $afform.metaJson  The full metadata record of the form
+ @param string $afform.layout    The template content (HTML)
  *}
 {literal}
 (function(angular, $, _) {

From fdee1ed953c47ee2eb99e1c7925f5fee1443a705 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 10:57:39 -0700
Subject: [PATCH 303/834] README.md

---
 ext/afform/README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 6e353004c128..a895ff2eb275 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -106,7 +106,7 @@ would request a URL like:
 http://dmaster.localhost/civicrm/pretty-page/#/?cid=123
 ```
 
-How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv33:
+How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv3:
 
 ```html
 <div ng-if="routeParams.cid"
@@ -131,6 +131,10 @@ How do we use the `cid` to get information about the contact? Update `layout.htm
 </div>
 ```
 
+This example is useful pedagogically and may be useful in a crunch -- but in the longer term,
+we should have a richer library of directives so that typical user-managed forms don't drill-down
+at this level of detail.
+
 ## Development: Form CRUD API
 
 Now that we've defined a baseline form, it's possible for administrators and
@@ -219,4 +223,7 @@ Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is curren
 * Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
   and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that.
 * We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
-* Need to implement the `Afform.revert` API to undo local cusotmizations.
+* Need to implement the `Afform.revert` API to undo local customizations.
+* Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
+  On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have
+  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-foobar/>`.

From 62fa07d506d6c6ed8e41c7f48c1a4c1edda6cd68 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 11:07:34 -0700
Subject: [PATCH 304/834] README.md

---
 ext/afform/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index a895ff2eb275..98e94c8be9d5 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -216,6 +216,15 @@ Or if you're not sure data will actually be provided:
 Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is currently {{options.phaseOfMoon ? options.phaseOfMoon : 'on hiatus'}}.
 ```
 
+This design has some other neat consequences:
+
+* One `afform` may embed another `afform`.
+* The parent `afform` can pass extra `options` to the child.
+* If you decide that the framework provided by `org.civicrm.afform` is too stifling, you can fork off --
+  remove the `afform/foobar` folder and create your own static module (`civix generate:angular-module --am=afform-foobar`, etc).
+  As long as your module supports the same interfaces (e.g. `<div afform-foobar="...">`), downstream users can still be supported.
+    *(FIXME: Could one fork off the JS while still allowing CRUD API to manipulate HTML?)
+
 ## Known Issues
 
 * The code is currently written as a proof-of-concept. There are several `FIXME`/`TODO` declarations in the code

From 90b7c4227b3a5bb63b055e6a2a7ec76aeced1c98 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 22:09:41 -0700
Subject: [PATCH 305/834] README.md - Rename foobar to helloworld

---
 ext/afform/README.md | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 98e94c8be9d5..8c1c83619cbc 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -45,19 +45,19 @@ cv en afform
 
 As an extension author, you can define a form along with its default,
 canonical content. Simply create a folder named  `afform/<MY-FORM>`. In
-this example, we create a form named `foobar`:
+this example, we create a form named `helloworld`:
 
 ```
 $ cd /path/to/my/own/extension
-$ mkdir -p afform/foobar
-$ echo '{"server_route": "civicrm/pretty-page"}' > afform/foobar/meta.json
-$ echo '<div>Hello {{routeParams.name}}</div>' > afform/foobar/layout.html
+$ mkdir -p afform/helloworld
+$ echo '{"server_route": "civicrm/hello-world"}' > afform/helloworld/meta.json
+$ echo '<div>Hello {{routeParams.name}}</div>' > afform/helloworld/layout.html
 $ cv flush
 ```
 
 A few things to note:
 
-* We defined a route `civicrm/pretty-page`. This is defined in the same routing system used by CiviCRM forms.
+* We defined a route `civicrm/hello-world`. This is defined in the same routing system used by CiviCRM forms.
 * The file `layout.html` is an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
 * After creating a new form or file, we should flush the cache.
 * If you're going to actively edit/revise the content of the file, then you should navigate
@@ -68,10 +68,10 @@ CiviCRM forms, the URL depends on the CMS configuration. Here is an example
 from a local Drupal 7 site:
 
 ```
-$ cv url "civicrm/pretty-page"
-"http://dmaster.localhost/civicrm/pretty-page"
-$ cv url "civicrm/pretty-page/#/?name=world"
-"http://dmaster.localhost/civicrm/pretty-page/#/?name=world"
+$ cv url "civicrm/hello-world"
+"http://dmaster.localhost/civicrm/hello-world"
+$ cv url "civicrm/hello-world/#/?name=world"
+"http://dmaster.localhost/civicrm/hello-world/#/?name=world"
 ```
 
 Open the URLs and see what you get.
@@ -99,11 +99,11 @@ AngularJS features.
 
 ## Development: Display a contact record
 
-Let's say we want `foobar` to become a basic "View Contact" page. A user
+Let's say we want `helloworld` to become a basic "View Contact" page. A user
 would request a URL like:
 
 ```
-http://dmaster.localhost/civicrm/pretty-page/#/?cid=123
+http://dmaster.localhost/civicrm/hello-world/#/?cid=123
 ```
 
 How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv3:
@@ -141,9 +141,9 @@ Now that we've defined a baseline form, it's possible for administrators and
 GUI applications to inspect the form using the API:
 
 ```
-$ cv api afform.getsingle name=foobar
+$ cv api afform.getsingle name=helloworld
 {
-    "name": "foobar",
+    "name": "helloworld",
     "requires": [
         "afformCore"
     ],
@@ -155,20 +155,20 @@ $ cv api afform.getsingle name=foobar
             "Hello {{routeParams.name}}"
         ]
     },
-    "id": "foobar"
+    "id": "helloworld"
 }
 ```
 
 Additionally, you can also update the forms:
 
 ```
-$ cv api afform.create name=foobar title="The Foo Bar Screen"
+$ cv api afform.create name=helloworld title="The Foo Bar Screen"
 {
     "is_error": 0,
     "version": 3,
     "count": 2,
     "values": {
-        "name": "foobar",
+        "name": "helloworld",
         "title": "The Foo Bar Screen"
     }
 }
@@ -178,33 +178,33 @@ A few important things to note about this:
 
 * The changes are only applied on this site.
 * Once you make a change with the CRUD API, there will be two copies of the form:
-    * `[myextension]/afform/foobar/` is the default, canonical version.
-    * `[civicrm.files]/afform/foobar/` is the locally customized version.
+    * `[myextension]/afform/helloworld/` is the default, canonical version.
+    * `[civicrm.files]/afform/helloworld/` is the locally customized version.
 * The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
   normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
 
 
 ## Development: Every form is an AngularJS directive
 
-In the quick-start example, we registered a new route (`"server_route": "civicrm/pretty-page"`) -- this created a
-simple, standalone page with the sole purpose of displaying the `foobar` form. But that had very limited information.
+In the quick-start example, we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
+simple, standalone page with the sole purpose of displaying the `helloworld` form. But that had very limited information.
 What if we want control the environment a bit more?
 
-There's no obligation to use the simple, standalone version of `foobar`.  Think of `foobar` as a *re-usable sub-form*
-or as a *directive*.  If you've created an AngluarJS application, then you can embed `foobar` with two small steps:
+There's no obligation to use the simple, standalone version of `helloworld`.  Think of `helloworld` as a *re-usable sub-form*
+or as a *directive*.  If you've created an AngluarJS application, then you can embed `helloworld` with two small steps:
 
 1. In your application, declare a dependency on module `afformFoobar`. This is usually done in `ang/MYMODULE.ang.php`
    and/or `ang/MYMODULE.js`.
-2. In your HTML template, use the directive `<div afform-foobar=""></div>`.
+2. In your HTML template, use the directive `<div afform-helloworld=""></div>`.
 
 This technique is particularly useful if you want to provide extra data for the form author to use.  For example, your
 application might pass in the current phase of the moon:
 
 ```html
-<div afform-foobar="{phaseOfMoon: 'waxing'}"></div>
+<div afform-helloworld="{phaseOfMoon: 'waxing'}"></div>
 ```
 
-Now, in `afform/foobar/layout.html`, you can use the `phaseOfMoon`:
+Now, in `afform/helloworld/layout.html`, you can use the `phaseOfMoon`:
 
 ```html
 Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
@@ -221,8 +221,8 @@ This design has some other neat consequences:
 * One `afform` may embed another `afform`.
 * The parent `afform` can pass extra `options` to the child.
 * If you decide that the framework provided by `org.civicrm.afform` is too stifling, you can fork off --
-  remove the `afform/foobar` folder and create your own static module (`civix generate:angular-module --am=afform-foobar`, etc).
-  As long as your module supports the same interfaces (e.g. `<div afform-foobar="...">`), downstream users can still be supported.
+  remove the `afform/helloworld` folder and create your own static module (`civix generate:angular-module --am=afform-helloworld`, etc).
+  As long as your module supports the same interfaces (e.g. `<div afform-helloworld="...">`), downstream users can still be supported.
     *(FIXME: Could one fork off the JS while still allowing CRUD API to manipulate HTML?)
 
 ## Known Issues
@@ -235,4 +235,4 @@ This design has some other neat consequences:
 * Need to implement the `Afform.revert` API to undo local customizations.
 * Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
   On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have
-  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-foobar/>`.
+  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-helloworld/>`.

From 4add5fad7a263ed7a9e2cf28a9938852bf6f7ba4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 23:09:04 -0700
Subject: [PATCH 306/834] README.md

---
 ext/afform/README.md | 78 ++++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 8c1c83619cbc..44f99a6e5602 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -76,7 +76,7 @@ $ cv url "civicrm/hello-world/#/?name=world"
 
 Open the URLs and see what you get.
 
-## Development: Scopes, variables, and directives - oh my!
+## Development: Writing HTML templates
 
 In AngularJS, the primary language for orchestrating a screen is HTML. You can embed code in here.
 
@@ -97,7 +97,7 @@ Additionally, AngularJS allows *directives* -- these are extra HTML attributes a
 A full explanation of these features is out-of-scope for this document, but the key point is that you can use standard
 AngularJS features.
 
-## Development: Display a contact record
+## Development: Writing HTML templates: Contact record example
 
 Let's say we want `helloworld` to become a basic "View Contact" page. A user
 would request a URL like:
@@ -179,51 +179,81 @@ A few important things to note about this:
 * The changes are only applied on this site.
 * Once you make a change with the CRUD API, there will be two copies of the form:
     * `[myextension]/afform/helloworld/` is the default, canonical version.
-    * `[civicrm.files]/afform/helloworld/` is the locally customized version.
+    * `[civicrm.files]/afform/helloworld/` is the local, custom version.
 * The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
   normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
 
-
-## Development: Every form is an AngularJS directive
+## Development: Embedding forms
 
 In the quick-start example, we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
-simple, standalone page with the sole purpose of displaying the `helloworld` form. But that had very limited information.
-What if we want control the environment a bit more?
+simple, standalone page with the sole purpose of displaying the `helloworld` form.  What if we want to embed the form
+somewhere else -- e.g. as a dialog inside an event-listing or membership directory?  Afforms are actualy *re-usable
+sub-forms*.
 
-There's no obligation to use the simple, standalone version of `helloworld`.  Think of `helloworld` as a *re-usable sub-form*
-or as a *directive*.  If you've created an AngluarJS application, then you can embed `helloworld` with two small steps:
+How does this work?  Every `afform` is an *AngularJS directive*.  For example, `helloworld` can be embedded with:
 
-1. In your application, declare a dependency on module `afformFoobar`. This is usually done in `ang/MYMODULE.ang.php`
-   and/or `ang/MYMODULE.js`.
-2. In your HTML template, use the directive `<div afform-helloworld=""></div>`.
+```html
+<div afform-hellworld=""></div>
+```
 
-This technique is particularly useful if you want to provide extra data for the form author to use.  For example, your
-application might pass in the current phase of the moon:
+Moreover, you can pass options to `helloworld`:
 
 ```html
 <div afform-helloworld="{phaseOfMoon: 'waxing'}"></div>
 ```
 
-Now, in `afform/helloworld/layout.html`, you can use the `phaseOfMoon`:
+Now, in `afform/helloworld/layout.html`, you can use `options.phaseOfMoon`:
 
 ```html
 Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
 ```
 
-Or if you're not sure data will actually be provided:
+## Development: Embedding forms: Contact record example
+
+Is this useful? Let's suppose you're building a contact record page.
+
+First, let's make a few building-blocks:
+
+1. `afform/contactName/layout.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
+2. `afform/contactAddressess/layout.html` displays a sub-form for editing street addresses.
+3. `afform/contactEmails/layout.html` displays a sub-form for editing email addresses.
+
+Now you can create an overall `afform/contact/layout.html` which uses these building-blocks:
 
 ```html
-Hello, {{routeParams.name ? routeParams.name : 'anonymous'}}. The moon is currently {{options.phaseOfMoon ? options.phaseOfMoon : 'on hiatus'}}.
+<div ng-form="contactForm">
+  <div crm-ui-accordion="{title: ts('Name')}">
+    <div afform-contact-name="{cid: routeParams.cid}"></div>
+  </div>
+  <div crm-ui-accordion="{title: ts('Street Addresses')}">
+    <div afform-contact-addresses="{cid: routeParams.cid}"></div>
+  </div>
+  <div crm-ui-accordion="{title: ts('Emails')}">
+    <div afform-contact-emails="{cid: routeParams.cid}"></div>
+  </div>
+</div>
 ```
 
-This design has some other neat consequences:
+> *(FIXME: In the parent form's `meta.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
+
+What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `afform/contactName/layout.html` --
+but all the other components can cleanly track the canonical release. This significantly reduces the costs and risks
+of manging upgrades and changes.
+
+## Development: Full AngularJS
+
+Afform is really only a subset of AngularJS -- it emphasizes the use of *directives* as a way to *pick and arrange* the
+parts of your form.  There is more to AngularJS -- such as client-side routing, controllers, services, etc.  What to do
+if you need these? Here are few tricks:
 
-* One `afform` may embed another `afform`.
-* The parent `afform` can pass extra `options` to the child.
-* If you decide that the framework provided by `org.civicrm.afform` is too stifling, you can fork off --
-  remove the `afform/helloworld` folder and create your own static module (`civix generate:angular-module --am=afform-helloworld`, etc).
-  As long as your module supports the same interfaces (e.g. `<div afform-helloworld="...">`), downstream users can still be supported.
-    *(FIXME: Could one fork off the JS while still allowing CRUD API to manipulate HTML?)
+* You can create your own applications and pages with full AngularJS. (See also: [CiviCRM Developer Guide: AngularJS: Quick Start](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/)).
+  Then embed the afform (like `helloworld`) in your page with these steps:
+    * Declare a dependency on module (`afformHelloworld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
+    * In your HTML template, use the directive `<div afform-helloworld=""></div>`. If you want to provide extra data or services for the form author, pass them along.
+* You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
+* If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
+  As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.
+    *(FIXME: But if you do this, could you still permit downstream folks customize the HTML?)
 
 ## Known Issues
 

From eae11380cc2f3e641d421311ed15998e88d8a816 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 13 Jun 2018 23:16:53 -0700
Subject: [PATCH 307/834] README.md

---
 ext/afform/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 44f99a6e5602..16cc50605d64 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -253,7 +253,9 @@ if you need these? Here are few tricks:
 * You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
 * If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
   As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.
-    *(FIXME: But if you do this, could you still permit downstream folks customize the HTML?)
+
+> *(FIXME: But if you do convert to static, could you still permit downstream folks customize the HTML?  Let's
+> re-assess after we've patched core to allow full participation in the lifecycle of HTML partials.)*
 
 ## Known Issues
 

From 86b0bdd733878adecd2a34109525d380c1a41263 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 14 Jun 2018 00:15:37 -0700
Subject: [PATCH 308/834] README.md

---
 ext/afform/README.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 16cc50605d64..0789ac8220b2 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -78,24 +78,25 @@ Open the URLs and see what you get.
 
 ## Development: Writing HTML templates
 
-In AngularJS, the primary language for orchestrating a screen is HTML. You can embed code in here.
+In AngularJS, the primary language for orchestrating a screen is HTML. You can do interesting things in Angular
+HTML, such as displaying variables and applying directives.
 
-One key concept *scope* -- the *scope* defines the list of variables which you can access.  By default, `afform`
-provides a few variables within the scope of every form:
+One key concept is *scope* -- the *scope* determines the list of variables which you can access.  By default, `afform`
+creates a scope with these variables:
 
 * `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
   service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
 * `meta`: The stored meta data (`meta.json`) for this form.
 * `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
 
-Additionally, AngularJS allows *directives* -- these are extra HTML attributes and HTML tags. For example:
+Additionally, AngularJS allows *directives* -- these are extra HTML attributes which create behavior. For example:
 
 * `ng-if` will conditionally create or destroy elements in the page.
 * `ng-repeat` will loop through data.
 * `ng-style` and `ng-class` will conditionally apply styling.
 
 A full explanation of these features is out-of-scope for this document, but the key point is that you can use standard
-AngularJS features.
+AngularJS markup.
 
 ## Development: Writing HTML templates: Contact record example
 
@@ -193,7 +194,7 @@ sub-forms*.
 How does this work?  Every `afform` is an *AngularJS directive*.  For example, `helloworld` can be embedded with:
 
 ```html
-<div afform-hellworld=""></div>
+<div afform-helloworld=""></div>
 ```
 
 Moreover, you can pass options to `helloworld`:
@@ -212,13 +213,13 @@ Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
 
 Is this useful? Let's suppose you're building a contact record page.
 
-First, let's make a few building-blocks:
+First, we should make a few building-blocks:
 
 1. `afform/contactName/layout.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
 2. `afform/contactAddressess/layout.html` displays a sub-form for editing street addresses.
 3. `afform/contactEmails/layout.html` displays a sub-form for editing email addresses.
 
-Now you can create an overall `afform/contact/layout.html` which uses these building-blocks:
+Next, we should create an overall `afform/contact/layout.html` which uses these building-blocks:
 
 ```html
 <div ng-form="contactForm">
@@ -242,14 +243,15 @@ of manging upgrades and changes.
 
 ## Development: Full AngularJS
 
-Afform is really only a subset of AngularJS -- it emphasizes the use of *directives* as a way to *pick and arrange* the
-parts of your form.  There is more to AngularJS -- such as client-side routing, controllers, services, etc.  What to do
-if you need these? Here are few tricks:
+Afform is a subset of AngularJS -- it emphasizes the use of *directives* as a way to *choose and arrange* the parts of
+your form.  There is more to AngularJS -- such as client-side routing, controllers, services, etc.  What to do if you
+need these?  Here are few tricks:
 
 * You can create your own applications and pages with full AngularJS. (See also: [CiviCRM Developer Guide: AngularJS: Quick Start](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/)).
   Then embed the afform (like `helloworld`) in your page with these steps:
     * Declare a dependency on module (`afformHelloworld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
-    * In your HTML template, use the directive `<div afform-helloworld=""></div>`. If you want to provide extra data or services for the form author, pass them along.
+    * In your HTML template, use the directive `<div afform-helloworld=""></div>`. I
+    * f you want to provide extra data, services, or actions for the form author -- then pass them along.
 * You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
 * If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
   As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.

From 8a0ffdf9894e65e406cfb7afa9935a330e36139c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 16:36:52 -0700
Subject: [PATCH 309/834] Split README.md into smaller `docs/*.md` files

---
 ext/afform/README.md          | 239 ++--------------------------------
 ext/afform/docs/angular.md    |  17 +++
 ext/afform/docs/crud.md       |  47 +++++++
 ext/afform/docs/embed.md      |  56 ++++++++
 ext/afform/docs/quickstart.md |  34 +++++
 ext/afform/docs/roadmap.md    |  15 +++
 ext/afform/docs/writing.md    |  59 +++++++++
 7 files changed, 238 insertions(+), 229 deletions(-)
 create mode 100644 ext/afform/docs/angular.md
 create mode 100644 ext/afform/docs/crud.md
 create mode 100644 ext/afform/docs/embed.md
 create mode 100644 ext/afform/docs/quickstart.md
 create mode 100644 ext/afform/docs/roadmap.md
 create mode 100644 ext/afform/docs/writing.md

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 0789ac8220b2..be92e3aec59a 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -10,7 +10,9 @@ in CiviCRM which:
 3. Allows developers to embed these forms in other CiviCRM-AngularJS apps.
 4. (WIP; pending upstream support) Allow developers to apply [change sets](https://docs.civicrm.org/dev/en/latest/framework/angular/changeset/).
 
-The extension is licensed under [AGPL-3.0](LICENSE.txt).
+This extension is a proof-of-concept.  It aims to demonstrate the core model/concept -- however, there are 
+[known issues and additional components](docs/roadmap.md) to address, and some documentation will be easier to approach
+if you already have a basic understanding of CiviCRM API and AngularJS.  It is licensed under [AGPL-3.0](LICENSE.txt).
 
 ## Requirements
 
@@ -41,232 +43,11 @@ git clone https://github.com/FIXME/org.civicrm.afform.git
 cv en afform
 ```
 
-## Development: Quick Start
+## Development
 
-As an extension author, you can define a form along with its default,
-canonical content. Simply create a folder named  `afform/<MY-FORM>`. In
-this example, we create a form named `helloworld`:
-
-```
-$ cd /path/to/my/own/extension
-$ mkdir -p afform/helloworld
-$ echo '{"server_route": "civicrm/hello-world"}' > afform/helloworld/meta.json
-$ echo '<div>Hello {{routeParams.name}}</div>' > afform/helloworld/layout.html
-$ cv flush
-```
-
-A few things to note:
-
-* We defined a route `civicrm/hello-world`. This is defined in the same routing system used by CiviCRM forms.
-* The file `layout.html` is an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
-* After creating a new form or file, we should flush the cache.
-* If you're going to actively edit/revise the content of the file, then you should navigate
-  to **Administer > System Settings > Debugging** and disable asset caching.
-
-Now that we've created a form, we'll want to determine its URL. As with most
-CiviCRM forms, the URL depends on the CMS configuration. Here is an example
-from a local Drupal 7 site:
-
-```
-$ cv url "civicrm/hello-world"
-"http://dmaster.localhost/civicrm/hello-world"
-$ cv url "civicrm/hello-world/#/?name=world"
-"http://dmaster.localhost/civicrm/hello-world/#/?name=world"
-```
-
-Open the URLs and see what you get.
-
-## Development: Writing HTML templates
-
-In AngularJS, the primary language for orchestrating a screen is HTML. You can do interesting things in Angular
-HTML, such as displaying variables and applying directives.
-
-One key concept is *scope* -- the *scope* determines the list of variables which you can access.  By default, `afform`
-creates a scope with these variables:
-
-* `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
-  service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
-* `meta`: The stored meta data (`meta.json`) for this form.
-* `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
-
-Additionally, AngularJS allows *directives* -- these are extra HTML attributes which create behavior. For example:
-
-* `ng-if` will conditionally create or destroy elements in the page.
-* `ng-repeat` will loop through data.
-* `ng-style` and `ng-class` will conditionally apply styling.
-
-A full explanation of these features is out-of-scope for this document, but the key point is that you can use standard
-AngularJS markup.
-
-## Development: Writing HTML templates: Contact record example
-
-Let's say we want `helloworld` to become a basic "View Contact" page. A user
-would request a URL like:
-
-```
-http://dmaster.localhost/civicrm/hello-world/#/?cid=123
-```
-
-How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv3:
-
-```html
-<div ng-if="routeParams.cid"
-  afform-api3="['Contact', 'get', {id: routeParams.cid}]"
-  afform-api3-ctrl="apiData">
-
-  <div ng-repeat="contact in apiData.result.values">
-    <h1 crm-page-title="">{{contact.display_name}}</h1>
-
-    <h3>Key Contact Fields</h3>
-
-    <div><strong>Contact ID</strong>: {{contact.contact_id}}</div>
-    <div><strong>Contact Type</strong>: {{contact.contact_type}}</div>
-    <div><strong>Display Name</strong>: {{contact.display_name}}</div>
-    <div><strong>First Name</strong>: {{contact.first_name}}</div>
-    <div><strong>Last Name</strong>: {{contact.last_name}}</div>
-
-    <h3>Full Contact record</h3>
-
-    <pre>{{contact|json}}</pre>
-  </div>
-</div>
-```
-
-This example is useful pedagogically and may be useful in a crunch -- but in the longer term,
-we should have a richer library of directives so that typical user-managed forms don't drill-down
-at this level of detail.
-
-## Development: Form CRUD API
-
-Now that we've defined a baseline form, it's possible for administrators and
-GUI applications to inspect the form using the API:
-
-```
-$ cv api afform.getsingle name=helloworld
-{
-    "name": "helloworld",
-    "requires": [
-        "afformCore"
-    ],
-    "title": "",
-    "description": "",
-    "layout": {
-        "#tag": "div",
-        "#children": [
-            "Hello {{routeParams.name}}"
-        ]
-    },
-    "id": "helloworld"
-}
-```
-
-Additionally, you can also update the forms:
-
-```
-$ cv api afform.create name=helloworld title="The Foo Bar Screen"
-{
-    "is_error": 0,
-    "version": 3,
-    "count": 2,
-    "values": {
-        "name": "helloworld",
-        "title": "The Foo Bar Screen"
-    }
-}
-```
-
-A few important things to note about this:
-
-* The changes are only applied on this site.
-* Once you make a change with the CRUD API, there will be two copies of the form:
-    * `[myextension]/afform/helloworld/` is the default, canonical version.
-    * `[civicrm.files]/afform/helloworld/` is the local, custom version.
-* The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
-  normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
-
-## Development: Embedding forms
-
-In the quick-start example, we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
-simple, standalone page with the sole purpose of displaying the `helloworld` form.  What if we want to embed the form
-somewhere else -- e.g. as a dialog inside an event-listing or membership directory?  Afforms are actualy *re-usable
-sub-forms*.
-
-How does this work?  Every `afform` is an *AngularJS directive*.  For example, `helloworld` can be embedded with:
-
-```html
-<div afform-helloworld=""></div>
-```
-
-Moreover, you can pass options to `helloworld`:
-
-```html
-<div afform-helloworld="{phaseOfMoon: 'waxing'}"></div>
-```
-
-Now, in `afform/helloworld/layout.html`, you can use `options.phaseOfMoon`:
-
-```html
-Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
-```
-
-## Development: Embedding forms: Contact record example
-
-Is this useful? Let's suppose you're building a contact record page.
-
-First, we should make a few building-blocks:
-
-1. `afform/contactName/layout.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
-2. `afform/contactAddressess/layout.html` displays a sub-form for editing street addresses.
-3. `afform/contactEmails/layout.html` displays a sub-form for editing email addresses.
-
-Next, we should create an overall `afform/contact/layout.html` which uses these building-blocks:
-
-```html
-<div ng-form="contactForm">
-  <div crm-ui-accordion="{title: ts('Name')}">
-    <div afform-contact-name="{cid: routeParams.cid}"></div>
-  </div>
-  <div crm-ui-accordion="{title: ts('Street Addresses')}">
-    <div afform-contact-addresses="{cid: routeParams.cid}"></div>
-  </div>
-  <div crm-ui-accordion="{title: ts('Emails')}">
-    <div afform-contact-emails="{cid: routeParams.cid}"></div>
-  </div>
-</div>
-```
-
-> *(FIXME: In the parent form's `meta.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
-
-What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `afform/contactName/layout.html` --
-but all the other components can cleanly track the canonical release. This significantly reduces the costs and risks
-of manging upgrades and changes.
-
-## Development: Full AngularJS
-
-Afform is a subset of AngularJS -- it emphasizes the use of *directives* as a way to *choose and arrange* the parts of
-your form.  There is more to AngularJS -- such as client-side routing, controllers, services, etc.  What to do if you
-need these?  Here are few tricks:
-
-* You can create your own applications and pages with full AngularJS. (See also: [CiviCRM Developer Guide: AngularJS: Quick Start](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/)).
-  Then embed the afform (like `helloworld`) in your page with these steps:
-    * Declare a dependency on module (`afformHelloworld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
-    * In your HTML template, use the directive `<div afform-helloworld=""></div>`. I
-    * f you want to provide extra data, services, or actions for the form author -- then pass them along.
-* You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
-* If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
-  As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.
-
-> *(FIXME: But if you do convert to static, could you still permit downstream folks customize the HTML?  Let's
-> re-assess after we've patched core to allow full participation in the lifecycle of HTML partials.)*
-
-## Known Issues
-
-* The code is currently written as a proof-of-concept. There are several `FIXME`/`TODO` declarations in the code
-  for checking pre-conditions, reporting errors, handling edge-cases, etc.
-* Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
-  and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that.
-* We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
-* Need to implement the `Afform.revert` API to undo local customizations.
-* Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
-  On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have
-  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-helloworld/>`.
+* [Quick Start: Creating the canonical definition of a basic form](docs/quickstart.md)
+* [Writing: Forms as basic AngularJS templates](docs/writing.md) (With example: *Contact Record*)
+* [Embedding: Forms as reusable building-block](docs/embed.md) (With example: *Contact Record*)
+* [Form CRUD: Updating forms via programmatic API](docs/crud.md)
+* [Full AngularJS: Integrating between Afform and vanilla AngularJS](docs/angular.md)
+* [Roadmap and Known Issues](docs/roadmap.md)
diff --git a/ext/afform/docs/angular.md b/ext/afform/docs/angular.md
new file mode 100644
index 000000000000..022404960325
--- /dev/null
+++ b/ext/afform/docs/angular.md
@@ -0,0 +1,17 @@
+## Development: Full AngularJS
+
+Afform is a subset of AngularJS -- it emphasizes the use of *directives* as a way to *choose and arrange* the parts of
+your form.  There is more to AngularJS -- such as client-side routing, controllers, services, etc.  What to do if you
+need these?  Here are few tricks:
+
+* You can create your own applications and pages with full AngularJS. (See also: [CiviCRM Developer Guide: AngularJS: Quick Start](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/)).
+  Then embed the afform (like `helloworld`) in your page with these steps:
+    * Declare a dependency on module (`afformHelloworld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
+    * In your HTML template, use the directive `<div afform-helloworld=""></div>`. I
+    * f you want to provide extra data, services, or actions for the form author -- then pass them along.
+* You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
+* If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
+  As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.
+
+> *(FIXME: But if you do convert to static, could you still permit downstream folks customize the HTML?  Let's
+> re-assess after we've patched core to allow full participation in the lifecycle of HTML partials.)*
diff --git a/ext/afform/docs/crud.md b/ext/afform/docs/crud.md
new file mode 100644
index 000000000000..e1f424b3ab1b
--- /dev/null
+++ b/ext/afform/docs/crud.md
@@ -0,0 +1,47 @@
+## Development: Form CRUD API
+
+Now that we've defined a baseline form, it's possible for administrators and
+GUI applications to inspect the form using the API:
+
+```
+$ cv api afform.getsingle name=helloworld
+{
+    "name": "helloworld",
+    "requires": [
+        "afformCore"
+    ],
+    "title": "",
+    "description": "",
+    "layout": {
+        "#tag": "div",
+        "#children": [
+            "Hello {{routeParams.name}}"
+        ]
+    },
+    "id": "helloworld"
+}
+```
+
+Additionally, you can also update the forms:
+
+```
+$ cv api afform.create name=helloworld title="The Foo Bar Screen"
+{
+    "is_error": 0,
+    "version": 3,
+    "count": 2,
+    "values": {
+        "name": "helloworld",
+        "title": "The Foo Bar Screen"
+    }
+}
+```
+
+A few important things to note about this:
+
+* The changes made through the API are only applied on this site.
+* Once you make a change with the CRUD API, there will be two copies of the form:
+    * `[myextension]/afform/helloworld/` is the default, canonical version.
+    * `[civicrm.files]/afform/helloworld/` is the local, custom version.
+* The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
+  normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
new file mode 100644
index 000000000000..c6708ad5eb41
--- /dev/null
+++ b/ext/afform/docs/embed.md
@@ -0,0 +1,56 @@
+## Development: Embedding forms
+
+In the [quick-start example](quickstart.md), we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
+simple, standalone page with the sole purpose of displaying the `helloworld` form.  What if we want to embed the form
+somewhere else -- e.g. as a dialog inside an event-listing or membership directory?  Afforms are actualy *re-usable
+sub-forms*.
+
+How does this work?  Every `afform` is an *AngularJS directive*.  For example, `helloworld` can be embedded with:
+
+```html
+<div afform-helloworld=""></div>
+```
+
+Moreover, you can pass options to `helloworld`:
+
+```html
+<div afform-helloworld="{phaseOfMoon: 'waxing'}"></div>
+```
+
+Now, in `afform/helloworld/layout.html`, you can use `options.phaseOfMoon`:
+
+```html
+Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
+```
+
+## Development: Embedding forms: Contact record example
+
+Is this useful? Let's suppose you're building a contact record page.
+
+First, we should make a few building-blocks:
+
+1. `afform/contactName/layout.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
+2. `afform/contactAddressess/layout.html` displays a sub-form for editing street addresses.
+3. `afform/contactEmails/layout.html` displays a sub-form for editing email addresses.
+
+Next, we should create an overall `afform/contact/layout.html` which uses these building-blocks:
+
+```html
+<div ng-form="contactForm">
+  <div crm-ui-accordion="{title: ts('Name')}">
+    <div afform-contact-name="{cid: routeParams.cid}"></div>
+  </div>
+  <div crm-ui-accordion="{title: ts('Street Addresses')}">
+    <div afform-contact-addresses="{cid: routeParams.cid}"></div>
+  </div>
+  <div crm-ui-accordion="{title: ts('Emails')}">
+    <div afform-contact-emails="{cid: routeParams.cid}"></div>
+  </div>
+</div>
+```
+
+> *(FIXME: In the parent form's `meta.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
+
+What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `afform/contactName/layout.html` --
+but all the other components can cleanly track the canonical release. This significantly reduces the costs and risks
+of manging upgrades and changes.
diff --git a/ext/afform/docs/quickstart.md b/ext/afform/docs/quickstart.md
new file mode 100644
index 000000000000..4e6b0beefb1b
--- /dev/null
+++ b/ext/afform/docs/quickstart.md
@@ -0,0 +1,34 @@
+## Development: Quick Start
+
+As an extension author, you can define a form along with its default,
+canonical content. Simply create a folder named  `afform/<MY-FORM>`. In
+this example, we create a form named `helloworld`:
+
+```
+$ cd /path/to/my/own/extension
+$ mkdir -p afform/helloworld
+$ echo '{"server_route": "civicrm/hello-world"}' > afform/helloworld/meta.json
+$ echo '<div>Hello {{routeParams.name}}</div>' > afform/helloworld/layout.html
+$ cv flush
+```
+
+A few things to note:
+
+* We defined a route `civicrm/hello-world`. This is defined in the same routing system used by CiviCRM forms.
+* The file `layout.html` is an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
+* After creating a new form or file, we should flush the cache.
+* If you're going to actively edit/revise the content of the file, then you should navigate
+  to **Administer > System Settings > Debugging** and disable asset caching.
+
+Now that we've created a form, we'll want to determine its URL. As with most
+CiviCRM forms, the URL depends on the CMS configuration. Here is an example
+from a local Drupal 7 site:
+
+```
+$ cv url "civicrm/hello-world"
+"http://dmaster.localhost/civicrm/hello-world"
+$ cv url "civicrm/hello-world/#/?name=world"
+"http://dmaster.localhost/civicrm/hello-world/#/?name=world"
+```
+
+Open the URLs and see what you get.
diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
new file mode 100644
index 000000000000..e88090df747a
--- /dev/null
+++ b/ext/afform/docs/roadmap.md
@@ -0,0 +1,15 @@
+## Roadmap
+
+The `afform` extension is a proof-of-concept.
+
+## Known Issues
+
+* The code is currently written as a proof-of-concept. There are several `FIXME`/`TODO` declarations in the code
+  for checking pre-conditions, reporting errors, handling edge-cases, etc.
+* Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
+  and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that.
+* We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
+* Need to implement the `Afform.revert` API to undo local customizations.
+* Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
+  On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have
+  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-helloworld/>`.
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
new file mode 100644
index 000000000000..6fb9a3986bd7
--- /dev/null
+++ b/ext/afform/docs/writing.md
@@ -0,0 +1,59 @@
+## Development: Writing HTML templates
+
+In AngularJS, the primary language for orchestrating a screen is HTML. You can do interesting things in Angular
+HTML, such as displaying variables and applying directives.
+
+One key concept is *scope* -- the *scope* determines the list of variables which you can access.  By default, `afform`
+creates a scope with these variables:
+
+* `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
+  service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
+* `meta`: The stored meta data (`meta.json`) for this form.
+* `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
+
+Additionally, AngularJS allows *directives* -- these are extra HTML attributes which create behavior. For example:
+
+* `ng-if` will conditionally create or destroy elements in the page.
+* `ng-repeat` will loop through data.
+* `ng-style` and `ng-class` will conditionally apply styling.
+
+A full explanation of these features is out-of-scope for this document, but the key point is that you can use standard
+AngularJS markup.
+
+## Development: Writing HTML templates: Contact record example
+
+Let's say we want `helloworld` to become a basic "View Contact" page. A user
+would request a URL like:
+
+```
+http://dmaster.localhost/civicrm/hello-world/#/?cid=123
+```
+
+How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv3:
+
+```html
+<div ng-if="routeParams.cid"
+  afform-api3="['Contact', 'get', {id: routeParams.cid}]"
+  afform-api3-ctrl="apiData">
+
+  <div ng-repeat="contact in apiData.result.values">
+    <h1 crm-page-title="">{{contact.display_name}}</h1>
+
+    <h3>Key Contact Fields</h3>
+
+    <div><strong>Contact ID</strong>: {{contact.contact_id}}</div>
+    <div><strong>Contact Type</strong>: {{contact.contact_type}}</div>
+    <div><strong>Display Name</strong>: {{contact.display_name}}</div>
+    <div><strong>First Name</strong>: {{contact.first_name}}</div>
+    <div><strong>Last Name</strong>: {{contact.last_name}}</div>
+
+    <h3>Full Contact record</h3>
+
+    <pre>{{contact|json}}</pre>
+  </div>
+</div>
+```
+
+This example is useful pedagogically and may be useful in a crunch -- but in the longer term,
+we should have a richer library of directives so that typical user-managed forms don't drill-down
+at this level of detail.

From 3c1d89bce421703f6536365b2122fda3d3847da6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 17:12:56 -0700
Subject: [PATCH 310/834] roadmap.md - Describe follow-up modules

---
 ext/afform/docs/roadmap.md | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index e88090df747a..0bad1f1958fa 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -1,14 +1,33 @@
-## Roadmap
+# Roadmap
 
-The `afform` extension is a proof-of-concept.
+The `afform` extension is a proof-of-concept.  It aims to demonstrate the core model/concept in which AngularJS
+provides the standard data-format and component-model shared by developers (working in code files) and administrators
+(working in a programmatic GUI).
 
-## Known Issues
+As a proof-of-concept, it is necessarily incomplete.  In particular: (a) some functionality is envisioned for
+additional extensions and (b) within this extension, there are known issues.
 
-* The code is currently written as a proof-of-concept. There are several `FIXME`/`TODO` declarations in the code
-  for checking pre-conditions, reporting errors, handling edge-cases, etc.
+## Suite of Extensions
+
+This extension is expected to be the base for a suite of related extensions:
+
+* `afform`: Base framework and runtime. Provides APIs for developers.
+* `afform_html`: Present web-based editor for customizing forms in HTML notation. Use Monaco or ACE.
+  (In the near term, it's a simple demonstration that forms can be edited by users in a browser; in the
+  long term, it occupies a smaller niche as a developer/power-admin tool.)
+* `afform_gui`: Present a web-based editor for customizing forms with drag-drop/multi-pane UX.
+  (In the long term, this is the main UI for admins.)
+* `afform_auditor`: Report on upgrade compatibility. Test changesets. Highlight dangerous/unknown/unsupported form elements.
+   Score maintainability of the system.
+
+## Known Issues (`org.civicrm.afform`)
+
+* There are several `FIXME`/`TODO` declarations in the code for checking pre-conditions, reporting errors, handling edge-cases, etc.
 * Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
-  and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that.
+  and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that. (Ex: Define partials via callback.)
 * We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
+* We need a formal way to enumerate the library of available tags/directives/attributes. This, in turn, will drive the
+  drag-drop UI and any validation/auditing.
 * Need to implement the `Afform.revert` API to undo local customizations.
 * Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
   On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have

From 64423b13a639799a1467df2d1b0481e717954904 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 17:16:10 -0700
Subject: [PATCH 311/834] README, docs - Tweak titles

---
 ext/afform/README.md          | 4 ++--
 ext/afform/docs/angular.md    | 2 +-
 ext/afform/docs/crud.md       | 2 +-
 ext/afform/docs/embed.md      | 4 ++--
 ext/afform/docs/quickstart.md | 2 +-
 ext/afform/docs/writing.md    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index be92e3aec59a..b2505d59352c 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -46,8 +46,8 @@ cv en afform
 ## Development
 
 * [Quick Start: Creating the canonical definition of a basic form](docs/quickstart.md)
-* [Writing: Forms as basic AngularJS templates](docs/writing.md) (With example: *Contact Record*)
-* [Embedding: Forms as reusable building-block](docs/embed.md) (With example: *Contact Record*)
+* [Writing Forms: Afform as basic AngularJS templates](docs/writing.md) (With example: *Contact Record*)
+* [Embedding Forms: Afform as reusable building-block](docs/embed.md) (With example: *Contact Record*)
 * [Form CRUD: Updating forms via programmatic API](docs/crud.md)
 * [Full AngularJS: Integrating between Afform and vanilla AngularJS](docs/angular.md)
 * [Roadmap and Known Issues](docs/roadmap.md)
diff --git a/ext/afform/docs/angular.md b/ext/afform/docs/angular.md
index 022404960325..e63a354a8ace 100644
--- a/ext/afform/docs/angular.md
+++ b/ext/afform/docs/angular.md
@@ -1,4 +1,4 @@
-## Development: Full AngularJS
+# Full AngularJS: Integrating between Afform and vanilla AngularJS
 
 Afform is a subset of AngularJS -- it emphasizes the use of *directives* as a way to *choose and arrange* the parts of
 your form.  There is more to AngularJS -- such as client-side routing, controllers, services, etc.  What to do if you
diff --git a/ext/afform/docs/crud.md b/ext/afform/docs/crud.md
index e1f424b3ab1b..24f6d823aa17 100644
--- a/ext/afform/docs/crud.md
+++ b/ext/afform/docs/crud.md
@@ -1,4 +1,4 @@
-## Development: Form CRUD API
+# Form CRUD: Updating forms via programmatic API
 
 Now that we've defined a baseline form, it's possible for administrators and
 GUI applications to inspect the form using the API:
diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index c6708ad5eb41..df631840930e 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -1,4 +1,4 @@
-## Development: Embedding forms
+# Embedding Forms: Afform as reusable building-block
 
 In the [quick-start example](quickstart.md), we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
 simple, standalone page with the sole purpose of displaying the `helloworld` form.  What if we want to embed the form
@@ -23,7 +23,7 @@ Now, in `afform/helloworld/layout.html`, you can use `options.phaseOfMoon`:
 Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
 ```
 
-## Development: Embedding forms: Contact record example
+## Example: Contact record
 
 Is this useful? Let's suppose you're building a contact record page.
 
diff --git a/ext/afform/docs/quickstart.md b/ext/afform/docs/quickstart.md
index 4e6b0beefb1b..d3c47063a1a4 100644
--- a/ext/afform/docs/quickstart.md
+++ b/ext/afform/docs/quickstart.md
@@ -1,4 +1,4 @@
-## Development: Quick Start
+# Quick Start: Creating the canonical definition of a basic form
 
 As an extension author, you can define a form along with its default,
 canonical content. Simply create a folder named  `afform/<MY-FORM>`. In
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index 6fb9a3986bd7..cd4bf7f87014 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -1,4 +1,4 @@
-## Development: Writing HTML templates
+# [Writing Forms: Afform as basic AngularJS templates
 
 In AngularJS, the primary language for orchestrating a screen is HTML. You can do interesting things in Angular
 HTML, such as displaying variables and applying directives.
@@ -20,7 +20,7 @@ Additionally, AngularJS allows *directives* -- these are extra HTML attributes w
 A full explanation of these features is out-of-scope for this document, but the key point is that you can use standard
 AngularJS markup.
 
-## Development: Writing HTML templates: Contact record example
+## Example: Contact record
 
 Let's say we want `helloworld` to become a basic "View Contact" page. A user
 would request a URL like:

From 9b5234b7f466e2db69b04fd16ff1173efc58ccfc Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 17:18:50 -0700
Subject: [PATCH 312/834] Fix typos

---
 ext/afform/docs/embed.md   | 2 +-
 ext/afform/docs/writing.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index df631840930e..7d754c09e7b6 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -2,7 +2,7 @@
 
 In the [quick-start example](quickstart.md), we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
 simple, standalone page with the sole purpose of displaying the `helloworld` form.  What if we want to embed the form
-somewhere else -- e.g. as a dialog inside an event-listing or membership directory?  Afforms are actualy *re-usable
+somewhere else -- e.g. as a dialog inside an event-listing or membership directory?  Afforms are actually *re-usable
 sub-forms*.
 
 How does this work?  Every `afform` is an *AngularJS directive*.  For example, `helloworld` can be embedded with:
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index cd4bf7f87014..f079a0c4ee89 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -1,4 +1,4 @@
-# [Writing Forms: Afform as basic AngularJS templates
+# Writing Forms: Afform as basic AngularJS templates
 
 In AngularJS, the primary language for orchestrating a screen is HTML. You can do interesting things in Angular
 HTML, such as displaying variables and applying directives.

From 7d7b13d73f0489f2e7e4007dcfa9b1e0b8ebbaee Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 17:32:27 -0700
Subject: [PATCH 313/834] Doc tweaks

---
 ext/afform/README.md       | 2 +-
 ext/afform/docs/angular.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index b2505d59352c..24ca9bf56075 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -43,7 +43,7 @@ git clone https://github.com/FIXME/org.civicrm.afform.git
 cv en afform
 ```
 
-## Development
+## Developer Documentation
 
 * [Quick Start: Creating the canonical definition of a basic form](docs/quickstart.md)
 * [Writing Forms: Afform as basic AngularJS templates](docs/writing.md) (With example: *Contact Record*)
diff --git a/ext/afform/docs/angular.md b/ext/afform/docs/angular.md
index e63a354a8ace..fc18a01b24b0 100644
--- a/ext/afform/docs/angular.md
+++ b/ext/afform/docs/angular.md
@@ -7,8 +7,8 @@ need these?  Here are few tricks:
 * You can create your own applications and pages with full AngularJS. (See also: [CiviCRM Developer Guide: AngularJS: Quick Start](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/)).
   Then embed the afform (like `helloworld`) in your page with these steps:
     * Declare a dependency on module (`afformHelloworld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
-    * In your HTML template, use the directive `<div afform-helloworld=""></div>`. I
-    * f you want to provide extra data, services, or actions for the form author -- then pass them along.
+    * In your HTML template, use the directive `<div afform-helloworld=""></div>`.
+    * If you want to provide extra data, services, or actions for the form author -- then pass them along.
 * You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
 * If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
   As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.

From 1abc2be19f94ab059c7707219316cdddaab9ea7b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 17:35:14 -0700
Subject: [PATCH 314/834] README.md - Change placeholder URLs

---
 ext/afform/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 24ca9bf56075..bb493eb6cd13 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -30,7 +30,7 @@ install it with the command-line tool [cv](https://github.com/civicrm/cv).
 
 ```bash
 cd <extension-dir>
-cv dl org.civicrm.afform@https://github.com/FIXME/org.civicrm.afform/archive/master.zip
+cv dl org.civicrm.afform@https://github.com/totten/afform/archive/master.zip
 ```
 
 ## Installation (CLI, Git)
@@ -39,7 +39,7 @@ Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git)
 install it with the command-line tool [cv](https://github.com/civicrm/cv).
 
 ```bash
-git clone https://github.com/FIXME/org.civicrm.afform.git
+git clone https://github.com/totten/afform.git
 cv en afform
 ```
 

From f314d4b0c0c73d5846709f9e6f3cecb7e44e6dcd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 30 Jul 2018 17:36:41 -0700
Subject: [PATCH 315/834] Update roadmap.md

---
 ext/afform/docs/roadmap.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index 0bad1f1958fa..840b9c0af7f3 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -20,7 +20,9 @@ This extension is expected to be the base for a suite of related extensions:
 * `afform_auditor`: Report on upgrade compatibility. Test changesets. Highlight dangerous/unknown/unsupported form elements.
    Score maintainability of the system.
 
-## Known Issues (`org.civicrm.afform`)
+## Known Issues
+
+Within this extension, there are things which need updating/addressing:
 
 * There are several `FIXME`/`TODO` declarations in the code for checking pre-conditions, reporting errors, handling edge-cases, etc.
 * Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`

From ef8764fbdf5f699bd7e4bdf3e21a6503a88a6958 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 7 Aug 2018 22:31:00 -0700
Subject: [PATCH 316/834] Add Afform.revert. Fix Afform.create. Add lifecycle
 test-case.

---
 ext/afform/afform/examplepage/layout.html     |  1 +
 ext/afform/afform/examplepage/meta.json       |  1 +
 ext/afform/api/v3/Afform/Create.php           |  6 +-
 ext/afform/api/v3/Afform/Revert.php           | 49 +++++++++++
 .../phpunit/api/v3/Afform/CreateTest.php      | 49 -----------
 .../tests/phpunit/api/v3/Afform/GetTest.php   | 49 -----------
 .../tests/phpunit/api/v3/AfformTest.php       | 84 +++++++++++++++++++
 7 files changed, 138 insertions(+), 101 deletions(-)
 create mode 100644 ext/afform/afform/examplepage/layout.html
 create mode 100644 ext/afform/afform/examplepage/meta.json
 create mode 100644 ext/afform/api/v3/Afform/Revert.php
 delete mode 100644 ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php
 delete mode 100644 ext/afform/tests/phpunit/api/v3/Afform/GetTest.php
 create mode 100644 ext/afform/tests/phpunit/api/v3/AfformTest.php

diff --git a/ext/afform/afform/examplepage/layout.html b/ext/afform/afform/examplepage/layout.html
new file mode 100644
index 000000000000..0f1db46e7897
--- /dev/null
+++ b/ext/afform/afform/examplepage/layout.html
@@ -0,0 +1 @@
+<div>Hello {{routeParams.name}}</div>
diff --git a/ext/afform/afform/examplepage/meta.json b/ext/afform/afform/examplepage/meta.json
new file mode 100644
index 000000000000..fbdd9d36ba07
--- /dev/null
+++ b/ext/afform/afform/examplepage/meta.json
@@ -0,0 +1 @@
+{"server_route": "civicrm/example-page"}
diff --git a/ext/afform/api/v3/Afform/Create.php b/ext/afform/api/v3/Afform/Create.php
index 412e721b1918..599c76314913 100644
--- a/ext/afform/api/v3/Afform/Create.php
+++ b/ext/afform/api/v3/Afform/Create.php
@@ -45,14 +45,14 @@ function civicrm_api3_afform_create($params) {
   }
 
   // Create or update meta.json.
-  $orig = civicrm_api('afform', 'get', ['name' => $name, 'sequential' => 1]);
-  if (is_array($orig['values'][0])) {
+  $orig = civicrm_api3('afform', 'get', ['name' => $name, 'sequential' => 1]);
+  if (isset($orig['values'][0])) {
     $meta = _afform_fields_filter(array_merge($orig['values'][0], $updates));
   }
   else {
     $meta = $updates;
   }
-  unset($meta['definition']);
+  unset($meta['layout']);
   unset($meta['name']);
   if (!empty($meta)) {
     $metaPath = $scanner->createSiteLocalPath($name, CRM_Afform_AfformScanner::METADATA_FILE);
diff --git a/ext/afform/api/v3/Afform/Revert.php b/ext/afform/api/v3/Afform/Revert.php
new file mode 100644
index 000000000000..3dced7646c82
--- /dev/null
+++ b/ext/afform/api/v3/Afform/Revert.php
@@ -0,0 +1,49 @@
+<?php
+use CRM_Afform_ExtensionUtil as E;
+
+/**
+ * Afform.Revert API specification (optional)
+ * This is used for documentation and validation.
+ *
+ * @param array $spec description of fields supported by this API call
+ * @return void
+ * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
+ */
+function _civicrm_api3_afform_revert_spec(&$spec) {
+  require_once __DIR__ . DIRECTORY_SEPARATOR . 'Get.php';
+  $getSpec = [];
+  _civicrm_api3_afform_get_spec($getSpec);
+  $spec['name'] = $getSpec['name'];
+}
+
+/**
+ * Afform.Revert API
+ *
+ * @param array $params
+ * @return array API result descriptor
+ * @see civicrm_api3_revert_success
+ * @see civicrm_api3_revert_error
+ * @throws API_Exception
+ */
+function civicrm_api3_afform_revert($params) {
+  $scanner = new CRM_Afform_AfformScanner();
+
+  if (empty($params['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $params['name'])) {
+    throw new \API_Exception("Afform.revert: name is a mandatory field. It should use alphanumerics and dashes.");
+  }
+  $name = $params['name'];
+
+  foreach ([CRM_Afform_AfformScanner::METADATA_FILE, 'layout.html'] as $file) {
+    $metaPath = $scanner->createSiteLocalPath($name, $file);
+    if (file_exists($metaPath)) {
+      if (!@unlink($metaPath)) {
+        throw new API_Exception("Failed to remove afform overrides in $file");
+      }
+    }
+  }
+
+  // FIXME if `server_route` changes, then flush the menu cache.
+  // FIXME if asset-caching is enabled, then flush the asset cache.
+
+  return civicrm_api3_create_success(1, $params, 'Afform', 'revert');
+}
diff --git a/ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php b/ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php
deleted file mode 100644
index 5fe2c9f8c845..000000000000
--- a/ext/afform/tests/phpunit/api/v3/Afform/CreateTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use Civi\Test\HeadlessInterface;
-use Civi\Test\HookInterface;
-use Civi\Test\TransactionalInterface;
-
-/**
- * Afform.Create API Test Case
- * This is a generic test class implemented with PHPUnit.
- * @group headless
- */
-class api_v3_Afform_CreateTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
-
-  /**
-   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
-   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
-   */
-  public function setUpHeadless() {
-    return \Civi\Test::headless()
-      ->installMe(__DIR__)
-      ->apply();
-  }
-
-  /**
-   * The setup() method is executed before the test is executed (optional).
-   */
-  public function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * The tearDown() method is executed after the test was executed (optional)
-   * This can be used for cleanup.
-   */
-  public function tearDown() {
-    parent::tearDown();
-  }
-
-  /**
-   * Simple example test case.
-   *
-   * Note how the function name begins with the word "test".
-   */
-  public function testApiExample() {
-    $result = civicrm_api3('Afform', 'Create', array('magicword' => 'sesame'));
-    $this->assertEquals('Twelve', $result['values'][12]['name']);
-  }
-
-}
diff --git a/ext/afform/tests/phpunit/api/v3/Afform/GetTest.php b/ext/afform/tests/phpunit/api/v3/Afform/GetTest.php
deleted file mode 100644
index 6fd87013bc31..000000000000
--- a/ext/afform/tests/phpunit/api/v3/Afform/GetTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use Civi\Test\HeadlessInterface;
-use Civi\Test\HookInterface;
-use Civi\Test\TransactionalInterface;
-
-/**
- * Afform.Get API Test Case
- * This is a generic test class implemented with PHPUnit.
- * @group headless
- */
-class api_v3_Afform_GetTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
-
-  /**
-   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
-   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
-   */
-  public function setUpHeadless() {
-    return \Civi\Test::headless()
-      ->installMe(__DIR__)
-      ->apply();
-  }
-
-  /**
-   * The setup() method is executed before the test is executed (optional).
-   */
-  public function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * The tearDown() method is executed after the test was executed (optional)
-   * This can be used for cleanup.
-   */
-  public function tearDown() {
-    parent::tearDown();
-  }
-
-  /**
-   * Simple example test case.
-   *
-   * Note how the function name begins with the word "test".
-   */
-  public function testApiExample() {
-    $result = civicrm_api3('Afform', 'Get', array('magicword' => 'sesame'));
-    $this->assertEquals('Twelve', $result['values'][12]['name']);
-  }
-
-}
diff --git a/ext/afform/tests/phpunit/api/v3/AfformTest.php b/ext/afform/tests/phpunit/api/v3/AfformTest.php
new file mode 100644
index 000000000000..0c639f892dc7
--- /dev/null
+++ b/ext/afform/tests/phpunit/api/v3/AfformTest.php
@@ -0,0 +1,84 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\HookInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Afform.Get API Test Case
+ * This is a generic test class implemented with PHPUnit.
+ * @group headless
+ */
+class api_v3_AfformTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
+
+  use \Civi\Test\Api3TestTrait;
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->apply();
+  }
+
+  /**
+   * The setup() method is executed before the test is executed (optional).
+   */
+  public function setUp() {
+    parent::setUp();
+  }
+
+  /**
+   * The tearDown() method is executed after the test was executed (optional)
+   * This can be used for cleanup.
+   */
+  public function tearDown() {
+    parent::tearDown();
+  }
+
+  /**
+   * This takes the bundled `examplepage` and performs some API calls on it.
+   */
+  public function testGetUpdateRevert() {
+    $this->callAPISuccess('Afform', 'revert', ['name' => 'examplepage']);
+
+    $message = 'The initial Afform.get should return default data';
+    $result = $this->callAPISuccess('Afform', 'get', ['name' => 'examplepage']);
+    $this->assertEquals('examplepage', $result['values']['examplepage']['id'], $message);
+    $this->assertEquals('examplepage', $result['values']['examplepage']['name'], $message);
+    $this->assertEquals('', $result['values']['examplepage']['title'], $message);
+    $this->assertEquals('', $result['values']['examplepage']['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result['values']['examplepage']['server_route'], $message);
+    $this->assertTrue(is_array($result['values']['examplepage']['layout']), $message);
+
+    $message = 'After updating with Afform.create, the revised data should be returned';
+    $result = $this->callAPISuccess('Afform', 'create', [
+      'name' => 'examplepage',
+      'description' => 'The temporary description',
+    ]);
+    $this->assertEquals('examplepage', $result['values']['name'], $message);
+    $this->assertEquals('The temporary description', $result['values']['description'], $message);
+
+    $message = 'After updating, the Afform.get API should return blended data';
+    $result = $this->callAPISuccess('Afform', 'get', ['name' => 'examplepage']);
+    $this->assertEquals('examplepage', $result['values']['examplepage']['id'], $message);
+    $this->assertEquals('examplepage', $result['values']['examplepage']['name'], $message);
+    $this->assertEquals('', $result['values']['examplepage']['title'], $message);
+    $this->assertEquals('The temporary description', $result['values']['examplepage']['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result['values']['examplepage']['server_route'], $message);
+    $this->assertTrue(is_array($result['values']['examplepage']['layout']), $message);
+
+    $this->callAPISuccess('Afform', 'revert', ['name' => 'examplepage']);
+    $message = 'After reverting, te final Afform.get should return default data';
+    $result = $this->callAPISuccess('Afform', 'get', ['name' => 'examplepage']);
+    $this->assertEquals('examplepage', $result['values']['examplepage']['id'], $message);
+    $this->assertEquals('examplepage', $result['values']['examplepage']['name'], $message);
+    $this->assertEquals('', $result['values']['examplepage']['title'], $message);
+    $this->assertEquals('', $result['values']['examplepage']['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result['values']['examplepage']['server_route'], $message);
+    $this->assertTrue(is_array($result['values']['examplepage']['layout']), $message);
+  }
+
+}

From 038e7c178af1c77c6e73fa66e8a07b218a8fe425 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 7 Aug 2018 23:37:44 -0700
Subject: [PATCH 317/834] Afform.get - Fix copy-paste mistake

---
 ext/afform/api/v3/Afform/Get.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
index d5e52563ae01..d7f5caa6919f 100644
--- a/ext/afform/api/v3/Afform/Get.php
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -59,5 +59,5 @@ function civicrm_api3_afform_get($params) {
     $records[$name] = $record;
   }
 
-  return _civicrm_api3_basic_array_get('CxnApp', $params, $records, 'name', _afform_fields());
+  return _civicrm_api3_basic_array_get('Afform', $params, $records, 'name', _afform_fields());
 }

From 3cf07c5fae4d45c771baae2af0ce9beb6893dfba Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 7 Aug 2018 23:39:55 -0700
Subject: [PATCH 318/834] Afform.create, Afform.revert - Clear file-cache
 adding/deleting files

---
 ext/afform/api/v3/Afform/Create.php | 3 +++
 ext/afform/api/v3/Afform/Revert.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ext/afform/api/v3/Afform/Create.php b/ext/afform/api/v3/Afform/Create.php
index 599c76314913..38257e3fe732 100644
--- a/ext/afform/api/v3/Afform/Create.php
+++ b/ext/afform/api/v3/Afform/Create.php
@@ -62,6 +62,9 @@ function civicrm_api3_afform_create($params) {
     // FIXME check for writability then success. Report errors.
   }
 
+  // We may have changed list of files covered by the cache.
+  $scanner->clear();
+
   // FIXME if `server_route` changes, then flush the menu cache.
   // FIXME if asset-caching is enabled, then flush the asset cache.
 
diff --git a/ext/afform/api/v3/Afform/Revert.php b/ext/afform/api/v3/Afform/Revert.php
index 3dced7646c82..3e7f5f8d242f 100644
--- a/ext/afform/api/v3/Afform/Revert.php
+++ b/ext/afform/api/v3/Afform/Revert.php
@@ -42,6 +42,9 @@ function civicrm_api3_afform_revert($params) {
     }
   }
 
+  // We may have changed list of files covered by the cache.
+  $scanner->clear();
+
   // FIXME if `server_route` changes, then flush the menu cache.
   // FIXME if asset-caching is enabled, then flush the asset cache.
 

From 6d404d90d40c5395713cd96bb503816994068697 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Sep 2018 15:38:02 -0700
Subject: [PATCH 319/834] Update README.md

---
 ext/afform/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index bb493eb6cd13..bbe9cb53c47b 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -5,9 +5,9 @@
 The Affable Administrative Angular Form Framework (`afform`) is a system for administering AngularJS-based forms
 in CiviCRM which:
 
-1. Allows developers to declaratively define a canonical, baseline form.
+1. Allows developers to declaratively define a canonical, baseline form using AngularJS.
 2. Allows administrators (or administrative tools) to use the CRUD API to customize the forms.
-3. Allows developers to embed these forms in other CiviCRM-AngularJS apps.
+3. Allows developers (or administrators/tools) to embed these forms in other CiviCRM-AngularJS apps.
 4. (WIP; pending upstream support) Allow developers to apply [change sets](https://docs.civicrm.org/dev/en/latest/framework/angular/changeset/).
 
 This extension is a proof-of-concept.  It aims to demonstrate the core model/concept -- however, there are 

From b9e5de69f75a49960db081c9d688b38b8f40ba0d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 18 Sep 2018 02:20:33 -0700
Subject: [PATCH 320/834] Update docs - Add more discussion of change-sets
 (alterAlngular) and philosophy

---
 ext/afform/README.md          |  6 ++-
 ext/afform/docs/alter.md      | 58 +++++++++++++++++++++++++
 ext/afform/docs/philosophy.md | 79 +++++++++++++++++++++++++++++++++++
 3 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/docs/alter.md
 create mode 100644 ext/afform/docs/philosophy.md

diff --git a/ext/afform/README.md b/ext/afform/README.md
index bbe9cb53c47b..e8c115e2ad68 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -1,6 +1,6 @@
 # org.civicrm.afform (Early Proof of Concept)
 
-![Screenshot](/images/screenshot.png)
+<!-- ![Screenshot](/images/screenshot.png) -->
 
 The Affable Administrative Angular Form Framework (`afform`) is a system for administering AngularJS-based forms
 in CiviCRM which:
@@ -8,7 +8,7 @@ in CiviCRM which:
 1. Allows developers to declaratively define a canonical, baseline form using AngularJS.
 2. Allows administrators (or administrative tools) to use the CRUD API to customize the forms.
 3. Allows developers (or administrators/tools) to embed these forms in other CiviCRM-AngularJS apps.
-4. (WIP; pending upstream support) Allow developers to apply [change sets](https://docs.civicrm.org/dev/en/latest/framework/angular/changeset/).
+4. Allows developers to apply change-sets via hook. (*WIP; pending upstream support*)
 
 This extension is a proof-of-concept.  It aims to demonstrate the core model/concept -- however, there are 
 [known issues and additional components](docs/roadmap.md) to address, and some documentation will be easier to approach
@@ -49,5 +49,7 @@ cv en afform
 * [Writing Forms: Afform as basic AngularJS templates](docs/writing.md) (With example: *Contact Record*)
 * [Embedding Forms: Afform as reusable building-block](docs/embed.md) (With example: *Contact Record*)
 * [Form CRUD: Updating forms via programmatic API](docs/crud.md)
+* [Form Hooks: Updating forms via declarative selector](docs/alter.md) (*WIP; pending upstream support*)
 * [Full AngularJS: Integrating between Afform and vanilla AngularJS](docs/angular.md)
 * [Roadmap and Known Issues](docs/roadmap.md)
+* [Philosophy, Beliefs, Assumptions](docs/philosophy.md)
diff --git a/ext/afform/docs/alter.md b/ext/afform/docs/alter.md
new file mode 100644
index 000000000000..295f5842f9ce
--- /dev/null
+++ b/ext/afform/docs/alter.md
@@ -0,0 +1,58 @@
+# Form Hooks: Updating forms via declarative selector
+
+> __WIP__ This describes functionality that is intended but not actual.  It
+> first requires writing a modest patch to civicrm-core so that HTML
+> documents managed by afform can go through `hook_civicrm_alterAngular`.
+
+Form hooks offer a different style of customization than [Form CRUD](docs/crud.md).  In the CRUD style, you use
+an API to save an updated form -- which stores the exact form (as designed by the user). In the hook style, you
+wait until a form is being displayed; and, as part of the rendering process, you filter the results.
+
+## Example
+
+In this example, we use `hook_civicrm_alterAngular` to apply a filter to the file `~/crmMailing/BlockSummary.html` --
+the filter selects an element by CSS class (`crm-group`) and then appends a new field to the bottom of that element:
+
+```php
+function mailwords_civicrm_alterAngular(\Civi\Angular\Manager $angular) {
+  $changeSet = \Civi\Angular\ChangeSet::create('inject_mailwords')
+    // ->requires('crmMailing', 'mailwords')
+    ->alterHtml('~/crmMailing/BlockSummary.html',
+      function (phpQueryObject $doc) {
+        $doc->find('.crm-group')->append('
+        <div crm-ui-field="{name: \'subform.mailwords\', title: ts(\'Keywords\')}">
+          <input crm-ui-id="subform.mailwords" class="crm-form-text" name="mailwords" ng-model="mailing.template_options.keywords">
+        </div>
+      ');
+      });
+  $angular->add($changeSet);
+}
+```
+
+## Comparison: CRUD vs Hook
+
+Similarities:
+
+* Both styles have safe and unsafe use-cases.
+* The safety generally depends on the specific components being used.
+    * Ex: If you add a new `crm-ui-field` (via either style), that could be safe/maintainable (if `crm-ui-field` is supported, stable, widely used) or it could be risky/hard-to-maintain
+      (if `crm-ui-field` is undocumented and rarely used).
+* In either style, there are legitimate scenarios for someone to reference a safe or risky component.  
+* In either style, it is difficult for a person to keep track of whether the referenced components are safe or risky. The lists of components will be long and will change over time. We'd rather have tooling to keep track of this.
+* Provided you abide by the code-style of the example, it is possible for the framework to build a list of all CRUD'd forms and all change-sets. In turn, it's possibile to loop through them, audit them, and warn about anything which appears unsafe.
+
+Differences:
+
+* CRUD is concrete. It saves what you tell it to save, and it doesn't do anything else. This makes it more suitable as the conceptual model for users' GUI editor. The good and bad consequences of CRUD are limited to the specific things you manipulated.
+* Change-sets are abstract. They can change many components (e.g. converting every `<h1>` to a `<div class="my-header-1">`). The good and bad consequences of change-sets can apply across a wider range of things.
+* CRUD locks-in your changes and preferences. If there's an upgrade, your form should remain safely as it was before (provided the form relied on safe components).
+* Change-sets are adaptable. If there's an upgrade or edit to the underlying, the change-set will be used on top of the latest revision. If the change-set is revised, then the latest change-set will be used without needing to edit the forms individually..
+
+I expect future people will develop better insight on the trade-offs; for an initial first-read, my expectations are that:
+
+* CRUD is more appropriate when an *administrator* is changing a *policy decision* (such as the relative position of two elements).
+* Change-sets are more appropriate when a *developer* is changing an *implementation detail* (such as the CSS classes used to style all calendar widgets).
+
+## See also
+
+https://docs.civicrm.org/dev/en/latest/framework/angular/changeset/
diff --git a/ext/afform/docs/philosophy.md b/ext/afform/docs/philosophy.md
new file mode 100644
index 000000000000..d6b074431c70
--- /dev/null
+++ b/ext/afform/docs/philosophy.md
@@ -0,0 +1,79 @@
+# Philosophy, Beliefs, Assumptions
+
+Afform is generally grounded in a few beliefs..
+
+## Leap by extension
+
+Afform represents a major conceptual change in how core forms are developed.  It is incubated as an extension that can
+be enabled or disabled to taste.  The aim is for oother extension using `afform` can incrementally override/replace
+particular forms in core.
+
+## Features and user-experiences evolve in funny workflows
+
+If we could sit down and define one true, correct version of a "Donation" form, then our lives as Civi devlopers would
+be easy: draw a mockup, write code, ship, and retire.  But we can't -- because Civi users and integrators engage with
+the system creatively.  They aim to optimize conversion-rates, to integrate with donor journerys, to question how each
+detail makes sense in their situation, etc.  That means switching between open-ended donation amounts, sliders, radios,
+etc; revising the language and layout; maybe adding an informational question or newsletter opt-in.
+
+I believe that features and user-experiences evolve in funny workflows -- because the actual stories behind major
+improvements have not fit into a single mold.  A main ambition of `afform` is to allow multiple workflows in developing
+a common type of deliverable (*the forms*).  Thus, the architecture anticipates scenarios for developers defining forms
+concretely; for users defining forms concretely; for using GUIs or text-editors or IDEs or SCMs; for using
+cross-cutting hooks and selectors.  Compatibility with multiple workflows is a primary feature of the design.
+
+This is *not* an argument for maximal customization or maximal decentralization.  As participants in an ecosystem, we
+must still communicate and exercise judgment about the best way to approach each problem.  But there are legitimate
+instances for each workflow; given that each will be sought, we want them to be safe and somewhat consistent.
+
+What distinguishes `afform` from the original form architecture (Civi's combination of HTML_Quickform, Smarty and
+Profiles)?  Each of those workflows has been given some consideration upfront with the aim of providing a *consistent,
+unified model* -- so that the same data-structure can be pushed through any of those common workflows.
+
+## Incremental and measurable strictness
+
+JavaScript, PHP, and HTML are forgiving, loosely-typed systems.  This can be viewed as a strength (wrt to learnability
+and prototyping), and it can be viewed as a weakness (allowing a number of common mistakes to go unidentified until a
+user runs into them).
+
+Personally, I think that strongly-typed languages are better for large, multi-person projects -- providing a fallback
+to protect against some common mistakes that arise people don't fully communicate or understand a change.  However,
+adopting a strongly-typed system is a major change, and it's not perfect, and I can respect the arguments in favor of
+loosely-typed systems.
+
+A compromise is to phase-in some static analysis incrementally.  For `afform`, this means that the main deliverables
+(HTML documents+changesets) should be encoded in an inspectable form -- it must be possible for the system to enumerate
+all documents+changesets and audit them (i.e.  identifying which form elements -- CSS classes and Angular directives --
+are officially supported or unsupported).  This, in turn, means that we can provide warnings and scores to identify
+which customizations are more maintainable or more experimental/suspect.
+
+## Don't reinvent the wheel; do use a wheel that fits
+
+The general philosophy and architecture in `afform` could be used with almost any form system that has a clear
+component hierarchy (such as AngularJS's HTML notation, Symfony Form's object graph, or Drupal Form API's array-trees).
+
+It specifically uses AngularJS.  Why?  In order of descending importance:
+
+* It can work across a wide range of existing deployment environments (D7, D8, WordPress, Backdrop, Joomla, Standalone).
+* It already exists.
+* I have experience with it.
+* The main Angular tutorials aimed at generalist web developers are reasonably slick.
+* The connection between the code you write and what's displayed in the browser is fairly concrete.
+
+It's by no means a perfect wheel.  Other wheels have strengths, too.  I checked the top-line requirement and grabbed
+the closest wheel that fit.
+
+## Fidelity to upstream
+
+The upstream AngularJS project canonically represents a form as an HTML file on disk; thus, `afform` does the same.
+The upstream project uses `ng-if` for a conditional element; thus, an `afform` instance should do the same.  The
+upstream project uses "directives" for composable building blocks; and `afform`, the same.
+
+This convention (a) helps to reduce bike-shedding, (b) helps us get some benefit out of re-using an existing wheel, and
+(c) practices what we preach with regard to "consistency" across the various workflows.
+
+## Generally comparable platform requirements
+
+If you can install CiviCRM on a server today, then you should be able to install `afform` and a personalized mix of
+extensions which build on it.  This means that the main workflows facilitated by `afform` can require PHP (and even
+MySQL), but they can't require (say) Redis or Ruby or NodeJS.

From 2d76e916c502cbb09a021b4d42b3e6a51eb63208 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 18 Sep 2018 02:32:03 -0700
Subject: [PATCH 321/834] docs/alter.md - Copy-edit

---
 ext/afform/docs/alter.md | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ext/afform/docs/alter.md b/ext/afform/docs/alter.md
index 295f5842f9ce..f68c535404e4 100644
--- a/ext/afform/docs/alter.md
+++ b/ext/afform/docs/alter.md
@@ -1,12 +1,12 @@
 # Form Hooks: Updating forms via declarative selector
 
-> __WIP__ This describes functionality that is intended but not actual.  It
-> first requires writing a modest patch to civicrm-core so that HTML
-> documents managed by afform can go through `hook_civicrm_alterAngular`.
+> __WIP__ This describes functionality that is intended but not actual.
+> The hooks/change-sets currently work with core's `*.html` files; but we need
+> a little patching to make them work with afform's `*.html` files.
 
-Form hooks offer a different style of customization than [Form CRUD](docs/crud.md).  In the CRUD style, you use
-an API to save an updated form -- which stores the exact form (as designed by the user). In the hook style, you
-wait until a form is being displayed; and, as part of the rendering process, you filter the results.
+Form hooks offer a different style of customization than [Form CRUD](docs/crud.md).  In the CRUD style, you use an API
+to save an updated form -- which stores the exact form (as designed by the user).  In the hook style, you wait until a
+form is being displayed; and, as part of the rendering process, you filter the output.
 
 ## Example
 
@@ -20,10 +20,10 @@ function mailwords_civicrm_alterAngular(\Civi\Angular\Manager $angular) {
     ->alterHtml('~/crmMailing/BlockSummary.html',
       function (phpQueryObject $doc) {
         $doc->find('.crm-group')->append('
-        <div crm-ui-field="{name: \'subform.mailwords\', title: ts(\'Keywords\')}">
-          <input crm-ui-id="subform.mailwords" class="crm-form-text" name="mailwords" ng-model="mailing.template_options.keywords">
-        </div>
-      ');
+          <div crm-ui-field="{name: \'subform.mailwords\', title: ts(\'Keywords\')}">
+            <input crm-ui-id="subform.mailwords" class="crm-form-text" name="mailwords" ng-model="mailing.template_options.keywords">
+          </div>
+        ');
       });
   $angular->add($changeSet);
 }
@@ -37,20 +37,22 @@ Similarities:
 * The safety generally depends on the specific components being used.
     * Ex: If you add a new `crm-ui-field` (via either style), that could be safe/maintainable (if `crm-ui-field` is supported, stable, widely used) or it could be risky/hard-to-maintain
       (if `crm-ui-field` is undocumented and rarely used).
-* In either style, there are legitimate scenarios for someone to reference a safe or risky component.  
-* In either style, it is difficult for a person to keep track of whether the referenced components are safe or risky. The lists of components will be long and will change over time. We'd rather have tooling to keep track of this.
+* In either style, there are legitimate scenarios for someone to reference a safe or risky component.
+* In either style, it is difficult for a person to keep track of whether the referenced components are safe or risky. The list of experimental/supported/deprecated components will be long and will change over time. We'd rather have tooling to keep track of this.
 * Provided you abide by the code-style of the example, it is possible for the framework to build a list of all CRUD'd forms and all change-sets. In turn, it's possibile to loop through them, audit them, and warn about anything which appears unsafe.
 
 Differences:
 
-* CRUD is concrete. It saves what you tell it to save, and it doesn't do anything else. This makes it more suitable as the conceptual model for users' GUI editor. The good and bad consequences of CRUD are limited to the specific things you manipulated.
-* Change-sets are abstract. They can change many components (e.g. converting every `<h1>` to a `<div class="my-header-1">`). The good and bad consequences of change-sets can apply across a wider range of things.
-* CRUD locks-in your changes and preferences. If there's an upgrade, your form should remain safely as it was before (provided the form relied on safe components).
-* Change-sets are adaptable. If there's an upgrade or edit to the underlying, the change-set will be used on top of the latest revision. If the change-set is revised, then the latest change-set will be used without needing to edit the forms individually..
+* CRUD is concrete. It saves what you tell it to save, and it doesn't do anything else. This makes it more suitable as the conceptual model for the users' GUI editor.
+* Change-sets are abstract. They can change many components (e.g. converting every `<h1>` to a `<div class="my-header-1">`).
+* The good and bad consequences of CRUD are limited to the specific things you manipulated.
+* The good and bad consequences of change-sets can apply across a wider range of things.
+* CRUD locks-in your changes and preferences. If there's an upgrade, your form should remain safely as it was before (provided the form relied on supported components).
+* Change-sets are adaptable. If there's an upgrade or edit to the underlying form, the change-set will be used on top of the latest revision. If the change-set is revised, then the latest change-set will be used without needing to edit the forms individually.
 
-I expect future people will develop better insight on the trade-offs; for an initial first-read, my expectations are that:
+I expect future people will develop better insight on the trade-offs (and may design other, more nuanced options). For an initial first-read on when to use each, my expectations are that:
 
-* CRUD is more appropriate when an *administrator* is changing a *policy decision* (such as the relative position of two elements).
+* CRUD is more appropriate when an *administrator* is expressing a *policy opinion* about the importance of information on a page.
 * Change-sets are more appropriate when a *developer* is changing an *implementation detail* (such as the CSS classes used to style all calendar widgets).
 
 ## See also

From 3e04b1d08d7c2f14b6f28160aad72edd95944e74 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 18 Sep 2018 23:03:33 -0700
Subject: [PATCH 322/834] Update philosophy.md

---
 ext/afform/docs/philosophy.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/afform/docs/philosophy.md b/ext/afform/docs/philosophy.md
index d6b074431c70..28768f32ab4f 100644
--- a/ext/afform/docs/philosophy.md
+++ b/ext/afform/docs/philosophy.md
@@ -1,17 +1,16 @@
 # Philosophy, Beliefs, Assumptions
 
-Afform is generally grounded in a few beliefs..
+Afform is generally grounded in a few beliefs.
 
 ## Leap by extension
 
 Afform represents a major conceptual change in how core forms are developed.  It is incubated as an extension that can
-be enabled or disabled to taste.  The aim is for oother extension using `afform` can incrementally override/replace
-particular forms in core.
+be enabled or disabled to taste.  The aim is to write further extensions which (a) build on afform APIs in order to (b) incrementally override/replace particular forms in core.
 
 ## Features and user-experiences evolve in funny workflows
 
 If we could sit down and define one true, correct version of a "Donation" form, then our lives as Civi devlopers would
-be easy: draw a mockup, write code, ship, and retire.  But we can't -- because Civi users and integrators engage with
+be easy: draw a mockup, write code, ship, and retire.  But we can't -- because Civi users / integrators / developers engage with
 the system creatively.  They aim to optimize conversion-rates, to integrate with donor journerys, to question how each
 detail makes sense in their situation, etc.  That means switching between open-ended donation amounts, sliders, radios,
 etc; revising the language and layout; maybe adding an informational question or newsletter opt-in.
@@ -26,6 +25,9 @@ This is *not* an argument for maximal customization or maximal decentralization.
 must still communicate and exercise judgment about the best way to approach each problem.  But there are legitimate
 instances for each workflow; given that each will be sought, we want them to be safe and somewhat consistent.
 
+The aims are *not* achieved by developing every feature in-house. Rather, this is conceived as an effort to use
+existing tools/frameworks while relaxing workflows.
+
 What distinguishes `afform` from the original form architecture (Civi's combination of HTML_Quickform, Smarty and
 Profiles)?  Each of those workflows has been given some consideration upfront with the aim of providing a *consistent,
 unified model* -- so that the same data-structure can be pushed through any of those common workflows.

From afc4a89bb0f4eee895b63359a8e30204e606678b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 19 Sep 2018 20:43:01 -0700
Subject: [PATCH 323/834] docs/roadmap.md - More known limits

---
 ext/afform/docs/roadmap.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index 840b9c0af7f3..a0a9f0803870 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -34,3 +34,9 @@ Within this extension, there are things which need updating/addressing:
 * Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
   On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have
   a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-helloworld/>`.
+* Injecting an afform onto an existing Civi page is currently as difficult as injecting any other AngularJS widget --
+  which is to say that (a) it's fine a pure-Angular page and (b) it's lousy on a non-Angular page.
+* The data-storage of user-edited forms supports primitive branching and no merging or rebasing.  In an ideal world
+  (OHUPA-4), we'd incorporate a merge or rebase mechanism (and provide the diff/export on web+cli).  To reduce unnecessary
+  merge-conflicts and allow structured UI for bona-fide merge-conflicts, the diff/merge should be based on HTML elements and
+  IDs (rather than lines-of-text).
\ No newline at end of file

From 30821357aab752f351e50dc9d311a829ceff1ae6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 28 Sep 2018 16:02:10 -0400
Subject: [PATCH 324/834] roadmap.md - Add tidbits

---
 ext/afform/docs/roadmap.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index a0a9f0803870..c970475f3027 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -39,4 +39,9 @@ Within this extension, there are things which need updating/addressing:
 * The data-storage of user-edited forms supports primitive branching and no merging or rebasing.  In an ideal world
   (OHUPA-4), we'd incorporate a merge or rebase mechanism (and provide the diff/export on web+cli).  To reduce unnecessary
   merge-conflicts and allow structured UI for bona-fide merge-conflicts, the diff/merge should be based on HTML elements and
-  IDs (rather than lines-of-text).
\ No newline at end of file
+  IDs (rather than lines-of-text).
+* API Request Batching -- If a page makes multiple API calls at the same time, they fire as separate HTTP requests. This concern is somewhat
+  mitigated by HTTP/2, but not really -- because each subrequest requires a separate CMS+CRM bootstrap. Instead, the JS API adapter should
+  support batching (i.e. all API calls issued within a 5ms window are sent as a batch).
+* Default CSS: There's no mechanism for defining adhoc CSS. This is arguably a feature, though, because the CSS classes
+  should be validated (to ensure theme interoperability).

From 254f01f028381fe8a83b8f54d37d799125c4c3ee Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@bidon.ca>
Date: Wed, 28 Nov 2018 16:38:11 -0500
Subject: [PATCH 325/834] Add support for the is_public flag on front-end forms

---
 ext/afform/CRM/Afform/AfformScanner.php | 1 +
 ext/afform/afform.php                   | 3 ++-
 ext/afform/docs/quickstart.md           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/CRM/Afform/AfformScanner.php
index 03cc44642d74..02afccef45a6 100644
--- a/ext/afform/CRM/Afform/AfformScanner.php
+++ b/ext/afform/CRM/Afform/AfformScanner.php
@@ -131,6 +131,7 @@ public function getMeta($name) {
       'requires' => explode(',', self::DEFAULT_REQUIRES),
       'title' => '',
       'description' => '',
+      'is_public' => false,
     ];
 
     return array_merge($defaults, json_decode(file_get_contents($metaFile), 1));
diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 9690db244c2c..9ac61b2f54d0 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -212,7 +212,8 @@ function afform_civicrm_alterMenu(&$items) {
         'page_callback' => 'CRM_Afform_Page_AfformBase',
         'page_arguments' => 'afform=' . urlencode($name),
         'title' => CRM_Utils_Array::value('title', $meta, ''),
-        'access_arguments' => [['access CiviCRM'], 'and'] // FIXME
+        'access_arguments' => [['access CiviCRM'], 'and'], // FIXME
+        'is_public' => $meta['is_public'],
       ];
     }
   }
diff --git a/ext/afform/docs/quickstart.md b/ext/afform/docs/quickstart.md
index d3c47063a1a4..d67ffc51fcb9 100644
--- a/ext/afform/docs/quickstart.md
+++ b/ext/afform/docs/quickstart.md
@@ -14,7 +14,7 @@ $ cv flush
 
 A few things to note:
 
-* We defined a route `civicrm/hello-world`. This is defined in the same routing system used by CiviCRM forms.
+* We defined a route `civicrm/hello-world`. This is defined in the same routing system used by CiviCRM forms. It also supports properties such as `title` (page title) and `is_public` (defaults to `false`).
 * The file `layout.html` is an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
 * After creating a new form or file, we should flush the cache.
 * If you're going to actively edit/revise the content of the file, then you should navigate

From ebc92914d87587f5c930813ba3b09532c77139dd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 12 Dec 2018 14:50:48 -0800
Subject: [PATCH 326/834] writing.md - Show error if no cid is provided

---
 ext/afform/docs/writing.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index f079a0c4ee89..0530ca74f6ac 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -32,6 +32,9 @@ http://dmaster.localhost/civicrm/hello-world/#/?cid=123
 How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv3:
 
 ```html
+<div ng-if="!routeParams.cid">
+  {{ts('Please provide the "cid"')}}
+</div>
 <div ng-if="routeParams.cid"
   afform-api3="['Contact', 'get', {id: routeParams.cid}]"
   afform-api3-ctrl="apiData">

From 01803805d0c93f03bd51cd208027ea4fb8e7bf0d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 12 Dec 2018 14:52:17 -0800
Subject: [PATCH 327/834] writing.md - Link to more docs for `afform-api3`

---
 ext/afform/docs/writing.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index 0530ca74f6ac..3b398d297043 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -29,7 +29,8 @@ would request a URL like:
 http://dmaster.localhost/civicrm/hello-world/#/?cid=123
 ```
 
-How do we use the `cid` to get information about the contact? Update `layout.html` to include data from APIv3:
+How do we use the `cid` to get information about the contact?  Update `layout.html` to fetch data with
+`Contact.get` API and the [afform-api3](https://github.com/totten/afform/blob/master/ang/afformCore/Api3Ctrl.md) utility:
 
 ```html
 <div ng-if="!routeParams.cid">

From e17912d6d6bd8641ee5fc44a1596f1830f0a6bb8 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 12 Dec 2018 15:31:22 -0800
Subject: [PATCH 328/834] AfformScanner.php - Syntax cleanup

---
 ext/afform/CRM/Afform/AfformScanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/CRM/Afform/AfformScanner.php
index 02afccef45a6..fb03cffbc4a1 100644
--- a/ext/afform/CRM/Afform/AfformScanner.php
+++ b/ext/afform/CRM/Afform/AfformScanner.php
@@ -131,7 +131,7 @@ public function getMeta($name) {
       'requires' => explode(',', self::DEFAULT_REQUIRES),
       'title' => '',
       'description' => '',
-      'is_public' => false,
+      'is_public' => FALSE,
     ];
 
     return array_merge($defaults, json_decode(file_get_contents($metaFile), 1));

From c987231b308b06b0ecd0339471ce1907b5a14fdc Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 12 Dec 2018 15:32:28 -0800
Subject: [PATCH 329/834] Report is_public as part of APIv3

---
 ext/afform/api/v3/Afform/Get.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
index d7f5caa6919f..cc21f508497a 100644
--- a/ext/afform/api/v3/Afform/Get.php
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -24,6 +24,12 @@ function _civicrm_api3_afform_get_spec(&$spec) {
     'title' => ts('Description'),
     'description' => 'Description',
   );
+  $spec['is_public'] = array(
+    'name' => 'is_public',
+    'type' => CRM_Utils_Type::T_BOOLEAN,
+    'title' => ts('Is public'),
+    'description' => 'Display with public theming?',
+  );
 
   // FIXME: title, requires, layout, server_route, client_route
 }

From d1ec770cde2e4118256a3a0fd4c56b537f0354fe Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 12 Dec 2018 15:32:43 -0800
Subject: [PATCH 330/834] Allow saving is_public

---
 ext/afform/afform.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index 9ac61b2f54d0..d85adc607722 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -4,7 +4,7 @@
 use CRM_Afform_ExtensionUtil as E;
 
 function _afform_fields() {
-  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'client_route'];
+  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'client_route', 'is_public'];
 }
 
 /**
@@ -19,6 +19,15 @@ function _afform_fields_filter($params) {
     if (isset($params[$field])) {
       $result[$field] = $params[$field];
     }
+
+    if (isset($result[$field])) {
+      switch ($field) {
+        case 'is_public':
+          $result[$field] = CRM_Utils_String::strtobool($result[$field]);
+          break;
+
+      }
+    }
   }
   return $result;
 }

From 6a7e9d500cd9eb63c0d6e9f122179dc84e984ffc Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 3 Jan 2019 12:08:13 +1300
Subject: [PATCH 331/834] Add need to create meta.json

Per the fix me the requires part of this might change later but for now this gives more help to devs using this
---
 ext/afform/docs/embed.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index 7d754c09e7b6..5109f90b7e49 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -49,6 +49,10 @@ Next, we should create an overall `afform/contact/layout.html` which uses these
 </div>
 ```
 
+And we should create a `afform/contact/meta.json` looking like
+```
+{"server_route": "civicrm/contact", "requires" : ["afformContactName", "afformContactEmails", "afformContactAddresses"]}
+```
 > *(FIXME: In the parent form's `meta.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
 
 What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `afform/contactName/layout.html` --

From 470fae95695cd0c41c34e3ae67d965a273741a73 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 3 Jan 2019 13:19:06 +1300
Subject: [PATCH 332/834] gramatical fix

---
 ext/afform/docs/roadmap.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index c970475f3027..4e375694fa3b 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -25,7 +25,7 @@ This extension is expected to be the base for a suite of related extensions:
 Within this extension, there are things which need updating/addressing:
 
 * There are several `FIXME`/`TODO` declarations in the code for checking pre-conditions, reporting errors, handling edge-cases, etc.
-* Although afforms are can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
+* Although afforms can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
   and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that. (Ex: Define partials via callback.)
 * We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
 * We need a formal way to enumerate the library of available tags/directives/attributes. This, in turn, will drive the

From d903bb2d172277f4be0ce527524414f6929ee8dc Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 8 Jan 2019 19:59:49 -0800
Subject: [PATCH 333/834] README.md - Bump up PHP/CiviCRM versions (#6)

It's not that we have any specific need for these versions, but this is
still alpha, and it's mostly being tested on newer platform versions.
---
 ext/afform/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index e8c115e2ad68..911fbf3b66ed 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -16,8 +16,8 @@ if you already have a basic understanding of CiviCRM API and AngularJS.  It is l
 
 ## Requirements
 
-* PHP v5.4+
-* CiviCRM v5.3+
+* PHP v5.6+
+* CiviCRM v5.7+
 
 ## Installation (Web UI)
 

From a8cb7414d3ffe01f2bac3ccb6d83d92ee7cde0e2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 8 Jan 2019 20:07:15 -0800
Subject: [PATCH 334/834] Update embed.md

---
 ext/afform/docs/embed.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index 5109f90b7e49..4be406dfe921 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -50,8 +50,12 @@ Next, we should create an overall `afform/contact/layout.html` which uses these
 ```
 
 And we should create a `afform/contact/meta.json` looking like
-```
-{"server_route": "civicrm/contact", "requires" : ["afformContactName", "afformContactEmails", "afformContactAddresses"]}
+
+```json
+{
+  "server_route": "civicrm/contact", 
+  "requires" : ["afformContactName", "afformContactEmails", "afformContactAddresses"]
+}
 ```
 > *(FIXME: In the parent form's `meta.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
 

From 97aa04c9764289b979b9202e9c0072cb4b9ced48 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 6 Feb 2019 21:43:27 -0500
Subject: [PATCH 335/834] info.xml - Require api4

---
 ext/afform/info.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ext/afform/info.xml b/ext/afform/info.xml
index d162aa31b1a7..51a8fa7aec69 100644
--- a/ext/afform/info.xml
+++ b/ext/afform/info.xml
@@ -20,8 +20,14 @@
   <compatibility>
     <ver>5.3</ver>
   </compatibility>
+  <requires>
+    <ext>org.civicrm.api4</ext>
+  </requires>
   <comments>This is a new, undeveloped module</comments>
   <civix>
     <namespace>CRM/Afform</namespace>
   </civix>
+  <classloader>
+    <psr4 prefix="Civi\" path="Civi" />
+  </classloader>
 </extension>

From 3e447fa777d347a469f6f304ec43d2f43f46b9ec Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Feb 2019 21:46:30 -0500
Subject: [PATCH 336/834] Add Api4Ctrl

---
 ext/afform/ang/afformCore.ang.php     |  2 +-
 ext/afform/ang/afformCore/Api4Ctrl.js | 51 +++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 ext/afform/ang/afformCore/Api4Ctrl.js

diff --git a/ext/afform/ang/afformCore.ang.php b/ext/afform/ang/afformCore.ang.php
index c8b2a48d9b67..2a0234163289 100644
--- a/ext/afform/ang/afformCore.ang.php
+++ b/ext/afform/ang/afformCore.ang.php
@@ -10,7 +10,7 @@
     2 => 'ang/afformCore/*/*.js',
   ),
   'css' => array(),
-  'requires' => array('crmUi', 'crmUtil'),
+  'requires' => array('crmUi', 'crmUtil', 'api4'),
   'partials' => array('ang/afformCore'),
   'settings' => array(),
   'basePages' => [],
diff --git a/ext/afform/ang/afformCore/Api4Ctrl.js b/ext/afform/ang/afformCore/Api4Ctrl.js
new file mode 100644
index 000000000000..32ae530fd199
--- /dev/null
+++ b/ext/afform/ang/afformCore/Api4Ctrl.js
@@ -0,0 +1,51 @@
+(function(angular, $, _) {
+
+  angular.module('afformCore').directive('affApi4Ctrl', function() {
+    return {
+      restrict: 'EA',
+      scope: {
+        affApi4Ctrl: '=',
+        affApi4: '@',
+        affApi4Refresh: '@',
+        onRefresh: '@'
+      },
+      controllerAs: 'affApi4Ctrl',
+      controller: function($scope, $parse, crmThrottle, crmApi4) {
+        var ctrl = this;
+
+        // CONSIDER: Trade-offs of upfront vs ongoing evaluation.
+        var parts = $parse($scope.affApi4)($scope.$parent);
+        ctrl.entity = parts[0];
+        ctrl.action = parts[1];
+        ctrl.params = parts[2];
+        ctrl.result = {};
+        ctrl.loading = ctrl.firstLoad = true;
+
+        ctrl.refresh = function refresh() {
+          ctrl.loading = true;
+          crmThrottle(function () {
+            return crmApi4(ctrl.entity, ctrl.action, ctrl.params)
+              .then(function (response) {
+                ctrl.result = response;
+                ctrl.loading = ctrl.firstLoad = false;
+                if ($scope.onRefresh) {
+                  $scope.$parent.$eval($scope.onRefresh, ctrl);
+                }
+              });
+          });
+        };
+
+        $scope.affApi4Ctrl = this;
+
+        var mode = $scope.affApi4Refresh ? $scope.affApi4Refresh : 'auto';
+        switch (mode) {
+          case 'auto': $scope.$watchCollection('affApi4Ctrl.params', ctrl.refresh); break;
+          case 'init': ctrl.refresh(); break;
+          case 'manual': break;
+          default: throw 'Unrecognized refresh mode: '+ mode;
+        }
+      }
+    };
+  });
+
+})(angular, CRM.$, CRM._);

From 8f4a0ee9d96666b5616e4dfb9830cee5df050b1d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 6 Feb 2019 23:39:07 -0500
Subject: [PATCH 337/834] Move CRM_Afform_AfformScanner to a service

---
 ext/afform/afform.php               | 26 ++++++++++++++++++++++----
 ext/afform/api/v3/Afform/Create.php |  2 +-
 ext/afform/api/v3/Afform/Get.php    |  2 +-
 ext/afform/api/v3/Afform/Revert.php |  2 +-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/ext/afform/afform.php b/ext/afform/afform.php
index d85adc607722..ad8630867f78 100644
--- a/ext/afform/afform.php
+++ b/ext/afform/afform.php
@@ -32,6 +32,16 @@ function _afform_fields_filter($params) {
   return $result;
 }
 
+/**
+ * @param ContainerBuilder $container
+ */
+function afform_civicrm_container($container) {
+  $container->setDefinition('afform_scanner', new \Symfony\Component\DependencyInjection\Definition(
+    'CRM_Afform_AfformScanner',
+    array()
+  ));
+}
+
 /**
  * Implements hook_civicrm_config().
  *
@@ -142,7 +152,7 @@ function afform_civicrm_caseTypes(&$caseTypes) {
 function afform_civicrm_angularModules(&$angularModules) {
   _afform_civix_civicrm_angularModules($angularModules);
 
-  $scanner = new CRM_Afform_AfformScanner();
+  $scanner = Civi::service('afform_scanner');
   $names = array_keys($scanner->findFilePaths());
   foreach ($names as $name) {
     $meta = $scanner->getMeta($name);
@@ -195,9 +205,11 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   }
 
   $name = $params['name'];
-  $scanner = new CRM_Afform_AfformScanner();
+  // Hmm?? $scanner = new CRM_Afform_AfformScanner();
+  // Hmm?? afform_scanner
+  $scanner = Civi::service('afform_scanner');
   $meta = $scanner->getMeta($name);
-  $scanner = new CRM_Afform_AfformScanner();
+  // Hmm?? $scanner = new CRM_Afform_AfformScanner();
 
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
@@ -214,7 +226,13 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
  * Implements hook_civicrm_alterMenu().
  */
 function afform_civicrm_alterMenu(&$items) {
-  $scanner = new CRM_Afform_AfformScanner();
+  if (Civi::container()->has('afform_scanner')) {
+    $scanner = Civi::service('afform_scanner');
+  }
+  else {
+    // During installation...
+    $scanner = new CRM_Afform_AfformScanner();
+  }
   foreach ($scanner->getMetas() as $name => $meta) {
     if (!empty($meta['server_route'])) {
       $items[$meta['server_route']] = [
diff --git a/ext/afform/api/v3/Afform/Create.php b/ext/afform/api/v3/Afform/Create.php
index 38257e3fe732..4a73c29a91dc 100644
--- a/ext/afform/api/v3/Afform/Create.php
+++ b/ext/afform/api/v3/Afform/Create.php
@@ -24,7 +24,7 @@ function _civicrm_api3_afform_create_spec(&$spec) {
  * @throws API_Exception
  */
 function civicrm_api3_afform_create($params) {
-  $scanner = new CRM_Afform_AfformScanner();
+  $scanner = Civi::service('afform_scanner');
   $converter = new CRM_Afform_ArrayHtml();
 
   if (empty($params['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $params['name'])) {
diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
index cc21f508497a..bba1b8983659 100644
--- a/ext/afform/api/v3/Afform/Get.php
+++ b/ext/afform/api/v3/Afform/Get.php
@@ -44,7 +44,7 @@ function _civicrm_api3_afform_get_spec(&$spec) {
  * @throws API_Exception
  */
 function civicrm_api3_afform_get($params) {
-  $scanner = new CRM_Afform_AfformScanner();
+  $scanner = Civi::service('afform_scanner');
   $converter = new CRM_Afform_ArrayHtml();
   $records = [];
 
diff --git a/ext/afform/api/v3/Afform/Revert.php b/ext/afform/api/v3/Afform/Revert.php
index 3e7f5f8d242f..bb5fb2c6f6e5 100644
--- a/ext/afform/api/v3/Afform/Revert.php
+++ b/ext/afform/api/v3/Afform/Revert.php
@@ -26,7 +26,7 @@ function _civicrm_api3_afform_revert_spec(&$spec) {
  * @throws API_Exception
  */
 function civicrm_api3_afform_revert($params) {
-  $scanner = new CRM_Afform_AfformScanner();
+  $scanner = Civi::service('afform_scanner');
 
   if (empty($params['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $params['name'])) {
     throw new \API_Exception("Afform.revert: name is a mandatory field. It should use alphanumerics and dashes.");

From 7422a2305c50bc5b8ef2d15b71cbf56689e5f8d5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 7 Feb 2019 00:49:37 -0500
Subject: [PATCH 338/834] Implement basic APIv4 support

---
 ext/afform/Civi/Api4/Action/Afform/Create.php | 11 +++
 ext/afform/Civi/Api4/Action/Afform/Delete.php | 19 ++++
 ext/afform/Civi/Api4/Action/Afform/Get.php    | 11 +++
 .../Civi/Api4/Action/Afform/GetFields.php     | 14 +++
 ext/afform/Civi/Api4/Action/Afform/Revert.php | 36 +++++++
 ext/afform/Civi/Api4/Action/Afform/Update.php | 13 +++
 ext/afform/Civi/Api4/Afform.php               | 15 +++
 ext/afform/Civi/Api4/AfformCrudTrait.php      | 95 +++++++++++++++++++
 .../tests/phpunit/api/v4/AfformTest.php       | 82 ++++++++++++++++
 9 files changed, 296 insertions(+)
 create mode 100644 ext/afform/Civi/Api4/Action/Afform/Create.php
 create mode 100644 ext/afform/Civi/Api4/Action/Afform/Delete.php
 create mode 100644 ext/afform/Civi/Api4/Action/Afform/Get.php
 create mode 100644 ext/afform/Civi/Api4/Action/Afform/GetFields.php
 create mode 100644 ext/afform/Civi/Api4/Action/Afform/Revert.php
 create mode 100644 ext/afform/Civi/Api4/Action/Afform/Update.php
 create mode 100644 ext/afform/Civi/Api4/Afform.php
 create mode 100644 ext/afform/Civi/Api4/AfformCrudTrait.php
 create mode 100644 ext/afform/tests/phpunit/api/v4/AfformTest.php

diff --git a/ext/afform/Civi/Api4/Action/Afform/Create.php b/ext/afform/Civi/Api4/Action/Afform/Create.php
new file mode 100644
index 000000000000..971eddfca4e3
--- /dev/null
+++ b/ext/afform/Civi/Api4/Action/Afform/Create.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace civi\Api4\Action\Afform;
+
+use Civi\Api4\AfformCrudTrait;
+
+class Create extends \Civi\Api4\Action\Create {
+
+  use AfformCrudTrait;
+
+}
diff --git a/ext/afform/Civi/Api4/Action/Afform/Delete.php b/ext/afform/Civi/Api4/Action/Afform/Delete.php
new file mode 100644
index 000000000000..139e5e4086d6
--- /dev/null
+++ b/ext/afform/Civi/Api4/Action/Afform/Delete.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace civi\Api4\Action\Afform;
+
+use Civi\API\Exception\NotImplementedException;
+use Civi\Api4\AfformCrudTrait;
+use Civi\Api4\Generic\Result;
+
+class Delete extends \Civi\Api4\Action\Delete {
+
+  use AfformCrudTrait;
+
+  protected $select = ['name'];
+
+  public function _run(Result $result) {
+    throw new NotImplementedException("Not support: Afform.delete");
+  }
+
+}
diff --git a/ext/afform/Civi/Api4/Action/Afform/Get.php b/ext/afform/Civi/Api4/Action/Afform/Get.php
new file mode 100644
index 000000000000..8759f9a58bbf
--- /dev/null
+++ b/ext/afform/Civi/Api4/Action/Afform/Get.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace civi\Api4\Action\Afform;
+
+use Civi\Api4\AfformCrudTrait;
+
+class Get extends \Civi\Api4\Action\Get {
+
+  use AfformCrudTrait;
+
+}
diff --git a/ext/afform/Civi/Api4/Action/Afform/GetFields.php b/ext/afform/Civi/Api4/Action/Afform/GetFields.php
new file mode 100644
index 000000000000..5a57591eae63
--- /dev/null
+++ b/ext/afform/Civi/Api4/Action/Afform/GetFields.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace civi\Api4\Action\Afform;
+
+use Civi\Api4\Generic\AbstractAction;
+use Civi\Api4\Generic\Result;
+
+class GetFields extends \Civi\Api4\Action\GetFields {
+
+  public function _run(Result $result) {
+    // FIXME
+  }
+
+}
diff --git a/ext/afform/Civi/Api4/Action/Afform/Revert.php b/ext/afform/Civi/Api4/Action/Afform/Revert.php
new file mode 100644
index 000000000000..206d5addd68d
--- /dev/null
+++ b/ext/afform/Civi/Api4/Action/Afform/Revert.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+use Civi\Api4\Generic\Result;
+
+class Revert extends Get {
+
+  protected $select = ['name'];
+
+  public function _run(Result $result) {
+    $scanner = \Civi::service('afform_scanner');
+
+    parent::_run($result);
+
+    $files = [\CRM_Afform_AfformScanner::METADATA_FILE, 'layout.html'];
+
+    foreach ($result as $afform) {
+      foreach ($files as $file) {
+        $metaPath = $scanner->createSiteLocalPath($afform['name'], $file);
+        if (file_exists($metaPath)) {
+          if (!@unlink($metaPath)) {
+            throw new \API_Exception("Failed to remove afform overrides in $file");
+          }
+        }
+      }
+    }
+
+    // We may have changed list of files covered by the cache.
+    $scanner->clear();
+
+    // FIXME if `server_route` changes, then flush the menu cache.
+    // FIXME if asset-caching is enabled, then flush the asset cache
+  }
+
+}
diff --git a/ext/afform/Civi/Api4/Action/Afform/Update.php b/ext/afform/Civi/Api4/Action/Afform/Update.php
new file mode 100644
index 000000000000..03dc840bad84
--- /dev/null
+++ b/ext/afform/Civi/Api4/Action/Afform/Update.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+use Civi\Api4\AfformCrudTrait;
+
+class Update extends \Civi\Api4\Action\Update {
+
+  use AfformCrudTrait;
+
+  protected $select = ['name'];
+
+}
diff --git a/ext/afform/Civi/Api4/Afform.php b/ext/afform/Civi/Api4/Afform.php
new file mode 100644
index 000000000000..38f7bb24de81
--- /dev/null
+++ b/ext/afform/Civi/Api4/Afform.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Civi\Api4;
+
+use Civi\Api4\Generic\AbstractEntity;
+
+/**
+ * Class Afform
+ * @package Civi\Api4
+ *
+ * @method static \Civi\Api4\Action\Afform\Revert revert
+ */
+class Afform extends AbstractEntity {
+
+}
diff --git a/ext/afform/Civi/Api4/AfformCrudTrait.php b/ext/afform/Civi/Api4/AfformCrudTrait.php
new file mode 100644
index 000000000000..b8aa307e9b5c
--- /dev/null
+++ b/ext/afform/Civi/Api4/AfformCrudTrait.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Civi\Api4;
+
+use Civi\Api4\Generic\ArrayRetrievalTrait;
+
+trait AfformCrudTrait {
+
+  use ArrayRetrievalTrait;
+
+  public function getObjects() {
+    /** @var \CRM_Afform_AfformScanner $scanner */
+    $scanner = \Civi::service('afform_scanner');
+    $converter = new \CRM_Afform_ArrayHtml();
+
+    if (count($this->where) === 1 && $this->where[0][0] === 'name' && $this->where[0][1] == '=') {
+      $names = [$this->where[0][2]];
+    }
+    else {
+      $names = array_keys($scanner->findFilePaths());
+    }
+
+    $values = [];
+    foreach ($names as $name) {
+      $record = $scanner->getMeta($name);
+      $layout = $scanner->findFilePath($name, 'layout.html');
+      if ($layout) {
+        // FIXME check for file existence+substance+validity
+        $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
+      }
+      $values[] = $record;
+    }
+
+    return $this->processArrayData($values);
+  }
+
+  /**
+   * Write a record as part of a create/update action.
+   *
+   * @param array $record
+   *   The record to write to the DB.
+   * @return array
+   *   The record after being written to the DB (e.g. including newly assigned "id").
+   * @throws \API_Exception
+   */
+  protected function writeObject($record) {
+    /** @var \CRM_Afform_AfformScanner $scanner */
+    $scanner = \Civi::service('afform_scanner');
+    $converter = new \CRM_Afform_ArrayHtml();
+
+    if (empty($record['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $record['name'])) {
+      throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
+    }
+    $name = $record['name'];
+
+    // FIXME validate all field data.
+    $updates = _afform_fields_filter($record);
+
+    // Create or update layout.html.
+    if (isset($updates['layout'])) {
+      $layoutPath = $scanner->createSiteLocalPath($name, 'layout.html');
+      \ CRM_Utils_File::createDir(dirname($layoutPath));
+      file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
+      // FIXME check for writability then success. Report errors.
+    }
+
+    // Create or update meta.json.
+    $orig = \Civi\Api4\Afform::get()->addWhere('name', '=', $name)->execute();
+
+    if (isset($orig[0])) {
+      $meta = _afform_fields_filter(array_merge($orig[0], $updates));
+    }
+    else {
+      $meta = $updates;
+    }
+    unset($meta['layout']);
+    unset($meta['name']);
+    if (!empty($meta)) {
+      $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
+      // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
+      \CRM_Utils_File::createDir(dirname($metaPath));
+      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
+      // FIXME check for writability then success. Report errors.
+    }
+
+    // We may have changed list of files covered by the cache.
+    $scanner->clear();
+
+    // FIXME if `server_route` changes, then flush the menu cache.
+    // FIXME if asset-caching is enabled, then flush the asset cache.
+
+    return $updates;
+  }
+
+}
diff --git a/ext/afform/tests/phpunit/api/v4/AfformTest.php b/ext/afform/tests/phpunit/api/v4/AfformTest.php
new file mode 100644
index 000000000000..1a0f01994cce
--- /dev/null
+++ b/ext/afform/tests/phpunit/api/v4/AfformTest.php
@@ -0,0 +1,82 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Afform.Get API Test Case
+ * This is a generic test class implemented with PHPUnit.
+ * @group headless
+ */
+class api_v4_AfformTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->install(['org.civicrm.api4'])
+      ->apply();
+  }
+
+  /**
+   * The setup() method is executed before the test is executed (optional).
+   */
+  public function setUp() {
+    parent::setUp();
+    CRM_Core_Config::singleton()->userPermissionTemp = new CRM_Core_Permission_Temp();
+    CRM_Core_Config::singleton()->userPermissionTemp->grant('administer CiviCRM');
+  }
+
+  /**
+   * The tearDown() method is executed after the test was executed (optional)
+   * This can be used for cleanup.
+   */
+  public function tearDown() {
+    parent::tearDown();
+  }
+
+  /**
+   * This takes the bundled `examplepage` and performs some API calls on it.
+   */
+  public function testGetUpdateRevert() {
+    Civi\Api4\Afform::revert()->addWhere('name', '=', 'examplepage')->execute();
+
+    $message = 'The initial Afform.get should return default data';
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'examplepage')->execute();
+    $result->indexBy('name');
+    $this->assertEquals('examplepage', $result['examplepage']['name'], $message);
+    $this->assertEquals('', $result['examplepage']['title'], $message);
+    $this->assertEquals('', $result['examplepage']['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result['examplepage']['server_route'], $message);
+    $this->assertTrue(is_array($result['examplepage']['layout']), $message);
+
+    $message = 'After updating with Afform.create, the revised data should be returned';
+    $result = Civi\Api4\Afform::update()
+      ->addWhere('name', '=', 'examplepage')
+      ->addValue('description', 'The temporary description')
+      ->execute();
+    $this->assertEquals('examplepage', $result[0]['name'], $message);
+    $this->assertEquals('The temporary description', $result[0]['description'], $message);
+
+    $message = 'After updating, the Afform.get API should return blended data';
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'examplepage')->execute();
+    $this->assertEquals('examplepage', $result[0]['name'], $message);
+    $this->assertEquals('', $result[0]['title'], $message);
+    $this->assertEquals('The temporary description', $result[0]['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result[0]['server_route'], $message);
+    $this->assertTrue(is_array($result[0]['layout']), $message);
+
+    Civi\Api4\Afform::revert()->addWhere('name', '=', 'examplepage')->execute();
+    $message = 'After reverting, te final Afform.get should return default data';
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'examplepage')->execute();
+    $this->assertEquals('examplepage', $result[0]['name'], $message);
+    $this->assertEquals('', $result[0]['title'], $message);
+    $this->assertEquals('', $result[0]['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result[0]['server_route'], $message);
+    $this->assertTrue(is_array($result[0]['layout']), $message);
+  }
+
+}

From 57ab557635664328d8b0c3f7f383c85ca5395378 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 7 Feb 2019 13:43:38 -0500
Subject: [PATCH 339/834] Move AfformCrudTrait to a namespace that isn't
 scanned

---
 ext/afform/Civi/Api4/Action/Afform/Create.php         | 2 +-
 ext/afform/Civi/Api4/Action/Afform/Delete.php         | 2 +-
 ext/afform/Civi/Api4/Action/Afform/Get.php            | 2 +-
 ext/afform/Civi/Api4/Action/Afform/Update.php         | 2 +-
 ext/afform/Civi/Api4/{ => Traits}/AfformCrudTrait.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename ext/afform/Civi/Api4/{ => Traits}/AfformCrudTrait.php (99%)

diff --git a/ext/afform/Civi/Api4/Action/Afform/Create.php b/ext/afform/Civi/Api4/Action/Afform/Create.php
index 971eddfca4e3..b2c16368d50d 100644
--- a/ext/afform/Civi/Api4/Action/Afform/Create.php
+++ b/ext/afform/Civi/Api4/Action/Afform/Create.php
@@ -2,7 +2,7 @@
 
 namespace civi\Api4\Action\Afform;
 
-use Civi\Api4\AfformCrudTrait;
+use Civi\Api4\Traits\AfformCrudTrait;
 
 class Create extends \Civi\Api4\Action\Create {
 
diff --git a/ext/afform/Civi/Api4/Action/Afform/Delete.php b/ext/afform/Civi/Api4/Action/Afform/Delete.php
index 139e5e4086d6..c08cb7d0093c 100644
--- a/ext/afform/Civi/Api4/Action/Afform/Delete.php
+++ b/ext/afform/Civi/Api4/Action/Afform/Delete.php
@@ -3,7 +3,7 @@
 namespace civi\Api4\Action\Afform;
 
 use Civi\API\Exception\NotImplementedException;
-use Civi\Api4\AfformCrudTrait;
+use Civi\Api4\Traits\AfformCrudTrait;
 use Civi\Api4\Generic\Result;
 
 class Delete extends \Civi\Api4\Action\Delete {
diff --git a/ext/afform/Civi/Api4/Action/Afform/Get.php b/ext/afform/Civi/Api4/Action/Afform/Get.php
index 8759f9a58bbf..53cded301128 100644
--- a/ext/afform/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/Civi/Api4/Action/Afform/Get.php
@@ -2,7 +2,7 @@
 
 namespace civi\Api4\Action\Afform;
 
-use Civi\Api4\AfformCrudTrait;
+use Civi\Api4\Traits\AfformCrudTrait;
 
 class Get extends \Civi\Api4\Action\Get {
 
diff --git a/ext/afform/Civi/Api4/Action/Afform/Update.php b/ext/afform/Civi/Api4/Action/Afform/Update.php
index 03dc840bad84..f89f23e0c3b8 100644
--- a/ext/afform/Civi/Api4/Action/Afform/Update.php
+++ b/ext/afform/Civi/Api4/Action/Afform/Update.php
@@ -2,7 +2,7 @@
 
 namespace Civi\Api4\Action\Afform;
 
-use Civi\Api4\AfformCrudTrait;
+use Civi\Api4\Traits\AfformCrudTrait;
 
 class Update extends \Civi\Api4\Action\Update {
 
diff --git a/ext/afform/Civi/Api4/AfformCrudTrait.php b/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
similarity index 99%
rename from ext/afform/Civi/Api4/AfformCrudTrait.php
rename to ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
index b8aa307e9b5c..ad47df041fe3 100644
--- a/ext/afform/Civi/Api4/AfformCrudTrait.php
+++ b/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Civi\Api4;
+namespace Civi\Api4\Traits;
 
 use Civi\Api4\Generic\ArrayRetrievalTrait;
 

From c6f3ce42f335a4b284bbbc1eed2ed7fce3794211 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 7 Feb 2019 16:57:33 -0500
Subject: [PATCH 340/834] AfformCrudTrait - When delegating to another API
 call, use same permissions

---
 ext/afform/Civi/Api4/Traits/AfformCrudTrait.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php b/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
index ad47df041fe3..668b90fbd299 100644
--- a/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
+++ b/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
@@ -65,7 +65,10 @@ protected function writeObject($record) {
     }
 
     // Create or update meta.json.
-    $orig = \Civi\Api4\Afform::get()->addWhere('name', '=', $name)->execute();
+    $orig = \Civi\Api4\Afform::get()
+      ->setCheckPermissions($this->getCheckPermissions())
+      ->addWhere('name', '=', $name)
+      ->execute();
 
     if (isset($orig[0])) {
       $meta = _afform_fields_filter(array_merge($orig[0], $updates));

From a00d9bd33595684fbc26b1ca304227a82174d12b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 7 Feb 2019 17:20:17 -0500
Subject: [PATCH 341/834] Update docs to use api4 instead of api3

---
 ext/afform/docs/crud.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/ext/afform/docs/crud.md b/ext/afform/docs/crud.md
index 24f6d823aa17..e99174a4dd4c 100644
--- a/ext/afform/docs/crud.md
+++ b/ext/afform/docs/crud.md
@@ -4,33 +4,33 @@ Now that we've defined a baseline form, it's possible for administrators and
 GUI applications to inspect the form using the API:
 
 ```
-$ cv api afform.getsingle name=helloworld
+$ cv api4 afform.get +w name=helloworld
 {
-    "name": "helloworld",
-    "requires": [
-        "afformCore"
-    ],
-    "title": "",
-    "description": "",
-    "layout": {
-        "#tag": "div",
-        "#children": [
-            "Hello {{routeParams.name}}"
-        ]
-    },
-    "id": "helloworld"
+    "0": {
+        "name": "helloworld",
+        "requires": [
+            "afformCore"
+        ],
+        "title": "",
+        "description": "",
+        "is_public": false,
+        "server_route": "civicrm/hello-world",
+        "layout": {
+            "#tag": "div",
+            "#children": [
+                "Hello {{routeParams.name}}"
+            ]
+        },
+    }
 }
 ```
 
 Additionally, you can also update the forms:
 
 ```
-$ cv api afform.create name=helloworld title="The Foo Bar Screen"
+$ cv api4 afform.update +w name=helloworld +v title="The Foo Bar Screen"
 {
-    "is_error": 0,
-    "version": 3,
-    "count": 2,
-    "values": {
+    "0": {
         "name": "helloworld",
         "title": "The Foo Bar Screen"
     }

From 6ed2195f234b3bc74962c7f6f85eefd582422ed2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 7 Feb 2019 17:24:39 -0500
Subject: [PATCH 342/834] Remove Afform.{get,create} support from APIv3

---
 ext/afform/api/v3/Afform/Create.php           | 72 ----------------
 ext/afform/api/v3/Afform/Get.php              | 69 ---------------
 ext/afform/api/v3/Afform/Revert.php           | 52 ------------
 .../tests/phpunit/api/v3/AfformTest.php       | 84 -------------------
 4 files changed, 277 deletions(-)
 delete mode 100644 ext/afform/api/v3/Afform/Create.php
 delete mode 100644 ext/afform/api/v3/Afform/Get.php
 delete mode 100644 ext/afform/api/v3/Afform/Revert.php
 delete mode 100644 ext/afform/tests/phpunit/api/v3/AfformTest.php

diff --git a/ext/afform/api/v3/Afform/Create.php b/ext/afform/api/v3/Afform/Create.php
deleted file mode 100644
index 4a73c29a91dc..000000000000
--- a/ext/afform/api/v3/Afform/Create.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-use CRM_Afform_ExtensionUtil as E;
-
-/**
- * Afform.Create API specification (optional)
- * This is used for documentation and validation.
- *
- * @param array $spec description of fields supported by this API call
- * @return void
- * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
- */
-function _civicrm_api3_afform_create_spec(&$spec) {
-  require_once __DIR__ . DIRECTORY_SEPARATOR . 'Get.php';
-  _civicrm_api3_afform_get_spec($spec);
-}
-
-/**
- * Afform.Create API
- *
- * @param array $params
- * @return array API result descriptor
- * @see civicrm_api3_create_success
- * @see civicrm_api3_create_error
- * @throws API_Exception
- */
-function civicrm_api3_afform_create($params) {
-  $scanner = Civi::service('afform_scanner');
-  $converter = new CRM_Afform_ArrayHtml();
-
-  if (empty($params['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $params['name'])) {
-    throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
-  }
-  $name = $params['name'];
-
-  // FIXME validate all field data.
-  $updates = _afform_fields_filter($params);
-
-  // Create or update layout.html.
-  if (isset($updates['layout'])) {
-    $layoutPath = $scanner->createSiteLocalPath($name, 'layout.html');
-    // printf("[%s] Update layout %s\n", $name, $layoutPath);
-    CRM_Utils_File::createDir(dirname($layoutPath));
-    file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
-    // FIXME check for writability then success. Report errors.
-  }
-
-  // Create or update meta.json.
-  $orig = civicrm_api3('afform', 'get', ['name' => $name, 'sequential' => 1]);
-  if (isset($orig['values'][0])) {
-    $meta = _afform_fields_filter(array_merge($orig['values'][0], $updates));
-  }
-  else {
-    $meta = $updates;
-  }
-  unset($meta['layout']);
-  unset($meta['name']);
-  if (!empty($meta)) {
-    $metaPath = $scanner->createSiteLocalPath($name, CRM_Afform_AfformScanner::METADATA_FILE);
-    // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
-    CRM_Utils_File::createDir(dirname($metaPath));
-    file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
-    // FIXME check for writability then success. Report errors.
-  }
-
-  // We may have changed list of files covered by the cache.
-  $scanner->clear();
-
-  // FIXME if `server_route` changes, then flush the menu cache.
-  // FIXME if asset-caching is enabled, then flush the asset cache.
-
-  return civicrm_api3_create_success($updates, $params, 'Afform', 'create');
-}
diff --git a/ext/afform/api/v3/Afform/Get.php b/ext/afform/api/v3/Afform/Get.php
deleted file mode 100644
index bba1b8983659..000000000000
--- a/ext/afform/api/v3/Afform/Get.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-use CRM_Afform_ExtensionUtil as E;
-
-/**
- * Afform.Get API specification (optional)
- * This is used for documentation and validation.
- *
- * @param array $spec description of fields supported by this API call
- * @return void
- * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
- */
-function _civicrm_api3_afform_get_spec(&$spec) {
-  $spec['name'] = array(
-    'name' => 'name',
-    'type' => CRM_Utils_Type::T_STRING,
-    'title' => ts('Form name'),
-    'description' => 'Form name',
-    'maxlength' => 128,
-    'size' => CRM_Utils_Type::HUGE,
-  );
-  $spec['description'] = array(
-    'name' => 'description',
-    'type' => CRM_Utils_Type::T_TEXT,
-    'title' => ts('Description'),
-    'description' => 'Description',
-  );
-  $spec['is_public'] = array(
-    'name' => 'is_public',
-    'type' => CRM_Utils_Type::T_BOOLEAN,
-    'title' => ts('Is public'),
-    'description' => 'Display with public theming?',
-  );
-
-  // FIXME: title, requires, layout, server_route, client_route
-}
-
-/**
- * Afform.Get API
- *
- * @param array $params
- * @return array API result descriptor
- * @see civicrm_api3_create_success
- * @see civicrm_api3_create_error
- * @throws API_Exception
- */
-function civicrm_api3_afform_get($params) {
-  $scanner = Civi::service('afform_scanner');
-  $converter = new CRM_Afform_ArrayHtml();
-  $records = [];
-
-  if (isset($params['name']) && is_string($params['name'])) {
-    $names = [$params['name']];
-  }
-  else {
-    $names = array_keys($scanner->findFilePaths());
-  }
-
-  foreach ($names as $name) {
-    $record = $scanner->getMeta($name);
-    $layout = $scanner->findFilePath($name, 'layout.html');
-    if ($layout) {
-      // FIXME check for file existence+substance+validity
-      $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
-    }
-    $records[$name] = $record;
-  }
-
-  return _civicrm_api3_basic_array_get('Afform', $params, $records, 'name', _afform_fields());
-}
diff --git a/ext/afform/api/v3/Afform/Revert.php b/ext/afform/api/v3/Afform/Revert.php
deleted file mode 100644
index bb5fb2c6f6e5..000000000000
--- a/ext/afform/api/v3/Afform/Revert.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-use CRM_Afform_ExtensionUtil as E;
-
-/**
- * Afform.Revert API specification (optional)
- * This is used for documentation and validation.
- *
- * @param array $spec description of fields supported by this API call
- * @return void
- * @see http://wiki.civicrm.org/confluence/display/CRMDOC/API+Architecture+Standards
- */
-function _civicrm_api3_afform_revert_spec(&$spec) {
-  require_once __DIR__ . DIRECTORY_SEPARATOR . 'Get.php';
-  $getSpec = [];
-  _civicrm_api3_afform_get_spec($getSpec);
-  $spec['name'] = $getSpec['name'];
-}
-
-/**
- * Afform.Revert API
- *
- * @param array $params
- * @return array API result descriptor
- * @see civicrm_api3_revert_success
- * @see civicrm_api3_revert_error
- * @throws API_Exception
- */
-function civicrm_api3_afform_revert($params) {
-  $scanner = Civi::service('afform_scanner');
-
-  if (empty($params['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $params['name'])) {
-    throw new \API_Exception("Afform.revert: name is a mandatory field. It should use alphanumerics and dashes.");
-  }
-  $name = $params['name'];
-
-  foreach ([CRM_Afform_AfformScanner::METADATA_FILE, 'layout.html'] as $file) {
-    $metaPath = $scanner->createSiteLocalPath($name, $file);
-    if (file_exists($metaPath)) {
-      if (!@unlink($metaPath)) {
-        throw new API_Exception("Failed to remove afform overrides in $file");
-      }
-    }
-  }
-
-  // We may have changed list of files covered by the cache.
-  $scanner->clear();
-
-  // FIXME if `server_route` changes, then flush the menu cache.
-  // FIXME if asset-caching is enabled, then flush the asset cache.
-
-  return civicrm_api3_create_success(1, $params, 'Afform', 'revert');
-}
diff --git a/ext/afform/tests/phpunit/api/v3/AfformTest.php b/ext/afform/tests/phpunit/api/v3/AfformTest.php
deleted file mode 100644
index 0c639f892dc7..000000000000
--- a/ext/afform/tests/phpunit/api/v3/AfformTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-use Civi\Test\HeadlessInterface;
-use Civi\Test\HookInterface;
-use Civi\Test\TransactionalInterface;
-
-/**
- * Afform.Get API Test Case
- * This is a generic test class implemented with PHPUnit.
- * @group headless
- */
-class api_v3_AfformTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, HookInterface, TransactionalInterface {
-
-  use \Civi\Test\Api3TestTrait;
-
-  /**
-   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
-   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
-   */
-  public function setUpHeadless() {
-    return \Civi\Test::headless()
-      ->installMe(__DIR__)
-      ->apply();
-  }
-
-  /**
-   * The setup() method is executed before the test is executed (optional).
-   */
-  public function setUp() {
-    parent::setUp();
-  }
-
-  /**
-   * The tearDown() method is executed after the test was executed (optional)
-   * This can be used for cleanup.
-   */
-  public function tearDown() {
-    parent::tearDown();
-  }
-
-  /**
-   * This takes the bundled `examplepage` and performs some API calls on it.
-   */
-  public function testGetUpdateRevert() {
-    $this->callAPISuccess('Afform', 'revert', ['name' => 'examplepage']);
-
-    $message = 'The initial Afform.get should return default data';
-    $result = $this->callAPISuccess('Afform', 'get', ['name' => 'examplepage']);
-    $this->assertEquals('examplepage', $result['values']['examplepage']['id'], $message);
-    $this->assertEquals('examplepage', $result['values']['examplepage']['name'], $message);
-    $this->assertEquals('', $result['values']['examplepage']['title'], $message);
-    $this->assertEquals('', $result['values']['examplepage']['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result['values']['examplepage']['server_route'], $message);
-    $this->assertTrue(is_array($result['values']['examplepage']['layout']), $message);
-
-    $message = 'After updating with Afform.create, the revised data should be returned';
-    $result = $this->callAPISuccess('Afform', 'create', [
-      'name' => 'examplepage',
-      'description' => 'The temporary description',
-    ]);
-    $this->assertEquals('examplepage', $result['values']['name'], $message);
-    $this->assertEquals('The temporary description', $result['values']['description'], $message);
-
-    $message = 'After updating, the Afform.get API should return blended data';
-    $result = $this->callAPISuccess('Afform', 'get', ['name' => 'examplepage']);
-    $this->assertEquals('examplepage', $result['values']['examplepage']['id'], $message);
-    $this->assertEquals('examplepage', $result['values']['examplepage']['name'], $message);
-    $this->assertEquals('', $result['values']['examplepage']['title'], $message);
-    $this->assertEquals('The temporary description', $result['values']['examplepage']['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result['values']['examplepage']['server_route'], $message);
-    $this->assertTrue(is_array($result['values']['examplepage']['layout']), $message);
-
-    $this->callAPISuccess('Afform', 'revert', ['name' => 'examplepage']);
-    $message = 'After reverting, te final Afform.get should return default data';
-    $result = $this->callAPISuccess('Afform', 'get', ['name' => 'examplepage']);
-    $this->assertEquals('examplepage', $result['values']['examplepage']['id'], $message);
-    $this->assertEquals('examplepage', $result['values']['examplepage']['name'], $message);
-    $this->assertEquals('', $result['values']['examplepage']['title'], $message);
-    $this->assertEquals('', $result['values']['examplepage']['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result['values']['examplepage']['server_route'], $message);
-    $this->assertTrue(is_array($result['values']['examplepage']['layout']), $message);
-  }
-
-}

From d6affd1cf082c6a8a361463399c51624900a72fc Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 7 Feb 2019 17:32:58 -0500
Subject: [PATCH 343/834] Afform.{create,delete} are equally
 unsupported/untested/TODO.

---
 ext/afform/Civi/Api4/Action/Afform/Create.php | 6 ++++++
 ext/afform/Civi/Api4/Action/Afform/Delete.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ext/afform/Civi/Api4/Action/Afform/Create.php b/ext/afform/Civi/Api4/Action/Afform/Create.php
index b2c16368d50d..c75a492429da 100644
--- a/ext/afform/Civi/Api4/Action/Afform/Create.php
+++ b/ext/afform/Civi/Api4/Action/Afform/Create.php
@@ -2,10 +2,16 @@
 
 namespace civi\Api4\Action\Afform;
 
+use Civi\API\Exception\NotImplementedException;
 use Civi\Api4\Traits\AfformCrudTrait;
+use Civi\Api4\Generic\Result;
 
 class Create extends \Civi\Api4\Action\Create {
 
   use AfformCrudTrait;
 
+  public function _run(Result $result) {
+    throw new NotImplementedException("Not supported: Afform.create"); // FIXME
+  }
+
 }
diff --git a/ext/afform/Civi/Api4/Action/Afform/Delete.php b/ext/afform/Civi/Api4/Action/Afform/Delete.php
index c08cb7d0093c..84cd2d8f904b 100644
--- a/ext/afform/Civi/Api4/Action/Afform/Delete.php
+++ b/ext/afform/Civi/Api4/Action/Afform/Delete.php
@@ -13,7 +13,7 @@ class Delete extends \Civi\Api4\Action\Delete {
   protected $select = ['name'];
 
   public function _run(Result $result) {
-    throw new NotImplementedException("Not support: Afform.delete");
+    throw new NotImplementedException("Not supported: Afform.delete"); // FIXME
   }
 
 }

From e24575a96832db831de4dfae55181c8a973652d4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 15:32:52 -0500
Subject: [PATCH 344/834] info.xml - Set version to 0.1

---
 ext/afform/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/info.xml b/ext/afform/info.xml
index 51a8fa7aec69..1bdf06e40ec9 100644
--- a/ext/afform/info.xml
+++ b/ext/afform/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2018-06-12</releaseDate>
-  <version>1.0</version>
+  <version>0.1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.3</ver>

From a197dea202a39679cff7dab9d1d1f3f217c22ebd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 15:38:18 -0500
Subject: [PATCH 345/834] Update README.md

---
 ext/afform/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 911fbf3b66ed..1071275c30d6 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -1,5 +1,10 @@
 # org.civicrm.afform (Early Proof of Concept)
 
+> You are looking at the `master` branch of a proof-of-concept module.  It
+> may change radically (without full curation of docs, etc).  For previous
+> iterations with more stable/cogent materials, check other branches (e.g.
+> `0.1`).
+
 <!-- ![Screenshot](/images/screenshot.png) -->
 
 The Affable Administrative Angular Form Framework (`afform`) is a system for administering AngularJS-based forms

From 95eb6fd51871577e5fb83756d84dd5b2e245e72a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 16:13:41 -0500
Subject: [PATCH 346/834] Add docs/sandbox/planning-v0.2.md

---
 ext/afform/docs/sandbox/planning-v0.2.md | 166 +++++++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 ext/afform/docs/sandbox/planning-v0.2.md

diff --git a/ext/afform/docs/sandbox/planning-v0.2.md b/ext/afform/docs/sandbox/planning-v0.2.md
new file mode 100644
index 000000000000..7f7aa406bd12
--- /dev/null
+++ b/ext/afform/docs/sandbox/planning-v0.2.md
@@ -0,0 +1,166 @@
+## Example Use Case
+
+A school has an application process which begins when a parent fills out a
+form with basic details about:
+
+* Themselves
+* Their spouse/coparent (if applicable)
+* The kid
+* A meeting request
+
+The data is saved to 4 entities:
+
+* "Parent" (or "You" or "Me")
+* "Spouse"
+* "Kid"
+* "Activity" (of type "Phone Call" assigned to a particular person)
+
+## General Metadata
+
+```php
+// The "library" is a definition of available tags/directives. It can be
+// used to validate form definitions; to advise sysadmins; and (probably)
+// to generate the $palette.
+//
+// Must NOT be required at runtime. Only required for administration.
+//
+// CONSIDER: Specifying non-conventional names for design/props variants
+$afformLibrary = [
+  'afl-entity' =>[
+    'attrs' => ['entity-name', 'matching-rule', 'assigned-values'],
+  ],
+  'afl-name' => [
+    'attrs' => ['contact-id', 'afl-label'],
+  ],
+  'afl-contact-email' => [
+    'attrs' => ['contact-id', 'afl-label'],
+  ],
+];
+
+// The "palette" is a list of things that can be selected by a web-based
+// admin and added to a form.
+//
+// The canonical form is flat-ish array, but it will be requested in 2-level indexed
+// format (e.g. `entity,id`).
+//
+// Must NOT be required at runtime. Only required for administration.
+$afformPalette = [
+  [
+    'id' => 'Parent:afl-name', /* string; should be stable but otherwise opaque to consumer */
+    'entity' => 'Parent',
+    'title' => 'Name',
+    'template' => '<afl-name contact-id="entities.parent.id" afl-label="Name"/>',
+  ],
+  [
+    'id' => 'Parent:afl-name',
+    'entity' => 'Parent',
+    'title' => 'Address',
+    'template' => '<afl-address contact-id="entities.parent.id" afl-label="Address"/>',
+  ],
+];
+```
+
+## Form Metadata: meta.json
+
+```json
+{
+  "server_route": "civicrm/hello-world",
+  "entities": {
+    "parent": {
+      "type": "Individual",
+      "set": {"favorite_color": "red"},
+      "matchingRule": "email_only"
+    }
+  }
+}
+```
+
+## Form Layout: layout.html
+
+```html
+<afl-form>
+  <crm-ui-tabset>
+
+    <crm-ui-tab>
+      <afl-entity name="parent">
+        <afl-name afl-label="Your Name" ng-required="true" name-style="First-Last" />
+        <afl-email afl-label="Your Email" ng-required="true" />
+      </afl-entity>
+    </crm-ui-tab>
+
+    <crm-ui-tab>
+      <afl-entity name="spouse">
+        <afl-name afl-label="Spouse Name" name-style="First-Last" />
+        <afl-email afl-label="Spouse Email" />
+      </afl-entity>
+    </crm-ui-tab>
+
+    <crm-ui-tab>
+      <afl-entity name="kid">
+        <afl-name afl-label="Kid Name" ng-required="true" name-style="First-Last" />
+      </afl-entity>      
+    </crm-ui-tab>
+  </crm-ui-tabset>
+
+  <button ng-click="save()">Save</button>
+</afl-form>
+```
+
+## Form Editor: Rendering the same layout
+
+```html
+<afl-form-af-design>
+  <crm-ui-tabset-af-design>
+    <crm-ui-tab-af-design>
+      
+    </crm-ui-tab-af-design>
+  </crm-ui-tabset-af-design>
+</afl-form-af-design>
+```
+
+## File Structure
+
+In v0.1, there was a convention of autoprefixing everything with `afform-`.
+This was generally tied to the goal of providing a strong symmetries in
+the names of folders/files/modules/directives/tags.
+
+In the long run, though, it doesn't seem sustainable force everything under
+the `afform-` prefix.
+
+* As we started spec'ing the standard library, it became clear that the
+  stdlib should have a diff namespace from the more business-oriented form defs.
+* As third parties start writing code, they're going to look for way to
+  make their own prefix.
+
+However, we still want to preserve the strong symmetries in the filesystem where:
+
+* The symbol in HTML (e.g.  `afform-email`) should match the file-name (e.g. 
+  `afform/Email/layout.html` or `afform-email.html`)
+* The file name in the base-code provided by an extension should match
+  the file-name in the local override folder.
+
+The following file-structure preserves those parallels. It also:
+
+* Gives access to a full range of tag names
+* Is a bit easier with IDE file-opening (more unique file-names)
+* Is a bit harder to manually copy (e.g. `cp -r foo bar` => `mcp 'foo.*' 'bar.#1'`
+
+Which leads to this structure:
+
+```
+// A business-y form; in canonical definition and local override
+{ext:org.foobar}/ang/afform-edit-contact.aff.json
+{ext:org.foobar}/ang/afform-edit-contact.aff.html
+ {civicrm.files}/ang/afform-edit-contact.aff.json
+ {civicrm.files}/ang/afform-edit-contact.aff.html
+
+// An address block in the stdlib; in canonical definition and local override
+// Note: We also have the "design" and "props" variants
+{ext:org.foobar}/ang/afl-address.aff.json
+{ext:org.foobar}/ang/afl-address.aff.html
+{ext:org.foobar}/ang/afl-address.aff.props.html
+{ext:org.foobar}/ang/afl-address.aff.design.html
+ {civicrm.files}/ang/afl-address.aff.json
+ {civicrm.files}/ang/afl-address.aff.html
+```
+

From 9a3ddb26910ccc58850b67b4bbee210d9d2ba70f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 16:20:42 -0500
Subject: [PATCH 347/834] Import v0.2 discussion sketches

---
 ext/afform/docs/sandbox/1-Sketch.png           | Bin 0 -> 19160 bytes
 ext/afform/docs/sandbox/2-Sketch.png           | Bin 0 -> 23207 bytes
 .../docs/sandbox/3-Free-Blocks-Parent.png      | Bin 0 -> 87290 bytes
 .../4-Repeatable-Entity-Blocks-Parent.png      | Bin 0 -> 85998 bytes
 .../sandbox/5-Repeatable-Entity-Blocks-Kid.png | Bin 0 -> 85059 bytes
 ext/afform/docs/sandbox/v0.2.bmpr              | Bin 0 -> 166912 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ext/afform/docs/sandbox/1-Sketch.png
 create mode 100644 ext/afform/docs/sandbox/2-Sketch.png
 create mode 100644 ext/afform/docs/sandbox/3-Free-Blocks-Parent.png
 create mode 100644 ext/afform/docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png
 create mode 100644 ext/afform/docs/sandbox/5-Repeatable-Entity-Blocks-Kid.png
 create mode 100644 ext/afform/docs/sandbox/v0.2.bmpr

diff --git a/ext/afform/docs/sandbox/1-Sketch.png b/ext/afform/docs/sandbox/1-Sketch.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fa002dd84af37ea5c1dbbc93e742d550f74a185
GIT binary patch
literal 19160
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
I-)`RjKgF836aWAK

literal 0
HcmV?d00001

diff --git a/ext/afform/docs/sandbox/2-Sketch.png b/ext/afform/docs/sandbox/2-Sketch.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e97da5583a21d0b1bb0d1bda5320f921fa4a122
GIT binary patch
literal 23207
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

literal 0
HcmV?d00001

diff --git a/ext/afform/docs/sandbox/3-Free-Blocks-Parent.png b/ext/afform/docs/sandbox/3-Free-Blocks-Parent.png
new file mode 100644
index 0000000000000000000000000000000000000000..47e8d8125c74a40995179cd706a62922de003732
GIT binary patch
literal 87290
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

literal 0
HcmV?d00001

diff --git a/ext/afform/docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png b/ext/afform/docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png
new file mode 100644
index 0000000000000000000000000000000000000000..4beccad0320153eff652c74b177e5ce3fd323c97
GIT binary patch
literal 85998
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
QBG&{d33>5+QG@sY2bz<LKL7v#

literal 0
HcmV?d00001

diff --git a/ext/afform/docs/sandbox/5-Repeatable-Entity-Blocks-Kid.png b/ext/afform/docs/sandbox/5-Repeatable-Entity-Blocks-Kid.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9c87436aa05bd7c13b5e770f4c78f9f042a73b1
GIT binary patch
literal 85059
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%0Avd>xu&yvx
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

literal 0
HcmV?d00001

diff --git a/ext/afform/docs/sandbox/v0.2.bmpr b/ext/afform/docs/sandbox/v0.2.bmpr
new file mode 100644
index 0000000000000000000000000000000000000000..8fb6fe4f051a537bc78353738e77b2c987414b61
GIT binary patch
literal 166912
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
Gl>ZNhj-R*y

literal 0
HcmV?d00001


From 3724db1c0ab1a53b998fb14a1fccab549bb01651 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 16:21:09 -0500
Subject: [PATCH 348/834] info.xml - Bump to v0.2

---
 ext/afform/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/info.xml b/ext/afform/info.xml
index 1bdf06e40ec9..09205b57da46 100644
--- a/ext/afform/info.xml
+++ b/ext/afform/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2018-06-12</releaseDate>
-  <version>0.1</version>
+  <version>0.2</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.3</ver>

From 0884ca2fb993e4875b9c4ad767d5fef5c32239f0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 17:42:47 -0500
Subject: [PATCH 349/834] Move core/framework code under `./core`

---
 .../{ => core}/CRM/Afform/AfformScanner.php   |   0
 .../{ => core}/CRM/Afform/ArrayHtml.php       |   0
 .../{ => core}/CRM/Afform/Page/AfformBase.php |   0
 .../Civi/Api4/Action/Afform/Create.php        |   0
 .../Civi/Api4/Action/Afform/Delete.php        |   0
 .../Civi/Api4/Action/Afform/Get.php           |   0
 .../Civi/Api4/Action/Afform/GetFields.php     |   0
 .../Civi/Api4/Action/Afform/Revert.php        |   0
 .../Civi/Api4/Action/Afform/Update.php        |   0
 ext/afform/{ => core}/Civi/Api4/Afform.php    |   0
 .../Civi/Api4/Traits/AfformCrudTrait.php      |   0
 ext/afform/core/LICENSE.txt                   | 667 ++++++++++++++++++
 ext/afform/{ => core}/afform.civix.php        |   0
 ext/afform/{ => core}/afform.php              |   0
 .../{ => core}/afform/examplepage/layout.html |   0
 .../{ => core}/afform/examplepage/meta.json   |   0
 ext/afform/{ => core}/ang/afformCore.ang.php  |   0
 ext/afform/{ => core}/ang/afformCore.js       |   0
 .../{ => core}/ang/afformCore/Api3Ctrl.js     |   0
 .../{ => core}/ang/afformCore/Api3Ctrl.md     |   0
 .../{ => core}/ang/afformCore/Api4Ctrl.js     |   0
 .../{ => core}/ang/afformStandalone.ang.php   |   0
 ext/afform/{ => core}/ang/afformStandalone.js |   0
 .../ang/afformStandalone/PageCtrl.js          |   0
 ext/afform/{ => core}/info.xml                |   0
 ext/afform/{ => core}/phpunit.xml.dist        |   0
 .../templates/CRM/Afform/Page/AfformBase.tpl  |   0
 .../templates/afform/AfformAngularModule.tpl  |   0
 .../tests/phpunit/api/v4/AfformTest.php       |   0
 .../{ => core}/tests/phpunit/bootstrap.php    |   0
 30 files changed, 667 insertions(+)
 rename ext/afform/{ => core}/CRM/Afform/AfformScanner.php (100%)
 rename ext/afform/{ => core}/CRM/Afform/ArrayHtml.php (100%)
 rename ext/afform/{ => core}/CRM/Afform/Page/AfformBase.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Action/Afform/Create.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Action/Afform/Delete.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Action/Afform/Get.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Action/Afform/GetFields.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Action/Afform/Revert.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Action/Afform/Update.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Afform.php (100%)
 rename ext/afform/{ => core}/Civi/Api4/Traits/AfformCrudTrait.php (100%)
 create mode 100644 ext/afform/core/LICENSE.txt
 rename ext/afform/{ => core}/afform.civix.php (100%)
 rename ext/afform/{ => core}/afform.php (100%)
 rename ext/afform/{ => core}/afform/examplepage/layout.html (100%)
 rename ext/afform/{ => core}/afform/examplepage/meta.json (100%)
 rename ext/afform/{ => core}/ang/afformCore.ang.php (100%)
 rename ext/afform/{ => core}/ang/afformCore.js (100%)
 rename ext/afform/{ => core}/ang/afformCore/Api3Ctrl.js (100%)
 rename ext/afform/{ => core}/ang/afformCore/Api3Ctrl.md (100%)
 rename ext/afform/{ => core}/ang/afformCore/Api4Ctrl.js (100%)
 rename ext/afform/{ => core}/ang/afformStandalone.ang.php (100%)
 rename ext/afform/{ => core}/ang/afformStandalone.js (100%)
 rename ext/afform/{ => core}/ang/afformStandalone/PageCtrl.js (100%)
 rename ext/afform/{ => core}/info.xml (100%)
 rename ext/afform/{ => core}/phpunit.xml.dist (100%)
 rename ext/afform/{ => core}/templates/CRM/Afform/Page/AfformBase.tpl (100%)
 rename ext/afform/{ => core}/templates/afform/AfformAngularModule.tpl (100%)
 rename ext/afform/{ => core}/tests/phpunit/api/v4/AfformTest.php (100%)
 rename ext/afform/{ => core}/tests/phpunit/bootstrap.php (100%)

diff --git a/ext/afform/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
similarity index 100%
rename from ext/afform/CRM/Afform/AfformScanner.php
rename to ext/afform/core/CRM/Afform/AfformScanner.php
diff --git a/ext/afform/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
similarity index 100%
rename from ext/afform/CRM/Afform/ArrayHtml.php
rename to ext/afform/core/CRM/Afform/ArrayHtml.php
diff --git a/ext/afform/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
similarity index 100%
rename from ext/afform/CRM/Afform/Page/AfformBase.php
rename to ext/afform/core/CRM/Afform/Page/AfformBase.php
diff --git a/ext/afform/Civi/Api4/Action/Afform/Create.php b/ext/afform/core/Civi/Api4/Action/Afform/Create.php
similarity index 100%
rename from ext/afform/Civi/Api4/Action/Afform/Create.php
rename to ext/afform/core/Civi/Api4/Action/Afform/Create.php
diff --git a/ext/afform/Civi/Api4/Action/Afform/Delete.php b/ext/afform/core/Civi/Api4/Action/Afform/Delete.php
similarity index 100%
rename from ext/afform/Civi/Api4/Action/Afform/Delete.php
rename to ext/afform/core/Civi/Api4/Action/Afform/Delete.php
diff --git a/ext/afform/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
similarity index 100%
rename from ext/afform/Civi/Api4/Action/Afform/Get.php
rename to ext/afform/core/Civi/Api4/Action/Afform/Get.php
diff --git a/ext/afform/Civi/Api4/Action/Afform/GetFields.php b/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
similarity index 100%
rename from ext/afform/Civi/Api4/Action/Afform/GetFields.php
rename to ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
diff --git a/ext/afform/Civi/Api4/Action/Afform/Revert.php b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
similarity index 100%
rename from ext/afform/Civi/Api4/Action/Afform/Revert.php
rename to ext/afform/core/Civi/Api4/Action/Afform/Revert.php
diff --git a/ext/afform/Civi/Api4/Action/Afform/Update.php b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
similarity index 100%
rename from ext/afform/Civi/Api4/Action/Afform/Update.php
rename to ext/afform/core/Civi/Api4/Action/Afform/Update.php
diff --git a/ext/afform/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
similarity index 100%
rename from ext/afform/Civi/Api4/Afform.php
rename to ext/afform/core/Civi/Api4/Afform.php
diff --git a/ext/afform/Civi/Api4/Traits/AfformCrudTrait.php b/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
similarity index 100%
rename from ext/afform/Civi/Api4/Traits/AfformCrudTrait.php
rename to ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
diff --git a/ext/afform/core/LICENSE.txt b/ext/afform/core/LICENSE.txt
new file mode 100644
index 000000000000..1cb1cd35cefe
--- /dev/null
+++ b/ext/afform/core/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: org.civicrm.afform
+Copyright (C) 2018, CiviCRM LLC <info@civicrm.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/afform/afform.civix.php b/ext/afform/core/afform.civix.php
similarity index 100%
rename from ext/afform/afform.civix.php
rename to ext/afform/core/afform.civix.php
diff --git a/ext/afform/afform.php b/ext/afform/core/afform.php
similarity index 100%
rename from ext/afform/afform.php
rename to ext/afform/core/afform.php
diff --git a/ext/afform/afform/examplepage/layout.html b/ext/afform/core/afform/examplepage/layout.html
similarity index 100%
rename from ext/afform/afform/examplepage/layout.html
rename to ext/afform/core/afform/examplepage/layout.html
diff --git a/ext/afform/afform/examplepage/meta.json b/ext/afform/core/afform/examplepage/meta.json
similarity index 100%
rename from ext/afform/afform/examplepage/meta.json
rename to ext/afform/core/afform/examplepage/meta.json
diff --git a/ext/afform/ang/afformCore.ang.php b/ext/afform/core/ang/afformCore.ang.php
similarity index 100%
rename from ext/afform/ang/afformCore.ang.php
rename to ext/afform/core/ang/afformCore.ang.php
diff --git a/ext/afform/ang/afformCore.js b/ext/afform/core/ang/afformCore.js
similarity index 100%
rename from ext/afform/ang/afformCore.js
rename to ext/afform/core/ang/afformCore.js
diff --git a/ext/afform/ang/afformCore/Api3Ctrl.js b/ext/afform/core/ang/afformCore/Api3Ctrl.js
similarity index 100%
rename from ext/afform/ang/afformCore/Api3Ctrl.js
rename to ext/afform/core/ang/afformCore/Api3Ctrl.js
diff --git a/ext/afform/ang/afformCore/Api3Ctrl.md b/ext/afform/core/ang/afformCore/Api3Ctrl.md
similarity index 100%
rename from ext/afform/ang/afformCore/Api3Ctrl.md
rename to ext/afform/core/ang/afformCore/Api3Ctrl.md
diff --git a/ext/afform/ang/afformCore/Api4Ctrl.js b/ext/afform/core/ang/afformCore/Api4Ctrl.js
similarity index 100%
rename from ext/afform/ang/afformCore/Api4Ctrl.js
rename to ext/afform/core/ang/afformCore/Api4Ctrl.js
diff --git a/ext/afform/ang/afformStandalone.ang.php b/ext/afform/core/ang/afformStandalone.ang.php
similarity index 100%
rename from ext/afform/ang/afformStandalone.ang.php
rename to ext/afform/core/ang/afformStandalone.ang.php
diff --git a/ext/afform/ang/afformStandalone.js b/ext/afform/core/ang/afformStandalone.js
similarity index 100%
rename from ext/afform/ang/afformStandalone.js
rename to ext/afform/core/ang/afformStandalone.js
diff --git a/ext/afform/ang/afformStandalone/PageCtrl.js b/ext/afform/core/ang/afformStandalone/PageCtrl.js
similarity index 100%
rename from ext/afform/ang/afformStandalone/PageCtrl.js
rename to ext/afform/core/ang/afformStandalone/PageCtrl.js
diff --git a/ext/afform/info.xml b/ext/afform/core/info.xml
similarity index 100%
rename from ext/afform/info.xml
rename to ext/afform/core/info.xml
diff --git a/ext/afform/phpunit.xml.dist b/ext/afform/core/phpunit.xml.dist
similarity index 100%
rename from ext/afform/phpunit.xml.dist
rename to ext/afform/core/phpunit.xml.dist
diff --git a/ext/afform/templates/CRM/Afform/Page/AfformBase.tpl b/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
similarity index 100%
rename from ext/afform/templates/CRM/Afform/Page/AfformBase.tpl
rename to ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
diff --git a/ext/afform/templates/afform/AfformAngularModule.tpl b/ext/afform/core/templates/afform/AfformAngularModule.tpl
similarity index 100%
rename from ext/afform/templates/afform/AfformAngularModule.tpl
rename to ext/afform/core/templates/afform/AfformAngularModule.tpl
diff --git a/ext/afform/tests/phpunit/api/v4/AfformTest.php b/ext/afform/core/tests/phpunit/api/v4/AfformTest.php
similarity index 100%
rename from ext/afform/tests/phpunit/api/v4/AfformTest.php
rename to ext/afform/core/tests/phpunit/api/v4/AfformTest.php
diff --git a/ext/afform/tests/phpunit/bootstrap.php b/ext/afform/core/tests/phpunit/bootstrap.php
similarity index 100%
rename from ext/afform/tests/phpunit/bootstrap.php
rename to ext/afform/core/tests/phpunit/bootstrap.php

From c4236ce91d54532b890188a94970030dda3bcf9d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 17:00:40 -0500
Subject: [PATCH 350/834] README.md - Hide sections about future/unavailable
 install methods

---
 ext/afform/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 1071275c30d6..6addf613b55c 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -24,6 +24,7 @@ if you already have a basic understanding of CiviCRM API and AngularJS.  It is l
 * PHP v5.6+
 * CiviCRM v5.7+
 
+<!--
 ## Installation (Web UI)
 
 This extension has not yet been published for installation via the web UI.
@@ -37,6 +38,7 @@ install it with the command-line tool [cv](https://github.com/civicrm/cv).
 cd <extension-dir>
 cv dl org.civicrm.afform@https://github.com/totten/afform/archive/master.zip
 ```
+-->
 
 ## Installation (CLI, Git)
 

From 6bc5e93050f9c0086019e3f3411f11aa531d0629 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 17:02:32 -0500
Subject: [PATCH 351/834] Generate skeletal `afform-gui` extension

---
 ext/afform/gui/LICENSE.txt           | 667 +++++++++++++++++++++++++++
 ext/afform/gui/README.md             |  44 ++
 ext/afform/gui/afform_gui.civix.php  | 460 ++++++++++++++++++
 ext/afform/gui/afform_gui.php        | 163 +++++++
 ext/afform/gui/images/screenshot.png | Bin 0 -> 11775 bytes
 ext/afform/gui/info.xml              |  27 ++
 6 files changed, 1361 insertions(+)
 create mode 100644 ext/afform/gui/LICENSE.txt
 create mode 100644 ext/afform/gui/README.md
 create mode 100644 ext/afform/gui/afform_gui.civix.php
 create mode 100644 ext/afform/gui/afform_gui.php
 create mode 100644 ext/afform/gui/images/screenshot.png
 create mode 100644 ext/afform/gui/info.xml

diff --git a/ext/afform/gui/LICENSE.txt b/ext/afform/gui/LICENSE.txt
new file mode 100644
index 000000000000..5d5da2f23320
--- /dev/null
+++ b/ext/afform/gui/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: org.civicrm.afform-gui
+Copyright (C) 2019, Tim Otten <totten@civicrm.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/afform/gui/README.md b/ext/afform/gui/README.md
new file mode 100644
index 000000000000..c1682405df66
--- /dev/null
+++ b/ext/afform/gui/README.md
@@ -0,0 +1,44 @@
+# org.civicrm.afform-gui
+
+![Screenshot](/images/screenshot.png)
+
+(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+
+The extension is licensed under [AGPL-3.0](LICENSE.txt).
+
+## Requirements
+
+* PHP v5.4+
+* CiviCRM (*FIXME: Version number*)
+
+## Installation (Web UI)
+
+This extension has not yet been published for installation via the web UI.
+
+## Installation (CLI, Zip)
+
+Sysadmins and developers may download the `.zip` file for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+cd <extension-dir>
+cv dl org.civicrm.afform-gui@https://github.com/FIXME/org.civicrm.afform-gui/archive/master.zip
+```
+
+## Installation (CLI, Git)
+
+Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+git clone https://github.com/FIXME/org.civicrm.afform-gui.git
+cv en afform_gui
+```
+
+## Usage
+
+(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+
+## Known Issues
+
+(* FIXME *)
diff --git a/ext/afform/gui/afform_gui.civix.php b/ext/afform/gui/afform_gui.civix.php
new file mode 100644
index 000000000000..483d910ffc90
--- /dev/null
+++ b/ext/afform/gui/afform_gui.civix.php
@@ -0,0 +1,460 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_AfformGui_ExtensionUtil {
+  const SHORT_NAME = "afform_gui";
+  const LONG_NAME = "org.civicrm.afform-gui";
+  const CLASS_PREFIX = "CRM_AfformGui";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = array()) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = array(self::LONG_NAME, NULL);
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_AfformGui_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function _afform_gui_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = array($extDir, $template->template_dir);
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function _afform_gui_civix_civicrm_xmlMenu(&$files) {
+  foreach (_afform_gui_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function _afform_gui_civix_civicrm_install() {
+  _afform_gui_civix_civicrm_config();
+  if ($upgrader = _afform_gui_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function _afform_gui_civix_civicrm_postInstall() {
+  _afform_gui_civix_civicrm_config();
+  if ($upgrader = _afform_gui_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onPostInstall'))) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function _afform_gui_civix_civicrm_uninstall() {
+  _afform_gui_civix_civicrm_config();
+  if ($upgrader = _afform_gui_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function _afform_gui_civix_civicrm_enable() {
+  _afform_gui_civix_civicrm_config();
+  if ($upgrader = _afform_gui_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onEnable'))) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @return mixed
+ */
+function _afform_gui_civix_civicrm_disable() {
+  _afform_gui_civix_civicrm_config();
+  if ($upgrader = _afform_gui_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onDisable'))) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *                for 'enqueue', returns void
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function _afform_gui_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _afform_gui_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_AfformGui_Upgrader
+ */
+function _afform_gui_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/AfformGui/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_AfformGui_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param $dir string, base dir
+ * @param $pattern string, glob pattern, eg "*.txt"
+ * @return array(string)
+ */
+function _afform_gui_civix_find_files($dir, $pattern) {
+  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = array($dir);
+  $result = array();
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_afform_gui_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry{0} == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function _afform_gui_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _afform_gui_civix_find_files(__DIR__, '*.mgd.php');
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function _afform_gui_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_afform_gui_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      CRM_Core_Error::fatal($errorMessage);
+      // throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = array(
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    );
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function _afform_gui_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _afform_gui_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ * @return array, possibly empty
+ */
+function _afform_gui_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : array();
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ */
+function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = array(
+      'attributes' => array_merge(array(
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ), $item),
+    );
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = array();
+        }
+        $found = _afform_gui_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _afform_gui_civix_navigationMenu(&$nodes) {
+  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+    _afform_gui_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _afform_gui_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _afform_gui_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _afform_gui_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _afform_gui_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function _afform_gui_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+
+function _afform_gui_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, array (
+  ));
+}
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
new file mode 100644
index 000000000000..da3a35c22148
--- /dev/null
+++ b/ext/afform/gui/afform_gui.php
@@ -0,0 +1,163 @@
+<?php
+
+require_once 'afform_gui.civix.php';
+use CRM_AfformGui_ExtensionUtil as E;
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function afform_gui_civicrm_config(&$config) {
+  _afform_gui_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function afform_gui_civicrm_xmlMenu(&$files) {
+  _afform_gui_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function afform_gui_civicrm_install() {
+  _afform_gui_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function afform_gui_civicrm_postInstall() {
+  _afform_gui_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function afform_gui_civicrm_uninstall() {
+  _afform_gui_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function afform_gui_civicrm_enable() {
+  _afform_gui_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ */
+function afform_gui_civicrm_disable() {
+  _afform_gui_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function afform_gui_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _afform_gui_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function afform_gui_civicrm_managed(&$entities) {
+  _afform_gui_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function afform_gui_civicrm_caseTypes(&$caseTypes) {
+  _afform_gui_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function afform_gui_civicrm_angularModules(&$angularModules) {
+  _afform_gui_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function afform_gui_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _afform_gui_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+function afform_gui_civicrm_entityTypes(&$entityTypes) {
+  _afform_gui_civix_civicrm_entityTypes($entityTypes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
+ *
+function afform_gui_civicrm_preProcess($formName, &$form) {
+
+} // */
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
+ *
+function afform_gui_civicrm_navigationMenu(&$menu) {
+  _afform_gui_civix_insert_navigation_menu($menu, 'Mailings', array(
+    'label' => E::ts('New subliminal message'),
+    'name' => 'mailing_subliminal_message',
+    'url' => 'civicrm/mailing/subliminal',
+    'permission' => 'access CiviMail',
+    'operator' => 'OR',
+    'separator' => 0,
+  ));
+  _afform_gui_civix_navigationMenu($menu);
+} // */
diff --git a/ext/afform/gui/images/screenshot.png b/ext/afform/gui/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6765b696fa03249ac2cd605d5f0e4aa000ad6dad
GIT binary patch
literal 11775
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
IrTdTn0|#irRsaA1

literal 0
HcmV?d00001

diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
new file mode 100644
index 000000000000..45f68277b509
--- /dev/null
+++ b/ext/afform/gui/info.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<extension key="org.civicrm.afform-gui" type="module">
+  <file>afform_gui</file>
+  <name>FIXME</name>
+  <description>FIXME</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>Tim Otten</author>
+    <email>totten@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://FIXME</url>
+    <url desc="Documentation">http://FIXME</url>
+    <url desc="Support">http://FIXME</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2019-02-08</releaseDate>
+  <version>1.0</version>
+  <develStage>alpha</develStage>
+  <compatibility>
+    <ver>5.0</ver>
+  </compatibility>
+  <comments>This is a new, undeveloped module</comments>
+  <civix>
+    <namespace>CRM/AfformGui</namespace>
+  </civix>
+</extension>

From 187941c636eabe51d17eaed9d988cae10d309a84 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 17:58:16 -0500
Subject: [PATCH 352/834] Update examplepage to follow new file naming

---
 .../examplepage/layout.html => ang/afformExamplepage.aff.html}    | 0
 .../examplepage/meta.json => ang/afformExamplepage.aff.json}      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename ext/afform/core/{afform/examplepage/layout.html => ang/afformExamplepage.aff.html} (100%)
 rename ext/afform/core/{afform/examplepage/meta.json => ang/afformExamplepage.aff.json} (100%)

diff --git a/ext/afform/core/afform/examplepage/layout.html b/ext/afform/core/ang/afformExamplepage.aff.html
similarity index 100%
rename from ext/afform/core/afform/examplepage/layout.html
rename to ext/afform/core/ang/afformExamplepage.aff.html
diff --git a/ext/afform/core/afform/examplepage/meta.json b/ext/afform/core/ang/afformExamplepage.aff.json
similarity index 100%
rename from ext/afform/core/afform/examplepage/meta.json
rename to ext/afform/core/ang/afformExamplepage.aff.json

From dcd0adb5f9b01f01798ce81d11653d591bd84fb7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 19:12:17 -0500
Subject: [PATCH 353/834] Move mock form and its test case to a separate
 extension (`afform-mock`)

---
 ext/afform/mock/LICENSE.txt                   | 667 ++++++++++++++++++
 ext/afform/mock/README.md                     |   9 +
 ext/afform/mock/afform_mock.civix.php         | 460 ++++++++++++
 ext/afform/mock/afform_mock.php               | 163 +++++
 .../ang/afformExamplepage.aff.html            |   0
 .../ang/afformExamplepage.aff.json            |   0
 ext/afform/mock/info.xml                      |  30 +
 ext/afform/mock/phpunit.xml.dist              |  18 +
 .../tests/phpunit/api/v4/AfformTest.php       |  32 +-
 ext/afform/mock/tests/phpunit/bootstrap.php   |  64 ++
 10 files changed, 1427 insertions(+), 16 deletions(-)
 create mode 100644 ext/afform/mock/LICENSE.txt
 create mode 100644 ext/afform/mock/README.md
 create mode 100644 ext/afform/mock/afform_mock.civix.php
 create mode 100644 ext/afform/mock/afform_mock.php
 rename ext/afform/{core => mock}/ang/afformExamplepage.aff.html (100%)
 rename ext/afform/{core => mock}/ang/afformExamplepage.aff.json (100%)
 create mode 100644 ext/afform/mock/info.xml
 create mode 100644 ext/afform/mock/phpunit.xml.dist
 rename ext/afform/{core => mock}/tests/phpunit/api/v4/AfformTest.php (65%)
 create mode 100644 ext/afform/mock/tests/phpunit/bootstrap.php

diff --git a/ext/afform/mock/LICENSE.txt b/ext/afform/mock/LICENSE.txt
new file mode 100644
index 000000000000..d47d1d287c46
--- /dev/null
+++ b/ext/afform/mock/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: org.civicrm.afform-mock
+Copyright (C) 2019, Tim Otten <totten@civicrm.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/afform/mock/README.md b/ext/afform/mock/README.md
new file mode 100644
index 000000000000..52363f7221fb
--- /dev/null
+++ b/ext/afform/mock/README.md
@@ -0,0 +1,9 @@
+# org.civicrm.afform-mock
+
+This is a dummy extension used for integration testing.
+
+```
+cd afform/mock
+cv en afform_mock
+phpunit5
+```
diff --git a/ext/afform/mock/afform_mock.civix.php b/ext/afform/mock/afform_mock.civix.php
new file mode 100644
index 000000000000..748493a573e5
--- /dev/null
+++ b/ext/afform/mock/afform_mock.civix.php
@@ -0,0 +1,460 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_AfformMock_ExtensionUtil {
+  const SHORT_NAME = "afform_mock";
+  const LONG_NAME = "org.civicrm.afform-mock";
+  const CLASS_PREFIX = "CRM_AfformMock";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = array()) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = array(self::LONG_NAME, NULL);
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_AfformMock_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function _afform_mock_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = array($extDir, $template->template_dir);
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function _afform_mock_civix_civicrm_xmlMenu(&$files) {
+  foreach (_afform_mock_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function _afform_mock_civix_civicrm_install() {
+  _afform_mock_civix_civicrm_config();
+  if ($upgrader = _afform_mock_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function _afform_mock_civix_civicrm_postInstall() {
+  _afform_mock_civix_civicrm_config();
+  if ($upgrader = _afform_mock_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onPostInstall'))) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function _afform_mock_civix_civicrm_uninstall() {
+  _afform_mock_civix_civicrm_config();
+  if ($upgrader = _afform_mock_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function _afform_mock_civix_civicrm_enable() {
+  _afform_mock_civix_civicrm_config();
+  if ($upgrader = _afform_mock_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onEnable'))) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @return mixed
+ */
+function _afform_mock_civix_civicrm_disable() {
+  _afform_mock_civix_civicrm_config();
+  if ($upgrader = _afform_mock_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onDisable'))) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *                for 'enqueue', returns void
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function _afform_mock_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _afform_mock_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_AfformMock_Upgrader
+ */
+function _afform_mock_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/AfformMock/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_AfformMock_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param $dir string, base dir
+ * @param $pattern string, glob pattern, eg "*.txt"
+ * @return array(string)
+ */
+function _afform_mock_civix_find_files($dir, $pattern) {
+  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = array($dir);
+  $result = array();
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_afform_mock_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry{0} == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function _afform_mock_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _afform_mock_civix_find_files(__DIR__, '*.mgd.php');
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function _afform_mock_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_afform_mock_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      CRM_Core_Error::fatal($errorMessage);
+      // throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = array(
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    );
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function _afform_mock_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _afform_mock_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ * @return array, possibly empty
+ */
+function _afform_mock_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : array();
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ */
+function _afform_mock_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = array(
+      'attributes' => array_merge(array(
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ), $item),
+    );
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = array();
+        }
+        $found = _afform_mock_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _afform_mock_civix_navigationMenu(&$nodes) {
+  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+    _afform_mock_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _afform_mock_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _afform_mock_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _afform_mock_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _afform_mock_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function _afform_mock_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+
+function _afform_mock_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, array (
+  ));
+}
diff --git a/ext/afform/mock/afform_mock.php b/ext/afform/mock/afform_mock.php
new file mode 100644
index 000000000000..ce1a165d1bf2
--- /dev/null
+++ b/ext/afform/mock/afform_mock.php
@@ -0,0 +1,163 @@
+<?php
+
+require_once 'afform_mock.civix.php';
+use CRM_AfformMock_ExtensionUtil as E;
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function afform_mock_civicrm_config(&$config) {
+  _afform_mock_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function afform_mock_civicrm_xmlMenu(&$files) {
+  _afform_mock_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function afform_mock_civicrm_install() {
+  _afform_mock_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function afform_mock_civicrm_postInstall() {
+  _afform_mock_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function afform_mock_civicrm_uninstall() {
+  _afform_mock_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function afform_mock_civicrm_enable() {
+  _afform_mock_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ */
+function afform_mock_civicrm_disable() {
+  _afform_mock_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function afform_mock_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _afform_mock_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function afform_mock_civicrm_managed(&$entities) {
+  _afform_mock_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function afform_mock_civicrm_caseTypes(&$caseTypes) {
+  _afform_mock_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function afform_mock_civicrm_angularModules(&$angularModules) {
+  _afform_mock_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function afform_mock_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _afform_mock_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+function afform_mock_civicrm_entityTypes(&$entityTypes) {
+  _afform_mock_civix_civicrm_entityTypes($entityTypes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
+ *
+function afform_mock_civicrm_preProcess($formName, &$form) {
+
+} // */
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
+ *
+function afform_mock_civicrm_navigationMenu(&$menu) {
+  _afform_mock_civix_insert_navigation_menu($menu, 'Mailings', array(
+    'label' => E::ts('New subliminal message'),
+    'name' => 'mailing_subliminal_message',
+    'url' => 'civicrm/mailing/subliminal',
+    'permission' => 'access CiviMail',
+    'operator' => 'OR',
+    'separator' => 0,
+  ));
+  _afform_mock_civix_navigationMenu($menu);
+} // */
diff --git a/ext/afform/core/ang/afformExamplepage.aff.html b/ext/afform/mock/ang/afformExamplepage.aff.html
similarity index 100%
rename from ext/afform/core/ang/afformExamplepage.aff.html
rename to ext/afform/mock/ang/afformExamplepage.aff.html
diff --git a/ext/afform/core/ang/afformExamplepage.aff.json b/ext/afform/mock/ang/afformExamplepage.aff.json
similarity index 100%
rename from ext/afform/core/ang/afformExamplepage.aff.json
rename to ext/afform/mock/ang/afformExamplepage.aff.json
diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
new file mode 100644
index 000000000000..c2f0b08e2bc7
--- /dev/null
+++ b/ext/afform/mock/info.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<extension key="org.civicrm.afform-mock" type="module">
+  <file>afform_mock</file>
+  <name>Afform Mocks</name>
+  <description>Mock extension used for testing the framework</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>Tim Otten</author>
+    <email>totten@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://FIXME</url>
+    <url desc="Documentation">http://FIXME</url>
+    <url desc="Support">http://FIXME</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2019-02-08</releaseDate>
+  <version>1.0</version>
+  <develStage>alpha</develStage>
+  <compatibility>
+    <ver>5.3</ver>
+  </compatibility>
+  <requires>
+    <ext>org.civicrm.afform</ext>
+  </requires>
+  <comments>This is a new, undeveloped module</comments>
+  <civix>
+    <namespace>CRM/AfformMock</namespace>
+  </civix>
+</extension>
diff --git a/ext/afform/mock/phpunit.xml.dist b/ext/afform/mock/phpunit.xml.dist
new file mode 100644
index 000000000000..0f9f25d307a9
--- /dev/null
+++ b/ext/afform/mock/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="false" bootstrap="tests/phpunit/bootstrap.php">
+  <testsuites>
+    <testsuite name="My Test Suite">
+      <directory>./tests/phpunit</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./</directory>
+    </whitelist>
+  </filter>
+  <listeners>
+    <listener class="Civi\Test\CiviTestListener">
+      <arguments/>
+    </listener>
+  </listeners>
+</phpunit>
diff --git a/ext/afform/core/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
similarity index 65%
rename from ext/afform/core/tests/phpunit/api/v4/AfformTest.php
rename to ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 1a0f01994cce..fed12e8c5a1e 100644
--- a/ext/afform/core/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -16,8 +16,7 @@ class api_v4_AfformTest extends \PHPUnit_Framework_TestCase implements HeadlessI
    */
   public function setUpHeadless() {
     return \Civi\Test::headless()
-      ->installMe(__DIR__)
-      ->install(['org.civicrm.api4'])
+      ->install(['org.civicrm.api4', 'org.civicrm.afform', 'org.civicrm.afform-mock'])
       ->apply();
   }
 
@@ -42,37 +41,38 @@ public function tearDown() {
    * This takes the bundled `examplepage` and performs some API calls on it.
    */
   public function testGetUpdateRevert() {
-    Civi\Api4\Afform::revert()->addWhere('name', '=', 'examplepage')->execute();
+    Civi\Api4\Afform::revert()->addWhere('name', '=', 'afformExamplepage')->execute();
 
     $message = 'The initial Afform.get should return default data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'examplepage')->execute();
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'afformExamplepage')->execute();
     $result->indexBy('name');
-    $this->assertEquals('examplepage', $result['examplepage']['name'], $message);
-    $this->assertEquals('', $result['examplepage']['title'], $message);
-    $this->assertEquals('', $result['examplepage']['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result['examplepage']['server_route'], $message);
-    $this->assertTrue(is_array($result['examplepage']['layout']), $message);
+    $b = (array) $result;
+    $this->assertEquals('afformExamplepage', $result['afformExamplepage']['name'], $message);
+    $this->assertEquals('', $result['afformExamplepage']['title'], $message);
+    $this->assertEquals('', $result['afformExamplepage']['description'], $message);
+    $this->assertEquals('civicrm/example-page', $result['afformExamplepage']['server_route'], $message);
+    $this->assertTrue(is_array($result['afformExamplepage']['layout']), $message);
 
     $message = 'After updating with Afform.create, the revised data should be returned';
     $result = Civi\Api4\Afform::update()
-      ->addWhere('name', '=', 'examplepage')
+      ->addWhere('name', '=', 'afformExamplepage')
       ->addValue('description', 'The temporary description')
       ->execute();
-    $this->assertEquals('examplepage', $result[0]['name'], $message);
+    $this->assertEquals('afformExamplepage', $result[0]['name'], $message);
     $this->assertEquals('The temporary description', $result[0]['description'], $message);
 
     $message = 'After updating, the Afform.get API should return blended data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'examplepage')->execute();
-    $this->assertEquals('examplepage', $result[0]['name'], $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'afformExamplepage')->execute();
+    $this->assertEquals('afformExamplepage', $result[0]['name'], $message);
     $this->assertEquals('', $result[0]['title'], $message);
     $this->assertEquals('The temporary description', $result[0]['description'], $message);
     $this->assertEquals('civicrm/example-page', $result[0]['server_route'], $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
 
-    Civi\Api4\Afform::revert()->addWhere('name', '=', 'examplepage')->execute();
+    Civi\Api4\Afform::revert()->addWhere('name', '=', 'afformExamplepage')->execute();
     $message = 'After reverting, te final Afform.get should return default data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'examplepage')->execute();
-    $this->assertEquals('examplepage', $result[0]['name'], $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'afformExamplepage')->execute();
+    $this->assertEquals('afformExamplepage', $result[0]['name'], $message);
     $this->assertEquals('', $result[0]['title'], $message);
     $this->assertEquals('', $result[0]['description'], $message);
     $this->assertEquals('civicrm/example-page', $result[0]['server_route'], $message);
diff --git a/ext/afform/mock/tests/phpunit/bootstrap.php b/ext/afform/mock/tests/phpunit/bootstrap.php
new file mode 100644
index 000000000000..65dcdaadabf9
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/bootstrap.php
@@ -0,0 +1,64 @@
+<?php
+
+ini_set('memory_limit', '2G');
+ini_set('safe_mode', 0);
+eval(cv('php:boot --level=classloader', 'phpcode'));
+
+// Allow autoloading of PHPUnit helper classes in this extension.
+foreach ([__DIR__] as $dir) {
+  $loader = new \Composer\Autoload\ClassLoader();
+  $loader->add('CRM_', $dir);
+  $loader->add('Civi\\', $dir);
+  $loader->add('api_', $dir);
+  $loader->add('api\\', $dir);
+  $loader->register();
+}
+
+/**
+ * Call the "cv" command.
+ *
+ * @param string $cmd
+ *   The rest of the command to send.
+ * @param string $decode
+ *   Ex: 'json' or 'phpcode'.
+ * @return string
+ *   Response output (if the command executed normally).
+ * @throws \RuntimeException
+ *   If the command terminates abnormally.
+ */
+function cv($cmd, $decode = 'json') {
+  $cmd = 'cv ' . $cmd;
+  $descriptorSpec = array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => STDERR);
+  $oldOutput = getenv('CV_OUTPUT');
+  putenv("CV_OUTPUT=json");
+
+  // Execute `cv` in the original folder. This is a work-around for
+  // phpunit/codeception, which seem to manipulate PWD.
+  $cmd = sprintf('cd %s; %s', escapeshellarg(getenv('PWD')), $cmd);
+
+  $process = proc_open($cmd, $descriptorSpec, $pipes, __DIR__);
+  putenv("CV_OUTPUT=$oldOutput");
+  fclose($pipes[0]);
+  $result = stream_get_contents($pipes[1]);
+  fclose($pipes[1]);
+  if (proc_close($process) !== 0) {
+    throw new RuntimeException("Command failed ($cmd):\n$result");
+  }
+  switch ($decode) {
+    case 'raw':
+      return $result;
+
+    case 'phpcode':
+      // If the last output is /*PHPCODE*/, then we managed to complete execution.
+      if (substr(trim($result), 0, 12) !== "/*BEGINPHP*/" || substr(trim($result), -10) !== "/*ENDPHP*/") {
+        throw new \RuntimeException("Command failed ($cmd):\n$result");
+      }
+      return $result;
+
+    case 'json':
+      return json_decode($result, 1);
+
+    default:
+      throw new RuntimeException("Bad decoder format ($decode)");
+  }
+}

From 87dde5ebb96416f98f1f76a82231be0eee8d696b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 19:56:03 -0500
Subject: [PATCH 354/834] AfformScanner - Use `ang/*.aff.json` file-naming
 convention

__Before__: Scan each `$extension` for `$extension/afform/*/meta.json`

__After__: Scan each `$extension` for `$extension/ang/*.aff.json`

__Comments__: This is a significant breaking change for v0.2.

It preserves some key design-goals from the old naming convention

* The symbol in HTML (e.g.  `afform-email`) should have symmetry with the file-name (e.g.  `afform/Email/*` or `afform-email.*`)
* The file-name in the base-code provided by an extension should match the file-name in the local override folder.

However, the new naming convention also:

* Makes it easier downstream to choose their own prefixes. We're not boxed-in or hard-coded to `afform-`.
  This will be useful, e.g., with distinguishing the stdlib from the business-forms that use the stdlib.
* Puts Afform-Angular content in the same folder structure as Regular-Angular content.
---
 ext/afform/core/CRM/Afform/AfformScanner.php  | 44 ++++++++--------
 .../core/Civi/Api4/Action/Afform/Revert.php   |  2 +-
 .../core/Civi/Api4/Traits/AfformCrudTrait.php |  8 +--
 ext/afform/core/afform.php                    | 21 ++++----
 .../tests/phpunit/CRM/Afform/UtilTest.php     | 52 +++++++++++++++++++
 5 files changed, 90 insertions(+), 37 deletions(-)
 create mode 100644 ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index fb03cffbc4a1..6c64f988e050 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -10,7 +10,7 @@
  */
 class CRM_Afform_AfformScanner {
 
-  const METADATA_FILE = 'meta.json';
+  const METADATA_FILE = 'aff.json';
 
   const DEFAULT_REQUIRES = 'afformCore';
 
@@ -28,6 +28,7 @@ public function __construct() {
       'group' => md5('afform_' . CRM_Core_Config_Runtime::getId() . $this->getSiteLocalPath()),
       'prefetch' => FALSE,
     ]);
+    // $this->cache = new CRM_Utils_Cache_Arraycache([]);
   }
 
   /**
@@ -51,7 +52,7 @@ public function findFilePaths() {
     foreach ($mapper->getModules() as $module) {
       /** @var $module CRM_Core_Module */
       if ($module->is_active) {
-        $this->appendFilePaths($paths, dirname($mapper->keyToPath($module->name)) . DIRECTORY_SEPARATOR . 'afform', 20);
+        $this->appendFilePaths($paths, dirname($mapper->keyToPath($module->name)) . DIRECTORY_SEPARATOR . 'ang', 20);
       }
     }
 
@@ -66,18 +67,18 @@ public function findFilePaths() {
    *
    * @param string $formName
    *   Ex: 'view-individual'
-   * @param string $subFile
-   *   Ex: 'meta.json'
+   * @param string $suffix
+   *   Ex: 'aff.json'
    * @return string|NULL
-   *   Ex: '/var/www/sites/default/files/civicrm/afform/view-individual'
+   *   Ex: '/var/www/sites/default/files/civicrm/afform/view-individual.aff.json'
    */
-  public function findFilePath($formName, $subFile) {
+  public function findFilePath($formName, $suffix) {
     $paths = $this->findFilePaths();
 
     if (isset($paths[$formName])) {
       foreach ($paths[$formName] as $path) {
-        if (file_exists($path . DIRECTORY_SEPARATOR . $subFile)) {
-          return $path . DIRECTORY_SEPARATOR . $subFile;
+        if (file_exists($path . '.' . $suffix)) {
+          return $path . '.' . $suffix;
         }
       }
     }
@@ -92,12 +93,12 @@ public function findFilePath($formName, $subFile) {
    * @param string $formName
    *   Ex: 'view-individual'
    * @param string $file
-   *   Ex: 'meta.json'
+   *   Ex: 'aff.json'
    * @return string|NULL
-   *   Ex: '/var/www/sites/default/files/civicrm/afform/view-individual'
+   *   Ex: '/var/www/sites/default/files/civicrm/afform/view-individual.aff.json'
    */
   public function createSiteLocalPath($formName, $file) {
-    return $this->getSiteLocalPath() . DIRECTORY_SEPARATOR . $formName . DIRECTORY_SEPARATOR . $file;
+    return $this->getSiteLocalPath() . DIRECTORY_SEPARATOR . $formName . '.' . $file;
   }
 
   public function clear() {
@@ -111,7 +112,7 @@ public function clear() {
    *   Ex: 'view-individual'
    * @return array
    *   An array with some mix of the following keys: name, title, description, client_route, server_route, requires.
-   *   NOTE: This is only data available in meta.json. It does *NOT* include layout.
+   *   NOTE: This is only data available in *.aff.json. It does *NOT* include layout.
    *   Ex: [
    *     'name' => 'view-individual',
    *     'title' => 'View an individual contact',
@@ -142,7 +143,7 @@ public function getMeta($name) {
    *
    * @return array
    *   A list of all forms, keyed by form name.
-   *   NOTE: This is only data available in meta.json. It does *NOT* include layout.
+   *   NOTE: This is only data available in *.aff.json. It does *NOT* include layout.
    *   Ex: ['view-individual' => ['title' => 'View an individual contact', ...]]
    */
   public function getMetas() {
@@ -156,21 +157,18 @@ public function getMetas() {
   /**
    * @param array $formPaths
    *   List of all form paths.
-   *   Ex: ['foo' => [0 => '/var/www/org.example.foobar/afform//foo']]
+   *   Ex: ['foo' => [0 => '/var/www/org.example.foobar/ang']]
    * @param string $parent
    *   Ex: '/var/www/org.example.foobar/afform/'
    * @param int $priority
    *   Lower priority files override higher priority files.
    */
   private function appendFilePaths(&$formPaths, $parent, $priority) {
-    $parent = CRM_Utils_File::addTrailingSlash($parent);
-    if (is_dir($parent) && $handle = opendir($parent)) {
-      while (FALSE !== ($entry = readdir($handle))) {
-        if ($entry{0} !== '.' && is_dir($parent . $entry)) {
-          $formPaths[$entry][$priority] = $parent . $entry;
-          ksort($formPaths[$entry]);
-        }
-      }
+    $files = (array) glob("$parent/*." . self::METADATA_FILE);
+    foreach ($files as $file) {
+      $name = _afform_angular_module_name(preg_replace('/\.aff\.json$/', '', basename($file)));
+      $formPaths[$name][$priority] = preg_replace('/\.aff\.json$/', '', $file);
+      ksort($formPaths[$name]);
     }
   }
 
@@ -183,7 +181,7 @@ private function appendFilePaths(&$formPaths, $parent, $priority) {
   private function getSiteLocalPath() {
     // TODO Allow a setting override.
     // return Civi::paths()->getPath(Civi::settings()->get('afformPath'));
-    return Civi::paths()->getPath('[civicrm.files]/afform');
+    return Civi::paths()->getPath('[civicrm.files]/ang');
   }
 
 }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
index 206d5addd68d..895890adfec3 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
@@ -13,7 +13,7 @@ public function _run(Result $result) {
 
     parent::_run($result);
 
-    $files = [\CRM_Afform_AfformScanner::METADATA_FILE, 'layout.html'];
+    $files = [\CRM_Afform_AfformScanner::METADATA_FILE, 'aff.html'];
 
     foreach ($result as $afform) {
       foreach ($files as $file) {
diff --git a/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php b/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
index 668b90fbd299..6360c9f05d70 100644
--- a/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
+++ b/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
@@ -23,7 +23,7 @@ public function getObjects() {
     $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
-      $layout = $scanner->findFilePath($name, 'layout.html');
+      $layout = $scanner->findFilePath($name, 'aff.html');
       if ($layout) {
         // FIXME check for file existence+substance+validity
         $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
@@ -56,15 +56,15 @@ protected function writeObject($record) {
     // FIXME validate all field data.
     $updates = _afform_fields_filter($record);
 
-    // Create or update layout.html.
+    // Create or update aff.html.
     if (isset($updates['layout'])) {
-      $layoutPath = $scanner->createSiteLocalPath($name, 'layout.html');
+      $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
       \ CRM_Utils_File::createDir(dirname($layoutPath));
       file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
       // FIXME check for writability then success. Report errors.
     }
 
-    // Create or update meta.json.
+    // Create or update *.aff.json.
     $orig = \Civi\Api4\Afform::get()
       ->setCheckPermissions($this->getCheckPermissions())
       ->addWhere('name', '=', $name)
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index ad8630867f78..09700d2fef0b 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -156,7 +156,7 @@ function afform_civicrm_angularModules(&$angularModules) {
   $names = array_keys($scanner->findFilePaths());
   foreach ($names as $name) {
     $meta = $scanner->getMeta($name);
-    $angularModules[_afform_angular_module_name($name)] = [
+    $angularModules[_afform_angular_module_name($name, 'camel')] = [
       'ext' => E::LONG_NAME,
       'js' => ['assetBuilder://afform.js?name=' . urlencode($name)],
       'requires' => $meta['requires'],
@@ -213,10 +213,10 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
 
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
-    'camel' => _afform_angular_module_name($name),
+    'camel' => _afform_angular_module_name($name, 'camel'),
     'meta' => $meta,
     'metaJson' => json_encode($meta),
-    'layout' => file_get_contents($scanner->findFilePath($name, 'layout.html'))
+    'layout' => file_get_contents($scanner->findFilePath($name, 'aff.html'))
   ]);
   $mimeType = 'text/javascript';
   $content = $smarty->fetch('afform/AfformAngularModule.tpl');
@@ -247,21 +247,24 @@ function afform_civicrm_alterMenu(&$items) {
 }
 
 /**
- * @param string $name
- *   Ex: fooBar
+ * @param string $fileBaseName
+ *   Ex: foo-bar
  * @param string $format
  *   'camel' or 'dash'.
  * @return string
  *   Ex: 'FooBar' or 'foo-bar'.
  */
-function _afform_angular_module_name($name, $format = 'camel') {
+function _afform_angular_module_name($fileBaseName, $format = 'camel') {
   switch ($format) {
     case 'camel':
-      return 'afform' . strtoupper($name{0}) . substr($name, 1);
+      $camelCase = '';
+      foreach (explode('-', $fileBaseName) as $shortNamePart) {
+        $camelCase .= ucfirst($shortNamePart);
+      }
+      return strtolower($camelCase{0}) . substr($camelCase, 1);
 
     case 'dash':
-      $camel = _afform_angular_module_name($name, 'camel');
-      return strtolower(implode('-', array_filter(preg_split('/(?=[A-Z])/', $camel))));
+      return strtolower(implode('-', array_filter(preg_split('/(?=[A-Z])/', $fileBaseName))));
 
     default:
       throw new \Exception("Unrecognized format");
diff --git a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
new file mode 100644
index 000000000000..32263e1ac2db
--- /dev/null
+++ b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
@@ -0,0 +1,52 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * @group headless
+ */
+class CRM_Afform_UtilTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()
+      ->installMe(__DIR__)
+      ->install(['org.civicrm.api4'])
+      ->apply();
+  }
+
+  public function getNameExamples() {
+    $exs = [];
+    $exs[] = ['ab-cd-ef', 'camel', 'abCdEf'];
+    $exs[] = ['abCd', 'camel', 'abCd'];
+    $exs[] = ['AbCd', 'camel', 'abCd'];
+    $exs[] = ['ab-cd', 'dash', 'ab-cd'];
+    $exs[] = ['abCd', 'dash', 'ab-cd'];
+    $exs[] = ['AbCd', 'dash', 'ab-cd'];
+
+    $exs[] = ['ab-cd-ef23', 'camel', 'abCdEf23'];
+    $exs[] = ['abCd23', 'camel', 'abCd23'];
+    $exs[] = ['AbCd23', 'camel', 'abCd23'];
+    $exs[] = ['ab-cd23', 'dash', 'ab-cd23'];
+    $exs[] = ['abCd23', 'dash', 'ab-cd23'];
+    $exs[] = ['AbCd23', 'dash', 'ab-cd23'];
+
+    return $exs;
+  }
+
+  /**
+   * @param $inputFileName
+   * @param $toFormat
+   * @param $expected
+   * @dataProvider getNameExamples
+   */
+  public function testNameConversion($inputFileName, $toFormat, $expected) {
+    $actual = _afform_angular_module_name($inputFileName, $toFormat);
+    $this->assertEquals($expected, $actual);
+  }
+
+}

From 38124ab93811838bd2f45bf990dcc6e00f34ad88 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 20:18:40 -0500
Subject: [PATCH 355/834] mock - Define two directives, one which references
 the other

---
 ext/afform/mock/ang/afformExamplepage.aff.html | 3 ++-
 ext/afform/mock/ang/afformExamplepage.aff.json | 2 +-
 ext/afform/mock/ang/fakelibFoo.aff.html        | 1 +
 ext/afform/mock/ang/fakelibFoo.aff.json        | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/mock/ang/fakelibFoo.aff.html
 create mode 100644 ext/afform/mock/ang/fakelibFoo.aff.json

diff --git a/ext/afform/mock/ang/afformExamplepage.aff.html b/ext/afform/mock/ang/afformExamplepage.aff.html
index 0f1db46e7897..f5272396877e 100644
--- a/ext/afform/mock/ang/afformExamplepage.aff.html
+++ b/ext/afform/mock/ang/afformExamplepage.aff.html
@@ -1 +1,2 @@
-<div>Hello {{routeParams.name}}</div>
+<div>Hello {{routeParams.name}}.</div>
+<div>The foo says "<span fakelib-foo/>".</div>
diff --git a/ext/afform/mock/ang/afformExamplepage.aff.json b/ext/afform/mock/ang/afformExamplepage.aff.json
index fbdd9d36ba07..355d29cf6220 100644
--- a/ext/afform/mock/ang/afformExamplepage.aff.json
+++ b/ext/afform/mock/ang/afformExamplepage.aff.json
@@ -1 +1 @@
-{"server_route": "civicrm/example-page"}
+{"server_route": "civicrm/example-page", "requires":["fakelibFoo"]}
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.html b/ext/afform/mock/ang/fakelibFoo.aff.html
new file mode 100644
index 000000000000..996cbd8d81fa
--- /dev/null
+++ b/ext/afform/mock/ang/fakelibFoo.aff.html
@@ -0,0 +1 @@
+the foo bar stuff
\ No newline at end of file
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.json b/ext/afform/mock/ang/fakelibFoo.aff.json
new file mode 100644
index 000000000000..9e26dfeeb6e6
--- /dev/null
+++ b/ext/afform/mock/ang/fakelibFoo.aff.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 0991d162ca4519b1d7f7d0b0a46da45ae5fdcdbf Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 8 Feb 2019 21:33:33 -0500
Subject: [PATCH 356/834] Skelital gui angular page

---
 ext/afform/gui/CRM/AfformGui/Page/Gui.php     | 18 +++++++++++++++
 ext/afform/gui/afform_gui.civix.php           |  2 +-
 ext/afform/gui/ang/afformGui.ang.php          | 14 ++++++++++++
 ext/afform/gui/ang/afformGui.css              |  1 +
 ext/afform/gui/ang/afformGui.js               |  4 ++++
 .../gui/ang/afformGui/afformBuilder.html      |  4 ++++
 ext/afform/gui/ang/afformGui/afformBuilder.js | 22 +++++++++++++++++++
 ext/afform/gui/info.xml                       |  6 ++++-
 .../gui/templates/CRM/AfformGui/Page/Gui.tpl  |  0
 .../templates/CRM/AfformGui/afformBuilder.hlp |  1 +
 ext/afform/gui/xml/Menu/afform_gui.xml        |  9 ++++++++
 11 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/gui/CRM/AfformGui/Page/Gui.php
 create mode 100644 ext/afform/gui/ang/afformGui.ang.php
 create mode 100644 ext/afform/gui/ang/afformGui.css
 create mode 100644 ext/afform/gui/ang/afformGui.js
 create mode 100644 ext/afform/gui/ang/afformGui/afformBuilder.html
 create mode 100644 ext/afform/gui/ang/afformGui/afformBuilder.js
 create mode 100644 ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl
 create mode 100644 ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp
 create mode 100644 ext/afform/gui/xml/Menu/afform_gui.xml

diff --git a/ext/afform/gui/CRM/AfformGui/Page/Gui.php b/ext/afform/gui/CRM/AfformGui/Page/Gui.php
new file mode 100644
index 000000000000..545aaf73de9a
--- /dev/null
+++ b/ext/afform/gui/CRM/AfformGui/Page/Gui.php
@@ -0,0 +1,18 @@
+<?php
+use CRM_AfformGui_ExtensionUtil as E;
+
+class CRM_AfformGui_Page_Gui extends CRM_Core_Page {
+
+  public function run() {
+    $loader = new \Civi\Angular\AngularLoader();
+    $loader->setModules(['afformGui']);
+    $loader->setPageName('civicrm/admin/afform');
+    $loader->useApp([
+      'defaultRoute' => '/build',
+    ]);
+    $loader->load();
+    CRM_Utils_System::setTitle('CiviCRM');
+    parent::run();
+  }
+
+}
diff --git a/ext/afform/gui/afform_gui.civix.php b/ext/afform/gui/afform_gui.civix.php
index 483d910ffc90..0188d1cb9750 100644
--- a/ext/afform/gui/afform_gui.civix.php
+++ b/ext/afform/gui/afform_gui.civix.php
@@ -269,10 +269,10 @@ function _afform_gui_civix_civicrm_managed(&$entities) {
       if (empty($e['module'])) {
         $e['module'] = E::LONG_NAME;
       }
+      $entities[] = $e;
       if (empty($e['params']['version'])) {
         $e['params']['version'] = '3';
       }
-      $entities[] = $e;
     }
   }
 }
diff --git a/ext/afform/gui/ang/afformGui.ang.php b/ext/afform/gui/ang/afformGui.ang.php
new file mode 100644
index 000000000000..a01ab9f769a2
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui.ang.php
@@ -0,0 +1,14 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+
+return [
+  'js' => [
+    'ang/afformGui.js',
+    'ang/afformGui/*.js',
+    'ang/afformGui/*/*.js',
+  ],
+  'css' => ['ang/afformGui.css'],
+  'partials' => ['ang/afformGui'],
+  'settings' => [],
+  'requires' => ['crmUi', 'crmUtil', 'ngRoute', 'ui.sortable', 'api4'],
+];
diff --git a/ext/afform/gui/ang/afformGui.css b/ext/afform/gui/ang/afformGui.css
new file mode 100644
index 000000000000..9e2005c62793
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui.css
@@ -0,0 +1 @@
+/* Add any CSS rules for Angular module "afformGui" */
diff --git a/ext/afform/gui/ang/afformGui.js b/ext/afform/gui/ang/afformGui.js
new file mode 100644
index 000000000000..24706af40382
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('afformGui', CRM.angRequires('afformGui'));
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afformGui/afformBuilder.html b/ext/afform/gui/ang/afformGui/afformBuilder.html
new file mode 100644
index 000000000000..27e9ba42a8ba
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui/afformBuilder.html
@@ -0,0 +1,4 @@
+<div class="crm-container">
+  Hello!
+
+</div>
diff --git a/ext/afform/gui/ang/afformGui/afformBuilder.js b/ext/afform/gui/ang/afformGui/afformBuilder.js
new file mode 100644
index 000000000000..cd440558ea46
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui/afformBuilder.js
@@ -0,0 +1,22 @@
+(function(angular, $, _) {
+
+  angular.module('afformGui').config(function($routeProvider) {
+    $routeProvider.when('/build', {
+      controller: 'afformBuilder',
+      templateUrl: '~/afformGui/afformBuilder.html'
+    });
+  });
+
+  // The controller uses *injection*. This default injects a few things:
+  //   $scope -- This is the set of variables shared between JS and HTML.
+  //   crmApi, crmStatus, crmUiHelp -- These are services provided by civicrm-core.
+  //   myContact -- The current contact, defined above in config().
+  angular.module('afformGui').controller('afformBuilder', function($scope, crmApi4, crmStatus, crmUiHelp) {
+    // The ts() and hs() functions help load strings for this module.
+    var ts = $scope.ts = CRM.ts('afformGui');
+    var hs = $scope.hs = crmUiHelp({file: 'CRM/AfformGui/afformBuilder'});
+
+
+  });
+
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
index 45f68277b509..964c52202871 100644
--- a/ext/afform/gui/info.xml
+++ b/ext/afform/gui/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.afform-gui" type="module">
   <file>afform_gui</file>
-  <name>FIXME</name>
+  <name>Civi Form Builder</name>
   <description>FIXME</description>
   <license>AGPL-3.0</license>
   <maintainer>
@@ -21,6 +21,10 @@
     <ver>5.0</ver>
   </compatibility>
   <comments>This is a new, undeveloped module</comments>
+  <requires>
+    <ext>org.civicrm.afform</ext>
+    <ext>org.civicrm.api4</ext>
+  </requires>
   <civix>
     <namespace>CRM/AfformGui</namespace>
   </civix>
diff --git a/ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl b/ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp b/ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp
new file mode 100644
index 000000000000..55a904ca6d2e
--- /dev/null
+++ b/ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp
@@ -0,0 +1 @@
+{* help for Angular afformGui *}
diff --git a/ext/afform/gui/xml/Menu/afform_gui.xml b/ext/afform/gui/xml/Menu/afform_gui.xml
new file mode 100644
index 000000000000..b13ee535699d
--- /dev/null
+++ b/ext/afform/gui/xml/Menu/afform_gui.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<menu>
+  <item>
+    <path>civicrm/admin/afform</path>
+    <page_callback>CRM_AfformGui_Page_Gui</page_callback>
+    <title>Gui</title>
+    <access_arguments>access CiviCRM</access_arguments>
+  </item>
+</menu>

From a87c70cea7cc9ab96e79c1fe010e53a93713265d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 21:43:46 -0500
Subject: [PATCH 357/834] AfformScanner - Allow loading bare forms

__Before__: To create an afform, you *must* create both the HTML and JSON file.

__After__: To create an afform, you *must* create the HTML file. You *may* create JSON file.

__Comments__: This enhances developer usability.
---
 ext/afform/core/CRM/Afform/AfformScanner.php  | 38 +++++++++---
 .../core/Civi/Api4/Action/Afform/Revert.php   |  2 +-
 .../mock/ang/afformExamplepage.aff.html       |  1 +
 .../mock/ang/afformExamplepage.aff.json       |  2 +-
 ext/afform/mock/ang/fakelibBareFile.aff.html  |  1 +
 ext/afform/mock/ang/fakelibFoo.aff.html       |  2 +-
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 59 +++++++++++--------
 7 files changed, 70 insertions(+), 35 deletions(-)
 create mode 100644 ext/afform/mock/ang/fakelibBareFile.aff.html

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 6c64f988e050..82a6d40a9193 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -12,6 +12,10 @@ class CRM_Afform_AfformScanner {
 
   const METADATA_FILE = 'aff.json';
 
+  const LAYOUT_FILE = 'aff.html';
+
+  const FILE_REGEXP = '/\.aff\.(json|html)$/';
+
   const DEFAULT_REQUIRES = 'afformCore';
 
   /**
@@ -122,10 +126,6 @@ public function clear() {
    */
   public function getMeta($name) {
     // FIXME error checking
-    $metaFile = $this->findFilePath($name, self::METADATA_FILE);
-    if (!$metaFile) {
-      return NULL;
-    }
 
     $defaults = [
       'name' => $name,
@@ -135,7 +135,16 @@ public function getMeta($name) {
       'is_public' => FALSE,
     ];
 
-    return array_merge($defaults, json_decode(file_get_contents($metaFile), 1));
+    $metaFile = $this->findFilePath($name, self::METADATA_FILE);
+    if ($metaFile !== NULL) {
+      return array_merge($defaults, json_decode(file_get_contents($metaFile), 1));
+    }
+    elseif ($this->findFilePath($name, self::LAYOUT_FILE)) {
+      return $defaults;
+    }
+    else {
+      return NULL;
+    }
   }
 
   /**
@@ -164,10 +173,12 @@ public function getMetas() {
    *   Lower priority files override higher priority files.
    */
   private function appendFilePaths(&$formPaths, $parent, $priority) {
-    $files = (array) glob("$parent/*." . self::METADATA_FILE);
+    $files = preg_grep(self::FILE_REGEXP, (array) glob("$parent/*"));
+
     foreach ($files as $file) {
-      $name = _afform_angular_module_name(preg_replace('/\.aff\.json$/', '', basename($file)));
-      $formPaths[$name][$priority] = preg_replace('/\.aff\.json$/', '', $file);
+      $fileBase = preg_replace(self::FILE_REGEXP, '', $file);
+      $name = _afform_angular_module_name(basename($fileBase));
+      $formPaths[$name][$priority] = $fileBase;
       ksort($formPaths[$name]);
     }
   }
@@ -184,4 +195,15 @@ private function getSiteLocalPath() {
     return Civi::paths()->getPath('[civicrm.files]/ang');
   }
 
+  /**
+   * @return string
+   */
+  private function getMarkerRegexp() {
+    static $v;
+    if ($v === NULL) {
+      $v = '/\.(' . preg_quote(self::LAYOUT_FILE, '/') . '|' . preg_quote(self::METADATA_FILE, '/') . ')$/';
+    }
+    return $v;
+  }
+
 }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
index 895890adfec3..f194e6f17538 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
@@ -13,7 +13,7 @@ public function _run(Result $result) {
 
     parent::_run($result);
 
-    $files = [\CRM_Afform_AfformScanner::METADATA_FILE, 'aff.html'];
+    $files = [\CRM_Afform_AfformScanner::METADATA_FILE, \CRM_Afform_AfformScanner::LAYOUT_FILE];
 
     foreach ($result as $afform) {
       foreach ($files as $file) {
diff --git a/ext/afform/mock/ang/afformExamplepage.aff.html b/ext/afform/mock/ang/afformExamplepage.aff.html
index f5272396877e..7e18ff54409e 100644
--- a/ext/afform/mock/ang/afformExamplepage.aff.html
+++ b/ext/afform/mock/ang/afformExamplepage.aff.html
@@ -1,2 +1,3 @@
 <div>Hello {{routeParams.name}}.</div>
 <div>The foo says "<span fakelib-foo/>".</div>
+<div>The bare file says "<span fakelib-bare-file/>"</div>
\ No newline at end of file
diff --git a/ext/afform/mock/ang/afformExamplepage.aff.json b/ext/afform/mock/ang/afformExamplepage.aff.json
index 355d29cf6220..5aad8afd2c1d 100644
--- a/ext/afform/mock/ang/afformExamplepage.aff.json
+++ b/ext/afform/mock/ang/afformExamplepage.aff.json
@@ -1 +1 @@
-{"server_route": "civicrm/example-page", "requires":["fakelibFoo"]}
+{"server_route": "civicrm/example-page", "requires":["fakelibFoo", "fakelibBareFile"]}
diff --git a/ext/afform/mock/ang/fakelibBareFile.aff.html b/ext/afform/mock/ang/fakelibBareFile.aff.html
new file mode 100644
index 000000000000..15827e4aeaf2
--- /dev/null
+++ b/ext/afform/mock/ang/fakelibBareFile.aff.html
@@ -0,0 +1 @@
+<em>This is just an HTML file without any metadata.</em>
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.html b/ext/afform/mock/ang/fakelibFoo.aff.html
index 996cbd8d81fa..b32d06d7f847 100644
--- a/ext/afform/mock/ang/fakelibFoo.aff.html
+++ b/ext/afform/mock/ang/fakelibFoo.aff.html
@@ -1 +1 @@
-the foo bar stuff
\ No newline at end of file
+<em>the foo bar stuff</em>
\ No newline at end of file
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index fed12e8c5a1e..97d7da937e94 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -37,45 +37,56 @@ public function tearDown() {
     parent::tearDown();
   }
 
+  public function getBasicDirectives() {
+    return [
+      ['afformExamplepage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/example-page']],
+      ['fakelibBareFile', ['title' => '', 'description' => '']],
+      ['fakelibFoo', ['title' => '', 'description' => '']],
+    ];
+  }
+
   /**
    * This takes the bundled `examplepage` and performs some API calls on it.
+   * @dataProvider getBasicDirectives
    */
-  public function testGetUpdateRevert() {
-    Civi\Api4\Afform::revert()->addWhere('name', '=', 'afformExamplepage')->execute();
+  public function testGetUpdateRevert($directiveName, $originalMetadata) {
+    $get = function($arr, $key) {
+      return isset($arr[$key]) ? $arr[$key] : NULL;
+    };
+
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
 
     $message = 'The initial Afform.get should return default data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'afformExamplepage')->execute();
-    $result->indexBy('name');
-    $b = (array) $result;
-    $this->assertEquals('afformExamplepage', $result['afformExamplepage']['name'], $message);
-    $this->assertEquals('', $result['afformExamplepage']['title'], $message);
-    $this->assertEquals('', $result['afformExamplepage']['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result['afformExamplepage']['server_route'], $message);
-    $this->assertTrue(is_array($result['afformExamplepage']['layout']), $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->execute();
+    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
+    $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
+    $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
+    $this->assertTrue(is_array($result[0]['layout']), $message);
 
     $message = 'After updating with Afform.create, the revised data should be returned';
     $result = Civi\Api4\Afform::update()
-      ->addWhere('name', '=', 'afformExamplepage')
+      ->addWhere('name', '=', $directiveName)
       ->addValue('description', 'The temporary description')
       ->execute();
-    $this->assertEquals('afformExamplepage', $result[0]['name'], $message);
+    $this->assertEquals($directiveName, $result[0]['name'], $message);
     $this->assertEquals('The temporary description', $result[0]['description'], $message);
 
     $message = 'After updating, the Afform.get API should return blended data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'afformExamplepage')->execute();
-    $this->assertEquals('afformExamplepage', $result[0]['name'], $message);
-    $this->assertEquals('', $result[0]['title'], $message);
-    $this->assertEquals('The temporary description', $result[0]['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result[0]['server_route'], $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->execute();
+    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
+    $this->assertEquals('The temporary description', $get($result[0], 'description'), $message);
+    $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
 
-    Civi\Api4\Afform::revert()->addWhere('name', '=', 'afformExamplepage')->execute();
-    $message = 'After reverting, te final Afform.get should return default data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', 'afformExamplepage')->execute();
-    $this->assertEquals('afformExamplepage', $result[0]['name'], $message);
-    $this->assertEquals('', $result[0]['title'], $message);
-    $this->assertEquals('', $result[0]['description'], $message);
-    $this->assertEquals('civicrm/example-page', $result[0]['server_route'], $message);
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+    $message = 'After reverting, the final Afform.get should return default data';
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->execute();
+    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
+    $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
+    $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
   }
 

From 2d24ebd263fd3caf41626441425b5f81f801a21d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 21:50:04 -0500
Subject: [PATCH 358/834] Show mockup as main graphic. Remove unused
 placeholder.

---
 ext/afform/README.md             |   2 +-
 ext/afform/images/screenshot.png | Bin 11775 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 ext/afform/images/screenshot.png

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 6addf613b55c..8d510dd8cee9 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -5,7 +5,7 @@
 > iterations with more stable/cogent materials, check other branches (e.g.
 > `0.1`).
 
-<!-- ![Screenshot](/images/screenshot.png) -->
+![Screenshot](docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png)
 
 The Affable Administrative Angular Form Framework (`afform`) is a system for administering AngularJS-based forms
 in CiviCRM which:
diff --git a/ext/afform/images/screenshot.png b/ext/afform/images/screenshot.png
deleted file mode 100644
index 6765b696fa03249ac2cd605d5f0e4aa000ad6dad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11775
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
IrTdTn0|#irRsaA1


From 7df3568584210568a9903400d2107ab83c577834 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 8 Feb 2019 22:06:22 -0500
Subject: [PATCH 359/834] Copyedits on mockups

---
 ext/afform/README.md                          |   4 ++--
 .../docs/sandbox/3-Free-Blocks-Parent.png     | Bin 87290 -> 92364 bytes
 .../4-Repeatable-Entity-Blocks-Parent.png     | Bin 85998 -> 91481 bytes
 ext/afform/docs/sandbox/v0.2.bmpr             | Bin 166912 -> 171008 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 8d510dd8cee9..1731e8e77be1 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -5,13 +5,13 @@
 > iterations with more stable/cogent materials, check other branches (e.g.
 > `0.1`).
 
-![Screenshot](docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png)
+![Screenshot](docs/sandbox/3-Free-Blocks-Parent.png)
 
 The Affable Administrative Angular Form Framework (`afform`) is a system for administering AngularJS-based forms
 in CiviCRM which:
 
 1. Allows developers to declaratively define a canonical, baseline form using AngularJS.
-2. Allows administrators (or administrative tools) to use the CRUD API to customize the forms.
+2. Allows administrators (or administrative GUI tools) to use the CRUD API to customize the forms.
 3. Allows developers (or administrators/tools) to embed these forms in other CiviCRM-AngularJS apps.
 4. Allows developers to apply change-sets via hook. (*WIP; pending upstream support*)
 
diff --git a/ext/afform/docs/sandbox/3-Free-Blocks-Parent.png b/ext/afform/docs/sandbox/3-Free-Blocks-Parent.png
index 47e8d8125c74a40995179cd706a62922de003732..7919d805ba4dc4975b5ab7bea2b1407f2a3e1043 100644
GIT binary patch
literal 92364
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

literal 87290
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

diff --git a/ext/afform/docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png b/ext/afform/docs/sandbox/4-Repeatable-Entity-Blocks-Parent.png
index 4beccad0320153eff652c74b177e5ce3fd323c97..c18f9e23c8d65770951c5dbd53d281d065c4ccdd 100644
GIT binary patch
literal 91481
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

literal 85998
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
QBG&{d33>5+QG@sY2bz<LKL7v#

diff --git a/ext/afform/docs/sandbox/v0.2.bmpr b/ext/afform/docs/sandbox/v0.2.bmpr
index 8fb6fe4f051a537bc78353738e77b2c987414b61..85bc4a10ee5b6237e149d901a47e961484858f95 100644
GIT binary patch
literal 171008
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

delta 46842
zcmciLdyJ*)RVMbmtJ{aRIW|YW9K*rD@c|o?GOqj0nem*e>h8MV?}bBL-F4~e>h8MV
zI);4?!x$Kx#GabCMxzlii4~#=Lf|IUkPye3L=jQUh%pjMCYECY31qO$@r*+d1Ub*|
zdr!-wkU#QAlrB~E-rxSd_g(L8y=y(|S?_-3AHC_7zxSq3eD|B*UaQsq!~FhSexLv3
z`+Dkc|CNu7J~K2}Ypr$Vr?b|RSADe~&Tn6>t=67bgSC#@?b@xp>dw#2ymswY{vW9I
z<{6)M=gE#**TvVL`GGgIr;N@gFMQko_5<~|T)gu0Z@+l$SH65P`Nz*+{@0EAyDp}`
z`25A^{$k*A^rQ9Pc=Gvge4u{W`s4LaU5_}=K6zzvvVQf#_4;3{U;g%C({opwZ>WE7
z{o>_6f2(_5y7<DcJokp&_Z{6A@BW>)UHsB7zHs@CAFn@u@tc48*2{M_>i?|XcDeTE
zrtiP_<<Go$`PW{lfBy29{(1dP7oYn-Zd^Y5YW-%Uc;CebU+cd7rB@@?=U#jE+KaWe
zi(mPVhJNsNZLM}v+pQhcwrfYVjoOQ~yLtDZy7K<K`;ppguC8CqeErpn5C6*>ME&be
z{@K@O>z6nFpgw&0%AeM6TzvFj{^Z4%e}4Az1OH2X^y2Yvz4huV?e!Py7hnEQZ!~iI
z-@j9vudV0jFh#ATvzlvD>B5_}nW~GI(~XO@;dJSpd_I=z^SNuOHeUO1?NMIe%)6}!
zHylC7)9I(xyN9)hwf@}yFjw!T#O>N#{_oFcv$f^CAE}Mz)o!D9o|f(A!<O1)sy<6$
zt!d#=Z6UA6QtACvvRxa>_1%cmkt&Ar_f}O@cWpC5-_H|0skpPc)*jJ!a+Po+DPc9`
zK1_voa&0dnEap>9ZB2P2wZ>>}A5P&jDfU)X;jL6R5wXTo4Z&t|$L)MNoBIy)@IWd&
z%hcOQQC(^OgH+p}XK&`y@!WHszImJq7joZ7erEI8e9G#tt_-HUol3aLlzr65hkI2E
z`_pklDR45Qy_AnSBl%&fSxbd$xq34l)*rz}BFt9WdzjzVe0D2OwMOu}RZF#XAfGJf
zcRS+m=aZ3K>qsr95p5xNkL0RndvdKYkq1xGmX-YUrY)zrMb|B*!zOCesrEFjT1$0%
zDR4C%zK|9SN3e$xY9s}3=ib9~tX|wq<+Ew+QJ!5)`#bYwf6CQ>iM*fBr`-|1Kcz3{
ziH=59iEi!4rIr-kkwOPD()$r+BGMZBgA}$O0Tv@O;l^vn`Fon;oAV@bCNd<m5n??5
z&!qUFTsz4Bed!-PYj`u=^66>BeVEs3xmRn9rK+3hgYgvIpGuC>VSVY3j!cri+&q#`
z_EL$04b5_jZL22FPO4bSHFM*BiaO7Igfq1c)5gX0(PZuzNy!tbV?CeU%X=$<nmUOP
zt&Q9`m<JE@_&{FY%d4(*dzs(!DQY#h?&N`mRQw=S-^ou`?z$V{#;Ufhq@tDx(;VRk
zQ^HI>v7A>c@z-<DT&i8Ggqw{hd)3_9&eKb^8;`1~(p~%P%h#?qZr;kJnQEe)=b?j)
zsA`r{*iPDimP)oFW>>^pkMxi8`FgG_r@&k3t-kccVA|K7-m=n9^YnD?+E2?3n2C6+
z5@R!0k8;oL-0#kNdG)x~7|Kok>9kvUbf!{59aWJlDX=XSk5ob}q&KJ%_bpegSgY<@
z&F9-`-E=i`&U069ioI7&YQ5~4nX1bDJb6F;)0V3vdDWl6*sHBHB2$_B?P+^oZhjQm
z>4nWyJe=E1xb9T2QMG!#l72gqKhBlq48lNqWGeT&b0%GF+S!IoRXuA{>Pm%kxo<gw
zjaJXJR+D(5)^K4q?b^*k*@{f<x#?EsKyOBWEuRo>FOScpKekf*!xTYPn~FMeBdyW4
z+1z!O|MxQq$8y)hRDPUS1a8gma7sMNmBsWx>6xuuOZ%yjwG@9h1yQKmxtT_vO}htj
z`@Ix88X-<o`R)8}=h|xC@8n*>b>!z}CGws09~Cv3d(QIo{WN7ecPPC#J!om$A83X1
zd^VaUHK>HST)vx5noA{HX~(TdzmaQ0xnU{8Vl{L}yw3c+oql?h7Cp=>`^0D}Rb6L#
zZXt#4=IO`zY_}3l%Lmi$sfab3k}TuS{NI^=n#=ujjTA)ZX)%2^mCLP>Zl)TooqS5}
z!8|;jpNA=WK9BX}^P%e39x$G{vYf8HogX7^l8&U8MpBY@bJd{CrEj*=JX`rdCEQ5F
zZ?vbKyD6+I1#G99k&N$R9(oudRx^4N5sGcImnt6S?}M~;s+y9Wd9Ej7Zsht*uI}db
zQ2uu2H5D`#aVAogvMk%l{C1}&J0j3=?$S>aja0lHgP``-mOQ}NnvGOPk+nDd@wi&+
zMaRvj(7E)%T*h-UPc5Y<HdD0C<w1&G&Qm=ZjMFq|JZ0`>XeJ}-LOwN!i}`#p0<EO{
z^OW5k(FSUb<Gegix7Z@ra%*>r*vP{w@6N+_Q_1}lN~h^O{b6G=_g5lJS-v-`uD+Q9
zEkpfiQ=^)0r>(<zHysiBBf$NXWVY<&p7q*7BRAO#+%%L5@1)}CNZy&Bt$fm#A}Nkr
znO+BZy_KJ(+-FWS=UQLhx8|wIlyE=7Se$L?nU!i$-hF+X&92)i?OvXGl%L_$FqR&>
zRcqX=3S=~}XjP+oCv(fg6lI=nWK5Y{_apsUDqqOM>(v0vrKRWj9f?51T*&}*<<2{4
z-Aa0CKcZ|zr##AUXWoydjOO&+c>dZkvwR!*fR$$9(P14K_rbL8UtIx15$93*h_SVs
z|8J$Tk^E((-Ah%c`P{SAx1DY;BJQV(`)Sfz{`Ta~a#b&HM3A$HLNjjE8qFz!@kMzS
z9p9a<xtA-Hi$dpeTUQEY3$CSqcGEMRxnn$no~5ehO0ZkG-fBcMOtUGvFVD`V>dCC4
zyH$HvBJ^JFnaDjfsC^*gKbp>6Pc<8PwUA=RBJpx6-OsJIk6XEUA-8s=OCRK+lf3J$
zgnKG*SNfy1>c5fn#@$p)Sr0~#_ROWJl)*}7G1^zUQ_^AXuv$)yze;YWV`fqW)3h_<
z%;(mgRKyxw&Hu)j8EPATkSADr%!$tYUCHlSTE;Fq&69(ba8s$$`k%_r?F{F5%0Ea+
zgkeMIo#EQavsEYSj7PPZC*K@<=EfVE{&B78AAj=I?|bq?^WRgyXnFpHi!UvF<JnrR
z{)?}E&wD<0{OW(PaPesV!xww+eCFH#=Wo0A#$5cVcf9(aU$o7)UHshq`*ZyRdEhgg
zk~e>L`Fdx}&4bk6kq(~D7|lkKGU3kB(dUu(e#Y}S?WH<5^11D%FKwYje0q@2ixKu9
zuc_41R-5j4y3xX1&fIvIez}=v%$xOevrTKSw%^E2-MP?~jw<Ga?M4^Or7{Anq=3=9
zVvwz*yEz=Q>FV*k-^qG-Sbf6kf1Iln)^I+vhPQKVHO+b$F$Z$*a6X%=p5IRSw&t^1
z!@RsxO($ZIZYqU5j0lf2ev9e)?X=0?%@jpB4(0w^`JbV7Ki3)I2l;8sGpg!NtF3ES
zta0wva-O;!k!JHbt$8bdx6;IcM&8)`ZI0Bcbv~Yn(U+TtBFIQy^`v55NjT23{mk~b
zkau?UlXUEGddl+Y%~La}l7iLdw*3DfpFGZAdU7L;noF5m`D`Z7G}`iZD6OG9Szs)>
zq9Qn!EqSEBy563CVPuS?(%A@hKSgpsm(l=3N4V2e!dY8P+qoe9xqCGKAEncEInQXW
z8n|1j{4B4A8Y!YbMGdFO)=FBPG@1vg+dC1ADX|~HY!5s6-wJ-5I}M42*ON+FF8068
z2sxI9EM~dgtt#Z*6&Hn0<6zEKbA}SKb2O&%F#B~Rx@bF<k#aCsOpcYjpGbjYRm-f6
z&U|*edOw!RHq*}5{47VT-c)mtr+U*D)OCMK8%<v^qj|P%X`mira89OAS|a2<7G77?
zb+_}Ou4ZKE4T_SzW8a(1sP&}s{=BmZ+x5n(&-i>JscbzWFf+IE9KU}$zk|7BE>}E%
zoX=0v99uGjtuGCJlrnm1jgb_Ye?Ksm&b}SFZdJ3qGq;$I^!LqNnNC5xw2eyG&Iq}a
z$upXE&8HgP8~sQ@-^y6iboyX6mD?dWqFh#{%XZ4>%~QSA=l2@<5XxaW4CICfDa@i7
z$d&!HZ8)z^Bfk~@I1kUJy8cu!kai4K#c!la$Vh*>)Fh;)sZraLja%ENBEWHG#CraJ
z7=gA^`kj2fUTYks)$F>hJisy7PIc!gVm{qQq=Cq57wE`nb1FA7*5<=}3R<taa3+68
zGh4b+0sH<mueNgSetON+Wwx!RrwG@YioqBIsb?sC8~sO(P!&|j-4t|~VmH#(fjr7V
zo~XvZsMx*gK_+#3`d~T5@%PU1T2~)My!BLhGZjuoz?KZzc_l2(`XGXgrA!8?&GtNf
z)Ld)WbNJn))5*KhUwe6YKf=tWsP)`>mZAYl-Fc)lk6WV5tetdaTb}Ps<;VHo)%o1V
zHll`S(g&Q(2dS(-mCdFfit^!pb?5a6{nwt`&eHWQX_4u1Gh(n?Z8~=%b7cypA1F-=
zbUOmirnlJtOA!p(Wog1gJZWMQ%@Axxkb}HFO2f8N({gH>PMxQ@`*A*RSTs9%IhWtn
zw67~t59MQ{yI3ipxm3MfJ-D4V@M|8XRr}Qdou-v~u054mU{C;?mZ2F)Nr!oDX!&$3
zVm2^UW&jv0^DI2m#}-3%-pdW}9k$4$RAeRC+u&P6S(Lm$dt!Iqcjqb25*<fhGDV9m
zzn=lvO}X=xa173)JhPC-ZKd^RDZ^&oo8N{JxtT%^^OJw?*-k<Bfc3Q9Qlc<OZ;p&b
zklT^o<~yFdy7HPYV~*@q6P0_~nW{EYfxTid&(7zrt(3l%-n*6lx*Ktn{W!1U;qYPx
zQ}lQ`O;>_LfJ`U(yOtZ7Mu(}MrS~AOR`U3x6xE-C&(c4(+nM}~<n>5|R6IwbC9j)v
zH|LEv3%uk-K2Fta1v~0ttzq=-X0U7Ekda==gN(rGTw$p&yjNczX9W_5lWk9<*@kit
zh;cTR59W#12tJVkpq%M{He++%vo(N{w;~3$JXJg6;m_tFx{Aj}YV&_2e@7$d!>r}A
zOtz)`ETmB87yV!rKdQQSH0^1BeVkX*cMzS`{C$}6x~egzNmo-#OZwFOx|h<ewfzVe
zga;^Cbii01?@FPNzrFMb3w|;3gOZN(yAcsM5mb-udLjbzTlK_rUeD(KliWX*JHSy3
zdD>Q1hIKAii-pl05nA$mT=hmCv|(_R7V|h$>?Cp(Ooqqao?n&diNW00m4a<H1tH{8
zQcZ`cs5ixfB&?&Ev=i#tk*D_al;Ffn8d_A+XhdAieY^A@>29Tp`?+|S%fsn<dpope
zJ@el(>W{S0%>HUVJoVYT^F(i+ImqAj6kc|IlUI-S=l;2rx|p*1bLZXs(5M_29^gct
ziT>m0Fusfr-F1)x!N+}hT_&B?9#t7}DAtv<YCZ)lrMLJhT`7*2OWOnP_cAn;8GQi>
zILXvIOApLNNER{QzM#uW3ET>=U?eG?)7MQ8y!TOVXA6zxfB2TIv^kGkD@(a=GDYsB
zK!Ch0csP~l$&I`MKA%K*eXx^J?#_MZ83sl<#irvKItSq9o@$f?1B4kUl?VABkf3FQ
zDR4eFg9abx9S@i%f0U{^Q^|7r$^OYMp31eJ+z-tIHQq@ztbERB(Jj3xWh#O&%xqW*
zH|Tzd)cq8Fo}a-?NEZ86-m~^kQzScp(i91?aoE+DBGPg`=keT6HFIed@MtWr?0|du
zAD(6A@E2@jEqT(u=$^hbFU{cpjHkuA&M>f0kJDjCDS+Q@W@MYlYwiQ=6L16~8cL;y
znOa~2+MJJIl08U=+XZ<PM5dCDBd8s5HFvZ|^w~VQp66o!pQW8csjNK}^`)A<R1G|Q
zkcaJi$N5V*V9MP*#)lhB=d$}a6fjJ1BTtupxS3CHru}x)!-xQU6p(_Gx8w;ym$Ce=
zWzhENe=bu;Zk$hrHqq5ozy#llASUNbZo8A~;Me9{X-N-lM4UUR_#~f|N%tV1bF84H
zti<NL@5nnY7<Kj_?dFy}$kSV?b2)#{Q%?iVOwrQHvw3tUH{FT6rX|#NC4#M1>$xRD
z?Pq|fX%mbX?7au+cwju8Kbp}!i-?a?-h)(3xbE~S+{_@rJ^0S-DOPg!|I@T^B~^h&
z&oVs#sjU&@UVhH<Ky$_`P(Z2$Au-o%tio{%d8TyfTq<6Q$UCWYsp{h4RJ@y3+M?JK
zt?5bCbK?Mblse&p@QCfL=SD6@d#a(gyx*Y*e(+9O(Vs^*bKheA2N*xh>(O-WP%7xm
z6(%Svk6vWgKF+6rM!>~FDg(P~P=D^BzB?kwex8X3*~rH>3f1yQt$12|x|%)=4>tQ&
zsv+%agfjMLl}Z7ubViiEJU^8Gm(pSg*KVFR*T>T3bcw4|spT-@!F+a8%Rrhk9x)qz
z=^D4dwYJhqns6^2zL55DN>~Pr(fLT*lj{R{>^OHV<vC%x(+IO!33ofILciV3y#NS7
zCg2nFl+IhsD`vTYWhM8d)}2OL$1Cg2U)#raI%g(hJ{QT)Q>}LB8;;0$MBw?@^On;N
zAhOWWLSCQd`Pm4vAK{Mkd{3TS&;1-yJ-3@uAu9Lt%Rv#U;Hox2Dx0~$h65myluqo(
z^|q{P{z@^YEhah*zBQIP12!8@h5Vmexwe*~8CMfk`#|fkPScw$bw3T_&e0wenr$kv
zwMHe~YziLA7;!Lc9+uErT4c5^r=W=x4KBQ&>Xy=)dwFFn8Qe>$p3f`x$v2!y@o)eG
zV>g6+Gs<s9IRA?b-ObgB{4BA5`%+kIZk*1If~2GA79h)H+NbMyaH5&Qv5W@5DRjO)
zMRum*-uwVfdC+3R795AeL?!q{UNJmuSs==rRX;0ZxHj8(y|cu-4<j$T#^~QoaW+uS
z2$!4|w3h9V52HF;QVii9rofeyL9?xA(12K@5m4Mm?6@@z0aMtD`Xb<bYMIYnJ1L6|
z-PlP*^N|k>!^$7dha;(uEqk7piEZTH`yN-Ct~IR(Q)ngZV<45ZM6{x;y7Ov3t)>;=
zqCs#gL4gf~wUIC8Z*TtBD|gwyB9FqQw^Q6fI=&<C5G(9gV!^`1gH?}+Vyx!w-8@4q
z$nZw)@dHqrOm*%Ro<FPl%^C=D8lg~8SW(9*86e5LWjQv=$dir*yO<(`6Yr*-lX+(w
zvMO{lLxQTJ|EMAe{$dI|t3I2`Q>PJQFaolTm}zWh*uq*WHpO|thLo+?mfyWvzxF>$
zW%e?<ttIUj^PzAGlv;K;&a}w)aD+L|ea$I!DU~oyZsrvb1AxObUXS>KRw5-_u9m!u
ztC4;^N*^yraO!w1R}*gUO~nEubTo$$W??z?<k6`VXG>zWnUq#L?~jcy1jzu^b6~5H
zT+u_5X#j9V{OdU4@eDcU1&9!gwfl)Eh#GA)Qlu$o+H|BMv)ttB%)@2{`{hCP8THZ}
z0a<Uhm$kGEB>}`RmUihCfp};?C37=k5{^3y^I1%pVhAg_GLtKZ)quqQF<}PMYORHP
zZDfK7kivT(=M{MEBoFCoqt62#NCEcs!E|R^=7OPW&AkE*{b`@U;ZYKQEmtWkkzhT%
znqJz-lZ5MPWSn;*^+cpOO_!0iyK2)yiigl39Nf={l9;D+oL1aRQ4}?0M2q#NZ&=Hq
zYwar_BY>efcbHis-lJ)ddk|7AP&%;DnUBt^&Ra?wOpy{4C*7m8-`>}jA`uVr?}xTh
zwPK7hs2cAHC~ME8tW3b22s)ktFmpI8HX^<foq&iVaEDniRU2*OBJ~QRn}{fVRkb^L
zw~>z2{oU!I-L!on_i;gV^I!&NGxLQrvX+r0>`>J<bR9F~K^g*-q9Xv8ECTC;Tf^|!
z&66f~gEB0-Z7Y?6SbNhB<SJMVb_$&*(km9swLFX<wrat|g?z&D;q!4_ai5A82!Ji>
zns86AZAUz6d?cTaM6kU^s^Am|gi<{CI403p9vMv==<Uf=a6g{|CM?0}d`f=Pijv_g
zq7zJ4vxAYsHn^MBqx)&r0@Z5_7tCCPrgWt58l<ye1RZ!L6DbI*rvPj%83uZb0|oaM
z^C}Km(PZ{_CMfa1?{J;n2n-d14tHgEsWOJUa5S^aY~zXwZai+J)nk!Y$Z#dEcrvg_
z)<AL1Tk{%bFD9^<tFRG_r?yNvMrdKj9H&EpDm`f{9cKod<{GSA<X|lI2y=C(DYklh
z!CHiE+)fuVEA4(`8Dofrk=st2+VaEx6@V4r2P<(?S-B;641{JMgWvF4kV>ZW%Y$OD
z%;yt*%9`Y`0G<oZNbg3^(En`Ll@tzy<1BWh(8WwYo(sIvilx87P;=?ZM`;xR#g=WW
zhK@73csy{T@f2)WS0V~4uQ?6e%daL1QosOl1_dBv|LR<^3d_t*3z2LjqQJt=QsH=2
zG{Hm!P}1`6U$gi`{e{^;cn4_+xTQT$&u0)1a_wPN77xG_#u!@5PvI3F<yySNMlKX-
zZ7QoNw58HkVWL%^z%(|~ULkhAen+Gipz6-OZD|d3kB`TyLAwFV--%c@U~oLRjr~kN
zBHbaal#riIx*OeYD+QDV#YS&QcZvV;bL;{I-xXjoF<Er>0O%#qieAU;<I4e_=JI1x
z2GlL*p5};L9MJCc+<F8*PrG4m>J19q$S81(TO!wS3ht}g&#+)Dp%{!u@{@?Tkk8n0
z?I{#kvzemqSL3WBJJZsEREZ-ok#^c@u)H|3ygo>>DR-Rz+1MbN#q>%;r|1$!75C#j
zEv7J`Gdp<@Bw-vM=P&IyT(u4#kmF(t9?B<NF&$57^{3xV(GnA68*pT3N!(C;AJz~?
zNrGFAw4p1Ho0T{7BP>=T@y+RhzC2{#qn_5P4&_dtruegb!e&^_Cv&;Bp4LGUmh*~t
zJdta*a<S2lh-uy5N-d++tf0uOkaO|BzEsUHqG;e5Y!v1=^g|>7*vMN4wBzWN82CxX
zaXO-vJr7EJD^F;rxDRyaBtLWMevmd}<vdUJN93XWnk_RC{-O9M^Qt{^LGOFh(H$w4
zbQBNIo-6)15>KZfs)eEwoI1@QAeO>%gyzf*F4$pSG2@^^U1{@4dbKxGZ#&oVB<vF>
z`O70}u;fnDVt^^Eejydu&8U{$JZ5z;wat&mX-9WjLb$bD%fDviBJcb1=|Fz5TG^6J
zca$?GO>cz6cj(Uadr&p(asIM5vi|K#K+?OpjcdtWHV`INM+QdNfk_H*<3iHs7Lr~Q
zZlbX0H+mH1axk9&?#01Cn1lnjo}>(Mvh|c`7wt-~w6lNNsMvcw`QRk8z^sP{K`tMr
z=;CDZb^)~LXGeKW5YQbCDDRh{1%eQC@(cA4sIjHNz<A6cS{8D5UNK!B*FG%%x07x{
zjYA|5CYVZF_`L?iM8wIwoeG8IU}Hlm8hDKH40M~$z3jo}2-B6;3&CRbn*IC*X3Std
z5w_QZ_@5T6fOg`)inK*=sajLmt=ww=FSh-D)sort1Ym7Hk4)s@rTk?LLv_VK%4;s{
z?c6z)R$5aa&4mm?TkgA)r}dx6feZjmTt_!wi9Ae23WZ8#JfjKRjz|w9Jx3AhC91)q
z>C3Cbh+$ku@+p%Yx{tqV!9se(H+aM1pqw^LSq_UuULtKG3=dLM@W0|lLHz}mm={7M
zrqIpEkAU$Y;v7Vn#Z-WZgr&#EIn5nxKgiBz1i2M4D4s$m2W1g_CT*tRfciWQyf*>3
z2YJ8T$QS`fFnigj=r|Z^W4Q@tYrcwqqhT%QUI=es(^QD(xDw$2x6Bpbf&d0$g=jDb
z)l_cJ9MEb5W%n!A@?pv}*@J%|yMfG1HLw!Yht{6V$NWNpCrZ{dY)>%&3JP^KuZ0#n
z=z$M#U1<sUC_e&5bUzh}nYX7=ya{lH-df7l*@zt+u#v)~04(Q+7mx2JIL?7M$e2>U
zP<|1w=KR<|(Nhj00N@1^(Cp!s4y3^1^U-)Vayy_`B41#f#r(DZ@f)p<Wei8*VS7|x
zKAx<mQqchiRTu83GP{7b16735`S>OpUIds5i;M37;pfg+g2L;axr(a84**CN5Yrw3
zv;n~_iT|}nO8(4dI%YCbGc<4&)-$8E2}hN+2Lb5Ly*gNk5!yXe-G?ItC%lvYq3PV1
zTN&Zu{Lrn%oEy)*b5$w!67hkwe=`^9_q{x3NzsCwYo^FjI%+WmBguE9pZNQ_d^`6W
zP4qb}#OY&n^yEH28<{K1`J5?7i%L-d?UW%o$ty!AWYtFhBgAki%~LxeL`1=ir`BB6
z8->HOo~vSeRFGBQ7vUEpdUFN@wUX%Ea$%Xp+%ucMIA9%lf*p)2PGzwwH7@BEkMlwv
zgV;7h!iK}2Y0Gs)0+cGE^rq;7azXd-Lis$+5qKj4>p9-fN{a7J+spK8i-5bCW>3jk
z5F_LZleVbi-bQXfx_|*dYbZ-r+))Zcp0mc0i_X(ec(7K<eyS>*5!%uSKg?>Ou)9*B
z#Dl{;&HN|>L^u{;nZV+vz-#zN@Ne+Ya^~Y|ieesPE#q$qtncO#UJK4QZVWn+V1*!(
zKs(AfvglD&**-ncf<6l?=emmum@Af@-bHh;ps^$Os`54)DXbvW@;%rohmjWgbCymf
z9Nd2G^_EyVG#H!zDbfkH1F1?av6N4%4ySl#^QtZP>jwfc$9r-G!(=2q-kv%ddy$8$
zVY59=_073FnIbJSeATULY{f+2x`TOKNP4ImFuUP{6v_GGSQk<f8j~NUD~{V*s>370
z7G$!(JtZ&*>jwV;o6%v9UvK@*w1P?2AE|Gq0F-gdMX<Fkk4dJWtkzRq!GLc@AegXC
zs>~U|ce9}@pO~0P#;6;B4$Bmu#N_P5|KrJZr1Fha0eGf(6u{2KSP^U(${kWHfQqvz
z&=0E7Sq8_LD#3&$DlRbIV6h+QPLmh^aVk9k+OVsjCj`i{|8t>qBvupCOZ0Ly1qn<w
z=N+q<%MD(`ii3W0%>|=r%gGc;bgSC91Lv%DTF)vF$|Uefu5&|M(gP(}o$(iH&=uw*
zvjG5GeuP?}G$O!kfP=J<kqV>&r3;}+5)dEM!8#W0Y`E$fSg))J3h8m4VF8Wh9^`FA
z6hj`cdp2z+o6Lp%$WD!do~>D^_gHS+OxJCuo%d24)x!cF%@dC^81kZ~)7FVx>rBPz
zrHeoL2k&SQ2IvIFr(K{VM^#OBQc*Jtmqly<SwoC=W(qBeQKDIbbR(}TH|`+V+DwF4
zi_~tWjuFeg6)B9e02IYRHmoQo!VR*X#LZzOrn<e*mNfORyk{r*#A-auXUP6~8K<5f
zF_}uw(<DJq-sn)OFM@(}be0jZzu;LPq4kkQB%~!$O3}KLE8v*~T~feQDnV?e$OZp<
zBRT8{ZIMO>YgvDO#7<Ar&+IQhOI0}&xeiAK@k@rqEk~i7%-;i9lqeUQk)Cum?%`^{
z6w;ona(+5;#j<CfFkoa)0(&0hr!P;RrWfy~KnO}}K4sDZuUTT4BrqrBFQ}W?T#31B
zW<#dqgGl@^x7|;Li)jthOM(%C-*H;O{vn)1RserrI&LrTCQ}i+viz*2SeB`d*LOC6
zwe)OXs-Y;%UP?q12R32<39LV!amSB`4B4!J6p~c1z(m*BkQ^QGy|rVjm!iO4V&EM`
zaKiPZ7X<cg2Plr<EeM?rTzVrk1?0i`6L%`?vxeDf>lQsvGHxD9u%)U(tBoeXxFBc_
z@+Zs~N(?~DWfec;vPy0MRU$ic6UCCD=!8R@1`N^4Onc_zQTnE(k?Q3@rYj=9m_NRl
zE&d?yrt@A!B{y(4g*^rHkJ3vmRY#YAM&TVHJ<38r=)xg7NUwo7#Mg@tYKFky=_c@Y
z1?$@HP;L+MASX|#3;94G13Q=#!ic$(*GN3vb*w_zQ%lvlk%-Mtm`>qbUsN~T^kO^X
z-*I~%=L(}K|Jn+cQ_-4xQwiKiytFIwpQHlz5$m`BS71F|Y#FwtXz-?l6n>(%6lk+d
zEZaO4j{0LR2<x#ekU3@|05(Qv#76@Ptxw3!jD`HOb4@T^gTg;sEtZ?nt)dCsbE$d4
zvBPPv`CXPQD$8D~1k?&_+QbBOX%8@;jHAO0uXj5cPEeZkprH7|8n86_Xekv~&1;d7
z;<nkHMON^PY_PFZYv1foWmX0fpzWRNXSlGr*=Rix7Tig=vSD(C79$9b%0@~RJh2c1
zYe`o)$k^E-QSBJ$qU)3i+mZ!%uljT|5BuTzOIe|eKq6*<{zLqMsKZaFZZ0C`2?iQ&
z=5ekrM?|dk0+xnI*T^kmf*g5n2tXUsCYo-l$&fN2iU#4>s6-4574`%h3>6wNg24-e
z#=9|?lvqbv9`-=)Geq!3>3#RoFu3(JS|>XX>(idf9{|<sIvz9_yEC7(rxlO#5YSJo
z2t|h*54hOLb1iw#n(j$Suv8!zmXa;$D4%tu+?%<It0{i9nLB&(S@a+K2$5wh56T^1
zPAe@VhD%$DXM};UZNY+jg;{S23d>X5dI(@6oeeJ&yoVg$nR}T6rnbolB-3*%X`rQy
ziPb2uy&25rW1iVArC?cJWy@h5%Nyf63TxrY0Kdgf87I6aVGtoeJqJ+}t+92LZOdfs
z&YhqgQAhmiTl7Gq6UPHwahm^me|&)RbQQv)Y#>OX`HRdpnU-PCKv4nM*s`{5yaI6O
zXnq0V8yU{-sv$!W7Lr_|@Zw8lRk&j<O-TExn!R)jJ;zm%G0n!ourYdY0R9Fi74LL9
z?O?1~O4w7Bl~WalBM5uhWTfkg3NqgNDZO}UtR(h>%|}Y)twvhBn}V=qu)#=2Y0C0l
zh!`#T+$uIe_Hug{F#tWx4bIDM8X%yHcl03Q(SVFAx|9(pmZqO<xB_83D^5LMra`x_
z<W^A;1O|ZC{oH23fj2~%9YjDO5zhXg0CX@Ll>;qiQ!ze@^8#er>nY}MQAd0<5eLpc
z^90~wK)~E%jTAVV$H7dDbFl%tSkZ1gLt(As$SaI#uN2f<$vfUA@&}Hv(Ii|~t{46g
zh)X$g@TaRe1#ba!ujDz1J!rS0^%l<fe&mzYDp1J=W^hmyZE20lMU6qU;zqrhh6X^p
z$I_a!6gQA!;Ria{K?XoO0G=s%S_#*ha*R30kS~ickoI$2Fdw*N;wHc?!D&#vvFuJO
z(AGOrwM~ZcWP6#8U<f_L6tZAyS?lNk;;@1OchYiE8X8tOfO<bmO}1+J+C#O*bl&PZ
zN(Mm7a~7DjcG>z2DT`91pjgL1>6To_xg?;hF~>hx0Ybtc0!j_Cjur-$wP!HxDKRE1
z!aJhN@b$ER@yR#;t7opiq5j!g{j;BZb@$t@{miT1^XgaMaPhs1oi}RNCi3Ply!p_Z
zYPD<6JoD=J{KT&><n8dqC;r>T7izVpA9d+>kJ}?|f9=)(<ltKM{^>18IlbkR|91VI
z;qPvy?L@J04M#MaF&d!Qb3tN(-%?=~(*=^oN+THv!V2dR9k>b!<uVLas&F}<(B3lF
z;6ktqkP<$N_?5#V5@c@V4c#fQ3!`1kLtW|j<w_j6Tm}?*U^Bf~s6h_;;1U<WjSAy=
z;4KTD+K2cM=)pkNiF73b1vNl%6sw$zO8bPrU3NSNfOJ=bzyxKgGtO{v5FvP}Ot_6q
zXpb6d8^7ZqN)88R9>N8kVxKA&n(%sS^#rv)O|}1Ue!KLF1dJHEYz%u}YaUW?L32>$
z4)P<kDlWH_p6SUQ_G15Y3kAyTIwvWbx}bpu(pCXEW&=~%f<Df590B<pgmrq0xPS<G
zHhP=05oP`H$Cq*&B}IJ;h>={7456figXU7aWHNd7^7$EnfM+|$e4Z3uX4<Tzq{T`F
zOy%?LJV9k1=Goo!tB6+GznkJQ%<;(v@`zs?dl@Kw>0r8nyMroEaSI#_rbQA91q%=I
zDSS>?)QUw8L#d*jv=`m3xINNNn2Vg{(@br)YT6GZw)`-b%2HM>>(VGaHP&&LPtsF7
zMvwrLO=Qx{5L!7-6QB|lzSe1ssLomLf#H^(<DFyoN>>=mQ^WEX1|qq%A6pkN)pF`d
zJNEM+(5E?L?gs<UNKfT1{!&-fPmH^@-0w^y(5N69Y9&Yw!B+gz9Fu0elIGaaoce*&
zoctwL@o^s4bzI%sRV%P}CL^i5JE3!wYQ`^eq&04LVV8AB5UC}Ft9+W)@h2qT@G#{>
z9i=>{ya3<iaSKJTK?}SV{-(27ATSmgMZK0$amK>!TmyWdz7tNKuF#4}b|<Z6>akLI
zC0dEOb(EqFA^et-=O{sG+^LbQ4d<Y62WXY9T4T1V5Z^#@k9|Q@#`2@F7Sa}G+gPrg
zrR$iu!mH4go(SoOa3Y$3bj#HSi2ET2dLaFW*(9()pE8g6-AGsY*PZdlvlX}D>W)M%
zy9+m!)c~<(u;F+J{?i5fkzDK&#C|(>6sTE>G}=IS?t<9yUEwhM5tM-Vu=1G1`R!DE
zSO-spzp|Z+ocqqS?rvHq{d+HMK&6M4;N<|qL1*A);MPdQVaTthFsc560=k*?%%uk>
z(g`Tni~>&JY}!4Sr;v{r$}Ewb&_Ft&4i8MF3XlYnh@I2HCi4-%{PhEo&=0UBfn@|c
zW<I52{jjQO(P9ehrhSY&h=uTBcb))Jv%@49PGwjs{2Fe;Xt6a2oY=m_YKrv)eHN2s
zWAP`%>A6K+X#*X1R&^@$7gs^@J;Y9+$Rfr1l2lOQz(;wCF(D2n-7x&U5<I$}%VLhx
zxq*q#D`pL=f-x&xtbf2B57S~!i=G38us%ib*^pzoYcij1<_g6IjS(SUO6j{11|UeK
z;d!8(HSSd-Ih4ve(n7{Q4`R2PFb63fEG*~JMuVebUGPdCr=<XMOf^vGWbP8x#`NZo
z5$-tm@Za|$mUqQ*5b;0CJ)--G-(n@x=;x7&0=1=zM$0zf0OB5ieegKt>R_*o=V3t=
z2J5%d%S334QL>N{Zsya&^xRDDrr0>V2bov9c~3YVNBG;UU0FBx(`xYvmLTIF5ZRgH
zxI0fVRQ7;nsYq}K=$W=(Oy`!J4HIxTpMgQ0|A4{2mf^IHxXjK3a2`lY)r{bf^nd>K
z*xTrKE8n^%VRvROa;$jHQbx^j5p*QFR9|`tmmSRnn?>RoqO|;VWGbZr&G+*uCX2)>
zfe3tFbQ($x`Mx14!IIw3#gnxBZr-z%1^i`pG*?rOb!cH7=dp6iLy7l@Rzs5L4VsZ1
zC=$x#lFw+l6@%FTOD^N|-^n$IbP~<*cj57Xx}{XIn}?`U4zA3U;`HKpBEN`K+7EO*
zOPLFEmZzX9V$~2BJtrP8mAmCeTM>+#o;<<r5&ffY+cTTu=p(?3B_l_o#yTQvHF9%o
z^Z>^nJUfu;ALkXAPoy5Cy_<UxPeJ7(wgM|i6ubHVBxRYjg$HgY1bPsT0n?J^RK6#m
z12ivMVZ*U+iztA1&(j`Jgw@<Gyi_Q|J`uUHF;Q2n1}F5vT!&Ig+52rlD_Lj@X#|iA
zX`Ch$7i8RGdGfp(628O|*eRsrQ$fa!6R^(!Si_v1nTTQaGR{zefxGxlPW9p9+{=J5
zU{Q!Ct3kqz+^>3TEe*wh6bIJZvLmAKIQleJA^Okc2Faf#<<H4Q#d!sC5f1Z`D@%H;
z#lEyis}?iefPi8%(AqLk^8Xhi7?e`p5?7MBgZmHi8BDzm=pvN^8Cy#~(CQWqn9fE^
z#~EShs1vIeQl0BLT`KY$G+{NuVYVSzHD`E)M}!3E3H((}q|Ug|e0hu)46sxAD`E`@
za{2duFdoa6HkZFB0?D6&$D>DbWbFY<DM&UO_g%cx_A`;{U`Wsulh{3|5|%Il&+`N;
zTUL_*vZz+tk3ip^%j7CBoZJGMa4Mf*TF{Odoiizdqc21IVMM!`p20{OO?$*z;8Sz~
zC_w0usmg{hD=c7sl_)se63QOjsgceqYgXbgJdl;c0^CZQBmkH~D1?WRn9(hNkB_Zr
z=l7Yg0t3ag5MOYIBLvnWJkC2{<7Ub!-o;j$$(a$|JF)*4UeaV_WV4G{@`(gg<?j@3
z0&9*}_b>vY8d5a-Rnbt_5@}*=6*Jykz<%mWAMg{G(^edi!wAAp)H54tK&*vEq=%<E
ztwQXtH610}!bWqR{{{MFaKH$FL9BUXOMaYv&A3vftUt-O$EgkzS~Q9=wip4}MX)xJ
zI46KIWEd`piVZ=$-gF=r(d-0xcBYFMVAw_w^r>{ETm=UvaH6P{!+fUDy{rWblVv!P
zqQ!WN(^ew?fH4LxKS0l#d<bZFQc?`|MmoYCEikNNnK+VP%3Qvg9@vRc!oF-@KD>>Y
zO^?TAkshWmIH1sZk)*ct0iGXw2^-qE5KFm}A!BEi@h5*(&$T!%)do6~-?LQQlAhpr
zAq7rGVxgSb+>V7+&ZFb;`keVBUq@VtO}kqOc{hK}cSHkYj;+YsV-HWJY|2`^(L#05
z!oXW|E8|O&jI(&6^Phb4f4qLZ@f<fwEWaFef_GzAz`*IrEa=WNoO4-UQfp8p&eKZ^
zd4|)$t7bu$-GskiNHad~OdqVK&lXaGY;der`>!*RV0e9bvLTNH>8Gn|r_S1s#COsz
zHjR@9rNX1iQB-!%(_Ci@pXb;7CJf7BIG-RK@(TSxjd&08CSdu(s%8b<2`_=ycfxo|
zJQ-inkT4!?ng@B$>b)HS#3Bk#M{5cSZAY+z@KC%`$}m>M7#ZXy-R|X&Y&X5<jdE@T
zaVIW+X1nQ!8=^H%_qdb(P(mT;p64dbHad=8Fsqu=WXBx{nAtSYH8@Y`$ebm?SE!RQ
zfEv!{HO(gYMi)(HDNz6P_C(siBH2dcrly(yo#{bwKRYQ-1@LPsg&8O`PazZIVJ))8
z<PdTl;GCM7te_N+hlYpAF>v4?Ivaabhb?A2pjd7BL=HmI7;I8@;c|KwfOs+$@I}o#
zEKt!}mJ?dW-4w`yr^tk!xHsEr2{W?TuI{pdKra9YcBkF+fWAQ%yp<B1#UzXoBZ(Ri
zShpu|P*yVtXw9-;xbz?($N^rB86|53thJo?jxn&I@v3a>LT<o;&a|J&#}?nqD~ziG
z*2~G`8evs=A~2ZtIrkQ?SpXdzPUSl@28JM;K-iI<UCOW4Dr7uQl%rVqn$0PNv!8!`
z#u-2+07vI)1Zst);>bcL572oPS*#J+*;9-8Kn!*?kM5^OjI-!3+(?UX=+N`U_JCdp
zZ4RW`N;~bZPSsY1_!xQti*zGx6xY6!t4vMIGF!rVp6B;F_Bb>~UM2X#AqKL>os=T;
z4dPuAu}kQUpn@yqv?x(hG+v5M=CP4xf$1FykA*Y9=7#MHRRRI53a9p<3<KZpqH)7l
zrt%1~wL}Dv56lEb$Mgb+FkP`@xi7Z*-V6r&r8B?aB0(w$MM2v@_EZ~ikV%A#*_v1F
z88#W3rZ>zZZjj^49Mok}fTuCa#ilJO@Tk@_=hK#46~z=dh5SEGYnSs*8sm8c0ufI|
z0LQukl7M3vs3&=jkWiT7xwFV2{z95b<B*(ll6F&ITz7MOKd<Oe_OggRL{SF{%!3Va
zScHotyq@KUS1I7a#cR#;Yq^_|Fq^wEKrBHD3X*5pItts$nc@b^8N|ydU1v-gI-*#h
z8eqtSv<CudH6Wxo+~a<V9L+tVHV%Mrj+B6<+}T211e_v7!=eY%FVf+`s9+TN=%9hX
zKuogoL&ZbLU=B=OxIBI3)QGZvDG_H%G7hn?u}^^-GRO9Eud`_2ZYK49dcszSi%mBI
zOA51qYT{aBs4vKs<)kx!<-V~jvEaaCRzcYp;15tJCc|OmXCUmPr<{jrPFt?H0mO>E
z_2ip>c>PBGZ(Ke5iTZr~@}K`v{rSrm|ES(sZ@>KcPuBlE7e=4_+#jshFMi_>pAX}#
zo!<DM8UW2`@?Gf$XV+P<*ldt-IKDGYm>dWq0@|!);cKv+!xCh%JjmjJhv2hwMxmr)
z_Hv!%^lO>uWx?B%NCQ?osb+*ZGh9swNmBeE$?+OzEQB~Q7vTj36UHWkgbHL&NBs7D
zioGI50>y)^56W|#m`H=j8+N$K&psB)$POfSPDM+kxRsXa)9L)($>0lEJLS=O64pdz
zGMi5Gzn}x*N@77Vv`Su&C^a03ALR%k=~nO+%r0>^=mFY(LL7itTis56c5@L#vYXcu
zB&@u-yrbrv)_kw(a%Lp*(^(3YnIzP3C-)-c^CZ~$T>5ed(VbicSmLpWOd`>1BBb5!
z77Yv(;XpCM9fWnS>Od6o;zp?4R<9>83wBdArYpb}z+hiq$~zHj2T0)(&7`#=)shB5
z7BV_mBlb9C+=31#%q5X<G6l2Y`29Qi$hQiJl!I3Ia5y(Q>?q>}NT*@=^On4TFeOL*
zanac`yeQisBh`ROr-ZHJ$IIpskq6A2rSwExm-3dU#?%zKF{z9zuXi^Opzt_efbt@i
z6jANos-BupzhJhr>e(woa0WqED-J&Zw&eH-@fLFFY9=NHm^Hu=Ys*7DDY`EO+lQxe
z1*=HZ14qEIh~=nTbf?0b1VS+hc#o*k3YYg{9|O`z%aj8GClbjPT|<FnCRo0$DOV==
zb6C1)Ng&7kd-=(`{?|{}FJE~r-?;I`Km5SOM?TYi_1b&u&($xVdvnu~FWtEK^6!1f
zIkdMgU;ek6majhY_WEb)SMRz}|9JiK-k(O*eD00)AN|$(wHuf3{*I>q=~Ej`*Z+gx
zsXzJBuYaU|t-aQIG4>}vc)9nsrVHO!0NZsu5*~VqTVe&8-LM-Dxzu0B!`#aFnqtnV
z(WO`fP5_ZU)slAb3hmA4V&@qc&bg=&?9X0iGPA@`W38(}Of%;;ptxASoCj3--c&|0
z@JHAV3^}l*`M{<U|0q@KHE6hSLb0asQK=**1k`6Tg4rINTFA(7G$FLPJEeqa#$E)n
zKqq@s3~I387&be?uCoU8kK@3E)=VAwevCTVZ?*wbtMr_AW%BV4X$7XG93X+MxzuAO
z2}c27a)1_J!;Zslg5S$4@5_f=r`c4;Z{Yo~$t+A*zNCA-!9jz9&~nRp`Y2D7#B)5G
zj$D;6fv;bZN!RnrDS%=NPJs!v1OO`yp64d~EI!$iDTw4<Qb$p9rPj#dwbUSeyk&=M
za!dE}i4cWPwTbmD_|7{#P3d@ROe%Kxa0I!VzO~nw5wX0Na(TKMSEkrv`a&1puWq$%
z1KFTnzKP{w?xj|W#fcijSV9yr-S7zo8Q`5Vf%ftj`4xo-sSBWkR>gScwt9a$9{Fta
zb~+&>04n27UOT>#EyAR0iAYYkxt%-l3MW&LLw0uZS2m_I%nmO{ezs}na_493qtE_W
z?af)6^`?*4nm+!?SO1+iUAte-m;Tk2%a4Cw)9~ddo~xf-e0lEK%f+|W-=FiRn>HOa
zJ@V>*dHh#Df8p7G(RIB#ihAVLFV+9*=YQ{wsp?1aJM_}!KfO_Jx%lPZ+PwV4vrXTi
zCZ2rx_g-qc_{is8xP0dM`tuaV#Kk8*_pZy&{aO7@R|C)2N9&jW@f+*kdHI=l)<1ml
ziO)RqEiLn@%U}Mk`U6i4UbOz+3zx5)Hof=agTL`&z3=jqZ?C`e$-!^@<TalTU%ll$
zDduAMx88O2p&LzqxBlcC|D>tzlaY(p{<9Y@TQ{11;&Shs^-o-V;4MvGtW!mQ=Xd_x
z=c5<D{k8W$dF>y4py^`ucfa>)`Y-E0Sv@y)`P@;{^Os+~k#8YNTdvZU=j&IIX1K{?
zD_76GrRlY*prX@mR8Ngxz4q1m^`@&YeWU(ob>CbxnJ*mr%=cYgf4=_H^{Z&o`ReJZ
z%TKq}KlH6;R?0NJ^g{LN^wkGGQExBS+EuKzUv2V@LLUNO0L8>xV6EolX(kG{18b!v
z^A)x{o_lB^>zEng%mG{k5Ex$I-7FdQjVa~K0t~Q$Oebtu2Ek%xveb8(c*P-}#06*V
zmk=mQDa|6U1n@)I*&f*^IE-z1kar9$7FOc};Rf=3ETE!3Eej_q35E+OutMl%r>b^V
z!WG|WEzg7^BoxB!q6*1IpJ1AB%RFRTFK2A?a5yH~ER=55Lie!8_<{_2Dh7lmyaqm{
zosnrQDQ)&nnk&mJ^*G`N8D=v@J8M(dIR#u$N6r=6C~*Y5cr+f9)+eh-4{05M%|7QH
zvyr31z{l|cEJ~h#oL6G?l7f|Um_8HbYtXgMiCs=RV2)$CspOFEMoL(vh#T{;phjSH
z_BMPS>q7L3z=%YJ)`_-OaCrmCsgtn{=zukW#R{ncw!77c9QI;<4ym0a!1;1apQsz8
z9bAfB$i0+h?8pzgiKA{4#T6~IY$wb}NhpM<o^-iGKCnYU>0CYt6y&70YILt7&PuMM
z(WXf;|76f|JNYM~)bMFI9hHvXJ(Jcv&Mz)#Z+`7rC?q}k1P73BjDyjaYh^MUR-tmZ
z(N=`g4>Ec({ycc`6Bg)c1h5~2YJ5DMw&A7SOjR%;&Y1w23^Nsj(9zP(b+-6ysuc=r
z&pQ}`umWBKTSWdnsF437QA$)OAp&L_>GE&(Zi=v9d*7XrHTMs5D|^B*&O_-9p+m+#
z=-8%bemFB=GS9L=Oiv&xY}OIM<(M#Mi^)PvQg>cKFAE~M>xgslCQh`@lD-dUWJ}<u
zK=f>yf(Aq#s)Q5#-ANG)DeB4@3~~oxv)n**Zs#l5<?M5F`O6>>pO%YU;{7WTDMvgA
zj6yCk39N?sJmyGq&a){b_Qqf~yFDt-=-#2+BasE~0{+2B)^q!r4}4flnv&vP64p{S
zz3utTFG(!H2Am)uC^(xBW+NR<X1)7Pm4j-$OwqyI<)A*?DtV&?l#ql(B$hlt%AGi~
zR?mZc##+~hpqr<t5nKIE-f{DD#N}#Qj{+e8<SZN>8uPf2C4knTC?tsC6e;RZhz`zU
zpp5z=C?G;06$wgA4r{@rb^^yho;-?(kR?fv6!&3j>q=e8N_50ET)dcYOe1U*7WG<n
zEAofbWB}g1Jfsk9w57-|6@hphp=@0ApoD+A;XKdD)MNo6<BHIu?xR*fnW-!gWxm8{
zC+!0pnL3mT3yq!Gk{cxN0o{x%U<%91wgQTAzyTUMs7>+>MW&liQ!!Lg+(sr1<WSVR
zJx{=g0bUMBU(emQeTfMd&@N!aZl^+4nFpA%971NVG%KBLKePo8M!d~bCR>zn@*Y4^
z*m?qL5<a;YQX_?oN7KO8ltnRdBu{cD9>m{ZgHEJNxJaVw`8Nkvm5{@_1P2%%F-1Cm
zI^D^^_Y<h(vSqsI-3`7WPuJ#flFKBbE-Z7fG87lzZY>hCtTBunvLxQJl`5S6CACi8
zl8GiIi%}~d+G!}WsTzZUes`vz=>^il<;+P^HW4nzct(WD?z9}7B6=Iz55L8&;hfJ_
z!toxUFW`!Du)CP5c=J;3d>p~RiXs`{R>Tj-bgiW%2o%z<oHr+{nKL2O3uj3aGXh8m
zfL8D#*iC@9C&e){kUHh!!2Iq-_Vua)+KS>Vq+d}=$jo%EVeTLi9;Z@=U9jg(NS2Na
z+`g2NbE2@Pd_9)0ktlHqfbwB_L;QkOf-T?#DM%hGP0X;2C?1WG#Yt2k<OqAJFAbPZ
z8>J(5q}0Mdb^MLU5Z}z1G~&4VCY(aNLgMt(lTKsoNGsx^%A!3_bs&(ns^xT&<CZa}
zX47x_3hxfN#~^Y0P#Nq5!Z2Dc7O#<z6#+yMc+rIL41}vqI-!Jvv|Q|k(s;U*4l)(V
zD+9y%5xU-%K~ssv9b{0J(;87A#1`>ZTtdkv-6_Xb8DJrTGCJ^A1^v473>Yu~yO4*C
z!B@l;yHn=#ShWInQvl(1QvfdJe#Eq!p>tuCp)QGVb>t43Y9=BgwFoEx44EFg`JGDH
z(Bk0?O<xoaa^Q6OY2_oi$o}+A7vgo~7b=;|{|HOY&FswMpmQ?YmuRE>n-?z?(B-4s
zKIH)tc0YFlx+I_tUH;H`(_BEzq6{o5^BI-h2tWWZ?HB^qxo$g1W%Fqb1){jcYWmr6
z=mlD0EFze+ObF2}d<>RPS%M(K+4QF`H4#mYt^#7(X^S?6C?F;=^#SH0TC8xvBAf$8
z5BrsE29ha9OPb48JlhqLSmLX8Wotr|7=FlHE;;cGOQCGB`GyZ1KPO*63tRJ;IHRMZ
zSa38Oa;D^G0ci<e#?*er!l4CA2$CJo&F@b&ut!{zg4N@k*z+)u%8p&mjp?mTV^gtD
z!ML0PNHJSn>KH=^Ayc{o{1+dtH&e(a=%gfhOKep8xyZPDXH6;goZuP<0&0T3u#m17
zVlz=OGXy0A;yU3;5-1vaUy3)bRO(^G5O6=v!)+-FXV7{!`@z%f6YL3x?n{F(fB0x9
zJecV?sH}36cQ2x?=Tr1AJYt*aQidu%pYiWcvD^dWgjcSp&J+Wj@6JfkgBDYPHRz{1
z`2-%+o)%(bK$Nla3UlT>l`t^DKynB8D8*nZ(22$fr3>AKO;1IzwCtv=bs($=6y40p
zakvso4x`Y#b`P%;D~v<HK8KN)6(M;6v(&Ukdhg22!835i5IY|e$APa-8y|NX_HyJv
zK5Vvf7i2}?ih-;J9T<ZwE?q6Q;M_nsqd>V(y1hyibRtg)oBO(1zN{}G;-#(UK3=L#
z*48^8u^3o{l}H~jOGNfg{w}2`aS+@n8eK344#v2Fm_vu93JN86=WeNWRFPc8<A_ia
zqK!N3NyakLkHd(}5NpUHEobMMZyot0^S>=Go+A6;Y)8nF&VGbGa2Qb>$4a?69h;#c
zp~sT7ZNL`~BAU~V*YlY*AP}efWvDQwH}lG0OBXYlTgE!fu>s3z160g3vzZoGUc!PS
z$+gm^3ledF;zC{%&L(Rvm(3aL7^ZGy^<rPT+D<04Mh|d}&_gWa?lj7&2bvV-IakRM
z67W#!)kMN4SB20j-NzCIOfRHsc_sp)^dUD1s|sKV{&jZ|jt{$*K^x1nP6ooT<pG0-
z&+;UVzzjLSCUT~LhrzK9&_Sw^-cr6=NSYHS24GU$Rcf4g<zZTag-$(Vd?2ZF6vcW8
zR<>jwDt@^Db8$hvX36hn*pfgYjE;syNqEem87vx0<}gBOFYXYm3QLR&%mQD?{q}oR
zisn*P0D^Kt0pkAse8whl6bFFR^knw{oLIqd_OPi~<uqSOWELw_J*vZOM3bk!mR~*O
z<k!s<F_yMrC^&4^BsFDQaut`9>i`}SKja#t$)4t_K&XS9q}Wl!>_%GT;B9&7j0K%Y
zQvpGKZMlB!decnLWq-YC@Z#lv@ztw*jrbRu;E1aiFaGWaFBjiifAQjrUw{7U<L|8>
zRpFJtTcMSgK`Xy;Ew}yO0w}lZm&0xKcU``Gqv@H8=|6d?3Zv9NeD$@r*56XUc=0PQ
zU47^E*DLrpE<XL|U%UKo8ub@0KL7hK2Za63U&!~c*DtRB@BjVNuUY>rL6$E*{ipBC
z*R<cbd~2irwTmzO>UTnJukx+xZ?FG<@<r;GzxWgN_W?2&arfKOF?^i0%rwyDQbyoT
z29%yM<&k`xIwW~pngn8gcb*wb-&<+8pMs8z07rh{!?RL+Ju=AN>@}|E8S#QdiVNnu
zx@`4Wi3Sr0WmDM8U*V9M+#(f|>E2a6$iaV@O5mnuX^93JbVLyQ^Kzc0qnw-JBpcHL
zuf!T~#?^Srp<?autF?xGgWbUrv+?hxA~+9?i(vu%GQAy_g;~KhhYmS^&H<p}8Qgn$
zq(iBMNOThavxJ}-5O^D0Vve#iei#sr5zKdWn3qx?gpSx-v*~2#D`Qkx$PgbHw=?M*
z6l}IP$iqpa=u1|okTg;GCbSt=lJzOeoVx=(l#bzB&{xt>0myQEe8VomK9;_U*~cb@
z9YW3|kD)hUI8z`rjU0N;xw8~xFyRW}(eSg`aC%DAs6=?F7=c$xbSz?V9~n%(^Jgl8
zgzJj{4WM9}gR{79c&H{F6HpF0s1v`239KE0iSQ?`%yFJ$@b;y6RS83uZ>oY$OEclk
zAhRRwKTd6QJGKhaYC~sd9;WNiLg{Krr7&Q++E&P4p3h_SFlM~{m~aQFOqAORJSZ@t
z<IHS^FVFi{et9L*O3oq#G?G!sFNe;{iVWA6H9;mp<br(L#2o2a%zyre&>E0R&XzzT
z{}I1#HN^_AqT9NsoW4W2?y9eFRUl0aBe4T1;QQ%0c%?+%9BSbNh?R6<{{1Lp&P`;5
zE&JjiIpmlhOxn&o&LQUdZ0Ga-R4x#3o@?W&)HzSE2^<bKjpJn@>wuq?RE#JGSz!&@
z-}`DaCD#iH7&0c-4N<eR2#GTfpam=WK`ljq0`$maLuV2==L+~~&fOv|JT_2=ZN(V{
zMf;!US!@y!U_Z7Y)S`S>3)*5imk{p4-lRBy)`g`Zc@%yGUlnQ`O-16|008`{wY&#v
zXax4rK{cSPTABd52uWg}?4?5IA&b(Wisj3fU=ZL{(F6y0Iq|{KU;BA*KR4Ozz?zsU
z*oI}fVw4qh4ed|M7)u0%kipJRBdEO`BM96N$O8ln=H0z4P9Uxbdw~4?6yBa+cnb<1
z<{)QAmbhQ8z(#(NFa{$eJ%5mUM7g!XTDA}LrgFxjd0o^pYt2Gs3L)o8Pbi118d3@^
zXBC2>fpazyi6lb7tWA6uQT{R?1eF<l@{{D;FQzvvr1F)2xEsC_Oh5FbA`Cr4CHTcE
z2c^*j(zAy1V})R<#yS%NU`vB1+EOhR3kIl2HKq%dgeHS<G!-F>Scvq{1#S<F9i9UA
z*1?Fr^oTf{CB0S&YFl&G2nRy?rb8*i{dTAe(63--;EcseI&P4!1wgB@HYA2PsD_1F
zzP(4*3&<PAZ#SaS_ws*5utgJjrkrR!AxDxbcW9(Erjnpw&OIkA$tjQ^x|HgE?W6VU
z&t6@BuIc~0_NFRYUHeq6_Nh<4I{D(Yf9SM;FTA5S#UTk9S9;^x-*NrF+qn2A@BQ94
zz4~i!y6){CzaejjFQ@<A`s~G*fAhs_nNrRc_^#}?Ci_`LL2g2Av8_?@JrUo)IC%>S
zVvD0)xfApVCEk-?OC098oxl3iUTT4$R?p>G4(?$-7ZDLmwU}h+uqopWn=4FfQ3X*;
zT0@2e9}$m0ZV<Yy5Q;=L9-(8z3favWS4LnxPceKD-+0g^DUPsKm!Hv09e_Lx6(!zj
zg3G)iiE5@f*RwDSP`S|7k@hGup#nY3vtw0oO}QQteu@HU&REUoK6r^tt-?E!gT(3p
zRob5pQazH39S&tG79M-69O%W6wxe2MA`sfcGLTEc>72}UCsqKw?Wwpnw5Qx+v#8|Y
zGx(fWML*$*%F05Sk<1MtH2I4GDXx+4M#Ti=@2QNx=E&K*DUd5_>C+h9QD4$FM4#ke
z7nBsPOHT=-D%^%CPY-QTuh|URtJi(`R2I6FXagrDgdU2c#v5RGS{?cK@8|dK)o=f0
zJ+!J{{Env1%OC%-`i-lvyt(Q7o9Y{v)9<Xm>*~cDO}~GwzWFVlLZKJDx1twpJ$dcd
zKTv;4RCv<V_&1%kr2|n)Ah`IDN9n+wTxm-SAOS`N>CkMqBcOAdCVP>y7&kIUXcPLw
z`9rKGr<Q0@Z`#>bJ;_tDFInQOv2gZbQ~Dmg4og`iWhzxuXZ8c8{+$RT!ptOLdrene
zBe%+AV*queTEa<DL3qQi0VuSm3|lvAL@N7C-ZOXv%z^kP;!;Tb^c&tMi{JSnrUY=*
zna(sN-JwV$C|rcx$ILBkQ|S+mDKMQ%8o%gF2#Kjwl(w8q0BUt?irg9zUFW#OoTG3R
z&P27J7SIg)925+-f%p{jdo*`oRcWUa>U@EMiP@euv$v4&?4ve1fj?hHL?>WMQY_N>
z<fJnH061}H;5WLCiEc|n-snk{VyU(s8M7jhf}qmwfT~nI6x_iw=73|yxkMci2cUEm
zk+7-E3fcqZm05@+;c!bV5PYk+Gj!2Tx|G4fm|@sUs=-=^(-ugbm0<*1(kkQ*(R;SD
z{a5$uIdoh*&~l!Igo)>%x%TH-xrnmSS&{8&1lwXc_XKRh=Mw(*<$3%7%YQD?nZpnq
zi0yI2V<QNHmovD0J(c;P=LXZ_x%@A7M<kn<8G^gLkWYZQ9EP5hBzh?%VKbK>(U{E3
z@$>=Rj;w)*#Z+^ID8SHZF`OGc1b~*Hs2G9Yi4;kLGj*^xzzhn92N9NVc286=j0EKs
zO~|uUPMCA_O#W?m<mPe~1k78uxI=7cW0{f=3PHhgdS{_F9!Fd;ET^RG=02Q2Ou>!_
zB*?@aT&}u*sOk~fi2ErK@Fc~p;^h<yo?|CS%Q}vcmB*w^;0_<<{Z0y!ynC9*G5_oX
z=jkoWaVleLhFiquk8Q?iTMcpp%?0r--=ie^ygL(@11%vTL)dtIlJRe7DdZ-xV{R$0
zf=G5d!Wo*9oMknj%napP$+BzDy)vy$E*>WxVp38-5}$1?h$X%+MP|AEpwc`xkm(dO
z9jQ3(WfzjyZqeZXmBarSdmyO-xH*{*kS-~&L^=VrmZ|`igDzw{R2;&~|KT6jzdOWy
ztRPz^JOJnkOju3D01Ijs4q%TWtxfeHk}}V@GNM3$3AW&T)`aAA*;>A`2lu4JyY!K~
zl=)0mQEkou+bev^%efCGe9Y<Mh(OyAw>Vk%b36S<55OWB-Ll@T0%nx30z*Sch89F;
zl4Z-8W6Zh^)iq!Q5P-to;vz|2EVzomWLUDcndUs$UQI19uqdV!J122Xq(CzqDC$S|
zwWr0V-)t%^hlGtrINy-R9T&T_@I<(|L0lQ-JMf9Uw4C?2_MpfQ*8*KwOmlfm%uVY3
zK?cJ2ojRwqCy$C|iA3@iI4mL(V$}Rhhr`aL=WH#$n$7_f2C9s<Ra3HMg>UG{{JRg3
zKTQwI`3ncbegx$8^-rSHVvkZlN)bFj-+|7})Rh|%Z9GprrJmc*@e1^Y<WpfpA+^JZ
z%)PfBM$(k|yb|eS>xu_V<O#fu&<7CFn<ECQ9#2PPhv&DS*VeNr2k=2i#l8kWo=vg9
zs+s(a1Csj*hh1fX_Erl@u$2mu6YR8s^E~ORNM}<$QW#$>97L|C)AKMbXkVw7;52i(
zO{cNyifAm`wWMg8Ius7o%Ak<fHITkzK5zwXvrdS?90&E4o|9#Nn(HirazbmqW}C(0
zs1*mgIi5+DEBz##42~)6Og<G;k_TuV7<((5i6~y}+!Jgo9yd}6AaE>AFg-zAzJf&m
z(DqO|d{2H?bbSezN#zqh29{%um{J@tUS3<qN=DlKh@&4IRV1~9jeeddpao+5VnH^g
z;yS?2=n{frtifIwFwSmvegJ1~Om+miG$;mQ0%DY_C#C5i5|<b)-&e&>LhHz1b|KAX
z8%4|pQbFyXenAr==}FqSACXLB5qvx(mcM`^a}1uCgc!P>Er-}Kkyf)+8P{+TSgD1G
z0T1bMoGtH7&HxLhWYBZMgyX0k{<Y*f=#wuLlG=gIXU{b49E`{#<ofTWq#V;E`PGy#
zztNXYas%4BWyxcc;UOF*g%o?#h%?XeQf(z-pgbGVaP9IvAt2h~hH@w^Lj7e@$`24w
z&A%NkN}wBGm4$g|fAV#509R-d4A~BaXzzFyF&loXZ^LDvcH})Q>@cIs!Zn_D4|(9$
zK479hVhX9u<*GFWj{)$SIf$|0AaZ@oRZ9eq(4?~*83m%V_aZ$j73OU-;<rg4ZpocU
zN9GT!mB%)mG788knZqPwK|7sOXxb0|ub^gxnD#ZRlPTPJs;t=E$S8<pA!-purRhaD
zd8Q_xNGETUi6-ukKrK=uetDGE^+i<VFk4jFGbF<@;qgDD%R2Cjk<K(}@WTD<<-^gm
zln$q%X+fzct?6vcVJqAr{Jsf>^*WnRDXkKU=jQ_ySV@HvEHjh!+>y$)Tpe~#;7@`6
z7+d+8K^YJnN#r0WiwZS3+lSh~HWe^NScMf~&mBe--{UB7!Tfaem;*gPvrfvAI4;Bt
z;3-L1U}{!?d5<J#3KCc-E`c@RJI_S*&d1{rQN18p0W!cyTlM!O{eevmrZb;Qgk>Qu
z=9HQXqJZnE244%VhP{cK$1~ut$u<<#G_k8BWPxR07hqB8Wbt|&Bl{h%UT~c$$-qDi
z$NHeVWve>-5A_#KME6SE1N8Z30MvOC8c21Vr+AVQV(+Emy*x(^@f^ZI#|#vkHuiKH
z&4%h|(%E$EeijaRQlJ#6m*0vW%zcD%Oh)*!GTQSb2aTq)Qk)7kn9^m;5guCPM|R0k
z&f~4s9yrs6GJ!8(B^^add~{3Ef<mdlR&mVdQwpeKX-q0M?p|J%6=D*1WY`QNtq2vc
z%R5(&%4*IpfLN^REPa<OAzu?JB1DsOGKbQkt&z<Z!#1S5ncZbU;;o3tI%H-xRq>B$
zOb2^tTT#o!24q)Eria=q;T%mPaAQ&qr96S4;CYR_!Hqu4jmF#$=TWeZ!u8&nCp<H=
z9FD3BwL(MzRoWgYbqjRu6b*-6S!@)UBP$Tp5X|iWh@%`D{)8;|e9fe;<JHn&hJZtH
zH$^U{otBg&LQ@J63ORf(-Ocg=+1i*aMUfF^roQS+c{XVTJ1R-!i05Fsf`Us@lao}E
z&<MJ2Nn3OaFSRRDiUF{S?E-{jhG1Q@bjm?o=7{&@RC0#NQ3OPnl&ULyWm7_U#d{3Z
zzv^x$uwpZqB@h9Ae~u}XZvxkz&Es4L9Qw0741SO~<_uAce1IdsUBpbXz;-2^5uHnS
zi?@Ov#2*FInd6WFL<HnC4hzf3HdSZ_NK5&eCCIFF7W3b}#6~TCzVCc@I*KuNmL#QY
z6Ln%a69e!fgA%?0j+GB)S7gYxR>D!-lG{WRq|^)Q9p%0GkMR-x$B&0~fOg?jr)jnD
zBP<5bjV`k}%TsrV#KQ=Tv)7zgB5bA=>Y3<+UBNebqLuLi1TyiPrIg#2L9nczvZ1-B
zB32+x<ljSQDF9D=0O#;+h2SRJry^Oi3=ta*V~U|xzB&j2m*-y$_+rpY@^khq--2TU
z-x-fMT<pa(5S28<3Olms7=91G2M15o&;!PtSzVM%p`XF30mwFFS+Za#2XyHzhD>js
zK^x>JINXL^h}FZ*1uMgTxO5^@fnXc?Kp?r~0v@Fuj&^tYoo^v4K(Wju?gGaeBI+*>
z*=QEWL+r79ClZXuNQ)ygvmv*TZNVTvc-@4D6Yb~u9MiO(apBEi^;t?r)oJWN2WR=&
z!);BhR~phT0Ru!QYRO%a%&j4-N3IgYpV|?L)N}Hhguxjvtr>d_MA53gf})ZCw$tsr
zUY0)FM}kk;Ov=Ktfy(T4%$P3+Y0cP)EjcwutPF>jHp5p#`M0l|F$<ZbE4iQlz!{gW
zf1I-I1M-Rqm-A^lQm_q?*~D2E>OkaR&m$~AwUET7Q^`R(R^-e?bt<yck?Fce5x$&j
z;7f$f0E~<Mlxibl&cJy<b{+Yj72F;{;*!(<e9@-}<xwgSAOF?~B}_?UCFe$x5FU?q
zjHhj=rnEgg$PQQ9X(9^Xu_DD`A^ozL477&aiqMF75R{C+_=K=fZ!SY5v05=5H*(!~
zI|^BXh1k5sj=fWL-9&l<$jE&^&gd5yj_m{&ZO^Y{)a8`2pH@@Z1urg4Xu;4V3N-Su
zZHD@gi<W<n#0U$C-u`7$s#w)5T5Ux&JIGxib4LN`T!DD#k4Og-TdJ=xeZfN)s}k5+
zk|-E?`zbFVzwd~U%u%4<!w5p_<6UwbxkzW#!~z-VeBHlu@$QLt<RpLCNN?JW7gPAZ
z9jSaWeIa4DP{)LSk*L%F;xOqzQT$?|ZA)EB&{<wNqf#QbnIQ(*mHVl4)(G0nWUe##
zS!uBxcmaZKvZhhXI8+EZ*11$K%q`|xQ9k@d&?ShK_OrjTt%2GWH{*nG5F>u$L7FCe
zjV6IWvb&Y=RGa2x6B`b%2)CkGJ}}M6h_sYPha&>ZiSx#B!z!{)%p0B%z@9LM7nQj!
zuN{9nmCu>L)0v6jA2eOGC&C$eC(mXNalqYH3YFzymdjfJrZc)rkb**zy--vWiYZc|
z-BDVgKw58F#r2``Yycn&95_T0xo(1TLU)L|1terS_?qG*9+0goZ*^W_+F)@D$ng`$
zGTLw;!4~kmAPWSEqCx|53`;TO4IkF@PWq@oKIOfAqNKwwq$hBy1^Hk}4uu?Vq<R|^
zOh~|KBb{mj;mMYL-xxZ!u(04EM$8(AThNLUL1izo52d4&w0JQP8~%LyRPWft!!Swd
z_E3ONUmBt3rWFXXVscwW(nfXpWL_iWvjx~g7NZm@KRqcJdT>82vwNt-xaQyS)%8E9
zfAd;>@A4~c^<TdD^w-~h^_#EM|MhG2{mYLWH+}W$wU5@{cCCJJ`T4)Bza0_qkFWj0
zwJ#*he)3Z7gSD5^!`YuN{^_5+?dqjJs{h`#`sr2cdDCw<U3}#)UcCCo*XrL<ub*8$
z_s;r9r7Qo<YxVPsmw*5Bm#@69{=(IlzfphBwfeowm%qKfS>66i-&LP&dh*&Ab0ox9
z|DyiRU%2)M_15~|`YY+n5}`l#|HOX$ssCR{hv<zz{r{2%`IA@Im-X%6escXw`R`{g
zL#e!XIeV@C_IJOS@pH^};VQqF!RHaNaSm%Q=1lz;FMsxJ_5E+LFMqAI>00OWpSG>-
zXa2}8u=;o@bC=)sh5C==8-8pqv$>3CR{ThN1l(MtOq`!}U~#o&hEOQ>(9skqyP4J)
z%)GFZptP3rWq^4280-e;6F}c-S&pOK$#Ey<R<c_8_9mZ&_AQ(khf09nv~$2ua~>}N
zT8orDEvJnJaqKIX5KcUwr@Rv2bc7BY>^Q<<r=aei<ulV+Ol2bf$D*{kP$VE+u)TTT
zl|mejC974iW#;v@K9@UBaz%=`aS$OB5!OpZI1A4XT!2q727HFIN0{N<hj-tVcLa>W
z7d>_$lu(QWQg*>$3Y0FyXXIPk%5C)Gz7iVbWx^0d9K?(yWdb{FfO}~p#<1#o^0Y0A
zRc+bgQxvZhj7F@x5H*^SCjr)RP>0<1LRu3o0Od+Q(#m36%%phGjjnG_rDjJ-KWE|@
zYqQd<LQ{c9nn#qm`639IwVzU%l0nqDrlbQ`K>~+U9GwO)lUgB*Le?OvEKdj&yBl$(
z%bFG3q1m*uWJgGz6$GXKd5`#OzUmdrb3RWC_Tb~8#L$yT$g=;-)niSwjQ1lYtANgf
z0}zgl$u;BL0rgC<<6NK4{SZY57)eJwsRqS6=qoCKyYA)=qYtHX5;1@TN#I^>_^m0-
zN%7Eh7)mnNufDm}bp6?tD2&=W^84}p{%n5#c7A^*zdxPdpUUsY@{7>H3iF+*d-*-i
z?@4}7^Lv)x^Zee+?^b>{^ShDXyH7s+@-JL#>>3Q1s^&4O8U3s+-udnPMHwh(!f+QC
z(@ddd69LVTeFEvTY2rSwWk@*=xMdja993xoX7|%v5ad31h6Ah;$$_x6=dUo5aH9PM
zItL_^V+~*+oH#pDs-738>&+*78ISHfvzr-)HX(tCTjHElPFZta=~!R5a+1;npd|@S
z<vFFt9^qHQ)tx|PFD_f2$OM2zR*?xIvH{VOSJIj4`K3}G&BD@iTJ1-q7wf@PVYz7l
z_i8csgJ}-4l6N8+M>U=t08!+HnFBV5W3}gh<TOkKMm4ZdW&!M(9V(v|$Rs%y$AfE)
z_lN`OdmM@Zpb3S>=?uf-ilbvQ6#H^7b<-|I2of*%gjKSf|GjQcfk=0lC2Xg1ln`JE
zy})-Qf{Nkt##@llQL3UB%nOh*>K!}I@<+ZF-DhGo=ToSjpDL2cL8KMP#RS4??#V;=
z3P)+%QM#N0L?;%__k&12kP4^-#*%m+B`0tQieiI7GZ{p_d&y}>_&SCZlELVtv2)U5
z!Qt7Jxb3n_b=K2tH76$GYlu}~v|_Hcq#(m3aCDZ!k0Y*xQ1<6ZdeQg%jHQG)N|n%@
zb4kXFX&#G}askik#U#Rl0RUyPQS1u%-o9a~Cl&Q&d@ak3JS+g{fF+@(GOo@Ov3~46
zz&9CtSUNz5rHJNC0U(s&ElCaBR7e<=@7a8_sN~lC`+40a3Xc{cld_zYAiY2c++Kuo
zE-F<Lyo&E9dMB+&z8<Y=e}!9lsxwnn5J{ZdGL@IZ<3+*-$q6OK9_Iv#Nb`^|vT!vx
zK$O3kUaSV*1ycZuEm#6DC`kTN1b&#OV0;4RmZNhuWd0$^Y^H(psaPT~Rudpirj|V`
z+4S&M$St45>K4bAk+T;WoAVA2fyCIr(&xCylBmE!hiRW32Fq?UV%ejym8NqA3{iMX
zb19z-Xc7}nfU-Nyb0m3E<nU7PHW>a2!$U%f)GpD@?%e3)1SUQ2l%BAMO2!x4M<5u;
z6BgHTM8ba{n7E+jDTIz<cr#6E&GYbI+%A;mBf(#6n!U(hBF+!;up1zkzDR_TGZ~qU
zEjHyw?n|ifvgKn<-~H{5uy0L`YqinKg^x9Te>jfF^;U@)WDcxFM5%(dSB=9KFFY~c
zi{mf1(>V5xG%X|rn<K;v2N|i71BzYVU6ow61!g9$WLG}*vy`sOM#7A61m;}zmdDOC
zw1^?3_cCuph}d6zbq9zDv>=_*yq0%=UKu1gkmcJ___-3!oQ)^d*5>S}jbbri$Z}ZK
zl<f?mZoVoSS3~$s9+7<$*O-S36O@!dX4%V3EZT=P4sz1J2nsm8aJBCA8$`@ZeA;s?
zA}XJuKABG#Yv^dnsSqY%{H$8kc|~8ax5Z02jjibkn#AtMx{+!tjxrn(CAkoU`Gwhr
z&?PAi_zcc+kcL<>UJW%yt%)45gUWY1MxAw3-3QSZFk!{wt>A{>Kl>s`!5M1}z>e)f
z8(JYf5sK06bFbh-U<c-xcM>2v^2@TYW|<4vmhf{wIgkmw(v_E3O@)ro66uXTFxI|k
zY^^sTC|HKE1g_zR0$xlh`V-n`Z3)ja%vfzk9U6e7J(%WM4zp=F-^YXvyx>gF`?=k2
z4`>sdU9Kv&2SWeg7>H<;yBGjS*#W0aWx`2u5v*hcELHu*+9(_={n?ve#-u(4)Qhf(
z9xdeBCUt(Au~|x6#6YF{J4lxf!GOUO5pJd##l(_^5phI@DQ$6{rHC))XD2P|h4WQ5
zYXo&Zo86Zl5?A2U=rsp3N1aQ5wT7)&NZw2;W6^V#+_s!HLx8ZEpgF=SdW0E+SFg*R
ziPxSkE>+OW2z%JmmZ7vwCLCwew%(q;Dqw$?@6T9`jI*iwer^Dm+H573Qrh;^V#tYc
zLww4_^IZ_YYQBg~T^^Qd7xU_V#BZwvBqaU|H)A2Q1c#E-Vf43Ze?31h)h-_G-gY3}
PX#K~ozWFzs>Nox`2f;(R


From 9fdcd44395f0180a690750d4dd84d80e033a8f15 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 8 Feb 2019 23:59:02 -0500
Subject: [PATCH 360/834] Skelital gui list page

---
 ext/afform/gui/CRM/AfformGui/Page/Gui.php       |  2 +-
 ext/afform/gui/ang/afformGui/afformBuilder.html |  2 +-
 ext/afform/gui/ang/afformGui/afformBuilder.js   | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ext/afform/gui/CRM/AfformGui/Page/Gui.php b/ext/afform/gui/CRM/AfformGui/Page/Gui.php
index 545aaf73de9a..8a10ab9ac017 100644
--- a/ext/afform/gui/CRM/AfformGui/Page/Gui.php
+++ b/ext/afform/gui/CRM/AfformGui/Page/Gui.php
@@ -8,7 +8,7 @@ public function run() {
     $loader->setModules(['afformGui']);
     $loader->setPageName('civicrm/admin/afform');
     $loader->useApp([
-      'defaultRoute' => '/build',
+      'defaultRoute' => '/list',
     ]);
     $loader->load();
     CRM_Utils_System::setTitle('CiviCRM');
diff --git a/ext/afform/gui/ang/afformGui/afformBuilder.html b/ext/afform/gui/ang/afformGui/afformBuilder.html
index 27e9ba42a8ba..8647a08e9148 100644
--- a/ext/afform/gui/ang/afformGui/afformBuilder.html
+++ b/ext/afform/gui/ang/afformGui/afformBuilder.html
@@ -1,4 +1,4 @@
 <div class="crm-container">
-  Hello!
+  <div crm-ui-debug="afform"></div>
 
 </div>
diff --git a/ext/afform/gui/ang/afformGui/afformBuilder.js b/ext/afform/gui/ang/afformGui/afformBuilder.js
index cd440558ea46..aeea181c0621 100644
--- a/ext/afform/gui/ang/afformGui/afformBuilder.js
+++ b/ext/afform/gui/ang/afformGui/afformBuilder.js
@@ -1,9 +1,17 @@
 (function(angular, $, _) {
 
   angular.module('afformGui').config(function($routeProvider) {
-    $routeProvider.when('/build', {
+    $routeProvider.when('/build/:afformName?', {
       controller: 'afformBuilder',
-      templateUrl: '~/afformGui/afformBuilder.html'
+      templateUrl: '~/afformGui/afformBuilder.html',
+      resolve: {
+        afform: function(crmApi4, $route) {
+          var name = $route.current.params.afformName;
+          if (name) {
+            return crmApi4('Afform', 'get', {where: [['name', '=', name]]});
+          }
+        }
+      }
     });
   });
 
@@ -11,11 +19,11 @@
   //   $scope -- This is the set of variables shared between JS and HTML.
   //   crmApi, crmStatus, crmUiHelp -- These are services provided by civicrm-core.
   //   myContact -- The current contact, defined above in config().
-  angular.module('afformGui').controller('afformBuilder', function($scope, crmApi4, crmStatus, crmUiHelp) {
+  angular.module('afformGui').controller('afformBuilder', function($scope, $routeParams, crmApi4, crmStatus, crmUiHelp, afform) {
     // The ts() and hs() functions help load strings for this module.
     var ts = $scope.ts = CRM.ts('afformGui');
     var hs = $scope.hs = crmUiHelp({file: 'CRM/AfformGui/afformBuilder'});
-
+    $scope.afform = afform;
 
   });
 

From 4f4b64873ba6ad357e06349723bcd2be95f282e6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 9 Feb 2019 00:11:58 -0500
Subject: [PATCH 361/834] docs - Update to reflect new naming convention.
 General copy-editing.

---
 ext/afform/docs/angular.md               |  8 ++---
 ext/afform/docs/crud.md                  | 21 ++++++++-----
 ext/afform/docs/embed.md                 | 38 ++++++++++++++++--------
 ext/afform/docs/quickstart.md            | 18 ++++++-----
 ext/afform/docs/roadmap.md               |  5 ++--
 ext/afform/docs/sandbox/planning-v0.2.md |  6 ++--
 ext/afform/docs/writing.md               | 19 ++++++------
 7 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/ext/afform/docs/angular.md b/ext/afform/docs/angular.md
index fc18a01b24b0..e23ba26cd999 100644
--- a/ext/afform/docs/angular.md
+++ b/ext/afform/docs/angular.md
@@ -5,13 +5,13 @@ your form.  There is more to AngularJS -- such as client-side routing, controlle
 need these?  Here are few tricks:
 
 * You can create your own applications and pages with full AngularJS. (See also: [CiviCRM Developer Guide: AngularJS: Quick Start](https://docs.civicrm.org/dev/en/latest/framework/angular/quickstart/)).
-  Then embed the afform (like `helloworld`) in your page with these steps:
-    * Declare a dependency on module (`afformHelloworld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
-    * In your HTML template, use the directive `<div afform-helloworld=""></div>`.
+  Then embed the afform (like `hello-world`) in your page with these steps:
+    * Declare a dependency on module (`helloWorld`). This is usually done in `ang/MYMODULE.ang.php` and/or `ang/MYMODULE.js`.
+    * In your HTML template, use the directive `<div hello-world=""></div>`.
     * If you want to provide extra data, services, or actions for the form author -- then pass them along.
 * You can write your own directives with full AngularJS (e.g. `civix generate:angular-directive`). These directives become available for use in other afforms.
 * If you start out distributing an `afform` and later find it too limiting, then you can change your mind and convert it to static code in full AngularJS.
-  As long as you name it consistently (e.g. `afform-helloworld`), downstream consumers can use the static version as a drop-in replacement.
+  As long as you name it consistently (`angular.module('helloWorld').directive('helloWorld')`), downstream consumers can use the static version as a drop-in replacement.
 
 > *(FIXME: But if you do convert to static, could you still permit downstream folks customize the HTML?  Let's
 > re-assess after we've patched core to allow full participation in the lifecycle of HTML partials.)*
diff --git a/ext/afform/docs/crud.md b/ext/afform/docs/crud.md
index e99174a4dd4c..47e54064e24f 100644
--- a/ext/afform/docs/crud.md
+++ b/ext/afform/docs/crud.md
@@ -4,10 +4,10 @@ Now that we've defined a baseline form, it's possible for administrators and
 GUI applications to inspect the form using the API:
 
 ```
-$ cv api4 afform.get +w name=helloworld
+$ cv api4 afform.get +w name=helloWorld
 {
     "0": {
-        "name": "helloworld",
+        "name": "helloWorld",
         "requires": [
             "afformCore"
         ],
@@ -28,10 +28,10 @@ $ cv api4 afform.get +w name=helloworld
 Additionally, you can also update the forms:
 
 ```
-$ cv api4 afform.update +w name=helloworld +v title="The Foo Bar Screen"
+$ cv api4 afform.update +w name=helloWorld +v title="The Foo Bar Screen"
 {
     "0": {
-        "name": "helloworld",
+        "name": "helloWorld",
         "title": "The Foo Bar Screen"
     }
 }
@@ -41,7 +41,14 @@ A few important things to note about this:
 
 * The changes made through the API are only applied on this site.
 * Once you make a change with the CRUD API, there will be two copies of the form:
-    * `[myextension]/afform/helloworld/` is the default, canonical version.
-    * `[civicrm.files]/afform/helloworld/` is the local, custom version.
-* The `layout` field is stored as an Angular-style HTML document (`layout.html`), so you can edit it on disk like
+    * `[myextension]/ang/helloWorld.aff.html` is the default, canonical version.
+    * `[civicrm.files]/ang/helloWorld.aff.html` is the local, custom version.
+* The `layout` field is stored as an Angular-style HTML document (`helloWorld.aff.html`), so you can edit it on disk like
   normal Angular code. However, when CRUD'ing the `layout` through the API, it is presented in JSON-style.
+
+To undo the change, you can use the `revert` API.  This will remove any local overrides so that the canonical content
+(`[myextension]/ang/helloWorld.aff.html`) is activated.
+
+```
+$ cv api4 afform.revert +w name=helloWorld
+```
diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index 4be406dfe921..e1ac30d5cae5 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -1,23 +1,23 @@
 # Embedding Forms: Afform as reusable building-block
 
 In the [quick-start example](quickstart.md), we registered a new route (`"server_route": "civicrm/hello-world"`) -- this created a
-simple, standalone page with the sole purpose of displaying the `helloworld` form.  What if we want to embed the form
+simple, standalone page with the sole purpose of displaying the `helloWorld` form.  What if we want to embed the form
 somewhere else -- e.g. as a dialog inside an event-listing or membership directory?  Afforms are actually *re-usable
 sub-forms*.
 
-How does this work?  Every `afform` is an *AngularJS directive*.  For example, `helloworld` can be embedded with:
+How does this work?  Every `afform` is an *AngularJS directive*.  For example, `hello-world` can be embedded with:
 
 ```html
-<div afform-helloworld=""></div>
+<div hello-world=""></div>
 ```
 
-Moreover, you can pass options to `helloworld`:
+Moreover, you can pass options to `helloWorld`:
 
 ```html
-<div afform-helloworld="{phaseOfMoon: 'waxing'}"></div>
+<div hello-world="{phaseOfMoon: 'waxing'}"></div>
 ```
 
-Now, in `afform/helloworld/layout.html`, you can use `options.phaseOfMoon`:
+Now, in `ang/helloWorld.aff.html`, you can use `options.phaseOfMoon`:
 
 ```html
 Hello, {{routeParams.name}}. The moon is currently {{options.phaseOfMoon}}.
@@ -29,11 +29,11 @@ Is this useful? Let's suppose you're building a contact record page.
 
 First, we should make a few building-blocks:
 
-1. `afform/contactName/layout.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
-2. `afform/contactAddressess/layout.html` displays a sub-form for editing street addresses.
-3. `afform/contactEmails/layout.html` displays a sub-form for editing email addresses.
+1. `ang/afformContactName.aff.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
+2. `ang/afformContactAddresses.aff.html` displays a sub-form for editing street addresses.
+3. `ang/afformContactEmails.aff.html` displays a sub-form for editing email addresses.
 
-Next, we should create an overall `afform/contact/layout.html` which uses these building-blocks:
+Next, we should create an overall `ang/afformContact.aff.html` which uses these building-blocks:
 
 ```html
 <div ng-form="contactForm">
@@ -49,7 +49,7 @@ Next, we should create an overall `afform/contact/layout.html` which uses these
 </div>
 ```
 
-And we should create a `afform/contact/meta.json` looking like
+And we should create a `ang/afformContact.aff.json` looking like
 
 ```json
 {
@@ -57,8 +57,20 @@ And we should create a `afform/contact/meta.json` looking like
   "requires" : ["afformContactName", "afformContactEmails", "afformContactAddresses"]
 }
 ```
-> *(FIXME: In the parent form's `meta.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
+> *(FIXME: In the parent form's `*.aff.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
 
-What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `afform/contactName/layout.html` --
+We've created new files, so we'll need to flush the file-index
+
+```
+cv flush
+```
+
+and now we can open the page
+
+```
+cv open 'civicrm/contact?cid=100'
+```
+
+What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `ang/afformContactName.aff.html` --
 but all the other components can cleanly track the canonical release. This significantly reduces the costs and risks
 of manging upgrades and changes.
diff --git a/ext/afform/docs/quickstart.md b/ext/afform/docs/quickstart.md
index d67ffc51fcb9..53000a16d677 100644
--- a/ext/afform/docs/quickstart.md
+++ b/ext/afform/docs/quickstart.md
@@ -1,24 +1,28 @@
 # Quick Start: Creating the canonical definition of a basic form
 
 As an extension author, you can define a form along with its default,
-canonical content. Simply create a folder named  `afform/<MY-FORM>`. In
-this example, we create a form named `helloworld`:
+canonical content. Simply create a file  `ang/MYFORM.aff.html`. In
+this example, we create a form named `helloWorld`:
 
 ```
 $ cd /path/to/my/own/extension
-$ mkdir -p afform/helloworld
-$ echo '{"server_route": "civicrm/hello-world"}' > afform/helloworld/meta.json
-$ echo '<div>Hello {{routeParams.name}}</div>' > afform/helloworld/layout.html
+$ mkdir ang
+$ echo '<div>Hello {{routeParams.name}}</div>' > ang/helloWorld.aff.html
+$ echo '{"server_route": "civicrm/hello-world"}' > ang/helloWorld.aff.json
 $ cv flush
 ```
 
 A few things to note:
 
-* We defined a route `civicrm/hello-world`. This is defined in the same routing system used by CiviCRM forms. It also supports properties such as `title` (page title) and `is_public` (defaults to `false`).
-* The file `layout.html` is an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
+* The `ang` folder is the typical location for AngularJS modules in CiviCRM extensions.
+* We defined a route `civicrm/hello-world`. This appears in the same routing system used by CiviCRM forms. It also supports properties such as `title` (page title) and `is_public` (defaults to `false`).
 * After creating a new form or file, we should flush the cache.
 * If you're going to actively edit/revise the content of the file, then you should navigate
   to **Administer > System Settings > Debugging** and disable asset caching.
+* The extension `*.aff.html` represents an AngularJS HTML document. It has access to all the general features of Angular HTML (discussed more later).
+* In AngularJS, there is a distinction between a "module" (unit-of-code to be shared; usually appears as `camelCase`) and a "directive" (a custom
+  HTML element; may appear as `camelCase` or as `kebab-case` depending on context). Afform supports a [tactical simplification](angular.md) in which one
+  `*.aff.html` corresponds to one eponymous module and one eponymous directive.
 
 Now that we've created a form, we'll want to determine its URL. As with most
 CiviCRM forms, the URL depends on the CMS configuration. Here is an example
diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index 4e375694fa3b..3ef1bd771ff3 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -30,12 +30,11 @@ Within this extension, there are things which need updating/addressing:
 * We generally need to provide more services for managing/accessing data (e.g. `crm-api3`).
 * We need a formal way to enumerate the library of available tags/directives/attributes. This, in turn, will drive the
   drag-drop UI and any validation/auditing.
-* Need to implement the `Afform.revert` API to undo local customizations.
 * Haven't decided if we should support a `client_route` property (i.e. defining a skeletal controller and route for any form).
   On the plus side, make it easier to add items to the `civicrm/a` base-page. On the flipside, we don't currently have
-  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div afform-helloworld/>`.
+  a strong use-case, and developers can get the same effect with `civix generate:angular-page` and embedding `<div hello-world/>`.
 * Injecting an afform onto an existing Civi page is currently as difficult as injecting any other AngularJS widget --
-  which is to say that (a) it's fine a pure-Angular page and (b) it's lousy on a non-Angular page.
+  which is to say that (a) it's fine for a Civi-Angular page and (b) it's lousy on a non-Angular page.
 * The data-storage of user-edited forms supports primitive branching and no merging or rebasing.  In an ideal world
   (OHUPA-4), we'd incorporate a merge or rebase mechanism (and provide the diff/export on web+cli).  To reduce unnecessary
   merge-conflicts and allow structured UI for bona-fide merge-conflicts, the diff/merge should be based on HTML elements and
diff --git a/ext/afform/docs/sandbox/planning-v0.2.md b/ext/afform/docs/sandbox/planning-v0.2.md
index 7f7aa406bd12..6f5a5f981269 100644
--- a/ext/afform/docs/sandbox/planning-v0.2.md
+++ b/ext/afform/docs/sandbox/planning-v0.2.md
@@ -60,7 +60,7 @@ $afformPalette = [
 ];
 ```
 
-## Form Metadata: meta.json
+## Form Metadata: *.aff.json
 
 ```json
 {
@@ -75,7 +75,7 @@ $afformPalette = [
 }
 ```
 
-## Form Layout: layout.html
+## Form Layout: *.aff.html
 
 ```html
 <afl-form>
@@ -135,7 +135,7 @@ the `afform-` prefix.
 However, we still want to preserve the strong symmetries in the filesystem where:
 
 * The symbol in HTML (e.g.  `afform-email`) should match the file-name (e.g. 
-  `afform/Email/layout.html` or `afform-email.html`)
+  `afform/Email/layout.html` or `afform-email.aff.html`)
 * The file name in the base-code provided by an extension should match
   the file-name in the local override folder.
 
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index 3b398d297043..1df877d743e7 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -1,6 +1,6 @@
 # Writing Forms: Afform as basic AngularJS templates
 
-In AngularJS, the primary language for orchestrating a screen is HTML. You can do interesting things in Angular
+In AngularJS, the primary language for composing a screen is HTML. You can do interesting things in Angular
 HTML, such as displaying variables and applying directives.
 
 One key concept is *scope* -- the *scope* determines the list of variables which you can access.  By default, `afform`
@@ -8,10 +8,10 @@ creates a scope with these variables:
 
 * `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
   service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
-* `meta`: The stored meta data (`meta.json`) for this form.
+* `meta`: The stored meta data (`*.aff.json`) for this form.
 * `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
 
-Additionally, AngularJS allows *directives* -- these are extra HTML attributes which create behavior. For example:
+Additionally, AngularJS allows *directives* -- these are extensions to HTML (custom tags and attributes) which create behavior. For example:
 
 * `ng-if` will conditionally create or destroy elements in the page.
 * `ng-repeat` will loop through data.
@@ -22,15 +22,15 @@ AngularJS markup.
 
 ## Example: Contact record
 
-Let's say we want `helloworld` to become a basic "View Contact" page. A user
+Let's say we want `civicrm/hello-world` to become a basic "View Contact" page. A user
 would request a URL like:
 
 ```
 http://dmaster.localhost/civicrm/hello-world/#/?cid=123
 ```
 
-How do we use the `cid` to get information about the contact?  Update `layout.html` to fetch data with
-`Contact.get` API and the [afform-api3](https://github.com/totten/afform/blob/master/ang/afformCore/Api3Ctrl.md) utility:
+How do we use the `cid` to get information about the contact?  Update `helloWorld.aff.html` to fetch data with
+`Contact.get` API and call the [afform-api3](https://github.com/totten/afform/blob/master/ang/afformCore/Api3Ctrl.md) utility:
 
 ```html
 <div ng-if="!routeParams.cid">
@@ -58,6 +58,7 @@ How do we use the `cid` to get information about the contact?  Update `layout.ht
 </div>
 ```
 
-This example is useful pedagogically and may be useful in a crunch -- but in the longer term,
-we should have a richer library of directives so that typical user-managed forms don't drill-down
-at this level of detail.
+This example is useful pedagogically and may be useful in a crunch -- but
+for typical user-managed forms, it would be better to use more high-level
+directives.  You can create such directives by [embedding forms](embed.md)
+or creating [conventional AngularJS directives](angular.md).

From 539af322a15fcf9bff42c9a2d0defdce58fdbccd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 9 Feb 2019 00:53:02 -0500
Subject: [PATCH 362/834] Afform.revert - Refuse to revert if there are no
 "where" constraints

Bulk reverting everything would be... a bit... dangerous?
---
 ext/afform/core/Civi/Api4/Action/Afform/Revert.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
index f194e6f17538..377dd2683ace 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
@@ -9,6 +9,10 @@ class Revert extends Get {
   protected $select = ['name'];
 
   public function _run(Result $result) {
+    if (empty($this->where)) {
+      throw new \API_Exception('Cannot revert with no "where" paramater specified');
+    }
+
     $scanner = \Civi::service('afform_scanner');
 
     parent::_run($result);

From aff08e16e8c3c7bdcda23599f54c03cf6c3990e6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 9 Feb 2019 16:16:33 -0500
Subject: [PATCH 363/834] Civi\Api4\Afform - Use simple (non-db)
 implementation. Fix typos in namespaces.

---
 .../core/Civi/Api4/Action/Afform/Create.php   |  2 +-
 .../core/Civi/Api4/Action/Afform/Delete.php   |  2 +-
 .../core/Civi/Api4/Action/Afform/Get.php      |  2 +-
 .../Civi/Api4/Action/Afform/GetFields.php     |  2 +-
 ext/afform/core/Civi/Api4/Afform.php          | 55 +++++++++++++++++--
 5 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Create.php b/ext/afform/core/Civi/Api4/Action/Afform/Create.php
index c75a492429da..d38c5d659aeb 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Create.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace civi\Api4\Action\Afform;
+namespace Civi\Api4\Action\Afform;
 
 use Civi\API\Exception\NotImplementedException;
 use Civi\Api4\Traits\AfformCrudTrait;
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Delete.php b/ext/afform/core/Civi/Api4/Action/Afform/Delete.php
index 84cd2d8f904b..b00aaaf5818d 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Delete.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace civi\Api4\Action\Afform;
+namespace Civi\Api4\Action\Afform;
 
 use Civi\API\Exception\NotImplementedException;
 use Civi\Api4\Traits\AfformCrudTrait;
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 53cded301128..7deab715a08e 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace civi\Api4\Action\Afform;
+namespace Civi\Api4\Action\Afform;
 
 use Civi\Api4\Traits\AfformCrudTrait;
 
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php b/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
index 5a57591eae63..a13665a5ae88 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace civi\Api4\Action\Afform;
+namespace Civi\Api4\Action\Afform;
 
 use Civi\Api4\Generic\AbstractAction;
 use Civi\Api4\Generic\Result;
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 38f7bb24de81..b4b2e79d68a4 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -2,14 +2,61 @@
 
 namespace Civi\Api4;
 
-use Civi\Api4\Generic\AbstractEntity;
+use Civi\Api4\Action\Afform\Create;
+use Civi\Api4\Action\Afform\Delete;
+use Civi\Api4\Action\Afform\Get;
+use Civi\Api4\Action\Afform\Revert;
+use Civi\Api4\Action\Afform\Update;
 
 /**
  * Class Afform
  * @package Civi\Api4
- *
- * @method static \Civi\Api4\Action\Afform\Revert revert
  */
-class Afform extends AbstractEntity {
+class Afform {
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Get
+   */
+  public static function get() {
+    return new Get('Afform');
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Revert
+   */
+  public static function revert() {
+    return new Revert('Afform');
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Update
+   */
+  public static function update() {
+    return new Update('Afform');
+  }
+
+  //  /**
+  //   * @return \Civi\Api4\Action\Afform\Create
+  //   */
+  //  public static function create() {
+  //    return new Create('Afform');
+  //  }
+
+  //  /**
+  //   * @return \Civi\Api4\Action\Afform\Delete
+  //   */
+  //  public static function delete() {
+  //    return new Delete('Afform');
+  //  }
+
+  /**
+   * @return array
+   */
+  public static function permissions() {
+    return [
+      "meta" => ["access CiviCRM"],
+      "default" => ["administer CiviCRM"],
+    ];
+  }
 
 }

From 01542df42ec14b711b961922eff83eab2a99cca8 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 9 Feb 2019 16:26:34 -0500
Subject: [PATCH 364/834] AfformTestCase - Extract base for more tests

---
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 29 +-------------
 .../tests/phpunit/api/v4/AfformTestCase.php   | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php

diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 97d7da937e94..dcf29cca6115 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -8,34 +8,7 @@
  * This is a generic test class implemented with PHPUnit.
  * @group headless
  */
-class api_v4_AfformTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, TransactionalInterface {
-
-  /**
-   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
-   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
-   */
-  public function setUpHeadless() {
-    return \Civi\Test::headless()
-      ->install(['org.civicrm.api4', 'org.civicrm.afform', 'org.civicrm.afform-mock'])
-      ->apply();
-  }
-
-  /**
-   * The setup() method is executed before the test is executed (optional).
-   */
-  public function setUp() {
-    parent::setUp();
-    CRM_Core_Config::singleton()->userPermissionTemp = new CRM_Core_Permission_Temp();
-    CRM_Core_Config::singleton()->userPermissionTemp->grant('administer CiviCRM');
-  }
-
-  /**
-   * The tearDown() method is executed after the test was executed (optional)
-   * This can be used for cleanup.
-   */
-  public function tearDown() {
-    parent::tearDown();
-  }
+class api_v4_AfformTest extends api_v4_AfformTestCase {
 
   public function getBasicDirectives() {
     return [
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
new file mode 100644
index 000000000000..94f16b8f916a
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
@@ -0,0 +1,38 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Base class for Afform API tests.
+ */
+abstract class api_v4_AfformTestCase extends \PHPUnit_Framework_TestCase implements HeadlessInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()
+      ->install(['org.civicrm.api4', 'org.civicrm.afform', 'org.civicrm.afform-mock'])
+      ->apply();
+  }
+
+  /**
+   * The setup() method is executed before the test is executed (optional).
+   */
+  public function setUp() {
+    parent::setUp();
+    CRM_Core_Config::singleton()->userPermissionTemp = new CRM_Core_Permission_Temp();
+    CRM_Core_Config::singleton()->userPermissionTemp->grant('administer CiviCRM');
+  }
+
+  /**
+   * The tearDown() method is executed after the test was executed (optional)
+   * This can be used for cleanup.
+   */
+  public function tearDown() {
+    parent::tearDown();
+  }
+
+}

From e00e4e87e431a6390fb27f4824f519c71564a540 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 10 Feb 2019 20:04:36 -0500
Subject: [PATCH 365/834] WIP afformList angular page

---
 ext/afform/gui/ang/afformGui/afformList.html  |  4 +++
 ext/afform/gui/ang/afformGui/afformList.js    | 27 +++++++++++++++++++
 .../templates/CRM/AfformGui/afformList.hlp    |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 ext/afform/gui/ang/afformGui/afformList.html
 create mode 100644 ext/afform/gui/ang/afformGui/afformList.js
 create mode 100644 ext/afform/gui/templates/CRM/AfformGui/afformList.hlp

diff --git a/ext/afform/gui/ang/afformGui/afformList.html b/ext/afform/gui/ang/afformGui/afformList.html
new file mode 100644
index 000000000000..165d91bc0258
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui/afformList.html
@@ -0,0 +1,4 @@
+<div class="crm-container">
+  <div crm-ui-debug="afforms"></div>
+
+</div>
diff --git a/ext/afform/gui/ang/afformGui/afformList.js b/ext/afform/gui/ang/afformGui/afformList.js
new file mode 100644
index 000000000000..14d78c214c27
--- /dev/null
+++ b/ext/afform/gui/ang/afformGui/afformList.js
@@ -0,0 +1,27 @@
+(function(angular, $, _) {
+
+  angular.module('afformGui').config(function($routeProvider) {
+    $routeProvider.when('/list', {
+      controller: 'afformList',
+      templateUrl: '~/afformGui/afformList.html',
+      resolve: {
+        afforms: function(crmApi4) {
+          return crmApi4('Afform', 'get');
+        }
+      }
+    });
+  });
+
+  // The controller uses *injection*. This default injects a few things:
+  //   $scope -- This is the set of variables shared between JS and HTML.
+  //   crmApi, crmStatus, crmUiHelp -- These are services provided by civicrm-core.
+  //   myContact -- The current contact, defined above in config().
+  angular.module('afformGui').controller('afformList', function($scope, crmApi4, crmStatus, crmUiHelp, afforms) {
+    // The ts() and hs() functions help load strings for this module.
+    var ts = $scope.ts = CRM.ts('afformGui');
+    var hs = $scope.hs = crmUiHelp({file: 'CRM/AfformGui/afformList'});
+    $scope.afforms = afforms;
+
+  });
+
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/templates/CRM/AfformGui/afformList.hlp b/ext/afform/gui/templates/CRM/AfformGui/afformList.hlp
new file mode 100644
index 000000000000..55a904ca6d2e
--- /dev/null
+++ b/ext/afform/gui/templates/CRM/AfformGui/afformList.hlp
@@ -0,0 +1 @@
+{* help for Angular afformGui *}

From f3062b8c39034ca273681ca487f1a04cd2f44752 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 9 Feb 2019 18:37:29 -0500
Subject: [PATCH 366/834] Civi\Api4\Afform - Refactor to use BasicGetAction,
 BasicUpdateAction, BasicBatchAction

---
 .../core/Civi/Api4/Action/Afform/Create.php   |  17 ---
 .../core/Civi/Api4/Action/Afform/Delete.php   |  19 ---
 .../core/Civi/Api4/Action/Afform/Get.php      |  11 --
 .../Civi/Api4/Action/Afform/GetFields.php     |  14 --
 .../core/Civi/Api4/Action/Afform/Revert.php   |  40 ------
 .../core/Civi/Api4/Action/Afform/Update.php   |  13 --
 ext/afform/core/Civi/Api4/Afform.php          | 136 ++++++++++++++----
 .../core/Civi/Api4/Traits/AfformCrudTrait.php |  98 -------------
 8 files changed, 110 insertions(+), 238 deletions(-)
 delete mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Create.php
 delete mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Delete.php
 delete mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Get.php
 delete mode 100644 ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
 delete mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Revert.php
 delete mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Update.php
 delete mode 100644 ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Create.php b/ext/afform/core/Civi/Api4/Action/Afform/Create.php
deleted file mode 100644
index d38c5d659aeb..000000000000
--- a/ext/afform/core/Civi/Api4/Action/Afform/Create.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Civi\Api4\Action\Afform;
-
-use Civi\API\Exception\NotImplementedException;
-use Civi\Api4\Traits\AfformCrudTrait;
-use Civi\Api4\Generic\Result;
-
-class Create extends \Civi\Api4\Action\Create {
-
-  use AfformCrudTrait;
-
-  public function _run(Result $result) {
-    throw new NotImplementedException("Not supported: Afform.create"); // FIXME
-  }
-
-}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Delete.php b/ext/afform/core/Civi/Api4/Action/Afform/Delete.php
deleted file mode 100644
index b00aaaf5818d..000000000000
--- a/ext/afform/core/Civi/Api4/Action/Afform/Delete.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Civi\Api4\Action\Afform;
-
-use Civi\API\Exception\NotImplementedException;
-use Civi\Api4\Traits\AfformCrudTrait;
-use Civi\Api4\Generic\Result;
-
-class Delete extends \Civi\Api4\Action\Delete {
-
-  use AfformCrudTrait;
-
-  protected $select = ['name'];
-
-  public function _run(Result $result) {
-    throw new NotImplementedException("Not supported: Afform.delete"); // FIXME
-  }
-
-}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
deleted file mode 100644
index 7deab715a08e..000000000000
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Civi\Api4\Action\Afform;
-
-use Civi\Api4\Traits\AfformCrudTrait;
-
-class Get extends \Civi\Api4\Action\Get {
-
-  use AfformCrudTrait;
-
-}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php b/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
deleted file mode 100644
index a13665a5ae88..000000000000
--- a/ext/afform/core/Civi/Api4/Action/Afform/GetFields.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Civi\Api4\Action\Afform;
-
-use Civi\Api4\Generic\AbstractAction;
-use Civi\Api4\Generic\Result;
-
-class GetFields extends \Civi\Api4\Action\GetFields {
-
-  public function _run(Result $result) {
-    // FIXME
-  }
-
-}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php b/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
deleted file mode 100644
index 377dd2683ace..000000000000
--- a/ext/afform/core/Civi/Api4/Action/Afform/Revert.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Civi\Api4\Action\Afform;
-
-use Civi\Api4\Generic\Result;
-
-class Revert extends Get {
-
-  protected $select = ['name'];
-
-  public function _run(Result $result) {
-    if (empty($this->where)) {
-      throw new \API_Exception('Cannot revert with no "where" paramater specified');
-    }
-
-    $scanner = \Civi::service('afform_scanner');
-
-    parent::_run($result);
-
-    $files = [\CRM_Afform_AfformScanner::METADATA_FILE, \CRM_Afform_AfformScanner::LAYOUT_FILE];
-
-    foreach ($result as $afform) {
-      foreach ($files as $file) {
-        $metaPath = $scanner->createSiteLocalPath($afform['name'], $file);
-        if (file_exists($metaPath)) {
-          if (!@unlink($metaPath)) {
-            throw new \API_Exception("Failed to remove afform overrides in $file");
-          }
-        }
-      }
-    }
-
-    // We may have changed list of files covered by the cache.
-    $scanner->clear();
-
-    // FIXME if `server_route` changes, then flush the menu cache.
-    // FIXME if asset-caching is enabled, then flush the asset cache
-  }
-
-}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Update.php b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
deleted file mode 100644
index f89f23e0c3b8..000000000000
--- a/ext/afform/core/Civi/Api4/Action/Afform/Update.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Civi\Api4\Action\Afform;
-
-use Civi\Api4\Traits\AfformCrudTrait;
-
-class Update extends \Civi\Api4\Action\Update {
-
-  use AfformCrudTrait;
-
-  protected $select = ['name'];
-
-}
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index b4b2e79d68a4..9136f940d852 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -2,52 +2,136 @@
 
 namespace Civi\Api4;
 
-use Civi\Api4\Action\Afform\Create;
-use Civi\Api4\Action\Afform\Delete;
-use Civi\Api4\Action\Afform\Get;
-use Civi\Api4\Action\Afform\Revert;
-use Civi\Api4\Action\Afform\Update;
+use Civi\Api4\Generic\AbstractEntity;
+use Civi\Api4\Generic\BasicBatchAction;
+use Civi\Api4\Generic\BasicGetAction;
+use Civi\Api4\Generic\BasicUpdateAction;
 
 /**
  * Class Afform
  * @package Civi\Api4
  */
-class Afform {
+class Afform extends AbstractEntity {
 
   /**
-   * @return \Civi\Api4\Action\Afform\Get
+   * @return BasicGetAction
    */
   public static function get() {
-    return new Get('Afform');
+    return new BasicGetAction('Afform', __FUNCTION__, function(BasicGetAction $action) {
+      /** @var \CRM_Afform_AfformScanner $scanner */
+      $scanner = \Civi::service('afform_scanner');
+      $converter = new \CRM_Afform_ArrayHtml();
+
+      $where = $action->getWhere();
+      if (count($where) === 1 && $where[0][0] === 'name' && $where[0][1] == '=') {
+        $names = [$where[0][2]];
+      }
+      else {
+        $names = array_keys($scanner->findFilePaths());
+      }
+
+      $values = [];
+      foreach ($names as $name) {
+        $record = $scanner->getMeta($name);
+        $layout = $scanner->findFilePath($name, 'aff.html');
+        if ($layout) {
+          // FIXME check for file existence+substance+validity
+          $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
+        }
+        $values[] = $record;
+      }
+
+      return $values;
+    });
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Revert
+   * @return BasicBatchAction
    */
   public static function revert() {
-    return new Revert('Afform');
+    return new BasicBatchAction('Afform', __FUNCTION__, ['name'], function($item, BasicBatchAction $action) {
+      $scanner = \Civi::service('afform_scanner');
+      $files = [
+        \CRM_Afform_AfformScanner::METADATA_FILE,
+        \CRM_Afform_AfformScanner::LAYOUT_FILE
+      ];
+
+      foreach ($files as $file) {
+        $metaPath = $scanner->createSiteLocalPath($item['name'], $file);
+        if (file_exists($metaPath)) {
+          if (!@unlink($metaPath)) {
+            throw new \API_Exception("Failed to remove afform overrides in $file");
+          }
+        }
+      }
+
+      // We may have changed list of files covered by the cache.
+      $scanner->clear();
+
+      // FIXME if `server_route` changes, then flush the menu cache.
+      // FIXME if asset-caching is enabled, then flush the asset cache
+
+      return $item;
+    });
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Update
+   * @return BasicUpdateAction
    */
   public static function update() {
-    return new Update('Afform');
-  }
+    $save = function ($item, BasicUpdateAction $action) {
+      /** @var \CRM_Afform_AfformScanner $scanner */
+      $scanner = \Civi::service('afform_scanner');
+      $converter = new \CRM_Afform_ArrayHtml();
 
-  //  /**
-  //   * @return \Civi\Api4\Action\Afform\Create
-  //   */
-  //  public static function create() {
-  //    return new Create('Afform');
-  //  }
-
-  //  /**
-  //   * @return \Civi\Api4\Action\Afform\Delete
-  //   */
-  //  public static function delete() {
-  //    return new Delete('Afform');
-  //  }
+      if (empty($item['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
+        throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
+      }
+      $name = $item['name'];
+
+      // FIXME validate all field data.
+      $updates = _afform_fields_filter($item);
+
+      // Create or update aff.html.
+      if (isset($updates['layout'])) {
+        $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
+        \ CRM_Utils_File::createDir(dirname($layoutPath));
+        file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
+        // FIXME check for writability then success. Report errors.
+      }
+
+      // Create or update *.aff.json.
+      $orig = \Civi\Api4\Afform::get()
+        ->setCheckPermissions($action->getCheckPermissions())
+        ->addWhere('name', '=', $name)
+        ->execute();
+
+      if (isset($orig[0])) {
+        $meta = _afform_fields_filter(array_merge($orig[0], $updates));
+      }
+      else {
+        $meta = $updates;
+      }
+      unset($meta['layout']);
+      unset($meta['name']);
+      if (!empty($meta)) {
+        $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
+        // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
+        \CRM_Utils_File::createDir(dirname($metaPath));
+        file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
+        // FIXME check for writability then success. Report errors.
+      }
+
+      // We may have changed list of files covered by the cache.
+      $scanner->clear();
+
+      // FIXME if `server_route` changes, then flush the menu cache.
+      // FIXME if asset-caching is enabled, then flush the asset cache.
+
+      return $updates;
+    };
+    return new BasicUpdateAction('Afform', __FUNCTION__, $save, 'name');
+  }
 
   /**
    * @return array
diff --git a/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php b/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
deleted file mode 100644
index 6360c9f05d70..000000000000
--- a/ext/afform/core/Civi/Api4/Traits/AfformCrudTrait.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Civi\Api4\Traits;
-
-use Civi\Api4\Generic\ArrayRetrievalTrait;
-
-trait AfformCrudTrait {
-
-  use ArrayRetrievalTrait;
-
-  public function getObjects() {
-    /** @var \CRM_Afform_AfformScanner $scanner */
-    $scanner = \Civi::service('afform_scanner');
-    $converter = new \CRM_Afform_ArrayHtml();
-
-    if (count($this->where) === 1 && $this->where[0][0] === 'name' && $this->where[0][1] == '=') {
-      $names = [$this->where[0][2]];
-    }
-    else {
-      $names = array_keys($scanner->findFilePaths());
-    }
-
-    $values = [];
-    foreach ($names as $name) {
-      $record = $scanner->getMeta($name);
-      $layout = $scanner->findFilePath($name, 'aff.html');
-      if ($layout) {
-        // FIXME check for file existence+substance+validity
-        $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
-      }
-      $values[] = $record;
-    }
-
-    return $this->processArrayData($values);
-  }
-
-  /**
-   * Write a record as part of a create/update action.
-   *
-   * @param array $record
-   *   The record to write to the DB.
-   * @return array
-   *   The record after being written to the DB (e.g. including newly assigned "id").
-   * @throws \API_Exception
-   */
-  protected function writeObject($record) {
-    /** @var \CRM_Afform_AfformScanner $scanner */
-    $scanner = \Civi::service('afform_scanner');
-    $converter = new \CRM_Afform_ArrayHtml();
-
-    if (empty($record['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $record['name'])) {
-      throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
-    }
-    $name = $record['name'];
-
-    // FIXME validate all field data.
-    $updates = _afform_fields_filter($record);
-
-    // Create or update aff.html.
-    if (isset($updates['layout'])) {
-      $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
-      \ CRM_Utils_File::createDir(dirname($layoutPath));
-      file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
-      // FIXME check for writability then success. Report errors.
-    }
-
-    // Create or update *.aff.json.
-    $orig = \Civi\Api4\Afform::get()
-      ->setCheckPermissions($this->getCheckPermissions())
-      ->addWhere('name', '=', $name)
-      ->execute();
-
-    if (isset($orig[0])) {
-      $meta = _afform_fields_filter(array_merge($orig[0], $updates));
-    }
-    else {
-      $meta = $updates;
-    }
-    unset($meta['layout']);
-    unset($meta['name']);
-    if (!empty($meta)) {
-      $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
-      // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
-      \CRM_Utils_File::createDir(dirname($metaPath));
-      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
-      // FIXME check for writability then success. Report errors.
-    }
-
-    // We may have changed list of files covered by the cache.
-    $scanner->clear();
-
-    // FIXME if `server_route` changes, then flush the menu cache.
-    // FIXME if asset-caching is enabled, then flush the asset cache.
-
-    return $updates;
-  }
-
-}

From f9a6cd03982c619cf8b6931bdc45f1df9a095158 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 11 Feb 2019 14:53:49 -0800
Subject: [PATCH 367/834] Add skeletal APIs for AfformPalette and AfformTag

---
 ext/afform/core/Civi/Api4/AfformPalette.php   | 46 +++++++++++++++++++
 ext/afform/core/Civi/Api4/AfformTag.php       | 45 ++++++++++++++++++
 .../phpunit/api/v4/AfformPaletteTest.php      | 24 ++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 ext/afform/core/Civi/Api4/AfformPalette.php
 create mode 100644 ext/afform/core/Civi/Api4/AfformTag.php
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php

diff --git a/ext/afform/core/Civi/Api4/AfformPalette.php b/ext/afform/core/Civi/Api4/AfformPalette.php
new file mode 100644
index 000000000000..ad0534f12b0f
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/AfformPalette.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Civi\Api4;
+
+use Civi\Api4\Generic\AbstractEntity;
+use Civi\Api4\Generic\BasicGetAction;
+
+/**
+ * Class AfformPalette
+ * @package Civi\Api4
+ */
+class AfformPalette extends AbstractEntity {
+
+  /**
+   * @return BasicGetAction
+   */
+  public static function get() {
+    return new BasicGetAction('AfformPalette', __FUNCTION__, function (BasicGetAction $action) {
+      return [
+        [
+          'id' => 'Parent:afl-name',
+          'entity' => 'Parent',
+          'title' => 'Name',
+          'template' => '<afl-name contact-id="entities.parent.id" afl-label="Name"/>',
+        ],
+        [
+          'id' => 'Parent:afl-address',
+          'entity' => 'Parent',
+          'title' => 'Address',
+          'template' => '<afl-address contact-id="entities.parent.id" afl-label="Address"/>',
+        ],
+      ];
+    });
+  }
+
+  /**
+   * @return array
+   */
+  public static function permissions() {
+    return [
+      "meta" => ["access CiviCRM"],
+      "default" => ["administer CiviCRM"],
+    ];
+  }
+
+}
diff --git a/ext/afform/core/Civi/Api4/AfformTag.php b/ext/afform/core/Civi/Api4/AfformTag.php
new file mode 100644
index 000000000000..763664e11b24
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/AfformTag.php
@@ -0,0 +1,45 @@
+<?php
+namespace Civi\Api4;
+
+use Civi\Api4\Generic\AbstractEntity;
+use Civi\Api4\Generic\BasicGetAction;
+
+/**
+ * Class AfformTag
+ * @package Civi\Api4
+ */
+class AfformTag extends AbstractEntity {
+
+  /**
+   * @return BasicGetAction
+   */
+  public static function get() {
+    return new BasicGetAction('AfformTag', __FUNCTION__, function (BasicGetAction $action) {
+      return [
+        [
+          'name' => 'afl-entity',
+          'attrs' => ['entity-name', 'matching-rule', 'assigned-values'],
+        ],
+        [
+          'name' => 'afl-name',
+          'attrs' => ['contact-id', 'afl-label'],
+        ],
+        [
+          'name' => 'afl-contact-email',
+          'attrs' => ['contact-id', 'afl-label'],
+        ],
+      ];
+    });
+  }
+
+  /**
+   * @return array
+   */
+  public static function permissions() {
+    return [
+      "meta" => ["access CiviCRM"],
+      "default" => ["administer CiviCRM"],
+    ];
+  }
+
+}
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php
new file mode 100644
index 000000000000..c181150bbd8a
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php
@@ -0,0 +1,24 @@
+<?php
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * AfformPalette API Test
+ * @group headless
+ */
+class api_v4_AfformPaletteTest extends api_v4_AfformTestCase {
+
+  public function testGetPalette() {
+    $r = Civi\Api4\AfformPalette::get()
+      ->addWhere('id', '=', 'Parent:afl-name')
+      ->execute();
+    $this->assertEquals(1, $r->count());
+
+    $r = Civi\Api4\AfformPalette::get()
+      ->setLimit(10)
+      ->execute();
+    $this->assertTrue($r->count() > 1);
+  }
+
+}

From 15b11f479ace1677797baa540e1c700f41ac48d0 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 16 Apr 2019 18:24:18 -0400
Subject: [PATCH 368/834] Add getFields to api4 classes

---
 ext/afform/core/Civi/Api4/Afform.php        | 30 +++++++++++++++++++++
 ext/afform/core/Civi/Api4/AfformPalette.php | 20 ++++++++++++++
 ext/afform/core/Civi/Api4/AfformTag.php     | 14 ++++++++++
 3 files changed, 64 insertions(+)

diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 9136f940d852..8856f3bbe183 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -5,6 +5,7 @@
 use Civi\Api4\Generic\AbstractEntity;
 use Civi\Api4\Generic\BasicBatchAction;
 use Civi\Api4\Generic\BasicGetAction;
+use Civi\Api4\Generic\BasicGetFieldsAction;
 use Civi\Api4\Generic\BasicUpdateAction;
 
 /**
@@ -133,6 +134,35 @@ public static function update() {
     return new BasicUpdateAction('Afform', __FUNCTION__, $save, 'name');
   }
 
+  public static function getFields() {
+    return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
+      return [
+        [
+          'name' => 'name',
+        ],
+        [
+          'name' => 'requires',
+        ],
+        [
+          'name' => 'title',
+        ],
+        [
+          'name' => 'description',
+        ],
+        [
+          'name' => 'is_public',
+          'data_type' => 'Boolean',
+        ],
+        [
+          'name' => 'server_route',
+        ],
+        [
+          'name' => 'layout',
+        ],
+      ];
+    });
+  }
+
   /**
    * @return array
    */
diff --git a/ext/afform/core/Civi/Api4/AfformPalette.php b/ext/afform/core/Civi/Api4/AfformPalette.php
index ad0534f12b0f..d6bb94687907 100644
--- a/ext/afform/core/Civi/Api4/AfformPalette.php
+++ b/ext/afform/core/Civi/Api4/AfformPalette.php
@@ -4,6 +4,7 @@
 
 use Civi\Api4\Generic\AbstractEntity;
 use Civi\Api4\Generic\BasicGetAction;
+use Civi\Api4\Generic\BasicGetFieldsAction;
 
 /**
  * Class AfformPalette
@@ -33,6 +34,25 @@ public static function get() {
     });
   }
 
+  public static function getFields() {
+    return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
+      return [
+        [
+          'name' => 'id',
+        ],
+        [
+          'name' => 'entity',
+        ],
+        [
+          'name' => 'title',
+        ],
+        [
+          'name' => 'template',
+        ],
+      ];
+    });
+  }
+
   /**
    * @return array
    */
diff --git a/ext/afform/core/Civi/Api4/AfformTag.php b/ext/afform/core/Civi/Api4/AfformTag.php
index 763664e11b24..a5f91d5f4c76 100644
--- a/ext/afform/core/Civi/Api4/AfformTag.php
+++ b/ext/afform/core/Civi/Api4/AfformTag.php
@@ -3,6 +3,7 @@
 
 use Civi\Api4\Generic\AbstractEntity;
 use Civi\Api4\Generic\BasicGetAction;
+use Civi\Api4\Generic\BasicGetFieldsAction;
 
 /**
  * Class AfformTag
@@ -32,6 +33,19 @@ public static function get() {
     });
   }
 
+  public static function getFields() {
+    return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
+      return [
+        [
+          'name' => 'name',
+        ],
+        [
+          'name' => 'attrs',
+        ],
+      ];
+    });
+  }
+
   /**
    * @return array
    */

From 09f973555f26b64caf3c2891a78a01731ac81608 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 2 May 2019 14:02:58 -0700
Subject: [PATCH 369/834] Update planning-v0.2.md

---
 ext/afform/docs/sandbox/planning-v0.2.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/docs/sandbox/planning-v0.2.md b/ext/afform/docs/sandbox/planning-v0.2.md
index 6f5a5f981269..38a576f22729 100644
--- a/ext/afform/docs/sandbox/planning-v0.2.md
+++ b/ext/afform/docs/sandbox/planning-v0.2.md
@@ -18,14 +18,14 @@ The data is saved to 4 entities:
 ## General Metadata
 
 ```php
-// The "library" is a definition of available tags/directives. It can be
+// The tag library is a definition of available tags/directives. It can be
 // used to validate form definitions; to advise sysadmins; and (probably)
 // to generate the $palette.
 //
 // Must NOT be required at runtime. Only required for administration.
 //
 // CONSIDER: Specifying non-conventional names for design/props variants
-$afformLibrary = [
+$afformTags = [
   'afl-entity' =>[
     'attrs' => ['entity-name', 'matching-rule', 'assigned-values'],
   ],

From cca41f345e47851531fc19c3cb4fa229b84805c1 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 2 May 2019 14:34:51 -0700
Subject: [PATCH 370/834] Update planning-v0.2.md

---
 ext/afform/docs/sandbox/planning-v0.2.md | 32 +++++++++++++-----------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/ext/afform/docs/sandbox/planning-v0.2.md b/ext/afform/docs/sandbox/planning-v0.2.md
index 38a576f22729..2792a7c44449 100644
--- a/ext/afform/docs/sandbox/planning-v0.2.md
+++ b/ext/afform/docs/sandbox/planning-v0.2.md
@@ -44,20 +44,24 @@ $afformTags = [
 // format (e.g. `entity,id`).
 //
 // Must NOT be required at runtime. Only required for administration.
-$afformPalette = [
-  [
-    'id' => 'Parent:afl-name', /* string; should be stable but otherwise opaque to consumer */
-    'entity' => 'Parent',
-    'title' => 'Name',
-    'template' => '<afl-name contact-id="entities.parent.id" afl-label="Name"/>',
-  ],
-  [
-    'id' => 'Parent:afl-name',
-    'entity' => 'Parent',
-    'title' => 'Address',
-    'template' => '<afl-address contact-id="entities.parent.id" afl-label="Address"/>',
-  ],
-];
+function computePalette($entityType) {
+  return [
+    [
+      'group' => 'Blocks',
+      'title' => 'Name',
+      'template' => '<afl-name entity="%%ENTITY%%" afl-label="Name"/>',
+    ],
+    [
+      'title' => 'Address',
+      'template' => '<afl-address entity="%%ENTITY%%" afl-label="Address"/>',
+    ], 
+    [
+      'group' => 'Fields',
+      'title' => 'First Name',
+      'template' => '<afl-api-field entity="%%ENTITY%%" afl-field="first_name" afl-label="First Name"/>',
+    ],
+  ];
+}
 ```
 
 ## Form Metadata: *.aff.json

From 636cdc8048b2a8f46bfd88fea1b121bb8f21c07a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 2 May 2019 19:12:06 -0700
Subject: [PATCH 371/834] Create planning-v0.3.md

---
 ext/afform/docs/sandbox/planning-v0.3.md | 145 +++++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 ext/afform/docs/sandbox/planning-v0.3.md

diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
new file mode 100644
index 000000000000..3fdbb7393965
--- /dev/null
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -0,0 +1,145 @@
+# Progression of sketches of canvas content
+
+```html
+<script class="afform-meta-1234abcd" type="text/json"> {
+  "entities": [
+    "parent": {
+      "title": "Parent",
+      "type": "Individual"
+    },
+    "spouse": {
+      "title": "Spouse".
+      "type": "Individual"
+    }
+  ]
+}
+</script>
+  
+<div afform-entity-ctrl="afform-meta-1234abcd">
+  <af-address contact-id="entities.parent.id" af-label="Address" ng-if="" ng-classes="{foo: name == 'Frank'}" />
+  <af-field entity="entities.parent" entity-type="contact" field="first_name" af-label="First Name"/>
+  <af-field entity="entities.parent" entity-type="contact" field="last_name" af-label="Last Name"/>
+</div>
+```
+
+
+-------------
+
+```html
+<div afform-entity-ctrl="myEntities">
+  <afform-entity type="Individual" name="parent" title="Parent" />
+  <afform-entity type="Individual" name="spouse" title="Spouse" />
+  
+  <af-name entity="myEntities.parent" af-label="Address" />
+  <af-address entity="myEntities.parent" af-label="Address" />
+  <af-field entity="myEntities.parent" entity-type="contact" field="first_name" af-label="First Name"/>
+  <af-field entity="myEntities.parent" entity-type="contact" field="last_name" af-label="Last Name"/>
+</div>
+```
+
+------------------
+
+```html
+<div afform-entity-ctrl="myEntities">
+
+  <af-entity af-type="Individual" af-name="parent" af-label="Parent">
+    <af-name af-label="Name" />
+    <af-email af-label="Email" />
+  </af-entity>
+  
+  <af-entity af-type="Individual" af-name="spouse" af-title="Spouse">
+    <af-name af-label="Spouse Name" />
+    <af-email af-label="Spouse Email" />
+  </af-entity>
+
+  <af-entity af-type="Individual" af-name="parent" af-title="Parent">
+    <af-address af-label="Address" />
+  </af-entity>
+
+</div>
+```
+
+---------
+
+```html
+<!-- 1. s/entity/model-->
+<af-model-list>
+
+  <af-model af-type="Individual" af-name="parent" af-label="Parent">
+    <af-name af-label="Name" />
+    <af-email af-label="Email" />
+  </af-model>
+
+  <af-model af-type="Individual" af-name="spouse" af-title="Spouse">
+    <af-name af-label="Spouse Name" />
+    <af-email af-label="Spouse Email" />
+  </af-model>
+
+  <af-model af-type="Individual" af-name="parent" af-title="Parent">
+    <af-address af-label="Address" />
+  </af-model>
+
+</af-model-list>
+```
+
+--------------
+
+```html
+<af-model-list ctrl="modelListCtrl">
+  <af-model-prop
+    af-type="Individual"
+    af-name="parent"
+    af-label="Parent"
+    af-api4-params="{where: ['id','=', routeParams.cid]}"
+  />
+  <af-model-prop
+    af-type="Individual"
+    af-name="spouse"
+    af-label="Spouse"
+    af-contact-relationship="['Spouse of', 'parent']"
+  />
+  <!-- "parent" and "spouse" should be exported as variables in this scope -->
+
+  <af-model af-name="parent">
+    <af-name af-label="Name" />
+    <af-email af-label="Email" />
+  </af-model>
+
+  <af-model af-name="spouse">
+    <af-name af-label="Spouse Name" />
+    <af-email af-label="Spouse Email" only-primary="true" />
+  </af-model>
+
+  <p ng-if="spouse.display_name.contains('Thor')">
+    Your spouse should go to the gym.
+  </p>
+
+  <af-model af-name="parent">
+    <af-address af-label="Address" />
+  </af-model>
+
+  <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
+  <button ng-model="modelListCtrl.submit()">Submit</button>
+
+</af-model-list>
+```
+
+------
+
+```html
+<!-- afform/Blocks/Email.html -->
+<!-- input: options.parent.id -->
+<!-- Decision: These blocks are written in straight AngularJS rather than Afform -->
+<!--<af-model-list>-->
+  <!--<af-model-prop -->
+    <!--af-type="Email"-->
+    <!--af-name="email"-->
+    <!--af-label="Emails"-->
+    <!--af-api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
+  <!--/>-->
+  <!--<af-model af-name="email">-->
+    <!---->
+  <!--</af-model>-->
+<!--</af-model-list>-->
+
+```

From 56dd07fa8a14b00987aaa909083a85a27b5969c0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 13:43:47 -0700
Subject: [PATCH 372/834] Update planning-v0.2.md

---
 ext/afform/docs/sandbox/planning-v0.2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/docs/sandbox/planning-v0.2.md b/ext/afform/docs/sandbox/planning-v0.2.md
index 2792a7c44449..0016f960a0da 100644
--- a/ext/afform/docs/sandbox/planning-v0.2.md
+++ b/ext/afform/docs/sandbox/planning-v0.2.md
@@ -58,7 +58,7 @@ function computePalette($entityType) {
     [
       'group' => 'Fields',
       'title' => 'First Name',
-      'template' => '<afl-api-field entity="%%ENTITY%%" afl-field="first_name" afl-label="First Name"/>',
+      'template' => '<afl-api-field entity="%%ENTITY%%" afl-field="first_name" afl-label="First Name" afl-type="String" />',
     ],
   ];
 }

From a87b43c427582dd0b365b96dd26131bf1786af5e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 14:06:29 -0700
Subject: [PATCH 373/834] Update planning-v0.3.md

---
 ext/afform/docs/sandbox/planning-v0.3.md | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index 3fdbb7393965..c68e71d2a2c5 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -143,3 +143,52 @@
 <!--</af-model-list>-->
 
 ```
+
+------
+
+```html
+<af-model-list ctrl="modelListCtrl">
+  <af-model-prop
+    af-type="Individual"
+    af-name="parent"
+    af-label="Parent"
+    af-api4-params="{where: ['id','=', routeParams.cid]}"
+  />
+  <af-model-prop
+    af-type="Individual"
+    af-name="spouse"
+    af-label="Spouse"
+    af-contact-relationship="['Spouse of', 'parent']"
+  />
+  <!-- "parent" and "spouse" should be exported as variables in this scope -->
+
+  <crm-ui-tab-set>
+    <crm-ui-tab title="About You">
+      <af-model af-name="parent">
+        <af-std-contact-name af-label="Name" />
+        <af-std-contact-email af-label="Email" />
+        <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+      </af-model>
+    </crm-ui-tab>
+    <crm-ui-tab title="Spouse">
+      <af-model af-name="spouse">
+        <af-std-contact-name af-label="Spouse Name" />
+        <af-std-contact-email af-label="Spouse Email" only-primary="true" />
+        <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+      </af-model>
+    </crm-ui-tab>
+  </crm-ui-tab-set>
+
+  <p ng-if="spouse.display_name.contains('Thor')">
+    Your spouse should go to the gym.
+  </p>
+
+  <af-model af-name="parent">
+    <af-block-contact-address af-label="Address" />
+  </af-model>
+
+  <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
+  <button ng-model="modelListCtrl.submit()">Submit</button>
+
+</af-model-list>
+```

From 0770b5ed17c914026495853b96579cb529060640 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:33:54 -0700
Subject: [PATCH 374/834] Api4/Afform.php - Fix callback notation. Cleanup
 style.

---
 ext/afform/core/Civi/Api4/Afform.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 8856f3bbe183..d32fa0f60e2e 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -15,7 +15,7 @@
 class Afform extends AbstractEntity {
 
   /**
-   * @return BasicGetAction
+   * @return \Civi\Api4\Generic\BasicGetAction
    */
   public static function get() {
     return new BasicGetAction('Afform', __FUNCTION__, function(BasicGetAction $action) {
@@ -47,14 +47,14 @@ public static function get() {
   }
 
   /**
-   * @return BasicBatchAction
+   * @return \Civi\Api4\Generic\BasicBatchAction
    */
   public static function revert() {
     return new BasicBatchAction('Afform', __FUNCTION__, ['name'], function($item, BasicBatchAction $action) {
       $scanner = \Civi::service('afform_scanner');
       $files = [
         \CRM_Afform_AfformScanner::METADATA_FILE,
-        \CRM_Afform_AfformScanner::LAYOUT_FILE
+        \CRM_Afform_AfformScanner::LAYOUT_FILE,
       ];
 
       foreach ($files as $file) {
@@ -77,10 +77,10 @@ public static function revert() {
   }
 
   /**
-   * @return BasicUpdateAction
+   * @return \Civi\Api4\Generic\BasicUpdateAction
    */
   public static function update() {
-    $save = function ($item, BasicUpdateAction $action) {
+    return new BasicUpdateAction('Afform', __FUNCTION__, 'name', function ($item, BasicUpdateAction $action) {
       /** @var \CRM_Afform_AfformScanner $scanner */
       $scanner = \Civi::service('afform_scanner');
       $converter = new \CRM_Afform_ArrayHtml();
@@ -130,8 +130,7 @@ public static function update() {
       // FIXME if asset-caching is enabled, then flush the asset cache.
 
       return $updates;
-    };
-    return new BasicUpdateAction('Afform', __FUNCTION__, $save, 'name');
+    });
   }
 
   public static function getFields() {

From e44cea43d68fd4b4bb851e5b2e244783e4d2a47f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 4 May 2019 16:50:30 -0700
Subject: [PATCH 375/834] ArrayHtml - Boundary cases for empty content. Code
 formatting.

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index b20c1e0fb09d..e30682f6ce2b 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -17,6 +17,10 @@ class CRM_Afform_ArrayHtml {
    *   Ex: '<div class="greeting">Hello world</div>'
    */
   public function convertArrayToHtml($array) {
+    if ($array === []) {
+      return '';
+    }
+
     $tag = empty($array['#tag']) ? self::DEFAULT_TAG : $array['#tag'];
     unset($array['#tag']);
     $children = empty($array['#children']) ? self::DEFAULT_TAG : $array['#children'];
@@ -31,10 +35,12 @@ public function convertArrayToHtml($array) {
         throw new \RuntimeException("Malformed HTML attribute");
       }
       if (is_string($attrValue)) {
-        $buf .= sprintf(' %s="%s"', $attrName, htmlentities($attrValue)); // FIXME attribute encoding
+        // FIXME attribute encoding
+        $buf .= sprintf(' %s="%s"', $attrName, htmlentities($attrValue));
       }
       elseif (is_array($attrValue) && $this->allowStructuredAttribute($tag, $attrName)) {
-        $buf .= sprintf(' %s="%s"', $attrName, htmlentities(json_encode($attrValue))); // FIXME attribute encoding
+        // FIXME attribute encoding
+        $buf .= sprintf(' %s="%s"', $attrName, htmlentities(json_encode($attrValue)));
       }
       else {
         Civi::log()->warning('Afform: Cannot serialize attribute {attrName}', [
@@ -64,6 +70,10 @@ public function convertArrayToHtml($array) {
    *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
    */
   public function convertHtmlToArray($html) {
+    if ($html === '') {
+      return [];
+    }
+
     $doc = new DOMDocument();
     $doc->loadHTML("<html><body>$html</body></html>");
 

From 11e724f028a7c6235f9fb6db99ae71b554041d01 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 4 May 2019 16:00:50 -0700
Subject: [PATCH 376/834] Afform.{get,update} - Allow layout format to be array
 or string/HTML

---
 .../core/Civi/Api4/Action/Afform/Get.php      | 43 ++++++++++
 .../core/Civi/Api4/Action/Afform/Update.php   | 67 +++++++++++++++
 ext/afform/core/Civi/Api4/Afform.php          | 85 +------------------
 .../Civi/Api4/Utils/AfformFormatTrait.php     | 59 +++++++++++++
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 50 +++++++++++
 5 files changed, 223 insertions(+), 81 deletions(-)
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Get.php
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Update.php
 create mode 100644 ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
new file mode 100644
index 000000000000..867cdc0d78ee
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+use Civi\Api4\Generic\BasicGetAction;
+use Civi\Api4\Utils\AfformFormatTrait;
+
+/**
+ * Class Get
+ * @package Civi\Api4\Action\Afform
+ */
+class Get extends BasicGetAction {
+
+  use AfformFormatTrait;
+
+  public function getRecords() {
+    /** @var \CRM_Afform_AfformScanner $scanner */
+    $scanner = \Civi::service('afform_scanner');
+
+    $where = $this->getWhere();
+    if (count($where) === 1 && $where[0][0] === 'name' && $where[0][1] == '=') {
+      $names = [$where[0][2]];
+    }
+    else {
+      $names = array_keys($scanner->findFilePaths());
+    }
+
+    $values = [];
+    foreach ($names as $name) {
+      $record = $scanner->getMeta($name);
+      $layout = $scanner->findFilePath($name, 'aff.html');
+      if ($layout) {
+        // FIXME check for file existence+substance+validity
+        $html = file_get_contents($layout);
+        $record['layout'] = $this->convertHtmlToOutput($html);
+      }
+      $values[] = $record;
+    }
+
+    return $values;
+  }
+
+}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Update.php b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
new file mode 100644
index 000000000000..879b26a6810f
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+use Civi\Api4\Generic\BasicUpdateAction;
+use Civi\Api4\Utils\AfformFormatTrait;
+
+/**
+ * Class Update
+ * @package Civi\Api4\Action\Afform
+ */
+class Update extends BasicUpdateAction {
+
+  use AfformFormatTrait;
+
+  protected function writeRecord($item) {
+    /** @var \CRM_Afform_AfformScanner $scanner */
+    $scanner = \Civi::service('afform_scanner');
+
+    if (empty($item['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
+      throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
+    }
+    $name = $item['name'];
+
+    // FIXME validate all field data.
+    $updates = _afform_fields_filter($item);
+
+    // Create or update aff.html.
+    if (isset($updates['layout'])) {
+      $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
+      \ CRM_Utils_File::createDir(dirname($layoutPath));
+      file_put_contents($layoutPath, $this->convertInputToHtml($updates['layout']));
+      // FIXME check for writability then success. Report errors.
+    }
+
+    // Create or update *.aff.json.
+    $orig = \Civi\Api4\Afform::get()
+      ->setCheckPermissions($this->getCheckPermissions())
+      ->addWhere('name', '=', $name)
+      ->execute();
+
+    if (isset($orig[0])) {
+      $meta = _afform_fields_filter(array_merge($orig[0], $updates));
+    }
+    else {
+      $meta = $updates;
+    }
+    unset($meta['layout']);
+    unset($meta['name']);
+    if (!empty($meta)) {
+      $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
+      // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
+      \CRM_Utils_File::createDir(dirname($metaPath));
+      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
+      // FIXME check for writability then success. Report errors.
+    }
+
+    // We may have changed list of files covered by the cache.
+    $scanner->clear();
+
+    // FIXME if `server_route` changes, then flush the menu cache.
+    // FIXME if asset-caching is enabled, then flush the asset cache.
+
+    return $updates;
+  }
+
+}
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index d32fa0f60e2e..ecfffa0e8097 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -4,9 +4,7 @@
 
 use Civi\Api4\Generic\AbstractEntity;
 use Civi\Api4\Generic\BasicBatchAction;
-use Civi\Api4\Generic\BasicGetAction;
 use Civi\Api4\Generic\BasicGetFieldsAction;
-use Civi\Api4\Generic\BasicUpdateAction;
 
 /**
  * Class Afform
@@ -15,35 +13,10 @@
 class Afform extends AbstractEntity {
 
   /**
-   * @return \Civi\Api4\Generic\BasicGetAction
+   * @return \Civi\Api4\Action\Afform\Get
    */
   public static function get() {
-    return new BasicGetAction('Afform', __FUNCTION__, function(BasicGetAction $action) {
-      /** @var \CRM_Afform_AfformScanner $scanner */
-      $scanner = \Civi::service('afform_scanner');
-      $converter = new \CRM_Afform_ArrayHtml();
-
-      $where = $action->getWhere();
-      if (count($where) === 1 && $where[0][0] === 'name' && $where[0][1] == '=') {
-        $names = [$where[0][2]];
-      }
-      else {
-        $names = array_keys($scanner->findFilePaths());
-      }
-
-      $values = [];
-      foreach ($names as $name) {
-        $record = $scanner->getMeta($name);
-        $layout = $scanner->findFilePath($name, 'aff.html');
-        if ($layout) {
-          // FIXME check for file existence+substance+validity
-          $record['layout'] = $converter->convertHtmlToArray(file_get_contents($layout));
-        }
-        $values[] = $record;
-      }
-
-      return $values;
-    });
+    return new \Civi\Api4\Action\Afform\Get('Afform', __FUNCTION__);
   }
 
   /**
@@ -77,60 +50,10 @@ public static function revert() {
   }
 
   /**
-   * @return \Civi\Api4\Generic\BasicUpdateAction
+   * @return \Civi\Api4\Action\Afform\Update
    */
   public static function update() {
-    return new BasicUpdateAction('Afform', __FUNCTION__, 'name', function ($item, BasicUpdateAction $action) {
-      /** @var \CRM_Afform_AfformScanner $scanner */
-      $scanner = \Civi::service('afform_scanner');
-      $converter = new \CRM_Afform_ArrayHtml();
-
-      if (empty($item['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
-        throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
-      }
-      $name = $item['name'];
-
-      // FIXME validate all field data.
-      $updates = _afform_fields_filter($item);
-
-      // Create or update aff.html.
-      if (isset($updates['layout'])) {
-        $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
-        \ CRM_Utils_File::createDir(dirname($layoutPath));
-        file_put_contents($layoutPath, $converter->convertArrayToHtml($updates['layout']));
-        // FIXME check for writability then success. Report errors.
-      }
-
-      // Create or update *.aff.json.
-      $orig = \Civi\Api4\Afform::get()
-        ->setCheckPermissions($action->getCheckPermissions())
-        ->addWhere('name', '=', $name)
-        ->execute();
-
-      if (isset($orig[0])) {
-        $meta = _afform_fields_filter(array_merge($orig[0], $updates));
-      }
-      else {
-        $meta = $updates;
-      }
-      unset($meta['layout']);
-      unset($meta['name']);
-      if (!empty($meta)) {
-        $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
-        // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
-        \CRM_Utils_File::createDir(dirname($metaPath));
-        file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
-        // FIXME check for writability then success. Report errors.
-      }
-
-      // We may have changed list of files covered by the cache.
-      $scanner->clear();
-
-      // FIXME if `server_route` changes, then flush the menu cache.
-      // FIXME if asset-caching is enabled, then flush the asset cache.
-
-      return $updates;
-    });
+    return new \Civi\Api4\Action\Afform\Update('Afform', __FUNCTION__, 'name');
   }
 
   public static function getFields() {
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
new file mode 100644
index 000000000000..58110d74f04c
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -0,0 +1,59 @@
+<?php
+namespace Civi\Api4\Utils;
+
+/**
+ * Class AfformFormatTrait
+ * @package Civi\Api4\Utils
+ *
+ * @method $this setLayoutFormat(string $layoutFormat)
+ * @method string getLayoutFormat()
+ */
+trait AfformFormatTrait {
+
+  /**
+   * @var string
+   *   Either 'array' or 'html'.
+   */
+  protected $layoutFormat = 'array';
+
+  /**
+   * @param string $html
+   * @return mixed
+   * @throws \API_Exception
+   */
+  protected function convertHtmlToOutput($html) {
+    switch ($this->layoutFormat) {
+      case 'html':
+        return $html;
+
+      case 'array':
+      case NULL:
+        $converter = new \CRM_Afform_ArrayHtml();
+        return $converter->convertHtmlToArray($html);
+
+      default:
+        throw new \API_Exception("Requested format is unrecognized");
+    }
+  }
+
+  /**
+   * @param mixed $mixed
+   * @return string
+   * @throws \API_Exception
+   */
+  protected function convertInputToHtml($mixed) {
+    switch ($this->layoutFormat) {
+      case 'html':
+        return $mixed;
+
+      case 'array':
+      case NULL:
+        $converter = new \CRM_Afform_ArrayHtml();
+        return $converter->convertArrayToHtml($mixed);
+
+      default:
+        throw new \API_Exception("Requested format is unrecognized");
+    }
+  }
+
+}
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index dcf29cca6115..ad00a70e1584 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -63,4 +63,54 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
     $this->assertTrue(is_array($result[0]['layout']), $message);
   }
 
+  public function getFormatExamples() {
+    $es = [];
+
+    $asHtml = '<strong>New text!</strong>';
+    $asArray = ['#tag' => 'strong', '#children' => ['New text!']];
+
+    $es[] = ['fakelibBareFile', 'html', $asHtml, 'array', $asArray];
+    $es[] = ['fakelibBareFile', 'array', $asArray, 'html', $asHtml];
+    $es[] = ['fakelibBareFile', 'html', $asHtml, 'html', $asHtml];
+    $es[] = ['fakelibBareFile', 'array', $asArray, 'array', $asArray];
+
+    return $es;
+  }
+
+  /**
+   * In this test, we update the layout and in one format and then read it back
+   * in another format.
+   *
+   * @param string $directiveName
+   * @param string $updateFormat
+   *   The format with which to write the data.
+   *   'html' or 'array'
+   * @param mixed $updateLayout
+   *   The new value to set
+   * @param string $readFormat
+   *   The format with which to read the data.
+   *   'html' or 'array'
+   * @param mixed $readLayout
+   *   The value that we expect to read.
+   * @dataProvider getFormatExamples
+   */
+  public function testUpdateAndGetFormat($directiveName, $updateFormat, $updateLayout, $readFormat, $readLayout) {
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+
+    Civi\Api4\Afform::update()
+      ->addWhere('name', '=', $directiveName)
+      ->setLayoutFormat($updateFormat)
+      ->setValues(['layout' => $updateLayout])
+      ->execute();
+
+    $result = Civi\Api4\Afform::get()
+      ->addWhere('name', '=', $directiveName)
+      ->setLayoutFormat($readFormat)
+      ->execute();
+
+    $this->assertEquals($readLayout, $result[0]['layout']);
+
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+  }
+
 }

From ca91b6bbd56e9196e549f74896691d77acf4ebca Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:44:17 -0700
Subject: [PATCH 377/834] ArrayHtml - Mitigate crash on HTML comments

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index e30682f6ce2b..cfd30300d550 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -112,6 +112,9 @@ public function convertNodeToArray($node) {
     elseif ($node instanceof DOMText) {
       return $node->textContent;
     }
+    elseif ($node instanceof DOMComment) {
+      // FIXME: How to preserve comments? For the moment, discarding them.
+    }
     else {
       throw new \RuntimeException("Unrecognized DOM node");
     }

From ca434f9bede3ac4eea3a941786c67572c2d5d2db Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:35:51 -0700
Subject: [PATCH 378/834] Add skeletal modules

---
 ext/afform/core/ang/af.ang.php      | 31 +++++++++++++++++++++++++++++
 ext/afform/core/ang/af.css          |  1 +
 ext/afform/core/ang/af.js           |  4 ++++
 ext/afform/core/ang/afBlock.ang.php | 31 +++++++++++++++++++++++++++++
 ext/afform/core/ang/afBlock.css     |  1 +
 ext/afform/core/ang/afBlock.js      |  4 ++++
 ext/afform/core/ang/afField.ang.php | 31 +++++++++++++++++++++++++++++
 ext/afform/core/ang/afField.css     |  1 +
 ext/afform/core/ang/afField.js      |  4 ++++
 9 files changed, 108 insertions(+)
 create mode 100644 ext/afform/core/ang/af.ang.php
 create mode 100644 ext/afform/core/ang/af.css
 create mode 100644 ext/afform/core/ang/af.js
 create mode 100644 ext/afform/core/ang/afBlock.ang.php
 create mode 100644 ext/afform/core/ang/afBlock.css
 create mode 100644 ext/afform/core/ang/afBlock.js
 create mode 100644 ext/afform/core/ang/afField.ang.php
 create mode 100644 ext/afform/core/ang/afField.css
 create mode 100644 ext/afform/core/ang/afField.js

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
new file mode 100644
index 000000000000..b40dd5348654
--- /dev/null
+++ b/ext/afform/core/ang/af.ang.php
@@ -0,0 +1,31 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+
+return array (
+  'js' => 
+  array (
+    0 => 'ang/af.js',
+    1 => 'ang/af/*.js',
+    2 => 'ang/af/*/*.js',
+  ),
+  'css' => 
+  array (
+    0 => 'ang/af.css',
+  ),
+  'partials' => 
+  array (
+    0 => 'ang/af',
+  ),
+  'requires' => 
+  array (
+    0 => 'crmUi',
+    1 => 'crmUtil',
+    2 => 'ngRoute',
+  ),
+  'settings' => 
+  array (
+  ),
+  'basePages' => [],
+);
diff --git a/ext/afform/core/ang/af.css b/ext/afform/core/ang/af.css
new file mode 100644
index 000000000000..572e25591d07
--- /dev/null
+++ b/ext/afform/core/ang/af.css
@@ -0,0 +1 @@
+/* Add any CSS rules for Angular module "af" */
diff --git a/ext/afform/core/ang/af.js b/ext/afform/core/ang/af.js
new file mode 100644
index 000000000000..bf8b47d5e615
--- /dev/null
+++ b/ext/afform/core/ang/af.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('af', CRM.angRequires('af'));
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afBlock.ang.php b/ext/afform/core/ang/afBlock.ang.php
new file mode 100644
index 000000000000..72baf5fb4896
--- /dev/null
+++ b/ext/afform/core/ang/afBlock.ang.php
@@ -0,0 +1,31 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+
+return array (
+  'js' => 
+  array (
+    0 => 'ang/afBlock.js',
+    1 => 'ang/afBlock/*.js',
+    2 => 'ang/afBlock/*/*.js',
+  ),
+  'css' => 
+  array (
+    0 => 'ang/afBlock.css',
+  ),
+  'partials' => 
+  array (
+    0 => 'ang/afBlock',
+  ),
+  'requires' => 
+  array (
+    0 => 'crmUi',
+    1 => 'crmUtil',
+    2 => 'ngRoute',
+  ),
+  'settings' => 
+  array (
+  ),
+  'basePages' => [],
+);
diff --git a/ext/afform/core/ang/afBlock.css b/ext/afform/core/ang/afBlock.css
new file mode 100644
index 000000000000..4ea218a1320d
--- /dev/null
+++ b/ext/afform/core/ang/afBlock.css
@@ -0,0 +1 @@
+/* Add any CSS rules for Angular module "afBlock" */
diff --git a/ext/afform/core/ang/afBlock.js b/ext/afform/core/ang/afBlock.js
new file mode 100644
index 000000000000..7eccc58d6804
--- /dev/null
+++ b/ext/afform/core/ang/afBlock.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('afBlock', CRM.angRequires('afBlock'));
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
new file mode 100644
index 000000000000..bc582bde85fa
--- /dev/null
+++ b/ext/afform/core/ang/afField.ang.php
@@ -0,0 +1,31 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+
+return array (
+  'js' => 
+  array (
+    0 => 'ang/afField.js',
+    1 => 'ang/afField/*.js',
+    2 => 'ang/afField/*/*.js',
+  ),
+  'css' => 
+  array (
+    0 => 'ang/afField.css',
+  ),
+  'partials' => 
+  array (
+    0 => 'ang/afField',
+  ),
+  'requires' => 
+  array (
+    0 => 'crmUi',
+    1 => 'crmUtil',
+    2 => 'ngRoute',
+  ),
+  'settings' => 
+  array (
+  ),
+  'basePages' => [],
+);
diff --git a/ext/afform/core/ang/afField.css b/ext/afform/core/ang/afField.css
new file mode 100644
index 000000000000..f7242cc0b7cf
--- /dev/null
+++ b/ext/afform/core/ang/afField.css
@@ -0,0 +1 @@
+/* Add any CSS rules for Angular module "afField" */
diff --git a/ext/afform/core/ang/afField.js b/ext/afform/core/ang/afField.js
new file mode 100644
index 000000000000..617a10b090b4
--- /dev/null
+++ b/ext/afform/core/ang/afField.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('afField', CRM.angRequires('afField'));
+})(angular, CRM.$, CRM._);

From 291135c4b1f920f4ac211c33a8b7edf695a3fc04 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:36:37 -0700
Subject: [PATCH 379/834] afModel*, afBlock*, afField - Add skeletal directives

---
 ext/afform/core/ang/af/Model.js               | 27 +++++++++++++++
 ext/afform/core/ang/af/ModelList.js           | 34 +++++++++++++++++++
 ext/afform/core/ang/af/ModelProp.js           | 24 +++++++++++++
 ext/afform/core/ang/afBlock/ContactEmail.html |  1 +
 ext/afform/core/ang/afBlock/ContactEmail.js   | 15 ++++++++
 ext/afform/core/ang/afBlock/ContactName.html  |  1 +
 ext/afform/core/ang/afBlock/ContactName.js    | 15 ++++++++
 ext/afform/core/ang/afField/afField.html      |  3 ++
 ext/afform/core/ang/afField/afField.js        | 17 ++++++++++
 9 files changed, 137 insertions(+)
 create mode 100644 ext/afform/core/ang/af/Model.js
 create mode 100644 ext/afform/core/ang/af/ModelList.js
 create mode 100644 ext/afform/core/ang/af/ModelProp.js
 create mode 100644 ext/afform/core/ang/afBlock/ContactEmail.html
 create mode 100644 ext/afform/core/ang/afBlock/ContactEmail.js
 create mode 100644 ext/afform/core/ang/afBlock/ContactName.html
 create mode 100644 ext/afform/core/ang/afBlock/ContactName.js
 create mode 100644 ext/afform/core/ang/afField/afField.html
 create mode 100644 ext/afform/core/ang/afField/afField.js

diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
new file mode 100644
index 000000000000..8a07e9f5d3d7
--- /dev/null
+++ b/ext/afform/core/ang/af/Model.js
@@ -0,0 +1,27 @@
+(function(angular, $, _) {
+  // "afModel" is a basic skeletal directive.
+  // Example usage: <af-model-list>... <af-model af-name="myModel">...</af-model> ...</af-model-list>
+  angular.module('af').directive('afModel', function() {
+    return {
+      restrict: 'AE',
+      require: '^afModelList',
+      scope: {
+        afName: '@'
+      },
+      link: function($scope, $el, $attr, afModelListCtrl) {
+        $scope.afModelListCtrl = afModelListCtrl;
+        // $scope.$watch('afName', function(newValue){
+        //   // $scope.myOptions = newValue;
+        //   $scope.modelDefn = afModelListCtrl.getEntity(newValue);
+        //   console.log('Lookup entity', newValue, $scope.modelDefn);
+        // });
+      },
+      controller: function($scope){
+        this.getDefn = function getDefn() {
+          return $scope.afModelListCtrl.getEntity($scope.afName);
+          // return $scope.modelDefn;
+        }
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
new file mode 100644
index 000000000000..1c6fc6f2077e
--- /dev/null
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -0,0 +1,34 @@
+(function(angular, $, _) {
+  // "afModelList" is a basic skeletal directive.
+  // Example usage: <af-model-list ctrl="myCtrl">
+  angular.module('af').directive('afModelList', function() {
+    return {
+      restrict: 'AE',
+      scope: {
+        // afModelList: '=',
+        ctrl: '@'
+      },
+      link: function($scope, $el, $attr) {},
+      controller: ['$scope', function($scope) {
+        var entities = {};
+
+        $scope.$parent[$scope.ctrl] = this;
+
+        this.registerEntity = function registerEntity(entity) {
+          // console.log('register', entity.name);
+          entities[entity.name] = entity;
+        };
+        this.getEntity = function getEntity(name) {
+          // console.log('get', name);
+          return entities[name];
+        };
+
+        // TODO: Support for tapping into load+save API calls
+
+        this.submit = function submit() {
+          CRM.alert('TODO: Submit');
+        };
+      }]
+    };
+  });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
new file mode 100644
index 000000000000..ef44b79feb73
--- /dev/null
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -0,0 +1,24 @@
+(function(angular, $, _) {
+  // "afModelProp" is a basic skeletal directive.
+  // Example usage: <af-model-list>... <af-model-prop af-name="myModel" af-type="Individual" /> ...</af-model-list>
+  angular.module('af').directive('afModelProp', function() {
+    return {
+      restrict: 'AE',
+      require: '^afModelList',
+      scope: {
+        afType: '@',
+        afName: '@',
+        afLabel: '@'
+      },
+      link: function($scope, $el, $attr, afModelListCtrl) {
+        var ts = $scope.ts = CRM.ts('afform');
+        afModelListCtrl.registerEntity({
+          type: $scope.afType,
+          name: $scope.afName,
+          label: $scope.afLabel
+        });
+        // $scope.$watch('afModelProp', function(newValue){$scope.myOptions = newValue;});
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.html b/ext/afform/core/ang/afBlock/ContactEmail.html
new file mode 100644
index 000000000000..680a4f1eca97
--- /dev/null
+++ b/ext/afform/core/ang/afBlock/ContactEmail.html
@@ -0,0 +1 @@
+<div>{{ts('Contact email block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().name})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.js b/ext/afform/core/ang/afBlock/ContactEmail.js
new file mode 100644
index 000000000000..88c744effee8
--- /dev/null
+++ b/ext/afform/core/ang/afBlock/ContactEmail.js
@@ -0,0 +1,15 @@
+(function(angular, $, _) {
+  // Example usage: <div af-block-contact-email="{foo: 1, bar: 2}"></div>
+  angular.module('afBlock').directive('afBlockContactEmail', function() {
+    return {
+      restrict: 'AE',
+      require: ['^afModel'],
+      templateUrl: '~/afBlock/ContactEmail.html',
+      scope: {},
+      link: function($scope, $el, $attr, ctrls) {
+        var ts = $scope.ts = CRM.ts('afform');
+        $scope.afModel = ctrls[0];
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
new file mode 100644
index 000000000000..e1155b04b6da
--- /dev/null
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -0,0 +1 @@
+<div>{{ts('Contact name block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().name})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactName.js b/ext/afform/core/ang/afBlock/ContactName.js
new file mode 100644
index 000000000000..16001f812ccf
--- /dev/null
+++ b/ext/afform/core/ang/afBlock/ContactName.js
@@ -0,0 +1,15 @@
+(function(angular, $, _) {
+  // Example usage: <af-model af-name="myModel"><af-block-contact-name /></af-model>
+  angular.module('afBlock').directive('afBlockContactName', function() {
+    return {
+      restrict: 'AE',
+      require: ['^afModel'],
+      templateUrl: '~/afBlock/ContactName.html',
+      scope: {},
+      link: function($scope, $el, $attr, ctrls) {
+        var ts = $scope.ts = CRM.ts('afform');
+        $scope.afModel = ctrls[0];
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afField/afField.html b/ext/afform/core/ang/afField/afField.html
new file mode 100644
index 000000000000..3590517913a4
--- /dev/null
+++ b/ext/afform/core/ang/afField/afField.html
@@ -0,0 +1,3 @@
+<div>
+  {{ts('Single field for %1::%2', {1: afModel.getDefn().type,2: fieldName})}}
+</div>
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
new file mode 100644
index 000000000000..911e8deed29c
--- /dev/null
+++ b/ext/afform/core/ang/afField/afField.js
@@ -0,0 +1,17 @@
+(function(angular, $, _) {
+  // Example usage: <af-model af-name="myModel"><af-field field-name="do_not_email" /></af-model>
+  angular.module('afField').directive('afField', function() {
+    return {
+      restrict: 'AE',
+      require: ['^afModel'],
+      templateUrl: '~/afField/afField.html',
+      scope: {
+        fieldName: '@'
+      },
+      link: function($scope, $el, $attr, ctrls) {
+        var ts = $scope.ts = CRM.ts('afform');
+        $scope.afModel = ctrls[0];
+      }
+    };
+  });
+})(angular, CRM.$, CRM._);

From 4d97e8c32cc11e63d3e518153398f5f1d46da6f3 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:44:31 -0700
Subject: [PATCH 380/834] Add example page `civicrm/afex` based on last note
 from planning-v0.3.md

---
 ext/afform/mock/ang/afex.aff.html | 31 +++++++++++++++++++++++++++++++
 ext/afform/mock/ang/afex.aff.json |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 ext/afform/mock/ang/afex.aff.html
 create mode 100644 ext/afform/mock/ang/afex.aff.json

diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
new file mode 100644
index 000000000000..377f85c280d3
--- /dev/null
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -0,0 +1,31 @@
+<af-model-list ctrl="modelListCtrl" >
+  <af-model-prop af-type="Individual" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}" />
+  <af-model-prop af-type="Individual" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']" />
+  <af-model-prop af-type="Household" af-name="home" af-label="Home" />
+
+  <!-- "parent" and "spouse" should be exported as variables in this scope -->
+
+  <af-model af-name="parent">
+    <af-block-contact-name af-label="My Name" />
+    <af-block-contact-email af-label="My Email" />
+    <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+  </af-model>
+
+  <af-model af-name="spouse">
+    <af-block-contact-name af-label="Spouse Name" />
+    <af-block-contact-email af-label="Spouse Email" only-primary="true" />
+    <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+  </af-model>
+
+  <af-model af-name="home">
+    <af-block-contact-name af-label="Home Name" />
+  </af-model>
+
+  <af-model af-name="parent">
+    <af-block-contact-address af-label="My Address" />
+  </af-model>
+
+  <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
+  <button ng-click="modelListCtrl.submit()">Submit</button>
+
+</af-model-list>
diff --git a/ext/afform/mock/ang/afex.aff.json b/ext/afform/mock/ang/afex.aff.json
new file mode 100644
index 000000000000..a68f14a38153
--- /dev/null
+++ b/ext/afform/mock/ang/afex.aff.json
@@ -0,0 +1,4 @@
+{
+  "server_route": "civicrm/afex",
+  "requires":["fakelibFoo", "fakelibBareFile", "af", "afBlock", "afField"]
+}

From b7b3a7c88f32fbcf1c8f24264880773085171fcb Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:50:38 -0700
Subject: [PATCH 381/834] ang/*.ang.php - Cleanup new files

---
 ext/afform/core/ang/af.ang.php      | 36 ++++++++------------------
 ext/afform/core/ang/afBlock.ang.php | 40 +++++++++++------------------
 ext/afform/core/ang/afField.ang.php | 40 +++++++++++------------------
 3 files changed, 41 insertions(+), 75 deletions(-)

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index b40dd5348654..dfc2edbec497 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -3,29 +3,15 @@
 // in CiviCRM. See also:
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
-return array (
-  'js' => 
-  array (
-    0 => 'ang/af.js',
-    1 => 'ang/af/*.js',
-    2 => 'ang/af/*/*.js',
-  ),
-  'css' => 
-  array (
-    0 => 'ang/af.css',
-  ),
-  'partials' => 
-  array (
-    0 => 'ang/af',
-  ),
-  'requires' => 
-  array (
-    0 => 'crmUi',
-    1 => 'crmUtil',
-    2 => 'ngRoute',
-  ),
-  'settings' => 
-  array (
-  ),
+return [
+  'js' => [
+    'ang/af.js',
+    'ang/af/*.js',
+    'ang/af/*/*.js',
+  ],
+  'css' => ['ang/af.css'],
+  'partials' => ['ang/af'],
+  'requires' => ['crmUi', 'crmUtil', 'ngRoute'],
+  'settings' => [],
   'basePages' => [],
-);
+];
diff --git a/ext/afform/core/ang/afBlock.ang.php b/ext/afform/core/ang/afBlock.ang.php
index 72baf5fb4896..799d65c827be 100644
--- a/ext/afform/core/ang/afBlock.ang.php
+++ b/ext/afform/core/ang/afBlock.ang.php
@@ -3,29 +3,19 @@
 // in CiviCRM. See also:
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
-return array (
-  'js' => 
-  array (
-    0 => 'ang/afBlock.js',
-    1 => 'ang/afBlock/*.js',
-    2 => 'ang/afBlock/*/*.js',
-  ),
-  'css' => 
-  array (
-    0 => 'ang/afBlock.css',
-  ),
-  'partials' => 
-  array (
-    0 => 'ang/afBlock',
-  ),
-  'requires' => 
-  array (
-    0 => 'crmUi',
-    1 => 'crmUtil',
-    2 => 'ngRoute',
-  ),
-  'settings' => 
-  array (
-  ),
+return [
+  'js' => [
+    'ang/afBlock.js',
+    'ang/afBlock/*.js',
+    'ang/afBlock/*/*.js',
+  ],
+  'css' => ['ang/afBlock.css'],
+  'partials' => ['ang/afBlock'],
+  'requires' => [
+    'crmUi',
+    'crmUtil',
+    'ngRoute',
+  ],
+  'settings' => [],
   'basePages' => [],
-);
+];
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
index bc582bde85fa..8d2f1c2abac0 100644
--- a/ext/afform/core/ang/afField.ang.php
+++ b/ext/afform/core/ang/afField.ang.php
@@ -3,29 +3,19 @@
 // in CiviCRM. See also:
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
-return array (
-  'js' => 
-  array (
-    0 => 'ang/afField.js',
-    1 => 'ang/afField/*.js',
-    2 => 'ang/afField/*/*.js',
-  ),
-  'css' => 
-  array (
-    0 => 'ang/afField.css',
-  ),
-  'partials' => 
-  array (
-    0 => 'ang/afField',
-  ),
-  'requires' => 
-  array (
-    0 => 'crmUi',
-    1 => 'crmUtil',
-    2 => 'ngRoute',
-  ),
-  'settings' => 
-  array (
-  ),
+return [
+  'js' => [
+    'ang/afField.js',
+    'ang/afField/*.js',
+    'ang/afField/*/*.js',
+  ],
+  'css' => ['ang/afField.css'],
+  'partials' => ['ang/afField'],
+  'requires' => [
+    'crmUi',
+    'crmUtil',
+    'ngRoute',
+  ],
+  'settings' => [],
   'basePages' => [],
-);
+];

From 132ddeae8b3bc572bfa6996c314297919d13cf57 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 16:58:08 -0700
Subject: [PATCH 382/834] ang/af*.ang.php - Remove elements that are unlikely
 to be used

---
 ext/afform/core/ang/af.ang.php      | 6 +++---
 ext/afform/core/ang/af.css          | 1 -
 ext/afform/core/ang/afBlock.ang.php | 1 -
 ext/afform/core/ang/afField.ang.php | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 ext/afform/core/ang/af.css

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index dfc2edbec497..7a937077b824 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -9,9 +9,9 @@
     'ang/af/*.js',
     'ang/af/*/*.js',
   ],
-  'css' => ['ang/af.css'],
-  'partials' => ['ang/af'],
-  'requires' => ['crmUi', 'crmUtil', 'ngRoute'],
+  // 'css' => ['ang/af.css'],
+  // 'partials' => ['ang/af'],
+  'requires' => ['crmUtil'],
   'settings' => [],
   'basePages' => [],
 ];
diff --git a/ext/afform/core/ang/af.css b/ext/afform/core/ang/af.css
deleted file mode 100644
index 572e25591d07..000000000000
--- a/ext/afform/core/ang/af.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add any CSS rules for Angular module "af" */
diff --git a/ext/afform/core/ang/afBlock.ang.php b/ext/afform/core/ang/afBlock.ang.php
index 799d65c827be..4075194883c4 100644
--- a/ext/afform/core/ang/afBlock.ang.php
+++ b/ext/afform/core/ang/afBlock.ang.php
@@ -14,7 +14,6 @@
   'requires' => [
     'crmUi',
     'crmUtil',
-    'ngRoute',
   ],
   'settings' => [],
   'basePages' => [],
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
index 8d2f1c2abac0..2e6bc7eff43d 100644
--- a/ext/afform/core/ang/afField.ang.php
+++ b/ext/afform/core/ang/afField.ang.php
@@ -14,7 +14,6 @@
   'requires' => [
     'crmUi',
     'crmUtil',
-    'ngRoute',
   ],
   'settings' => [],
   'basePages' => [],

From a807dfa4e107b5c89c74e7fa54597d2aa201ea6e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 20:48:45 -0700
Subject: [PATCH 383/834] Import afform_html skeleton

---
 ext/afform/html/LICENSE.txt           | 667 ++++++++++++++++++++++++++
 ext/afform/html/README.md             |  44 ++
 ext/afform/html/afform_html.civix.php | 461 ++++++++++++++++++
 ext/afform/html/afform_html.php       | 163 +++++++
 ext/afform/html/images/screenshot.png | Bin 0 -> 11775 bytes
 ext/afform/html/info.xml              |  27 ++
 6 files changed, 1362 insertions(+)
 create mode 100644 ext/afform/html/LICENSE.txt
 create mode 100644 ext/afform/html/README.md
 create mode 100644 ext/afform/html/afform_html.civix.php
 create mode 100644 ext/afform/html/afform_html.php
 create mode 100644 ext/afform/html/images/screenshot.png
 create mode 100644 ext/afform/html/info.xml

diff --git a/ext/afform/html/LICENSE.txt b/ext/afform/html/LICENSE.txt
new file mode 100644
index 000000000000..cfd30320f42d
--- /dev/null
+++ b/ext/afform/html/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: org.civicrm.afform-html
+Copyright (C) 2019, Tim Otten <totten@civicrm.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/afform/html/README.md b/ext/afform/html/README.md
new file mode 100644
index 000000000000..33448293c2c1
--- /dev/null
+++ b/ext/afform/html/README.md
@@ -0,0 +1,44 @@
+# org.civicrm.afform-html
+
+![Screenshot](/images/screenshot.png)
+
+(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+
+The extension is licensed under [AGPL-3.0](LICENSE.txt).
+
+## Requirements
+
+* PHP v5.6+
+* CiviCRM (*FIXME: Version number*)
+
+## Installation (Web UI)
+
+This extension has not yet been published for installation via the web UI.
+
+## Installation (CLI, Zip)
+
+Sysadmins and developers may download the `.zip` file for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+cd <extension-dir>
+cv dl org.civicrm.afform-html@https://github.com/FIXME/org.civicrm.afform-html/archive/master.zip
+```
+
+## Installation (CLI, Git)
+
+Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+git clone https://github.com/FIXME/org.civicrm.afform-html.git
+cv en afform_html
+```
+
+## Usage
+
+(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+
+## Known Issues
+
+(* FIXME *)
diff --git a/ext/afform/html/afform_html.civix.php b/ext/afform/html/afform_html.civix.php
new file mode 100644
index 000000000000..ae00f38e1a68
--- /dev/null
+++ b/ext/afform/html/afform_html.civix.php
@@ -0,0 +1,461 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_AfformHtml_ExtensionUtil {
+  const SHORT_NAME = "afform_html";
+  const LONG_NAME = "org.civicrm.afform-html";
+  const CLASS_PREFIX = "CRM_AfformHtml";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = array()) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = array(self::LONG_NAME, NULL);
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_AfformHtml_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function _afform_html_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = array($extDir, $template->template_dir);
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function _afform_html_civix_civicrm_xmlMenu(&$files) {
+  foreach (_afform_html_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function _afform_html_civix_civicrm_install() {
+  _afform_html_civix_civicrm_config();
+  if ($upgrader = _afform_html_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function _afform_html_civix_civicrm_postInstall() {
+  _afform_html_civix_civicrm_config();
+  if ($upgrader = _afform_html_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onPostInstall'))) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function _afform_html_civix_civicrm_uninstall() {
+  _afform_html_civix_civicrm_config();
+  if ($upgrader = _afform_html_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function _afform_html_civix_civicrm_enable() {
+  _afform_html_civix_civicrm_config();
+  if ($upgrader = _afform_html_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onEnable'))) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @return mixed
+ */
+function _afform_html_civix_civicrm_disable() {
+  _afform_html_civix_civicrm_config();
+  if ($upgrader = _afform_html_civix_upgrader()) {
+    if (is_callable(array($upgrader, 'onDisable'))) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *                for 'enqueue', returns void
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function _afform_html_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _afform_html_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_AfformHtml_Upgrader
+ */
+function _afform_html_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/AfformHtml/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_AfformHtml_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param $dir string, base dir
+ * @param $pattern string, glob pattern, eg "*.txt"
+ * @return array(string)
+ */
+function _afform_html_civix_find_files($dir, $pattern) {
+  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = array($dir);
+  $result = array();
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_afform_html_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry{0} == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function _afform_html_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _afform_html_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function _afform_html_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_afform_html_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      CRM_Core_Error::fatal($errorMessage);
+      // throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = array(
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    );
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function _afform_html_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _afform_html_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ * @return array, possibly empty
+ */
+function _afform_html_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : array();
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ */
+function _afform_html_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = array(
+      'attributes' => array_merge(array(
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ), $item),
+    );
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = array();
+        }
+        $found = _afform_html_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _afform_html_civix_navigationMenu(&$nodes) {
+  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+    _afform_html_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _afform_html_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _afform_html_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _afform_html_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _afform_html_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function _afform_html_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+
+function _afform_html_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, array (
+  ));
+}
diff --git a/ext/afform/html/afform_html.php b/ext/afform/html/afform_html.php
new file mode 100644
index 000000000000..815a2b0beebc
--- /dev/null
+++ b/ext/afform/html/afform_html.php
@@ -0,0 +1,163 @@
+<?php
+
+require_once 'afform_html.civix.php';
+use CRM_AfformHtml_ExtensionUtil as E;
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ */
+function afform_html_civicrm_config(&$config) {
+  _afform_html_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ */
+function afform_html_civicrm_xmlMenu(&$files) {
+  _afform_html_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ */
+function afform_html_civicrm_install() {
+  _afform_html_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ */
+function afform_html_civicrm_postInstall() {
+  _afform_html_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ */
+function afform_html_civicrm_uninstall() {
+  _afform_html_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ */
+function afform_html_civicrm_enable() {
+  _afform_html_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ */
+function afform_html_civicrm_disable() {
+  _afform_html_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ */
+function afform_html_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _afform_html_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ */
+function afform_html_civicrm_managed(&$entities) {
+  _afform_html_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ */
+function afform_html_civicrm_caseTypes(&$caseTypes) {
+  _afform_html_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ */
+function afform_html_civicrm_angularModules(&$angularModules) {
+  _afform_html_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ */
+function afform_html_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _afform_html_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ */
+function afform_html_civicrm_entityTypes(&$entityTypes) {
+  _afform_html_civix_civicrm_entityTypes($entityTypes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
+ *
+function afform_html_civicrm_preProcess($formName, &$form) {
+
+} // */
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
+ *
+function afform_html_civicrm_navigationMenu(&$menu) {
+  _afform_html_civix_insert_navigation_menu($menu, 'Mailings', array(
+    'label' => E::ts('New subliminal message'),
+    'name' => 'mailing_subliminal_message',
+    'url' => 'civicrm/mailing/subliminal',
+    'permission' => 'access CiviMail',
+    'operator' => 'OR',
+    'separator' => 0,
+  ));
+  _afform_html_civix_navigationMenu($menu);
+} // */
diff --git a/ext/afform/html/images/screenshot.png b/ext/afform/html/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6765b696fa03249ac2cd605d5f0e4aa000ad6dad
GIT binary patch
literal 11775
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
IrTdTn0|#irRsaA1

literal 0
HcmV?d00001

diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
new file mode 100644
index 000000000000..98a126934c11
--- /dev/null
+++ b/ext/afform/html/info.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<extension key="org.civicrm.afform-html" type="module">
+  <file>afform_html</file>
+  <name>FIXME</name>
+  <description>FIXME</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>Tim Otten</author>
+    <email>totten@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://FIXME</url>
+    <url desc="Documentation">http://FIXME</url>
+    <url desc="Support">http://FIXME</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2019-05-03</releaseDate>
+  <version>1.0</version>
+  <develStage>alpha</develStage>
+  <compatibility>
+    <ver>5.0</ver>
+  </compatibility>
+  <comments>This is a new, undeveloped module</comments>
+  <civix>
+    <namespace>CRM/AfformHtml</namespace>
+  </civix>
+</extension>

From 0b6a4df85f1f7ac609981fcc387577e7d1eb9804 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 20:52:12 -0700
Subject: [PATCH 384/834] afform_html - Use package.json to download Monaco

---
 ext/afform/html/bin/add-zip-regex.php |  37 +++++++++
 ext/afform/html/bin/setup.sh          | 105 ++++++++++++++++++++++++++
 ext/afform/html/package-lock.json     |  13 ++++
 ext/afform/html/package.json          |  15 ++++
 4 files changed, 170 insertions(+)
 create mode 100755 ext/afform/html/bin/add-zip-regex.php
 create mode 100755 ext/afform/html/bin/setup.sh
 create mode 100644 ext/afform/html/package-lock.json
 create mode 100644 ext/afform/html/package.json

diff --git a/ext/afform/html/bin/add-zip-regex.php b/ext/afform/html/bin/add-zip-regex.php
new file mode 100755
index 000000000000..3ec29eb4acaf
--- /dev/null
+++ b/ext/afform/html/bin/add-zip-regex.php
@@ -0,0 +1,37 @@
+#!/usr/bin/php
+<?php
+
+## This script allows you to add to a ZIP file -- while filtering the filename.
+## For example, suppose you want to inject a prefix to put everything in a subdir;
+## match the start of the name (^) and put in the new sub dir:
+##
+## find -type f | add-zip-regex.php myfile.zip :^: 'the-new-sub-dir/'
+
+if (PHP_SAPI !== 'cli') {
+  die("This tool can only be run from command line.");
+}
+
+if (empty($argv[1]) || empty($argv[2])) {
+  die(sprintf("usage: cat files.txt | %s <zipfile> <old-prefix> <new-prefix>\n", $argv[0]));
+}
+
+$zip = new ZipArchive();
+$zip->open($argv[1], ZipArchive::CREATE);
+$zip->addEmptyDir($argv[3]);
+
+$files = explode("\n", file_get_contents('php://stdin'));
+foreach ($files as $file) {
+  if (empty($file)) {
+    continue;
+  }
+  $file = preg_replace(':^\./:', '', $file);
+  $internalName = preg_replace($argv[2], $argv[3], $file);
+  if (file_exists($file) && is_dir($file)) {
+    $zip->addEmptyDir($internalName);
+  }
+  else {
+    $zip->addFile($file, $internalName);
+  }
+}
+
+$zip->close();
diff --git a/ext/afform/html/bin/setup.sh b/ext/afform/html/bin/setup.sh
new file mode 100755
index 000000000000..ed1e89b4d4ee
--- /dev/null
+++ b/ext/afform/html/bin/setup.sh
@@ -0,0 +1,105 @@
+#!/usr/bin/env bash
+set -e
+
+EXTROOT=$(cd `dirname $0`/..; pwd)
+EXTKEY="org.civicrm.afform-html"
+
+##############################
+function do_help() {
+  echo "usage: $0 [options]"
+  echo "example: $0"
+  echo "  -h     (Help)           Show this help screen"
+  echo "  -D     (Download)       Download dependencies"
+  echo "  -z     (Zip)            Build installable ZIP file"
+}
+
+##############################
+function use_civiroot() {
+  if [ -z "$CIVIROOT" ]; then
+    CIVIROOT=$(cv ev 'echo $GLOBALS["civicrm_root"];')
+    if [ -z "$CIVIROOT" -o ! -d "$CIVIROOT" ]; then
+      do_help
+      echo ""
+      echo "ERROR: invalid civicrm-dir: [$CIVIROOT]"
+      exit
+    fi
+  fi
+}
+
+##############################
+function cleanup() {
+  use_civiroot
+  ## No DAOs or XML build to cleanup
+}
+
+##############################
+function do_download() {
+  pushd "$EXTROOT" >> /dev/null
+    npm install
+  popd >> /dev/null
+}
+
+##############################
+## Build installable ZIP file
+function do_zipfile() {
+  local canary="$EXTROOT/node_modules/monaco-editor/package.json"
+  if [ ! -f "$canary" ]; then
+    echo "Error: File $canary missing. Are you sure the build is ready?"
+    exit 1
+  fi
+
+  local zipfile="$EXTROOT/build/$EXTKEY.zip"
+  [ -f "$zipfile" ] && rm -f "$zipfile"
+  [ ! -d "$EXTROOT/build" ] && mkdir "$EXTROOT/build"
+  pushd "$EXTROOT" >> /dev/null
+    ## Build a list of files to include.
+    ## Put the files into the *.zip, using a $EXTKEY as a prefix.
+    {
+       ## Get any files in the project root, except for dotfiles.
+       find . -mindepth 1 -maxdepth 1 -type f -o -type d | grep -v '^\./\.'
+       ## Get any files in the main subfolders.
+       #find CRM/ ang/ api/ bin/ css/ js/ sql/ sass/ settings/ templates/ tests/ xml/ -type f -o -type d
+       find bin/ xml/ -type f -o -type d
+       ## Get the distributable files for Monaco.
+       find node_modules/monaco-editor/LICENSE node_modules/monaco-editor/min -type f -o -type d
+    } \
+      | grep -v '~$' \
+      | php bin/add-zip-regex.php "$zipfile" ":^:" "$EXTKEY/"
+  popd >> /dev/null
+  echo "Created: $zipfile"
+}
+
+##############################
+## Main
+HAS_ACTION=
+
+while getopts "aDghz" opt; do
+  case $opt in
+    h)
+      do_help
+      HAS_ACTION=1
+      ;;
+    D)
+      do_download
+      HAS_ACTION=1
+      ;;
+    z)
+      do_zipfile
+      HAS_ACTION=1
+      ;;
+    \?)
+      do_help
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1
+      ;;
+    :)
+      echo "Option -$OPTARG requires an argument." >&2
+      exit 1
+      ;;
+  esac
+done
+
+if [ -z "$HAS_ACTION" ]; then
+  do_help
+  exit 2
+fi
diff --git a/ext/afform/html/package-lock.json b/ext/afform/html/package-lock.json
new file mode 100644
index 000000000000..167253f91cd6
--- /dev/null
+++ b/ext/afform/html/package-lock.json
@@ -0,0 +1,13 @@
+{
+  "name": "afform_html",
+  "version": "0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "monaco-editor": {
+      "version": "0.14.3",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.14.3.tgz",
+      "integrity": "sha512-RhaO4xXmWn/p0WrkEOXe4PoZj6xOcvDYjoAh0e1kGUrQnP1IOpc0m86Ceuaa2CLEMDINqKijBSmqhvBQnsPLHQ=="
+    }
+  }
+}
diff --git a/ext/afform/html/package.json b/ext/afform/html/package.json
new file mode 100644
index 000000000000..4305b46b55f4
--- /dev/null
+++ b/ext/afform/html/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "afform_html",
+  "version": "0.0.1",
+  "description": "![Screenshot](/images/screenshot.png)",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "repository": "https://github.com/totten/afform",
+  "license": "AGPL-3.0",
+  "dependencies": {
+    "monaco-editor": "^0.14.3"
+  }
+}

From 6d888111d49edf06012769fdd1028f4fa90f223c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 20:59:04 -0700
Subject: [PATCH 385/834] afform_html - Add skeletal page
 civicrm/admin/afform/html

---
 .../html/CRM/AfformHtml/Page/HtmlEditor.php      | 16 ++++++++++++++++
 .../templates/CRM/AfformHtml/Page/HtmlEditor.tpl |  7 +++++++
 ext/afform/html/xml/Menu/afform_html.xml         |  9 +++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
 create mode 100644 ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
 create mode 100644 ext/afform/html/xml/Menu/afform_html.xml

diff --git a/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php b/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
new file mode 100644
index 000000000000..d2bd59303fb2
--- /dev/null
+++ b/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
@@ -0,0 +1,16 @@
+<?php
+use CRM_AfformHtml_ExtensionUtil as E;
+
+class CRM_AfformHtml_Page_HtmlEditor extends CRM_Core_Page {
+
+  public function run() {
+    // Example: Set the page-title dynamically; alternatively, declare a static title in xml/Menu/*.xml
+    CRM_Utils_System::setTitle(E::ts('HtmlEditor'));
+
+    // Example: Assign a variable for use in a template
+    $this->assign('currentTime', date('Y-m-d H:i:s'));
+
+    parent::run();
+  }
+
+}
diff --git a/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl b/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
new file mode 100644
index 000000000000..5ce652565985
--- /dev/null
+++ b/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
@@ -0,0 +1,7 @@
+<h3>This new page is generated by CRM/AfformHtml/Page/HtmlEditor.php</h3>
+
+{* Example: Display a variable directly *}
+<p>The current time is {$currentTime}</p>
+
+{* Example: Display a translated string -- which happens to include a variable *}
+<p>{ts 1=$currentTime}(In your native language) The current time is %1.{/ts}</p>
diff --git a/ext/afform/html/xml/Menu/afform_html.xml b/ext/afform/html/xml/Menu/afform_html.xml
new file mode 100644
index 000000000000..bf56e3799a50
--- /dev/null
+++ b/ext/afform/html/xml/Menu/afform_html.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<menu>
+  <item>
+    <path>civicrm/admin/afform/html</path>
+    <page_callback>CRM_AfformHtml_Page_HtmlEditor</page_callback>
+    <title>HtmlEditor</title>
+    <access_arguments>administer CiviCRM</access_arguments>
+  </item>
+</menu>

From 64ac4a614f13383d415392994706ca4c0edec579 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 21:51:17 -0700
Subject: [PATCH 386/834] afform_html - Statically load Monaco editor

---
 .../html/CRM/AfformHtml/Page/HtmlEditor.php   | 17 ++++++++---
 .../CRM/AfformHtml/Page/HtmlEditor.tpl        | 30 +++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php b/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
index d2bd59303fb2..89d4767ea93a 100644
--- a/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
+++ b/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
@@ -3,12 +3,21 @@
 
 class CRM_AfformHtml_Page_HtmlEditor extends CRM_Core_Page {
 
+  const MONACO_DIR = 'node_modules/monaco-editor/min/vs';
+
   public function run() {
-    // Example: Set the page-title dynamically; alternatively, declare a static title in xml/Menu/*.xml
-    CRM_Utils_System::setTitle(E::ts('HtmlEditor'));
+    CRM_Utils_System::setTitle(E::ts('Afform HTML Editor'));
 
-    // Example: Assign a variable for use in a template
-    $this->assign('currentTime', date('Y-m-d H:i:s'));
+    CRM_Core_Region::instance('html-header')->add([
+      'markup' => '<meta http-equiv="X-UA-Compatible" content="IE=edge" />',
+    ]);
+    Civi::resources()
+      ->addVars('afform_html', [
+        'paths' => [
+          'vs' => E::url(self::MONACO_DIR),
+        ],
+      ])
+      ->addScriptFile(E::LONG_NAME, self::MONACO_DIR . '/loader.js', CRM_Core_Resources::DEFAULT_WEIGHT, 'html-header');
 
     parent::run();
   }
diff --git a/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl b/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
index 5ce652565985..df123dada3e4 100644
--- a/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
+++ b/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
@@ -1,7 +1,27 @@
-<h3>This new page is generated by CRM/AfformHtml/Page/HtmlEditor.php</h3>
+<script type="text/javascript">
+    var myEditor;
+</script>
 
-{* Example: Display a variable directly *}
-<p>The current time is {$currentTime}</p>
+<button onclick="console.log(myEditor.getValue())">Dump to console</button>
+<div id="htmlEditor" style="width:800px;height:600px;border:1px solid grey"></div>
 
-{* Example: Display a translated string -- which happens to include a variable *}
-<p>{ts 1=$currentTime}(In your native language) The current time is %1.{/ts}</p>
+<script>
+    {literal}
+    require.config({
+        paths: CRM.vars.afform_html.paths
+    });
+    require(['vs/editor/editor.main'], function () {
+        myEditor = monaco.editor.create(document.getElementById('htmlEditor'), {
+            value: [
+                '<div afform-helloworld>\nHello {{routeParams.name}}\n</div>'
+            ].join('\n'),
+            language: 'html',
+            theme: 'vs-dark',
+            tabSize: 2,
+            minimap: {
+                enabled: false
+            }
+        });
+    });
+    {/literal}
+</script>

From 01a82cc7ce103c9b08774a0ed42ac41c4fe878ce Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 21:51:51 -0700
Subject: [PATCH 387/834] afform_html - Add status-check for Monaco files

---
 ext/afform/html/afform_html.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ext/afform/html/afform_html.php b/ext/afform/html/afform_html.php
index 815a2b0beebc..fc81ca2ab417 100644
--- a/ext/afform/html/afform_html.php
+++ b/ext/afform/html/afform_html.php
@@ -161,3 +161,19 @@ function afform_html_civicrm_navigationMenu(&$menu) {
   ));
   _afform_html_civix_navigationMenu($menu);
 } // */
+
+/**
+ * Implements hook_civicrm_check().
+ */
+function afform_html_civicrm_check(&$messages) {
+  $dir = E::path(CRM_AfformHtml_Page_HtmlEditor::MONACO_DIR);
+  if (!file_exists($dir)) {
+    $messages[] = new CRM_Utils_Check_Message(
+      'afform_html_monaco',
+      ts('Afform HTML is missing its "node_modules" folder. Please consult the README.md for current installation instructions.'),
+      ts('Afform HTML: Packages are missing'),
+      \Psr\Log\LogLevel::CRITICAL,
+      'fa-chain-broken'
+    );
+  }
+}

From 1aac4625a4672753c68e72ecf2be69a722b4bfde Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 3 May 2019 23:30:07 -0700
Subject: [PATCH 388/834] afform_html - Skeletal page with Monaco
 (Angular-based; no saving)

Example URL: http://dmaster.bknix:8001/civicrm/admin/afform-html/#/?name=afformExamplepage
---
 ext/afform/html/ang/afMoncao.ang.php          | 22 +++++++++
 ext/afform/html/ang/afMoncao.css              |  1 +
 ext/afform/html/ang/afMoncao.js               | 45 +++++++++++++++++++
 ext/afform/html/ang/afformHtmlEditor.aff.html | 17 +++++++
 ext/afform/html/ang/afformHtmlEditor.aff.json |  4 ++
 5 files changed, 89 insertions(+)
 create mode 100644 ext/afform/html/ang/afMoncao.ang.php
 create mode 100644 ext/afform/html/ang/afMoncao.css
 create mode 100644 ext/afform/html/ang/afMoncao.js
 create mode 100644 ext/afform/html/ang/afformHtmlEditor.aff.html
 create mode 100644 ext/afform/html/ang/afformHtmlEditor.aff.json

diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMoncao.ang.php
new file mode 100644
index 000000000000..a1c6c88687b5
--- /dev/null
+++ b/ext/afform/html/ang/afMoncao.ang.php
@@ -0,0 +1,22 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+
+return array(
+  'js' => [
+    'node_modules/monaco-editor/min/vs/loader.js',
+    'ang/afMoncao.js',
+    //    'ang/afMoncao/*.js',
+    //    'ang/afMoncao/*/*.js',
+  ],
+  'css' => ['ang/afMoncao.css'],
+  // 'partials' => ['ang/afMoncao'],
+  'requires' => ['crmUi', 'crmUtil'],
+  'settings' => [
+    'paths' => [
+      'vs' => CRM_AfformHtml_ExtensionUtil::url('node_modules/monaco-editor/min/vs'),
+    ],
+  ],
+  'basePages' => [],
+);
diff --git a/ext/afform/html/ang/afMoncao.css b/ext/afform/html/ang/afMoncao.css
new file mode 100644
index 000000000000..1abf4a2fed96
--- /dev/null
+++ b/ext/afform/html/ang/afMoncao.css
@@ -0,0 +1 @@
+/* Add any CSS rules for Angular module "afMoncao" */
diff --git a/ext/afform/html/ang/afMoncao.js b/ext/afform/html/ang/afMoncao.js
new file mode 100644
index 000000000000..718980a231fd
--- /dev/null
+++ b/ext/afform/html/ang/afMoncao.js
@@ -0,0 +1,45 @@
+(function(angular, $, _) {
+  angular.module('afMoncao', CRM.angRequires('afMoncao'));
+
+  // "afMonaco" is a basic skeletal directive.
+  // Example usage: <div af-monaco ng-model="my.content"></div>
+  angular.module('afMoncao').directive('afMonaco', function() {
+    return {
+      restrict: 'AE',
+      require: 'ngModel',
+      template: '<div id="myContainer" style="width:800px;height:600px;border:1px solid grey"></div>',
+      link: function($scope, $el, $attr, ngModel) {
+        var editor;
+        require.config({paths: CRM.afMoncao.paths});
+        require(['vs/editor/editor.main'], function() {
+          editor = monaco.editor.create(document.getElementById('myContainer'), {
+            value: ngModel.$modelValue,
+            language: 'html',
+            theme: 'vs-dark',
+            minimap: {
+              enabled: false
+            }
+          });
+
+          editor.onDidChangeModelContent(_.debounce(function () {
+            $scope.$apply(function () {
+              ngModel.$setViewValue(editor.getValue());
+            });
+          }, 150));
+
+          ngModel.$render = function() {
+            if (editor) {
+              editor.setValue(ngModel.$modelValue);
+            }
+            // FIXME: else: retry?
+          };
+
+          $scope.$on('$destroy', function () {
+            if (editor) editor.dispose();
+          });
+        });
+      }
+    };
+  });
+
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
new file mode 100644
index 000000000000..af9419920a15
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -0,0 +1,17 @@
+<div ng-if="!routeParams.name">
+  {{ts('Please provide the form "name" parameter.')}}
+</div>
+
+<div ng-if="routeParams.name"
+     aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', routeParams.name]]}]"
+     aff-api4-ctrl="apiData">
+
+  <div ng-if="apiData.result.length == 0">
+    {{ts('Failed to find requested form.')}}
+  </div>
+
+  <div ng-repeat="resultForm in apiData.result" ng-if="apiData.result.length > 0">
+    <div crm-ui-debug="resultForm.layout"></div>
+    <div af-monaco ng-model="resultForm.layout"></div>
+  </div>
+</div>
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.json b/ext/afform/html/ang/afformHtmlEditor.aff.json
new file mode 100644
index 000000000000..231015f70163
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.json
@@ -0,0 +1,4 @@
+{
+  "server_route": "civicrm/admin/afform-html",
+  "requires":["afformCore", "afMoncao"]
+}

From 01a56bbd6d4831fe13c2c3dd5ec150831b9f1c51 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 4 May 2019 21:30:06 -0700
Subject: [PATCH 389/834] afform_html - Update monaco to 0.16.2

---
 ext/afform/html/package-lock.json | 6 +++---
 ext/afform/html/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/afform/html/package-lock.json b/ext/afform/html/package-lock.json
index 167253f91cd6..7a3ea026d20f 100644
--- a/ext/afform/html/package-lock.json
+++ b/ext/afform/html/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "monaco-editor": {
-      "version": "0.14.3",
-      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.14.3.tgz",
-      "integrity": "sha512-RhaO4xXmWn/p0WrkEOXe4PoZj6xOcvDYjoAh0e1kGUrQnP1IOpc0m86Ceuaa2CLEMDINqKijBSmqhvBQnsPLHQ=="
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz",
+      "integrity": "sha512-NtGrFzf54jADe7qsWh3lazhS7Kj0XHkJUGBq9fA/Jbwc+sgVcyfsYF6z2AQ7hPqDC+JmdOt/OwFjBnRwqXtx6w=="
     }
   }
 }
diff --git a/ext/afform/html/package.json b/ext/afform/html/package.json
index 4305b46b55f4..d7e8a1b5cf22 100644
--- a/ext/afform/html/package.json
+++ b/ext/afform/html/package.json
@@ -10,6 +10,6 @@
   "repository": "https://github.com/totten/afform",
   "license": "AGPL-3.0",
   "dependencies": {
-    "monaco-editor": "^0.14.3"
+    "monaco-editor": "^0.16.2"
   }
 }

From a3470d1962731bd14e4591ff6d2ff6bfc77b8349 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 4 May 2019 21:30:40 -0700
Subject: [PATCH 390/834] afformCore - Expose crmApi4 and crmStatus in standard
 scopes

---
 ext/afform/core/ang/afformCore.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/ang/afformCore.js b/ext/afform/core/ang/afformCore.js
index 7548db1f5c8c..afad2607e219 100644
--- a/ext/afform/core/ang/afformCore.js
+++ b/ext/afform/core/ang/afformCore.js
@@ -1,11 +1,11 @@
 (function(angular, $, _) {
   // Declare a list of dependencies.
   angular.module('afformCore', [
-    'crmUi', 'crmUtil', 'ngRoute'
+    'crmUi', 'crmUtil', 'ngRoute', 'api4'
   ]);
 
   // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
-  angular.module('afformCore').service('afformCoreDirective', function($routeParams){
+  angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus){
     return function(camelName, meta, d){
       d.restrict = 'AE';
       d.scope = {};
@@ -14,6 +14,8 @@
         $scope.ts = CRM.ts(camelName);
         $scope.routeParams = $routeParams;
         $scope.meta = meta;
+        $scope.crmApi4 = crmApi4;
+        $scope.crmStatus = crmStatus;
       };
       return d;
     };

From 85933a0211c30b4eb2c8ba5e37324a1e17caefbe Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 4 May 2019 21:31:14 -0700
Subject: [PATCH 391/834] afMonaco - Use more conventional scrollbars

---
 ext/afform/html/ang/afMoncao.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ext/afform/html/ang/afMoncao.js b/ext/afform/html/ang/afMoncao.js
index 718980a231fd..1b829fafc37b 100644
--- a/ext/afform/html/ang/afMoncao.js
+++ b/ext/afform/html/ang/afMoncao.js
@@ -18,6 +18,16 @@
             theme: 'vs-dark',
             minimap: {
               enabled: false
+            },
+            scrollbar: {
+              useShadows: false,
+              verticalHasArrows: true,
+              horizontalHasArrows: true,
+              vertical: 'visible',
+              horizontal: 'visible',
+              verticalScrollbarSize: 17,
+              horizontalScrollbarSize: 17,
+              arrowSize: 30
             }
           });
 

From 954703502f5b850dc3fb035b54365d01dc44bf9c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 00:05:07 -0700
Subject: [PATCH 392/834] core - Implement aff-api4-action directive

This allows you to invoke APIv4 when a user clicks on a button or link.  It
is analogous to `ng-click`, except that the notation and messaging are
tweaked for APIv4.
---
 ext/afform/core/ang/afformCore.ang.php       |  2 +-
 ext/afform/core/ang/afformCore.css           |  7 ++++
 ext/afform/core/ang/afformCore.js            |  3 +-
 ext/afform/core/ang/afformCore/Api4Action.js | 31 ++++++++++++++++++
 ext/afform/core/ang/afformCore/Api4Action.md | 34 ++++++++++++++++++++
 ext/afform/docs/roadmap.md                   |  1 +
 6 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/core/ang/afformCore.css
 create mode 100644 ext/afform/core/ang/afformCore/Api4Action.js
 create mode 100644 ext/afform/core/ang/afformCore/Api4Action.md

diff --git a/ext/afform/core/ang/afformCore.ang.php b/ext/afform/core/ang/afformCore.ang.php
index 2a0234163289..c93f30450252 100644
--- a/ext/afform/core/ang/afformCore.ang.php
+++ b/ext/afform/core/ang/afformCore.ang.php
@@ -9,7 +9,7 @@
     1 => 'ang/afformCore/*.js',
     2 => 'ang/afformCore/*/*.js',
   ),
-  'css' => array(),
+  'css' => array('ang/afformCore.css'),
   'requires' => array('crmUi', 'crmUtil', 'api4'),
   'partials' => array('ang/afformCore'),
   'settings' => array(),
diff --git a/ext/afform/core/ang/afformCore.css b/ext/afform/core/ang/afformCore.css
new file mode 100644
index 000000000000..d5a9b31fcb44
--- /dev/null
+++ b/ext/afform/core/ang/afformCore.css
@@ -0,0 +1,7 @@
+.aff-api4-action-running {
+    cursor: not-allowed;
+    color: black;
+}
+a.aff-api4-action-idle {
+    cursor: pointer;
+}
diff --git a/ext/afform/core/ang/afformCore.js b/ext/afform/core/ang/afformCore.js
index afad2607e219..9c12c157a444 100644
--- a/ext/afform/core/ang/afformCore.js
+++ b/ext/afform/core/ang/afformCore.js
@@ -5,7 +5,7 @@
   ]);
 
   // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
-  angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus){
+  angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus, crmUiAlert){
     return function(camelName, meta, d){
       d.restrict = 'AE';
       d.scope = {};
@@ -16,6 +16,7 @@
         $scope.meta = meta;
         $scope.crmApi4 = crmApi4;
         $scope.crmStatus = crmStatus;
+        $scope.crmUiAlert = crmUiAlert;
       };
       return d;
     };
diff --git a/ext/afform/core/ang/afformCore/Api4Action.js b/ext/afform/core/ang/afformCore/Api4Action.js
new file mode 100644
index 000000000000..b68b729ce31b
--- /dev/null
+++ b/ext/afform/core/ang/afformCore/Api4Action.js
@@ -0,0 +1,31 @@
+(function(angular, $, _) {
+
+  angular.module('afformCore').directive('affApi4Action', function($parse, crmStatus, crmApi4) {
+    return {
+      restrict: 'A',
+      scope: {
+        affApi4Action: '@',
+        msgStart: '=',
+        msgError: '=',
+        msgSuccess: '=',
+        onSuccess: '@',
+        onError: '@'
+      },
+      link: function($scope, $el, $attr) {
+        var ts = CRM.ts(null);
+        function running(x) {$el.toggleClass('aff-api4-action-running', x).toggleClass('aff-api4-action-idle', !x);}
+        running(false);
+        $el.click(function(){
+          var parts = $parse($scope.affApi4Action)($scope.$parent);
+          var msgs = {start: $scope.msgStart || ts('Submitting...'), success: $scope.msgSuccess, error: $scope.msgError};
+          running(true);
+          crmStatus(msgs, crmApi4(parts[0], parts[1], parts[2]))
+            .finally(function(){running(false);})
+            .then(function(response){$scope.$parent.$eval($scope.onSuccess, {response: response});})
+            .catch(function(error){$scope.$parent.$eval($scope.onError, {error: error});});
+        });
+      }
+    };
+  });
+
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afformCore/Api4Action.md b/ext/afform/core/ang/afformCore/Api4Action.md
new file mode 100644
index 000000000000..d1f4f810e29b
--- /dev/null
+++ b/ext/afform/core/ang/afformCore/Api4Action.md
@@ -0,0 +1,34 @@
+# aff-api4-action
+
+This directive is designed for invoking an action via APIv4. Much like
+`ng-click`, one would use `api4-action` to add behavior to a button or link.
+
+```html
+<button
+  aff-api4-action="['Contact','delete',{where:['id','=','100]}}]"
+  >Delete</button>
+```
+
+### Options
+
+Additional options may be used to manipulate the status messages and to
+trigger further actions on failure or success.
+
+```html
+<button
+  aff-api4-action="['Contact','delete',{where:['id','=','100]}}]"
+  msg-start="ts('Deleting...')"
+  msg-success="ts('Deleted')"
+  on-success="crmUiAlert({text:'Received ' + response.length + ' items'})"
+  on-error="crmUiAlert({text:'Failure: ' + error})"
+>Delete</button>
+<!-- Automated flag with aff-api4-action-{running -->
+```
+
+### Styling
+
+The `aff-api4-action` element will have the follow classes
+toggled automatically:
+
+* `aff-api4-action-running`: User has clicked to fire the action, and action is still running.
+* `aff-api4-action-idle`: The action is not running.
diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index 3ef1bd771ff3..ab8639a1fc49 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -24,6 +24,7 @@ This extension is expected to be the base for a suite of related extensions:
 
 Within this extension, there are things which need updating/addressing:
 
+* Test coverage for key Angular directives (e.g. `aff-api4-ctrl`, `aff-api4-action`)
 * There are several `FIXME`/`TODO` declarations in the code for checking pre-conditions, reporting errors, handling edge-cases, etc.
 * Although afforms can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
   and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that. (Ex: Define partials via callback.)

From 56ad93c45f56bbaa48ab38fa07862831db006361 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 00:07:26 -0700
Subject: [PATCH 393/834] afformHtmlEditor - Show list-view if no `?name=` is
 set.

---
 ext/afform/html/ang/afformHtmlEditor.aff.html | 43 ++++++++++++++++++-
 ext/afform/html/ang/afformHtmlEditor.aff.json |  1 +
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index af9419920a15..eca4e8f6653d 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -1,11 +1,52 @@
 <div ng-if="!routeParams.name">
-  {{ts('Please provide the form "name" parameter.')}}
+  <div
+    aff-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+    aff-api4-ctrl="listCtrl">
+
+    <div ng-if="apiData.result.length == 0">
+      {{ts('There are no forms! Tell Aristotle!')}}
+    </div>
+
+    <table>
+      <thead>
+        <tr>
+          <th>{{ts('Name')}}</th>
+          <th>{{ts('Title')}}</th>
+          <th>{{ts('Server Route')}}</th>
+          <th>{{ts('Frontend?')}}</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+      <tr ng-repeat="availForm in listCtrl.result">
+        <td>
+          <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
+        </td>
+        <td>{{availForm.title}}</td>
+        <td><code>{{availForm.server_route}}</code></td>
+        <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
+        <td>
+          <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
+          <a aff-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+             msg-start="ts('Reverting...')"
+             msg-success="ts('Reverted')"
+            >{{ts('Revert')}}</a>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+
+  </div>
 </div>
 
 <div ng-if="routeParams.name"
      aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', routeParams.name]]}]"
      aff-api4-ctrl="apiData">
 
+  <div>
+    <a ng-href="#/">{{ts('Back')}}</a>
+  </div>
+
   <div ng-if="apiData.result.length == 0">
     {{ts('Failed to find requested form.')}}
   </div>
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.json b/ext/afform/html/ang/afformHtmlEditor.aff.json
index 231015f70163..ce82be9ed43b 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.json
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.json
@@ -1,4 +1,5 @@
 {
+  "title": "Afform HTML Editor",
   "server_route": "civicrm/admin/afform-html",
   "requires":["afformCore", "afMoncao"]
 }

From 90cd1eced2d74325a48027552dd3e8813cd8d815 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 15:26:50 -0700
Subject: [PATCH 394/834] afMoncao - While hovering on editor, 2-finger scroll
 should only affect editor

---
 ext/afform/html/ang/afMoncao.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/ext/afform/html/ang/afMoncao.js b/ext/afform/html/ang/afMoncao.js
index 1b829fafc37b..142dba8f6660 100644
--- a/ext/afform/html/ang/afMoncao.js
+++ b/ext/afform/html/ang/afMoncao.js
@@ -3,16 +3,17 @@
 
   // "afMonaco" is a basic skeletal directive.
   // Example usage: <div af-monaco ng-model="my.content"></div>
-  angular.module('afMoncao').directive('afMonaco', function() {
+  angular.module('afMoncao').directive('afMonaco', function($timeout) {
     return {
       restrict: 'AE',
       require: 'ngModel',
-      template: '<div id="myContainer" style="width:800px;height:600px;border:1px solid grey"></div>',
+      template: '<div class="af-monaco-container" style="width:800px;height:600px;border:1px solid grey"></div>',
       link: function($scope, $el, $attr, ngModel) {
         var editor;
         require.config({paths: CRM.afMoncao.paths});
         require(['vs/editor/editor.main'], function() {
-          editor = monaco.editor.create(document.getElementById('myContainer'), {
+          var editorEl = $el.find('.af-monaco-container');
+          editor = monaco.editor.create(editorEl[0], {
             value: ngModel.$modelValue,
             language: 'html',
             theme: 'vs-dark',
@@ -44,7 +45,25 @@
             // FIXME: else: retry?
           };
 
+          // FIXME: This makes vertical scrolling much better, but horizontal is still weird.
+          var origOverflow;
+          function bodyScrollSuspend() {
+            if (origOverflow !== undefined) return;
+            origOverflow = $('body').css('overflow');
+            $('body').css('overflow', 'hidden');
+          }
+          function bodyScrollRestore() {
+            if (origOverflow === undefined) return;
+            $('body').css('overflow', origOverflow);
+            origOverflow = undefined;
+          }
+          editorEl.on('mouseenter', bodyScrollSuspend);
+          editorEl.on('mouseleave', bodyScrollRestore);
+          editor.onDidFocusEditorWidget(bodyScrollSuspend);
+          editor.onDidBlurEditorWidget(bodyScrollRestore);
+
           $scope.$on('$destroy', function () {
+            bodyScrollRestore();
             if (editor) editor.dispose();
           });
         });

From 6cb689b30ebebd0cbcf13aef57d3d822d7eeb231 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 15:39:57 -0700
Subject: [PATCH 395/834] afMoncao - Better default sizing

---
 ext/afform/html/ang/afMoncao.css | 3 +++
 ext/afform/html/ang/afMoncao.js  | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ext/afform/html/ang/afMoncao.css b/ext/afform/html/ang/afMoncao.css
index 1abf4a2fed96..58ed3679e4c0 100644
--- a/ext/afform/html/ang/afMoncao.css
+++ b/ext/afform/html/ang/afMoncao.css
@@ -1 +1,4 @@
 /* Add any CSS rules for Angular module "afMoncao" */
+.af-monaco-container {
+    border:1px solid grey;
+}
\ No newline at end of file
diff --git a/ext/afform/html/ang/afMoncao.js b/ext/afform/html/ang/afMoncao.js
index 142dba8f6660..6d47f4ea0789 100644
--- a/ext/afform/html/ang/afMoncao.js
+++ b/ext/afform/html/ang/afMoncao.js
@@ -7,19 +7,23 @@
     return {
       restrict: 'AE',
       require: 'ngModel',
-      template: '<div class="af-monaco-container" style="width:800px;height:600px;border:1px solid grey"></div>',
+      template: '<div class="af-monaco-container"></div>',
       link: function($scope, $el, $attr, ngModel) {
+        var heightPct = 0.70;
         var editor;
         require.config({paths: CRM.afMoncao.paths});
         require(['vs/editor/editor.main'], function() {
           var editorEl = $el.find('.af-monaco-container');
+          editorEl.css({height: Math.round(heightPct * $(window).height())});
           editor = monaco.editor.create(editorEl[0], {
             value: ngModel.$modelValue,
             language: 'html',
-            theme: 'vs-dark',
+            // theme: 'vs-dark',
+            theme: 'vs',
             minimap: {
               enabled: false
             },
+            automaticLayout: true,
             scrollbar: {
               useShadows: false,
               verticalHasArrows: true,

From fc2cb8641c85e30f5b0de1dc5bb7f020cdb67558 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 15:54:24 -0700
Subject: [PATCH 396/834] afform_html - Split main screen into two smaller
 components

* Before: `afformHtmlEditor` contains list and edit screens
* After: `afformHtmlEditor` contains just the edit screen
* After: `afforHtmlList` contains just the list screen
* After: `afforHtmlAdmin` delegates to `afforHtmlList` and `afformHtmlEditor`
---
 ext/afform/html/ang/afformHtmlAdmin.aff.html  |  7 +++
 ext/afform/html/ang/afformHtmlAdmin.aff.json  |  5 ++
 ext/afform/html/ang/afformHtmlEditor.aff.html | 46 ++-----------------
 ext/afform/html/ang/afformHtmlEditor.aff.json |  1 -
 ext/afform/html/ang/afformHtmlList.aff.html   | 38 +++++++++++++++
 ext/afform/html/ang/afformHtmlList.aff.json   |  4 ++
 6 files changed, 57 insertions(+), 44 deletions(-)
 create mode 100644 ext/afform/html/ang/afformHtmlAdmin.aff.html
 create mode 100644 ext/afform/html/ang/afformHtmlAdmin.aff.json
 create mode 100644 ext/afform/html/ang/afformHtmlList.aff.html
 create mode 100644 ext/afform/html/ang/afformHtmlList.aff.json

diff --git a/ext/afform/html/ang/afformHtmlAdmin.aff.html b/ext/afform/html/ang/afformHtmlAdmin.aff.html
new file mode 100644
index 000000000000..c8f3a7e7407f
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlAdmin.aff.html
@@ -0,0 +1,7 @@
+<div ng-if="!routeParams.name">
+  <div afform-html-list=""></div>
+</div>
+
+<div ng-if="routeParams.name">
+  <div afform-html-editor="{name: routeParams.name}"></div>
+</div>
diff --git a/ext/afform/html/ang/afformHtmlAdmin.aff.json b/ext/afform/html/ang/afformHtmlAdmin.aff.json
new file mode 100644
index 000000000000..ff99ac064302
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlAdmin.aff.json
@@ -0,0 +1,5 @@
+{
+  "title": "Afform HTML Administration",
+  "server_route": "civicrm/admin/afform-html",
+  "requires":["afformCore", "afMoncao", "afformHtmlEditor", "afformHtmlList"]
+}
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index eca4e8f6653d..83c712cc8c38 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -1,46 +1,5 @@
-<div ng-if="!routeParams.name">
-  <div
-    aff-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
-    aff-api4-ctrl="listCtrl">
-
-    <div ng-if="apiData.result.length == 0">
-      {{ts('There are no forms! Tell Aristotle!')}}
-    </div>
-
-    <table>
-      <thead>
-        <tr>
-          <th>{{ts('Name')}}</th>
-          <th>{{ts('Title')}}</th>
-          <th>{{ts('Server Route')}}</th>
-          <th>{{ts('Frontend?')}}</th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-      <tr ng-repeat="availForm in listCtrl.result">
-        <td>
-          <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
-        </td>
-        <td>{{availForm.title}}</td>
-        <td><code>{{availForm.server_route}}</code></td>
-        <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
-        <td>
-          <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
-          <a aff-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
-             msg-start="ts('Reverting...')"
-             msg-success="ts('Reverted')"
-            >{{ts('Revert')}}</a>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-
-  </div>
-</div>
-
-<div ng-if="routeParams.name"
-     aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', routeParams.name]]}]"
+<div 
+     aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]"
      aff-api4-ctrl="apiData">
 
   <div>
@@ -55,4 +14,5 @@
     <div crm-ui-debug="resultForm.layout"></div>
     <div af-monaco ng-model="resultForm.layout"></div>
   </div>
+
 </div>
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.json b/ext/afform/html/ang/afformHtmlEditor.aff.json
index ce82be9ed43b..3f7f53f4b207 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.json
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.json
@@ -1,5 +1,4 @@
 {
   "title": "Afform HTML Editor",
-  "server_route": "civicrm/admin/afform-html",
   "requires":["afformCore", "afMoncao"]
 }
diff --git a/ext/afform/html/ang/afformHtmlList.aff.html b/ext/afform/html/ang/afformHtmlList.aff.html
new file mode 100644
index 000000000000..b6ccc76c18ff
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlList.aff.html
@@ -0,0 +1,38 @@
+<div
+  aff-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+  aff-api4-ctrl="listCtrl">
+
+  <div ng-if="apiData.result.length == 0">
+    {{ts('There are no forms! Tell Aristotle!')}}
+  </div>
+
+  <table>
+    <thead>
+      <tr>
+        <th>{{ts('Name')}}</th>
+        <th>{{ts('Title')}}</th>
+        <th>{{ts('Server Route')}}</th>
+        <th>{{ts('Frontend?')}}</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    <tr ng-repeat="availForm in listCtrl.result">
+      <td>
+        <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
+      </td>
+      <td>{{availForm.title}}</td>
+      <td><code>{{availForm.server_route}}</code></td>
+      <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
+      <td>
+        <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
+        <a aff-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+           msg-start="ts('Reverting...')"
+           msg-success="ts('Reverted')"
+          >{{ts('Revert')}}</a>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</div>
diff --git a/ext/afform/html/ang/afformHtmlList.aff.json b/ext/afform/html/ang/afformHtmlList.aff.json
new file mode 100644
index 000000000000..a20755492836
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlList.aff.json
@@ -0,0 +1,4 @@
+{
+  "title": "Afform HTML List",
+  "requires":["afformCore"]
+}

From 7046c8a93dd13a9cf33ce1995dffd5873e660ad4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 16:04:38 -0700
Subject: [PATCH 397/834] roadmap.md

---
 ext/afform/docs/roadmap.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index ab8639a1fc49..f715401676e2 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -20,6 +20,11 @@ This extension is expected to be the base for a suite of related extensions:
 * `afform_auditor`: Report on upgrade compatibility. Test changesets. Highlight dangerous/unknown/unsupported form elements.
    Score maintainability of the system.
 
+## Documentation
+
+* Development and Refactoring: A guide for making changes to supported markup in a maintainable fashion.
+  (*What if I need to rename a tag? What if I need to deprecate a tag? Ad nauseum*)
+
 ## Known Issues
 
 Within this extension, there are things which need updating/addressing:

From 784141a8a7faef3652a4c6402454dba970ae1b2d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 16:15:42 -0700
Subject: [PATCH 398/834] afformHtmlEditor - Add "Save" button

---
 ext/afform/html/ang/afformHtmlEditor.aff.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index 83c712cc8c38..db22d1fcb461 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -2,15 +2,17 @@
      aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]"
      aff-api4-ctrl="apiData">
 
-  <div>
-    <a ng-href="#/">{{ts('Back')}}</a>
-  </div>
-
   <div ng-if="apiData.result.length == 0">
     {{ts('Failed to find requested form.')}}
   </div>
 
   <div ng-repeat="resultForm in apiData.result" ng-if="apiData.result.length > 0">
+    <div>
+      <a ng-href="#/">{{ts('Back')}}</a>
+      |
+      <a aff-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:{layout: resultForm.layout}}]">{{ts('Save')}}</a>
+    </div>
+
     <div crm-ui-debug="resultForm.layout"></div>
     <div af-monaco ng-model="resultForm.layout"></div>
   </div>

From 9c0f475b9e67803cacfc083ddda5fdf7d3936044 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 3 Jun 2019 18:35:48 -0700
Subject: [PATCH 399/834] afformCore - Add crmUrl to default scopes for afforms

---
 ext/afform/core/ang/afformCore.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/afform/core/ang/afformCore.js b/ext/afform/core/ang/afformCore.js
index 9c12c157a444..b583486da33b 100644
--- a/ext/afform/core/ang/afformCore.js
+++ b/ext/afform/core/ang/afformCore.js
@@ -17,6 +17,7 @@
         $scope.crmApi4 = crmApi4;
         $scope.crmStatus = crmStatus;
         $scope.crmUiAlert = crmUiAlert;
+        $scope.crmUrl = CRM.url;
       };
       return d;
     };

From 42a4b799972bfc30ec5c76b69aecccfe8144bf4e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 3 Jun 2019 18:36:06 -0700
Subject: [PATCH 400/834] afform_html - Declare dependency on afform core

---
 ext/afform/html/info.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index 98a126934c11..6857580ee2e5 100644
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -20,6 +20,9 @@
   <compatibility>
     <ver>5.0</ver>
   </compatibility>
+  <requires>
+    <ext>org.civicrm.afform</ext>
+  </requires>
   <comments>This is a new, undeveloped module</comments>
   <civix>
     <namespace>CRM/AfformHtml</namespace>

From 9313f9f55b7751b72fdefaea9454e32fe145c7d9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 3 Jun 2019 18:37:00 -0700
Subject: [PATCH 401/834] afform_html - Show more editable properaties

---
 ext/afform/html/ang/afformHtmlEditor.aff.html | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index db22d1fcb461..2c2681502691 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -1,20 +1,33 @@
-<div 
-     aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]"
-     aff-api4-ctrl="apiData">
+<div aff-api4-ctrl="apiData" aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]">
 
   <div ng-if="apiData.result.length == 0">
     {{ts('Failed to find requested form.')}}
   </div>
 
   <div ng-repeat="resultForm in apiData.result" ng-if="apiData.result.length > 0">
+    <div crm-ui-debug="resultForm"></div>
+
     <div>
       <a ng-href="#/">{{ts('Back')}}</a>
       |
       <a aff-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:{layout: resultForm.layout}}]">{{ts('Save')}}</a>
+      <span ng-if="resultForm.server_route">
+        | <a target="_blank" ng-href="{{crmUrl(resultForm.server_route)}}">Open</a>
+      </span>
     </div>
 
-    <div crm-ui-debug="resultForm.layout"></div>
-    <div af-monaco ng-model="resultForm.layout"></div>
+    <fieldset>
+      <legend>{{ts('Properties')}}</legend>
+      <div><label>{{ts('Name')}}:</label> {{resultForm.name}}</div>
+      <div><label>{{ts('Server Router')}}:</label> <input ng-model="resultForm.server_route" type="text" /></div>
+      <div><label>{{ts('Description')}}:</label> <textarea ng-model="resultForm.description"></textarea></div>
+    </fieldset>
+
+    <fieldset>
+      <legend>{{ts('Layout')}}</legend>
+      <div af-monaco ng-model="resultForm.layout"></div>
+    </fieldset>
+
   </div>
 
 </div>

From fdc0292a90b6d529901a730d20afcdec5001d70c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 9 Jun 2019 09:10:06 -0400
Subject: [PATCH 402/834] Add index to Api4Ctrl

---
 ext/afform/core/ang/afformCore/Api4Ctrl.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/ang/afformCore/Api4Ctrl.js b/ext/afform/core/ang/afformCore/Api4Ctrl.js
index 32ae530fd199..67fac36b4de4 100644
--- a/ext/afform/core/ang/afformCore/Api4Ctrl.js
+++ b/ext/afform/core/ang/afformCore/Api4Ctrl.js
@@ -18,13 +18,14 @@
         ctrl.entity = parts[0];
         ctrl.action = parts[1];
         ctrl.params = parts[2];
+        ctrl.index = parts[3];
         ctrl.result = {};
         ctrl.loading = ctrl.firstLoad = true;
 
         ctrl.refresh = function refresh() {
           ctrl.loading = true;
           crmThrottle(function () {
-            return crmApi4(ctrl.entity, ctrl.action, ctrl.params)
+            return crmApi4(ctrl.entity, ctrl.action, ctrl.params, ctrl.index)
               .then(function (response) {
                 ctrl.result = response;
                 ctrl.loading = ctrl.firstLoad = false;
@@ -39,7 +40,7 @@
 
         var mode = $scope.affApi4Refresh ? $scope.affApi4Refresh : 'auto';
         switch (mode) {
-          case 'auto': $scope.$watchCollection('affApi4Ctrl.params', ctrl.refresh); break;
+          case 'auto': $scope.$watch('affApi4Ctrl', ctrl.refresh, true); break;
           case 'init': ctrl.refresh(); break;
           case 'manual': break;
           default: throw 'Unrecognized refresh mode: '+ mode;

From 4a6d8f19f40a101855df1a881aec3d926ec53be7 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 9 Jun 2019 09:10:11 -0400
Subject: [PATCH 403/834] Add basic table output on afform list page

---
 ext/afform/gui/ang/afformGui/afformList.html | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ext/afform/gui/ang/afformGui/afformList.html b/ext/afform/gui/ang/afformGui/afformList.html
index 165d91bc0258..59fa732c38ef 100644
--- a/ext/afform/gui/ang/afformGui/afformList.html
+++ b/ext/afform/gui/ang/afformGui/afformList.html
@@ -1,4 +1,25 @@
 <div class="crm-container">
   <div crm-ui-debug="afforms"></div>
 
+  <h1 crm-page-title>{{ ts('All Forms') }}</h1>
+
+  <table>
+    <thead>
+      <tr>
+        <th>Title</th>
+        <th>Name</th>
+        <th>Route</th>
+        <th>Public</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr ng-repeat="afform in afforms">
+        <td>{{ afform.title }}</td>
+        <td>{{ afform.name }}</td>
+        <td>{{ afform.server_route }}</td>
+        <td>{{ afform.is_public }}</td>
+      </tr>
+    </tbody>
+  </table>
+
 </div>

From 5e4baeca161d51ff9dca56da83871008f3b94c56 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 11 Jun 2019 16:42:53 -0400
Subject: [PATCH 404/834] Afform.update - If server_route changes, then clear
 menu/navigation system

---
 ext/afform/core/Civi/Api4/Action/Afform/Update.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Update.php b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
index 879b26a6810f..212c252fb1fb 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Update.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
@@ -58,6 +58,10 @@ protected function writeRecord($item) {
     // We may have changed list of files covered by the cache.
     $scanner->clear();
 
+    if (isset($updates['server_route']) && $updates['server_route'] !== $orig[0]['server_route']) {
+      \CRM_Core_Menu::store();
+      \CRM_Core_BAO_Navigation::resetNavigation();
+    }
     // FIXME if `server_route` changes, then flush the menu cache.
     // FIXME if asset-caching is enabled, then flush the asset cache.
 

From cf41f25a2afccc9588bbab852c70a3567f074ba4 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 12 Jun 2019 06:37:11 -0400
Subject: [PATCH 405/834] Fix phpunit 6 support

---
 ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php   | 7 ++++++-
 ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
index 32263e1ac2db..288141f8d6a9 100644
--- a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
+++ b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
@@ -6,11 +6,14 @@
 /**
  * @group headless
  */
-class CRM_Afform_UtilTest extends \PHPUnit_Framework_TestCase implements HeadlessInterface, TransactionalInterface {
+class CRM_Afform_UtilTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, TransactionalInterface {
 
   /**
    * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   *
    * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   *
+   * @throws \CRM_Extension_Exception_ParseException
    */
   public function setUpHeadless() {
     return \Civi\Test::headless()
@@ -42,7 +45,9 @@ public function getNameExamples() {
    * @param $inputFileName
    * @param $toFormat
    * @param $expected
+   *
    * @dataProvider getNameExamples
+   * @throws \Exception
    */
   public function testNameConversion($inputFileName, $toFormat, $expected) {
     $actual = _afform_angular_module_name($inputFileName, $toFormat);
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
index 94f16b8f916a..6d3e9907af93 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
@@ -6,7 +6,7 @@
 /**
  * Base class for Afform API tests.
  */
-abstract class api_v4_AfformTestCase extends \PHPUnit_Framework_TestCase implements HeadlessInterface, TransactionalInterface {
+abstract class api_v4_AfformTestCase extends \PHPUnit\Framework\TestCase implements HeadlessInterface, TransactionalInterface {
 
   /**
    * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().

From 1825c3bf1068b7aa9bb0f4993276f3d4102d9c74 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 13 Jun 2019 12:46:47 -0400
Subject: [PATCH 406/834] afex.aff.html - Update example markup

---
 ext/afform/mock/ang/afex.aff.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 377f85c280d3..2bf45526698d 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,14 +1,15 @@
-<af-model-list ctrl="modelListCtrl" >
-  <af-model-prop af-type="Individual" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}" />
-  <af-model-prop af-type="Individual" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']" />
-  <af-model-prop af-type="Household" af-name="home" af-label="Home" />
+<af-model-list ctrl="modelListCtrl">
+  <!-- FIXME: Distinguish "Individual"s from "Household"s -->
+  <af-model-prop af-type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model-prop>
+  <af-model-prop af-type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model-prop>
+  <af-model-prop af-type="Contact" af-name="home" af-label="Home"></af-model-prop>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
   <af-model af-name="parent">
     <af-block-contact-name af-label="My Name" />
     <af-block-contact-email af-label="My Email" />
-    <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+    <af-field field-name="do_not_email" />
   </af-model>
 
   <af-model af-name="spouse">

From 7d2f28fee68e7bd03a7c28a0ac23c33074db9e2e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 13 Jun 2019 12:49:59 -0400
Subject: [PATCH 407/834] afform/core - Apply changesets to afform HTML

---
 ext/afform/core/afform.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 09700d2fef0b..6c7586e7fb4b 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -165,7 +165,7 @@ function afform_civicrm_angularModules(&$angularModules) {
 
     // FIXME: The HTML layout template is embedded in the JS asset.
     // This works at runtime for basic usage, but it bypasses
-    // the hook_alterAngular infrastructure, and I'm not sure translation works.
+    // the normal workflow for templates (e.g. translation).
     // We should update core so that 'partials' can be specified more dynamically.
   }
 }
@@ -211,12 +211,18 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   $meta = $scanner->getMeta($name);
   // Hmm?? $scanner = new CRM_Afform_AfformScanner();
 
+  $fileName = '~afform/' . _afform_angular_module_name($name, 'camel');
+  $htmls = [
+    $fileName => file_get_contents($scanner->findFilePath($name, 'aff.html'))
+  ];
+  $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(Civi::service('angular')->getChangeSets(), 'partials', $htmls);
+
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
     'camel' => _afform_angular_module_name($name, 'camel'),
     'meta' => $meta,
     'metaJson' => json_encode($meta),
-    'layout' => file_get_contents($scanner->findFilePath($name, 'aff.html'))
+    'layout' => $htmls[$fileName],
   ]);
   $mimeType = 'text/javascript';
   $content = $smarty->fetch('afform/AfformAngularModule.tpl');

From 9384980c250bd6301fc3b8cab2759844fb11e58b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 13 Jun 2019 12:50:22 -0400
Subject: [PATCH 408/834] afform/core - Inject APIv4 metadata on the `af-field`
 tags

---
 ext/afform/core/afform.php | 38 ++++++++++++++++++++++++++++++++++++++
 ext/afform/docs/roadmap.md |  4 ++++
 2 files changed, 42 insertions(+)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 6c7586e7fb4b..5ab9c7547ec5 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -170,6 +170,44 @@ function afform_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * @param \Civi\Angular\Manager $angular
+ * @see CRM_Utils_Hook::alterAngular()
+ */
+function afform_civicrm_alterAngular($angular) {
+  $fieldMetadata = \Civi\Angular\ChangeSet::create('fieldMetadata')
+    ->alterHtml(';^~afform/;', function($doc, $path){
+      $entities =  _afform_getMetadata($doc);
+
+      foreach (pq('af-field', $doc) as $afField) {
+        /** @var DOMElement $afField */
+        $fieldName = $afField->getAttribute('field-name');
+        $entityName = pq($afField)->parent('[af-name]')->attr('af-name');
+        if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
+          throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
+        }
+        $entityType = $entities[$entityName]['type'];
+        $getFields = civicrm_api4($entityType, 'getFields', [
+          'where' => [['name', '=', $fieldName]],
+        ]);
+        foreach ($getFields as $field) {
+          pq($afField)->attr('field-defn', json_encode($field, JSON_UNESCAPED_SLASHES));
+        }
+      }
+    });
+  $angular->add($fieldMetadata);
+}
+
+function _afform_getMetadata(phpQueryObject $doc) {
+  $entities = [];
+  foreach ($doc->find('af-model-prop') as $afmModelProp) {
+    $entities[$afmModelProp->getAttribute('af-name')] = [
+      'type' => $afmModelProp->getAttribute('af-type'),
+    ];
+  }
+  return $entities;
+}
+
 /**
  * Implements hook_civicrm_alterSettingsFolders().
  *
diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index f715401676e2..eb55f35545a1 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -50,3 +50,7 @@ Within this extension, there are things which need updating/addressing:
   support batching (i.e. all API calls issued within a 5ms window are sent as a batch).
 * Default CSS: There's no mechanism for defining adhoc CSS. This is arguably a feature, though, because the CSS classes
   should be validated (to ensure theme interoperability).
+* `Civi/Angular/ChangeSet.php` previously had an integrity check that activated in developer mode
+  (`\CRM_Core_Config::singleton()->debug && $coder->checkConsistentHtml($html)`). This has been removed because it was a bit brittle
+  about self-closing HTML tags. However, the general concept of HTML validation should be reinstated as part of the `afform_auditor`.
+* `hook_alterAngular` is used to inject APIv4 metadata for certain tags. This behavior needs a unit-test.

From c9920ea7d3bd497a2b9c6049a5eed7c0400e15cd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 13 Jun 2019 13:06:22 -0400
Subject: [PATCH 409/834] afform/core - When injecting APIv4 metadata, be more
 choosy

---
 ext/afform/core/afform.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 5ab9c7547ec5..e1f68f59f338 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -189,6 +189,8 @@ function afform_civicrm_alterAngular($angular) {
         $entityType = $entities[$entityName]['type'];
         $getFields = civicrm_api4($entityType, 'getFields', [
           'where' => [['name', '=', $fieldName]],
+          'select' => ['name', 'html_type', 'html_attrs', 'options'],
+          'loadOptions' => TRUE,
         ]);
         foreach ($getFields as $field) {
           pq($afField)->attr('field-defn', json_encode($field, JSON_UNESCAPED_SLASHES));

From 3cd5c38b192d2a4666cfaa194cd4782f4cddbdb0 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 20 Jun 2019 17:11:35 -0400
Subject: [PATCH 410/834] Civilint cleanup

---
 ext/afform/core/afform.php | 33 ++++-----------------------------
 1 file changed, 4 insertions(+), 29 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index e1f68f59f338..f306746c712b 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -176,8 +176,8 @@ function afform_civicrm_angularModules(&$angularModules) {
  */
 function afform_civicrm_alterAngular($angular) {
   $fieldMetadata = \Civi\Angular\ChangeSet::create('fieldMetadata')
-    ->alterHtml(';^~afform/;', function($doc, $path){
-      $entities =  _afform_getMetadata($doc);
+    ->alterHtml(';^~afform/;', function($doc, $path) {
+      $entities = _afform_getMetadata($doc);
 
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
@@ -253,7 +253,7 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
 
   $fileName = '~afform/' . _afform_angular_module_name($name, 'camel');
   $htmls = [
-    $fileName => file_get_contents($scanner->findFilePath($name, 'aff.html'))
+    $fileName => file_get_contents($scanner->findFilePath($name, 'aff.html')),
   ];
   $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(Civi::service('angular')->getChangeSets(), 'partials', $htmls);
 
@@ -299,6 +299,7 @@ function afform_civicrm_alterMenu(&$items) {
  *   'camel' or 'dash'.
  * @return string
  *   Ex: 'FooBar' or 'foo-bar'.
+ * @throws \Exception
  */
 function _afform_angular_module_name($fileBaseName, $format = 'camel') {
   switch ($format) {
@@ -316,29 +317,3 @@ function _afform_angular_module_name($fileBaseName, $format = 'camel') {
       throw new \Exception("Unrecognized format");
   }
 }
-
-/**
- * Implements hook_civicrm_preProcess().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
- *
-function afform_civicrm_preProcess($formName, &$form) {
-
-} // */
-
-/**
- * Implements hook_civicrm_navigationMenu().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
- *
-function afform_civicrm_navigationMenu(&$menu) {
-  _afform_civix_insert_navigation_menu($menu, 'Mailings', array(
-    'label' => E::ts('New subliminal message'),
-    'name' => 'mailing_subliminal_message',
-    'url' => 'civicrm/mailing/subliminal',
-    'permission' => 'access CiviMail',
-    'operator' => 'OR',
-    'separator' => 0,
-  ));
-  _afform_civix_navigationMenu($menu);
-} // */

From cef2e16a7ab1f4335b95650ee8010db22b8039ee Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Jun 2019 21:35:04 -0400
Subject: [PATCH 411/834] Merge existing field metadata

---
 ext/afform/core/afform.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index f306746c712b..abea0d825b29 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -189,11 +189,23 @@ function afform_civicrm_alterAngular($angular) {
         $entityType = $entities[$entityName]['type'];
         $getFields = civicrm_api4($entityType, 'getFields', [
           'where' => [['name', '=', $fieldName]],
-          'select' => ['name', 'html_type', 'html_attrs', 'options'],
+          'select' => ['title', 'input_type', 'input_attrs', 'options'],
           'loadOptions' => TRUE,
         ]);
+        // Merge field definition data with whatever's already in the markup
         foreach ($getFields as $field) {
-          pq($afField)->attr('field-defn', json_encode($field, JSON_UNESCAPED_SLASHES));
+          $existingFieldDefn = trim(pq($afField)->attr('field-defn') ?: '');
+          if ($existingFieldDefn && $existingFieldDefn[0] != '{') {
+            // If it's not an object, don't mess with it.
+            continue;
+          }
+          foreach ($field as &$prop) {
+            $prop = json_encode($prop, JSON_UNESCAPED_SLASHES);
+          }
+          if ($existingFieldDefn) {
+            $field = array_merge($field, CRM_Utils_JS::getRawProps($existingFieldDefn));
+          }
+          pq($afField)->attr('field-defn', CRM_Utils_JS::writeObject($field));
         }
       }
     });

From 17d153bd6af66342ce0fc856ed30ae72e21dadcd Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Jun 2019 21:35:39 -0400
Subject: [PATCH 412/834] Add field widgets

Add field widgets
---
 .../core/CRM/Afform/Page/AfformBase.php       |  4 +++-
 ext/afform/core/ang/af/Model.js               | 15 ++++++++----
 ext/afform/core/ang/af/ModelList.js           | 24 ++++++++++++-------
 ext/afform/core/ang/af/ModelProp.js           |  4 +++-
 ext/afform/core/ang/afField/afField.html      |  7 +++---
 ext/afform/core/ang/afField/afField.js        | 18 +++++++++++---
 .../core/ang/afField/widgets/CheckBox.html    |  7 ++++++
 ext/afform/core/ang/afField/widgets/Date.html |  1 +
 .../core/ang/afField/widgets/Number.html      |  1 +
 .../core/ang/afField/widgets/Radio.html       |  4 ++++
 .../ang/afField/widgets/RichTextEditor.html   |  1 +
 .../core/ang/afField/widgets/Select.html      |  1 +
 ext/afform/core/ang/afField/widgets/Text.html |  1 +
 .../core/ang/afField/widgets/TextArea.html    |  1 +
 ext/afform/core/ang/afformCore.ang.php        | 22 ++++++++---------
 ext/afform/core/ang/afformCore.js             |  4 +---
 ext/afform/core/ang/afformStandalone.ang.php  | 16 ++++++-------
 .../templates/CRM/Afform/Page/AfformBase.tpl  | 14 ++++-------
 18 files changed, 93 insertions(+), 52 deletions(-)
 create mode 100644 ext/afform/core/ang/afField/widgets/CheckBox.html
 create mode 100644 ext/afform/core/ang/afField/widgets/Date.html
 create mode 100644 ext/afform/core/ang/afField/widgets/Number.html
 create mode 100644 ext/afform/core/ang/afField/widgets/Radio.html
 create mode 100644 ext/afform/core/ang/afField/widgets/RichTextEditor.html
 create mode 100644 ext/afform/core/ang/afField/widgets/Select.html
 create mode 100644 ext/afform/core/ang/afField/widgets/Text.html
 create mode 100644 ext/afform/core/ang/afField/widgets/TextArea.html

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 75daf17cba74..ee666dacac11 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -12,7 +12,9 @@ public function run() {
     $loader = new \Civi\Angular\AngularLoader();
     $loader->setModules([$module, 'afformStandalone']);
     $loader->setPageName(implode('/', $pagePath));
-    $loader->useApp();
+    $loader->useApp([
+      'file' => 'CRM/Afform/Page/AfformBase.tpl',
+    ]);
     $loader->getRes()->addSetting([
       'afform' => [
         'open' => _afform_angular_module_name($pageArgs['afform'], 'dash'),
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
index 8a07e9f5d3d7..3201e1af6788 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -10,16 +10,21 @@
       },
       link: function($scope, $el, $attr, afModelListCtrl) {
         $scope.afModelListCtrl = afModelListCtrl;
-        // $scope.$watch('afName', function(newValue){
-        //   // $scope.myOptions = newValue;
-        //   $scope.modelDefn = afModelListCtrl.getEntity(newValue);
-        //   console.log('Lookup entity', newValue, $scope.modelDefn);
-        // });
+        // This is faster than waiting for each field directive to register itself
+        $('af-field', $el).each(function() {
+          afModelListCtrl.registerField($scope.afName, $(this).attr('field-name'))
+        });
       },
       controller: function($scope){
         this.getDefn = function getDefn() {
           return $scope.afModelListCtrl.getEntity($scope.afName);
           // return $scope.modelDefn;
+        };
+        this.getData = function getData() {
+          return $scope.afModelListCtrl.getData($scope.afName);
+        };
+        this.getName = function() {
+          return $scope.afName;
         }
       }
     };
diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index 1c6fc6f2077e..cdbe8b9f47ca 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -10,25 +10,33 @@
       },
       link: function($scope, $el, $attr) {},
       controller: ['$scope', function($scope) {
-        var entities = {};
+        var schema = {}, data = {};
 
         $scope.$parent[$scope.ctrl] = this;
+        // Maybe there's a better way to export this controller to scope?
+        $scope.myCtrl = this;
 
         this.registerEntity = function registerEntity(entity) {
-          // console.log('register', entity.name);
-          entities[entity.name] = entity;
+          schema[entity.name] = entity;
+          data[entity.name] = data[entity.name] || {};
+        };
+        this.registerField = function(entityName, fieldName) {
+          schema[entityName].fields.push(fieldName);
         };
         this.getEntity = function getEntity(name) {
-          // console.log('get', name);
-          return entities[name];
+          return schema[name];
+        };
+        this.getData = function getData(name) {
+          return data[name];
+        };
+        this.getSchema = function getSchema(name) {
+          return schema[name];
         };
-
-        // TODO: Support for tapping into load+save API calls
 
         this.submit = function submit() {
           CRM.alert('TODO: Submit');
         };
-      }]
+      }
     };
   });
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index ef44b79feb73..399c6a60bf0b 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -13,9 +13,11 @@
       link: function($scope, $el, $attr, afModelListCtrl) {
         var ts = $scope.ts = CRM.ts('afform');
         afModelListCtrl.registerEntity({
+          id: null,
           type: $scope.afType,
           name: $scope.afName,
-          label: $scope.afLabel
+          label: $scope.afLabel,
+          fields: [],
         });
         // $scope.$watch('afModelProp', function(newValue){$scope.myOptions = newValue;});
       }
diff --git a/ext/afform/core/ang/afField/afField.html b/ext/afform/core/ang/afField/afField.html
index 3590517913a4..f54a4bfede97 100644
--- a/ext/afform/core/ang/afField/afField.html
+++ b/ext/afform/core/ang/afField/afField.html
@@ -1,3 +1,4 @@
-<div>
-  {{ts('Single field for %1::%2', {1: afModel.getDefn().type,2: fieldName})}}
-</div>
+<label class="crm-af-field-label" ng-if="fieldDefn.title" for="{{ fieldId }}">
+  {{ fieldDefn.title }}
+</label>
+<div class="crm-af-field" ng-include="'~/afField/widgets/' + fieldDefn.input_type + '.html'"></div>
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 911e8deed29c..5d4fb7a1fae5 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -2,15 +2,27 @@
   // Example usage: <af-model af-name="myModel"><af-field field-name="do_not_email" /></af-model>
   angular.module('afField').directive('afField', function() {
     return {
-      restrict: 'AE',
-      require: ['^afModel'],
+      restrict: 'E',
+      require: ['^afModel', '^afModelList'],
       templateUrl: '~/afField/afField.html',
       scope: {
-        fieldName: '@'
+        fieldName: '@',
+        fieldDefn: '='
       },
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform');
         $scope.afModel = ctrls[0];
+        var modelList = ctrls[1];
+        $scope.fieldId = $scope.afModel.getDefn().name + '-' + $scope.fieldName;
+        $scope.getData = $scope.afModel.getData;
+
+        $scope.getOptions = function() {
+          return _.transform($scope.fieldDefn.options, function(result, val, key) {
+            result.push({id: key, text: val});
+          }, []);
+        };
+
+        $el.addClass('af-field-type-' + _.kebabCase($scope.fieldDefn.input_type));
       }
     };
   });
diff --git a/ext/afform/core/ang/afField/widgets/CheckBox.html b/ext/afform/core/ang/afField/widgets/CheckBox.html
new file mode 100644
index 000000000000..d4401cc1d89b
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/CheckBox.html
@@ -0,0 +1,7 @@
+<ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="fieldDefn.options">
+  <li ng-repeat="(key, val) in fieldDefn.options" >
+    <input type="checkbox" checklist-model="getData()[fieldName]" id="{{ fieldId + key }}" checklist-value="key" />
+    <label for="{{ fieldId + key }}">{{ val }}</label>
+  </li>
+</ul>
+<input type="checkbox" ng-if="!fieldDefn.options" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Date.html b/ext/afform/core/ang/afField/widgets/Date.html
new file mode 100644
index 000000000000..21d59e7a0bb2
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/Date.html
@@ -0,0 +1 @@
+<input crm-ui-datepicker="fieldDefn.input_attrs" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Number.html b/ext/afform/core/ang/afField/widgets/Number.html
new file mode 100644
index 000000000000..d04da0659556
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/Number.html
@@ -0,0 +1 @@
+<input class="crm-form-text" type="number" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Radio.html b/ext/afform/core/ang/afField/widgets/Radio.html
new file mode 100644
index 000000000000..114978550940
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/Radio.html
@@ -0,0 +1,4 @@
+<label ng-repeat="(key, val) in fieldDefn.options" >
+  <input class="crm-form-radio" type="radio" ng-model="getData()[fieldName]" value="{{ key }}" />
+  {{ val }}
+</label>
diff --git a/ext/afform/core/ang/afField/widgets/RichTextEditor.html b/ext/afform/core/ang/afField/widgets/RichTextEditor.html
new file mode 100644
index 000000000000..cedb7221047a
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/RichTextEditor.html
@@ -0,0 +1 @@
+<textarea crm-ui-richtext id="{{ fieldId }}" ng-model="getData()[fieldName]" ></textarea>
diff --git a/ext/afform/core/ang/afField/widgets/Select.html b/ext/afform/core/ang/afField/widgets/Select.html
new file mode 100644
index 000000000000..298c16f9bf3d
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/Select.html
@@ -0,0 +1 @@
+<input crm-ui-select="{data: getOptions(), multiple: fieldDefn.input_attrs.multiple}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Text.html b/ext/afform/core/ang/afField/widgets/Text.html
new file mode 100644
index 000000000000..6f94d24a59fb
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/Text.html
@@ -0,0 +1 @@
+<input class="crm-form-text" type="text" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/TextArea.html b/ext/afform/core/ang/afField/widgets/TextArea.html
new file mode 100644
index 000000000000..f19d4c9771bb
--- /dev/null
+++ b/ext/afform/core/ang/afField/widgets/TextArea.html
@@ -0,0 +1 @@
+<textarea class="crm-form-textarea" id="{{ fieldId }}" ng-model="getData()[fieldName]" ></textarea>
diff --git a/ext/afform/core/ang/afformCore.ang.php b/ext/afform/core/ang/afformCore.ang.php
index c93f30450252..ff3e7a48f94e 100644
--- a/ext/afform/core/ang/afformCore.ang.php
+++ b/ext/afform/core/ang/afformCore.ang.php
@@ -3,15 +3,15 @@
 // in CiviCRM. See also:
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
-return array(
-  'js' => array(
-    0 => 'ang/afformCore.js',
-    1 => 'ang/afformCore/*.js',
-    2 => 'ang/afformCore/*/*.js',
-  ),
-  'css' => array('ang/afformCore.css'),
-  'requires' => array('crmUi', 'crmUtil', 'api4'),
-  'partials' => array('ang/afformCore'),
-  'settings' => array(),
+return [
+  'js' => [
+    'ang/afformCore.js',
+    'ang/afformCore/*.js',
+    'ang/afformCore/*/*.js',
+  ],
+  'css' => ['ang/afformCore.css'],
+  'requires' => ['crmUi', 'crmUtil', 'api4', 'checklist-model'],
+  'partials' => ['ang/afformCore'],
+  'settings' => [],
   'basePages' => [],
-);
+];
diff --git a/ext/afform/core/ang/afformCore.js b/ext/afform/core/ang/afformCore.js
index b583486da33b..9ee3732d3a16 100644
--- a/ext/afform/core/ang/afformCore.js
+++ b/ext/afform/core/ang/afformCore.js
@@ -1,8 +1,6 @@
 (function(angular, $, _) {
   // Declare a list of dependencies.
-  angular.module('afformCore', [
-    'crmUi', 'crmUtil', 'ngRoute', 'api4'
-  ]);
+  angular.module('afformCore', CRM.angRequires('afformCore'));
 
   // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
   angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus, crmUiAlert){
diff --git a/ext/afform/core/ang/afformStandalone.ang.php b/ext/afform/core/ang/afformStandalone.ang.php
index 2fbf67d02fad..3b145af59c87 100644
--- a/ext/afform/core/ang/afformStandalone.ang.php
+++ b/ext/afform/core/ang/afformStandalone.ang.php
@@ -3,16 +3,16 @@
 // in CiviCRM. See also:
 // http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
 
-return array(
-  'js' => array(
+return [
+  'js' => [
     'ang/afformStandalone.js',
     'ang/afformStandalone/*.js',
     'ang/afformStandalone/*/*.js',
-  ),
-  'css' => array(),
-  'partials' => array(
+  ],
+  'css' => [],
+  'partials' => [
     'ang/afformStandalone',
-  ),
-  'settings' => array(),
+  ],
+  'settings' => [],
   'requires' => ['ngRoute'],
-);
+];
diff --git a/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl b/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
index 4beb737db3e9..aeaf3848e8cd 100644
--- a/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
+++ b/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
@@ -1,9 +1,5 @@
-<h3>This new page is generated by CRM/Afform/Page/AfformBase.php</h3>
-
-{* Example: Display a variable directly *}
-<p>The current time is {$currentTime}</p>
-
-{* Example: Display a translated string -- which happens to include a variable *}
-<p>{ts 1=$currentTime}(In your native language) The current time is %1.{/ts}</p>
-
-<p>Please open "{$afform}"</p>
\ No newline at end of file
+{literal}
+  <div ng-app="crmApp">
+    <form ng-view></form>
+  </div>
+{/literal}

From 1d23311bc6f0c5eeced1916de14f2654c2e5daf9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Jun 2019 21:42:29 -0400
Subject: [PATCH 413/834] Load data from ids passed in url

---
 ext/afform/core/ang/af/ModelList.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index cdbe8b9f47ca..8976fe0e29b3 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -8,8 +8,15 @@
         // afModelList: '=',
         ctrl: '@'
       },
-      link: function($scope, $el, $attr) {},
-      controller: ['$scope', function($scope) {
+      link: {
+        pre: function($scope, $el, $attr) {
+
+        },
+        post: function($scope, $el, $attr) {
+          $scope.myCtrl.loadData();
+        }
+      },
+      controller: function($scope, $routeParams, crmApi4) {
         var schema = {}, data = {};
 
         $scope.$parent[$scope.ctrl] = this;
@@ -32,6 +39,20 @@
         this.getSchema = function getSchema(name) {
           return schema[name];
         };
+        this.loadData = function() {
+          var apiCalls = {};
+          _.each(schema, function(entity, entityName) {
+            if ($routeParams[entityName]) {
+              var id = $routeParams[entityName];
+              apiCalls[entityName] = [entity.type, 'get', {select: entity.fields, where: [['id', '=', id]]}, 0];
+            }
+          });
+          if (!_.isEmpty(apiCalls)) {
+            crmApi4(apiCalls).then(function(resp) {
+              data = resp;
+            });
+          }
+        };
 
         this.submit = function submit() {
           CRM.alert('TODO: Submit');

From a2616a0495c24b616ababa9531817cb943ac0004 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 26 Jun 2019 15:04:00 -0700
Subject: [PATCH 414/834] Add auditor/backlog.md

---
 ext/afform/auditor/backlog.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 ext/afform/auditor/backlog.md

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
new file mode 100644
index 000000000000..27d01df1e23e
--- /dev/null
+++ b/ext/afform/auditor/backlog.md
@@ -0,0 +1,20 @@
+# Afform Auditor Backlog
+
+The general design of validation mechanism is being discussed in https://github.com/totten/afform/issues/20
+
+For the moment, it's good to keep some notes on specific issues for the
+validator to catch. Loosely/informally:
+
+* HTML partials should be well-formed/parseable XML
+* Warnings about any unrecognized tags/attributes/classes.
+* `<af-model-list>`, `<af-model-prop>`, `<af-model>`, `<af-field>` should have suitable relationships.
+* `<af-model-prop>` should reference legit entities.
+* `<af-field>` should reference legit fields.
+    * Future consideration: how to validate when it's part of a subform?
+* `<af-model>` should reference a declared model.
+* `<af-field field-defn="...">` should contain an object.
+* `<a>` should have `href` or `ng-click` or `aff-api4-action`
+* Accept a restricted subset of HTML (e.g. `p h1 h2 h3` but not `script` or `[onclick]`)
+* Accept a restricted subset of BootstrapCSS
+* Accept a restricted subset of Angular HTML
+* Accept directives created via Afform

From 7cba5b8f2328a69c359451630d960115db6e56b6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 24 Jul 2019 14:36:31 -0700
Subject: [PATCH 415/834] Update info.xml

---
 ext/afform/core/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 09205b57da46..48827ac6cc32 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -18,10 +18,10 @@
   <version>0.2</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.3</ver>
+    <ver>5.17</ver>
   </compatibility>
   <requires>
-    <ext>org.civicrm.api4</ext>
+    <ext version="~4.5">org.civicrm.api4</ext>
   </requires>
   <comments>This is a new, undeveloped module</comments>
   <civix>

From 210888c516200c0f298000ecbe5ff70e78c9fcfe Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 7 Aug 2019 14:48:36 -0700
Subject: [PATCH 416/834] afform_html - Remove unused page controller

Obsoleted by afform-based version of the page
---
 .../html/CRM/AfformHtml/Page/HtmlEditor.php   | 25 -----------------
 .../CRM/AfformHtml/Page/HtmlEditor.tpl        | 27 -------------------
 ext/afform/html/xml/Menu/afform_html.xml      |  9 -------
 3 files changed, 61 deletions(-)
 delete mode 100644 ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
 delete mode 100644 ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
 delete mode 100644 ext/afform/html/xml/Menu/afform_html.xml

diff --git a/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php b/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
deleted file mode 100644
index 89d4767ea93a..000000000000
--- a/ext/afform/html/CRM/AfformHtml/Page/HtmlEditor.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-use CRM_AfformHtml_ExtensionUtil as E;
-
-class CRM_AfformHtml_Page_HtmlEditor extends CRM_Core_Page {
-
-  const MONACO_DIR = 'node_modules/monaco-editor/min/vs';
-
-  public function run() {
-    CRM_Utils_System::setTitle(E::ts('Afform HTML Editor'));
-
-    CRM_Core_Region::instance('html-header')->add([
-      'markup' => '<meta http-equiv="X-UA-Compatible" content="IE=edge" />',
-    ]);
-    Civi::resources()
-      ->addVars('afform_html', [
-        'paths' => [
-          'vs' => E::url(self::MONACO_DIR),
-        ],
-      ])
-      ->addScriptFile(E::LONG_NAME, self::MONACO_DIR . '/loader.js', CRM_Core_Resources::DEFAULT_WEIGHT, 'html-header');
-
-    parent::run();
-  }
-
-}
diff --git a/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl b/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
deleted file mode 100644
index df123dada3e4..000000000000
--- a/ext/afform/html/templates/CRM/AfformHtml/Page/HtmlEditor.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<script type="text/javascript">
-    var myEditor;
-</script>
-
-<button onclick="console.log(myEditor.getValue())">Dump to console</button>
-<div id="htmlEditor" style="width:800px;height:600px;border:1px solid grey"></div>
-
-<script>
-    {literal}
-    require.config({
-        paths: CRM.vars.afform_html.paths
-    });
-    require(['vs/editor/editor.main'], function () {
-        myEditor = monaco.editor.create(document.getElementById('htmlEditor'), {
-            value: [
-                '<div afform-helloworld>\nHello {{routeParams.name}}\n</div>'
-            ].join('\n'),
-            language: 'html',
-            theme: 'vs-dark',
-            tabSize: 2,
-            minimap: {
-                enabled: false
-            }
-        });
-    });
-    {/literal}
-</script>
diff --git a/ext/afform/html/xml/Menu/afform_html.xml b/ext/afform/html/xml/Menu/afform_html.xml
deleted file mode 100644
index bf56e3799a50..000000000000
--- a/ext/afform/html/xml/Menu/afform_html.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<menu>
-  <item>
-    <path>civicrm/admin/afform/html</path>
-    <page_callback>CRM_AfformHtml_Page_HtmlEditor</page_callback>
-    <title>HtmlEditor</title>
-    <access_arguments>administer CiviCRM</access_arguments>
-  </item>
-</menu>

From 6f8b6c684b60dce066c7e5bc488f9bde9688d53e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 7 Aug 2019 15:00:26 -0700
Subject: [PATCH 417/834] Api4Ctrl - Fix infinite reloads

I noticed that the `afform-html` GUI is sending an infinite number requests to
reload its data.  After bisecting, I found that e7ebc633a had expanded the
scope the `watch()` so that it reloads on *any* change to `affApi4Ctrl` (not
just a change in params).  But the `affApi4Ctrl` includes the `.result` data
- as soon as the result data is returned, it re-triggers the watch and sends
the request again.  This becomes an infinite loop.

I don't think this was necessary for the goal of indexing - although maybe
the idea was that a change to `.index` should cause a reload, which seems
reasonable.  So I've whitelisted fields which deal with APIv4 inputs.
---
 ext/afform/core/ang/afformCore/Api4Ctrl.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/ang/afformCore/Api4Ctrl.js b/ext/afform/core/ang/afformCore/Api4Ctrl.js
index 67fac36b4de4..41648cfc1d3b 100644
--- a/ext/afform/core/ang/afformCore/Api4Ctrl.js
+++ b/ext/afform/core/ang/afformCore/Api4Ctrl.js
@@ -40,7 +40,13 @@
 
         var mode = $scope.affApi4Refresh ? $scope.affApi4Refresh : 'auto';
         switch (mode) {
-          case 'auto': $scope.$watch('affApi4Ctrl', ctrl.refresh, true); break;
+          case 'auto':
+            // Note: Do NOT watch '.result' or '.loading' - causes infinite reloads.
+            $scope.$watchCollection('affApi4Ctrl.params', ctrl.refresh, true);
+            $scope.$watch('affApi4Ctrl.index', ctrl.refresh, true);
+            $scope.$watch('affApi4Ctrl.entity', ctrl.refresh, true);
+            $scope.$watch('affApi4Ctrl.action', ctrl.refresh, true);
+            break;
           case 'init': ctrl.refresh(); break;
           case 'manual': break;
           default: throw 'Unrecognized refresh mode: '+ mode;

From 6a064c7916080c804397ce58fbf7b47abe103b76 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 7 Aug 2019 15:48:11 -0700
Subject: [PATCH 418/834] afformHtmlEditor - Fix saving of server_route and
 description

---
 ext/afform/html/ang/afformHtmlEditor.aff.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index 2c2681502691..69af093d7931 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -10,7 +10,7 @@
     <div>
       <a ng-href="#/">{{ts('Back')}}</a>
       |
-      <a aff-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:{layout: resultForm.layout}}]">{{ts('Save')}}</a>
+      <a aff-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:resultForm}]">{{ts('Save')}}</a>
       <span ng-if="resultForm.server_route">
         | <a target="_blank" ng-href="{{crmUrl(resultForm.server_route)}}">Open</a>
       </span>

From 13bdd6d22bddb635d820d6f5eb7dc38df9687fb6 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 13 Aug 2019 17:10:29 -0400
Subject: [PATCH 419/834] Simplify variable assignment

---
 ext/afform/core/afform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index abea0d825b29..ec6468a3933b 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -296,7 +296,7 @@ function afform_civicrm_alterMenu(&$items) {
       $items[$meta['server_route']] = [
         'page_callback' => 'CRM_Afform_Page_AfformBase',
         'page_arguments' => 'afform=' . urlencode($name),
-        'title' => CRM_Utils_Array::value('title', $meta, ''),
+        'title' => $meta['title'] ?? '',
         'access_arguments' => [['access CiviCRM'], 'and'], // FIXME
         'is_public' => $meta['is_public'],
       ];

From 5591cfbf715bcb3ebe212ecdd7b9869e17f629c4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 13 Aug 2019 17:17:08 -0400
Subject: [PATCH 420/834] Code cleanup

---
 ext/afform/core/CRM/Afform/AfformScanner.php | 4 ++--
 ext/afform/core/afform.php                   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 82a6d40a9193..3611d1b5af44 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -50,7 +50,7 @@ public function findFilePaths() {
       }
     }
 
-    $paths = array();
+    $paths = [];
 
     $mapper = CRM_Extension_System::singleton()->getMapper();
     foreach ($mapper->getModules() as $module) {
@@ -156,7 +156,7 @@ public function getMeta($name) {
    *   Ex: ['view-individual' => ['title' => 'View an individual contact', ...]]
    */
   public function getMetas() {
-    $result = array();
+    $result = [];
     foreach (array_keys($this->findFilePaths()) as $name) {
       $result[$name] = $this->getMeta($name);
     }
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index ec6468a3933b..c505c3c42649 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -14,7 +14,7 @@ function _afform_fields() {
  * @return array
  */
 function _afform_fields_filter($params) {
-  $result = array();
+  $result = [];
   foreach (_afform_fields() as $field) {
     if (isset($params[$field])) {
       $result[$field] = $params[$field];
@@ -33,12 +33,12 @@ function _afform_fields_filter($params) {
 }
 
 /**
- * @param ContainerBuilder $container
+ * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
  */
 function afform_civicrm_container($container) {
   $container->setDefinition('afform_scanner', new \Symfony\Component\DependencyInjection\Definition(
     'CRM_Afform_AfformScanner',
-    array()
+    []
   ));
 }
 

From 3b95ac274dbfcff8da03d0161b0ca2a36411175c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 13 Aug 2019 17:46:14 -0400
Subject: [PATCH 421/834] Suppress warnings about nonstandard tag names

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index cfd30300d550..3a94dddf4fdf 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -75,7 +75,7 @@ public function convertHtmlToArray($html) {
     }
 
     $doc = new DOMDocument();
-    $doc->loadHTML("<html><body>$html</body></html>");
+    @$doc->loadHTML("<html><body>$html</body></html>");
 
     // FIXME: Validate expected number of child nodes
 

From 7ea6ab6037d06c0b54ef3fc5ad3cc99be0ac13bd Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 13 Aug 2019 23:59:51 -0400
Subject: [PATCH 422/834] Remove dependence on crmApp & add page title

---
 .../core/CRM/Afform/Page/AfformBase.php       | 10 +++++----
 ext/afform/core/ang/af/ModelList.js           |  3 ---
 ext/afform/core/ang/afformCore.js             | 22 ++++++++++---------
 .../core/ang/afformStandalone/PageCtrl.js     |  9 ++++----
 .../templates/CRM/Afform/Page/AfformBase.tpl  |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index ee666dacac11..91bec9509c52 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -4,7 +4,6 @@
 class CRM_Afform_Page_AfformBase extends CRM_Core_Page {
 
   public function run() {
-    //    echo '<pre>';print_r(func_get_args());exit();
     list ($pagePath, $pageArgs) = func_get_args();
 
     $module = _afform_angular_module_name($pageArgs['afform']);
@@ -12,9 +11,6 @@ public function run() {
     $loader = new \Civi\Angular\AngularLoader();
     $loader->setModules([$module, 'afformStandalone']);
     $loader->setPageName(implode('/', $pagePath));
-    $loader->useApp([
-      'file' => 'CRM/Afform/Page/AfformBase.tpl',
-    ]);
     $loader->getRes()->addSetting([
       'afform' => [
         'open' => _afform_angular_module_name($pageArgs['afform'], 'dash'),
@@ -22,6 +18,12 @@ public function run() {
     ]);
     $loader->load();
 
+    $afform = civicrm_api4('Afform', 'get', ['where' => [['name', '=', $pageArgs['afform']]], 'select' => ['title']]);
+
+    if (!empty($afform[0]['title'])) {
+      CRM_Utils_System::setTitle(strip_tags($afform[0]['title']));
+    }
+
     parent::run();
   }
 
diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index 8976fe0e29b3..7e28e0e6080f 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -9,9 +9,6 @@
         ctrl: '@'
       },
       link: {
-        pre: function($scope, $el, $attr) {
-
-        },
         post: function($scope, $el, $attr) {
           $scope.myCtrl.loadData();
         }
diff --git a/ext/afform/core/ang/afformCore.js b/ext/afform/core/ang/afformCore.js
index 9ee3732d3a16..bdb6856a1b90 100644
--- a/ext/afform/core/ang/afformCore.js
+++ b/ext/afform/core/ang/afformCore.js
@@ -3,19 +3,21 @@
   angular.module('afformCore', CRM.angRequires('afformCore'));
 
   // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
-  angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus, crmUiAlert){
-    return function(camelName, meta, d){
+  angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus, crmUiAlert) {
+    return function(camelName, meta, d) {
       d.restrict = 'AE';
       d.scope = {};
       d.scope.options = '=' + camelName;
-      d.link = function($scope, $el, $attr) {
-        $scope.ts = CRM.ts(camelName);
-        $scope.routeParams = $routeParams;
-        $scope.meta = meta;
-        $scope.crmApi4 = crmApi4;
-        $scope.crmStatus = crmStatus;
-        $scope.crmUiAlert = crmUiAlert;
-        $scope.crmUrl = CRM.url;
+      d.link = {
+        pre: function($scope, $el, $attr) {
+          $scope.ts = CRM.ts(camelName);
+          $scope.routeParams = $routeParams;
+          $scope.meta = meta;
+          $scope.crmApi4 = crmApi4;
+          $scope.crmStatus = crmStatus;
+          $scope.crmUiAlert = crmUiAlert;
+          $scope.crmUrl = CRM.url;
+        }
       };
       return d;
     };
diff --git a/ext/afform/core/ang/afformStandalone/PageCtrl.js b/ext/afform/core/ang/afformStandalone/PageCtrl.js
index 8c39fc4055c0..7f597b022384 100644
--- a/ext/afform/core/ang/afformStandalone/PageCtrl.js
+++ b/ext/afform/core/ang/afformStandalone/PageCtrl.js
@@ -1,13 +1,12 @@
 (function(angular, $, _) {
 
-  angular.module('afformStandalone').config(function($routeProvider) {
+  angular.module('afformStandalone', CRM.angular.modules)
+    .config(function($routeProvider) {
       $routeProvider.when('/', {
         controller: 'AfformStandalonePageCtrl',
         template: function() {return '<div ' + CRM.afform.open + '="{}"></div>'; }
       });
-    }
-  );
-
-  angular.module('afformStandalone').controller('AfformStandalonePageCtrl', function($scope) {});
+    })
+    .controller('AfformStandalonePageCtrl', function($scope) {});
 
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl b/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
index aeaf3848e8cd..0637db770d1e 100644
--- a/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
+++ b/ext/afform/core/templates/CRM/Afform/Page/AfformBase.tpl
@@ -1,5 +1,5 @@
 {literal}
-  <div ng-app="crmApp">
+  <div ng-app="afformStandalone">
     <form ng-view></form>
   </div>
 {/literal}

From e75652826b956bb785ff29d1e0f8f7f98a63329a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 23 Aug 2019 19:50:27 -0700
Subject: [PATCH 423/834] afformHtmlEditor - Expose 'title' property

---
 ext/afform/html/ang/afformHtmlEditor.aff.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index 69af093d7931..d97af4c0d1a3 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -19,6 +19,7 @@
     <fieldset>
       <legend>{{ts('Properties')}}</legend>
       <div><label>{{ts('Name')}}:</label> {{resultForm.name}}</div>
+      <div><label>{{ts('Title')}}:</label> <input ng-model="resultForm.title" type="text" /></div>
       <div><label>{{ts('Server Router')}}:</label> <input ng-model="resultForm.server_route" type="text" /></div>
       <div><label>{{ts('Description')}}:</label> <textarea ng-model="resultForm.description"></textarea></div>
     </fieldset>

From 36212fa6d171f18efbd0c037d4fc91d15929314c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 23 Aug 2019 19:55:23 -0700
Subject: [PATCH 424/834] info.xml - Normalize titles/descriptions

---
 ext/afform/core/info.xml | 2 +-
 ext/afform/gui/info.xml  | 4 ++--
 ext/afform/html/info.xml | 4 ++--
 ext/afform/mock/info.xml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 48827ac6cc32..637108d9cc45 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.afform" type="module">
   <file>afform</file>
-  <name>Afform</name>
+  <name>Afform: Core Runtime</name>
   <description>Afform is the Affable Administrative AngularJS Form Framework</description>
   <license>AGPL-3.0</license>
   <maintainer>
diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
index 964c52202871..f722afb4b741 100644
--- a/ext/afform/gui/info.xml
+++ b/ext/afform/gui/info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.afform-gui" type="module">
   <file>afform_gui</file>
-  <name>Civi Form Builder</name>
-  <description>FIXME</description>
+  <name>Afform: Form Builder</name>
+  <description>GUI for designing forms</description>
   <license>AGPL-3.0</license>
   <maintainer>
     <author>Tim Otten</author>
diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index 6857580ee2e5..b4e26f0fd7e4 100644
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.afform-html" type="module">
   <file>afform_html</file>
-  <name>FIXME</name>
-  <description>FIXME</description>
+  <name>Afform: HTML</name>
+  <description>Power-tool for editing Afform as HTML</description>
   <license>AGPL-3.0</license>
   <maintainer>
     <author>Tim Otten</author>
diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index c2f0b08e2bc7..db57635a0e66 100644
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.afform-mock" type="module">
   <file>afform_mock</file>
-  <name>Afform Mocks</name>
+  <name>Afform: Mocks</name>
   <description>Mock extension used for testing the framework</description>
   <license>AGPL-3.0</license>
   <maintainer>

From a7635acfab45aa329da08950b785948c8a060b4f Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 29 Aug 2019 09:43:40 +1200
Subject: [PATCH 425/834] Add note as to what this does

Limited but  in the right direction
---
 ext/afform/html/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/html/README.md b/ext/afform/html/README.md
index 33448293c2c1..25d971b7b075 100644
--- a/ext/afform/html/README.md
+++ b/ext/afform/html/README.md
@@ -2,7 +2,7 @@
 
 ![Screenshot](/images/screenshot.png)
 
-(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+This extension provides a UI for overriding the html in a flexible form. The UI  is accessible at the url civicrm/admin/afform-html
 
 The extension is licensed under [AGPL-3.0](LICENSE.txt).
 

From 293fbeadb605b9753435de19fc66de6b239f40e4 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 29 Aug 2019 09:44:53 +1200
Subject: [PATCH 426/834] Let's stop advertising 5.6 since we might break it at
 any moment

---
 ext/afform/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 1731e8e77be1..f1ef35975ede 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -21,7 +21,7 @@ if you already have a basic understanding of CiviCRM API and AngularJS.  It is l
 
 ## Requirements
 
-* PHP v5.6+
+* PHP v7.0+
 * CiviCRM v5.7+
 
 <!--

From 0813676bbada920cfb5b7b8e942ad2d2ee512728 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Sep 2019 16:32:28 -0400
Subject: [PATCH 427/834] WIP deep array format

---
 ext/afform/core/CRM/Afform/ArrayHtml.php      |  6 ++--
 .../Civi/Api4/Utils/AfformFormatTrait.php     | 34 ++++++-------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 3a94dddf4fdf..af5c4a4c410e 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -13,10 +13,11 @@ class CRM_Afform_ArrayHtml {
   /**
    * @param array $array
    *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
+   * @param string $format
    * @return string
    *   Ex: '<div class="greeting">Hello world</div>'
    */
-  public function convertArrayToHtml($array) {
+  public function convertArrayToHtml(array $array, $format = 'shallow') {
     if ($array === []) {
       return '';
     }
@@ -66,10 +67,11 @@ public function convertArrayToHtml($array) {
   /**
    * @param string $html
    *   Ex: '<div class="greeting">Hello world</div>'
+   * @param string $format
    * @return array
    *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
    */
-  public function convertHtmlToArray($html) {
+  public function convertHtmlToArray($html, $format = 'shallow') {
     if ($html === '') {
       return [];
     }
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index 58110d74f04c..4f3af7428127 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -12,9 +12,9 @@ trait AfformFormatTrait {
 
   /**
    * @var string
-   *   Either 'array' or 'html'.
+   * @options html,shallow,deep
    */
-  protected $layoutFormat = 'array';
+  protected $layoutFormat = 'shallow';
 
   /**
    * @param string $html
@@ -22,18 +22,11 @@ trait AfformFormatTrait {
    * @throws \API_Exception
    */
   protected function convertHtmlToOutput($html) {
-    switch ($this->layoutFormat) {
-      case 'html':
-        return $html;
-
-      case 'array':
-      case NULL:
-        $converter = new \CRM_Afform_ArrayHtml();
-        return $converter->convertHtmlToArray($html);
-
-      default:
-        throw new \API_Exception("Requested format is unrecognized");
+    if ($this->layoutFormat === 'html') {
+      return $html;
     }
+    $converter = new \CRM_Afform_ArrayHtml();
+    return $converter->convertHtmlToArray($html, $this->layoutFormat);
   }
 
   /**
@@ -42,18 +35,11 @@ protected function convertHtmlToOutput($html) {
    * @throws \API_Exception
    */
   protected function convertInputToHtml($mixed) {
-    switch ($this->layoutFormat) {
-      case 'html':
-        return $mixed;
-
-      case 'array':
-      case NULL:
-        $converter = new \CRM_Afform_ArrayHtml();
-        return $converter->convertArrayToHtml($mixed);
-
-      default:
-        throw new \API_Exception("Requested format is unrecognized");
+    if ($this->layoutFormat === 'html') {
+      return $mixed;
     }
+    $converter = new \CRM_Afform_ArrayHtml();
+    return $converter->convertArrayToHtml($mixed, $this->layoutFormat);
   }
 
 }

From 69a32a3f0e6ac0e6a3cd0cd21a985bb148f5c404 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 11 Sep 2019 17:16:24 -0400
Subject: [PATCH 428/834] WIP ArrayHtml

---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 152 +++++++++++++++---
 .../Civi/Api4/Utils/AfformFormatTrait.php     |   8 +-
 .../mock/tests/phpunit/api/v4/AfformTest.php  |  34 +++-
 3 files changed, 161 insertions(+), 33 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index af5c4a4c410e..66757c3ba9a0 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -10,21 +10,58 @@ class CRM_Afform_ArrayHtml {
 
   const DEFAULT_TAG = 'div';
 
+  /**
+   * This is a minimalist/temporary placeholder for a schema definition.
+   * FIXME: It shouldn't be here or look like this.
+   *
+   * @var array
+   *   Ex: $protoSchema['my-tag']['my-attr'] = 'text';
+   */
+  private $protoSchema = [
+    '*' => [
+      '*' => 'text',
+    ],
+    'af-model-prop' => [
+      'af-name' => 'text',
+      'af-entity' => 'text',
+      'af-data' => 'js',
+    ],
+    'af-field' => [
+      'field-name' => 'text',
+      'field-defn' => 'js',
+    ],
+    'af-model' => [
+      'af-name' => 'text',
+    ],
+  ];
+
+  /**
+   * @var bool
+   */
+  protected $deepCoding;
+
+  /**
+   * CRM_Afform_ArrayHtml constructor.
+   * @param bool $deepCoding
+   */
+  public function __construct($deepCoding = TRUE) {
+    $this->deepCoding = $deepCoding;
+  }
+
   /**
    * @param array $array
    *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
-   * @param string $format
    * @return string
    *   Ex: '<div class="greeting">Hello world</div>'
    */
-  public function convertArrayToHtml(array $array, $format = 'shallow') {
+  public function convertArrayToHtml(array $array) {
     if ($array === []) {
       return '';
     }
 
     $tag = empty($array['#tag']) ? self::DEFAULT_TAG : $array['#tag'];
     unset($array['#tag']);
-    $children = empty($array['#children']) ? self::DEFAULT_TAG : $array['#children'];
+    $children = empty($array['#children']) ? [] : $array['#children'];
     unset($array['#children']);
 
     $buf = '<' . $tag;
@@ -35,13 +72,12 @@ public function convertArrayToHtml(array $array, $format = 'shallow') {
       if (!preg_match('/^[a-zA-Z0-9\-]+$/', $attrName)) {
         throw new \RuntimeException("Malformed HTML attribute");
       }
-      if (is_string($attrValue)) {
-        // FIXME attribute encoding
-        $buf .= sprintf(' %s="%s"', $attrName, htmlentities($attrValue));
-      }
-      elseif (is_array($attrValue) && $this->allowStructuredAttribute($tag, $attrName)) {
-        // FIXME attribute encoding
-        $buf .= sprintf(' %s="%s"', $attrName, htmlentities(json_encode($attrValue)));
+
+      $type = $this->pickAttrType($tag, $attrName);
+      $encodedValue = $this->encodeAttrValue($type, $attrValue);
+      if ($encodedValue !== NULL) {
+        // ENT_COMPAT: Will convert double-quotes and leave single-quotes alone.
+        $buf .= sprintf(" %s=\"%s\"", $attrName, htmlentities($encodedValue, ENT_COMPAT | ENT_XHTML));
       }
       else {
         Civi::log()->warning('Afform: Cannot serialize attribute {attrName}', [
@@ -67,11 +103,10 @@ public function convertArrayToHtml(array $array, $format = 'shallow') {
   /**
    * @param string $html
    *   Ex: '<div class="greeting">Hello world</div>'
-   * @param string $format
    * @return array
    *   Ex: ['#tag' => 'div', 'class' => 'greeting', '#children' => ['Hello world']]
    */
-  public function convertHtmlToArray($html, $format = 'shallow') {
+  public function convertHtmlToArray($html) {
     if ($html === '') {
       return [];
     }
@@ -99,12 +134,9 @@ public function convertNodeToArray($node) {
       $arr = ['#tag' => $node->tagName];
       foreach ($node->attributes as $attribute) {
         $txt = $attribute->textContent;
-        if ($txt && $txt{0} === '{' && $txt{1} !== '{' && $this->allowStructuredAttribute($node->tagName, $attribute->name)) {
-          $arr[$attribute->name] = sprintf('PARSE-ME(%s)', $txt);
-        }
-        else {
-          $arr[$attribute->name] = $txt;
-        }
+
+        $type = $this->pickAttrType($node->tagName, $attribute->name);
+        $arr[$attribute->name] = $this->decodeAttrValue($type, $txt);
       }
       foreach ($node->childNodes as $childNode) {
         $arr['#children'][] = $this->convertNodeToArray($childNode);
@@ -122,9 +154,87 @@ public function convertNodeToArray($node) {
     }
   }
 
-  public function allowStructuredAttribute($tag, $attr) {
-    // FIXME: use whitelist of allowed angular directives
-    return FALSE;
+  /**
+   * Determine the type of data that is stored in an attribute.
+   *
+   * @param string $tag
+   *   Ex: 'af-model-prop'
+   * @param string $attrName
+   *   Ex: 'af-name'
+   * @return string
+   *   Ex: 'text' or 'js'
+   */
+  protected function pickAttrType($tag, $attrName) {
+    if (!$this->deepCoding) {
+      return 'text';
+    }
+
+    if (isset($this->protoSchema[$tag][$attrName])) {
+      return $this->protoSchema[$tag][$attrName];
+    }
+
+    if (isset($this->protoSchema['*'][$attrName])) {
+      return $this->protoSchema['*'][$attrName];
+    }
+
+    return $this->protoSchema['*']['*'];
+  }
+
+  /**
+   * Given an array (deep) representation of an attribute, determine the
+   * attribute's content.
+   *
+   * @param string $type
+   *   Ex A: 'text'
+   *   Ex B: 'js'
+   * @param mixed $mixedAttrValue
+   *   The mixed (string/array/int) representation of the value in deep format
+   *   Ex A: 'hello'
+   *   Ex B: ['hello' => 123]
+   * @return string
+   *   An equivalent HTML attribute content (text).
+   *   Ex A: 'hello'
+   *   Ex B: '{hello: 123}'
+   */
+  protected function encodeAttrValue($type, $mixedAttrValue) {
+    switch ($type) {
+      case 'text':
+        return $mixedAttrValue;
+
+      case 'js':
+        $v = CRM_Utils_JS::writeObject($mixedAttrValue, TRUE);
+        return $v;
+
+      default:
+        return NULL;
+    }
+  }
+
+  /**
+   * Given a string representation of an attribute value, determine the
+   * equivalent array (deep) representation.
+   *
+   * @param string $type
+   *   Ex A: 'text'
+   *   Ex B: 'js'
+   * @param string $txtAttrValue
+   *   The textual representation of the value from HTML notation.
+   *   Ex A: 'hello'
+   *   Ex B: '{hello: 123}'
+   * @return mixed
+   *   The mixed (string/array/int) rerepresentation of the value in deep format
+   *   Ex A: 'hello'
+   *   Ex B: ['hello' => 123]
+   */
+  protected function decodeAttrValue($type, $txtAttrValue) {
+    if ($type == 'js') {
+      $attrValue = CRM_Utils_JS::decode($txtAttrValue);
+      return $attrValue;
+    }
+    else {
+      $attrValue = $txtAttrValue;
+      return $attrValue;
+    }
   }
 
 }
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index 4f3af7428127..dd3e7cd6e329 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -25,8 +25,8 @@ protected function convertHtmlToOutput($html) {
     if ($this->layoutFormat === 'html') {
       return $html;
     }
-    $converter = new \CRM_Afform_ArrayHtml();
-    return $converter->convertHtmlToArray($html, $this->layoutFormat);
+    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat === 'deep');
+    return $converter->convertHtmlToArray($html);
   }
 
   /**
@@ -38,8 +38,8 @@ protected function convertInputToHtml($mixed) {
     if ($this->layoutFormat === 'html') {
       return $mixed;
     }
-    $converter = new \CRM_Afform_ArrayHtml();
-    return $converter->convertArrayToHtml($mixed, $this->layoutFormat);
+    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat === 'deep');
+    return $converter->convertArrayToHtml($mixed);
   }
 
 }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index ad00a70e1584..05cf0a3b73a0 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -1,8 +1,5 @@
 <?php
 
-use Civi\Test\HeadlessInterface;
-use Civi\Test\TransactionalInterface;
-
 /**
  * Afform.Get API Test Case
  * This is a generic test class implemented with PHPUnit.
@@ -66,13 +63,34 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
   public function getFormatExamples() {
     $es = [];
 
-    $asHtml = '<strong>New text!</strong>';
-    $asArray = ['#tag' => 'strong', '#children' => ['New text!']];
+    $asHtml = '<div><strong>New text!</strong><af-field field-name="do_not_sms" field-defn="{label: \'Do not do any of the emailing\'}"></af-field></div>';
+    $asShallow = [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => "{label: 'Do not do any of the emailing'}"],
+      ],
+    ];
+    $asDeep = [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => ['label' => 'Do not do any of the emailing']],
+      ],
+    ];
 
-    $es[] = ['fakelibBareFile', 'html', $asHtml, 'array', $asArray];
-    $es[] = ['fakelibBareFile', 'array', $asArray, 'html', $asHtml];
     $es[] = ['fakelibBareFile', 'html', $asHtml, 'html', $asHtml];
-    $es[] = ['fakelibBareFile', 'array', $asArray, 'array', $asArray];
+
+    $es[] = ['fakelibBareFile', 'html', $asHtml, 'shallow', $asShallow];
+    $es[] = ['fakelibBareFile', 'shallow', $asShallow, 'html', $asHtml];
+    $es[] = ['fakelibBareFile', 'shallow', $asShallow, 'shallow', $asShallow];
+
+    $es[] = ['fakelibBareFile', 'html', $asHtml, 'deep', $asDeep];
+    $es[] = ['fakelibBareFile', 'deep', $asDeep, 'html', $asHtml];
+    $es[] = ['fakelibBareFile', 'deep', $asDeep, 'deep', $asDeep];
+
+    $es[] = ['fakelibBareFile', 'shallow', $asShallow, 'deep', $asDeep];
+    $es[] = ['fakelibBareFile', 'deep', $asDeep, 'shallow', $asShallow];
 
     return $es;
   }

From f5ec72d3245836edf4c3873eea8131ff2a7e68bf Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 11 Sep 2019 18:27:38 -0400
Subject: [PATCH 429/834] AfformTest - Test two example documents thoroughly
 for consistent conversions

---
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 44 ++++++-------------
 .../phpunit/api/v4/formatExamples/apple.php   |  7 +++
 .../phpunit/api/v4/formatExamples/banana.php  | 19 ++++++++
 3 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php

diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 05cf0a3b73a0..7869a44818f7 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -63,34 +63,16 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
   public function getFormatExamples() {
     $es = [];
 
-    $asHtml = '<div><strong>New text!</strong><af-field field-name="do_not_sms" field-defn="{label: \'Do not do any of the emailing\'}"></af-field></div>';
-    $asShallow = [
-      '#tag' => 'div',
-      '#children' => [
-        ['#tag' => 'strong', '#children' => ['New text!']],
-        ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => "{label: 'Do not do any of the emailing'}"],
-      ],
-    ];
-    $asDeep = [
-      '#tag' => 'div',
-      '#children' => [
-        ['#tag' => 'strong', '#children' => ['New text!']],
-        ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => ['label' => 'Do not do any of the emailing']],
-      ],
-    ];
-
-    $es[] = ['fakelibBareFile', 'html', $asHtml, 'html', $asHtml];
-
-    $es[] = ['fakelibBareFile', 'html', $asHtml, 'shallow', $asShallow];
-    $es[] = ['fakelibBareFile', 'shallow', $asShallow, 'html', $asHtml];
-    $es[] = ['fakelibBareFile', 'shallow', $asShallow, 'shallow', $asShallow];
-
-    $es[] = ['fakelibBareFile', 'html', $asHtml, 'deep', $asDeep];
-    $es[] = ['fakelibBareFile', 'deep', $asDeep, 'html', $asHtml];
-    $es[] = ['fakelibBareFile', 'deep', $asDeep, 'deep', $asDeep];
-
-    $es[] = ['fakelibBareFile', 'shallow', $asShallow, 'deep', $asDeep];
-    $es[] = ['fakelibBareFile', 'deep', $asDeep, 'shallow', $asShallow];
+    foreach (['apple', 'banana'] as $exampleName) {
+      $exampleFile = '/formatExamples/' . $exampleName . '.php';
+      $example = require __DIR__ . $exampleFile;
+      $formats = ['html', 'shallow', 'deep'];
+      foreach ($formats as $updateFormat) {
+        foreach ($formats as $readFormat) {
+          $es[] = ['fakelibBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
+        }
+      }
+    }
 
     return $es;
   }
@@ -110,9 +92,11 @@ public function getFormatExamples() {
    *   'html' or 'array'
    * @param mixed $readLayout
    *   The value that we expect to read.
+   * @param string $exampleName
+   *   (For debug messages) A symbolic name of the example data-set being tested.
    * @dataProvider getFormatExamples
    */
-  public function testUpdateAndGetFormat($directiveName, $updateFormat, $updateLayout, $readFormat, $readLayout) {
+  public function testUpdateAndGetFormat($directiveName, $updateFormat, $updateLayout, $readFormat, $readLayout, $exampleName) {
     Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
 
     Civi\Api4\Afform::update()
@@ -126,7 +110,7 @@ public function testUpdateAndGetFormat($directiveName, $updateFormat, $updateLay
       ->setLayoutFormat($readFormat)
       ->execute();
 
-    $this->assertEquals($readLayout, $result[0]['layout']);
+    $this->assertEquals($readLayout, $result[0]['layout'], "Based on \"$exampleName\", writing content as \"$updateFormat\" and reading back as \"$readFormat\".");
 
     Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
   }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
new file mode 100644
index 000000000000..e5e41acd24c9
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+  'html' => '<strong>New text!</strong>',
+  'shallow' => ['#tag' => 'strong', '#children' => ['New text!']],
+  'deep' => ['#tag' => 'strong', '#children' => ['New text!']],
+];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
new file mode 100644
index 000000000000..7b75b8b9afe2
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+  'html' => '<div><strong>New text!</strong><af-field field-name="do_not_sms" field-defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
+  'shallow' => [
+    '#tag' => 'div',
+    '#children' => [
+      ['#tag' => 'strong', '#children' => ['New text!']],
+      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => "{label: 'Do not do any of the emailing'}"],
+    ],
+  ],
+  'deep' => [
+    '#tag' => 'div',
+    '#children' => [
+      ['#tag' => 'strong', '#children' => ['New text!']],
+      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => ['label' => 'Do not do any of the emailing']],
+    ],
+  ],
+];

From f901535f12154d1781548424a86209fbe913cc5c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 11 Sep 2019 18:39:09 -0400
Subject: [PATCH 430/834] layoutFormat - Flip default from shallow to deep

---
 ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index dd3e7cd6e329..072528608bd7 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -14,7 +14,7 @@ trait AfformFormatTrait {
    * @var string
    * @options html,shallow,deep
    */
-  protected $layoutFormat = 'shallow';
+  protected $layoutFormat = 'deep';
 
   /**
    * @param string $html
@@ -25,7 +25,7 @@ protected function convertHtmlToOutput($html) {
     if ($this->layoutFormat === 'html') {
       return $html;
     }
-    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat === 'deep');
+    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow');
     return $converter->convertHtmlToArray($html);
   }
 
@@ -38,7 +38,7 @@ protected function convertInputToHtml($mixed) {
     if ($this->layoutFormat === 'html') {
       return $mixed;
     }
-    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat === 'deep');
+    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow');
     return $converter->convertArrayToHtml($mixed);
   }
 

From 797aca9341a4e8a34ea67308e0f02190f6fdf04c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 17:57:16 -0400
Subject: [PATCH 431/834] Add docs/style.md

---
 ext/afform/docs/style.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 ext/afform/docs/style.md

diff --git a/ext/afform/docs/style.md b/ext/afform/docs/style.md
new file mode 100644
index 000000000000..30063d2f6740
--- /dev/null
+++ b/ext/afform/docs/style.md
@@ -0,0 +1,26 @@
+# Code Style
+
+## Naming
+
+The following naming conventions apply to directives defined within `afform.git`:
+
+* Standalone directives (e.g. `afModelProp` or `afField`), including forms (e.g. `afHtmlEditor`)
+    * The directive name must begin with the `af` prefix.
+    * Supplemental attributes SHOULD NOT begin with the `af` prefix.
+    * Example: `<af-model-prop type="Activity" name="myPhoneCall">`
+
+* Mix-in directives (e.g. `afMonaco` or `afApi4Action`)
+    * The directive name must begin with the `af` prefix.
+    * Supplemental attributes SHOULD begin with a prefix that matches the directive.
+    * Example: `<button af-api4-action="['Job', 'process_mailings', {}]` af-api4-success-msg="ts('Processed pending mailings')">
+
+__Discussion__: These differ in two ways:
+
+* Namespacing
+    * Standalone directives form an implicit namespace.
+      (*Anything passed to `<af-model-prop>` is implicitly about `af-model-prop`.)
+    * Mix-in directives must share a namespace with other potential mix-ins.
+      (*The *)
+* Directive arguments
+    * Standalone directives only take input on the supplemental attributes (`type="..."`).
+    * Mix-ins take inputs via the directive's attribute (`af-api4-action="..."`) and the supplemental attributes (`af-api4-success-msg="..."`).

From 028a1411d5fd1d53e28fefba8f8f027846932664 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:07:02 -0400
Subject: [PATCH 432/834] Rename `afformHtml*` to `afHtml*`

---
 ext/afform/html/ang/afHtmlAdmin.aff.html                   | 7 +++++++
 .../ang/{afformHtmlAdmin.aff.json => afHtmlAdmin.aff.json} | 2 +-
 .../{afformHtmlEditor.aff.html => afHtmlEditor.aff.html}   | 0
 .../{afformHtmlEditor.aff.json => afHtmlEditor.aff.json}   | 0
 .../ang/{afformHtmlList.aff.html => afHtmlList.aff.html}   | 0
 .../ang/{afformHtmlList.aff.json => afHtmlList.aff.json}   | 0
 ext/afform/html/ang/afformHtmlAdmin.aff.html               | 7 -------
 7 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 ext/afform/html/ang/afHtmlAdmin.aff.html
 rename ext/afform/html/ang/{afformHtmlAdmin.aff.json => afHtmlAdmin.aff.json} (54%)
 rename ext/afform/html/ang/{afformHtmlEditor.aff.html => afHtmlEditor.aff.html} (100%)
 rename ext/afform/html/ang/{afformHtmlEditor.aff.json => afHtmlEditor.aff.json} (100%)
 rename ext/afform/html/ang/{afformHtmlList.aff.html => afHtmlList.aff.html} (100%)
 rename ext/afform/html/ang/{afformHtmlList.aff.json => afHtmlList.aff.json} (100%)
 delete mode 100644 ext/afform/html/ang/afformHtmlAdmin.aff.html

diff --git a/ext/afform/html/ang/afHtmlAdmin.aff.html b/ext/afform/html/ang/afHtmlAdmin.aff.html
new file mode 100644
index 000000000000..2f463b86a771
--- /dev/null
+++ b/ext/afform/html/ang/afHtmlAdmin.aff.html
@@ -0,0 +1,7 @@
+<div ng-if="!routeParams.name">
+  <div af-html-list=""></div>
+</div>
+
+<div ng-if="routeParams.name">
+  <div af-html-editor="{name: routeParams.name}"></div>
+</div>
diff --git a/ext/afform/html/ang/afformHtmlAdmin.aff.json b/ext/afform/html/ang/afHtmlAdmin.aff.json
similarity index 54%
rename from ext/afform/html/ang/afformHtmlAdmin.aff.json
rename to ext/afform/html/ang/afHtmlAdmin.aff.json
index ff99ac064302..cddb2b63684d 100644
--- a/ext/afform/html/ang/afformHtmlAdmin.aff.json
+++ b/ext/afform/html/ang/afHtmlAdmin.aff.json
@@ -1,5 +1,5 @@
 {
   "title": "Afform HTML Administration",
   "server_route": "civicrm/admin/afform-html",
-  "requires":["afformCore", "afMoncao", "afformHtmlEditor", "afformHtmlList"]
+  "requires":["afformCore", "afMoncao", "afHtmlEditor", "afHtmlList"]
 }
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afHtmlEditor.aff.html
similarity index 100%
rename from ext/afform/html/ang/afformHtmlEditor.aff.html
rename to ext/afform/html/ang/afHtmlEditor.aff.html
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.json b/ext/afform/html/ang/afHtmlEditor.aff.json
similarity index 100%
rename from ext/afform/html/ang/afformHtmlEditor.aff.json
rename to ext/afform/html/ang/afHtmlEditor.aff.json
diff --git a/ext/afform/html/ang/afformHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
similarity index 100%
rename from ext/afform/html/ang/afformHtmlList.aff.html
rename to ext/afform/html/ang/afHtmlList.aff.html
diff --git a/ext/afform/html/ang/afformHtmlList.aff.json b/ext/afform/html/ang/afHtmlList.aff.json
similarity index 100%
rename from ext/afform/html/ang/afformHtmlList.aff.json
rename to ext/afform/html/ang/afHtmlList.aff.json
diff --git a/ext/afform/html/ang/afformHtmlAdmin.aff.html b/ext/afform/html/ang/afformHtmlAdmin.aff.html
deleted file mode 100644
index c8f3a7e7407f..000000000000
--- a/ext/afform/html/ang/afformHtmlAdmin.aff.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div ng-if="!routeParams.name">
-  <div afform-html-list=""></div>
-</div>
-
-<div ng-if="routeParams.name">
-  <div afform-html-editor="{name: routeParams.name}"></div>
-</div>

From 894cb44dcb84d23b2863e334e58a5f3715b88fc7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:10:36 -0400
Subject: [PATCH 433/834] Rename affApi4* to afApi4*

---
 ext/afform/auditor/backlog.md                |  2 +-
 ext/afform/core/ang/afformCore.css           |  4 ++--
 ext/afform/core/ang/afformCore/Api4Action.js |  8 +++----
 ext/afform/core/ang/afformCore/Api4Action.md | 14 ++++++------
 ext/afform/core/ang/afformCore/Api4Ctrl.js   | 24 ++++++++++----------
 ext/afform/docs/roadmap.md                   |  2 +-
 ext/afform/html/ang/afHtmlEditor.aff.html    |  4 ++--
 ext/afform/html/ang/afHtmlList.aff.html      |  6 ++---
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index 27d01df1e23e..3e9a620ca08b 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -13,7 +13,7 @@ validator to catch. Loosely/informally:
     * Future consideration: how to validate when it's part of a subform?
 * `<af-model>` should reference a declared model.
 * `<af-field field-defn="...">` should contain an object.
-* `<a>` should have `href` or `ng-click` or `aff-api4-action`
+* `<a>` should have `href` or `ng-click` or `af-api4-action`
 * Accept a restricted subset of HTML (e.g. `p h1 h2 h3` but not `script` or `[onclick]`)
 * Accept a restricted subset of BootstrapCSS
 * Accept a restricted subset of Angular HTML
diff --git a/ext/afform/core/ang/afformCore.css b/ext/afform/core/ang/afformCore.css
index d5a9b31fcb44..83b008df299e 100644
--- a/ext/afform/core/ang/afformCore.css
+++ b/ext/afform/core/ang/afformCore.css
@@ -1,7 +1,7 @@
-.aff-api4-action-running {
+.af-api4-action-running {
     cursor: not-allowed;
     color: black;
 }
-a.aff-api4-action-idle {
+a.af-api4-action-idle {
     cursor: pointer;
 }
diff --git a/ext/afform/core/ang/afformCore/Api4Action.js b/ext/afform/core/ang/afformCore/Api4Action.js
index b68b729ce31b..01b335c6101b 100644
--- a/ext/afform/core/ang/afformCore/Api4Action.js
+++ b/ext/afform/core/ang/afformCore/Api4Action.js
@@ -1,10 +1,10 @@
 (function(angular, $, _) {
 
-  angular.module('afformCore').directive('affApi4Action', function($parse, crmStatus, crmApi4) {
+  angular.module('afformCore').directive('afApi4Action', function($parse, crmStatus, crmApi4) {
     return {
       restrict: 'A',
       scope: {
-        affApi4Action: '@',
+        afApi4Action: '@',
         msgStart: '=',
         msgError: '=',
         msgSuccess: '=',
@@ -13,10 +13,10 @@
       },
       link: function($scope, $el, $attr) {
         var ts = CRM.ts(null);
-        function running(x) {$el.toggleClass('aff-api4-action-running', x).toggleClass('aff-api4-action-idle', !x);}
+        function running(x) {$el.toggleClass('af-api4-action-running', x).toggleClass('af-api4-action-idle', !x);}
         running(false);
         $el.click(function(){
-          var parts = $parse($scope.affApi4Action)($scope.$parent);
+          var parts = $parse($scope.afApi4Action)($scope.$parent);
           var msgs = {start: $scope.msgStart || ts('Submitting...'), success: $scope.msgSuccess, error: $scope.msgError};
           running(true);
           crmStatus(msgs, crmApi4(parts[0], parts[1], parts[2]))
diff --git a/ext/afform/core/ang/afformCore/Api4Action.md b/ext/afform/core/ang/afformCore/Api4Action.md
index d1f4f810e29b..7e43867850be 100644
--- a/ext/afform/core/ang/afformCore/Api4Action.md
+++ b/ext/afform/core/ang/afformCore/Api4Action.md
@@ -1,11 +1,11 @@
-# aff-api4-action
+# af-api4-action
 
 This directive is designed for invoking an action via APIv4. Much like
 `ng-click`, one would use `api4-action` to add behavior to a button or link.
 
 ```html
 <button
-  aff-api4-action="['Contact','delete',{where:['id','=','100]}}]"
+  af-api4-action="['Contact','delete',{where:['id','=','100]}}]"
   >Delete</button>
 ```
 
@@ -16,19 +16,19 @@ trigger further actions on failure or success.
 
 ```html
 <button
-  aff-api4-action="['Contact','delete',{where:['id','=','100]}}]"
+  af-api4-action="['Contact','delete',{where:['id','=','100]}}]"
   msg-start="ts('Deleting...')"
   msg-success="ts('Deleted')"
   on-success="crmUiAlert({text:'Received ' + response.length + ' items'})"
   on-error="crmUiAlert({text:'Failure: ' + error})"
 >Delete</button>
-<!-- Automated flag with aff-api4-action-{running -->
+<!-- Automated flag with af-api4-action-{running -->
 ```
 
 ### Styling
 
-The `aff-api4-action` element will have the follow classes
+The `af-api4-action` element will have the follow classes
 toggled automatically:
 
-* `aff-api4-action-running`: User has clicked to fire the action, and action is still running.
-* `aff-api4-action-idle`: The action is not running.
+* `af-api4-action-running`: User has clicked to fire the action, and action is still running.
+* `af-api4-action-idle`: The action is not running.
diff --git a/ext/afform/core/ang/afformCore/Api4Ctrl.js b/ext/afform/core/ang/afformCore/Api4Ctrl.js
index 41648cfc1d3b..7bc7abdf4d59 100644
--- a/ext/afform/core/ang/afformCore/Api4Ctrl.js
+++ b/ext/afform/core/ang/afformCore/Api4Ctrl.js
@@ -1,20 +1,20 @@
 (function(angular, $, _) {
 
-  angular.module('afformCore').directive('affApi4Ctrl', function() {
+  angular.module('afformCore').directive('afApi4Ctrl', function() {
     return {
       restrict: 'EA',
       scope: {
-        affApi4Ctrl: '=',
-        affApi4: '@',
-        affApi4Refresh: '@',
+        afApi4Ctrl: '=',
+        afApi4: '@',
+        afApi4Refresh: '@',
         onRefresh: '@'
       },
-      controllerAs: 'affApi4Ctrl',
+      controllerAs: 'afApi4Ctrl',
       controller: function($scope, $parse, crmThrottle, crmApi4) {
         var ctrl = this;
 
         // CONSIDER: Trade-offs of upfront vs ongoing evaluation.
-        var parts = $parse($scope.affApi4)($scope.$parent);
+        var parts = $parse($scope.afApi4)($scope.$parent);
         ctrl.entity = parts[0];
         ctrl.action = parts[1];
         ctrl.params = parts[2];
@@ -36,16 +36,16 @@
           });
         };
 
-        $scope.affApi4Ctrl = this;
+        $scope.afApi4Ctrl = this;
 
-        var mode = $scope.affApi4Refresh ? $scope.affApi4Refresh : 'auto';
+        var mode = $scope.afApi4Refresh ? $scope.afApi4Refresh : 'auto';
         switch (mode) {
           case 'auto':
             // Note: Do NOT watch '.result' or '.loading' - causes infinite reloads.
-            $scope.$watchCollection('affApi4Ctrl.params', ctrl.refresh, true);
-            $scope.$watch('affApi4Ctrl.index', ctrl.refresh, true);
-            $scope.$watch('affApi4Ctrl.entity', ctrl.refresh, true);
-            $scope.$watch('affApi4Ctrl.action', ctrl.refresh, true);
+            $scope.$watchCollection('afApi4Ctrl.params', ctrl.refresh, true);
+            $scope.$watch('afApi4Ctrl.index', ctrl.refresh, true);
+            $scope.$watch('afApi4Ctrl.entity', ctrl.refresh, true);
+            $scope.$watch('afApi4Ctrl.action', ctrl.refresh, true);
             break;
           case 'init': ctrl.refresh(); break;
           case 'manual': break;
diff --git a/ext/afform/docs/roadmap.md b/ext/afform/docs/roadmap.md
index eb55f35545a1..3b0b0c6b1fc0 100644
--- a/ext/afform/docs/roadmap.md
+++ b/ext/afform/docs/roadmap.md
@@ -29,7 +29,7 @@ This extension is expected to be the base for a suite of related extensions:
 
 Within this extension, there are things which need updating/addressing:
 
-* Test coverage for key Angular directives (e.g. `aff-api4-ctrl`, `aff-api4-action`)
+* Test coverage for key Angular directives (e.g. `af-api4-ctrl`, `af-api4-action`)
 * There are several `FIXME`/`TODO` declarations in the code for checking pre-conditions, reporting errors, handling edge-cases, etc.
 * Although afforms can be used in AngularJS, they don't fully support tooling like `cv ang:html:list`
   and `hook_civicrm_alterAngular` changesets. We'll need a core patch to allow that. (Ex: Define partials via callback.)
diff --git a/ext/afform/html/ang/afHtmlEditor.aff.html b/ext/afform/html/ang/afHtmlEditor.aff.html
index d97af4c0d1a3..a17b66d6baa1 100644
--- a/ext/afform/html/ang/afHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afHtmlEditor.aff.html
@@ -1,4 +1,4 @@
-<div aff-api4-ctrl="apiData" aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]">
+<div af-api4-ctrl="apiData" af-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]">
 
   <div ng-if="apiData.result.length == 0">
     {{ts('Failed to find requested form.')}}
@@ -10,7 +10,7 @@
     <div>
       <a ng-href="#/">{{ts('Back')}}</a>
       |
-      <a aff-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:resultForm}]">{{ts('Save')}}</a>
+      <a af-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:resultForm}]">{{ts('Save')}}</a>
       <span ng-if="resultForm.server_route">
         | <a target="_blank" ng-href="{{crmUrl(resultForm.server_route)}}">Open</a>
       </span>
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index b6ccc76c18ff..f78ca5362ced 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -1,6 +1,6 @@
 <div
-  aff-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
-  aff-api4-ctrl="listCtrl">
+  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+  af-api4-ctrl="listCtrl">
 
   <div ng-if="apiData.result.length == 0">
     {{ts('There are no forms! Tell Aristotle!')}}
@@ -26,7 +26,7 @@
       <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
       <td>
         <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
-        <a aff-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+        <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            msg-start="ts('Reverting...')"
            msg-success="ts('Reverted')"
           >{{ts('Revert')}}</a>

From d2b0e14873d421f9958c24309994c58793d5a259 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:19:16 -0400
Subject: [PATCH 434/834] info.xml - Align version numbers

---
 ext/afform/core/info.xml | 4 ++--
 ext/afform/gui/info.xml  | 4 ++--
 ext/afform/html/info.xml | 4 ++--
 ext/afform/mock/info.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 637108d9cc45..b61ebf9332d0 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2018-06-12</releaseDate>
-  <version>0.2</version>
+  <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.17</ver>
+    <ver>5.18</ver>
   </compatibility>
   <requires>
     <ext version="~4.5">org.civicrm.api4</ext>
diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
index f722afb4b741..25397be3c260 100644
--- a/ext/afform/gui/info.xml
+++ b/ext/afform/gui/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2019-02-08</releaseDate>
-  <version>1.0</version>
+  <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.0</ver>
+    <ver>5.18</ver>
   </compatibility>
   <comments>This is a new, undeveloped module</comments>
   <requires>
diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index b4e26f0fd7e4..2ff167ea8a80 100644
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2019-05-03</releaseDate>
-  <version>1.0</version>
+  <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.0</ver>
+    <ver>5.18</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>
diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index db57635a0e66..489ffc30f82d 100644
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2019-02-08</releaseDate>
-  <version>1.0</version>
+  <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.3</ver>
+    <ver>5.18</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>

From 500247a7459394cc64debc24aa68779653ae8577 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:13:07 -0400
Subject: [PATCH 435/834] Rename afformApi3* to afApi3*

---
 ext/afform/core/ang/afformCore/Api3Ctrl.js | 18 +++++++++---------
 ext/afform/core/ang/afformCore/Api3Ctrl.md | 20 ++++++++++----------
 ext/afform/docs/writing.md                 |  6 +++---
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ext/afform/core/ang/afformCore/Api3Ctrl.js b/ext/afform/core/ang/afformCore/Api3Ctrl.js
index e1f7506f3356..a7a7f642155c 100644
--- a/ext/afform/core/ang/afformCore/Api3Ctrl.js
+++ b/ext/afform/core/ang/afformCore/Api3Ctrl.js
@@ -1,20 +1,20 @@
 (function(angular, $, _) {
 
-  angular.module('afformCore').directive('afformApi3Ctrl', function() {
+  angular.module('afformCore').directive('afApi3Ctrl', function() {
     return {
       restrict: 'EA',
       scope: {
-        afformApi3Ctrl: '=',
-        afformApi3: '@',
-        afformApi3Refresh: '@',
+        afApi3Ctrl: '=',
+        afApi3: '@',
+        afApi3Refresh: '@',
         onRefresh: '@'
       },
-      controllerAs: 'afformApi3Ctrl',
+      controllerAs: 'afApi3Ctrl',
       controller: function($scope, $parse, crmThrottle, crmApi) {
         var ctrl = this;
 
         // CONSIDER: Trade-offs of upfront vs ongoing evaluation.
-        var parts = $parse($scope.afformApi3)($scope.$parent);
+        var parts = $parse($scope.afApi3)($scope.$parent);
         ctrl.entity = parts[0];
         ctrl.action = parts[1];
         ctrl.params = parts[2];
@@ -35,11 +35,11 @@
           });
         };
 
-        $scope.afformApi3Ctrl = this;
+        $scope.afApi3Ctrl = this;
 
-        var mode = $scope.afformApi3Refresh ? $scope.afformApi3Refresh : 'auto';
+        var mode = $scope.afApi3Refresh ? $scope.afApi3Refresh : 'auto';
         switch (mode) {
-          case 'auto': $scope.$watchCollection('afformApi3Ctrl.params', ctrl.refresh); break;
+          case 'auto': $scope.$watchCollection('afApi3Ctrl.params', ctrl.refresh); break;
           case 'init': ctrl.refresh(); break;
           case 'manual': break;
           default: throw 'Unrecognized refresh mode: '+ mode;
diff --git a/ext/afform/core/ang/afformCore/Api3Ctrl.md b/ext/afform/core/ang/afformCore/Api3Ctrl.md
index 0b328eca5b96..cfb040d6a17e 100644
--- a/ext/afform/core/ang/afformCore/Api3Ctrl.md
+++ b/ext/afform/core/ang/afformCore/Api3Ctrl.md
@@ -1,4 +1,4 @@
-# afform-api3-ctrl
+# af-api3-ctrl
 
 This directive is designed for querying and displaying data from APIv3. Each API call is represented with an object like this:
 
@@ -16,12 +16,12 @@ This directive is designed for querying and displaying data from APIv3. Each API
 }
 ```
 
-You can initialize this object using `<afform-api3-ctrl>` and `<afform-api3>`, as in:
+You can initialize this object using `<af-api3-ctrl>` and `<af-api3>`, as in:
 
 ```html
 <div
-  afform-api3-ctrl="apiData"
-  afform-api3="['Contact','get', {display_name: ''}]">
+  af-api3-ctrl="apiData"
+  af-api3="['Contact','get', {display_name: ''}]">
 
     <div crm-ui-debug="apiData"></div>
 
@@ -37,13 +37,13 @@ You can initialize this object using `<afform-api3-ctrl>` and `<afform-api3>`, a
 
 By default, the API call will refresh its results automatically - as soon as the filter parameters change.
 
-If you'd rather wait and trigger the refresh another way, then set the `afform-api3-refresh` policy to `init` or `manual`. Don't forget to fire the refresh some other way, such as `ng-click`:
+If you'd rather wait and trigger the refresh another way, then set the `af-api3-refresh` policy to `init` or `manual`. Don't forget to fire the refresh some other way, such as `ng-click`:
 
 ```html
 <div
-  afform-api3-ctrl="apiData"
-  afform-api3="['Contact','get', {display_name: ''}]"
-  afform-api3-refresh="init">
+  af-api3-ctrl="apiData"
+  af-api3="['Contact','get', {display_name: ''}]"
+  af-api3-refresh="init">
 
     <div crm-ui-debug="apiData"></div>
 
@@ -65,8 +65,8 @@ properties of the API object (`entity`, `action`, `params`, `result`).
 
 ```html
 <div
-  afform-api3-ctrl="apiData"
-  afform-api3="['Contact','get', {display_name: ''}]"
+  af-api3-ctrl="apiData"
+  af-api3="['Contact','get', {display_name: ''}]"
   on-refresh="doSomething(result)">
   ...
 </div>
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index 1df877d743e7..fc3ab06ae216 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -30,15 +30,15 @@ http://dmaster.localhost/civicrm/hello-world/#/?cid=123
 ```
 
 How do we use the `cid` to get information about the contact?  Update `helloWorld.aff.html` to fetch data with
-`Contact.get` API and call the [afform-api3](https://github.com/totten/afform/blob/master/ang/afformCore/Api3Ctrl.md) utility:
+`Contact.get` API and call the [af-api3](https://github.com/totten/afform/blob/master/ang/afformCore/Api3Ctrl.md) utility:
 
 ```html
 <div ng-if="!routeParams.cid">
   {{ts('Please provide the "cid"')}}
 </div>
 <div ng-if="routeParams.cid"
-  afform-api3="['Contact', 'get', {id: routeParams.cid}]"
-  afform-api3-ctrl="apiData">
+  af-api3="['Contact', 'get', {id: routeParams.cid}]"
+  af-api3-ctrl="apiData">
 
   <div ng-repeat="contact in apiData.result.values">
     <h1 crm-page-title="">{{contact.display_name}}</h1>

From 0ba3ade87fc63f393467fff910671ce8250da059 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:21:03 -0400
Subject: [PATCH 436/834] Rename `afformExamplepage` to `afExamplePage`

---
 .../{afformExamplepage.aff.html => afExamplePage.aff.html}    | 0
 .../{afformExamplepage.aff.json => afExamplePage.aff.json}    | 0
 ext/afform/mock/tests/phpunit/api/v4/AfformTest.php           | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename ext/afform/mock/ang/{afformExamplepage.aff.html => afExamplePage.aff.html} (100%)
 rename ext/afform/mock/ang/{afformExamplepage.aff.json => afExamplePage.aff.json} (100%)

diff --git a/ext/afform/mock/ang/afformExamplepage.aff.html b/ext/afform/mock/ang/afExamplePage.aff.html
similarity index 100%
rename from ext/afform/mock/ang/afformExamplepage.aff.html
rename to ext/afform/mock/ang/afExamplePage.aff.html
diff --git a/ext/afform/mock/ang/afformExamplepage.aff.json b/ext/afform/mock/ang/afExamplePage.aff.json
similarity index 100%
rename from ext/afform/mock/ang/afformExamplepage.aff.json
rename to ext/afform/mock/ang/afExamplePage.aff.json
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 7869a44818f7..097b2a775968 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -9,14 +9,14 @@ class api_v4_AfformTest extends api_v4_AfformTestCase {
 
   public function getBasicDirectives() {
     return [
-      ['afformExamplepage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/example-page']],
+      ['afExamplePage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/example-page']],
       ['fakelibBareFile', ['title' => '', 'description' => '']],
       ['fakelibFoo', ['title' => '', 'description' => '']],
     ];
   }
 
   /**
-   * This takes the bundled `examplepage` and performs some API calls on it.
+   * This takes the bundled `example-page` and performs some API calls on it.
    * @dataProvider getBasicDirectives
    */
   public function testGetUpdateRevert($directiveName, $originalMetadata) {

From 3e29642c6e3a9dee744edaff4d4fcdd8aa0c84e6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:26:19 -0400
Subject: [PATCH 437/834] docs/embed.md - Use example prefix that doesn't
 conflict with built-ins

---
 ext/afform/docs/embed.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index e1ac30d5cae5..58698f75bb35 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -29,35 +29,35 @@ Is this useful? Let's suppose you're building a contact record page.
 
 First, we should make a few building-blocks:
 
-1. `ang/afformContactName.aff.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
-2. `ang/afformContactAddresses.aff.html` displays a sub-form for editing street addresses.
-3. `ang/afformContactEmails.aff.html` displays a sub-form for editing email addresses.
+1. `ang/myContactName.aff.html` displays a sub-form for editing first name, lastname, prefix, suffix, etc.
+2. `ang/myContactAddresses.aff.html` displays a sub-form for editing street addresses.
+3. `ang/myContactEmails.aff.html` displays a sub-form for editing email addresses.
 
-Next, we should create an overall `ang/afformContact.aff.html` which uses these building-blocks:
+Next, we should create an overall `ang/myContact.aff.html` which uses these building-blocks:
 
 ```html
 <div ng-form="contactForm">
   <div crm-ui-accordion="{title: ts('Name')}">
-    <div afform-contact-name="{cid: routeParams.cid}"></div>
+    <div my-contact-name="{cid: routeParams.cid}"></div>
   </div>
   <div crm-ui-accordion="{title: ts('Street Addresses')}">
-    <div afform-contact-addresses="{cid: routeParams.cid}"></div>
+    <div my-contact-addresses="{cid: routeParams.cid}"></div>
   </div>
   <div crm-ui-accordion="{title: ts('Emails')}">
-    <div afform-contact-emails="{cid: routeParams.cid}"></div>
+    <div my-contact-emails="{cid: routeParams.cid}"></div>
   </div>
 </div>
 ```
 
-And we should create a `ang/afformContact.aff.json` looking like
+And we should create a `ang/myContact.aff.json` looking like
 
 ```json
 {
   "server_route": "civicrm/contact", 
-  "requires" : ["afformContactName", "afformContactEmails", "afformContactAddresses"]
+  "requires" : ["myContactName", "myContactEmails", "myContactAddresses"]
 }
 ```
-> *(FIXME: In the parent form's `*.aff.json`, we need to manually add `afformContactName`, `afformContactAddresses`, `afformContactEmails` to the `requires` list. We should autodetect these instead.)*
+> *(FIXME: In the parent form's `*.aff.json`, we need to manually add `myContactName`, `myContactAddresses`, `myContactEmails` to the `requires` list. We should autodetect these instead.)*
 
 We've created new files, so we'll need to flush the file-index
 
@@ -71,6 +71,6 @@ and now we can open the page
 cv open 'civicrm/contact?cid=100'
 ```
 
-What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `ang/afformContactName.aff.html` --
+What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `ang/myContactName.aff.html` --
 but all the other components can cleanly track the canonical release. This significantly reduces the costs and risks
 of manging upgrades and changes.

From c1b9955f72106c5e597bc90a5be3805124877f2a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 18:31:22 -0400
Subject: [PATCH 438/834] Rename afformCore to afCore

---
 ext/afform/core/CRM/Afform/AfformScanner.php           |  2 +-
 .../core/ang/{afformCore.ang.php => afCore.ang.php}    | 10 +++++-----
 ext/afform/core/ang/{afformCore.css => afCore.css}     |  0
 ext/afform/core/ang/{afformCore.js => afCore.js}       |  6 +++---
 ext/afform/core/ang/{afformCore => afCore}/Api3Ctrl.js |  2 +-
 ext/afform/core/ang/{afformCore => afCore}/Api3Ctrl.md |  0
 .../core/ang/{afformCore => afCore}/Api4Action.js      |  2 +-
 .../core/ang/{afformCore => afCore}/Api4Action.md      |  0
 ext/afform/core/ang/{afformCore => afCore}/Api4Ctrl.js |  2 +-
 .../core/templates/afform/AfformAngularModule.tpl      |  4 ++--
 ext/afform/docs/crud.md                                |  2 +-
 ext/afform/docs/writing.md                             |  2 +-
 ext/afform/html/ang/afHtmlAdmin.aff.json               |  2 +-
 ext/afform/html/ang/afHtmlEditor.aff.json              |  2 +-
 ext/afform/html/ang/afHtmlList.aff.json                |  2 +-
 15 files changed, 19 insertions(+), 19 deletions(-)
 rename ext/afform/core/ang/{afformCore.ang.php => afCore.ang.php} (67%)
 rename ext/afform/core/ang/{afformCore.css => afCore.css} (100%)
 rename ext/afform/core/ang/{afformCore.js => afCore.js} (69%)
 rename ext/afform/core/ang/{afformCore => afCore}/Api3Ctrl.js (95%)
 rename ext/afform/core/ang/{afformCore => afCore}/Api3Ctrl.md (100%)
 rename ext/afform/core/ang/{afformCore => afCore}/Api4Action.js (91%)
 rename ext/afform/core/ang/{afformCore => afCore}/Api4Action.md (100%)
 rename ext/afform/core/ang/{afformCore => afCore}/Api4Ctrl.js (96%)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 3611d1b5af44..2c5f86c1f382 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -16,7 +16,7 @@ class CRM_Afform_AfformScanner {
 
   const FILE_REGEXP = '/\.aff\.(json|html)$/';
 
-  const DEFAULT_REQUIRES = 'afformCore';
+  const DEFAULT_REQUIRES = 'afCore';
 
   /**
    * @var CRM_Utils_Cache_Interface
diff --git a/ext/afform/core/ang/afformCore.ang.php b/ext/afform/core/ang/afCore.ang.php
similarity index 67%
rename from ext/afform/core/ang/afformCore.ang.php
rename to ext/afform/core/ang/afCore.ang.php
index ff3e7a48f94e..9e9f4c505ec7 100644
--- a/ext/afform/core/ang/afformCore.ang.php
+++ b/ext/afform/core/ang/afCore.ang.php
@@ -5,13 +5,13 @@
 
 return [
   'js' => [
-    'ang/afformCore.js',
-    'ang/afformCore/*.js',
-    'ang/afformCore/*/*.js',
+    'ang/afCore.js',
+    'ang/afCore/*.js',
+    'ang/afCore/*/*.js',
   ],
-  'css' => ['ang/afformCore.css'],
+  'css' => ['ang/afCore.css'],
   'requires' => ['crmUi', 'crmUtil', 'api4', 'checklist-model'],
-  'partials' => ['ang/afformCore'],
+  'partials' => ['ang/afCore'],
   'settings' => [],
   'basePages' => [],
 ];
diff --git a/ext/afform/core/ang/afformCore.css b/ext/afform/core/ang/afCore.css
similarity index 100%
rename from ext/afform/core/ang/afformCore.css
rename to ext/afform/core/ang/afCore.css
diff --git a/ext/afform/core/ang/afformCore.js b/ext/afform/core/ang/afCore.js
similarity index 69%
rename from ext/afform/core/ang/afformCore.js
rename to ext/afform/core/ang/afCore.js
index bdb6856a1b90..7d43c99dccb6 100644
--- a/ext/afform/core/ang/afformCore.js
+++ b/ext/afform/core/ang/afCore.js
@@ -1,9 +1,9 @@
 (function(angular, $, _) {
   // Declare a list of dependencies.
-  angular.module('afformCore', CRM.angRequires('afformCore'));
+  angular.module('afCore', CRM.angRequires('afCore'));
 
-  // Use `afformCoreDirective(string name)` to generate an AngularJS directive.
-  angular.module('afformCore').service('afformCoreDirective', function($routeParams, crmApi4, crmStatus, crmUiAlert) {
+  // Use `afCoreDirective(string name)` to generate an AngularJS directive.
+  angular.module('afCore').service('afCoreDirective', function($routeParams, crmApi4, crmStatus, crmUiAlert) {
     return function(camelName, meta, d) {
       d.restrict = 'AE';
       d.scope = {};
diff --git a/ext/afform/core/ang/afformCore/Api3Ctrl.js b/ext/afform/core/ang/afCore/Api3Ctrl.js
similarity index 95%
rename from ext/afform/core/ang/afformCore/Api3Ctrl.js
rename to ext/afform/core/ang/afCore/Api3Ctrl.js
index a7a7f642155c..98ce88d25d8c 100644
--- a/ext/afform/core/ang/afformCore/Api3Ctrl.js
+++ b/ext/afform/core/ang/afCore/Api3Ctrl.js
@@ -1,6 +1,6 @@
 (function(angular, $, _) {
 
-  angular.module('afformCore').directive('afApi3Ctrl', function() {
+  angular.module('afCore').directive('afApi3Ctrl', function() {
     return {
       restrict: 'EA',
       scope: {
diff --git a/ext/afform/core/ang/afformCore/Api3Ctrl.md b/ext/afform/core/ang/afCore/Api3Ctrl.md
similarity index 100%
rename from ext/afform/core/ang/afformCore/Api3Ctrl.md
rename to ext/afform/core/ang/afCore/Api3Ctrl.md
diff --git a/ext/afform/core/ang/afformCore/Api4Action.js b/ext/afform/core/ang/afCore/Api4Action.js
similarity index 91%
rename from ext/afform/core/ang/afformCore/Api4Action.js
rename to ext/afform/core/ang/afCore/Api4Action.js
index 01b335c6101b..da8ed8d22b8b 100644
--- a/ext/afform/core/ang/afformCore/Api4Action.js
+++ b/ext/afform/core/ang/afCore/Api4Action.js
@@ -1,6 +1,6 @@
 (function(angular, $, _) {
 
-  angular.module('afformCore').directive('afApi4Action', function($parse, crmStatus, crmApi4) {
+  angular.module('afCore').directive('afApi4Action', function($parse, crmStatus, crmApi4) {
     return {
       restrict: 'A',
       scope: {
diff --git a/ext/afform/core/ang/afformCore/Api4Action.md b/ext/afform/core/ang/afCore/Api4Action.md
similarity index 100%
rename from ext/afform/core/ang/afformCore/Api4Action.md
rename to ext/afform/core/ang/afCore/Api4Action.md
diff --git a/ext/afform/core/ang/afformCore/Api4Ctrl.js b/ext/afform/core/ang/afCore/Api4Ctrl.js
similarity index 96%
rename from ext/afform/core/ang/afformCore/Api4Ctrl.js
rename to ext/afform/core/ang/afCore/Api4Ctrl.js
index 7bc7abdf4d59..48fcbf4fb5f3 100644
--- a/ext/afform/core/ang/afformCore/Api4Ctrl.js
+++ b/ext/afform/core/ang/afCore/Api4Ctrl.js
@@ -1,6 +1,6 @@
 (function(angular, $, _) {
 
-  angular.module('afformCore').directive('afApi4Ctrl', function() {
+  angular.module('afCore').directive('afApi4Ctrl', function() {
     return {
       restrict: 'EA',
       scope: {
diff --git a/ext/afform/core/templates/afform/AfformAngularModule.tpl b/ext/afform/core/templates/afform/AfformAngularModule.tpl
index 2853b8412558..4a04137884e7 100644
--- a/ext/afform/core/templates/afform/AfformAngularModule.tpl
+++ b/ext/afform/core/templates/afform/AfformAngularModule.tpl
@@ -8,8 +8,8 @@
 {literal}
 (function(angular, $, _) {
   angular.module('{/literal}{$afform.camel}{literal}', CRM.angRequires('{/literal}{$afform.camel}{literal}'));
-  angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function(afformCoreDirective) {
-    return afformCoreDirective({/literal}{$afform.camel|json},{$afform.metaJson}{literal}, {
+  angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function(afCoreDirective) {
+    return afCoreDirective({/literal}{$afform.camel|json},{$afform.metaJson}{literal}, {
       template: {/literal}{$afform.layout|json}{literal}
     });
   });
diff --git a/ext/afform/docs/crud.md b/ext/afform/docs/crud.md
index 47e54064e24f..7ba2f3c09dbd 100644
--- a/ext/afform/docs/crud.md
+++ b/ext/afform/docs/crud.md
@@ -9,7 +9,7 @@ $ cv api4 afform.get +w name=helloWorld
     "0": {
         "name": "helloWorld",
         "requires": [
-            "afformCore"
+            "afCore"
         ],
         "title": "",
         "description": "",
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index fc3ab06ae216..7ed5a41c9362 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -30,7 +30,7 @@ http://dmaster.localhost/civicrm/hello-world/#/?cid=123
 ```
 
 How do we use the `cid` to get information about the contact?  Update `helloWorld.aff.html` to fetch data with
-`Contact.get` API and call the [af-api3](https://github.com/totten/afform/blob/master/ang/afformCore/Api3Ctrl.md) utility:
+`Contact.get` API and call the [af-api3](https://github.com/totten/afform/blob/master/ang/afCore/Api3Ctrl.md) utility:
 
 ```html
 <div ng-if="!routeParams.cid">
diff --git a/ext/afform/html/ang/afHtmlAdmin.aff.json b/ext/afform/html/ang/afHtmlAdmin.aff.json
index cddb2b63684d..f058774297ca 100644
--- a/ext/afform/html/ang/afHtmlAdmin.aff.json
+++ b/ext/afform/html/ang/afHtmlAdmin.aff.json
@@ -1,5 +1,5 @@
 {
   "title": "Afform HTML Administration",
   "server_route": "civicrm/admin/afform-html",
-  "requires":["afformCore", "afMoncao", "afHtmlEditor", "afHtmlList"]
+  "requires":["afCore", "afMoncao", "afHtmlEditor", "afHtmlList"]
 }
diff --git a/ext/afform/html/ang/afHtmlEditor.aff.json b/ext/afform/html/ang/afHtmlEditor.aff.json
index 3f7f53f4b207..d55381fed38d 100644
--- a/ext/afform/html/ang/afHtmlEditor.aff.json
+++ b/ext/afform/html/ang/afHtmlEditor.aff.json
@@ -1,4 +1,4 @@
 {
   "title": "Afform HTML Editor",
-  "requires":["afformCore", "afMoncao"]
+  "requires":["afCore", "afMoncao"]
 }
diff --git a/ext/afform/html/ang/afHtmlList.aff.json b/ext/afform/html/ang/afHtmlList.aff.json
index a20755492836..7293f8e83f7e 100644
--- a/ext/afform/html/ang/afHtmlList.aff.json
+++ b/ext/afform/html/ang/afHtmlList.aff.json
@@ -1,4 +1,4 @@
 {
   "title": "Afform HTML List",
-  "requires":["afformCore"]
+  "requires":["afCore"]
 }

From 4381cab0a69e6d94e49aaffc7debc8bd86dc8a19 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 19:07:59 -0400
Subject: [PATCH 439/834] af-api4-action - Rename 'msg-' and 'on-' options

Here's the bash script...

```
for REGEX in \
        s/msg-start/af-api4-start-msg/g \
        s/msgStart/afApi4StartMsg/g \
        s/msg-error/af-api4-error-msg/g \
        s/msgError/afApi4ErrorMsg/g \
        s/msg-success/af-api4-success-msg/g \
        s/msgSuccess/afApi4SuccessMsg/g \
        s/on-success/af-api4-success/g \
        s/onSuccess/afApi4Success/g \
        s/on-error/af-api4-error/g \
        s/on-error/afApi4Error/g
do
  DIRS="core docs gui html mock auditor"
  echo "Processing regex [$REGEX] in [$DIRS]"
  find $DIRS -name '*.js' -o -name '*.html' -o -name '*.json' -o -name '*.md' \
    | grep -v /node_modules/ \
    | xargs -L1 sed -i.bak "$REGEX"
  find $DIRS -name '*.bak' -delete
done
```
---
 ext/afform/core/ang/afCore/Api4Action.js | 12 ++++++------
 ext/afform/core/ang/afCore/Api4Action.md |  8 ++++----
 ext/afform/html/ang/afHtmlList.aff.html  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/afform/core/ang/afCore/Api4Action.js b/ext/afform/core/ang/afCore/Api4Action.js
index da8ed8d22b8b..20c47c824a58 100644
--- a/ext/afform/core/ang/afCore/Api4Action.js
+++ b/ext/afform/core/ang/afCore/Api4Action.js
@@ -5,10 +5,10 @@
       restrict: 'A',
       scope: {
         afApi4Action: '@',
-        msgStart: '=',
-        msgError: '=',
-        msgSuccess: '=',
-        onSuccess: '@',
+        afApi4StartMsg: '=',
+        afApi4ErrorMsg: '=',
+        afApi4SuccessMsg: '=',
+        afApi4Success: '@',
         onError: '@'
       },
       link: function($scope, $el, $attr) {
@@ -17,11 +17,11 @@
         running(false);
         $el.click(function(){
           var parts = $parse($scope.afApi4Action)($scope.$parent);
-          var msgs = {start: $scope.msgStart || ts('Submitting...'), success: $scope.msgSuccess, error: $scope.msgError};
+          var msgs = {start: $scope.afApi4StartMsg || ts('Submitting...'), success: $scope.afApi4SuccessMsg, error: $scope.afApi4ErrorMsg};
           running(true);
           crmStatus(msgs, crmApi4(parts[0], parts[1], parts[2]))
             .finally(function(){running(false);})
-            .then(function(response){$scope.$parent.$eval($scope.onSuccess, {response: response});})
+            .then(function(response){$scope.$parent.$eval($scope.afApi4Success, {response: response});})
             .catch(function(error){$scope.$parent.$eval($scope.onError, {error: error});});
         });
       }
diff --git a/ext/afform/core/ang/afCore/Api4Action.md b/ext/afform/core/ang/afCore/Api4Action.md
index 7e43867850be..7d62d740ff61 100644
--- a/ext/afform/core/ang/afCore/Api4Action.md
+++ b/ext/afform/core/ang/afCore/Api4Action.md
@@ -17,10 +17,10 @@ trigger further actions on failure or success.
 ```html
 <button
   af-api4-action="['Contact','delete',{where:['id','=','100]}}]"
-  msg-start="ts('Deleting...')"
-  msg-success="ts('Deleted')"
-  on-success="crmUiAlert({text:'Received ' + response.length + ' items'})"
-  on-error="crmUiAlert({text:'Failure: ' + error})"
+  af-api4-start-msg="ts('Deleting...')"
+  af-api4-success-msg="ts('Deleted')"
+  af-api4-success="crmUiAlert({text:'Received ' + response.length + ' items'})"
+  af-api4-error="crmUiAlert({text:'Failure: ' + error})"
 >Delete</button>
 <!-- Automated flag with af-api4-action-{running -->
 ```
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index f78ca5362ced..e0e5f950ee20 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -27,8 +27,8 @@
       <td>
         <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
-           msg-start="ts('Reverting...')"
-           msg-success="ts('Reverted')"
+           af-api4-start-msg="ts('Reverting...')"
+           af-api4-success-msg="ts('Reverted')"
           >{{ts('Revert')}}</a>
       </td>
     </tr>

From 93eb21def99ec6316055b8a5bd5b3a323c2393a0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 19:36:40 -0400
Subject: [PATCH 440/834] (NFC) Normalize trailing newlines

---
 ext/afform/mock/ang/afExamplePage.aff.html | 2 +-
 ext/afform/mock/ang/fakelibFoo.aff.html    | 2 +-
 ext/afform/mock/ang/fakelibFoo.aff.json    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/afform/mock/ang/afExamplePage.aff.html b/ext/afform/mock/ang/afExamplePage.aff.html
index 7e18ff54409e..801da898560c 100644
--- a/ext/afform/mock/ang/afExamplePage.aff.html
+++ b/ext/afform/mock/ang/afExamplePage.aff.html
@@ -1,3 +1,3 @@
 <div>Hello {{routeParams.name}}.</div>
 <div>The foo says "<span fakelib-foo/>".</div>
-<div>The bare file says "<span fakelib-bare-file/>"</div>
\ No newline at end of file
+<div>The bare file says "<span fakelib-bare-file/>"</div>
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.html b/ext/afform/mock/ang/fakelibFoo.aff.html
index b32d06d7f847..0c4807bcc347 100644
--- a/ext/afform/mock/ang/fakelibFoo.aff.html
+++ b/ext/afform/mock/ang/fakelibFoo.aff.html
@@ -1 +1 @@
-<em>the foo bar stuff</em>
\ No newline at end of file
+<em>the foo bar stuff</em>
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.json b/ext/afform/mock/ang/fakelibFoo.aff.json
index 9e26dfeeb6e6..0967ef424bce 100644
--- a/ext/afform/mock/ang/fakelibFoo.aff.json
+++ b/ext/afform/mock/ang/fakelibFoo.aff.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}

From 3fe3418556aac1beaf79e5786532972c3fb6ed29 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 25 Aug 2019 19:44:55 -0400
Subject: [PATCH 441/834] Add api for afform prefill

---
 .../core/CRM/Afform/Page/AfformBase.php       |  2 +-
 ext/afform/core/Civi/Afform/Utils.php         | 65 ++++++++++++++++
 .../Api4/Action/Afform/AbstractProcessor.php  | 57 ++++++++++++++
 .../core/Civi/Api4/Action/Afform/Prefill.php  | 75 +++++++++++++++++++
 ext/afform/core/Civi/Api4/Afform.php          | 16 ++++
 ext/afform/core/ang/af/ModelList.js           | 19 +++--
 ext/afform/core/ang/af/ModelProp.js           |  6 +-
 7 files changed, 229 insertions(+), 11 deletions(-)
 create mode 100644 ext/afform/core/Civi/Afform/Utils.php
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Prefill.php

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 91bec9509c52..3d389528b605 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -18,7 +18,7 @@ public function run() {
     ]);
     $loader->load();
 
-    $afform = civicrm_api4('Afform', 'get', ['where' => [['name', '=', $pageArgs['afform']]], 'select' => ['title']]);
+    $afform = civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $pageArgs['afform']]], 'select' => ['title']]);
 
     if (!empty($afform[0]['title'])) {
       CRM_Utils_System::setTitle(strip_tags($afform[0]['title']));
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
new file mode 100644
index 000000000000..4a89307d2142
--- /dev/null
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Civi\Afform;
+
+class Utils {
+
+  /**
+   * Gets entity metadata and all fields from the form
+   *
+   * @param array $layout
+   * @return array
+   */
+  public static function getEntities($layout) {
+    $entities = array_column(self::getTags($layout, 'af-model-prop'), NULL, 'af-name');
+    self::getFields($layout, $entities);
+    return $entities;
+  }
+
+  /**
+   * Returns all tags with a certain tag name, e.g. 'af-model-prop'
+   *
+   * @param array $collection
+   * @param string $tagName
+   * @return array
+   */
+  public static function getTags($collection, $tagName) {
+    $results = [];
+    if ($collection['#tag'] == $tagName) {
+      $results[] = self::getProps($collection);
+    }
+    foreach ($collection['#children'] ?? [] as $child) {
+      $results = array_merge($results, self::getTags($child, $tagName));
+    }
+    return $results;
+  }
+
+  /**
+   * @param array $layout
+   * @param array $entities
+   */
+  protected static function getFields($layout, &$entities) {
+    foreach ($layout['#children'] as $child) {
+      if ($child['#tag'] == 'af-model' && !empty($child['#children'])) {
+        $entities[$child['af-name']]['fields'] = array_merge($entities[$child['af-name']]['fields'] ?? [], self::getTags($child, 'af-field'));
+      }
+      elseif (!empty($child['#children'])) {
+        self::getFields($child['#children'], $entities);
+      }
+    }
+  }
+
+  /**
+   * Returns all the real properties of a collection,
+   * filtering out any array keys that start with a hashtag
+   *
+   * @param array $collection
+   * @return array
+   */
+  public static function getProps($collection) {
+    return array_filter($collection, function($key) {
+      return substr($key, 0, 1) !== '#';
+    }, ARRAY_FILTER_USE_KEY);
+  }
+
+}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
new file mode 100644
index 000000000000..3c5085cbadc1
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+use Civi\Afform\Utils;
+use Civi\Api4\Generic\Result;
+
+/**
+ * Class Prefill
+ * @package Civi\Api4\Action\Afform
+ */
+abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
+
+  /**
+   * Form name
+   * @var string
+   * @required
+   */
+  protected $name;
+
+  /**
+   * Arguments present when loading the form
+   * @var array
+   */
+  protected $args;
+
+  protected $_afform;
+  
+  protected $_afformEntities;
+
+  public function _run(Result $result) {
+    // This will throw an exception if the form doesn't exist
+    $this->_afform = (array) civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $this->name]]], 0);
+    $this->_afformEntities = Utils::getEntities($this->_afform['layout']);
+    $this->validateArgs();
+    $result->exchangeArray($this->processForm());
+  }
+
+  /**
+   * Strip out arguments that are not allowed on this form
+   */
+  protected function validateArgs() {
+    $rawArgs = $this->args;
+    $this->args = [];
+    foreach ($rawArgs as $arg => $val) {
+      if (!empty($this->_afformEntities[$arg]['af-url-autofill'])) {
+        $this->args[$arg] = $val;
+      }
+    }
+  }
+
+  /**
+   * @return array
+   */
+  abstract protected function processForm();
+
+}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
new file mode 100644
index 000000000000..64ff21822fd5
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+/**
+ * Class Prefill
+ * @package Civi\Api4\Action\Afform
+ */
+class Prefill extends AbstractProcessor {
+
+  protected $_data = [];
+
+  protected function processForm() {
+    foreach ($this->_afformEntities as $entityName => $entity) {
+      // Load entities from args
+      if (!empty($this->args[$entityName])) {
+        $this->loadEntity($entity, $this->args[$entityName]);
+      }
+      // Load entities from autofill settings
+      elseif (!empty($entity['af-autofill'])) {
+        $this->autofillEntity($entity, $entity['af-autofill']);
+      }
+    }
+    $data = [];
+    foreach ($this->_data as $name => $values) {
+      $data[] = ['name' => $name, 'values' => $values];
+    }
+    return $data;
+  }
+
+  /**
+   * Fetch all fields needed to display a given entity on this form
+   *
+   * @param $entity
+   * @param $id
+   * @throws \API_Exception
+   */
+  private function loadEntity($entity, $id) {
+    $checkPermissions = TRUE;
+    if ($entity['af-type'] == 'Contact' && !empty($this->args[$entity['af-name'] . '-cs'])) {
+      $checkSum = civicrm_api4('Contact', 'validateChecksum', [
+        'checksum' => $this->args[$entity['af-name'] . '-cs'],
+        'contactId' => $id,
+      ]);
+      $checkPermissions = empty($checkSum[0]['valid']);
+    }
+    $result = civicrm_api4($entity['af-type'], 'get', [
+      'where' => [['id', '=', $id]],
+      'select' => array_column($entity['fields'], 'field-name'),
+      'checkPermissions' => $checkPermissions,
+    ]);
+    if ($result->first()) {
+      $this->_data[$entity['af-name']] = $result->first();
+    }
+  }
+
+  /**
+   * Fetch an entity based on its autofill settings
+   *
+   * @param $entity
+   * @param $mode
+   */
+  private function autoFillEntity($entity, $mode) {
+    $id = NULL;
+    if ($entity['af-type'] == 'Contact') {
+      if ($mode == 'user') {
+        $id = \CRM_Core_Session::getLoggedInContactID();
+      }
+    }
+    if ($id) {
+      $this->loadEntity($entity, $id);
+    }
+  }
+
+}
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index ecfffa0e8097..75b2095d87e2 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -56,6 +56,20 @@ public static function update() {
     return new \Civi\Api4\Action\Afform\Update('Afform', __FUNCTION__, 'name');
   }
 
+  /**
+   * @return \Civi\Api4\Action\Afform\Prefill
+   */
+  public static function prefill() {
+    return new \Civi\Api4\Action\Afform\Prefill('Afform', __FUNCTION__);
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Submit
+   */
+  public static function submit() {
+    return new \Civi\Api4\Action\Afform\Submit('Afform', __FUNCTION__);
+  }
+
   public static function getFields() {
     return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
       return [
@@ -92,6 +106,8 @@ public static function permissions() {
     return [
       "meta" => ["access CiviCRM"],
       "default" => ["administer CiviCRM"],
+      'prefill' => [],
+      'submit' => [],
     ];
   }
 
diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index 7e28e0e6080f..b4465a4515df 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -30,6 +30,7 @@
         this.getEntity = function getEntity(name) {
           return schema[name];
         };
+        // Returns field values for a given entity
         this.getData = function getData(name) {
           return data[name];
         };
@@ -37,17 +38,19 @@
           return schema[name];
         };
         this.loadData = function() {
-          var apiCalls = {};
+          var toLoad = 0;
           _.each(schema, function(entity, entityName) {
-            if ($routeParams[entityName]) {
-              var id = $routeParams[entityName];
-              apiCalls[entityName] = [entity.type, 'get', {select: entity.fields, where: [['id', '=', id]]}, 0];
+            if ($routeParams[entityName] || entity.autofill) {
+              toLoad++;
             }
           });
-          if (!_.isEmpty(apiCalls)) {
-            crmApi4(apiCalls).then(function(resp) {
-              data = resp;
-            });
+          if (toLoad) {
+            crmApi4('Afform', 'prefill', {name: CRM.afform.open, args: $routeParams})
+              .then(function(result) {
+                _.each(result, function(item) {
+                  data[item.name] = item.values;
+                });
+              });
           }
         };
 
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index 399c6a60bf0b..ce597661ed5d 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -8,7 +8,8 @@
       scope: {
         afType: '@',
         afName: '@',
-        afLabel: '@'
+        afLabel: '@',
+        afAutofill: '@'
       },
       link: function($scope, $el, $attr, afModelListCtrl) {
         var ts = $scope.ts = CRM.ts('afform');
@@ -17,7 +18,8 @@
           type: $scope.afType,
           name: $scope.afName,
           label: $scope.afLabel,
-          fields: [],
+          autofill: $scope.afAutofill,
+          fields: []
         });
         // $scope.$watch('afModelProp', function(newValue){$scope.myOptions = newValue;});
       }

From 11f4f1fbe0fb44b2b81b16988a74d88a63eed58e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 26 Aug 2019 22:10:45 -0400
Subject: [PATCH 442/834] Move modelProps to whitelist

---
 ext/afform/core/ang/af/ModelList.js           |  6 ++--
 ext/afform/core/ang/af/ModelProp.js           | 29 +++++++++----------
 ext/afform/core/ang/afBlock/ContactEmail.html |  2 +-
 ext/afform/core/ang/afBlock/ContactName.html  |  2 +-
 ext/afform/core/ang/afField/afField.js        |  2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index b4465a4515df..85222bf806ae 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -21,8 +21,8 @@
         $scope.myCtrl = this;
 
         this.registerEntity = function registerEntity(entity) {
-          schema[entity.name] = entity;
-          data[entity.name] = data[entity.name] || {};
+          schema[entity.afName] = entity;
+          data[entity.afName] = data[entity.afName] || {};
         };
         this.registerField = function(entityName, fieldName) {
           schema[entityName].fields.push(fieldName);
@@ -40,7 +40,7 @@
         this.loadData = function() {
           var toLoad = 0;
           _.each(schema, function(entity, entityName) {
-            if ($routeParams[entityName] || entity.autofill) {
+            if ($routeParams[entityName] || entity.afAutofill) {
               toLoad++;
             }
           });
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index ce597661ed5d..47426a6cc520 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -2,25 +2,24 @@
   // "afModelProp" is a basic skeletal directive.
   // Example usage: <af-model-list>... <af-model-prop af-name="myModel" af-type="Individual" /> ...</af-model-list>
   angular.module('af').directive('afModelProp', function() {
+    // Whitelist of all allowed properties of an af-model
+    // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
+    var modelProps = {
+      afType: '@',
+      afName: '@',
+      afLabel: '@',
+      afAutofill: '@'
+    };
     return {
       restrict: 'AE',
       require: '^afModelList',
-      scope: {
-        afType: '@',
-        afName: '@',
-        afLabel: '@',
-        afAutofill: '@'
-      },
+      scope: modelProps,
       link: function($scope, $el, $attr, afModelListCtrl) {
-        var ts = $scope.ts = CRM.ts('afform');
-        afModelListCtrl.registerEntity({
-          id: null,
-          type: $scope.afType,
-          name: $scope.afName,
-          label: $scope.afLabel,
-          autofill: $scope.afAutofill,
-          fields: []
-        });
+        var ts = $scope.ts = CRM.ts('afform'),
+          entity = _.pick($scope, _.keys(modelProps));
+        entity.id = null;
+        entity.fields = [];
+        afModelListCtrl.registerEntity(entity);
         // $scope.$watch('afModelProp', function(newValue){$scope.myOptions = newValue;});
       }
     };
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.html b/ext/afform/core/ang/afBlock/ContactEmail.html
index 680a4f1eca97..b40b6bec6b80 100644
--- a/ext/afform/core/ang/afBlock/ContactEmail.html
+++ b/ext/afform/core/ang/afBlock/ContactEmail.html
@@ -1 +1 @@
-<div>{{ts('Contact email block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().name})}}</div>
+<div>{{ts('Contact email block for a model of type %1 named %2', {1: afModel.getDefn().afType, 2: afModel.getDefn().afName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
index e1155b04b6da..9a18f5784173 100644
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -1 +1 @@
-<div>{{ts('Contact name block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().name})}}</div>
+<div>{{ts('Contact name block for a model of type %1 named %2', {1: afModel.getDefn().afType, 2: afModel.getDefn().afName})}}</div>
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 5d4fb7a1fae5..f826d22dc43b 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -13,7 +13,7 @@
         var ts = $scope.ts = CRM.ts('afform');
         $scope.afModel = ctrls[0];
         var modelList = ctrls[1];
-        $scope.fieldId = $scope.afModel.getDefn().name + '-' + $scope.fieldName;
+        $scope.fieldId = $scope.afModel.getDefn().afName + '-' + $scope.fieldName;
         $scope.getData = $scope.afModel.getData;
 
         $scope.getOptions = function() {

From e0295754e9d135f872022652b2b1e68d5532908b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 26 Aug 2019 22:33:37 -0400
Subject: [PATCH 443/834] Add afData property for predetermined data like
 contact_id

---
 ext/afform/core/ang/af/ModelList.js | 4 ++--
 ext/afform/core/ang/af/ModelProp.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index 85222bf806ae..03652da7aea5 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -22,7 +22,7 @@
 
         this.registerEntity = function registerEntity(entity) {
           schema[entity.afName] = entity;
-          data[entity.afName] = data[entity.afName] || {};
+          data[entity.afName] = entity.afData || {};
         };
         this.registerField = function(entityName, fieldName) {
           schema[entityName].fields.push(fieldName);
@@ -48,7 +48,7 @@
             crmApi4('Afform', 'prefill', {name: CRM.afform.open, args: $routeParams})
               .then(function(result) {
                 _.each(result, function(item) {
-                  data[item.name] = item.values;
+                  data[item.name] = _.extend(item.values, schema[item.name].afData || {});
                 });
               });
           }
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index 47426a6cc520..7bf5b45418f0 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -6,6 +6,7 @@
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
       afType: '@',
+      afData: '=',
       afName: '@',
       afLabel: '@',
       afAutofill: '@'

From 93e3e57749490b7b2bca1a079dc6f147265d5cf6 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Sep 2019 21:02:59 -0400
Subject: [PATCH 444/834] WIP Submit api

---
 .../core/Civi/Api4/Action/Afform/Submit.php   | 55 +++++++++++++++++++
 ext/afform/core/ang/af/ModelList.js           |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Submit.php

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
new file mode 100644
index 000000000000..94241a121f14
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+/**
+ * Class Submit
+ * @package Civi\Api4\Action\Afform
+ */
+class Submit extends AbstractProcessor {
+
+  /**
+   * Submitted values
+   * @var array
+   * @required
+   */
+  protected $values;
+
+  /**
+   * @var array
+   */
+  protected $_submission = [];
+
+  protected function processForm() {
+    foreach ($this->_afformEntities as $entityName => $entity) {
+      // Predetermined values override submitted values
+      $this->_submission[$entity['af-type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
+    }
+    // Determines the order in which to process entities. Contacts go first.
+    $entitiesToProcess = [
+      'Contact' => 'processContacts',
+      'Activity' => 'processActivities',
+    ];
+    foreach ($entitiesToProcess as $entityType => $callback) {
+      if (!empty($this->_submission[$entityType])) {
+        $this->$callback($this->_submission[$entityType]);
+      }
+    }
+    foreach (array_diff_key($this->_submission, $entitiesToProcess) as $entityType) {
+
+    }
+  }
+
+  protected function processGenericEntity($entityType, $items) {
+    foreach ($items as $name => $item) {
+      civicrm_api4($entityType, 'save', $items);
+    }
+  }
+
+  protected function processContacts($contacts) {
+    foreach ($contacts as $name => $contact) {
+
+    }
+  }
+
+}
diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index 03652da7aea5..ef696de09098 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -55,7 +55,7 @@
         };
 
         this.submit = function submit() {
-          CRM.alert('TODO: Submit');
+          crmApi4('Afform', 'submit', {name: CRM.afform.open, args: $routeParams, values: data});
         };
       }
     };

From bbd6df21b235ecda950c3c069c58a6562c19c027 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Sep 2019 22:07:56 -0400
Subject: [PATCH 445/834] Rename af-type to type

---
 ext/afform/core/Civi/Api4/Action/Afform/Prefill.php | 6 +++---
 ext/afform/core/Civi/Api4/Action/Afform/Submit.php  | 2 +-
 ext/afform/core/afform.php                          | 4 ++--
 ext/afform/core/ang/af/ModelProp.js                 | 4 ++--
 ext/afform/core/ang/afBlock/ContactEmail.html       | 2 +-
 ext/afform/core/ang/afBlock/ContactName.html        | 2 +-
 ext/afform/mock/ang/afex.aff.html                   | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index 64ff21822fd5..b8babb67d781 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -37,14 +37,14 @@ protected function processForm() {
    */
   private function loadEntity($entity, $id) {
     $checkPermissions = TRUE;
-    if ($entity['af-type'] == 'Contact' && !empty($this->args[$entity['af-name'] . '-cs'])) {
+    if ($entity['type'] == 'Contact' && !empty($this->args[$entity['af-name'] . '-cs'])) {
       $checkSum = civicrm_api4('Contact', 'validateChecksum', [
         'checksum' => $this->args[$entity['af-name'] . '-cs'],
         'contactId' => $id,
       ]);
       $checkPermissions = empty($checkSum[0]['valid']);
     }
-    $result = civicrm_api4($entity['af-type'], 'get', [
+    $result = civicrm_api4($entity['type'], 'get', [
       'where' => [['id', '=', $id]],
       'select' => array_column($entity['fields'], 'field-name'),
       'checkPermissions' => $checkPermissions,
@@ -62,7 +62,7 @@ private function loadEntity($entity, $id) {
    */
   private function autoFillEntity($entity, $mode) {
     $id = NULL;
-    if ($entity['af-type'] == 'Contact') {
+    if ($entity['type'] == 'Contact') {
       if ($mode == 'user') {
         $id = \CRM_Core_Session::getLoggedInContactID();
       }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 94241a121f14..be9546c4717c 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -23,7 +23,7 @@ class Submit extends AbstractProcessor {
   protected function processForm() {
     foreach ($this->_afformEntities as $entityName => $entity) {
       // Predetermined values override submitted values
-      $this->_submission[$entity['af-type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
+      $this->_submission[$entity['type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
     }
     // Determines the order in which to process entities. Contacts go first.
     $entitiesToProcess = [
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index c505c3c42649..b4314e90a4b3 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -182,7 +182,7 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $fieldName = $afField->getAttribute('field-name');
-        $entityName = pq($afField)->parent('[af-name]')->attr('af-name');
+        $entityName = pq($afField)->parent('af-model[af-name]')->attr('af-name'); // TEST ME
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
@@ -216,7 +216,7 @@ function _afform_getMetadata(phpQueryObject $doc) {
   $entities = [];
   foreach ($doc->find('af-model-prop') as $afmModelProp) {
     $entities[$afmModelProp->getAttribute('af-name')] = [
-      'type' => $afmModelProp->getAttribute('af-type'),
+      'type' => $afmModelProp->getAttribute('type'),
     ];
   }
   return $entities;
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index 7bf5b45418f0..2d36e81b064d 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -1,11 +1,11 @@
 (function(angular, $, _) {
   // "afModelProp" is a basic skeletal directive.
-  // Example usage: <af-model-list>... <af-model-prop af-name="myModel" af-type="Individual" /> ...</af-model-list>
+  // Example usage: <af-model-list>... <af-model-prop af-name="myModel" type="Individual" /> ...</af-model-list>
   angular.module('af').directive('afModelProp', function() {
     // Whitelist of all allowed properties of an af-model
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
-      afType: '@',
+      type: '@',
       afData: '=',
       afName: '@',
       afLabel: '@',
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.html b/ext/afform/core/ang/afBlock/ContactEmail.html
index b40b6bec6b80..41aab8b722de 100644
--- a/ext/afform/core/ang/afBlock/ContactEmail.html
+++ b/ext/afform/core/ang/afBlock/ContactEmail.html
@@ -1 +1 @@
-<div>{{ts('Contact email block for a model of type %1 named %2', {1: afModel.getDefn().afType, 2: afModel.getDefn().afName})}}</div>
+<div>{{ts('Contact email block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().afName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
index 9a18f5784173..08b62db24680 100644
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -1 +1 @@
-<div>{{ts('Contact name block for a model of type %1 named %2', {1: afModel.getDefn().afType, 2: afModel.getDefn().afName})}}</div>
+<div>{{ts('Contact name block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().afName})}}</div>
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 2bf45526698d..5d112bb96bfd 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,8 +1,8 @@
 <af-model-list ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model-prop af-type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model-prop>
-  <af-model-prop af-type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model-prop>
-  <af-model-prop af-type="Contact" af-name="home" af-label="Home"></af-model-prop>
+  <af-model-prop type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model-prop>
+  <af-model-prop type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model-prop>
+  <af-model-prop type="Contact" af-name="home" af-label="Home"></af-model-prop>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 

From f57ba633e996361541daa4cb0e1159f8b0f3ea98 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:14:21 -0400
Subject: [PATCH 446/834] Rename `<af-model-list>` to `<af-form>`

---
 ext/afform/auditor/backlog.md                    |  2 +-
 ext/afform/core/ang/af/{ModelList.js => Form.js} |  8 ++++----
 ext/afform/core/ang/af/Model.js                  | 14 +++++++-------
 ext/afform/core/ang/af/ModelProp.js              |  8 ++++----
 ext/afform/core/ang/afField/afField.js           |  2 +-
 ext/afform/docs/sandbox/planning-v0.3.md         | 16 ++++++++--------
 ext/afform/mock/ang/afex.aff.html                |  4 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)
 rename ext/afform/core/ang/af/{ModelList.js => Form.js} (90%)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index 3e9a620ca08b..1c47199ae87d 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -7,7 +7,7 @@ validator to catch. Loosely/informally:
 
 * HTML partials should be well-formed/parseable XML
 * Warnings about any unrecognized tags/attributes/classes.
-* `<af-model-list>`, `<af-model-prop>`, `<af-model>`, `<af-field>` should have suitable relationships.
+* `<af-form>`, `<af-model-prop>`, `<af-model>`, `<af-field>` should have suitable relationships.
 * `<af-model-prop>` should reference legit entities.
 * `<af-field>` should reference legit fields.
     * Future consideration: how to validate when it's part of a subform?
diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/Form.js
similarity index 90%
rename from ext/afform/core/ang/af/ModelList.js
rename to ext/afform/core/ang/af/Form.js
index ef696de09098..48ea2696e62d 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -1,11 +1,11 @@
 (function(angular, $, _) {
-  // "afModelList" is a basic skeletal directive.
-  // Example usage: <af-model-list ctrl="myCtrl">
-  angular.module('af').directive('afModelList', function() {
+  // "afForm" is a basic skeletal directive.
+  // Example usage: <af-form ctrl="myCtrl">
+  angular.module('af').directive('afForm', function() {
     return {
       restrict: 'AE',
       scope: {
-        // afModelList: '=',
+        // afForm: '=',
         ctrl: '@'
       },
       link: {
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
index 3201e1af6788..d3b314ff6c6c 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -1,27 +1,27 @@
 (function(angular, $, _) {
   // "afModel" is a basic skeletal directive.
-  // Example usage: <af-model-list>... <af-model af-name="myModel">...</af-model> ...</af-model-list>
+  // Example usage: <af-form>... <af-model af-name="myModel">...</af-model> ...</af-form>
   angular.module('af').directive('afModel', function() {
     return {
       restrict: 'AE',
-      require: '^afModelList',
+      require: '^afForm',
       scope: {
         afName: '@'
       },
-      link: function($scope, $el, $attr, afModelListCtrl) {
-        $scope.afModelListCtrl = afModelListCtrl;
+      link: function($scope, $el, $attr, afFormCtrl) {
+        $scope.afFormCtrl = afFormCtrl;
         // This is faster than waiting for each field directive to register itself
         $('af-field', $el).each(function() {
-          afModelListCtrl.registerField($scope.afName, $(this).attr('field-name'))
+          afFormCtrl.registerField($scope.afName, $(this).attr('field-name'))
         });
       },
       controller: function($scope){
         this.getDefn = function getDefn() {
-          return $scope.afModelListCtrl.getEntity($scope.afName);
+          return $scope.afFormCtrl.getEntity($scope.afName);
           // return $scope.modelDefn;
         };
         this.getData = function getData() {
-          return $scope.afModelListCtrl.getData($scope.afName);
+          return $scope.afFormCtrl.getData($scope.afName);
         };
         this.getName = function() {
           return $scope.afName;
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index 2d36e81b064d..a1b4b6a15663 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -1,6 +1,6 @@
 (function(angular, $, _) {
   // "afModelProp" is a basic skeletal directive.
-  // Example usage: <af-model-list>... <af-model-prop af-name="myModel" type="Individual" /> ...</af-model-list>
+  // Example usage: <af-form>... <af-model-prop af-name="myModel" type="Individual" /> ...</af-form>
   angular.module('af').directive('afModelProp', function() {
     // Whitelist of all allowed properties of an af-model
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
@@ -13,14 +13,14 @@
     };
     return {
       restrict: 'AE',
-      require: '^afModelList',
+      require: '^afForm',
       scope: modelProps,
-      link: function($scope, $el, $attr, afModelListCtrl) {
+      link: function($scope, $el, $attr, afFormCtrl) {
         var ts = $scope.ts = CRM.ts('afform'),
           entity = _.pick($scope, _.keys(modelProps));
         entity.id = null;
         entity.fields = [];
-        afModelListCtrl.registerEntity(entity);
+        afFormCtrl.registerEntity(entity);
         // $scope.$watch('afModelProp', function(newValue){$scope.myOptions = newValue;});
       }
     };
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index f826d22dc43b..29523ed9eecd 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -3,7 +3,7 @@
   angular.module('afField').directive('afField', function() {
     return {
       restrict: 'E',
-      require: ['^afModel', '^afModelList'],
+      require: ['^afModel', '^afForm'],
       templateUrl: '~/afField/afField.html',
       scope: {
         fieldName: '@',
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index c68e71d2a2c5..203c23cdf206 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -63,7 +63,7 @@
 
 ```html
 <!-- 1. s/entity/model-->
-<af-model-list>
+<af-form>
 
   <af-model af-type="Individual" af-name="parent" af-label="Parent">
     <af-name af-label="Name" />
@@ -79,13 +79,13 @@
     <af-address af-label="Address" />
   </af-model>
 
-</af-model-list>
+</af-form>
 ```
 
 --------------
 
 ```html
-<af-model-list ctrl="modelListCtrl">
+<af-form ctrl="modelListCtrl">
   <af-model-prop
     af-type="Individual"
     af-name="parent"
@@ -121,7 +121,7 @@
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-model="modelListCtrl.submit()">Submit</button>
 
-</af-model-list>
+</af-form>
 ```
 
 ------
@@ -130,7 +130,7 @@
 <!-- afform/Blocks/Email.html -->
 <!-- input: options.parent.id -->
 <!-- Decision: These blocks are written in straight AngularJS rather than Afform -->
-<!--<af-model-list>-->
+<!--<af-form>-->
   <!--<af-model-prop -->
     <!--af-type="Email"-->
     <!--af-name="email"-->
@@ -140,14 +140,14 @@
   <!--<af-model af-name="email">-->
     <!---->
   <!--</af-model>-->
-<!--</af-model-list>-->
+<!--</af-form>-->
 
 ```
 
 ------
 
 ```html
-<af-model-list ctrl="modelListCtrl">
+<af-form ctrl="modelListCtrl">
   <af-model-prop
     af-type="Individual"
     af-name="parent"
@@ -190,5 +190,5 @@
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-model="modelListCtrl.submit()">Submit</button>
 
-</af-model-list>
+</af-form>
 ```
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 5d112bb96bfd..00e64d0525e3 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,4 +1,4 @@
-<af-model-list ctrl="modelListCtrl">
+<af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
   <af-model-prop type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model-prop>
   <af-model-prop type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model-prop>
@@ -29,4 +29,4 @@
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-click="modelListCtrl.submit()">Submit</button>
 
-</af-model-list>
+</af-form>

From d33d49e1a03fd36a19d540e7daafab0e0dfa9fc3 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:18:01 -0400
Subject: [PATCH 447/834] Temporarily rename <af-model-prop> to
 <af-will-be-model> (so we can rename existing <af-model> easily)

---
 ext/afform/auditor/backlog.md                          |  4 ++--
 ext/afform/core/CRM/Afform/ArrayHtml.php               |  4 ++--
 ext/afform/core/Civi/Afform/Utils.php                  |  4 ++--
 ext/afform/core/afform.php                             |  2 +-
 .../core/ang/af/{ModelProp.js => WillBeModel.js}       |  8 ++++----
 ext/afform/docs/sandbox/planning-v0.3.md               | 10 +++++-----
 ext/afform/docs/style.md                               |  6 +++---
 ext/afform/mock/ang/afex.aff.html                      |  6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)
 rename ext/afform/core/ang/af/{ModelProp.js => WillBeModel.js} (70%)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index 1c47199ae87d..cd3e4f95cab0 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -7,8 +7,8 @@ validator to catch. Loosely/informally:
 
 * HTML partials should be well-formed/parseable XML
 * Warnings about any unrecognized tags/attributes/classes.
-* `<af-form>`, `<af-model-prop>`, `<af-model>`, `<af-field>` should have suitable relationships.
-* `<af-model-prop>` should reference legit entities.
+* `<af-form>`, `<af-will-be-model>`, `<af-model>`, `<af-field>` should have suitable relationships.
+* `<af-will-be-model>` should reference legit entities.
 * `<af-field>` should reference legit fields.
     * Future consideration: how to validate when it's part of a subform?
 * `<af-model>` should reference a declared model.
diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 66757c3ba9a0..b27bb3b331ec 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -21,7 +21,7 @@ class CRM_Afform_ArrayHtml {
     '*' => [
       '*' => 'text',
     ],
-    'af-model-prop' => [
+    'af-will-be-model' => [
       'af-name' => 'text',
       'af-entity' => 'text',
       'af-data' => 'js',
@@ -158,7 +158,7 @@ public function convertNodeToArray($node) {
    * Determine the type of data that is stored in an attribute.
    *
    * @param string $tag
-   *   Ex: 'af-model-prop'
+   *   Ex: 'af-will-be-model'
    * @param string $attrName
    *   Ex: 'af-name'
    * @return string
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
index 4a89307d2142..1ffb2ca95ff0 100644
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -11,13 +11,13 @@ class Utils {
    * @return array
    */
   public static function getEntities($layout) {
-    $entities = array_column(self::getTags($layout, 'af-model-prop'), NULL, 'af-name');
+    $entities = array_column(self::getTags($layout, 'af-will-be-model'), NULL, 'af-name');
     self::getFields($layout, $entities);
     return $entities;
   }
 
   /**
-   * Returns all tags with a certain tag name, e.g. 'af-model-prop'
+   * Returns all tags with a certain tag name, e.g. 'af-will-be-model'
    *
    * @param array $collection
    * @param string $tagName
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index b4314e90a4b3..8efdb66500f9 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -214,7 +214,7 @@ function afform_civicrm_alterAngular($angular) {
 
 function _afform_getMetadata(phpQueryObject $doc) {
   $entities = [];
-  foreach ($doc->find('af-model-prop') as $afmModelProp) {
+  foreach ($doc->find('af-will-be-model') as $afmModelProp) {
     $entities[$afmModelProp->getAttribute('af-name')] = [
       'type' => $afmModelProp->getAttribute('type'),
     ];
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/WillBeModel.js
similarity index 70%
rename from ext/afform/core/ang/af/ModelProp.js
rename to ext/afform/core/ang/af/WillBeModel.js
index a1b4b6a15663..df0f98fcf91f 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/WillBeModel.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
-  // "afModelProp" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-model-prop af-name="myModel" type="Individual" /> ...</af-form>
-  angular.module('af').directive('afModelProp', function() {
+  // "afWillBeModel" is a basic skeletal directive.
+  // Example usage: <af-form>... <af-will-be-model af-name="myModel" type="Individual" /> ...</af-form>
+  angular.module('af').directive('afWillBeModel', function() {
     // Whitelist of all allowed properties of an af-model
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
@@ -21,7 +21,7 @@
         entity.id = null;
         entity.fields = [];
         afFormCtrl.registerEntity(entity);
-        // $scope.$watch('afModelProp', function(newValue){$scope.myOptions = newValue;});
+        // $scope.$watch('afWillBeModel', function(newValue){$scope.myOptions = newValue;});
       }
     };
   });
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index 203c23cdf206..ce2fe93dd869 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -86,13 +86,13 @@
 
 ```html
 <af-form ctrl="modelListCtrl">
-  <af-model-prop
+  <af-will-be-model
     af-type="Individual"
     af-name="parent"
     af-label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
-  <af-model-prop
+  <af-will-be-model
     af-type="Individual"
     af-name="spouse"
     af-label="Spouse"
@@ -131,7 +131,7 @@
 <!-- input: options.parent.id -->
 <!-- Decision: These blocks are written in straight AngularJS rather than Afform -->
 <!--<af-form>-->
-  <!--<af-model-prop -->
+  <!--<af-will-be-model -->
     <!--af-type="Email"-->
     <!--af-name="email"-->
     <!--af-label="Emails"-->
@@ -148,13 +148,13 @@
 
 ```html
 <af-form ctrl="modelListCtrl">
-  <af-model-prop
+  <af-will-be-model
     af-type="Individual"
     af-name="parent"
     af-label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
-  <af-model-prop
+  <af-will-be-model
     af-type="Individual"
     af-name="spouse"
     af-label="Spouse"
diff --git a/ext/afform/docs/style.md b/ext/afform/docs/style.md
index 30063d2f6740..4cf1bdc80cb8 100644
--- a/ext/afform/docs/style.md
+++ b/ext/afform/docs/style.md
@@ -4,10 +4,10 @@
 
 The following naming conventions apply to directives defined within `afform.git`:
 
-* Standalone directives (e.g. `afModelProp` or `afField`), including forms (e.g. `afHtmlEditor`)
+* Standalone directives (e.g. `afWillBeModel` or `afField`), including forms (e.g. `afHtmlEditor`)
     * The directive name must begin with the `af` prefix.
     * Supplemental attributes SHOULD NOT begin with the `af` prefix.
-    * Example: `<af-model-prop type="Activity" name="myPhoneCall">`
+    * Example: `<af-will-be-model type="Activity" name="myPhoneCall">`
 
 * Mix-in directives (e.g. `afMonaco` or `afApi4Action`)
     * The directive name must begin with the `af` prefix.
@@ -18,7 +18,7 @@ __Discussion__: These differ in two ways:
 
 * Namespacing
     * Standalone directives form an implicit namespace.
-      (*Anything passed to `<af-model-prop>` is implicitly about `af-model-prop`.)
+      (*Anything passed to `<af-will-be-model>` is implicitly about `af-will-be-model`.)
     * Mix-in directives must share a namespace with other potential mix-ins.
       (*The *)
 * Directive arguments
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 00e64d0525e3..ff3e552a2721 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,8 +1,8 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model-prop type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model-prop>
-  <af-model-prop type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model-prop>
-  <af-model-prop type="Contact" af-name="home" af-label="Home"></af-model-prop>
+  <af-will-be-model type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-will-be-model>
+  <af-will-be-model type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-will-be-model>
+  <af-will-be-model type="Contact" af-name="home" af-label="Home"></af-will-be-model>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 

From dce8ad72f520c9535e9433a23fa98fb9bc891ef2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:21:26 -0400
Subject: [PATCH 448/834] Rename <af-model> to <af-fieldset>

---
 ext/afform/auditor/backlog.md                 |  4 +-
 ext/afform/core/CRM/Afform/ArrayHtml.php      |  2 +-
 ext/afform/core/Civi/Afform/Utils.php         |  2 +-
 ext/afform/core/afform.php                    |  2 +-
 .../core/ang/af/{Model.js => Fieldset.js}     |  6 +--
 ext/afform/core/ang/af/WillBeModel.js         |  2 +-
 ext/afform/core/ang/afBlock/ContactEmail.html |  2 +-
 ext/afform/core/ang/afBlock/ContactEmail.js   |  4 +-
 ext/afform/core/ang/afBlock/ContactName.html  |  2 +-
 ext/afform/core/ang/afBlock/ContactName.js    |  6 +--
 ext/afform/core/ang/afField/afField.js        | 10 ++---
 ext/afform/docs/sandbox/planning-v0.3.md      | 40 +++++++++----------
 ext/afform/mock/ang/afex.aff.html             | 16 ++++----
 13 files changed, 49 insertions(+), 49 deletions(-)
 rename ext/afform/core/ang/af/{Model.js => Fieldset.js} (81%)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index cd3e4f95cab0..19a6d1a7f3a3 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -7,11 +7,11 @@ validator to catch. Loosely/informally:
 
 * HTML partials should be well-formed/parseable XML
 * Warnings about any unrecognized tags/attributes/classes.
-* `<af-form>`, `<af-will-be-model>`, `<af-model>`, `<af-field>` should have suitable relationships.
+* `<af-form>`, `<af-will-be-model>`, `<af-fieldset>`, `<af-field>` should have suitable relationships.
 * `<af-will-be-model>` should reference legit entities.
 * `<af-field>` should reference legit fields.
     * Future consideration: how to validate when it's part of a subform?
-* `<af-model>` should reference a declared model.
+* `<af-fieldset>` should reference a declared model.
 * `<af-field field-defn="...">` should contain an object.
 * `<a>` should have `href` or `ng-click` or `af-api4-action`
 * Accept a restricted subset of HTML (e.g. `p h1 h2 h3` but not `script` or `[onclick]`)
diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index b27bb3b331ec..9d11d35df947 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -30,7 +30,7 @@ class CRM_Afform_ArrayHtml {
       'field-name' => 'text',
       'field-defn' => 'js',
     ],
-    'af-model' => [
+    'af-fieldset' => [
       'af-name' => 'text',
     ],
   ];
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
index 1ffb2ca95ff0..6c04167695d9 100644
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -40,7 +40,7 @@ public static function getTags($collection, $tagName) {
    */
   protected static function getFields($layout, &$entities) {
     foreach ($layout['#children'] as $child) {
-      if ($child['#tag'] == 'af-model' && !empty($child['#children'])) {
+      if ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
         $entities[$child['af-name']]['fields'] = array_merge($entities[$child['af-name']]['fields'] ?? [], self::getTags($child, 'af-field'));
       }
       elseif (!empty($child['#children'])) {
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 8efdb66500f9..03316a5c3df7 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -182,7 +182,7 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $fieldName = $afField->getAttribute('field-name');
-        $entityName = pq($afField)->parent('af-model[af-name]')->attr('af-name'); // TEST ME
+        $entityName = pq($afField)->parent('af-fieldset[af-name]')->attr('af-name'); // TEST ME
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Fieldset.js
similarity index 81%
rename from ext/afform/core/ang/af/Model.js
rename to ext/afform/core/ang/af/Fieldset.js
index d3b314ff6c6c..60b61e0942c9 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
-  // "afModel" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-model af-name="myModel">...</af-model> ...</af-form>
-  angular.module('af').directive('afModel', function() {
+  // "afFieldset" is a basic skeletal directive.
+  // Example usage: <af-form>... <af-fieldset af-name="myModel">...</af-fieldset> ...</af-form>
+  angular.module('af').directive('afFieldset', function() {
     return {
       restrict: 'AE',
       require: '^afForm',
diff --git a/ext/afform/core/ang/af/WillBeModel.js b/ext/afform/core/ang/af/WillBeModel.js
index df0f98fcf91f..6dbda8c70193 100644
--- a/ext/afform/core/ang/af/WillBeModel.js
+++ b/ext/afform/core/ang/af/WillBeModel.js
@@ -2,7 +2,7 @@
   // "afWillBeModel" is a basic skeletal directive.
   // Example usage: <af-form>... <af-will-be-model af-name="myModel" type="Individual" /> ...</af-form>
   angular.module('af').directive('afWillBeModel', function() {
-    // Whitelist of all allowed properties of an af-model
+    // Whitelist of all allowed properties of an af-fieldset
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
       type: '@',
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.html b/ext/afform/core/ang/afBlock/ContactEmail.html
index 41aab8b722de..0a451eb5b894 100644
--- a/ext/afform/core/ang/afBlock/ContactEmail.html
+++ b/ext/afform/core/ang/afBlock/ContactEmail.html
@@ -1 +1 @@
-<div>{{ts('Contact email block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().afName})}}</div>
+<div>{{ts('Contact email block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().afName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.js b/ext/afform/core/ang/afBlock/ContactEmail.js
index 88c744effee8..44c3b23ebb67 100644
--- a/ext/afform/core/ang/afBlock/ContactEmail.js
+++ b/ext/afform/core/ang/afBlock/ContactEmail.js
@@ -3,12 +3,12 @@
   angular.module('afBlock').directive('afBlockContactEmail', function() {
     return {
       restrict: 'AE',
-      require: ['^afModel'],
+      require: ['^afFieldset'],
       templateUrl: '~/afBlock/ContactEmail.html',
       scope: {},
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform');
-        $scope.afModel = ctrls[0];
+        $scope.afFieldset = ctrls[0];
       }
     };
   });
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
index 08b62db24680..f99155662527 100644
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -1 +1 @@
-<div>{{ts('Contact name block for a model of type %1 named %2', {1: afModel.getDefn().type, 2: afModel.getDefn().afName})}}</div>
+<div>{{ts('Contact name block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().afName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactName.js b/ext/afform/core/ang/afBlock/ContactName.js
index 16001f812ccf..da68c0b45b3f 100644
--- a/ext/afform/core/ang/afBlock/ContactName.js
+++ b/ext/afform/core/ang/afBlock/ContactName.js
@@ -1,14 +1,14 @@
 (function(angular, $, _) {
-  // Example usage: <af-model af-name="myModel"><af-block-contact-name /></af-model>
+  // Example usage: <af-fieldset af-name="myModel"><af-block-contact-name /></af-fieldset>
   angular.module('afBlock').directive('afBlockContactName', function() {
     return {
       restrict: 'AE',
-      require: ['^afModel'],
+      require: ['^afFieldset'],
       templateUrl: '~/afBlock/ContactName.html',
       scope: {},
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform');
-        $scope.afModel = ctrls[0];
+        $scope.afFieldset = ctrls[0];
       }
     };
   });
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 29523ed9eecd..42a4ae56e28e 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -1,9 +1,9 @@
 (function(angular, $, _) {
-  // Example usage: <af-model af-name="myModel"><af-field field-name="do_not_email" /></af-model>
+  // Example usage: <af-fieldset af-name="myModel"><af-field field-name="do_not_email" /></af-fieldset>
   angular.module('afField').directive('afField', function() {
     return {
       restrict: 'E',
-      require: ['^afModel', '^afForm'],
+      require: ['^afFieldset', '^afForm'],
       templateUrl: '~/afField/afField.html',
       scope: {
         fieldName: '@',
@@ -11,10 +11,10 @@
       },
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform');
-        $scope.afModel = ctrls[0];
+        $scope.afFieldset = ctrls[0];
         var modelList = ctrls[1];
-        $scope.fieldId = $scope.afModel.getDefn().afName + '-' + $scope.fieldName;
-        $scope.getData = $scope.afModel.getData;
+        $scope.fieldId = $scope.afFieldset.getDefn().afName + '-' + $scope.fieldName;
+        $scope.getData = $scope.afFieldset.getData;
 
         $scope.getOptions = function() {
           return _.transform($scope.fieldDefn.options, function(result, val, key) {
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index ce2fe93dd869..6c4b66b87fad 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -65,19 +65,19 @@
 <!-- 1. s/entity/model-->
 <af-form>
 
-  <af-model af-type="Individual" af-name="parent" af-label="Parent">
+  <af-fieldset af-type="Individual" af-name="parent" af-label="Parent">
     <af-name af-label="Name" />
     <af-email af-label="Email" />
-  </af-model>
+  </af-fieldset>
 
-  <af-model af-type="Individual" af-name="spouse" af-title="Spouse">
+  <af-fieldset af-type="Individual" af-name="spouse" af-title="Spouse">
     <af-name af-label="Spouse Name" />
     <af-email af-label="Spouse Email" />
-  </af-model>
+  </af-fieldset>
 
-  <af-model af-type="Individual" af-name="parent" af-title="Parent">
+  <af-fieldset af-type="Individual" af-name="parent" af-title="Parent">
     <af-address af-label="Address" />
-  </af-model>
+  </af-fieldset>
 
 </af-form>
 ```
@@ -100,23 +100,23 @@
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
-  <af-model af-name="parent">
+  <af-fieldset af-name="parent">
     <af-name af-label="Name" />
     <af-email af-label="Email" />
-  </af-model>
+  </af-fieldset>
 
-  <af-model af-name="spouse">
+  <af-fieldset af-name="spouse">
     <af-name af-label="Spouse Name" />
     <af-email af-label="Spouse Email" only-primary="true" />
-  </af-model>
+  </af-fieldset>
 
   <p ng-if="spouse.display_name.contains('Thor')">
     Your spouse should go to the gym.
   </p>
 
-  <af-model af-name="parent">
+  <af-fieldset af-name="parent">
     <af-address af-label="Address" />
-  </af-model>
+  </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-model="modelListCtrl.submit()">Submit</button>
@@ -137,9 +137,9 @@
     <!--af-label="Emails"-->
     <!--af-api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
   <!--/>-->
-  <!--<af-model af-name="email">-->
+  <!--<af-fieldset af-name="email">-->
     <!---->
-  <!--</af-model>-->
+  <!--</af-fieldset>-->
 <!--</af-form>-->
 
 ```
@@ -164,18 +164,18 @@
 
   <crm-ui-tab-set>
     <crm-ui-tab title="About You">
-      <af-model af-name="parent">
+      <af-fieldset af-name="parent">
         <af-std-contact-name af-label="Name" />
         <af-std-contact-email af-label="Email" />
         <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
-      </af-model>
+      </af-fieldset>
     </crm-ui-tab>
     <crm-ui-tab title="Spouse">
-      <af-model af-name="spouse">
+      <af-fieldset af-name="spouse">
         <af-std-contact-name af-label="Spouse Name" />
         <af-std-contact-email af-label="Spouse Email" only-primary="true" />
         <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
-      </af-model>
+      </af-fieldset>
     </crm-ui-tab>
   </crm-ui-tab-set>
 
@@ -183,9 +183,9 @@
     Your spouse should go to the gym.
   </p>
 
-  <af-model af-name="parent">
+  <af-fieldset af-name="parent">
     <af-block-contact-address af-label="Address" />
-  </af-model>
+  </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-model="modelListCtrl.submit()">Submit</button>
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index ff3e552a2721..c0689336a8c0 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -6,25 +6,25 @@
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
-  <af-model af-name="parent">
+  <af-fieldset af-name="parent">
     <af-block-contact-name af-label="My Name" />
     <af-block-contact-email af-label="My Email" />
     <af-field field-name="do_not_email" />
-  </af-model>
+  </af-fieldset>
 
-  <af-model af-name="spouse">
+  <af-fieldset af-name="spouse">
     <af-block-contact-name af-label="Spouse Name" />
     <af-block-contact-email af-label="Spouse Email" only-primary="true" />
     <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
-  </af-model>
+  </af-fieldset>
 
-  <af-model af-name="home">
+  <af-fieldset af-name="home">
     <af-block-contact-name af-label="Home Name" />
-  </af-model>
+  </af-fieldset>
 
-  <af-model af-name="parent">
+  <af-fieldset af-name="parent">
     <af-block-contact-address af-label="My Address" />
-  </af-model>
+  </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-click="modelListCtrl.submit()">Submit</button>

From e81468882340bc0c7a239a1f35fabda903a08cc2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:27:00 -0400
Subject: [PATCH 449/834] Rename `<af-will-be-model>` to its real name,
 `<af-model>`

---
 ext/afform/auditor/backlog.md                       |  4 ++--
 ext/afform/core/CRM/Afform/ArrayHtml.php            |  4 ++--
 ext/afform/core/Civi/Afform/Utils.php               |  4 ++--
 ext/afform/core/afform.php                          |  2 +-
 ext/afform/core/ang/af/{WillBeModel.js => Model.js} |  8 ++++----
 ext/afform/docs/sandbox/planning-v0.3.md            | 10 +++++-----
 ext/afform/docs/style.md                            |  6 +++---
 ext/afform/mock/ang/afex.aff.html                   |  6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)
 rename ext/afform/core/ang/af/{WillBeModel.js => Model.js} (70%)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index 19a6d1a7f3a3..bdd7a71f56d7 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -7,8 +7,8 @@ validator to catch. Loosely/informally:
 
 * HTML partials should be well-formed/parseable XML
 * Warnings about any unrecognized tags/attributes/classes.
-* `<af-form>`, `<af-will-be-model>`, `<af-fieldset>`, `<af-field>` should have suitable relationships.
-* `<af-will-be-model>` should reference legit entities.
+* `<af-form>`, `<af-model>`, `<af-fieldset>`, `<af-field>` should have suitable relationships.
+* `<af-model>` should reference legit entities.
 * `<af-field>` should reference legit fields.
     * Future consideration: how to validate when it's part of a subform?
 * `<af-fieldset>` should reference a declared model.
diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 9d11d35df947..e957e5cba071 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -21,7 +21,7 @@ class CRM_Afform_ArrayHtml {
     '*' => [
       '*' => 'text',
     ],
-    'af-will-be-model' => [
+    'af-model' => [
       'af-name' => 'text',
       'af-entity' => 'text',
       'af-data' => 'js',
@@ -158,7 +158,7 @@ public function convertNodeToArray($node) {
    * Determine the type of data that is stored in an attribute.
    *
    * @param string $tag
-   *   Ex: 'af-will-be-model'
+   *   Ex: 'af-model'
    * @param string $attrName
    *   Ex: 'af-name'
    * @return string
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
index 6c04167695d9..9095ed020834 100644
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -11,13 +11,13 @@ class Utils {
    * @return array
    */
   public static function getEntities($layout) {
-    $entities = array_column(self::getTags($layout, 'af-will-be-model'), NULL, 'af-name');
+    $entities = array_column(self::getTags($layout, 'af-model'), NULL, 'af-name');
     self::getFields($layout, $entities);
     return $entities;
   }
 
   /**
-   * Returns all tags with a certain tag name, e.g. 'af-will-be-model'
+   * Returns all tags with a certain tag name, e.g. 'af-model'
    *
    * @param array $collection
    * @param string $tagName
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 03316a5c3df7..cf1189520d42 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -214,7 +214,7 @@ function afform_civicrm_alterAngular($angular) {
 
 function _afform_getMetadata(phpQueryObject $doc) {
   $entities = [];
-  foreach ($doc->find('af-will-be-model') as $afmModelProp) {
+  foreach ($doc->find('af-model') as $afmModelProp) {
     $entities[$afmModelProp->getAttribute('af-name')] = [
       'type' => $afmModelProp->getAttribute('type'),
     ];
diff --git a/ext/afform/core/ang/af/WillBeModel.js b/ext/afform/core/ang/af/Model.js
similarity index 70%
rename from ext/afform/core/ang/af/WillBeModel.js
rename to ext/afform/core/ang/af/Model.js
index 6dbda8c70193..6d94908c7068 100644
--- a/ext/afform/core/ang/af/WillBeModel.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
-  // "afWillBeModel" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-will-be-model af-name="myModel" type="Individual" /> ...</af-form>
-  angular.module('af').directive('afWillBeModel', function() {
+  // "afModel" is a basic skeletal directive.
+  // Example usage: <af-form>... <af-model af-name="myModel" type="Individual" /> ...</af-form>
+  angular.module('af').directive('afModel', function() {
     // Whitelist of all allowed properties of an af-fieldset
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
@@ -21,7 +21,7 @@
         entity.id = null;
         entity.fields = [];
         afFormCtrl.registerEntity(entity);
-        // $scope.$watch('afWillBeModel', function(newValue){$scope.myOptions = newValue;});
+        // $scope.$watch('afModel', function(newValue){$scope.myOptions = newValue;});
       }
     };
   });
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index 6c4b66b87fad..ea72e2ae0d80 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -86,13 +86,13 @@
 
 ```html
 <af-form ctrl="modelListCtrl">
-  <af-will-be-model
+  <af-model
     af-type="Individual"
     af-name="parent"
     af-label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
-  <af-will-be-model
+  <af-model
     af-type="Individual"
     af-name="spouse"
     af-label="Spouse"
@@ -131,7 +131,7 @@
 <!-- input: options.parent.id -->
 <!-- Decision: These blocks are written in straight AngularJS rather than Afform -->
 <!--<af-form>-->
-  <!--<af-will-be-model -->
+  <!--<af-model -->
     <!--af-type="Email"-->
     <!--af-name="email"-->
     <!--af-label="Emails"-->
@@ -148,13 +148,13 @@
 
 ```html
 <af-form ctrl="modelListCtrl">
-  <af-will-be-model
+  <af-model
     af-type="Individual"
     af-name="parent"
     af-label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
-  <af-will-be-model
+  <af-model
     af-type="Individual"
     af-name="spouse"
     af-label="Spouse"
diff --git a/ext/afform/docs/style.md b/ext/afform/docs/style.md
index 4cf1bdc80cb8..58736e8ccdc4 100644
--- a/ext/afform/docs/style.md
+++ b/ext/afform/docs/style.md
@@ -4,10 +4,10 @@
 
 The following naming conventions apply to directives defined within `afform.git`:
 
-* Standalone directives (e.g. `afWillBeModel` or `afField`), including forms (e.g. `afHtmlEditor`)
+* Standalone directives (e.g. `afModel` or `afField`), including forms (e.g. `afHtmlEditor`)
     * The directive name must begin with the `af` prefix.
     * Supplemental attributes SHOULD NOT begin with the `af` prefix.
-    * Example: `<af-will-be-model type="Activity" name="myPhoneCall">`
+    * Example: `<af-model type="Activity" name="myPhoneCall">`
 
 * Mix-in directives (e.g. `afMonaco` or `afApi4Action`)
     * The directive name must begin with the `af` prefix.
@@ -18,7 +18,7 @@ __Discussion__: These differ in two ways:
 
 * Namespacing
     * Standalone directives form an implicit namespace.
-      (*Anything passed to `<af-will-be-model>` is implicitly about `af-will-be-model`.)
+      (*Anything passed to `<af-model>` is implicitly about `af-model`.)
     * Mix-in directives must share a namespace with other potential mix-ins.
       (*The *)
 * Directive arguments
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index c0689336a8c0..81e94a6bb12c 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,8 +1,8 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-will-be-model type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-will-be-model>
-  <af-will-be-model type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-will-be-model>
-  <af-will-be-model type="Contact" af-name="home" af-label="Home"></af-will-be-model>
+  <af-model type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
+  <af-model type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model>
+  <af-model type="Contact" af-name="home" af-label="Home"></af-model>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 

From afbf32c7e281f2f97b511b5da36dff73ca08ab6b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:33:31 -0400
Subject: [PATCH 450/834] (docs) Finish renaming "af-type" to "type"

---
 ext/afform/docs/sandbox/planning-v0.3.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index ea72e2ae0d80..dcc455b7d8af 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -42,17 +42,17 @@
 ```html
 <div afform-entity-ctrl="myEntities">
 
-  <af-entity af-type="Individual" af-name="parent" af-label="Parent">
+  <af-entity type="Individual" af-name="parent" af-label="Parent">
     <af-name af-label="Name" />
     <af-email af-label="Email" />
   </af-entity>
   
-  <af-entity af-type="Individual" af-name="spouse" af-title="Spouse">
+  <af-entity type="Individual" af-name="spouse" af-title="Spouse">
     <af-name af-label="Spouse Name" />
     <af-email af-label="Spouse Email" />
   </af-entity>
 
-  <af-entity af-type="Individual" af-name="parent" af-title="Parent">
+  <af-entity type="Individual" af-name="parent" af-title="Parent">
     <af-address af-label="Address" />
   </af-entity>
 
@@ -65,17 +65,17 @@
 <!-- 1. s/entity/model-->
 <af-form>
 
-  <af-fieldset af-type="Individual" af-name="parent" af-label="Parent">
+  <af-fieldset type="Individual" af-name="parent" af-label="Parent">
     <af-name af-label="Name" />
     <af-email af-label="Email" />
   </af-fieldset>
 
-  <af-fieldset af-type="Individual" af-name="spouse" af-title="Spouse">
+  <af-fieldset type="Individual" af-name="spouse" af-title="Spouse">
     <af-name af-label="Spouse Name" />
     <af-email af-label="Spouse Email" />
   </af-fieldset>
 
-  <af-fieldset af-type="Individual" af-name="parent" af-title="Parent">
+  <af-fieldset type="Individual" af-name="parent" af-title="Parent">
     <af-address af-label="Address" />
   </af-fieldset>
 
@@ -87,13 +87,13 @@
 ```html
 <af-form ctrl="modelListCtrl">
   <af-model
-    af-type="Individual"
+    type="Individual"
     af-name="parent"
     af-label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
-    af-type="Individual"
+    type="Individual"
     af-name="spouse"
     af-label="Spouse"
     af-contact-relationship="['Spouse of', 'parent']"
@@ -132,7 +132,7 @@
 <!-- Decision: These blocks are written in straight AngularJS rather than Afform -->
 <!--<af-form>-->
   <!--<af-model -->
-    <!--af-type="Email"-->
+    <!--type="Email"-->
     <!--af-name="email"-->
     <!--af-label="Emails"-->
     <!--af-api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
@@ -149,13 +149,13 @@
 ```html
 <af-form ctrl="modelListCtrl">
   <af-model
-    af-type="Individual"
+    type="Individual"
     af-name="parent"
     af-label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
-    af-type="Individual"
+    type="Individual"
     af-name="spouse"
     af-label="Spouse"
     af-contact-relationship="['Spouse of', 'parent']"

From da670b451a86d8845498aeb25cfc02d7835f7553 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:35:01 -0400
Subject: [PATCH 451/834] (af-model) Rename af-label to label

---
 ext/afform/core/ang/af/Model.js          |  2 +-
 ext/afform/docs/sandbox/planning-v0.3.md | 68 ++++++++++++------------
 ext/afform/mock/ang/afex.aff.html        | 18 +++----
 3 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
index 6d94908c7068..545ebf7f2ff2 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -8,7 +8,7 @@
       type: '@',
       afData: '=',
       afName: '@',
-      afLabel: '@',
+      label: '@',
       afAutofill: '@'
     };
     return {
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index dcc455b7d8af..00751898758e 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -16,9 +16,9 @@
 </script>
   
 <div afform-entity-ctrl="afform-meta-1234abcd">
-  <af-address contact-id="entities.parent.id" af-label="Address" ng-if="" ng-classes="{foo: name == 'Frank'}" />
-  <af-field entity="entities.parent" entity-type="contact" field="first_name" af-label="First Name"/>
-  <af-field entity="entities.parent" entity-type="contact" field="last_name" af-label="Last Name"/>
+  <af-address contact-id="entities.parent.id" label="Address" ng-if="" ng-classes="{foo: name == 'Frank'}" />
+  <af-field entity="entities.parent" entity-type="contact" field="first_name" label="First Name"/>
+  <af-field entity="entities.parent" entity-type="contact" field="last_name" label="Last Name"/>
 </div>
 ```
 
@@ -30,10 +30,10 @@
   <afform-entity type="Individual" name="parent" title="Parent" />
   <afform-entity type="Individual" name="spouse" title="Spouse" />
   
-  <af-name entity="myEntities.parent" af-label="Address" />
-  <af-address entity="myEntities.parent" af-label="Address" />
-  <af-field entity="myEntities.parent" entity-type="contact" field="first_name" af-label="First Name"/>
-  <af-field entity="myEntities.parent" entity-type="contact" field="last_name" af-label="Last Name"/>
+  <af-name entity="myEntities.parent" label="Address" />
+  <af-address entity="myEntities.parent" label="Address" />
+  <af-field entity="myEntities.parent" entity-type="contact" field="first_name" label="First Name"/>
+  <af-field entity="myEntities.parent" entity-type="contact" field="last_name" label="Last Name"/>
 </div>
 ```
 
@@ -42,18 +42,18 @@
 ```html
 <div afform-entity-ctrl="myEntities">
 
-  <af-entity type="Individual" af-name="parent" af-label="Parent">
-    <af-name af-label="Name" />
-    <af-email af-label="Email" />
+  <af-entity type="Individual" af-name="parent" label="Parent">
+    <af-name label="Name" />
+    <af-email label="Email" />
   </af-entity>
   
   <af-entity type="Individual" af-name="spouse" af-title="Spouse">
-    <af-name af-label="Spouse Name" />
-    <af-email af-label="Spouse Email" />
+    <af-name label="Spouse Name" />
+    <af-email label="Spouse Email" />
   </af-entity>
 
   <af-entity type="Individual" af-name="parent" af-title="Parent">
-    <af-address af-label="Address" />
+    <af-address label="Address" />
   </af-entity>
 
 </div>
@@ -65,18 +65,18 @@
 <!-- 1. s/entity/model-->
 <af-form>
 
-  <af-fieldset type="Individual" af-name="parent" af-label="Parent">
-    <af-name af-label="Name" />
-    <af-email af-label="Email" />
+  <af-fieldset type="Individual" af-name="parent" label="Parent">
+    <af-name label="Name" />
+    <af-email label="Email" />
   </af-fieldset>
 
   <af-fieldset type="Individual" af-name="spouse" af-title="Spouse">
-    <af-name af-label="Spouse Name" />
-    <af-email af-label="Spouse Email" />
+    <af-name label="Spouse Name" />
+    <af-email label="Spouse Email" />
   </af-fieldset>
 
   <af-fieldset type="Individual" af-name="parent" af-title="Parent">
-    <af-address af-label="Address" />
+    <af-address label="Address" />
   </af-fieldset>
 
 </af-form>
@@ -89,25 +89,25 @@
   <af-model
     type="Individual"
     af-name="parent"
-    af-label="Parent"
+    label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
     type="Individual"
     af-name="spouse"
-    af-label="Spouse"
+    label="Spouse"
     af-contact-relationship="['Spouse of', 'parent']"
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
   <af-fieldset af-name="parent">
-    <af-name af-label="Name" />
-    <af-email af-label="Email" />
+    <af-name label="Name" />
+    <af-email label="Email" />
   </af-fieldset>
 
   <af-fieldset af-name="spouse">
-    <af-name af-label="Spouse Name" />
-    <af-email af-label="Spouse Email" only-primary="true" />
+    <af-name label="Spouse Name" />
+    <af-email label="Spouse Email" only-primary="true" />
   </af-fieldset>
 
   <p ng-if="spouse.display_name.contains('Thor')">
@@ -115,7 +115,7 @@
   </p>
 
   <af-fieldset af-name="parent">
-    <af-address af-label="Address" />
+    <af-address label="Address" />
   </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
@@ -134,7 +134,7 @@
   <!--<af-model -->
     <!--type="Email"-->
     <!--af-name="email"-->
-    <!--af-label="Emails"-->
+    <!--label="Emails"-->
     <!--af-api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
   <!--/>-->
   <!--<af-fieldset af-name="email">-->
@@ -151,13 +151,13 @@
   <af-model
     type="Individual"
     af-name="parent"
-    af-label="Parent"
+    label="Parent"
     af-api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
     type="Individual"
     af-name="spouse"
-    af-label="Spouse"
+    label="Spouse"
     af-contact-relationship="['Spouse of', 'parent']"
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
@@ -165,15 +165,15 @@
   <crm-ui-tab-set>
     <crm-ui-tab title="About You">
       <af-fieldset af-name="parent">
-        <af-std-contact-name af-label="Name" />
-        <af-std-contact-email af-label="Email" />
+        <af-std-contact-name label="Name" />
+        <af-std-contact-email label="Email" />
         <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
       </af-fieldset>
     </crm-ui-tab>
     <crm-ui-tab title="Spouse">
       <af-fieldset af-name="spouse">
-        <af-std-contact-name af-label="Spouse Name" />
-        <af-std-contact-email af-label="Spouse Email" only-primary="true" />
+        <af-std-contact-name label="Spouse Name" />
+        <af-std-contact-email label="Spouse Email" only-primary="true" />
         <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
       </af-fieldset>
     </crm-ui-tab>
@@ -184,7 +184,7 @@
   </p>
 
   <af-fieldset af-name="parent">
-    <af-block-contact-address af-label="Address" />
+    <af-block-contact-address label="Address" />
   </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 81e94a6bb12c..4550e83047ec 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,29 +1,29 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model type="Contact" af-name="parent" af-label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
-  <af-model type="Contact" af-name="spouse" af-label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model>
-  <af-model type="Contact" af-name="home" af-label="Home"></af-model>
+  <af-model type="Contact" af-name="parent" label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
+  <af-model type="Contact" af-name="spouse" label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model>
+  <af-model type="Contact" af-name="home" label="Home"></af-model>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
   <af-fieldset af-name="parent">
-    <af-block-contact-name af-label="My Name" />
-    <af-block-contact-email af-label="My Email" />
+    <af-block-contact-name label="My Name" />
+    <af-block-contact-email label="My Email" />
     <af-field field-name="do_not_email" />
   </af-fieldset>
 
   <af-fieldset af-name="spouse">
-    <af-block-contact-name af-label="Spouse Name" />
-    <af-block-contact-email af-label="Spouse Email" only-primary="true" />
+    <af-block-contact-name label="Spouse Name" />
+    <af-block-contact-email label="Spouse Email" only-primary="true" />
     <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
   </af-fieldset>
 
   <af-fieldset af-name="home">
-    <af-block-contact-name af-label="Home Name" />
+    <af-block-contact-name label="Home Name" />
   </af-fieldset>
 
   <af-fieldset af-name="parent">
-    <af-block-contact-address af-label="My Address" />
+    <af-block-contact-address label="My Address" />
   </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->

From ddb148715ea0fc5bb28c3c64ab7b639d77506486 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:36:06 -0400
Subject: [PATCH 452/834] (af-model) Rename "af-autofill" to "autofill"

---
 ext/afform/core/Civi/Api4/Action/Afform/Prefill.php | 4 ++--
 ext/afform/core/ang/af/Form.js                      | 2 +-
 ext/afform/core/ang/af/Model.js                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index b8babb67d781..f3adcead23d7 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -17,8 +17,8 @@ protected function processForm() {
         $this->loadEntity($entity, $this->args[$entityName]);
       }
       // Load entities from autofill settings
-      elseif (!empty($entity['af-autofill'])) {
-        $this->autofillEntity($entity, $entity['af-autofill']);
+      elseif (!empty($entity['autofill'])) {
+        $this->autofillEntity($entity, $entity['autofill']);
       }
     }
     $data = [];
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 48ea2696e62d..0b3f5a0cfffa 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -40,7 +40,7 @@
         this.loadData = function() {
           var toLoad = 0;
           _.each(schema, function(entity, entityName) {
-            if ($routeParams[entityName] || entity.afAutofill) {
+            if ($routeParams[entityName] || entity.autofill) {
               toLoad++;
             }
           });
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
index 545ebf7f2ff2..180f8784a090 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -9,7 +9,7 @@
       afData: '=',
       afName: '@',
       label: '@',
-      afAutofill: '@'
+      autofill: '@'
     };
     return {
       restrict: 'AE',

From c3ac9bff05767552a66198db68a5c7e45e7ec516 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:38:38 -0400
Subject: [PATCH 453/834] (af-model) Rename "af-data" to "data"

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 2 +-
 ext/afform/core/ang/af/Form.js           | 4 ++--
 ext/afform/core/ang/af/Model.js          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index e957e5cba071..2039aa57ee2a 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -24,7 +24,7 @@ class CRM_Afform_ArrayHtml {
     'af-model' => [
       'af-name' => 'text',
       'af-entity' => 'text',
-      'af-data' => 'js',
+      'data' => 'js',
     ],
     'af-field' => [
       'field-name' => 'text',
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 0b3f5a0cfffa..2ebd7867fa19 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -22,7 +22,7 @@
 
         this.registerEntity = function registerEntity(entity) {
           schema[entity.afName] = entity;
-          data[entity.afName] = entity.afData || {};
+          data[entity.afName] = entity.data || {};
         };
         this.registerField = function(entityName, fieldName) {
           schema[entityName].fields.push(fieldName);
@@ -48,7 +48,7 @@
             crmApi4('Afform', 'prefill', {name: CRM.afform.open, args: $routeParams})
               .then(function(result) {
                 _.each(result, function(item) {
-                  data[item.name] = _.extend(item.values, schema[item.name].afData || {});
+                  data[item.name] = _.extend(item.values, schema[item.name].data || {});
                 });
               });
           }
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
index 180f8784a090..21e442dfa2e7 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -6,7 +6,7 @@
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
       type: '@',
-      afData: '=',
+      data: '=',
       afName: '@',
       label: '@',
       autofill: '@'

From eeedadfa953ce94d6b15150e7e9eb809e5619f98 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:40:30 -0400
Subject: [PATCH 454/834] Rename speculative attributes af-api4-params and
 af-contact-relationship

---
 ext/afform/docs/sandbox/planning-v0.3.md | 10 +++++-----
 ext/afform/mock/ang/afex.aff.html        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index 00751898758e..e8ea3ab28773 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -90,13 +90,13 @@
     type="Individual"
     af-name="parent"
     label="Parent"
-    af-api4-params="{where: ['id','=', routeParams.cid]}"
+    api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
     type="Individual"
     af-name="spouse"
     label="Spouse"
-    af-contact-relationship="['Spouse of', 'parent']"
+    contact-relationship="['Spouse of', 'parent']"
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
@@ -135,7 +135,7 @@
     <!--type="Email"-->
     <!--af-name="email"-->
     <!--label="Emails"-->
-    <!--af-api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
+    <!--api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
   <!--/>-->
   <!--<af-fieldset af-name="email">-->
     <!---->
@@ -152,13 +152,13 @@
     type="Individual"
     af-name="parent"
     label="Parent"
-    af-api4-params="{where: ['id','=', routeParams.cid]}"
+    api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
     type="Individual"
     af-name="spouse"
     label="Spouse"
-    af-contact-relationship="['Spouse of', 'parent']"
+    contact-relationship="['Spouse of', 'parent']"
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 4550e83047ec..ef5d156df5d5 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,7 +1,7 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model type="Contact" af-name="parent" label="Parent" af-api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
-  <af-model type="Contact" af-name="spouse" label="Spouse" af-contact-relationship="['Spouse of', 'parent']"></af-model>
+  <af-model type="Contact" af-name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
+  <af-model type="Contact" af-name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']"></af-model>
   <af-model type="Contact" af-name="home" label="Home"></af-model>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->

From a715f6d4f4f65f1a603441e21c5e11aab5d49bc0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:43:09 -0400
Subject: [PATCH 455/834] (af-field) Rename "field-defn" to "defn"

---
 ext/afform/auditor/backlog.md                               | 2 +-
 ext/afform/core/CRM/Afform/ArrayHtml.php                    | 2 +-
 ext/afform/core/afform.php                                  | 4 ++--
 ext/afform/core/ang/afField/afField.html                    | 6 +++---
 ext/afform/core/ang/afField/afField.js                      | 6 +++---
 ext/afform/core/ang/afField/widgets/CheckBox.html           | 6 +++---
 ext/afform/core/ang/afField/widgets/Date.html               | 2 +-
 ext/afform/core/ang/afField/widgets/Radio.html              | 2 +-
 ext/afform/core/ang/afField/widgets/Select.html             | 2 +-
 .../mock/tests/phpunit/api/v4/formatExamples/banana.php     | 6 +++---
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index bdd7a71f56d7..ed5941e9760e 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -12,7 +12,7 @@ validator to catch. Loosely/informally:
 * `<af-field>` should reference legit fields.
     * Future consideration: how to validate when it's part of a subform?
 * `<af-fieldset>` should reference a declared model.
-* `<af-field field-defn="...">` should contain an object.
+* `<af-field defn="...">` should contain an object.
 * `<a>` should have `href` or `ng-click` or `af-api4-action`
 * Accept a restricted subset of HTML (e.g. `p h1 h2 h3` but not `script` or `[onclick]`)
 * Accept a restricted subset of BootstrapCSS
diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 2039aa57ee2a..7c24e5303588 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -28,7 +28,7 @@ class CRM_Afform_ArrayHtml {
     ],
     'af-field' => [
       'field-name' => 'text',
-      'field-defn' => 'js',
+      'defn' => 'js',
     ],
     'af-fieldset' => [
       'af-name' => 'text',
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index cf1189520d42..714196b319db 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -194,7 +194,7 @@ function afform_civicrm_alterAngular($angular) {
         ]);
         // Merge field definition data with whatever's already in the markup
         foreach ($getFields as $field) {
-          $existingFieldDefn = trim(pq($afField)->attr('field-defn') ?: '');
+          $existingFieldDefn = trim(pq($afField)->attr('defn') ?: '');
           if ($existingFieldDefn && $existingFieldDefn[0] != '{') {
             // If it's not an object, don't mess with it.
             continue;
@@ -205,7 +205,7 @@ function afform_civicrm_alterAngular($angular) {
           if ($existingFieldDefn) {
             $field = array_merge($field, CRM_Utils_JS::getRawProps($existingFieldDefn));
           }
-          pq($afField)->attr('field-defn', CRM_Utils_JS::writeObject($field));
+          pq($afField)->attr('defn', CRM_Utils_JS::writeObject($field));
         }
       }
     });
diff --git a/ext/afform/core/ang/afField/afField.html b/ext/afform/core/ang/afField/afField.html
index f54a4bfede97..30fd1ed6a79e 100644
--- a/ext/afform/core/ang/afField/afField.html
+++ b/ext/afform/core/ang/afField/afField.html
@@ -1,4 +1,4 @@
-<label class="crm-af-field-label" ng-if="fieldDefn.title" for="{{ fieldId }}">
-  {{ fieldDefn.title }}
+<label class="crm-af-field-label" ng-if="defn.title" for="{{ fieldId }}">
+  {{ defn.title }}
 </label>
-<div class="crm-af-field" ng-include="'~/afField/widgets/' + fieldDefn.input_type + '.html'"></div>
+<div class="crm-af-field" ng-include="'~/afField/widgets/' + defn.input_type + '.html'"></div>
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 42a4ae56e28e..63b79967f604 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -7,7 +7,7 @@
       templateUrl: '~/afField/afField.html',
       scope: {
         fieldName: '@',
-        fieldDefn: '='
+        defn: '='
       },
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform');
@@ -17,12 +17,12 @@
         $scope.getData = $scope.afFieldset.getData;
 
         $scope.getOptions = function() {
-          return _.transform($scope.fieldDefn.options, function(result, val, key) {
+          return _.transform($scope.defn.options, function(result, val, key) {
             result.push({id: key, text: val});
           }, []);
         };
 
-        $el.addClass('af-field-type-' + _.kebabCase($scope.fieldDefn.input_type));
+        $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
       }
     };
   });
diff --git a/ext/afform/core/ang/afField/widgets/CheckBox.html b/ext/afform/core/ang/afField/widgets/CheckBox.html
index d4401cc1d89b..f652a022da40 100644
--- a/ext/afform/core/ang/afField/widgets/CheckBox.html
+++ b/ext/afform/core/ang/afField/widgets/CheckBox.html
@@ -1,7 +1,7 @@
-<ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="fieldDefn.options">
-  <li ng-repeat="(key, val) in fieldDefn.options" >
+<ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="defn.options">
+  <li ng-repeat="(key, val) in defn.options" >
     <input type="checkbox" checklist-model="getData()[fieldName]" id="{{ fieldId + key }}" checklist-value="key" />
     <label for="{{ fieldId + key }}">{{ val }}</label>
   </li>
 </ul>
-<input type="checkbox" ng-if="!fieldDefn.options" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Date.html b/ext/afform/core/ang/afField/widgets/Date.html
index 21d59e7a0bb2..8e46274415af 100644
--- a/ext/afform/core/ang/afField/widgets/Date.html
+++ b/ext/afform/core/ang/afField/widgets/Date.html
@@ -1 +1 @@
-<input crm-ui-datepicker="fieldDefn.input_attrs" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-datepicker="defn.input_attrs" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Radio.html b/ext/afform/core/ang/afField/widgets/Radio.html
index 114978550940..c20d3daf0384 100644
--- a/ext/afform/core/ang/afField/widgets/Radio.html
+++ b/ext/afform/core/ang/afField/widgets/Radio.html
@@ -1,4 +1,4 @@
-<label ng-repeat="(key, val) in fieldDefn.options" >
+<label ng-repeat="(key, val) in defn.options" >
   <input class="crm-form-radio" type="radio" ng-model="getData()[fieldName]" value="{{ key }}" />
   {{ val }}
 </label>
diff --git a/ext/afform/core/ang/afField/widgets/Select.html b/ext/afform/core/ang/afField/widgets/Select.html
index 298c16f9bf3d..e59b2c724e89 100644
--- a/ext/afform/core/ang/afField/widgets/Select.html
+++ b/ext/afform/core/ang/afField/widgets/Select.html
@@ -1 +1 @@
-<input crm-ui-select="{data: getOptions(), multiple: fieldDefn.input_attrs.multiple}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-select="{data: getOptions(), multiple: defn.input_attrs.multiple}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index 7b75b8b9afe2..5d3441133efc 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-  'html' => '<div><strong>New text!</strong><af-field field-name="do_not_sms" field-defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
+  'html' => '<div><strong>New text!</strong><af-field field-name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
   'shallow' => [
     '#tag' => 'div',
     '#children' => [
       ['#tag' => 'strong', '#children' => ['New text!']],
-      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => "{label: 'Do not do any of the emailing'}"],
+      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
     ],
   ],
   'deep' => [
     '#tag' => 'div',
     '#children' => [
       ['#tag' => 'strong', '#children' => ['New text!']],
-      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'field-defn' => ['label' => 'Do not do any of the emailing']],
+      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
     ],
   ],
 ];

From 0eaa6e27f2844abd1b25345f0e17df330baca78d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 12:55:26 -0400
Subject: [PATCH 456/834] (af-field) Rename "field-name" to "name"

---
 ext/afform/core/CRM/Afform/ArrayHtml.php                    | 2 +-
 ext/afform/core/Civi/Api4/Action/Afform/Prefill.php         | 2 +-
 ext/afform/core/afform.php                                  | 2 +-
 ext/afform/core/ang/af/Fieldset.js                          | 2 +-
 ext/afform/core/ang/afField/afField.js                      | 4 ++--
 ext/afform/core/ang/afField/widgets/CheckBox.html           | 2 +-
 ext/afform/docs/sandbox/planning-v0.3.md                    | 4 ++--
 ext/afform/mock/ang/afex.aff.html                           | 4 ++--
 .../mock/tests/phpunit/api/v4/formatExamples/banana.php     | 6 +++---
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 7c24e5303588..acf0ac6fcc09 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -27,7 +27,7 @@ class CRM_Afform_ArrayHtml {
       'data' => 'js',
     ],
     'af-field' => [
-      'field-name' => 'text',
+      'name' => 'text',
       'defn' => 'js',
     ],
     'af-fieldset' => [
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index f3adcead23d7..0a05e550de13 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -46,7 +46,7 @@ private function loadEntity($entity, $id) {
     }
     $result = civicrm_api4($entity['type'], 'get', [
       'where' => [['id', '=', $id]],
-      'select' => array_column($entity['fields'], 'field-name'),
+      'select' => array_column($entity['fields'], 'name'),
       'checkPermissions' => $checkPermissions,
     ]);
     if ($result->first()) {
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 714196b319db..ae148d8bd081 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -181,7 +181,7 @@ function afform_civicrm_alterAngular($angular) {
 
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
-        $fieldName = $afField->getAttribute('field-name');
+        $fieldName = $afField->getAttribute('name');
         $entityName = pq($afField)->parent('af-fieldset[af-name]')->attr('af-name'); // TEST ME
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index 60b61e0942c9..6afe95b664cc 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -12,7 +12,7 @@
         $scope.afFormCtrl = afFormCtrl;
         // This is faster than waiting for each field directive to register itself
         $('af-field', $el).each(function() {
-          afFormCtrl.registerField($scope.afName, $(this).attr('field-name'))
+          afFormCtrl.registerField($scope.afName, $(this).attr('name'))
         });
       },
       controller: function($scope){
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 63b79967f604..fb618405af5e 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -1,12 +1,12 @@
 (function(angular, $, _) {
-  // Example usage: <af-fieldset af-name="myModel"><af-field field-name="do_not_email" /></af-fieldset>
+  // Example usage: <af-fieldset af-name="myModel"><af-field name="do_not_email" /></af-fieldset>
   angular.module('afField').directive('afField', function() {
     return {
       restrict: 'E',
       require: ['^afFieldset', '^afForm'],
       templateUrl: '~/afField/afField.html',
       scope: {
-        fieldName: '@',
+        fieldName: '@name', // TEST ME
         defn: '='
       },
       link: function($scope, $el, $attr, ctrls) {
diff --git a/ext/afform/core/ang/afField/widgets/CheckBox.html b/ext/afform/core/ang/afField/widgets/CheckBox.html
index f652a022da40..bf0bd8bb9e6a 100644
--- a/ext/afform/core/ang/afField/widgets/CheckBox.html
+++ b/ext/afform/core/ang/afField/widgets/CheckBox.html
@@ -1,6 +1,6 @@
 <ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="defn.options">
   <li ng-repeat="(key, val) in defn.options" >
-    <input type="checkbox" checklist-model="getData()[fieldName]" id="{{ fieldId + key }}" checklist-value="key" />
+    <input type="checkbox" checklist-model="getData()[name]" id="{{ fieldId + key }}" checklist-value="key" />
     <label for="{{ fieldId + key }}">{{ val }}</label>
   </li>
 </ul>
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index e8ea3ab28773..d7daf040cc08 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -167,14 +167,14 @@
       <af-fieldset af-name="parent">
         <af-std-contact-name label="Name" />
         <af-std-contact-email label="Email" />
-        <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+        <af-field name="do_not_email" field-type="checkbox" field-default="1" />
       </af-fieldset>
     </crm-ui-tab>
     <crm-ui-tab title="Spouse">
       <af-fieldset af-name="spouse">
         <af-std-contact-name label="Spouse Name" />
         <af-std-contact-email label="Spouse Email" only-primary="true" />
-        <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+        <af-field name="do_not_email" field-type="checkbox" field-default="1" />
       </af-fieldset>
     </crm-ui-tab>
   </crm-ui-tab-set>
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index ef5d156df5d5..edbd2b3baeb8 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -9,13 +9,13 @@
   <af-fieldset af-name="parent">
     <af-block-contact-name label="My Name" />
     <af-block-contact-email label="My Email" />
-    <af-field field-name="do_not_email" />
+    <af-field name="do_not_email" />
   </af-fieldset>
 
   <af-fieldset af-name="spouse">
     <af-block-contact-name label="Spouse Name" />
     <af-block-contact-email label="Spouse Email" only-primary="true" />
-    <af-field field-name="do_not_email" field-type="checkbox" field-default="1" />
+    <af-field name="do_not_email" field-type="checkbox" field-default="1" />
   </af-fieldset>
 
   <af-fieldset af-name="home">
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index 5d3441133efc..af5c134adf9e 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,19 +1,19 @@
 <?php
 
 return [
-  'html' => '<div><strong>New text!</strong><af-field field-name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
+  'html' => '<div><strong>New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
   'shallow' => [
     '#tag' => 'div',
     '#children' => [
       ['#tag' => 'strong', '#children' => ['New text!']],
-      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
+      ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
     ],
   ],
   'deep' => [
     '#tag' => 'div',
     '#children' => [
       ['#tag' => 'strong', '#children' => ['New text!']],
-      ['#tag' => 'af-field', 'field-name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
+      ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
     ],
   ],
 ];

From 8410442c139aa5159ed74338e96f34d91b41b59f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 13:13:44 -0400
Subject: [PATCH 457/834] Rename `[af-name]` to `af-model[name]` and
 `af-fieldset[model]`

---
 ext/afform/core/CRM/Afform/ArrayHtml.php      |  6 ++--
 ext/afform/core/Civi/Afform/Utils.php         |  4 +--
 .../core/Civi/Api4/Action/Afform/Prefill.php  |  6 ++--
 ext/afform/core/afform.php                    |  4 +--
 ext/afform/core/ang/af/Fieldset.js            | 12 +++----
 ext/afform/core/ang/af/Form.js                |  4 +--
 ext/afform/core/ang/af/Model.js               |  4 +--
 ext/afform/core/ang/afBlock/ContactEmail.html |  2 +-
 ext/afform/core/ang/afBlock/ContactName.html  |  2 +-
 ext/afform/core/ang/afBlock/ContactName.js    |  2 +-
 ext/afform/core/ang/afField/afField.js        |  4 +--
 ext/afform/docs/sandbox/planning-v0.3.md      | 36 +++++++++----------
 ext/afform/mock/ang/afex.aff.html             | 14 ++++----
 13 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index acf0ac6fcc09..0a536f829b01 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -22,7 +22,7 @@ class CRM_Afform_ArrayHtml {
       '*' => 'text',
     ],
     'af-model' => [
-      'af-name' => 'text',
+      'name' => 'text',
       'af-entity' => 'text',
       'data' => 'js',
     ],
@@ -31,7 +31,7 @@ class CRM_Afform_ArrayHtml {
       'defn' => 'js',
     ],
     'af-fieldset' => [
-      'af-name' => 'text',
+      'model' => 'text',
     ],
   ];
 
@@ -160,7 +160,7 @@ public function convertNodeToArray($node) {
    * @param string $tag
    *   Ex: 'af-model'
    * @param string $attrName
-   *   Ex: 'af-name'
+   *   Ex: 'label'
    * @return string
    *   Ex: 'text' or 'js'
    */
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
index 9095ed020834..d343894dc8ba 100644
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -11,7 +11,7 @@ class Utils {
    * @return array
    */
   public static function getEntities($layout) {
-    $entities = array_column(self::getTags($layout, 'af-model'), NULL, 'af-name');
+    $entities = array_column(self::getTags($layout, 'af-model'), NULL, 'name');
     self::getFields($layout, $entities);
     return $entities;
   }
@@ -41,7 +41,7 @@ public static function getTags($collection, $tagName) {
   protected static function getFields($layout, &$entities) {
     foreach ($layout['#children'] as $child) {
       if ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
-        $entities[$child['af-name']]['fields'] = array_merge($entities[$child['af-name']]['fields'] ?? [], self::getTags($child, 'af-field'));
+        $entities[$child['model']]['fields'] = array_merge($entities[$child['model']]['fields'] ?? [], self::getTags($child, 'af-field'));
       }
       elseif (!empty($child['#children'])) {
         self::getFields($child['#children'], $entities);
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index 0a05e550de13..f7c64d77ca92 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -37,9 +37,9 @@ protected function processForm() {
    */
   private function loadEntity($entity, $id) {
     $checkPermissions = TRUE;
-    if ($entity['type'] == 'Contact' && !empty($this->args[$entity['af-name'] . '-cs'])) {
+    if ($entity['type'] == 'Contact' && !empty($this->args[$entity['name'] . '-cs'])) {
       $checkSum = civicrm_api4('Contact', 'validateChecksum', [
-        'checksum' => $this->args[$entity['af-name'] . '-cs'],
+        'checksum' => $this->args[$entity['name'] . '-cs'],
         'contactId' => $id,
       ]);
       $checkPermissions = empty($checkSum[0]['valid']);
@@ -50,7 +50,7 @@ private function loadEntity($entity, $id) {
       'checkPermissions' => $checkPermissions,
     ]);
     if ($result->first()) {
-      $this->_data[$entity['af-name']] = $result->first();
+      $this->_data[$entity['name']] = $result->first();
     }
   }
 
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index ae148d8bd081..6eb602bc1fde 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -182,7 +182,7 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $fieldName = $afField->getAttribute('name');
-        $entityName = pq($afField)->parent('af-fieldset[af-name]')->attr('af-name'); // TEST ME
+        $entityName = pq($afField)->parent('af-fieldset[model]')->attr('model'); // TEST ME
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
@@ -215,7 +215,7 @@ function afform_civicrm_alterAngular($angular) {
 function _afform_getMetadata(phpQueryObject $doc) {
   $entities = [];
   foreach ($doc->find('af-model') as $afmModelProp) {
-    $entities[$afmModelProp->getAttribute('af-name')] = [
+    $entities[$afmModelProp->getAttribute('name')] = [
       'type' => $afmModelProp->getAttribute('type'),
     ];
   }
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index 6afe95b664cc..72e6e5481da3 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -1,30 +1,30 @@
 (function(angular, $, _) {
   // "afFieldset" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-fieldset af-name="myModel">...</af-fieldset> ...</af-form>
+  // Example usage: <af-form>... <af-fieldset model="myModel">...</af-fieldset> ...</af-form>
   angular.module('af').directive('afFieldset', function() {
     return {
       restrict: 'AE',
       require: '^afForm',
       scope: {
-        afName: '@'
+        modelName: '@model'
       },
       link: function($scope, $el, $attr, afFormCtrl) {
         $scope.afFormCtrl = afFormCtrl;
         // This is faster than waiting for each field directive to register itself
         $('af-field', $el).each(function() {
-          afFormCtrl.registerField($scope.afName, $(this).attr('name'))
+          afFormCtrl.registerField($scope.modelName, $(this).attr('name'))
         });
       },
       controller: function($scope){
         this.getDefn = function getDefn() {
-          return $scope.afFormCtrl.getEntity($scope.afName);
+          return $scope.afFormCtrl.getEntity($scope.modelName);
           // return $scope.modelDefn;
         };
         this.getData = function getData() {
-          return $scope.afFormCtrl.getData($scope.afName);
+          return $scope.afFormCtrl.getData($scope.modelName);
         };
         this.getName = function() {
-          return $scope.afName;
+          return $scope.modelName;
         }
       }
     };
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 2ebd7867fa19..a8196bfccd6b 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -21,8 +21,8 @@
         $scope.myCtrl = this;
 
         this.registerEntity = function registerEntity(entity) {
-          schema[entity.afName] = entity;
-          data[entity.afName] = entity.data || {};
+          schema[entity.modelName] = entity;
+          data[entity.modelName] = entity.data || {};
         };
         this.registerField = function(entityName, fieldName) {
           schema[entityName].fields.push(fieldName);
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Model.js
index 21e442dfa2e7..b7390a43ff83 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Model.js
@@ -1,13 +1,13 @@
 (function(angular, $, _) {
   // "afModel" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-model af-name="myModel" type="Individual" /> ...</af-form>
+  // Example usage: <af-form>... <af-model name="myModel" type="Individual" /> ...</af-form>
   angular.module('af').directive('afModel', function() {
     // Whitelist of all allowed properties of an af-fieldset
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
       type: '@',
       data: '=',
-      afName: '@',
+      modelName: '@name',
       label: '@',
       autofill: '@'
     };
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.html b/ext/afform/core/ang/afBlock/ContactEmail.html
index 0a451eb5b894..295dcbada0d8 100644
--- a/ext/afform/core/ang/afBlock/ContactEmail.html
+++ b/ext/afform/core/ang/afBlock/ContactEmail.html
@@ -1 +1 @@
-<div>{{ts('Contact email block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().afName})}}</div>
+<div>{{ts('Contact email block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().modelName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
index f99155662527..541edcc84dfd 100644
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -1 +1 @@
-<div>{{ts('Contact name block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().afName})}}</div>
+<div>{{ts('Contact name block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().modelName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactName.js b/ext/afform/core/ang/afBlock/ContactName.js
index da68c0b45b3f..46cb10441901 100644
--- a/ext/afform/core/ang/afBlock/ContactName.js
+++ b/ext/afform/core/ang/afBlock/ContactName.js
@@ -1,5 +1,5 @@
 (function(angular, $, _) {
-  // Example usage: <af-fieldset af-name="myModel"><af-block-contact-name /></af-fieldset>
+  // Example usage: <af-fieldset model="myModel"><af-block-contact-name /></af-fieldset>
   angular.module('afBlock').directive('afBlockContactName', function() {
     return {
       restrict: 'AE',
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index fb618405af5e..4a3c9b1a968f 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -1,5 +1,5 @@
 (function(angular, $, _) {
-  // Example usage: <af-fieldset af-name="myModel"><af-field name="do_not_email" /></af-fieldset>
+  // Example usage: <af-fieldset model="myModel"><af-field name="do_not_email" /></af-fieldset>
   angular.module('afField').directive('afField', function() {
     return {
       restrict: 'E',
@@ -13,7 +13,7 @@
         var ts = $scope.ts = CRM.ts('afform');
         $scope.afFieldset = ctrls[0];
         var modelList = ctrls[1];
-        $scope.fieldId = $scope.afFieldset.getDefn().afName + '-' + $scope.fieldName;
+        $scope.fieldId = $scope.afFieldset.getDefn().modelName + '-' + $scope.fieldName;
         $scope.getData = $scope.afFieldset.getData;
 
         $scope.getOptions = function() {
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index d7daf040cc08..cce1eb460167 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -42,17 +42,17 @@
 ```html
 <div afform-entity-ctrl="myEntities">
 
-  <af-entity type="Individual" af-name="parent" label="Parent">
+  <af-entity type="Individual" name="parent" label="Parent">
     <af-name label="Name" />
     <af-email label="Email" />
   </af-entity>
   
-  <af-entity type="Individual" af-name="spouse" af-title="Spouse">
+  <af-entity type="Individual" name="spouse" af-title="Spouse">
     <af-name label="Spouse Name" />
     <af-email label="Spouse Email" />
   </af-entity>
 
-  <af-entity type="Individual" af-name="parent" af-title="Parent">
+  <af-entity type="Individual" name="parent" af-title="Parent">
     <af-address label="Address" />
   </af-entity>
 
@@ -65,17 +65,17 @@
 <!-- 1. s/entity/model-->
 <af-form>
 
-  <af-fieldset type="Individual" af-name="parent" label="Parent">
+  <af-fieldset type="Individual" model="parent" label="Parent">
     <af-name label="Name" />
     <af-email label="Email" />
   </af-fieldset>
 
-  <af-fieldset type="Individual" af-name="spouse" af-title="Spouse">
+  <af-fieldset type="Individual" model="spouse" af-title="Spouse">
     <af-name label="Spouse Name" />
     <af-email label="Spouse Email" />
   </af-fieldset>
 
-  <af-fieldset type="Individual" af-name="parent" af-title="Parent">
+  <af-fieldset type="Individual" model="parent" af-title="Parent">
     <af-address label="Address" />
   </af-fieldset>
 
@@ -88,24 +88,24 @@
 <af-form ctrl="modelListCtrl">
   <af-model
     type="Individual"
-    af-name="parent"
+    name="parent"
     label="Parent"
     api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
     type="Individual"
-    af-name="spouse"
+    name="spouse"
     label="Spouse"
     contact-relationship="['Spouse of', 'parent']"
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
-  <af-fieldset af-name="parent">
+  <af-fieldset model="parent">
     <af-name label="Name" />
     <af-email label="Email" />
   </af-fieldset>
 
-  <af-fieldset af-name="spouse">
+  <af-fieldset model="spouse">
     <af-name label="Spouse Name" />
     <af-email label="Spouse Email" only-primary="true" />
   </af-fieldset>
@@ -114,7 +114,7 @@
     Your spouse should go to the gym.
   </p>
 
-  <af-fieldset af-name="parent">
+  <af-fieldset model="parent">
     <af-address label="Address" />
   </af-fieldset>
 
@@ -133,11 +133,11 @@
 <!--<af-form>-->
   <!--<af-model -->
     <!--type="Email"-->
-    <!--af-name="email"-->
+    <!--name="email"-->
     <!--label="Emails"-->
     <!--api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
   <!--/>-->
-  <!--<af-fieldset af-name="email">-->
+  <!--<af-fieldset model="email">-->
     <!---->
   <!--</af-fieldset>-->
 <!--</af-form>-->
@@ -150,13 +150,13 @@
 <af-form ctrl="modelListCtrl">
   <af-model
     type="Individual"
-    af-name="parent"
+    name="parent"
     label="Parent"
     api4-params="{where: ['id','=', routeParams.cid]}"
   />
   <af-model
     type="Individual"
-    af-name="spouse"
+    name="spouse"
     label="Spouse"
     contact-relationship="['Spouse of', 'parent']"
   />
@@ -164,14 +164,14 @@
 
   <crm-ui-tab-set>
     <crm-ui-tab title="About You">
-      <af-fieldset af-name="parent">
+      <af-fieldset model="parent">
         <af-std-contact-name label="Name" />
         <af-std-contact-email label="Email" />
         <af-field name="do_not_email" field-type="checkbox" field-default="1" />
       </af-fieldset>
     </crm-ui-tab>
     <crm-ui-tab title="Spouse">
-      <af-fieldset af-name="spouse">
+      <af-fieldset model="spouse">
         <af-std-contact-name label="Spouse Name" />
         <af-std-contact-email label="Spouse Email" only-primary="true" />
         <af-field name="do_not_email" field-type="checkbox" field-default="1" />
@@ -183,7 +183,7 @@
     Your spouse should go to the gym.
   </p>
 
-  <af-fieldset af-name="parent">
+  <af-fieldset model="parent">
     <af-block-contact-address label="Address" />
   </af-fieldset>
 
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index edbd2b3baeb8..3a6af7918293 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,28 +1,28 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model type="Contact" af-name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
-  <af-model type="Contact" af-name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']"></af-model>
-  <af-model type="Contact" af-name="home" label="Home"></af-model>
+  <af-model type="Contact" name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
+  <af-model type="Contact" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']"></af-model>
+  <af-model type="Contact" name="home" label="Home"></af-model>
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
-  <af-fieldset af-name="parent">
+  <af-fieldset model="parent">
     <af-block-contact-name label="My Name" />
     <af-block-contact-email label="My Email" />
     <af-field name="do_not_email" />
   </af-fieldset>
 
-  <af-fieldset af-name="spouse">
+  <af-fieldset model="spouse">
     <af-block-contact-name label="Spouse Name" />
     <af-block-contact-email label="Spouse Email" only-primary="true" />
     <af-field name="do_not_email" field-type="checkbox" field-default="1" />
   </af-fieldset>
 
-  <af-fieldset af-name="home">
+  <af-fieldset model="home">
     <af-block-contact-name label="Home Name" />
   </af-fieldset>
 
-  <af-fieldset af-name="parent">
+  <af-fieldset model="parent">
     <af-block-contact-address label="My Address" />
   </af-fieldset>
 

From d12e1e7602de16ce3b6dc15e375ebe828c4a0db4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 13:14:54 -0400
Subject: [PATCH 458/834] (CRM_Afform_ArrayHtml) Fix errant reference

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 0a536f829b01..7a4e7b76bd7a 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -23,7 +23,7 @@ class CRM_Afform_ArrayHtml {
     ],
     'af-model' => [
       'name' => 'text',
-      'af-entity' => 'text',
+      'type' => 'text',
       'data' => 'js',
     ],
     'af-field' => [

From e1aef3ed5b532f31a1ef86f4c5cea7e807e7b5d1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 13 Sep 2019 20:03:35 -0400
Subject: [PATCH 459/834] Add mock testAfform

---
 ext/afform/core/afform.php              |  2 +-
 ext/afform/mock/ang/testAfform.aff.html | 27 +++++++++++++++++++++++++
 ext/afform/mock/ang/testAfform.aff.json |  7 +++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 ext/afform/mock/ang/testAfform.aff.html
 create mode 100644 ext/afform/mock/ang/testAfform.aff.json

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 6eb602bc1fde..9ea9da18f69c 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -182,7 +182,7 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $fieldName = $afField->getAttribute('name');
-        $entityName = pq($afField)->parent('af-fieldset[model]')->attr('model'); // TEST ME
+        $entityName = pq($afField)->parent('af-fieldset[model]')->attr('model');
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
new file mode 100644
index 000000000000..add785cd5824
--- /dev/null
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -0,0 +1,27 @@
+<af-form ctrl="modelListCtrl" >
+  <div crm-ui-debug="modelListCtrl.getEntity('parent')" />
+  <div crm-ui-debug="modelListCtrl.getData('parent')" />
+  <af-model type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
+  <af-model type="Contact" name="spouse" label="Spouse" url-autofill="1" />
+  <af-model type="Contact" name="home" label="Home" />
+
+  <af-fieldset model="parent">
+
+    <af-field name="first_name" defn='{title: ts("Your First Name")}' />
+    <af-field name="last_name" />
+    <af-field name="contact_sub_type" defn="{widget: hidden}" value="Student" />
+    <af-field name="gender_id" />
+    <af-field name="constituent_information.Marital_Status" />
+    <af-field name="constituent_information.Marriage_Date" />
+    <af-field name="constituent_information.Most_Important_Issue" />
+  </af-fieldset>
+
+  <af-fieldset model="spouse">
+    <af-field name="first_name" defn='{title: ts("Spouse First Name")}' />
+    <af-field name="last_name" />
+  </af-fieldset>
+
+  <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
+  <button ng-click="modelListCtrl.submit()">Submit</button>
+
+</af-form>
diff --git a/ext/afform/mock/ang/testAfform.aff.json b/ext/afform/mock/ang/testAfform.aff.json
new file mode 100644
index 000000000000..5fc368cbcf33
--- /dev/null
+++ b/ext/afform/mock/ang/testAfform.aff.json
@@ -0,0 +1,7 @@
+{
+  "server_route": "civicrm/test-afform",
+  "title": "This is a test",
+  "requires": [
+    "af", "afBlock", "afField", "afCore"
+  ]
+}

From 162631755c685d8d3fd2a9ef19438c58258dedb9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 20:23:16 -0400
Subject: [PATCH 460/834] Fix login error due to stale constant in
 afform_html_civicrm_check()

---
 ext/afform/html/afform_html.php      | 6 +++++-
 ext/afform/html/ang/afMoncao.ang.php | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ext/afform/html/afform_html.php b/ext/afform/html/afform_html.php
index fc81ca2ab417..f5fcfed3dab6 100644
--- a/ext/afform/html/afform_html.php
+++ b/ext/afform/html/afform_html.php
@@ -3,6 +3,10 @@
 require_once 'afform_html.civix.php';
 use CRM_AfformHtml_ExtensionUtil as E;
 
+if (!defined('AFFORM_HTML_MONACO')) {
+  define('AFFORM_HTML_MONACO', 'node_modules/monaco-editor/min/vs');
+}
+
 /**
  * Implements hook_civicrm_config().
  *
@@ -166,7 +170,7 @@ function afform_html_civicrm_navigationMenu(&$menu) {
  * Implements hook_civicrm_check().
  */
 function afform_html_civicrm_check(&$messages) {
-  $dir = E::path(CRM_AfformHtml_Page_HtmlEditor::MONACO_DIR);
+  $dir = E::path(AFFORM_HTML_MONACO);
   if (!file_exists($dir)) {
     $messages[] = new CRM_Utils_Check_Message(
       'afform_html_monaco',
diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMoncao.ang.php
index a1c6c88687b5..2f896db75d4f 100644
--- a/ext/afform/html/ang/afMoncao.ang.php
+++ b/ext/afform/html/ang/afMoncao.ang.php
@@ -5,7 +5,7 @@
 
 return array(
   'js' => [
-    'node_modules/monaco-editor/min/vs/loader.js',
+    AFFORM_HTML_MONACO . '/loader.js',
     'ang/afMoncao.js',
     //    'ang/afMoncao/*.js',
     //    'ang/afMoncao/*/*.js',
@@ -15,7 +15,7 @@
   'requires' => ['crmUi', 'crmUtil'],
   'settings' => [
     'paths' => [
-      'vs' => CRM_AfformHtml_ExtensionUtil::url('node_modules/monaco-editor/min/vs'),
+      'vs' => CRM_AfformHtml_ExtensionUtil::url(AFFORM_HTML_MONACO),
     ],
   ],
   'basePages' => [],

From 8981b6ac1b440a3410fd12b78cc22abbdb80d028 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 20:36:21 -0400
Subject: [PATCH 461/834] af/Form.js - Use the canonical name for API calls

---
 ext/afform/core/CRM/Afform/Page/AfformBase.php | 1 +
 ext/afform/core/ang/af/Form.js                 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 3d389528b605..8684e0431536 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -13,6 +13,7 @@ public function run() {
     $loader->setPageName(implode('/', $pagePath));
     $loader->getRes()->addSetting([
       'afform' => [
+        'name' => $pageArgs['afform'],
         'open' => _afform_angular_module_name($pageArgs['afform'], 'dash'),
       ],
     ]);
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index a8196bfccd6b..304ea43e0e2d 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -45,7 +45,7 @@
             }
           });
           if (toLoad) {
-            crmApi4('Afform', 'prefill', {name: CRM.afform.open, args: $routeParams})
+            crmApi4('Afform', 'prefill', {name: CRM.afform.name, args: $routeParams})
               .then(function(result) {
                 _.each(result, function(item) {
                   data[item.name] = _.extend(item.values, schema[item.name].data || {});
@@ -55,7 +55,7 @@
         };
 
         this.submit = function submit() {
-          crmApi4('Afform', 'submit', {name: CRM.afform.open, args: $routeParams, values: data});
+          crmApi4('Afform', 'submit', {name: CRM.afform.name, args: $routeParams, values: data});
         };
       }
     };

From 6d353d3b47eb938c62e7450efe85881805d81a84 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 20:43:49 -0400
Subject: [PATCH 462/834] afex.aff.html - Slightly more contemporary markup

---
 ext/afform/mock/ang/afex.aff.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 3a6af7918293..8596e3877b7c 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,8 +1,8 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model type="Contact" name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}"></af-model>
-  <af-model type="Contact" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']"></af-model>
-  <af-model type="Contact" name="home" label="Home"></af-model>
+  <af-model type="Contact" name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}" />
+  <af-model type="Contact" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
+  <af-model type="Contact" name="home" label="Home" />
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
@@ -15,7 +15,7 @@
   <af-fieldset model="spouse">
     <af-block-contact-name label="Spouse Name" />
     <af-block-contact-email label="Spouse Email" only-primary="true" />
-    <af-field name="do_not_email" field-type="checkbox" field-default="1" />
+    <af-field name="do_not_email" defn="{type: 'checkbox', default: 1}" />
   </af-fieldset>
 
   <af-fieldset model="home">

From 20f0ffe01a98db0ac5b47235f5fbf01f8af35bc6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 20:57:39 -0400
Subject: [PATCH 463/834] af/Form.js - Get the form name implicitly (without a
 global)

---
 ext/afform/core/CRM/Afform/Page/AfformBase.php | 1 -
 ext/afform/core/ang/af/Form.js                 | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 8684e0431536..3d389528b605 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -13,7 +13,6 @@ public function run() {
     $loader->setPageName(implode('/', $pagePath));
     $loader->getRes()->addSetting([
       'afform' => [
-        'name' => $pageArgs['afform'],
         'open' => _afform_angular_module_name($pageArgs['afform'], 'dash'),
       ],
     ]);
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 304ea43e0e2d..c5098391e6c8 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -37,6 +37,10 @@
         this.getSchema = function getSchema(name) {
           return schema[name];
         };
+        // Returns the 'meta' record ('name', 'description', etc) of the active form.
+        this.getFormMeta = function getFormMeta() {
+          return $scope.$parent.meta;
+        };
         this.loadData = function() {
           var toLoad = 0;
           _.each(schema, function(entity, entityName) {
@@ -45,7 +49,7 @@
             }
           });
           if (toLoad) {
-            crmApi4('Afform', 'prefill', {name: CRM.afform.name, args: $routeParams})
+            crmApi4('Afform', 'prefill', {name: this.getFormMeta().name, args: $routeParams})
               .then(function(result) {
                 _.each(result, function(item) {
                   data[item.name] = _.extend(item.values, schema[item.name].data || {});
@@ -55,7 +59,7 @@
         };
 
         this.submit = function submit() {
-          crmApi4('Afform', 'submit', {name: CRM.afform.name, args: $routeParams, values: data});
+          crmApi4('Afform', 'submit', {name: this.getFormMeta().name, args: $routeParams, values: data});
         };
       }
     };

From fb3888325736f2005668b4e69828da1c056a5430 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 21:59:06 -0400
Subject: [PATCH 464/834] Afform.submit - Use an event to allow the mix of
 prioritized special-case save methods

---
 .../Civi/Afform/Event/AfformSubmitEvent.php   | 54 ++++++++++++++++
 .../Api4/Action/Afform/AbstractProcessor.php  |  6 +-
 .../core/Civi/Api4/Action/Afform/Submit.php   | 61 +++++++++++--------
 ext/afform/core/afform.php                    |  3 +
 4 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php

diff --git a/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php b/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
new file mode 100644
index 000000000000..4eff408c40eb
--- /dev/null
+++ b/ext/afform/core/Civi/Afform/Event/AfformSubmitEvent.php
@@ -0,0 +1,54 @@
+<?php
+namespace Civi\Afform\Event;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * Class AfformSubmitEvent
+ * @package Civi\Afform\Event
+ *
+ * Handle submission of an "<af-form>".
+ * Listeners ought to take any recognized items from `entityValues`, handle
+ * them, and remove them.
+ *
+ * NOTE: I'm on the fence about whether to expose the arrays or more targeted
+ * methods. For the moment, this is only expected to be used internally,
+ * so KISS.
+ */
+class AfformSubmitEvent extends Event {
+
+  /**
+   * @var array
+   *   List of definitions of the entities.
+   *   $entityDefns['spouse'] = ['type' => 'Individual'];
+   */
+  public $entityDefns;
+
+  /**
+   * @var array
+   *   List of submitted entities to save.
+   *   $entityValues['Contact']['spouse'] = ['first_name' => 'Optimus Prime'];
+   */
+  public $entityValues;
+
+  /**
+   * AfformSubmitEvent constructor.
+   * @param $entityDefns
+   * @param array $entityValues
+   */
+  public function __construct($entityDefns, array $entityValues) {
+    $this->entityDefns = $entityDefns;
+    $this->entityValues = $entityValues;
+  }
+
+  /**
+   * List of entity types which need processing.
+   *
+   * @return array
+   *   Ex: ['Contact', 'Activity']
+   */
+  public function getTypes() {
+    return array_keys($this->entityValues);
+  }
+
+}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 3c5085cbadc1..a15074e32048 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -25,7 +25,11 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
   protected $args;
 
   protected $_afform;
-  
+
+  /**
+   * @var array
+   *   List of entities declared by this form.
+   */
   protected $_afformEntities;
 
   public function _run(Result $result) {
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index be9546c4717c..809b7ace6cca 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -2,12 +2,16 @@
 
 namespace Civi\Api4\Action\Afform;
 
+use Civi\Afform\Event\AfformSubmitEvent;
+
 /**
  * Class Submit
  * @package Civi\Api4\Action\Afform
  */
 class Submit extends AbstractProcessor {
 
+  const EVENT_NAME = 'civi.afform.submit';
+
   /**
    * Submitted values
    * @var array
@@ -15,40 +19,49 @@ class Submit extends AbstractProcessor {
    */
   protected $values;
 
-  /**
-   * @var array
-   */
-  protected $_submission = [];
-
   protected function processForm() {
+    $entityValues = [];
     foreach ($this->_afformEntities as $entityName => $entity) {
       // Predetermined values override submitted values
-      $this->_submission[$entity['type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
+      $entityValues[$entity['type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
     }
-    // Determines the order in which to process entities. Contacts go first.
-    $entitiesToProcess = [
-      'Contact' => 'processContacts',
-      'Activity' => 'processActivities',
-    ];
-    foreach ($entitiesToProcess as $entityType => $callback) {
-      if (!empty($this->_submission[$entityType])) {
-        $this->$callback($this->_submission[$entityType]);
-      }
-    }
-    foreach (array_diff_key($this->_submission, $entitiesToProcess) as $entityType) {
 
+    $event = new AfformSubmitEvent($this->_afformEntities, $entityValues);
+    \Civi::dispatcher()->dispatch(self::EVENT_NAME, $event);
+    foreach ($event->entityValues as $entityType => $entities) {
+      if (!empty($entities)) {
+        throw new \API_Exception(sprintf("Failed to process entities (type=%s; name=%s)", $entityType, implode(',', array_keys($entities))));
+      }
     }
-  }
 
-  protected function processGenericEntity($entityType, $items) {
-    foreach ($items as $name => $item) {
-      civicrm_api4($entityType, 'save', $items);
-    }
+    // What should I return?
+    return [];
   }
 
-  protected function processContacts($contacts) {
-    foreach ($contacts as $name => $contact) {
+  ///**
+  // * @param \Civi\Afform\Event\AfformSubmitEvent $event
+  // * @see afform_civicrm_config
+  // */
+  //public function processContacts(AfformSubmitEvent $event) {
+  //  if (empty($event->entityValues['Contact'])) {
+  //    return;
+  //  }
+  //  foreach ($event->entityValues['Contact'] as $entityName => $contact) {
+  //    // Do something
+  //    unset($event->entityValues['Contact'][$entityName]);
+  //  }
+  //}
 
+  /**
+   * @param \Civi\Afform\Event\AfformSubmitEvent $event
+   * @see afform_civicrm_config
+   */
+  public static function processGenericEntity(AfformSubmitEvent $event) {
+    foreach ($event->entityValues as $entityType => $records) {
+      civicrm_api4($entityType, 'save', [
+        'records' => $records,
+      ]);
+      unset($event->entityValues[$entityType]);
     }
   }
 
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 9ea9da18f69c..ba3f5c2ec5b8 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -2,6 +2,7 @@
 
 require_once 'afform.civix.php';
 use CRM_Afform_ExtensionUtil as E;
+use Civi\Api4\Action\Afform\Submit;
 
 function _afform_fields() {
   return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'client_route', 'is_public'];
@@ -49,6 +50,8 @@ function afform_civicrm_container($container) {
  */
 function afform_civicrm_config(&$config) {
   _afform_civix_civicrm_config($config);
+  // Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processContacts'], -500);
+  Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processGenericEntity'], -1000);
 }
 
 /**

From 14ba39975e1a245b0a4483164ef7dcb354058ba4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 22:02:27 -0400
Subject: [PATCH 465/834] <af-form> - By default, show an indicator of
 submission status

---
 ext/afform/core/ang/af/Form.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index c5098391e6c8..2810e8cfe1ea 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -13,7 +13,7 @@
           $scope.myCtrl.loadData();
         }
       },
-      controller: function($scope, $routeParams, crmApi4) {
+      controller: function($scope, $routeParams, crmApi4, crmStatus) {
         var schema = {}, data = {};
 
         $scope.$parent[$scope.ctrl] = this;
@@ -59,7 +59,8 @@
         };
 
         this.submit = function submit() {
-          crmApi4('Afform', 'submit', {name: this.getFormMeta().name, args: $routeParams, values: data});
+          var submission = crmApi4('Afform', 'submit', {name: this.getFormMeta().name, args: $routeParams, values: data});
+          return crmStatus({start: ts('Saving'), success: ts('Saved')}, submission);
         };
       }
     };

From c37151d286d5501800b6c54430521abc4c24f4eb Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 13 Sep 2019 22:09:21 -0400
Subject: [PATCH 466/834] Rename `<af-model>` to `<af-entity>` to better match
 API terminology

---
 ext/afform/auditor/backlog.md                  |  4 ++--
 ext/afform/core/CRM/Afform/ArrayHtml.php       |  4 ++--
 ext/afform/core/Civi/Afform/Utils.php          |  4 ++--
 ext/afform/core/afform.php                     |  2 +-
 ext/afform/core/ang/af/{Model.js => Entity.js} |  8 ++++----
 ext/afform/core/ang/afBlock/ContactName.html   |  9 ++++++++-
 ext/afform/docs/sandbox/planning-v0.3.md       | 10 +++++-----
 ext/afform/docs/style.md                       |  6 +++---
 ext/afform/mock/ang/afex.aff.html              |  6 +++---
 ext/afform/mock/ang/testAfform.aff.html        |  6 +++---
 10 files changed, 33 insertions(+), 26 deletions(-)
 rename ext/afform/core/ang/af/{Model.js => Entity.js} (71%)

diff --git a/ext/afform/auditor/backlog.md b/ext/afform/auditor/backlog.md
index ed5941e9760e..c5230b4150e9 100644
--- a/ext/afform/auditor/backlog.md
+++ b/ext/afform/auditor/backlog.md
@@ -7,8 +7,8 @@ validator to catch. Loosely/informally:
 
 * HTML partials should be well-formed/parseable XML
 * Warnings about any unrecognized tags/attributes/classes.
-* `<af-form>`, `<af-model>`, `<af-fieldset>`, `<af-field>` should have suitable relationships.
-* `<af-model>` should reference legit entities.
+* `<af-form>`, `<af-entity>`, `<af-fieldset>`, `<af-field>` should have suitable relationships.
+* `<af-entity>` should reference legit entities.
 * `<af-field>` should reference legit fields.
     * Future consideration: how to validate when it's part of a subform?
 * `<af-fieldset>` should reference a declared model.
diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 7a4e7b76bd7a..1839271f1691 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -21,7 +21,7 @@ class CRM_Afform_ArrayHtml {
     '*' => [
       '*' => 'text',
     ],
-    'af-model' => [
+    'af-entity' => [
       'name' => 'text',
       'type' => 'text',
       'data' => 'js',
@@ -158,7 +158,7 @@ public function convertNodeToArray($node) {
    * Determine the type of data that is stored in an attribute.
    *
    * @param string $tag
-   *   Ex: 'af-model'
+   *   Ex: 'af-entity'
    * @param string $attrName
    *   Ex: 'label'
    * @return string
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
index d343894dc8ba..f8f4cc15053e 100644
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -11,13 +11,13 @@ class Utils {
    * @return array
    */
   public static function getEntities($layout) {
-    $entities = array_column(self::getTags($layout, 'af-model'), NULL, 'name');
+    $entities = array_column(self::getTags($layout, 'af-entity'), NULL, 'name');
     self::getFields($layout, $entities);
     return $entities;
   }
 
   /**
-   * Returns all tags with a certain tag name, e.g. 'af-model'
+   * Returns all tags with a certain tag name, e.g. 'af-entity'
    *
    * @param array $collection
    * @param string $tagName
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index ba3f5c2ec5b8..28caaf8952e8 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -217,7 +217,7 @@ function afform_civicrm_alterAngular($angular) {
 
 function _afform_getMetadata(phpQueryObject $doc) {
   $entities = [];
-  foreach ($doc->find('af-model') as $afmModelProp) {
+  foreach ($doc->find('af-entity') as $afmModelProp) {
     $entities[$afmModelProp->getAttribute('name')] = [
       'type' => $afmModelProp->getAttribute('type'),
     ];
diff --git a/ext/afform/core/ang/af/Model.js b/ext/afform/core/ang/af/Entity.js
similarity index 71%
rename from ext/afform/core/ang/af/Model.js
rename to ext/afform/core/ang/af/Entity.js
index b7390a43ff83..561563d6cabf 100644
--- a/ext/afform/core/ang/af/Model.js
+++ b/ext/afform/core/ang/af/Entity.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
-  // "afModel" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-model name="myModel" type="Individual" /> ...</af-form>
-  angular.module('af').directive('afModel', function() {
+  // "afEntity" is a basic skeletal directive.
+  // Example usage: <af-form>... <af-entity name="myModel" type="Individual" /> ...</af-form>
+  angular.module('af').directive('afEntity', function() {
     // Whitelist of all allowed properties of an af-fieldset
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
@@ -21,7 +21,7 @@
         entity.id = null;
         entity.fields = [];
         afFormCtrl.registerEntity(entity);
-        // $scope.$watch('afModel', function(newValue){$scope.myOptions = newValue;});
+        // $scope.$watch('afEntity', function(newValue){$scope.myOptions = newValue;});
       }
     };
   });
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
index 541edcc84dfd..3a345a33221d 100644
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -1 +1,8 @@
-<div>{{ts('Contact name block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().modelName})}}</div>
+<af-form>
+  <af-entity name="$parent.model" type="Contact" label="Target Contact" />
+  <af-fieldset model="$parent.model">
+    <af-field name="prefix" />
+    <af-field name="first_name" />
+    <af-field name="last_name" />
+  </af-fieldset>
+</af-form>
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index cce1eb460167..2273a4b88988 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -86,13 +86,13 @@
 
 ```html
 <af-form ctrl="modelListCtrl">
-  <af-model
+  <af-entity
     type="Individual"
     name="parent"
     label="Parent"
     api4-params="{where: ['id','=', routeParams.cid]}"
   />
-  <af-model
+  <af-entity
     type="Individual"
     name="spouse"
     label="Spouse"
@@ -131,7 +131,7 @@
 <!-- input: options.parent.id -->
 <!-- Decision: These blocks are written in straight AngularJS rather than Afform -->
 <!--<af-form>-->
-  <!--<af-model -->
+  <!--<af-entity -->
     <!--type="Email"-->
     <!--name="email"-->
     <!--label="Emails"-->
@@ -148,13 +148,13 @@
 
 ```html
 <af-form ctrl="modelListCtrl">
-  <af-model
+  <af-entity
     type="Individual"
     name="parent"
     label="Parent"
     api4-params="{where: ['id','=', routeParams.cid]}"
   />
-  <af-model
+  <af-entity
     type="Individual"
     name="spouse"
     label="Spouse"
diff --git a/ext/afform/docs/style.md b/ext/afform/docs/style.md
index 58736e8ccdc4..5b9fb38abd72 100644
--- a/ext/afform/docs/style.md
+++ b/ext/afform/docs/style.md
@@ -4,10 +4,10 @@
 
 The following naming conventions apply to directives defined within `afform.git`:
 
-* Standalone directives (e.g. `afModel` or `afField`), including forms (e.g. `afHtmlEditor`)
+* Standalone directives (e.g. `afEntity` or `afField`), including forms (e.g. `afHtmlEditor`)
     * The directive name must begin with the `af` prefix.
     * Supplemental attributes SHOULD NOT begin with the `af` prefix.
-    * Example: `<af-model type="Activity" name="myPhoneCall">`
+    * Example: `<af-entity type="Activity" name="myPhoneCall">`
 
 * Mix-in directives (e.g. `afMonaco` or `afApi4Action`)
     * The directive name must begin with the `af` prefix.
@@ -18,7 +18,7 @@ __Discussion__: These differ in two ways:
 
 * Namespacing
     * Standalone directives form an implicit namespace.
-      (*Anything passed to `<af-model>` is implicitly about `af-model`.)
+      (*Anything passed to `<af-entity>` is implicitly about `af-entity`.)
     * Mix-in directives must share a namespace with other potential mix-ins.
       (*The *)
 * Directive arguments
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index 8596e3877b7c..f81aff3c5fd7 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -1,8 +1,8 @@
 <af-form ctrl="modelListCtrl">
   <!-- FIXME: Distinguish "Individual"s from "Household"s -->
-  <af-model type="Contact" name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}" />
-  <af-model type="Contact" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
-  <af-model type="Contact" name="home" label="Home" />
+  <af-entity type="Contact" name="parent" label="Parent" api4-params="{where: ['id','=', routeParams.cid]}" />
+  <af-entity type="Contact" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
+  <af-entity type="Contact" name="home" label="Home" />
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index add785cd5824..50acb5062c2f 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -1,9 +1,9 @@
 <af-form ctrl="modelListCtrl" >
   <div crm-ui-debug="modelListCtrl.getEntity('parent')" />
   <div crm-ui-debug="modelListCtrl.getData('parent')" />
-  <af-model type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
-  <af-model type="Contact" name="spouse" label="Spouse" url-autofill="1" />
-  <af-model type="Contact" name="home" label="Home" />
+  <af-entity type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
+  <af-entity type="Contact" name="spouse" label="Spouse" url-autofill="1" />
+  <af-entity type="Contact" name="home" label="Home" />
 
   <af-fieldset model="parent">
 

From 8ad30bee5cf748f4d7807891a3ab2c862375d9ff Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 5 Oct 2019 11:11:54 +0200
Subject: [PATCH 467/834] Do not fatal on missing extensions

Currently a missing extension will lead to a complete fatal on afforms. We can ignore these in the
extensions, missing extensions are otherwise notified in corre
---
 ext/afform/core/CRM/Afform/AfformScanner.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 2c5f86c1f382..589602369d51 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -55,8 +55,13 @@ public function findFilePaths() {
     $mapper = CRM_Extension_System::singleton()->getMapper();
     foreach ($mapper->getModules() as $module) {
       /** @var $module CRM_Core_Module */
-      if ($module->is_active) {
-        $this->appendFilePaths($paths, dirname($mapper->keyToPath($module->name)) . DIRECTORY_SEPARATOR . 'ang', 20);
+      try {
+        if ($module->is_active) {
+          $this->appendFilePaths($paths, dirname($mapper->keyToPath($module->name)) . DIRECTORY_SEPARATOR . 'ang', 20);
+        }
+      }
+      catch (CRM_Extension_Exception_MissingException $e) {
+        // If the extension is missing skip & continue.
       }
     }
 

From 00a19b0d6f8f52357612df85fea3bf7087dbc3db Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Oct 2019 07:02:05 -0700
Subject: [PATCH 468/834] afHtmlList - Tweak layout

---
 ext/afform/html/ang/afHtmlList.aff.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index e0e5f950ee20..a0d9fa36c17a 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -22,13 +22,16 @@
         <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
       </td>
       <td>{{availForm.title}}</td>
-      <td><code>{{availForm.server_route}}</code></td>
+      <td>
+        <a ng-href="{{crmUrl(availForm.server_route)}}" target="_blank"><code>{{availForm.server_route}}</code></a>
+      </td>
       <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
       <td>
         <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Reverting...')"
            af-api4-success-msg="ts('Reverted')"
+           class="btn btn-xs btn-default"
           >{{ts('Revert')}}</a>
       </td>
     </tr>

From c7efb6f5d4a912431babf08cfb28678c3d69a045 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Oct 2019 07:02:27 -0700
Subject: [PATCH 469/834] testAfform.aff.html - Tweak example

---
 ext/afform/mock/ang/testAfform.aff.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 50acb5062c2f..ec38eb18055c 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -3,10 +3,8 @@
   <div crm-ui-debug="modelListCtrl.getData('parent')" />
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
   <af-entity type="Contact" name="spouse" label="Spouse" url-autofill="1" />
-  <af-entity type="Contact" name="home" label="Home" />
 
   <af-fieldset model="parent">
-
     <af-field name="first_name" defn='{title: ts("Your First Name")}' />
     <af-field name="last_name" />
     <af-field name="contact_sub_type" defn="{widget: hidden}" value="Student" />

From b73c0abc3a7f179a9f7fa2e3a51b338767b40523 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 19:29:44 -0700
Subject: [PATCH 470/834] Unit tests - Update for api4 in core

---
 ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php   | 2 +-
 ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
index 288141f8d6a9..d7e9629908f2 100644
--- a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
+++ b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
@@ -18,7 +18,7 @@ class CRM_Afform_UtilTest extends \PHPUnit\Framework\TestCase implements Headles
   public function setUpHeadless() {
     return \Civi\Test::headless()
       ->installMe(__DIR__)
-      ->install(['org.civicrm.api4'])
+      ->install(version_compare(CRM_Utils_System::version(), '5.19', '<') ? ['org.civicrm.api4'] : [])
       ->apply();
   }
 
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
index 6d3e9907af93..9df221ba69d6 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
@@ -14,7 +14,8 @@ abstract class api_v4_AfformTestCase extends \PHPUnit\Framework\TestCase impleme
    */
   public function setUpHeadless() {
     return \Civi\Test::headless()
-      ->install(['org.civicrm.api4', 'org.civicrm.afform', 'org.civicrm.afform-mock'])
+      ->install(version_compare(CRM_Utils_System::version(), '5.19', '<') ? ['org.civicrm.api4'] : [])
+      ->install(['org.civicrm.afform', 'org.civicrm.afform-mock'])
       ->apply();
   }
 

From f9c20b0c40a4f20944a1cf60bc0bbf0bafd174ea Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Oct 2019 07:35:23 -0700
Subject: [PATCH 471/834] afform_mock - Tweak example names/text

---
 ext/afform/mock/ang/afExamplePage.aff.html         |  3 ---
 ext/afform/mock/ang/afExamplePage.aff.json         |  1 -
 ext/afform/mock/ang/afex.aff.json                  |  2 +-
 ...elibBareFile.aff.html => mockBareFile.aff.html} |  0
 .../ang/{fakelibFoo.aff.html => mockFoo.aff.html}  |  0
 .../ang/{fakelibFoo.aff.json => mockFoo.aff.json}  |  0
 ext/afform/mock/ang/mockPage.aff.html              |  3 +++
 ext/afform/mock/ang/mockPage.aff.json              |  1 +
 ext/afform/mock/ang/testAfform.aff.html            | 14 +++++++++-----
 .../mock/tests/phpunit/api/v4/AfformTest.php       |  8 ++++----
 10 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 ext/afform/mock/ang/afExamplePage.aff.html
 delete mode 100644 ext/afform/mock/ang/afExamplePage.aff.json
 rename ext/afform/mock/ang/{fakelibBareFile.aff.html => mockBareFile.aff.html} (100%)
 rename ext/afform/mock/ang/{fakelibFoo.aff.html => mockFoo.aff.html} (100%)
 rename ext/afform/mock/ang/{fakelibFoo.aff.json => mockFoo.aff.json} (100%)
 create mode 100644 ext/afform/mock/ang/mockPage.aff.html
 create mode 100644 ext/afform/mock/ang/mockPage.aff.json

diff --git a/ext/afform/mock/ang/afExamplePage.aff.html b/ext/afform/mock/ang/afExamplePage.aff.html
deleted file mode 100644
index 801da898560c..000000000000
--- a/ext/afform/mock/ang/afExamplePage.aff.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>Hello {{routeParams.name}}.</div>
-<div>The foo says "<span fakelib-foo/>".</div>
-<div>The bare file says "<span fakelib-bare-file/>"</div>
diff --git a/ext/afform/mock/ang/afExamplePage.aff.json b/ext/afform/mock/ang/afExamplePage.aff.json
deleted file mode 100644
index 5aad8afd2c1d..000000000000
--- a/ext/afform/mock/ang/afExamplePage.aff.json
+++ /dev/null
@@ -1 +0,0 @@
-{"server_route": "civicrm/example-page", "requires":["fakelibFoo", "fakelibBareFile"]}
diff --git a/ext/afform/mock/ang/afex.aff.json b/ext/afform/mock/ang/afex.aff.json
index a68f14a38153..7cb07054e8ab 100644
--- a/ext/afform/mock/ang/afex.aff.json
+++ b/ext/afform/mock/ang/afex.aff.json
@@ -1,4 +1,4 @@
 {
   "server_route": "civicrm/afex",
-  "requires":["fakelibFoo", "fakelibBareFile", "af", "afBlock", "afField"]
+  "requires":["mockFoo", "mockBareFile", "af", "afBlock", "afField"]
 }
diff --git a/ext/afform/mock/ang/fakelibBareFile.aff.html b/ext/afform/mock/ang/mockBareFile.aff.html
similarity index 100%
rename from ext/afform/mock/ang/fakelibBareFile.aff.html
rename to ext/afform/mock/ang/mockBareFile.aff.html
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.html b/ext/afform/mock/ang/mockFoo.aff.html
similarity index 100%
rename from ext/afform/mock/ang/fakelibFoo.aff.html
rename to ext/afform/mock/ang/mockFoo.aff.html
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.json b/ext/afform/mock/ang/mockFoo.aff.json
similarity index 100%
rename from ext/afform/mock/ang/fakelibFoo.aff.json
rename to ext/afform/mock/ang/mockFoo.aff.json
diff --git a/ext/afform/mock/ang/mockPage.aff.html b/ext/afform/mock/ang/mockPage.aff.html
new file mode 100644
index 000000000000..d3300ca8b7dd
--- /dev/null
+++ b/ext/afform/mock/ang/mockPage.aff.html
@@ -0,0 +1,3 @@
+<div>Hello {{routeParams.name}}.</div>
+<div>The foo says "<span mock-foo/>".</div>
+<div>The bare file says "<span mock-bare-file/>"</div>
diff --git a/ext/afform/mock/ang/mockPage.aff.json b/ext/afform/mock/ang/mockPage.aff.json
new file mode 100644
index 000000000000..bd3a6baf25f8
--- /dev/null
+++ b/ext/afform/mock/ang/mockPage.aff.json
@@ -0,0 +1 @@
+{"server_route": "civicrm/mock-page", "requires":["mockFoo", "mockBareFile"]}
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index ec38eb18055c..a8fecdb4f322 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -2,21 +2,25 @@
   <div crm-ui-debug="modelListCtrl.getEntity('parent')" />
   <div crm-ui-debug="modelListCtrl.getData('parent')" />
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
-  <af-entity type="Contact" name="spouse" label="Spouse" url-autofill="1" />
+  <af-entity type="Contact" data="{contact_type: 'Individual'}" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
 
   <af-fieldset model="parent">
-    <af-field name="first_name" defn='{title: ts("Your First Name")}' />
+    <h3>About You</h3>
+
+    <af-field name="first_name" />
     <af-field name="last_name" />
-    <af-field name="contact_sub_type" defn="{widget: hidden}" value="Student" />
     <af-field name="gender_id" />
     <af-field name="constituent_information.Marital_Status" />
     <af-field name="constituent_information.Marriage_Date" />
     <af-field name="constituent_information.Most_Important_Issue" />
   </af-fieldset>
 
-  <af-fieldset model="spouse">
+  <af-fieldset model="spouse" ng-if="modelListCtrl.getData('parent')['constituent_information.Marital_Status'] == 'M'">
+    <h3>About Your Spouse</h3>
+
     <af-field name="first_name" defn='{title: ts("Spouse First Name")}' />
-    <af-field name="last_name" />
+    <af-field name="last_name" defn='{title: ts("Spouse Last Name")}' />
+    <af-field name="do_not_email" />
   </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 097b2a775968..2bbc3e106cd0 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -9,9 +9,9 @@ class api_v4_AfformTest extends api_v4_AfformTestCase {
 
   public function getBasicDirectives() {
     return [
-      ['afExamplePage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/example-page']],
-      ['fakelibBareFile', ['title' => '', 'description' => '']],
-      ['fakelibFoo', ['title' => '', 'description' => '']],
+      ['mockPage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/mock-page']],
+      ['mockBareFile', ['title' => '', 'description' => '']],
+      ['mockFoo', ['title' => '', 'description' => '']],
     ];
   }
 
@@ -69,7 +69,7 @@ public function getFormatExamples() {
       $formats = ['html', 'shallow', 'deep'];
       foreach ($formats as $updateFormat) {
         foreach ($formats as $readFormat) {
-          $es[] = ['fakelibBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
+          $es[] = ['mockBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
         }
       }
     }

From 77dccccbeb37630ba0b4a98c02c3d22b10a2d6d2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 15:05:22 -0700
Subject: [PATCH 472/834] Automatically detect requirements in *.aff.html

PART A: EXPORT LIST

Suppose you create a form `downstreamForm.aff.html`.

The metadata for `downstreamForm` will indicate that it exports an element `<downstream-form/>`:

```php
$angularModules['downstreamForm']['exports']['el'] = ['downstream-form'];
```

PART B: AUTO-REQUIRES

Suppose that:

1. he form `downstreamForm.aff.html` uses element `<upstream-el/>`.
2. The `$angularModules['upsteamMod']['exports']['el']` defines an exported element `upstream-el`.

Then the `downstreamForm` module will automatically requires the `upstreamMod`, as in

```php
$angularModules['downstreamForm']['requires'][] = 'upstreamMod';
```
---
 ext/afform/core/CRM/Afform/AfformScanner.php |   2 +-
 ext/afform/core/Civi/Afform/Symbols.php      |  68 +++++++++++
 ext/afform/core/afform.php                   | 116 +++++++++++++++++++
 3 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 ext/afform/core/Civi/Afform/Symbols.php

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 589602369d51..fe2c91f6cc91 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -134,7 +134,7 @@ public function getMeta($name) {
 
     $defaults = [
       'name' => $name,
-      'requires' => explode(',', self::DEFAULT_REQUIRES),
+      'requires' => [],
       'title' => '',
       'description' => '',
       'is_public' => FALSE,
diff --git a/ext/afform/core/Civi/Afform/Symbols.php b/ext/afform/core/Civi/Afform/Symbols.php
new file mode 100644
index 000000000000..b933afb11f43
--- /dev/null
+++ b/ext/afform/core/Civi/Afform/Symbols.php
@@ -0,0 +1,68 @@
+<?php
+namespace Civi\Afform;
+
+class Symbols {
+
+  /**
+   * @var array
+   *   Array(string $element => int $count).
+   */
+  public $elements = [];
+
+  /**
+   * @var array
+   *   Array(string $class => int $count).
+   */
+  public $classes = [];
+
+  /**
+   * @var array
+   *   Array(string $attr => int $count).
+   */
+  public $attributes = [];
+
+  /**
+   * @param string $html
+   * @return static
+   */
+  public static function scan($html) {
+    $symbols = new static();
+    $doc = new \DOMDocumentWrapper($html, 'text/html');
+    $symbols->scanNode($doc->root);
+    return $symbols;
+  }
+
+  protected function scanNode(\DOMNode $node) {
+    if ($node instanceof \DOMElement) {
+
+      self::increment($this->elements, $node->tagName);
+
+      foreach ($node->childNodes as $childNode) {
+        $this->scanNode($childNode);
+      }
+
+      foreach ($node->attributes as $attribute) {
+        $this->scanNode($attribute);
+      }
+    }
+
+    elseif ($node instanceof \DOMAttr) {
+      self::increment($this->attributes, $node->nodeName);
+
+      if ($node->nodeName === 'class') {
+        $classes = explode(' ', $node->nodeValue);
+        foreach ($classes as $class) {
+          self::increment($this->classes, $class);
+        }
+      }
+    }
+  }
+
+  private static function increment(&$arr, $key) {
+    if (!isset($arr[$key])) {
+      $arr[$key] = 0;
+    }
+    $arr[$key]++;
+  }
+
+}
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 28caaf8952e8..605a186f1843 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -37,6 +37,7 @@ function _afform_fields_filter($params) {
  * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
  */
 function afform_civicrm_container($container) {
+  $container->addResource(new \Symfony\Component\Config\Resource\FileResource(__FILE__));
   $container->setDefinition('afform_scanner', new \Symfony\Component\DependencyInjection\Definition(
     'CRM_Afform_AfformScanner',
     []
@@ -50,8 +51,15 @@ function afform_civicrm_container($container) {
  */
 function afform_civicrm_config(&$config) {
   _afform_civix_civicrm_config($config);
+
+  if (isset(Civi::$statics[__FUNCTION__])) {
+    return;
+  }
+  Civi::$statics[__FUNCTION__] = 1;
+
   // Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processContacts'], -500);
   Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processGenericEntity'], -1000);
+  Civi::dispatcher()->addListener('hook_civicrm_angularModules', '_afform_civicrm_angularModules_autoReq', -1000);
 }
 
 /**
@@ -155,6 +163,7 @@ function afform_civicrm_caseTypes(&$caseTypes) {
 function afform_civicrm_angularModules(&$angularModules) {
   _afform_civix_civicrm_angularModules($angularModules);
 
+  /** @var CRM_Afform_AfformScanner $scanner */
   $scanner = Civi::service('afform_scanner');
   $names = array_keys($scanner->findFilePaths());
   foreach ($names as $name) {
@@ -164,6 +173,11 @@ function afform_civicrm_angularModules(&$angularModules) {
       'js' => ['assetBuilder://afform.js?name=' . urlencode($name)],
       'requires' => $meta['requires'],
       'basePages' => [],
+      'exports' => [
+        // Each afform is an attribute and an element.
+        'el' => [_afform_angular_module_name($name, 'dash')],
+        'attr' => [_afform_angular_module_name($name, 'dash')],
+      ],
     ];
 
     // FIXME: The HTML layout template is embedded in the JS asset.
@@ -173,6 +187,108 @@ function afform_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * Scan the list of Angular modules and inject automatic-requirements.
+ *
+ * TLDR: if an afform uses element "<other-el/>", and if another module defines
+ * `$angularModules['otherMod']['exports']['el'][0] === 'other-el'`, then
+ * the 'otherMod' is automatically required.
+ *
+ * @param \Civi\Core\Event\GenericHookEvent $e
+ * @see CRM_Utils_Hook::angularModules()
+ */
+function _afform_civicrm_angularModules_autoReq($e) {
+  /** @var CRM_Afform_AfformScanner $scanner */
+  $scanner = Civi::service('afform_scanner');
+  $moduleEnvId = md5(\CRM_Core_Config_Runtime::getId() . implode(',', array_keys($e->angularModules)));
+  $depCache = CRM_Utils_Cache::create([
+    'name' => 'afdep_' . substr($moduleEnvId, 0, 32 - 6),
+    'type' => ['*memory*', 'SqlGroup', 'ArrayCache'],
+    'withArray' => 'fast',
+    'prefetch' => TRUE,
+  ]);
+  $depCacheTtl = 2 * 60 * 60;
+
+  $revMap = _afform_reverse_deps($e->angularModules);
+
+  $formNames = array_keys($scanner->findFilePaths());
+  foreach ($formNames as $formName) {
+    $angModule = _afform_angular_module_name($formName, 'camel');
+    $cacheLine = $depCache->get($formName, NULL);
+
+    $jFile = $scanner->findFilePath($formName, 'aff.json');
+    $hFile = $scanner->findFilePath($formName, 'aff.html');
+
+    $jStat = stat($jFile);
+    $hStat = stat($hFile);
+
+    if ($cacheLine === NULL) {
+      $needsUpdate = TRUE;
+    }
+    elseif ($jStat !== FALSE && $jStat['size'] !== $cacheLine['js']) {
+      $needsUpdate = TRUE;
+    }
+    elseif ($jStat !== FALSE && $jStat['mtime'] > $cacheLine['jm']) {
+      $needsUpdate = TRUE;
+    }
+    elseif ($hStat !== FALSE && $hStat['size'] !== $cacheLine['hs']) {
+      $needsUpdate = TRUE;
+    }
+    elseif ($hStat !== FALSE && $hStat['mtime'] > $cacheLine['hm']) {
+      $needsUpdate = TRUE;
+    }
+    else {
+      $needsUpdate = FALSE;
+    }
+
+    if ($needsUpdate) {
+      $cacheLine = [
+        'js' => $jStat['size'] ?? NULL,
+        'jm' => $jStat['mtime'] ?? NULL,
+        'hs' => $hStat['size'] ?? NULL,
+        'hm' => $hStat['mtime'] ?? NULL,
+        'r' => array_values(array_unique(array_merge(
+          [CRM_Afform_AfformScanner::DEFAULT_REQUIRES],
+          $e->angularModules[$angModule]['requires'] ?? [],
+          _afform_reverse_deps_find($formName, file_get_contents($hFile), $revMap)
+        ))),
+      ];
+      // print_r(['cache update:' . $formName => $cacheLine]);
+      $depCache->set($formName, $cacheLine, $depCacheTtl);
+    }
+
+    $e->angularModules[$angModule]['requires'] = $cacheLine['r'];
+  }
+}
+
+/**
+ * @param $angularModules
+ * @return array
+ *   'attr': array(string $attrName => string $angModuleName)
+ *   'el': array(string $elementName => string $angModuleName)
+ */
+function _afform_reverse_deps($angularModules) {
+  $revMap = [];
+  foreach (['attr', 'el'] as $exportType) {
+    $revMap[$exportType] = [];
+    foreach (array_keys($angularModules) as $module) {
+      if (isset($angularModules[$module]['exports'][$exportType])) {
+        foreach ($angularModules[$module]['exports'][$exportType] as $exportItem) {
+          $revMap[$exportType][$exportItem] = $module;
+        }
+      }
+    }
+  }
+  return $revMap;
+}
+
+function _afform_reverse_deps_find($formName, $html, $revMap) {
+  $symbols = \Civi\Afform\Symbols::scan($html);
+  $elems = array_intersect_key($revMap['el'], $symbols->elements);
+  $attrs = array_intersect_key($revMap['attr'], $symbols->attributes);
+  return array_values(array_unique(array_merge($elems, $attrs)));
+}
+
 /**
  * @param \Civi\Angular\Manager $angular
  * @see CRM_Utils_Hook::alterAngular()

From 648f59bfdc137baf03080fa9cf9e9bf04a63f6c7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 18:30:14 -0700
Subject: [PATCH 473/834] Civi\Afform\Symbols - Add unit test. Define behavior
 for Angular exprs.

---
 ext/afform/core/Civi/Afform/Symbols.php       |  22 +++-
 .../tests/phpunit/Civi/Afform/SymbolsTest.php | 103 ++++++++++++++++++
 2 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 ext/afform/core/tests/phpunit/Civi/Afform/SymbolsTest.php

diff --git a/ext/afform/core/Civi/Afform/Symbols.php b/ext/afform/core/Civi/Afform/Symbols.php
index b933afb11f43..f816a3c18a6e 100644
--- a/ext/afform/core/Civi/Afform/Symbols.php
+++ b/ext/afform/core/Civi/Afform/Symbols.php
@@ -50,7 +50,7 @@ protected function scanNode(\DOMNode $node) {
       self::increment($this->attributes, $node->nodeName);
 
       if ($node->nodeName === 'class') {
-        $classes = explode(' ', $node->nodeValue);
+        $classes = $this->parseClasses($node->nodeValue);
         foreach ($classes as $class) {
           self::increment($this->classes, $class);
         }
@@ -58,6 +58,26 @@ protected function scanNode(\DOMNode $node) {
     }
   }
 
+  /**
+   * @param string $expr
+   *   Ex: 'crm-icon fa-mail'
+   * @return array
+   *   Ex: ['crm-icon', 'fa-mail']
+   */
+  protected function parseClasses($expr) {
+    if ($expr === '' || $expr === NULL || $expr === FALSE) {
+      return [];
+    }
+    if (strpos($expr, '{{') === FALSE) {
+      return explode(' ', $expr);
+    }
+    if (preg_match_all(';([a-zA-Z\-_]+|\{\{.*\}\}) ;U', "$expr ", $m)) {
+      return $m[1];
+    }
+    error_log("Failed to parse CSS classes: $expr");
+    return [];
+  }
+
   private static function increment(&$arr, $key) {
     if (!isset($arr[$key])) {
       $arr[$key] = 0;
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/SymbolsTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/SymbolsTest.php
new file mode 100644
index 000000000000..8074fc41f9ca
--- /dev/null
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/SymbolsTest.php
@@ -0,0 +1,103 @@
+<?php
+namespace Civi\Afform;
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * @group headless
+ */
+class SymbolsTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   *
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   *
+   * @throws \CRM_Extension_Exception_ParseException
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()->installMe(__DIR__)->apply();
+  }
+
+  public function getExamples() {
+    $exs = [];
+    $exs[] = [
+      '<div/>',
+      [
+        'e' => ['div' => 1, 'body' => 1],
+        'a' => [],
+        'c' => [],
+      ],
+    ];
+    $exs[] = [
+      '<my-tabset><my-tab id="1"/><my-tab id="2">foo</my-tab><my-tab id="3">bar</my-tab></my-tabset>',
+      [
+        'e' => ['my-tabset' => 1, 'my-tab' => 3, 'body' => 1],
+        'a' => ['id' => 3],
+        'c' => [],
+      ],
+    ];
+    $exs[] = [
+      '<div class="my-parent"><div class="my-child"><img class="special" src="foo.png"/></div></div>',
+      [
+        'e' => ['div' => 2, 'img' => 1, 'body' => 1],
+        'a' => ['class' => 3, 'src' => 1],
+        'c' => [
+          'my-parent' => 1,
+          'my-child' => 1,
+          'special' => 1,
+        ],
+      ],
+    ];
+    $exs[] = [
+      '<div class="my-parent foo bar">a<div class="my-child whiz bang {{ghost + stuff}} last">b</div>c</div>',
+      [
+        'e' => ['div' => 2, 'body' => 1],
+        'a' => ['class' => 2],
+        'c' => [
+          'my-parent' => 1,
+          'my-child' => 1,
+          'foo' => 1,
+          'bar' => 1,
+          'whiz' => 1,
+          'bang' => 1,
+          '{{ghost + stuff}}' => 1,
+          'last' => 1,
+        ],
+      ],
+    ];
+    $exs[] = [
+      '<div class="{{make[\'cheese\']}} {{ghost + stuff}} {{a}}_{{b}}"/>',
+      [
+        'e' => ['div' => 1, 'body' => 1],
+        'a' => ['class' => 1],
+        'c' => [
+          '{{ghost + stuff}}' => 1,
+          '{{make[\'cheese\']}}' => 1,
+          '{{a}}_{{b}}' => 1,
+        ],
+      ],
+    ];
+
+    return $exs;
+  }
+
+  /**
+   * @param string $html
+   * @param array $expect
+   *   List of expected symbol counts, by type.
+   *   Types are (e)lement, (a)ttribute, (c)lass
+   * @dataProvider getExamples
+   */
+  public function testSymbols($html, $expect) {
+    $expectDefaults = ['e' => [], 'a' => [], 'c' => []];
+    $expect = array_merge($expectDefaults, $expect);
+    $actual = Symbols::scan($html);
+
+    $this->assertEquals($expect['e'], $actual->elements);
+    $this->assertEquals($expect['a'], $actual->attributes);
+    $this->assertEquals($expect['c'], $actual->classes);
+  }
+
+}

From bcd62970afbedafb13326bde1cd14f94c6cec4fb Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 16:05:36 -0700
Subject: [PATCH 474/834] afform_core: Declare exports for 'af-form',
 'af-field', etc

---
 ext/afform/core/ang/af.ang.php      | 4 ++++
 ext/afform/core/ang/afBlock.ang.php | 4 ++++
 ext/afform/core/ang/afField.ang.php | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index 7a937077b824..68c90678490f 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -14,4 +14,8 @@
   'requires' => ['crmUtil'],
   'settings' => [],
   'basePages' => [],
+  'exports' => [
+    'el' => ['af-entity', 'af-fieldset', 'af-form'],
+    'attr' => ['af-entity', 'af-fieldset', 'af-form'],
+  ],
 ];
diff --git a/ext/afform/core/ang/afBlock.ang.php b/ext/afform/core/ang/afBlock.ang.php
index 4075194883c4..af988bb72381 100644
--- a/ext/afform/core/ang/afBlock.ang.php
+++ b/ext/afform/core/ang/afBlock.ang.php
@@ -17,4 +17,8 @@
   ],
   'settings' => [],
   'basePages' => [],
+  'exports' => [
+    'el' => ['af-block-contact-name', 'af-block-contact-email'],
+    'attr' => ['af-block-contact-name', 'af-block-contact-email'],
+  ],
 ];
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
index 2e6bc7eff43d..ac52351553e3 100644
--- a/ext/afform/core/ang/afField.ang.php
+++ b/ext/afform/core/ang/afField.ang.php
@@ -17,4 +17,8 @@
   ],
   'settings' => [],
   'basePages' => [],
+  'exports' => [
+    'el' => ['af-field'],
+    'attr' => ['af-field'],
+  ],
 ];

From 2219b23ad869a93ed7c1728ed2ad9b851200d65a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 15:58:24 -0700
Subject: [PATCH 475/834] afform_html - Simplify; use auto-requires

---
 ext/afform/html/ang/afHtmlAdmin.aff.json  | 3 +--
 ext/afform/html/ang/afHtmlEditor.aff.json | 3 +--
 ext/afform/html/ang/afHtmlList.aff.json   | 3 +--
 ext/afform/html/ang/afMoncao.ang.php      | 3 +++
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/afform/html/ang/afHtmlAdmin.aff.json b/ext/afform/html/ang/afHtmlAdmin.aff.json
index f058774297ca..b67e195f41f2 100644
--- a/ext/afform/html/ang/afHtmlAdmin.aff.json
+++ b/ext/afform/html/ang/afHtmlAdmin.aff.json
@@ -1,5 +1,4 @@
 {
   "title": "Afform HTML Administration",
-  "server_route": "civicrm/admin/afform-html",
-  "requires":["afCore", "afMoncao", "afHtmlEditor", "afHtmlList"]
+  "server_route": "civicrm/admin/afform-html"
 }
diff --git a/ext/afform/html/ang/afHtmlEditor.aff.json b/ext/afform/html/ang/afHtmlEditor.aff.json
index d55381fed38d..f8cd0cc16888 100644
--- a/ext/afform/html/ang/afHtmlEditor.aff.json
+++ b/ext/afform/html/ang/afHtmlEditor.aff.json
@@ -1,4 +1,3 @@
 {
-  "title": "Afform HTML Editor",
-  "requires":["afCore", "afMoncao"]
+  "title": "Afform HTML Editor"
 }
diff --git a/ext/afform/html/ang/afHtmlList.aff.json b/ext/afform/html/ang/afHtmlList.aff.json
index 7293f8e83f7e..e412a325d398 100644
--- a/ext/afform/html/ang/afHtmlList.aff.json
+++ b/ext/afform/html/ang/afHtmlList.aff.json
@@ -1,4 +1,3 @@
 {
-  "title": "Afform HTML List",
-  "requires":["afCore"]
+  "title": "Afform HTML List"
 }
diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMoncao.ang.php
index 2f896db75d4f..d394532c1f70 100644
--- a/ext/afform/html/ang/afMoncao.ang.php
+++ b/ext/afform/html/ang/afMoncao.ang.php
@@ -19,4 +19,7 @@
     ],
   ],
   'basePages' => [],
+  'exports' => [
+    'attr' => ['af-monaco'],
+  ],
 );

From 1d1821c66b469986bec3c9af122616e0e8dd2348 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 16:09:07 -0700
Subject: [PATCH 476/834] afform_mock - Simplify; use auto-requires

---
 ext/afform/mock/ang/testAfform.aff.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ext/afform/mock/ang/testAfform.aff.json b/ext/afform/mock/ang/testAfform.aff.json
index 5fc368cbcf33..6c8684eee761 100644
--- a/ext/afform/mock/ang/testAfform.aff.json
+++ b/ext/afform/mock/ang/testAfform.aff.json
@@ -1,7 +1,4 @@
 {
   "server_route": "civicrm/test-afform",
-  "title": "This is a test",
-  "requires": [
-    "af", "afBlock", "afField", "afCore"
-  ]
+  "title": "This is a test"
 }

From 74f862e4e950c0d0418df4041a4114ed8ac6d1b7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 20:16:14 -0700
Subject: [PATCH 477/834] afform_mock - Add test-coverage for auto-requires
 functionality

---
 .../core/Civi/Api4/Action/Afform/Update.php   |  2 +-
 ext/afform/core/Civi/Api4/Afform.php          |  2 +-
 ext/afform/core/afform.php                    | 12 ++++++
 ext/afform/mock/ang/mockPage.aff.json         |  2 +-
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 43 +++++++++++++++++++
 5 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Update.php b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
index 212c252fb1fb..4ee3130426b0 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Update.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
@@ -56,7 +56,7 @@ protected function writeRecord($item) {
     }
 
     // We may have changed list of files covered by the cache.
-    $scanner->clear();
+    _afform_clear();
 
     if (isset($updates['server_route']) && $updates['server_route'] !== $orig[0]['server_route']) {
       \CRM_Core_Menu::store();
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 75b2095d87e2..86e26a4d9567 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -40,7 +40,7 @@ public static function revert() {
       }
 
       // We may have changed list of files covered by the cache.
-      $scanner->clear();
+      _afform_clear();
 
       // FIXME if `server_route` changes, then flush the menu cache.
       // FIXME if asset-caching is enabled, then flush the asset cache
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 605a186f1843..167af68d6703 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -423,6 +423,18 @@ function afform_civicrm_alterMenu(&$items) {
   }
 }
 
+/**
+ * Clear any local/in-memory caches based on afform data.
+ */
+function _afform_clear() {
+  $container = \Civi::container();
+  $container->get('afform_scanner')->clear();
+
+  // Civi\Angular\Manager doesn't currently have a way to clear its in-memory
+  // data, so we just reset the whole object.
+  $container->set('angular', NULL);
+}
+
 /**
  * @param string $fileBaseName
  *   Ex: foo-bar
diff --git a/ext/afform/mock/ang/mockPage.aff.json b/ext/afform/mock/ang/mockPage.aff.json
index bd3a6baf25f8..9b45e0bfbebc 100644
--- a/ext/afform/mock/ang/mockPage.aff.json
+++ b/ext/afform/mock/ang/mockPage.aff.json
@@ -1 +1 @@
-{"server_route": "civicrm/mock-page", "requires":["mockFoo", "mockBareFile"]}
+{"server_route": "civicrm/mock-page", "requires":["extraMock"]}
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 2bbc3e106cd0..538e977e5e4a 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -6,6 +6,8 @@
  * @group headless
  */
 class api_v4_AfformTest extends api_v4_AfformTestCase {
+  use \Civi\Test\Api3TestTrait;
+  use \Civi\Test\ContactTestTrait;
 
   public function getBasicDirectives() {
     return [
@@ -115,4 +117,45 @@ public function testUpdateAndGetFormat($directiveName, $updateFormat, $updateLay
     Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
   }
 
+  public function testAutoRequires() {
+    $directiveName = 'mockPage';
+    $this->createLoggedInUser();
+
+    // The default mockPage has 1 explicit requirement + 2 automatic requirements.
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+    $angModule = Civi::service('angular')->getModule($directiveName);
+    $this->assertEquals(['afCore', 'extraMock', 'mockBareFile', 'mockFoo'], $angModule['requires']);
+    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->addSelect('requires')->execute();
+    $this->assertEquals(['extraMock'], $storedRequires[0]['requires']);
+
+    // Knock down to 1 explicit + 1 automatic.
+    Civi\Api4\Afform::update()
+      ->addWhere('name', '=', $directiveName)
+      ->setLayoutFormat('html')
+      ->setValues(['layout' => '<div>The bare file says "<span mock-bare-file/>"</div>'])
+      ->execute();
+    $angModule = Civi::service('angular')->getModule($directiveName);
+    $this->assertEquals(['afCore', 'extraMock', 'mockBareFile'], $angModule['requires']);
+    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->addSelect('requires')->execute();
+    $this->assertEquals(['extraMock'], $storedRequires[0]['requires']);
+
+    // Remove the last explict and implicit requirements.
+    Civi\Api4\Afform::update()
+      ->addWhere('name', '=', $directiveName)
+      ->setLayoutFormat('html')
+      ->setValues([
+        'layout' => '<div>The file has nothing! <strong>NOTHING!</strong> <em>JUST RANTING!</em></div>',
+        'requires' => [],
+      ])
+      ->execute();
+    $angModule = Civi::service('angular')->getModule($directiveName);
+    $this->assertEquals(['afCore'], $angModule['requires']);
+    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->addSelect('requires')->execute();
+    $this->assertEquals([], $storedRequires[0]['requires']);
+
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+    $angModule = Civi::service('angular')->getModule($directiveName);
+    $this->assertEquals(['afCore', 'extraMock', 'mockBareFile', 'mockFoo'], $angModule['requires']);
+  }
+
 }

From 2331541111c709d5112ea922ffc18cc8171f4140 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 20:46:17 -0700
Subject: [PATCH 478/834] 'exports' - Specify symbols in notation more like
 Angular directives ("A", "AE", etc)

---
 ext/afform/core/afform.php           | 31 ++++++++++++++++++----------
 ext/afform/core/ang/af.ang.php       |  5 +++--
 ext/afform/core/ang/afBlock.ang.php  |  4 ++--
 ext/afform/core/ang/afField.ang.php  |  3 +--
 ext/afform/html/ang/afMoncao.ang.php |  2 +-
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 167af68d6703..735b678c197f 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -174,9 +174,7 @@ function afform_civicrm_angularModules(&$angularModules) {
       'requires' => $meta['requires'],
       'basePages' => [],
       'exports' => [
-        // Each afform is an attribute and an element.
-        'el' => [_afform_angular_module_name($name, 'dash')],
-        'attr' => [_afform_angular_module_name($name, 'dash')],
+        _afform_angular_module_name($name, 'dash') => 'AE',
       ],
     ];
 
@@ -268,20 +266,31 @@ function _afform_civicrm_angularModules_autoReq($e) {
  *   'el': array(string $elementName => string $angModuleName)
  */
 function _afform_reverse_deps($angularModules) {
-  $revMap = [];
-  foreach (['attr', 'el'] as $exportType) {
-    $revMap[$exportType] = [];
-    foreach (array_keys($angularModules) as $module) {
-      if (isset($angularModules[$module]['exports'][$exportType])) {
-        foreach ($angularModules[$module]['exports'][$exportType] as $exportItem) {
-          $revMap[$exportType][$exportItem] = $module;
-        }
+  $revMap = ['attr' => [], 'el' => []];
+  foreach (array_keys($angularModules) as $module) {
+    if (!isset($angularModules[$module]['exports'])) {
+      continue;
+    }
+    foreach ($angularModules[$module]['exports'] as $symbolName => $symbolTypes) {
+      if (strpos($symbolTypes, 'A') !== FALSE) {
+        $revMap['attr'][$symbolName] = $module;
+      }
+      if (strpos($symbolTypes, 'E') !== FALSE) {
+        $revMap['el'][$symbolName] = $module;
       }
     }
   }
   return $revMap;
 }
 
+/**
+ * @param string $formName
+ * @param string $html
+ * @param array $revMap
+ *   The reverse-dependencies map from _afform_reverse_deps().
+ * @return array
+ * @see _afform_reverse_deps()
+ */
 function _afform_reverse_deps_find($formName, $html, $revMap) {
   $symbols = \Civi\Afform\Symbols::scan($html);
   $elems = array_intersect_key($revMap['el'], $symbols->elements);
diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index 68c90678490f..a97b53814242 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -15,7 +15,8 @@
   'settings' => [],
   'basePages' => [],
   'exports' => [
-    'el' => ['af-entity', 'af-fieldset', 'af-form'],
-    'attr' => ['af-entity', 'af-fieldset', 'af-form'],
+    'af-entity' => 'AE',
+    'af-fieldset' => 'AE',
+    'af-form' => 'AE',
   ],
 ];
diff --git a/ext/afform/core/ang/afBlock.ang.php b/ext/afform/core/ang/afBlock.ang.php
index af988bb72381..ccf473bb1fb1 100644
--- a/ext/afform/core/ang/afBlock.ang.php
+++ b/ext/afform/core/ang/afBlock.ang.php
@@ -18,7 +18,7 @@
   'settings' => [],
   'basePages' => [],
   'exports' => [
-    'el' => ['af-block-contact-name', 'af-block-contact-email'],
-    'attr' => ['af-block-contact-name', 'af-block-contact-email'],
+    'af-block-contact-name' => 'AE',
+    'af-block-contact-email' => 'AE',
   ],
 ];
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
index ac52351553e3..a50114e60d8b 100644
--- a/ext/afform/core/ang/afField.ang.php
+++ b/ext/afform/core/ang/afField.ang.php
@@ -18,7 +18,6 @@
   'settings' => [],
   'basePages' => [],
   'exports' => [
-    'el' => ['af-field'],
-    'attr' => ['af-field'],
+    'af-field' => 'AE',
   ],
 ];
diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMoncao.ang.php
index d394532c1f70..81e069f2486d 100644
--- a/ext/afform/html/ang/afMoncao.ang.php
+++ b/ext/afform/html/ang/afMoncao.ang.php
@@ -20,6 +20,6 @@
   ],
   'basePages' => [],
   'exports' => [
-    'attr' => ['af-monaco'],
+    'af-monaco' => 'A',
   ],
 );

From 0dee563fb1766dfbe45b1b51dec933b7a3c2cb81 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 18 Oct 2019 20:49:28 -0700
Subject: [PATCH 479/834] afform_html - Fix typo in module name
 ("afMoncao"/"afMonaco")

---
 .../html/ang/{afMoncao.ang.php => afMonaco.ang.php}    | 10 +++++-----
 ext/afform/html/ang/afMonaco.css                       |  4 ++++
 ext/afform/html/ang/{afMoncao.js => afMonaco.js}       |  6 +++---
 ext/afform/html/ang/afMoncao.css                       |  4 ----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename ext/afform/html/ang/{afMoncao.ang.php => afMonaco.ang.php} (75%)
 create mode 100644 ext/afform/html/ang/afMonaco.css
 rename ext/afform/html/ang/{afMoncao.js => afMonaco.js} (93%)
 delete mode 100644 ext/afform/html/ang/afMoncao.css

diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMonaco.ang.php
similarity index 75%
rename from ext/afform/html/ang/afMoncao.ang.php
rename to ext/afform/html/ang/afMonaco.ang.php
index 81e069f2486d..5c99071e213f 100644
--- a/ext/afform/html/ang/afMoncao.ang.php
+++ b/ext/afform/html/ang/afMonaco.ang.php
@@ -6,12 +6,12 @@
 return array(
   'js' => [
     AFFORM_HTML_MONACO . '/loader.js',
-    'ang/afMoncao.js',
-    //    'ang/afMoncao/*.js',
-    //    'ang/afMoncao/*/*.js',
+    'ang/afMonaco.js',
+    //    'ang/afMonaco/*.js',
+    //    'ang/afMonaco/*/*.js',
   ],
-  'css' => ['ang/afMoncao.css'],
-  // 'partials' => ['ang/afMoncao'],
+  'css' => ['ang/afMonaco.css'],
+  // 'partials' => ['ang/afMonaco'],
   'requires' => ['crmUi', 'crmUtil'],
   'settings' => [
     'paths' => [
diff --git a/ext/afform/html/ang/afMonaco.css b/ext/afform/html/ang/afMonaco.css
new file mode 100644
index 000000000000..01029b1f2b8d
--- /dev/null
+++ b/ext/afform/html/ang/afMonaco.css
@@ -0,0 +1,4 @@
+/* Add any CSS rules for Angular module "afMonaco" */
+.af-monaco-container {
+    border:1px solid grey;
+}
\ No newline at end of file
diff --git a/ext/afform/html/ang/afMoncao.js b/ext/afform/html/ang/afMonaco.js
similarity index 93%
rename from ext/afform/html/ang/afMoncao.js
rename to ext/afform/html/ang/afMonaco.js
index 6d47f4ea0789..3e0009b7af68 100644
--- a/ext/afform/html/ang/afMoncao.js
+++ b/ext/afform/html/ang/afMonaco.js
@@ -1,9 +1,9 @@
 (function(angular, $, _) {
-  angular.module('afMoncao', CRM.angRequires('afMoncao'));
+  angular.module('afMonaco', CRM.angRequires('afMonaco'));
 
   // "afMonaco" is a basic skeletal directive.
   // Example usage: <div af-monaco ng-model="my.content"></div>
-  angular.module('afMoncao').directive('afMonaco', function($timeout) {
+  angular.module('afMonaco').directive('afMonaco', function($timeout) {
     return {
       restrict: 'AE',
       require: 'ngModel',
@@ -11,7 +11,7 @@
       link: function($scope, $el, $attr, ngModel) {
         var heightPct = 0.70;
         var editor;
-        require.config({paths: CRM.afMoncao.paths});
+        require.config({paths: CRM.afMonaco.paths});
         require(['vs/editor/editor.main'], function() {
           var editorEl = $el.find('.af-monaco-container');
           editorEl.css({height: Math.round(heightPct * $(window).height())});
diff --git a/ext/afform/html/ang/afMoncao.css b/ext/afform/html/ang/afMoncao.css
deleted file mode 100644
index 58ed3679e4c0..000000000000
--- a/ext/afform/html/ang/afMoncao.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Add any CSS rules for Angular module "afMoncao" */
-.af-monaco-container {
-    border:1px solid grey;
-}
\ No newline at end of file

From c54f538f183a34791c6d4ea499afc914868397c6 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 23 Oct 2019 09:47:04 -0400
Subject: [PATCH 480/834] Delete unused files

---
 ext/afform/html/ang/afHtmlEditor.aff.json | 3 ---
 ext/afform/html/ang/afHtmlList.aff.json   | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 ext/afform/html/ang/afHtmlEditor.aff.json
 delete mode 100644 ext/afform/html/ang/afHtmlList.aff.json

diff --git a/ext/afform/html/ang/afHtmlEditor.aff.json b/ext/afform/html/ang/afHtmlEditor.aff.json
deleted file mode 100644
index f8cd0cc16888..000000000000
--- a/ext/afform/html/ang/afHtmlEditor.aff.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "title": "Afform HTML Editor"
-}
diff --git a/ext/afform/html/ang/afHtmlList.aff.json b/ext/afform/html/ang/afHtmlList.aff.json
deleted file mode 100644
index e412a325d398..000000000000
--- a/ext/afform/html/ang/afHtmlList.aff.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "title": "Afform HTML List"
-}

From 98f4a7cb6769f0fb85effdd0c28c8d4538a34b33 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 23 Oct 2019 17:34:54 -0700
Subject: [PATCH 481/834] afform/core - Update extension boilerplate

---
 ext/afform/core/afform.civix.php | 107 ++++++++++++++++++-------------
 ext/afform/core/afform.php       |   7 ++
 2 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/ext/afform/core/afform.civix.php b/ext/afform/core/afform.civix.php
index 2d7c1c54b8e5..17db0361bdd5 100644
--- a/ext/afform/core/afform.civix.php
+++ b/ext/afform/core/afform.civix.php
@@ -24,9 +24,9 @@ class CRM_Afform_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = array()) {
+  public static function ts($text, $params = []) {
     if (!array_key_exists('domain', $params)) {
-      $params['domain'] = array(self::LONG_NAME, NULL);
+      $params['domain'] = [self::LONG_NAME, NULL];
     }
     return ts($text, $params);
   }
@@ -82,7 +82,7 @@ public static function findClass($suffix) {
 /**
  * (Delegated) Implements hook_civicrm_config().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
 function _afform_civix_civicrm_config(&$config = NULL) {
   static $configured = FALSE;
@@ -100,7 +100,7 @@ function _afform_civix_civicrm_config(&$config = NULL) {
     array_unshift($template->template_dir, $extDir);
   }
   else {
-    $template->template_dir = array($extDir, $template->template_dir);
+    $template->template_dir = [$extDir, $template->template_dir];
   }
 
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
@@ -112,7 +112,7 @@ function _afform_civix_civicrm_config(&$config = NULL) {
  *
  * @param $files array(string)
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
  */
 function _afform_civix_civicrm_xmlMenu(&$files) {
   foreach (_afform_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
@@ -123,7 +123,7 @@ function _afform_civix_civicrm_xmlMenu(&$files) {
 /**
  * Implements hook_civicrm_install().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
  */
 function _afform_civix_civicrm_install() {
   _afform_civix_civicrm_config();
@@ -135,12 +135,12 @@ function _afform_civix_civicrm_install() {
 /**
  * Implements hook_civicrm_postInstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
  */
 function _afform_civix_civicrm_postInstall() {
   _afform_civix_civicrm_config();
   if ($upgrader = _afform_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onPostInstall'))) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
       $upgrader->onPostInstall();
     }
   }
@@ -149,7 +149,7 @@ function _afform_civix_civicrm_postInstall() {
 /**
  * Implements hook_civicrm_uninstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
 function _afform_civix_civicrm_uninstall() {
   _afform_civix_civicrm_config();
@@ -161,12 +161,12 @@ function _afform_civix_civicrm_uninstall() {
 /**
  * (Delegated) Implements hook_civicrm_enable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
 function _afform_civix_civicrm_enable() {
   _afform_civix_civicrm_config();
   if ($upgrader = _afform_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onEnable'))) {
+    if (is_callable([$upgrader, 'onEnable'])) {
       $upgrader->onEnable();
     }
   }
@@ -175,13 +175,13 @@ function _afform_civix_civicrm_enable() {
 /**
  * (Delegated) Implements hook_civicrm_disable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
 function _afform_civix_civicrm_disable() {
   _afform_civix_civicrm_config();
   if ($upgrader = _afform_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onDisable'))) {
+    if (is_callable([$upgrader, 'onDisable'])) {
       $upgrader->onDisable();
     }
   }
@@ -196,7 +196,7 @@ function _afform_civix_civicrm_disable() {
  * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
  *                for 'enqueue', returns void
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
 function _afform_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
   if ($upgrader = _afform_civix_upgrader()) {
@@ -217,22 +217,23 @@ function _afform_civix_upgrader() {
 }
 
 /**
- * Search directory tree for files which match a glob pattern
+ * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
  * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
  *
- * @param $dir string, base dir
- * @param $pattern string, glob pattern, eg "*.txt"
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
  * @return array(string)
  */
 function _afform_civix_find_files($dir, $pattern) {
-  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
     return CRM_Utils_File::findFiles($dir, $pattern);
   }
 
-  $todos = array($dir);
-  $result = array();
+  $todos = [$dir];
+  $result = [];
   while (!empty($todos)) {
     $subdir = array_shift($todos);
     foreach (_afform_civix_glob("$subdir/$pattern") as $match) {
@@ -259,20 +260,21 @@ function _afform_civix_find_files($dir, $pattern) {
  *
  * Find any *.mgd.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
  */
 function _afform_civix_civicrm_managed(&$entities) {
   $mgdFiles = _afform_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
   foreach ($mgdFiles as $file) {
     $es = include $file;
     foreach ($es as $e) {
       if (empty($e['module'])) {
         $e['module'] = E::LONG_NAME;
       }
-      $entities[] = $e;
       if (empty($e['params']['version'])) {
         $e['params']['version'] = '3';
       }
+      $entities[] = $e;
     }
   }
 }
@@ -284,7 +286,7 @@ function _afform_civix_civicrm_managed(&$entities) {
  *
  * Note: This hook only runs in CiviCRM 4.4+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
  */
 function _afform_civix_civicrm_caseTypes(&$caseTypes) {
   if (!is_dir(__DIR__ . '/xml/case')) {
@@ -295,14 +297,13 @@ function _afform_civix_civicrm_caseTypes(&$caseTypes) {
     $name = preg_replace('/\.xml$/', '', basename($file));
     if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
       $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
-      CRM_Core_Error::fatal($errorMessage);
-      // throw new CRM_Core_Exception($errorMessage);
+      throw new CRM_Core_Exception($errorMessage);
     }
-    $caseTypes[$name] = array(
+    $caseTypes[$name] = [
       'module' => E::LONG_NAME,
       'name' => $name,
       'file' => $file,
-    );
+    ];
   }
 }
 
@@ -313,7 +314,7 @@ function _afform_civix_civicrm_caseTypes(&$caseTypes) {
  *
  * Note: This hook only runs in CiviCRM 4.5+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
 function _afform_civix_civicrm_angularModules(&$angularModules) {
   if (!is_dir(__DIR__ . '/ang')) {
@@ -331,6 +332,25 @@ function _afform_civix_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _afform_civix_civicrm_themes(&$themes) {
+  $files = _afform_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
 /**
  * Glob wrapper which is guaranteed to return an array.
  *
@@ -341,11 +361,12 @@ function _afform_civix_civicrm_angularModules(&$angularModules) {
  *
  * @link http://php.net/glob
  * @param string $pattern
+ *
  * @return array, possibly empty
  */
 function _afform_civix_glob($pattern) {
   $result = glob($pattern);
-  return is_array($result) ? $result : array();
+  return is_array($result) ? $result : [];
 }
 
 /**
@@ -356,16 +377,18 @@ function _afform_civix_glob($pattern) {
  *    'Mailing', or 'Administer/System Settings'
  * @param array $item - the item to insert (parent/child attributes will be
  *    filled for you)
+ *
+ * @return bool
  */
 function _afform_civix_insert_navigation_menu(&$menu, $path, $item) {
   // If we are done going down the path, insert menu
   if (empty($path)) {
-    $menu[] = array(
-      'attributes' => array_merge(array(
+    $menu[] = [
+      'attributes' => array_merge([
         'label'      => CRM_Utils_Array::value('name', $item),
         'active'     => 1,
-      ), $item),
-    );
+      ], $item),
+    ];
     return TRUE;
   }
   else {
@@ -376,9 +399,9 @@ function _afform_civix_insert_navigation_menu(&$menu, $path, $item) {
     foreach ($menu as $key => &$entry) {
       if ($entry['attributes']['name'] == $first) {
         if (!isset($entry['child'])) {
-          $entry['child'] = array();
+          $entry['child'] = [];
         }
-        $found = _afform_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+        $found = _afform_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
       }
     }
     return $found;
@@ -389,7 +412,7 @@ function _afform_civix_insert_navigation_menu(&$menu, $path, $item) {
  * (Delegated) Implements hook_civicrm_navigationMenu().
  */
 function _afform_civix_navigationMenu(&$nodes) {
-  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
     _afform_civix_fixNavigationMenu($nodes);
   }
 }
@@ -431,17 +454,11 @@ function _afform_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) {
 /**
  * (Delegated) Implements hook_civicrm_alterSettingsFolders().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
  */
 function _afform_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  static $configured = FALSE;
-  if ($configured) {
-    return;
-  }
-  $configured = TRUE;
-
   $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
-  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
     $metaDataFolders[] = $settingsDir;
   }
 }
@@ -451,7 +468,7 @@ function _afform_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  *
  * Find any *.entityType.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
 
 function _afform_civix_civicrm_entityTypes(&$entityTypes) {
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 735b678c197f..c4ea5305fa68 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -370,6 +370,13 @@ function afform_civicrm_entityTypes(&$entityTypes) {
   _afform_civix_civicrm_entityTypes($entityTypes);
 }
 
+/**
+ * Implements hook_civicrm_themes().
+ */
+function afform_civicrm_themes(&$themes) {
+  _afform_civix_civicrm_themes($themes);
+}
+
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**

From 0a496a3f17c15de836228f3c796218363f44c618 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 23 Oct 2019 17:35:12 -0700
Subject: [PATCH 482/834] afform/html - Update extension boilerplate

---
 ext/afform/html/afform_html.civix.php | 104 +++++++++++++++-----------
 ext/afform/html/afform_html.php       |   7 ++
 2 files changed, 67 insertions(+), 44 deletions(-)

diff --git a/ext/afform/html/afform_html.civix.php b/ext/afform/html/afform_html.civix.php
index ae00f38e1a68..3e06b6081760 100644
--- a/ext/afform/html/afform_html.civix.php
+++ b/ext/afform/html/afform_html.civix.php
@@ -24,9 +24,9 @@ class CRM_AfformHtml_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = array()) {
+  public static function ts($text, $params = []) {
     if (!array_key_exists('domain', $params)) {
-      $params['domain'] = array(self::LONG_NAME, NULL);
+      $params['domain'] = [self::LONG_NAME, NULL];
     }
     return ts($text, $params);
   }
@@ -82,7 +82,7 @@ public static function findClass($suffix) {
 /**
  * (Delegated) Implements hook_civicrm_config().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
 function _afform_html_civix_civicrm_config(&$config = NULL) {
   static $configured = FALSE;
@@ -100,7 +100,7 @@ function _afform_html_civix_civicrm_config(&$config = NULL) {
     array_unshift($template->template_dir, $extDir);
   }
   else {
-    $template->template_dir = array($extDir, $template->template_dir);
+    $template->template_dir = [$extDir, $template->template_dir];
   }
 
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
@@ -112,7 +112,7 @@ function _afform_html_civix_civicrm_config(&$config = NULL) {
  *
  * @param $files array(string)
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
  */
 function _afform_html_civix_civicrm_xmlMenu(&$files) {
   foreach (_afform_html_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
@@ -123,7 +123,7 @@ function _afform_html_civix_civicrm_xmlMenu(&$files) {
 /**
  * Implements hook_civicrm_install().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
  */
 function _afform_html_civix_civicrm_install() {
   _afform_html_civix_civicrm_config();
@@ -135,12 +135,12 @@ function _afform_html_civix_civicrm_install() {
 /**
  * Implements hook_civicrm_postInstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
  */
 function _afform_html_civix_civicrm_postInstall() {
   _afform_html_civix_civicrm_config();
   if ($upgrader = _afform_html_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onPostInstall'))) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
       $upgrader->onPostInstall();
     }
   }
@@ -149,7 +149,7 @@ function _afform_html_civix_civicrm_postInstall() {
 /**
  * Implements hook_civicrm_uninstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
 function _afform_html_civix_civicrm_uninstall() {
   _afform_html_civix_civicrm_config();
@@ -161,12 +161,12 @@ function _afform_html_civix_civicrm_uninstall() {
 /**
  * (Delegated) Implements hook_civicrm_enable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
 function _afform_html_civix_civicrm_enable() {
   _afform_html_civix_civicrm_config();
   if ($upgrader = _afform_html_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onEnable'))) {
+    if (is_callable([$upgrader, 'onEnable'])) {
       $upgrader->onEnable();
     }
   }
@@ -175,13 +175,13 @@ function _afform_html_civix_civicrm_enable() {
 /**
  * (Delegated) Implements hook_civicrm_disable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
 function _afform_html_civix_civicrm_disable() {
   _afform_html_civix_civicrm_config();
   if ($upgrader = _afform_html_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onDisable'))) {
+    if (is_callable([$upgrader, 'onDisable'])) {
       $upgrader->onDisable();
     }
   }
@@ -196,7 +196,7 @@ function _afform_html_civix_civicrm_disable() {
  * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
  *                for 'enqueue', returns void
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
 function _afform_html_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
   if ($upgrader = _afform_html_civix_upgrader()) {
@@ -217,22 +217,23 @@ function _afform_html_civix_upgrader() {
 }
 
 /**
- * Search directory tree for files which match a glob pattern
+ * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
  * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
  *
- * @param $dir string, base dir
- * @param $pattern string, glob pattern, eg "*.txt"
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
  * @return array(string)
  */
 function _afform_html_civix_find_files($dir, $pattern) {
-  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
     return CRM_Utils_File::findFiles($dir, $pattern);
   }
 
-  $todos = array($dir);
-  $result = array();
+  $todos = [$dir];
+  $result = [];
   while (!empty($todos)) {
     $subdir = array_shift($todos);
     foreach (_afform_html_civix_glob("$subdir/$pattern") as $match) {
@@ -259,7 +260,7 @@ function _afform_html_civix_find_files($dir, $pattern) {
  *
  * Find any *.mgd.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
  */
 function _afform_html_civix_civicrm_managed(&$entities) {
   $mgdFiles = _afform_html_civix_find_files(__DIR__, '*.mgd.php');
@@ -285,7 +286,7 @@ function _afform_html_civix_civicrm_managed(&$entities) {
  *
  * Note: This hook only runs in CiviCRM 4.4+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
  */
 function _afform_html_civix_civicrm_caseTypes(&$caseTypes) {
   if (!is_dir(__DIR__ . '/xml/case')) {
@@ -296,14 +297,13 @@ function _afform_html_civix_civicrm_caseTypes(&$caseTypes) {
     $name = preg_replace('/\.xml$/', '', basename($file));
     if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
       $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
-      CRM_Core_Error::fatal($errorMessage);
-      // throw new CRM_Core_Exception($errorMessage);
+      throw new CRM_Core_Exception($errorMessage);
     }
-    $caseTypes[$name] = array(
+    $caseTypes[$name] = [
       'module' => E::LONG_NAME,
       'name' => $name,
       'file' => $file,
-    );
+    ];
   }
 }
 
@@ -314,7 +314,7 @@ function _afform_html_civix_civicrm_caseTypes(&$caseTypes) {
  *
  * Note: This hook only runs in CiviCRM 4.5+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
 function _afform_html_civix_civicrm_angularModules(&$angularModules) {
   if (!is_dir(__DIR__ . '/ang')) {
@@ -332,6 +332,25 @@ function _afform_html_civix_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _afform_html_civix_civicrm_themes(&$themes) {
+  $files = _afform_html_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
 /**
  * Glob wrapper which is guaranteed to return an array.
  *
@@ -342,11 +361,12 @@ function _afform_html_civix_civicrm_angularModules(&$angularModules) {
  *
  * @link http://php.net/glob
  * @param string $pattern
+ *
  * @return array, possibly empty
  */
 function _afform_html_civix_glob($pattern) {
   $result = glob($pattern);
-  return is_array($result) ? $result : array();
+  return is_array($result) ? $result : [];
 }
 
 /**
@@ -357,16 +377,18 @@ function _afform_html_civix_glob($pattern) {
  *    'Mailing', or 'Administer/System Settings'
  * @param array $item - the item to insert (parent/child attributes will be
  *    filled for you)
+ *
+ * @return bool
  */
 function _afform_html_civix_insert_navigation_menu(&$menu, $path, $item) {
   // If we are done going down the path, insert menu
   if (empty($path)) {
-    $menu[] = array(
-      'attributes' => array_merge(array(
+    $menu[] = [
+      'attributes' => array_merge([
         'label'      => CRM_Utils_Array::value('name', $item),
         'active'     => 1,
-      ), $item),
-    );
+      ], $item),
+    ];
     return TRUE;
   }
   else {
@@ -377,9 +399,9 @@ function _afform_html_civix_insert_navigation_menu(&$menu, $path, $item) {
     foreach ($menu as $key => &$entry) {
       if ($entry['attributes']['name'] == $first) {
         if (!isset($entry['child'])) {
-          $entry['child'] = array();
+          $entry['child'] = [];
         }
-        $found = _afform_html_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+        $found = _afform_html_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
       }
     }
     return $found;
@@ -390,7 +412,7 @@ function _afform_html_civix_insert_navigation_menu(&$menu, $path, $item) {
  * (Delegated) Implements hook_civicrm_navigationMenu().
  */
 function _afform_html_civix_navigationMenu(&$nodes) {
-  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
     _afform_html_civix_fixNavigationMenu($nodes);
   }
 }
@@ -432,17 +454,11 @@ function _afform_html_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentI
 /**
  * (Delegated) Implements hook_civicrm_alterSettingsFolders().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
  */
 function _afform_html_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  static $configured = FALSE;
-  if ($configured) {
-    return;
-  }
-  $configured = TRUE;
-
   $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
-  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
     $metaDataFolders[] = $settingsDir;
   }
 }
@@ -452,7 +468,7 @@ function _afform_html_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NUL
  *
  * Find any *.entityType.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
 
 function _afform_html_civix_civicrm_entityTypes(&$entityTypes) {
diff --git a/ext/afform/html/afform_html.php b/ext/afform/html/afform_html.php
index f5fcfed3dab6..3a06031fc4df 100644
--- a/ext/afform/html/afform_html.php
+++ b/ext/afform/html/afform_html.php
@@ -138,6 +138,13 @@ function afform_html_civicrm_entityTypes(&$entityTypes) {
   _afform_html_civix_civicrm_entityTypes($entityTypes);
 }
 
+/**
+ * Implements hook_civicrm_themes().
+ */
+function afform_html_civicrm_themes(&$themes) {
+  _afform_html_civix_civicrm_themes($themes);
+}
+
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**

From 7620445e056808bbc2459a411b82e3c84582fe97 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 23 Oct 2019 17:35:18 -0700
Subject: [PATCH 483/834] afform/gui - Update extension boilerplate

---
 ext/afform/gui/afform_gui.civix.php | 107 ++++++++++++++++------------
 ext/afform/gui/afform_gui.php       |   7 ++
 2 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/ext/afform/gui/afform_gui.civix.php b/ext/afform/gui/afform_gui.civix.php
index 0188d1cb9750..c8a4f361cdc5 100644
--- a/ext/afform/gui/afform_gui.civix.php
+++ b/ext/afform/gui/afform_gui.civix.php
@@ -24,9 +24,9 @@ class CRM_AfformGui_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = array()) {
+  public static function ts($text, $params = []) {
     if (!array_key_exists('domain', $params)) {
-      $params['domain'] = array(self::LONG_NAME, NULL);
+      $params['domain'] = [self::LONG_NAME, NULL];
     }
     return ts($text, $params);
   }
@@ -82,7 +82,7 @@ public static function findClass($suffix) {
 /**
  * (Delegated) Implements hook_civicrm_config().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
 function _afform_gui_civix_civicrm_config(&$config = NULL) {
   static $configured = FALSE;
@@ -100,7 +100,7 @@ function _afform_gui_civix_civicrm_config(&$config = NULL) {
     array_unshift($template->template_dir, $extDir);
   }
   else {
-    $template->template_dir = array($extDir, $template->template_dir);
+    $template->template_dir = [$extDir, $template->template_dir];
   }
 
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
@@ -112,7 +112,7 @@ function _afform_gui_civix_civicrm_config(&$config = NULL) {
  *
  * @param $files array(string)
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
  */
 function _afform_gui_civix_civicrm_xmlMenu(&$files) {
   foreach (_afform_gui_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
@@ -123,7 +123,7 @@ function _afform_gui_civix_civicrm_xmlMenu(&$files) {
 /**
  * Implements hook_civicrm_install().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
  */
 function _afform_gui_civix_civicrm_install() {
   _afform_gui_civix_civicrm_config();
@@ -135,12 +135,12 @@ function _afform_gui_civix_civicrm_install() {
 /**
  * Implements hook_civicrm_postInstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
  */
 function _afform_gui_civix_civicrm_postInstall() {
   _afform_gui_civix_civicrm_config();
   if ($upgrader = _afform_gui_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onPostInstall'))) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
       $upgrader->onPostInstall();
     }
   }
@@ -149,7 +149,7 @@ function _afform_gui_civix_civicrm_postInstall() {
 /**
  * Implements hook_civicrm_uninstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
 function _afform_gui_civix_civicrm_uninstall() {
   _afform_gui_civix_civicrm_config();
@@ -161,12 +161,12 @@ function _afform_gui_civix_civicrm_uninstall() {
 /**
  * (Delegated) Implements hook_civicrm_enable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
 function _afform_gui_civix_civicrm_enable() {
   _afform_gui_civix_civicrm_config();
   if ($upgrader = _afform_gui_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onEnable'))) {
+    if (is_callable([$upgrader, 'onEnable'])) {
       $upgrader->onEnable();
     }
   }
@@ -175,13 +175,13 @@ function _afform_gui_civix_civicrm_enable() {
 /**
  * (Delegated) Implements hook_civicrm_disable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
 function _afform_gui_civix_civicrm_disable() {
   _afform_gui_civix_civicrm_config();
   if ($upgrader = _afform_gui_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onDisable'))) {
+    if (is_callable([$upgrader, 'onDisable'])) {
       $upgrader->onDisable();
     }
   }
@@ -196,7 +196,7 @@ function _afform_gui_civix_civicrm_disable() {
  * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
  *                for 'enqueue', returns void
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
 function _afform_gui_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
   if ($upgrader = _afform_gui_civix_upgrader()) {
@@ -217,22 +217,23 @@ function _afform_gui_civix_upgrader() {
 }
 
 /**
- * Search directory tree for files which match a glob pattern
+ * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
  * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
  *
- * @param $dir string, base dir
- * @param $pattern string, glob pattern, eg "*.txt"
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
  * @return array(string)
  */
 function _afform_gui_civix_find_files($dir, $pattern) {
-  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
     return CRM_Utils_File::findFiles($dir, $pattern);
   }
 
-  $todos = array($dir);
-  $result = array();
+  $todos = [$dir];
+  $result = [];
   while (!empty($todos)) {
     $subdir = array_shift($todos);
     foreach (_afform_gui_civix_glob("$subdir/$pattern") as $match) {
@@ -259,20 +260,21 @@ function _afform_gui_civix_find_files($dir, $pattern) {
  *
  * Find any *.mgd.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
  */
 function _afform_gui_civix_civicrm_managed(&$entities) {
   $mgdFiles = _afform_gui_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
   foreach ($mgdFiles as $file) {
     $es = include $file;
     foreach ($es as $e) {
       if (empty($e['module'])) {
         $e['module'] = E::LONG_NAME;
       }
-      $entities[] = $e;
       if (empty($e['params']['version'])) {
         $e['params']['version'] = '3';
       }
+      $entities[] = $e;
     }
   }
 }
@@ -284,7 +286,7 @@ function _afform_gui_civix_civicrm_managed(&$entities) {
  *
  * Note: This hook only runs in CiviCRM 4.4+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
  */
 function _afform_gui_civix_civicrm_caseTypes(&$caseTypes) {
   if (!is_dir(__DIR__ . '/xml/case')) {
@@ -295,14 +297,13 @@ function _afform_gui_civix_civicrm_caseTypes(&$caseTypes) {
     $name = preg_replace('/\.xml$/', '', basename($file));
     if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
       $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
-      CRM_Core_Error::fatal($errorMessage);
-      // throw new CRM_Core_Exception($errorMessage);
+      throw new CRM_Core_Exception($errorMessage);
     }
-    $caseTypes[$name] = array(
+    $caseTypes[$name] = [
       'module' => E::LONG_NAME,
       'name' => $name,
       'file' => $file,
-    );
+    ];
   }
 }
 
@@ -313,7 +314,7 @@ function _afform_gui_civix_civicrm_caseTypes(&$caseTypes) {
  *
  * Note: This hook only runs in CiviCRM 4.5+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
 function _afform_gui_civix_civicrm_angularModules(&$angularModules) {
   if (!is_dir(__DIR__ . '/ang')) {
@@ -331,6 +332,25 @@ function _afform_gui_civix_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _afform_gui_civix_civicrm_themes(&$themes) {
+  $files = _afform_gui_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
 /**
  * Glob wrapper which is guaranteed to return an array.
  *
@@ -341,11 +361,12 @@ function _afform_gui_civix_civicrm_angularModules(&$angularModules) {
  *
  * @link http://php.net/glob
  * @param string $pattern
+ *
  * @return array, possibly empty
  */
 function _afform_gui_civix_glob($pattern) {
   $result = glob($pattern);
-  return is_array($result) ? $result : array();
+  return is_array($result) ? $result : [];
 }
 
 /**
@@ -356,16 +377,18 @@ function _afform_gui_civix_glob($pattern) {
  *    'Mailing', or 'Administer/System Settings'
  * @param array $item - the item to insert (parent/child attributes will be
  *    filled for you)
+ *
+ * @return bool
  */
 function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) {
   // If we are done going down the path, insert menu
   if (empty($path)) {
-    $menu[] = array(
-      'attributes' => array_merge(array(
+    $menu[] = [
+      'attributes' => array_merge([
         'label'      => CRM_Utils_Array::value('name', $item),
         'active'     => 1,
-      ), $item),
-    );
+      ], $item),
+    ];
     return TRUE;
   }
   else {
@@ -376,9 +399,9 @@ function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) {
     foreach ($menu as $key => &$entry) {
       if ($entry['attributes']['name'] == $first) {
         if (!isset($entry['child'])) {
-          $entry['child'] = array();
+          $entry['child'] = [];
         }
-        $found = _afform_gui_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+        $found = _afform_gui_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
       }
     }
     return $found;
@@ -389,7 +412,7 @@ function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) {
  * (Delegated) Implements hook_civicrm_navigationMenu().
  */
 function _afform_gui_civix_navigationMenu(&$nodes) {
-  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
     _afform_gui_civix_fixNavigationMenu($nodes);
   }
 }
@@ -431,17 +454,11 @@ function _afform_gui_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID
 /**
  * (Delegated) Implements hook_civicrm_alterSettingsFolders().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
  */
 function _afform_gui_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  static $configured = FALSE;
-  if ($configured) {
-    return;
-  }
-  $configured = TRUE;
-
   $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
-  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
     $metaDataFolders[] = $settingsDir;
   }
 }
@@ -451,7 +468,7 @@ function _afform_gui_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL
  *
  * Find any *.entityType.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
 
 function _afform_gui_civix_civicrm_entityTypes(&$entityTypes) {
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index da3a35c22148..9eef57b07f1b 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -134,6 +134,13 @@ function afform_gui_civicrm_entityTypes(&$entityTypes) {
   _afform_gui_civix_civicrm_entityTypes($entityTypes);
 }
 
+/**
+ * Implements hook_civicrm_themes().
+ */
+function afform_gui_civicrm_themes(&$themes) {
+  _afform_gui_civix_civicrm_themes($themes);
+}
+
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**

From 84f4e5cb9d76bcae79c15e266ab79d617f2315e0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 23 Oct 2019 17:35:24 -0700
Subject: [PATCH 484/834] afform/mock - Update extension boilerplate

---
 ext/afform/mock/afform_mock.civix.php | 105 +++++++++++++++-----------
 ext/afform/mock/afform_mock.php       |   7 ++
 2 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/ext/afform/mock/afform_mock.civix.php b/ext/afform/mock/afform_mock.civix.php
index 748493a573e5..04c6b632f19d 100644
--- a/ext/afform/mock/afform_mock.civix.php
+++ b/ext/afform/mock/afform_mock.civix.php
@@ -24,9 +24,9 @@ class CRM_AfformMock_ExtensionUtil {
    *   Translated text.
    * @see ts
    */
-  public static function ts($text, $params = array()) {
+  public static function ts($text, $params = []) {
     if (!array_key_exists('domain', $params)) {
-      $params['domain'] = array(self::LONG_NAME, NULL);
+      $params['domain'] = [self::LONG_NAME, NULL];
     }
     return ts($text, $params);
   }
@@ -82,7 +82,7 @@ public static function findClass($suffix) {
 /**
  * (Delegated) Implements hook_civicrm_config().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
  */
 function _afform_mock_civix_civicrm_config(&$config = NULL) {
   static $configured = FALSE;
@@ -100,7 +100,7 @@ function _afform_mock_civix_civicrm_config(&$config = NULL) {
     array_unshift($template->template_dir, $extDir);
   }
   else {
-    $template->template_dir = array($extDir, $template->template_dir);
+    $template->template_dir = [$extDir, $template->template_dir];
   }
 
   $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
@@ -112,7 +112,7 @@ function _afform_mock_civix_civicrm_config(&$config = NULL) {
  *
  * @param $files array(string)
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
  */
 function _afform_mock_civix_civicrm_xmlMenu(&$files) {
   foreach (_afform_mock_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
@@ -123,7 +123,7 @@ function _afform_mock_civix_civicrm_xmlMenu(&$files) {
 /**
  * Implements hook_civicrm_install().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
  */
 function _afform_mock_civix_civicrm_install() {
   _afform_mock_civix_civicrm_config();
@@ -135,12 +135,12 @@ function _afform_mock_civix_civicrm_install() {
 /**
  * Implements hook_civicrm_postInstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
  */
 function _afform_mock_civix_civicrm_postInstall() {
   _afform_mock_civix_civicrm_config();
   if ($upgrader = _afform_mock_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onPostInstall'))) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
       $upgrader->onPostInstall();
     }
   }
@@ -149,7 +149,7 @@ function _afform_mock_civix_civicrm_postInstall() {
 /**
  * Implements hook_civicrm_uninstall().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
  */
 function _afform_mock_civix_civicrm_uninstall() {
   _afform_mock_civix_civicrm_config();
@@ -161,12 +161,12 @@ function _afform_mock_civix_civicrm_uninstall() {
 /**
  * (Delegated) Implements hook_civicrm_enable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
  */
 function _afform_mock_civix_civicrm_enable() {
   _afform_mock_civix_civicrm_config();
   if ($upgrader = _afform_mock_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onEnable'))) {
+    if (is_callable([$upgrader, 'onEnable'])) {
       $upgrader->onEnable();
     }
   }
@@ -175,13 +175,13 @@ function _afform_mock_civix_civicrm_enable() {
 /**
  * (Delegated) Implements hook_civicrm_disable().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
  * @return mixed
  */
 function _afform_mock_civix_civicrm_disable() {
   _afform_mock_civix_civicrm_config();
   if ($upgrader = _afform_mock_civix_upgrader()) {
-    if (is_callable(array($upgrader, 'onDisable'))) {
+    if (is_callable([$upgrader, 'onDisable'])) {
       $upgrader->onDisable();
     }
   }
@@ -196,7 +196,7 @@ function _afform_mock_civix_civicrm_disable() {
  * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
  *                for 'enqueue', returns void
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
 function _afform_mock_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
   if ($upgrader = _afform_mock_civix_upgrader()) {
@@ -217,22 +217,23 @@ function _afform_mock_civix_upgrader() {
 }
 
 /**
- * Search directory tree for files which match a glob pattern
+ * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
  * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
  *
- * @param $dir string, base dir
- * @param $pattern string, glob pattern, eg "*.txt"
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
  * @return array(string)
  */
 function _afform_mock_civix_find_files($dir, $pattern) {
-  if (is_callable(array('CRM_Utils_File', 'findFiles'))) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
     return CRM_Utils_File::findFiles($dir, $pattern);
   }
 
-  $todos = array($dir);
-  $result = array();
+  $todos = [$dir];
+  $result = [];
   while (!empty($todos)) {
     $subdir = array_shift($todos);
     foreach (_afform_mock_civix_glob("$subdir/$pattern") as $match) {
@@ -259,10 +260,11 @@ function _afform_mock_civix_find_files($dir, $pattern) {
  *
  * Find any *.mgd.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
  */
 function _afform_mock_civix_civicrm_managed(&$entities) {
   $mgdFiles = _afform_mock_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
   foreach ($mgdFiles as $file) {
     $es = include $file;
     foreach ($es as $e) {
@@ -284,7 +286,7 @@ function _afform_mock_civix_civicrm_managed(&$entities) {
  *
  * Note: This hook only runs in CiviCRM 4.4+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
  */
 function _afform_mock_civix_civicrm_caseTypes(&$caseTypes) {
   if (!is_dir(__DIR__ . '/xml/case')) {
@@ -295,14 +297,13 @@ function _afform_mock_civix_civicrm_caseTypes(&$caseTypes) {
     $name = preg_replace('/\.xml$/', '', basename($file));
     if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
       $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
-      CRM_Core_Error::fatal($errorMessage);
-      // throw new CRM_Core_Exception($errorMessage);
+      throw new CRM_Core_Exception($errorMessage);
     }
-    $caseTypes[$name] = array(
+    $caseTypes[$name] = [
       'module' => E::LONG_NAME,
       'name' => $name,
       'file' => $file,
-    );
+    ];
   }
 }
 
@@ -313,7 +314,7 @@ function _afform_mock_civix_civicrm_caseTypes(&$caseTypes) {
  *
  * Note: This hook only runs in CiviCRM 4.5+.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
  */
 function _afform_mock_civix_civicrm_angularModules(&$angularModules) {
   if (!is_dir(__DIR__ . '/ang')) {
@@ -331,6 +332,25 @@ function _afform_mock_civix_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _afform_mock_civix_civicrm_themes(&$themes) {
+  $files = _afform_mock_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
 /**
  * Glob wrapper which is guaranteed to return an array.
  *
@@ -341,11 +361,12 @@ function _afform_mock_civix_civicrm_angularModules(&$angularModules) {
  *
  * @link http://php.net/glob
  * @param string $pattern
+ *
  * @return array, possibly empty
  */
 function _afform_mock_civix_glob($pattern) {
   $result = glob($pattern);
-  return is_array($result) ? $result : array();
+  return is_array($result) ? $result : [];
 }
 
 /**
@@ -356,16 +377,18 @@ function _afform_mock_civix_glob($pattern) {
  *    'Mailing', or 'Administer/System Settings'
  * @param array $item - the item to insert (parent/child attributes will be
  *    filled for you)
+ *
+ * @return bool
  */
 function _afform_mock_civix_insert_navigation_menu(&$menu, $path, $item) {
   // If we are done going down the path, insert menu
   if (empty($path)) {
-    $menu[] = array(
-      'attributes' => array_merge(array(
+    $menu[] = [
+      'attributes' => array_merge([
         'label'      => CRM_Utils_Array::value('name', $item),
         'active'     => 1,
-      ), $item),
-    );
+      ], $item),
+    ];
     return TRUE;
   }
   else {
@@ -376,9 +399,9 @@ function _afform_mock_civix_insert_navigation_menu(&$menu, $path, $item) {
     foreach ($menu as $key => &$entry) {
       if ($entry['attributes']['name'] == $first) {
         if (!isset($entry['child'])) {
-          $entry['child'] = array();
+          $entry['child'] = [];
         }
-        $found = _afform_mock_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item, $key);
+        $found = _afform_mock_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
       }
     }
     return $found;
@@ -389,7 +412,7 @@ function _afform_mock_civix_insert_navigation_menu(&$menu, $path, $item) {
  * (Delegated) Implements hook_civicrm_navigationMenu().
  */
 function _afform_mock_civix_navigationMenu(&$nodes) {
-  if (!is_callable(array('CRM_Core_BAO_Navigation', 'fixNavigationMenu'))) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
     _afform_mock_civix_fixNavigationMenu($nodes);
   }
 }
@@ -431,17 +454,11 @@ function _afform_mock_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentI
 /**
  * (Delegated) Implements hook_civicrm_alterSettingsFolders().
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
  */
 function _afform_mock_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  static $configured = FALSE;
-  if ($configured) {
-    return;
-  }
-  $configured = TRUE;
-
   $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
-  if (is_dir($settingsDir) && !in_array($settingsDir, $metaDataFolders)) {
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
     $metaDataFolders[] = $settingsDir;
   }
 }
@@ -451,7 +468,7 @@ function _afform_mock_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NUL
  *
  * Find any *.entityType.php files, merge their content, and return.
  *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
 
 function _afform_mock_civix_civicrm_entityTypes(&$entityTypes) {
diff --git a/ext/afform/mock/afform_mock.php b/ext/afform/mock/afform_mock.php
index ce1a165d1bf2..b101e0d2d10b 100644
--- a/ext/afform/mock/afform_mock.php
+++ b/ext/afform/mock/afform_mock.php
@@ -134,6 +134,13 @@ function afform_mock_civicrm_entityTypes(&$entityTypes) {
   _afform_mock_civix_civicrm_entityTypes($entityTypes);
 }
 
+/**
+ * Implements hook_civicrm_themes().
+ */
+function afform_mock_civicrm_themes(&$themes) {
+  _afform_mock_civix_civicrm_themes($themes);
+}
+
 // --- Functions below this ship commented out. Uncomment as required. ---
 
 /**

From f2f9e95d82d03c40398837f47cd7ff86a2be90e2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 24 Oct 2019 08:15:27 -0400
Subject: [PATCH 485/834] Use helper for checking items to get by name

---
 ext/afform/core/Civi/Api4/Action/Afform/Get.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 867cdc0d78ee..61da5f8d523a 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -17,13 +17,7 @@ public function getRecords() {
     /** @var \CRM_Afform_AfformScanner $scanner */
     $scanner = \Civi::service('afform_scanner');
 
-    $where = $this->getWhere();
-    if (count($where) === 1 && $where[0][0] === 'name' && $where[0][1] == '=') {
-      $names = [$where[0][2]];
-    }
-    else {
-      $names = array_keys($scanner->findFilePaths());
-    }
+    $names = $this->_itemsToGet('name') ?? array_keys($scanner->findFilePaths());
 
     $values = [];
     foreach ($names as $name) {

From 13ecc17192c8bc808190f644158151faa0c74cad Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 24 Oct 2019 13:15:03 -0700
Subject: [PATCH 486/834] Unit tests - Fix test-run on 5.19.beta

The conditional incorrectly tries to activate `api4` when running on 5.19.beta.
---
 ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php   | 2 +-
 ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
index d7e9629908f2..d355dfe3af11 100644
--- a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
+++ b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
@@ -18,7 +18,7 @@ class CRM_Afform_UtilTest extends \PHPUnit\Framework\TestCase implements Headles
   public function setUpHeadless() {
     return \Civi\Test::headless()
       ->installMe(__DIR__)
-      ->install(version_compare(CRM_Utils_System::version(), '5.19', '<') ? ['org.civicrm.api4'] : [])
+      ->install(version_compare(CRM_Utils_System::version(), '5.19.alpha1', '<') ? ['org.civicrm.api4'] : [])
       ->apply();
   }
 
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
index 9df221ba69d6..4847abf604e1 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTestCase.php
@@ -14,7 +14,7 @@ abstract class api_v4_AfformTestCase extends \PHPUnit\Framework\TestCase impleme
    */
   public function setUpHeadless() {
     return \Civi\Test::headless()
-      ->install(version_compare(CRM_Utils_System::version(), '5.19', '<') ? ['org.civicrm.api4'] : [])
+      ->install(version_compare(CRM_Utils_System::version(), '5.19.alpha1', '<') ? ['org.civicrm.api4'] : [])
       ->install(['org.civicrm.afform', 'org.civicrm.afform-mock'])
       ->apply();
   }

From ddec2ab03b4cf0500bf92d09ded8de7afa7006c4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Oct 2019 17:40:08 -0700
Subject: [PATCH 487/834] Civi/Afform/Utils - Small cleanups

---
 ext/afform/core/Civi/Afform/Utils.php | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
index f8f4cc15053e..45054f631aa6 100644
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ b/ext/afform/core/Civi/Afform/Utils.php
@@ -8,7 +8,10 @@ class Utils {
    * Gets entity metadata and all fields from the form
    *
    * @param array $layout
+   *   The root element of the layout, in shallow/deep format.
    * @return array
+   *   A list of entities, keyed by named.
+   *   Ex: $entities['spouse']['type'] = 'Contact';
    */
   public static function getEntities($layout) {
     $entities = array_column(self::getTags($layout, 'af-entity'), NULL, 'name');
@@ -19,16 +22,16 @@ public static function getEntities($layout) {
   /**
    * Returns all tags with a certain tag name, e.g. 'af-entity'
    *
-   * @param array $collection
+   * @param array $element
    * @param string $tagName
    * @return array
    */
-  public static function getTags($collection, $tagName) {
+  public static function getTags($element, $tagName) {
     $results = [];
-    if ($collection['#tag'] == $tagName) {
-      $results[] = self::getProps($collection);
+    if ($element['#tag'] == $tagName) {
+      $results[] = self::getProps($element);
     }
-    foreach ($collection['#children'] ?? [] as $child) {
+    foreach ($element['#children'] ?? [] as $child) {
       $results = array_merge($results, self::getTags($child, $tagName));
     }
     return $results;
@@ -36,7 +39,11 @@ public static function getTags($collection, $tagName) {
 
   /**
    * @param array $layout
+   *   The root element of the layout, in shallow/deep format.
    * @param array $entities
+   *   A list of entities, keyed by named.
+   *   This will be updated to include 'fields'.
+   *   Ex: $entities['spouse']['type'] = 'Contact';
    */
   protected static function getFields($layout, &$entities) {
     foreach ($layout['#children'] as $child) {
@@ -53,11 +60,11 @@ protected static function getFields($layout, &$entities) {
    * Returns all the real properties of a collection,
    * filtering out any array keys that start with a hashtag
    *
-   * @param array $collection
+   * @param array $element
    * @return array
    */
-  public static function getProps($collection) {
-    return array_filter($collection, function($key) {
+  public static function getProps($element) {
+    return array_filter($element, function($key) {
       return substr($key, 0, 1) !== '#';
     }, ARRAY_FILTER_USE_KEY);
   }

From b853b419144edc946a5ab42dc49e202460440b1f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Oct 2019 17:45:40 -0700
Subject: [PATCH 488/834] (NFC) Civi/Afform/Symbols.php - Docblock

---
 ext/afform/core/Civi/Afform/Symbols.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ext/afform/core/Civi/Afform/Symbols.php b/ext/afform/core/Civi/Afform/Symbols.php
index f816a3c18a6e..521f1bfde113 100644
--- a/ext/afform/core/Civi/Afform/Symbols.php
+++ b/ext/afform/core/Civi/Afform/Symbols.php
@@ -1,6 +1,14 @@
 <?php
 namespace Civi\Afform;
 
+/**
+ * Class Symbols
+ * @package Civi\Afform
+ *
+ * This class repesents a list of key symbols used by an
+ * HTML document, such as element (tag) names, attribute
+ * names, and CSS class names.
+ */
 class Symbols {
 
   /**

From fc54326ff8d77d396f269fca5bb6fb02239b99f6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Oct 2019 18:21:40 -0700
Subject: [PATCH 489/834] Split "Utils" into "AHQ" and "FormDataModel"

---
 ext/afform/core/Civi/Afform/AHQ.php           | 47 ++++++++++++
 ext/afform/core/Civi/Afform/FormDataModel.php | 64 +++++++++++++++++
 ext/afform/core/Civi/Afform/Utils.php         | 72 -------------------
 .../Api4/Action/Afform/AbstractProcessor.php  | 10 +--
 .../core/Civi/Api4/Action/Afform/Prefill.php  |  2 +-
 .../core/Civi/Api4/Action/Afform/Submit.php   |  4 +-
 .../phpunit/Civi/Afform/FormDataModelTest.php | 69 ++++++++++++++++++
 7 files changed, 188 insertions(+), 80 deletions(-)
 create mode 100644 ext/afform/core/Civi/Afform/AHQ.php
 create mode 100644 ext/afform/core/Civi/Afform/FormDataModel.php
 delete mode 100644 ext/afform/core/Civi/Afform/Utils.php
 create mode 100644 ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php

diff --git a/ext/afform/core/Civi/Afform/AHQ.php b/ext/afform/core/Civi/Afform/AHQ.php
new file mode 100644
index 000000000000..7eb8877fa1d9
--- /dev/null
+++ b/ext/afform/core/Civi/Afform/AHQ.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Civi\Afform;
+
+/**
+ * AHQ: ArrayHtml Query
+ *
+ * These are helper functions for searching/digesting a form presented in
+ * in ArrayHtml format (shallow or deep).
+ */
+class AHQ {
+
+  /**
+   * Returns all tags with a certain tag name, e.g. 'af-entity'
+   *
+   * @param array $element
+   * @param string $tagName
+   * @return array
+   */
+  public static function getTags($element, $tagName) {
+    if ($element === []) {
+      return [];
+    }
+    $results = [];
+    if ($element['#tag'] == $tagName) {
+      $results[] = self::getProps($element);
+    }
+    foreach ($element['#children'] ?? [] as $child) {
+      $results = array_merge($results, self::getTags($child, $tagName));
+    }
+    return $results;
+  }
+
+  /**
+   * Returns all the real properties of a collection,
+   * filtering out any array keys that start with a hashtag
+   *
+   * @param array $element
+   * @return array
+   */
+  public static function getProps($element) {
+    return array_filter($element, function($key) {
+      return substr($key, 0, 1) !== '#';
+    }, ARRAY_FILTER_USE_KEY);
+  }
+
+}
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
new file mode 100644
index 000000000000..c607dd9b36e8
--- /dev/null
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Civi\Afform;
+
+/**
+ * Class FormDataModel
+ * @package Civi\Afform
+ *
+ * The FormDataModel examines a form and determines the list of entities/fields
+ * which are used by the form.
+ */
+class FormDataModel {
+
+  /**
+   * @var array
+   *   Ex: $entities['spouse']['type'] = 'Contact';
+   */
+  protected $entities;
+
+  /**
+   * Gets entity metadata and all fields from the form
+   *
+   * @param array $layout
+   *   The root element of the layout, in shallow/deep format.
+   * @return static
+   *   Parsed summary of the entities used in a given form.
+   */
+  public static function create($layout) {
+    $entities = array_column(AHQ::getTags($layout, 'af-entity'), NULL, 'name');
+    self::parseFields($layout, $entities);
+
+    $self = new static();
+    $self->entities = $entities;
+    return $self;
+  }
+
+  /**
+   * @param array $layout
+   *   The root element of the layout, in shallow/deep format.
+   * @param array $entities
+   *   A list of entities, keyed by named.
+   *   This will be updated to include 'fields'.
+   *   Ex: $entities['spouse']['type'] = 'Contact';
+   */
+  protected static function parseFields($layout, &$entities) {
+    foreach ($layout['#children'] as $child) {
+      if ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
+        $entities[$child['model']]['fields'] = array_merge($entities[$child['model']]['fields'] ?? [], AHQ::getTags($child, 'af-field'));
+      }
+      elseif (!empty($child['#children'])) {
+        self::parseFields($child['#children'], $entities);
+      }
+    }
+  }
+
+  /**
+   * @return array
+   *   Ex: $entities['spouse']['type'] = 'Contact';
+   */
+  public function getEntities() {
+    return $this->entities;
+  }
+
+}
diff --git a/ext/afform/core/Civi/Afform/Utils.php b/ext/afform/core/Civi/Afform/Utils.php
deleted file mode 100644
index 45054f631aa6..000000000000
--- a/ext/afform/core/Civi/Afform/Utils.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Civi\Afform;
-
-class Utils {
-
-  /**
-   * Gets entity metadata and all fields from the form
-   *
-   * @param array $layout
-   *   The root element of the layout, in shallow/deep format.
-   * @return array
-   *   A list of entities, keyed by named.
-   *   Ex: $entities['spouse']['type'] = 'Contact';
-   */
-  public static function getEntities($layout) {
-    $entities = array_column(self::getTags($layout, 'af-entity'), NULL, 'name');
-    self::getFields($layout, $entities);
-    return $entities;
-  }
-
-  /**
-   * Returns all tags with a certain tag name, e.g. 'af-entity'
-   *
-   * @param array $element
-   * @param string $tagName
-   * @return array
-   */
-  public static function getTags($element, $tagName) {
-    $results = [];
-    if ($element['#tag'] == $tagName) {
-      $results[] = self::getProps($element);
-    }
-    foreach ($element['#children'] ?? [] as $child) {
-      $results = array_merge($results, self::getTags($child, $tagName));
-    }
-    return $results;
-  }
-
-  /**
-   * @param array $layout
-   *   The root element of the layout, in shallow/deep format.
-   * @param array $entities
-   *   A list of entities, keyed by named.
-   *   This will be updated to include 'fields'.
-   *   Ex: $entities['spouse']['type'] = 'Contact';
-   */
-  protected static function getFields($layout, &$entities) {
-    foreach ($layout['#children'] as $child) {
-      if ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
-        $entities[$child['model']]['fields'] = array_merge($entities[$child['model']]['fields'] ?? [], self::getTags($child, 'af-field'));
-      }
-      elseif (!empty($child['#children'])) {
-        self::getFields($child['#children'], $entities);
-      }
-    }
-  }
-
-  /**
-   * Returns all the real properties of a collection,
-   * filtering out any array keys that start with a hashtag
-   *
-   * @param array $element
-   * @return array
-   */
-  public static function getProps($element) {
-    return array_filter($element, function($key) {
-      return substr($key, 0, 1) !== '#';
-    }, ARRAY_FILTER_USE_KEY);
-  }
-
-}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index a15074e32048..e8729f73fff1 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -2,7 +2,7 @@
 
 namespace Civi\Api4\Action\Afform;
 
-use Civi\Afform\Utils;
+use Civi\Afform\FormDataModel;
 use Civi\Api4\Generic\Result;
 
 /**
@@ -27,15 +27,15 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
   protected $_afform;
 
   /**
-   * @var array
+   * @var \Civi\Afform\FormDataModel
    *   List of entities declared by this form.
    */
-  protected $_afformEntities;
+  protected $_formDataModel;
 
   public function _run(Result $result) {
     // This will throw an exception if the form doesn't exist
     $this->_afform = (array) civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $this->name]]], 0);
-    $this->_afformEntities = Utils::getEntities($this->_afform['layout']);
+    $this->_formDataModel = FormDataModel::create($this->_afform['layout']);
     $this->validateArgs();
     $result->exchangeArray($this->processForm());
   }
@@ -47,7 +47,7 @@ protected function validateArgs() {
     $rawArgs = $this->args;
     $this->args = [];
     foreach ($rawArgs as $arg => $val) {
-      if (!empty($this->_afformEntities[$arg]['af-url-autofill'])) {
+      if (!empty($this->_formDataModel[$arg]['af-url-autofill'])) {
         $this->args[$arg] = $val;
       }
     }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index f7c64d77ca92..5ce5918c9ab9 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -11,7 +11,7 @@ class Prefill extends AbstractProcessor {
   protected $_data = [];
 
   protected function processForm() {
-    foreach ($this->_afformEntities as $entityName => $entity) {
+    foreach ($this->_formDataModel->getEntities() as $entityName => $entity) {
       // Load entities from args
       if (!empty($this->args[$entityName])) {
         $this->loadEntity($entity, $this->args[$entityName]);
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 809b7ace6cca..85b88ea449e3 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -21,12 +21,12 @@ class Submit extends AbstractProcessor {
 
   protected function processForm() {
     $entityValues = [];
-    foreach ($this->_afformEntities as $entityName => $entity) {
+    foreach ($this->_formDataModel->getEntities() as $entityName => $entity) {
       // Predetermined values override submitted values
       $entityValues[$entity['type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
     }
 
-    $event = new AfformSubmitEvent($this->_afformEntities, $entityValues);
+    $event = new AfformSubmitEvent($this->_formDataModel->getEntities(), $entityValues);
     \Civi::dispatcher()->dispatch(self::EVENT_NAME, $event);
     foreach ($event->entityValues as $entityType => $entities) {
       if (!empty($entities)) {
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
new file mode 100644
index 000000000000..df5687028bd3
--- /dev/null
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
@@ -0,0 +1,69 @@
+<?php
+namespace Civi\Afform;
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * @group headless
+ */
+class FormDataModelTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, TransactionalInterface {
+
+  /**
+   * Civi\Test has many helpers, like install(), uninstall(), sql(), and sqlFile().
+   *
+   * See: https://github.com/civicrm/org.civicrm.testapalooza/blob/master/civi-test.md
+   *
+   * @throws \CRM_Extension_Exception_ParseException
+   */
+  public function setUpHeadless() {
+    return \Civi\Test::headless()->installMe(__DIR__)->apply();
+  }
+
+  public function getEntityExamples() {
+    $cases = [];
+
+    //$cases[] = [
+    //  'html' => 'Hello world',
+    //  'entities' => [],
+    //];
+    //
+    //$cases[] = [
+    //  'html' => '<div/>',
+    //  'entities' => [],
+    //];
+    //
+    //$cases[] = [
+    //  'html' => '<div>Hello world</div>',
+    //  'entities' => [],
+    //];
+
+    $cases[] = [
+      'html' => '<af-form><af-entity type="Foo" name="foobar"/><af-fieldset model="foobar"><af-field name="propA" /><af-field name="propB" defn="{title: \'Whiz\'}" /></af-fieldset></af-form>',
+      'entities' => [
+        'foobar' => [
+          'type' => 'Foo',
+          'name' => 'foobar',
+          'fields' => [
+            ['name' => 'propA'],
+            ['name' => 'propB', 'defn' => ['title' => 'Whiz']],
+          ],
+        ],
+      ],
+    ];
+
+    return $cases;
+  }
+
+  /**
+   * @param $html
+   * @param $expectEntities
+   * @dataProvider getEntityExamples
+   */
+  public function testGetEntities($html, $expectEntities) {
+    $parser = new \CRM_Afform_ArrayHtml();
+    $fdm = FormDataModel::create($parser->convertHtmlToArray($html));
+    $this->assertEquals($expectEntities, $fdm->getEntities());
+  }
+
+}

From fa5d618347a575155777c8b56f0ace0b5f6b9e0a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Oct 2019 18:31:22 -0700
Subject: [PATCH 490/834] FormDataModel - Define behavior for more edgy HTML
 documents

---
 ext/afform/core/Civi/Afform/AHQ.php           |  8 ++--
 ext/afform/core/Civi/Afform/FormDataModel.php | 11 ++++-
 .../phpunit/Civi/Afform/FormDataModelTest.php | 46 +++++++++++++------
 3 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/AHQ.php b/ext/afform/core/Civi/Afform/AHQ.php
index 7eb8877fa1d9..711ad668e3cd 100644
--- a/ext/afform/core/Civi/Afform/AHQ.php
+++ b/ext/afform/core/Civi/Afform/AHQ.php
@@ -13,12 +13,13 @@ class AHQ {
   /**
    * Returns all tags with a certain tag name, e.g. 'af-entity'
    *
-   * @param array $element
+   * @param array|string $element
+   *   The ArrayHtml representation of a document/fragment.
    * @param string $tagName
    * @return array
    */
   public static function getTags($element, $tagName) {
-    if ($element === []) {
+    if ($element === [] || is_string($element)) {
       return [];
     }
     $results = [];
@@ -35,7 +36,8 @@ public static function getTags($element, $tagName) {
    * Returns all the real properties of a collection,
    * filtering out any array keys that start with a hashtag
    *
-   * @param array $element
+   * @param array|string $element
+   *   The ArrayHtml representation of a document/fragment.
    * @return array
    */
   public static function getProps($element) {
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index c607dd9b36e8..15e0a12b3f56 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -27,6 +27,9 @@ class FormDataModel {
    */
   public static function create($layout) {
     $entities = array_column(AHQ::getTags($layout, 'af-entity'), NULL, 'name');
+    foreach (array_keys($entities) as $entity) {
+      $entities[$entity]['fields'] = [];
+    }
     self::parseFields($layout, $entities);
 
     $self = new static();
@@ -43,8 +46,14 @@ public static function create($layout) {
    *   Ex: $entities['spouse']['type'] = 'Contact';
    */
   protected static function parseFields($layout, &$entities) {
+    if (!isset($layout['#children'])) {
+      return;
+    }
     foreach ($layout['#children'] as $child) {
-      if ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
+      if (is_string($child)) {
+        //nothing
+      }
+      elseif ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
         $entities[$child['model']]['fields'] = array_merge($entities[$child['model']]['fields'] ?? [], AHQ::getTags($child, 'af-field'));
       }
       elseif (!empty($child['#children'])) {
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
index df5687028bd3..52e32fab2c64 100644
--- a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
@@ -23,23 +23,23 @@ public function setUpHeadless() {
   public function getEntityExamples() {
     $cases = [];
 
-    //$cases[] = [
-    //  'html' => 'Hello world',
-    //  'entities' => [],
-    //];
-    //
-    //$cases[] = [
-    //  'html' => '<div/>',
-    //  'entities' => [],
-    //];
-    //
-    //$cases[] = [
-    //  'html' => '<div>Hello world</div>',
-    //  'entities' => [],
-    //];
+    $cases[] = [
+      'html' => 'Hello world',
+      'entities' => [],
+    ];
+
+    $cases[] = [
+      'html' => '<div/>',
+      'entities' => [],
+    ];
 
     $cases[] = [
-      'html' => '<af-form><af-entity type="Foo" name="foobar"/><af-fieldset model="foobar"><af-field name="propA" /><af-field name="propB" defn="{title: \'Whiz\'}" /></af-fieldset></af-form>',
+      'html' => '<div>Hello world</div>',
+      'entities' => [],
+    ];
+
+    $cases[] = [
+      'html' => '<af-form><af-entity type="Foo" name="foobar"/><af-fieldset model="foobar"><af-field name="propA" /><span><p><af-field name="propB" defn="{title: \'Whiz\'}" /></p></span></af-fieldset></af-form>',
       'entities' => [
         'foobar' => [
           'type' => 'Foo',
@@ -52,6 +52,22 @@ public function getEntityExamples() {
       ],
     ];
 
+    $cases[] = [
+      'html' => '<af-form><div><af-entity type="Foo" name="foobar"/><af-entity name="whiz_bang" type="Whiz" /></div></af-form>',
+      'entities' => [
+        'foobar' => [
+          'type' => 'Foo',
+          'name' => 'foobar',
+          'fields' => [],
+        ],
+        'whiz_bang' => [
+          'type' => 'Whiz',
+          'name' => 'whiz_bang',
+          'fields' => [],
+        ],
+      ],
+    ];
+
     return $cases;
   }
 

From 3b729d0cbdbec3d47693401a3dd8493e42648c72 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Oct 2019 18:51:07 -0700
Subject: [PATCH 491/834] FormDataModel::parseFields() - Rename param for
 clarity

This function uses a recursive algorithm to scan subtrees.  Each call to the
algorithm is a particular HTML element.
---
 ext/afform/core/Civi/Afform/FormDataModel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index 15e0a12b3f56..03a1413a41e7 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -38,18 +38,18 @@ public static function create($layout) {
   }
 
   /**
-   * @param array $layout
+   * @param array $element
    *   The root element of the layout, in shallow/deep format.
    * @param array $entities
    *   A list of entities, keyed by named.
    *   This will be updated to include 'fields'.
    *   Ex: $entities['spouse']['type'] = 'Contact';
    */
-  protected static function parseFields($layout, &$entities) {
-    if (!isset($layout['#children'])) {
+  protected static function parseFields($element, &$entities) {
+    if (!isset($element['#children'])) {
       return;
     }
-    foreach ($layout['#children'] as $child) {
+    foreach ($element['#children'] as $child) {
       if (is_string($child)) {
         //nothing
       }

From f800b0461083e09328da8cc5e2b2443a5874998a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Oct 2019 17:14:30 -0700
Subject: [PATCH 492/834] (BC Break) Change shallow+deep formats to begin with
 an array of elements

Before: In the shallow+deep representations of `layout`, the root array
has a `#tag` and `#children`.

After: The root array is just list a list of children.

Comment: This is a more accufrate representation of how HTML partials are
often written.
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 27 ++++++++++++++++---
 ext/afform/core/Civi/Afform/FormDataModel.php | 12 ++++++---
 .../Civi/Api4/Utils/AfformFormatTrait.php     |  2 +-
 .../mock/tests/phpunit/api/v4/AfformTest.php  |  2 +-
 .../phpunit/api/v4/formatExamples/apple.php   |  8 ++++--
 .../phpunit/api/v4/formatExamples/banana.php  | 20 ++++++++------
 .../phpunit/api/v4/formatExamples/cherry.php  | 15 +++++++++++
 .../phpunit/api/v4/formatExamples/empty.php   |  7 +++++
 .../phpunit/api/v4/formatExamples/string.php  |  7 +++++
 9 files changed, 80 insertions(+), 20 deletions(-)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 1839271f1691..a3086c514a44 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -86,6 +86,13 @@ public function convertArrayToHtml(array $array) {
       }
     }
     $buf .= '>';
+    $buf .= $this->convertArraysToHtml($children);
+    $buf .= '</' . $tag . '>';
+    return $buf;
+  }
+
+  public function convertArraysToHtml($children) {
+    $buf = '';
 
     foreach ($children as $child) {
       if (is_string($child)) {
@@ -96,7 +103,6 @@ public function convertArrayToHtml(array $array) {
       }
     }
 
-    $buf .= '</' . $tag . '>';
     return $buf;
   }
 
@@ -118,7 +124,7 @@ public function convertHtmlToArray($html) {
 
     foreach ($doc->childNodes as $htmlNode) {
       if ($htmlNode instanceof DOMElement && $htmlNode->tagName === 'html') {
-        return $this->convertNodeToArray($htmlNode->firstChild->firstChild);
+        return $this->convertNodesToArray($htmlNode->firstChild->childNodes);
       }
     }
 
@@ -138,8 +144,8 @@ public function convertNodeToArray($node) {
         $type = $this->pickAttrType($node->tagName, $attribute->name);
         $arr[$attribute->name] = $this->decodeAttrValue($type, $txt);
       }
-      foreach ($node->childNodes as $childNode) {
-        $arr['#children'][] = $this->convertNodeToArray($childNode);
+      if ($node->childNodes->length > 0) {
+        $arr['#children'] = $this->convertNodesToArray($node->childNodes);
       }
       return $arr;
     }
@@ -154,6 +160,19 @@ public function convertNodeToArray($node) {
     }
   }
 
+  /**
+   * @param array|DOMNodeList $nodes
+   *   List of DOMNodes
+   * @return array
+   */
+  protected function convertNodesToArray($nodes) {
+    $children = [];
+    foreach ($nodes as $childNode) {
+      $children[] = $this->convertNodeToArray($childNode);
+    }
+    return $children;
+  }
+
   /**
    * Determine the type of data that is stored in an attribute.
    *
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index 03a1413a41e7..8b783f4bfc9a 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -26,11 +26,15 @@ class FormDataModel {
    *   Parsed summary of the entities used in a given form.
    */
   public static function create($layout) {
-    $entities = array_column(AHQ::getTags($layout, 'af-entity'), NULL, 'name');
+    $root = [
+      '#tag' => 'root',
+      '#children' => $layout,
+    ];
+    $entities = array_column(AHQ::getTags($root, 'af-entity'), NULL, 'name');
     foreach (array_keys($entities) as $entity) {
       $entities[$entity]['fields'] = [];
     }
-    self::parseFields($layout, $entities);
+    self::parseFields($root, $entities);
 
     $self = new static();
     $self->entities = $entities;
@@ -56,8 +60,8 @@ protected static function parseFields($element, &$entities) {
       elseif ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
         $entities[$child['model']]['fields'] = array_merge($entities[$child['model']]['fields'] ?? [], AHQ::getTags($child, 'af-field'));
       }
-      elseif (!empty($child['#children'])) {
-        self::parseFields($child['#children'], $entities);
+      else {
+        self::parseFields($child, $entities);
       }
     }
   }
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index 072528608bd7..7d224a657f68 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -39,7 +39,7 @@ protected function convertInputToHtml($mixed) {
       return $mixed;
     }
     $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow');
-    return $converter->convertArrayToHtml($mixed);
+    return $converter->convertArraysToHtml($mixed);
   }
 
 }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 538e977e5e4a..606ac9c29a44 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -65,7 +65,7 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
   public function getFormatExamples() {
     $es = [];
 
-    foreach (['apple', 'banana'] as $exampleName) {
+    foreach (['empty', 'string', 'apple', 'banana', 'cherry'] as $exampleName) {
       $exampleFile = '/formatExamples/' . $exampleName . '.php';
       $example = require __DIR__ . $exampleFile;
       $formats = ['html', 'shallow', 'deep'];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
index e5e41acd24c9..dc37c5024bd8 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -2,6 +2,10 @@
 
 return [
   'html' => '<strong>New text!</strong>',
-  'shallow' => ['#tag' => 'strong', '#children' => ['New text!']],
-  'deep' => ['#tag' => 'strong', '#children' => ['New text!']],
+  'shallow' => [
+    ['#tag' => 'strong', '#children' => ['New text!']],
+  ],
+  'deep' => [
+    ['#tag' => 'strong', '#children' => ['New text!']],
+  ],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index af5c134adf9e..779b3cd4469c 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -3,17 +3,21 @@
 return [
   'html' => '<div><strong>New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
   'shallow' => [
-    '#tag' => 'div',
-    '#children' => [
-      ['#tag' => 'strong', '#children' => ['New text!']],
-      ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
+      ],
     ],
   ],
   'deep' => [
-    '#tag' => 'div',
-    '#children' => [
-      ['#tag' => 'strong', '#children' => ['New text!']],
-      ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
+      ],
     ],
   ],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
new file mode 100644
index 000000000000..879329bce31e
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
@@ -0,0 +1,15 @@
+<?php
+
+return [
+  'html' => '<span>First</span> <span>Second</span>',
+  'shallow' => [
+    ['#tag' => 'span', '#children' => ['First']],
+    ' ',
+    ['#tag' => 'span', '#children' => ['Second']],
+  ],
+  'deep' => [
+    ['#tag' => 'span', '#children' => ['First']],
+    ' ',
+    ['#tag' => 'span', '#children' => ['Second']],
+  ],
+];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php
new file mode 100644
index 000000000000..e08233a2d07e
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+  'html' => '',
+  'shallow' => [],
+  'deep' => [],
+];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
new file mode 100644
index 000000000000..18ccc7f48751
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+  'html' => 'hello world',
+  'shallow' => ['hello world'],
+  'deep' => ['hello world'],
+];

From 8f245854f571d7f49f440d13f871f8b8e8065042 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 28 Oct 2019 13:38:22 -0400
Subject: [PATCH 493/834] Fix forms autofill with new dataModel

The formDataModel is now an object rather than an array.
This also changes the array key to match what's used in testAfform.aff.html:
url-autofill instead of af-url-autofill
---
 ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index e8729f73fff1..4fb269811709 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -45,9 +45,10 @@ public function _run(Result $result) {
    */
   protected function validateArgs() {
     $rawArgs = $this->args;
+    $entities = $this->_formDataModel->getEntities();
     $this->args = [];
     foreach ($rawArgs as $arg => $val) {
-      if (!empty($this->_formDataModel[$arg]['af-url-autofill'])) {
+      if (!empty($entities[$arg]['url-autofill'])) {
         $this->args[$arg] = $val;
       }
     }

From ec9e7df3ba56ea80f0e5184e3354de946abc3c60 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 29 Oct 2019 15:31:06 -0700
Subject: [PATCH 494/834] ArrayHtml - Support comments

Before
------

HTML comments appear in the array as NULL values

After
-----

HTML comments appear in the array as `['#comment' => '...']`

Technical Notes
---------------

* Considered using `['#tag' => 'comment', '#children' => '...'], but this is ambiguous when you
  have a node/tag named '<comment>'
* Considered using `['#tag' => 'comment', '#children' => '...'], but it's needlessly difficult to
  extract the comment text from under `'#children'`.
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 11 ++++++-
 .../mock/tests/phpunit/api/v4/AfformTest.php  |  2 +-
 .../api/v4/formatExamples/comments.php        | 31 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index a3086c514a44..98204aa65f7f 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -59,6 +59,14 @@ public function convertArrayToHtml(array $array) {
       return '';
     }
 
+    if (isset($array['#comment'])) {
+      if (strpos($array['#comment'], '-->')) {
+        Civi::log()->warning('Afform: Cannot store comment with text "-->". Munging.');
+        $array['#comment'] = str_replace('-->', '-- >', $array['#comment']);
+      }
+      return sprintf('<!--%s-->', $array['#comment']);
+    }
+
     $tag = empty($array['#tag']) ? self::DEFAULT_TAG : $array['#tag'];
     unset($array['#tag']);
     $children = empty($array['#children']) ? [] : $array['#children'];
@@ -153,7 +161,8 @@ public function convertNodeToArray($node) {
       return $node->textContent;
     }
     elseif ($node instanceof DOMComment) {
-      // FIXME: How to preserve comments? For the moment, discarding them.
+      $arr = ['#comment' => $node->nodeValue];
+      return $arr;
     }
     else {
       throw new \RuntimeException("Unrecognized DOM node");
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 606ac9c29a44..f63272b6fe3c 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -65,7 +65,7 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
   public function getFormatExamples() {
     $es = [];
 
-    foreach (['empty', 'string', 'apple', 'banana', 'cherry'] as $exampleName) {
+    foreach (['empty', 'string', 'comments', 'apple', 'banana', 'cherry'] as $exampleName) {
       $exampleFile = '/formatExamples/' . $exampleName . '.php';
       $example = require __DIR__ . $exampleFile;
       $formats = ['html', 'shallow', 'deep'];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
new file mode 100644
index 000000000000..248cffddb34c
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
@@ -0,0 +1,31 @@
+<?php
+
+return [
+  'html' => '<div>One<!-- uno --> Two <!--dos & so on --> Three</div><!--tres-a--b---c-->',
+  'shallow' => [
+    [
+      '#tag' => 'div',
+      '#children' => [
+        'One',
+        ['#comment' => ' uno '],
+        ' Two ',
+        ['#comment' => 'dos & so on '],
+        ' Three',
+      ],
+    ],
+    ['#comment' => 'tres-a--b---c'],
+  ],
+  'deep' => [
+    [
+      '#tag' => 'div',
+      '#children' => [
+        'One',
+        ['#comment' => ' uno '],
+        ' Two ',
+        ['#comment' => 'dos & so on '],
+        ' Three',
+      ],
+    ],
+    ['#comment' => 'tres-a--b---c'],
+  ],
+];

From 66342641404af5092bc72c6eb079bfd742e700a5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 29 Oct 2019 16:07:12 -0700
Subject: [PATCH 495/834] ArrayHtml - Encode self-closing HTML tags (`<img />`,
 `<br />`) normally

---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 40 +++++++++++++++++--
 .../mock/tests/phpunit/api/v4/AfformTest.php  |  2 +-
 .../api/v4/formatExamples/self-closing.php    | 27 +++++++++++++
 3 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 98204aa65f7f..748dadfec340 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -33,6 +33,23 @@ class CRM_Afform_ArrayHtml {
     'af-fieldset' => [
       'model' => 'text',
     ],
+    'area' => ['#selfClose' => TRUE],
+    'base' => ['#selfClose' => TRUE],
+    'br' => ['#selfClose' => TRUE],
+    'col' => ['#selfClose' => TRUE],
+    'command' => ['#selfClose' => TRUE],
+    'embed' => ['#selfClose' => TRUE],
+    'hr' => ['#selfClose' => TRUE],
+    'iframe' => ['#selfClose' => TRUE],
+    'img' => ['#selfClose' => TRUE],
+    'input' => ['#selfClose' => TRUE],
+    'keygen' => ['#selfClose' => TRUE],
+    'link' => ['#selfClose' => TRUE],
+    'meta' => ['#selfClose' => TRUE],
+    'param' => ['#selfClose' => TRUE],
+    'source' => ['#selfClose' => TRUE],
+    'track' => ['#selfClose' => TRUE],
+    'wbr' => ['#selfClose' => TRUE],
   ];
 
   /**
@@ -93,9 +110,15 @@ public function convertArrayToHtml(array $array) {
         ]);
       }
     }
-    $buf .= '>';
-    $buf .= $this->convertArraysToHtml($children);
-    $buf .= '</' . $tag . '>';
+
+    if (empty($children) && $this->isSelfClosing($tag)) {
+      $buf .= ' />';
+    }
+    else {
+      $buf .= '>';
+      $buf .= $this->convertArraysToHtml($children);
+      $buf .= '</' . $tag . '>';
+    }
     return $buf;
   }
 
@@ -182,6 +205,17 @@ protected function convertNodesToArray($nodes) {
     return $children;
   }
 
+  /**
+   * @param string $tag
+   *   Ex: 'img', 'div'
+   * @return bool
+   *   TRUE if the tag should look like '<img/>'.
+   *   FALSE if the tag should look like '<div></div>'.
+   */
+  protected function isSelfClosing($tag) {
+    return $this->protoSchema[$tag]['#selfClose'] ?? FALSE;
+  }
+
   /**
    * Determine the type of data that is stored in an attribute.
    *
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index f63272b6fe3c..0fdbc9ac403d 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -65,7 +65,7 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
   public function getFormatExamples() {
     $es = [];
 
-    foreach (['empty', 'string', 'comments', 'apple', 'banana', 'cherry'] as $exampleName) {
+    foreach (['empty', 'string', 'comments', 'self-closing', 'apple', 'banana', 'cherry'] as $exampleName) {
       $exampleFile = '/formatExamples/' . $exampleName . '.php';
       $example = require __DIR__ . $exampleFile;
       $formats = ['html', 'shallow', 'deep'];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
new file mode 100644
index 000000000000..ab68d0238b73
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
@@ -0,0 +1,27 @@
+<?php
+
+return [
+  'html' => '<span class="one"></span><img class="two" /><div><br class="three" /><br /></div>',
+  'shallow' => [
+    ['#tag' => 'span', 'class' => 'one'],
+    ['#tag' => 'img', 'class' => 'two'],
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'br', 'class' => 'three'],
+        ['#tag' => 'br'],
+      ],
+    ],
+  ],
+  'deep' => [
+    ['#tag' => 'span', 'class' => 'one'],
+    ['#tag' => 'img', 'class' => 'two'],
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'br', 'class' => 'three'],
+        ['#tag' => 'br'],
+      ],
+    ],
+  ],
+];

From 5fddbe27c0b049725e01981282fa87c715f94d34 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 29 Oct 2019 16:11:10 -0700
Subject: [PATCH 496/834] ArrayHtml - Treat `<af-entity/>` and `<af-field/>` as
 self-closing tags

---
 ext/afform/core/CRM/Afform/ArrayHtml.php                       | 2 ++
 ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 748dadfec340..6f5117926259 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -22,11 +22,13 @@ class CRM_Afform_ArrayHtml {
       '*' => 'text',
     ],
     'af-entity' => [
+      '#selfClose' => TRUE,
       'name' => 'text',
       'type' => 'text',
       'data' => 'js',
     ],
     'af-field' => [
+      '#selfClose' => TRUE,
       'name' => 'text',
       'defn' => 'js',
     ],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index 779b3cd4469c..bf33a0a21f0c 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-  'html' => '<div><strong>New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}"></af-field></div>',
+  'html' => '<div><strong>New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
   'shallow' => [
     [
       '#tag' => 'div',

From a0f8a062ac1c7e6704efdda4a19867cc97030352 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 30 Oct 2019 16:53:19 -0400
Subject: [PATCH 497/834] ArrayHtml - Change text node format from string to
 array

Everything in the arrayHtml is associative exept text nodes were just strings.
That made it difficult to loop through the whole thing in javascript, so
this updates the format to be consistent with everything else.
---
 ext/afform/core/CRM/Afform/ArrayHtml.php             |  6 +++++-
 .../tests/phpunit/api/v4/formatExamples/apple.php    |  4 ++--
 .../tests/phpunit/api/v4/formatExamples/banana.php   |  4 ++--
 .../tests/phpunit/api/v4/formatExamples/cherry.php   | 12 ++++++------
 .../tests/phpunit/api/v4/formatExamples/comments.php | 12 ++++++------
 .../tests/phpunit/api/v4/formatExamples/string.php   |  4 ++--
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 6f5117926259..99fd3221b7b1 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -86,6 +86,10 @@ public function convertArrayToHtml(array $array) {
       return sprintf('<!--%s-->', $array['#comment']);
     }
 
+    if (isset($array['#text'])) {
+      return $array['#text'];
+    }
+
     $tag = empty($array['#tag']) ? self::DEFAULT_TAG : $array['#tag'];
     unset($array['#tag']);
     $children = empty($array['#children']) ? [] : $array['#children'];
@@ -183,7 +187,7 @@ public function convertNodeToArray($node) {
       return $arr;
     }
     elseif ($node instanceof DOMText) {
-      return $node->textContent;
+      return ['#text' => $node->textContent];
     }
     elseif ($node instanceof DOMComment) {
       $arr = ['#comment' => $node->nodeValue];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
index dc37c5024bd8..28d8ba4be2f6 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -3,9 +3,9 @@
 return [
   'html' => '<strong>New text!</strong>',
   'shallow' => [
-    ['#tag' => 'strong', '#children' => ['New text!']],
+    ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
   ],
   'deep' => [
-    ['#tag' => 'strong', '#children' => ['New text!']],
+    ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
   ],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index bf33a0a21f0c..7e0a134caaa0 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -6,7 +6,7 @@
     [
       '#tag' => 'div',
       '#children' => [
-        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
       ],
     ],
@@ -15,7 +15,7 @@
     [
       '#tag' => 'div',
       '#children' => [
-        ['#tag' => 'strong', '#children' => ['New text!']],
+        ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
       ],
     ],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
index 879329bce31e..f47efed0e462 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
@@ -3,13 +3,13 @@
 return [
   'html' => '<span>First</span> <span>Second</span>',
   'shallow' => [
-    ['#tag' => 'span', '#children' => ['First']],
-    ' ',
-    ['#tag' => 'span', '#children' => ['Second']],
+    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
+    ['#text' => ' '],
+    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
   ],
   'deep' => [
-    ['#tag' => 'span', '#children' => ['First']],
-    ' ',
-    ['#tag' => 'span', '#children' => ['Second']],
+    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
+    ['#text' => ' '],
+    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
   ],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
index 248cffddb34c..c311e930e67f 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
@@ -6,11 +6,11 @@
     [
       '#tag' => 'div',
       '#children' => [
-        'One',
+        ['#text' => 'One'],
         ['#comment' => ' uno '],
-        ' Two ',
+        ['#text' => ' Two '],
         ['#comment' => 'dos & so on '],
-        ' Three',
+        ['#text' => ' Three'],
       ],
     ],
     ['#comment' => 'tres-a--b---c'],
@@ -19,11 +19,11 @@
     [
       '#tag' => 'div',
       '#children' => [
-        'One',
+        ['#text' => 'One'],
         ['#comment' => ' uno '],
-        ' Two ',
+        ['#text' => ' Two '],
         ['#comment' => 'dos & so on '],
-        ' Three',
+        ['#text' => ' Three'],
       ],
     ],
     ['#comment' => 'tres-a--b---c'],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
index 18ccc7f48751..221e1a36f058 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
@@ -2,6 +2,6 @@
 
 return [
   'html' => 'hello world',
-  'shallow' => ['hello world'],
-  'deep' => ['hello world'],
+  'shallow' => [['#text' => 'hello world']],
+  'deep' => [['#text' => 'hello world']],
 ];

From d16b39c3c687d68900fba7d090693ea27ea6bc2c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 30 Oct 2019 20:33:26 -0400
Subject: [PATCH 498/834] Restrict af-fieldset directive to A not E

The af-fieldset directive was ambiguiously set to restrict: "AE"
but only "E" was supported. I want to pick one and stick with it, and
I prefer "A" because the fieldset is also a container, so div or fieldset
seem like the appropriate tag names.
---
 ext/afform/core/Civi/Afform/FormDataModel.php |  4 +--
 ext/afform/core/afform.php                    |  2 +-
 ext/afform/core/ang/af/Fieldset.js            |  6 ++--
 ext/afform/core/ang/afBlock/ContactName.html  |  4 +--
 ext/afform/core/ang/afBlock/ContactName.js    |  1 -
 ext/afform/core/ang/afField/afField.js        |  2 +-
 .../phpunit/Civi/Afform/FormDataModelTest.php |  2 +-
 ext/afform/docs/sandbox/planning-v0.3.md      | 34 +++++++++----------
 ext/afform/mock/ang/afex.aff.html             | 16 ++++-----
 ext/afform/mock/ang/testAfform.aff.html       |  8 ++---
 10 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index 8b783f4bfc9a..5055e14cf82a 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -57,8 +57,8 @@ protected static function parseFields($element, &$entities) {
       if (is_string($child)) {
         //nothing
       }
-      elseif ($child['#tag'] == 'af-fieldset' && !empty($child['#children'])) {
-        $entities[$child['model']]['fields'] = array_merge($entities[$child['model']]['fields'] ?? [], AHQ::getTags($child, 'af-field'));
+      elseif (!empty($child['af-fieldset']) && !empty($child['#children'])) {
+        $entities[$child['af-fieldset']]['fields'] = array_merge($entities[$child['af-fieldset']]['fields'] ?? [], AHQ::getTags($child, 'af-field'));
       }
       else {
         self::parseFields($child, $entities);
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index c4ea5305fa68..b1d41f5a84ea 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -310,7 +310,7 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $fieldName = $afField->getAttribute('name');
-        $entityName = pq($afField)->parent('af-fieldset[model]')->attr('model');
+        $entityName = pq($afField)->parent('[af-fieldset]')->attr('af-fieldset');
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index 72e6e5481da3..63e338554d6e 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -1,12 +1,12 @@
 (function(angular, $, _) {
   // "afFieldset" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-fieldset model="myModel">...</af-fieldset> ...</af-form>
+  // Example usage: <af-form>... <div af-fieldset="myModel">...</div> ...</af-form>
   angular.module('af').directive('afFieldset', function() {
     return {
-      restrict: 'AE',
+      restrict: 'A',
       require: '^afForm',
       scope: {
-        modelName: '@model'
+        modelName: '@afFieldset'
       },
       link: function($scope, $el, $attr, afFormCtrl) {
         $scope.afFormCtrl = afFormCtrl;
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
index 3a345a33221d..8585c9b824e1 100644
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ b/ext/afform/core/ang/afBlock/ContactName.html
@@ -1,8 +1,8 @@
 <af-form>
   <af-entity name="$parent.model" type="Contact" label="Target Contact" />
-  <af-fieldset model="$parent.model">
+  <div af-fieldset="$parent.model">
     <af-field name="prefix" />
     <af-field name="first_name" />
     <af-field name="last_name" />
-  </af-fieldset>
+  </div>
 </af-form>
diff --git a/ext/afform/core/ang/afBlock/ContactName.js b/ext/afform/core/ang/afBlock/ContactName.js
index 46cb10441901..2de0136783ae 100644
--- a/ext/afform/core/ang/afBlock/ContactName.js
+++ b/ext/afform/core/ang/afBlock/ContactName.js
@@ -1,5 +1,4 @@
 (function(angular, $, _) {
-  // Example usage: <af-fieldset model="myModel"><af-block-contact-name /></af-fieldset>
   angular.module('afBlock').directive('afBlockContactName', function() {
     return {
       restrict: 'AE',
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 4a3c9b1a968f..6c70a98e700f 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -1,5 +1,5 @@
 (function(angular, $, _) {
-  // Example usage: <af-fieldset model="myModel"><af-field name="do_not_email" /></af-fieldset>
+  // Example usage: <div af-fieldset="myModel"><af-field name="do_not_email" /></div>
   angular.module('afField').directive('afField', function() {
     return {
       restrict: 'E',
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
index 52e32fab2c64..b75619d8efc7 100644
--- a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
@@ -39,7 +39,7 @@ public function getEntityExamples() {
     ];
 
     $cases[] = [
-      'html' => '<af-form><af-entity type="Foo" name="foobar"/><af-fieldset model="foobar"><af-field name="propA" /><span><p><af-field name="propB" defn="{title: \'Whiz\'}" /></p></span></af-fieldset></af-form>',
+      'html' => '<af-form><af-entity type="Foo" name="foobar"/><div af-fieldset="foobar"><af-field name="propA" /><span><p><af-field name="propB" defn="{title: \'Whiz\'}" /></p></span></div></af-form>',
       'entities' => [
         'foobar' => [
           'type' => 'Foo',
diff --git a/ext/afform/docs/sandbox/planning-v0.3.md b/ext/afform/docs/sandbox/planning-v0.3.md
index 2273a4b88988..18b33073cf2f 100644
--- a/ext/afform/docs/sandbox/planning-v0.3.md
+++ b/ext/afform/docs/sandbox/planning-v0.3.md
@@ -68,16 +68,16 @@
   <af-fieldset type="Individual" model="parent" label="Parent">
     <af-name label="Name" />
     <af-email label="Email" />
-  </af-fieldset>
+  </div>
 
   <af-fieldset type="Individual" model="spouse" af-title="Spouse">
     <af-name label="Spouse Name" />
     <af-email label="Spouse Email" />
-  </af-fieldset>
+  </div>
 
   <af-fieldset type="Individual" model="parent" af-title="Parent">
     <af-address label="Address" />
-  </af-fieldset>
+  </div>
 
 </af-form>
 ```
@@ -100,23 +100,23 @@
   />
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
-  <af-fieldset model="parent">
+  <div af-fieldset="parent">
     <af-name label="Name" />
     <af-email label="Email" />
-  </af-fieldset>
+  </div>
 
-  <af-fieldset model="spouse">
+  <div af-fieldset="spouse">
     <af-name label="Spouse Name" />
     <af-email label="Spouse Email" only-primary="true" />
-  </af-fieldset>
+  </div>
 
   <p ng-if="spouse.display_name.contains('Thor')">
     Your spouse should go to the gym.
   </p>
 
-  <af-fieldset model="parent">
+  <div af-fieldset="parent">
     <af-address label="Address" />
-  </af-fieldset>
+  </div>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-model="modelListCtrl.submit()">Submit</button>
@@ -137,9 +137,9 @@
     <!--label="Emails"-->
     <!--api4-params="{where: ['contact_id', '=', options.parent.id]}"-->
   <!--/>-->
-  <!--<af-fieldset model="email">-->
+  <!--<div af-fieldset="email">-->
     <!---->
-  <!--</af-fieldset>-->
+  <!--</div>-->
 <!--</af-form>-->
 
 ```
@@ -164,18 +164,18 @@
 
   <crm-ui-tab-set>
     <crm-ui-tab title="About You">
-      <af-fieldset model="parent">
+      <div af-fieldset="parent">
         <af-std-contact-name label="Name" />
         <af-std-contact-email label="Email" />
         <af-field name="do_not_email" field-type="checkbox" field-default="1" />
-      </af-fieldset>
+      </div>
     </crm-ui-tab>
     <crm-ui-tab title="Spouse">
-      <af-fieldset model="spouse">
+      <div af-fieldset="spouse">
         <af-std-contact-name label="Spouse Name" />
         <af-std-contact-email label="Spouse Email" only-primary="true" />
         <af-field name="do_not_email" field-type="checkbox" field-default="1" />
-      </af-fieldset>
+      </div>
     </crm-ui-tab>
   </crm-ui-tab-set>
 
@@ -183,9 +183,9 @@
     Your spouse should go to the gym.
   </p>
 
-  <af-fieldset model="parent">
+  <div af-fieldset="parent">
     <af-block-contact-address label="Address" />
-  </af-fieldset>
+  </div>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-model="modelListCtrl.submit()">Submit</button>
diff --git a/ext/afform/mock/ang/afex.aff.html b/ext/afform/mock/ang/afex.aff.html
index f81aff3c5fd7..1cc0a26dbd59 100644
--- a/ext/afform/mock/ang/afex.aff.html
+++ b/ext/afform/mock/ang/afex.aff.html
@@ -6,25 +6,25 @@
 
   <!-- "parent" and "spouse" should be exported as variables in this scope -->
 
-  <af-fieldset model="parent">
+  <div af-fieldset="parent">
     <af-block-contact-name label="My Name" />
     <af-block-contact-email label="My Email" />
     <af-field name="do_not_email" />
-  </af-fieldset>
+  </div>
 
-  <af-fieldset model="spouse">
+  <div af-fieldset="spouse">
     <af-block-contact-name label="Spouse Name" />
     <af-block-contact-email label="Spouse Email" only-primary="true" />
     <af-field name="do_not_email" defn="{type: 'checkbox', default: 1}" />
-  </af-fieldset>
+  </div>
 
-  <af-fieldset model="home">
+  <div af-fieldset="home">
     <af-block-contact-name label="Home Name" />
-  </af-fieldset>
+  </div>
 
-  <af-fieldset model="parent">
+  <div af-fieldset="parent">
     <af-block-contact-address label="My Address" />
-  </af-fieldset>
+  </div>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-click="modelListCtrl.submit()">Submit</button>
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index a8fecdb4f322..824054eb4c46 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -4,7 +4,7 @@
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
 
-  <af-fieldset model="parent">
+  <div af-fieldset="parent">
     <h3>About You</h3>
 
     <af-field name="first_name" />
@@ -13,15 +13,15 @@ <h3>About You</h3>
     <af-field name="constituent_information.Marital_Status" />
     <af-field name="constituent_information.Marriage_Date" />
     <af-field name="constituent_information.Most_Important_Issue" />
-  </af-fieldset>
+  </div>
 
-  <af-fieldset model="spouse" ng-if="modelListCtrl.getData('parent')['constituent_information.Marital_Status'] == 'M'">
+  <div af-fieldset="spouse" ng-if="modelListCtrl.getData('parent')['constituent_information.Marital_Status'] == 'M'">
     <h3>About Your Spouse</h3>
 
     <af-field name="first_name" defn='{title: ts("Spouse First Name")}' />
     <af-field name="last_name" defn='{title: ts("Spouse Last Name")}' />
     <af-field name="do_not_email" />
-  </af-fieldset>
+  </div>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
   <button ng-click="modelListCtrl.submit()">Submit</button>

From aaf3e9b30c252c135f3f98b50c10370c042a2ac7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 31 Oct 2019 21:53:24 -0700
Subject: [PATCH 499/834] af-fieldset - More updates for switching E=>A

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 4 +---
 ext/afform/core/ang/af.ang.php           | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 99fd3221b7b1..a8f55b22732b 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -20,6 +20,7 @@ class CRM_Afform_ArrayHtml {
   private $protoSchema = [
     '*' => [
       '*' => 'text',
+      'af-fieldset' => 'text',
     ],
     'af-entity' => [
       '#selfClose' => TRUE,
@@ -32,9 +33,6 @@ class CRM_Afform_ArrayHtml {
       'name' => 'text',
       'defn' => 'js',
     ],
-    'af-fieldset' => [
-      'model' => 'text',
-    ],
     'area' => ['#selfClose' => TRUE],
     'base' => ['#selfClose' => TRUE],
     'br' => ['#selfClose' => TRUE],
diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index a97b53814242..0dae45cef56c 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -16,7 +16,7 @@
   'basePages' => [],
   'exports' => [
     'af-entity' => 'AE',
-    'af-fieldset' => 'AE',
+    'af-fieldset' => 'A',
     'af-form' => 'AE',
   ],
 ];

From 30d78783ff708c6ae3a982d1237bc009c99e0bad Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 31 Oct 2019 21:53:44 -0700
Subject: [PATCH 500/834] Fix warnings for `#text` format

---
 ext/afform/core/Civi/Afform/AHQ.php           | 2 +-
 ext/afform/core/Civi/Afform/FormDataModel.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/AHQ.php b/ext/afform/core/Civi/Afform/AHQ.php
index 711ad668e3cd..1a8f1edb610e 100644
--- a/ext/afform/core/Civi/Afform/AHQ.php
+++ b/ext/afform/core/Civi/Afform/AHQ.php
@@ -19,7 +19,7 @@ class AHQ {
    * @return array
    */
   public static function getTags($element, $tagName) {
-    if ($element === [] || is_string($element)) {
+    if ($element === [] || is_string($element) || isset($element['#text'])) {
       return [];
     }
     $results = [];
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index 5055e14cf82a..ec8cb7fdb225 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -54,7 +54,7 @@ protected static function parseFields($element, &$entities) {
       return;
     }
     foreach ($element['#children'] as $child) {
-      if (is_string($child)) {
+      if (is_string($child) || isset($child['#text'])) {
         //nothing
       }
       elseif (!empty($child['af-fieldset']) && !empty($child['#children'])) {

From f6e9a95de2a2b9de675f965bbd7c3c78cccef125 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 31 Oct 2019 22:20:26 -0700
Subject: [PATCH 501/834] Add bin/test-all.sh

---
 ext/afform/bin/test-all.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100755 ext/afform/bin/test-all.sh

diff --git a/ext/afform/bin/test-all.sh b/ext/afform/bin/test-all.sh
new file mode 100755
index 000000000000..c1a7cf77abde
--- /dev/null
+++ b/ext/afform/bin/test-all.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+## Run all afform-related tests
+##
+## Usage: ./bin/test-all.sh
+
+set -e
+EXIT=0
+
+cv en afform afform_mock
+AFF_CORE=$(cv path -x afform)
+AFF_MOCK=$(cv path -x afform_mock)
+
+pushd "$AFF_CORE" >> /dev/null
+  if ! phpunit6 "$@" ; then
+    EXIT=1
+  fi
+popd >> /dev/null
+
+pushd "$AFF_MOCK" >> /dev/null
+  if ! phpunit6 "$@" ; then
+    EXIT=1
+  fi
+popd >> /dev/null
+
+exit "$EXIT"

From 56b9319d50cb73950a633b671f2c3db18999bc6a Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 1 Nov 2019 09:57:25 -0400
Subject: [PATCH 502/834] Fix parser to work with nested fields

Fields should be allowed to be inside other tags as long as they're
contained in an af-fieldset.
---
 ext/afform/core/afform.php              | 2 +-
 ext/afform/mock/ang/testAfform.aff.html | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index b1d41f5a84ea..bbd0b627b08d 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -310,7 +310,7 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $fieldName = $afField->getAttribute('name');
-        $entityName = pq($afField)->parent('[af-fieldset]')->attr('af-fieldset');
+        $entityName = pq($afField)->parents('[af-fieldset]')->attr('af-fieldset');
         if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 824054eb4c46..8e5e52ea73e5 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -7,8 +7,10 @@
   <div af-fieldset="parent">
     <h3>About You</h3>
 
-    <af-field name="first_name" />
-    <af-field name="last_name" />
+    <div class="af-block">
+      <af-field name="first_name" />
+      <af-field name="last_name" />
+    </div>
     <af-field name="gender_id" />
     <af-field name="constituent_information.Marital_Status" />
     <af-field name="constituent_information.Marriage_Date" />

From bebb3e591f3bc099765a06ba9a21fee0c16a1829 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Nov 2019 12:40:56 -0700
Subject: [PATCH 503/834] (REF) AfformScanner::getLayout() - Extract new method

---
 ext/afform/core/CRM/Afform/AfformScanner.php    | 12 ++++++++++++
 ext/afform/core/Civi/Api4/Action/Afform/Get.php |  9 ++++-----
 ext/afform/core/afform.php                      |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index fe2c91f6cc91..f7ba60a704b5 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -152,6 +152,18 @@ public function getMeta($name) {
     }
   }
 
+  /**
+   * @param string $formName
+   *   Ex: 'view-individual'
+   * @return string|NULL
+   *   Ex: '<em>Hello world!</em>'
+   *   NULL if no layout exists
+   */
+  public function getLayout($formName) {
+    $filePath = $this->findFilePath($formName, self::LAYOUT_FILE);
+    return $filePath === NULL ? NULL : file_get_contents($filePath);
+  }
+
   /**
    * Get the effective metadata for all forms.
    *
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 61da5f8d523a..e6571eb591e3 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -22,11 +22,10 @@ public function getRecords() {
     $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
-      $layout = $scanner->findFilePath($name, 'aff.html');
-      if ($layout) {
-        // FIXME check for file existence+substance+validity
-        $html = file_get_contents($layout);
-        $record['layout'] = $this->convertHtmlToOutput($html);
+      $layout = $scanner->getLayout($name);
+      if ($layout !== NULL) {
+        // FIXME check for validity?
+        $record['layout'] = $this->convertHtmlToOutput($layout);
       }
       $values[] = $record;
     }
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index bbd0b627b08d..a18f2bd67a6a 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -400,7 +400,7 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
 
   $fileName = '~afform/' . _afform_angular_module_name($name, 'camel');
   $htmls = [
-    $fileName => file_get_contents($scanner->findFilePath($name, 'aff.html')),
+    $fileName => $scanner->getLayout($name),
   ];
   $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(Civi::service('angular')->getChangeSets(), 'partials', $htmls);
 

From 854558d3dc1983a6419109ddf5c4287ddc919828 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Nov 2019 12:41:35 -0700
Subject: [PATCH 504/834] (NFC) Small cleanup

---
 ext/afform/core/afform.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index a18f2bd67a6a..81323f2faf00 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -392,8 +392,7 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   }
 
   $name = $params['name'];
-  // Hmm?? $scanner = new CRM_Afform_AfformScanner();
-  // Hmm?? afform_scanner
+  /** @var \CRM_Afform_AfformScanner $scanner */
   $scanner = Civi::service('afform_scanner');
   $meta = $scanner->getMeta($name);
   // Hmm?? $scanner = new CRM_Afform_AfformScanner();

From 8bed1c849bf7fee2245a65c5f5336a20f4fe2b5a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Nov 2019 12:45:15 -0700
Subject: [PATCH 505/834] (REF) _afform_html_filter() - Extract method for
 unit-testing

---
 ext/afform/core/afform.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 81323f2faf00..e9decfee32f3 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -395,25 +395,34 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   /** @var \CRM_Afform_AfformScanner $scanner */
   $scanner = Civi::service('afform_scanner');
   $meta = $scanner->getMeta($name);
-  // Hmm?? $scanner = new CRM_Afform_AfformScanner();
-
-  $fileName = '~afform/' . _afform_angular_module_name($name, 'camel');
-  $htmls = [
-    $fileName => $scanner->getLayout($name),
-  ];
-  $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(Civi::service('angular')->getChangeSets(), 'partials', $htmls);
 
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
     'camel' => _afform_angular_module_name($name, 'camel'),
     'meta' => $meta,
     'metaJson' => json_encode($meta),
-    'layout' => $htmls[$fileName],
+    'layout' => _afform_html_filter($name, $scanner->getLayout($name)),
   ]);
   $mimeType = 'text/javascript';
   $content = $smarty->fetch('afform/AfformAngularModule.tpl');
 }
 
+/**
+ * Apply any filters to an HTML partial.
+ *
+ * @param string $formName
+ * @param string $html
+ *   Original HTML.
+ * @return string
+ *   Modified HTML.
+ */
+function _afform_html_filter($formName, $html) {
+  $fileName = '~afform/' . _afform_angular_module_name($formName, 'camel');
+  $htmls = [$fileName => $html];
+  $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(Civi::service('angular')->getChangeSets(), 'partials', $htmls);
+  return $htmls[$fileName];
+}
+
 /**
  * Implements hook_civicrm_alterMenu().
  */

From b7d59d872efb907dce06887c2c4e3dbf788f7833 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Nov 2019 13:14:33 -0700
Subject: [PATCH 506/834] FilterTest - Add basic unit test for the 'defn="..."`
 injection

---
 .../tests/phpunit/Civi/Afform/FilterTest.php  | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php

diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
new file mode 100644
index 000000000000..ec441c2909eb
--- /dev/null
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
@@ -0,0 +1,59 @@
+<?php
+namespace Civi\Afform;
+
+use Civi\Test\HeadlessInterface;
+use Civi\Test\TransactionalInterface;
+
+/**
+ * Class FilterTest
+ *
+ * Ensure that the HTML post-processing/filtering works as expected.
+ *
+ * @package Civi\Afform
+ * @group headless
+ */
+class FilterTest extends \PHPUnit\Framework\TestCase implements HeadlessInterface, TransactionalInterface {
+
+  const PERSON_TPL = '<af-form ctrl="modelListCtrl" ><af-entity type="Contact" name="person" />%s</af-form>';
+
+  public function setUpHeadless() {
+    return \Civi\Test::headless()->installMe(__DIR__)->apply();
+  }
+
+  public function testDefnInjection() {
+    $inputHtml = sprintf(self::PERSON_TPL,
+      '<div af-fieldset="person"><af-field name="first_name" /></div>');
+    $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+    $converter = new \CRM_Afform_ArrayHtml(TRUE);
+    $parsed = $converter->convertHtmlToArray($filteredHtml);
+
+    $myField = $parsed[0]['#children'][1]['#children'][0];
+    $this->assertEquals('af-field', $myField['#tag']);
+    $this->assertEquals('First Name', $myField['defn']['title']);
+  }
+
+  public function testDefnInjectionNested() {
+    $inputHtml = sprintf(self::PERSON_TPL,
+      '<span><div af-fieldset="person"><foo><af-field name="first_name" /></foo></div></span>');
+    $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+    $converter = new \CRM_Afform_ArrayHtml(TRUE);
+    $parsed = $converter->convertHtmlToArray($filteredHtml);
+
+    $myField = $parsed[0]['#children'][1]['#children'][0]['#children'][0]['#children'][0];
+    $this->assertEquals('af-field', $myField['#tag']);
+    $this->assertEquals('First Name', $myField['defn']['title']);
+  }
+
+  //public function testDefnOverrideTitle() {
+  //  $inputHtml = sprintf(self::PERSON_TPL,
+  //    '<div af-fieldset="person"><af-field name="first_name" defn="{title: \'Given name\'}" /></div>');
+  //  $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+  //  $converter = new \CRM_Afform_ArrayHtml(TRUE);
+  //  $parsed = $converter->convertHtmlToArray($filteredHtml);
+  //
+  //  $myField = $parsed[0]['#children'][1]['#children'][0];
+  //  $this->assertEquals('af-field', $myField['#tag']);
+  //  $this->assertEquals('Given name', $myField['defn']['title']);
+  //}
+
+}

From fb96a2d7405913acf5556ca35328a4ddbd3e49bb Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Nov 2019 13:27:46 -0700
Subject: [PATCH 507/834] (REF) AHQ::makeRoot() - Extract helper from
 FormDataModel

---
 ext/afform/core/Civi/Afform/AHQ.php           | 14 ++++++++++++++
 ext/afform/core/Civi/Afform/FormDataModel.php |  5 +----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/AHQ.php b/ext/afform/core/Civi/Afform/AHQ.php
index 1a8f1edb610e..e87512f5a53d 100644
--- a/ext/afform/core/Civi/Afform/AHQ.php
+++ b/ext/afform/core/Civi/Afform/AHQ.php
@@ -10,6 +10,20 @@
  */
 class AHQ {
 
+  /**
+   * Given a list of would-be child nodes, combine them under a common root.
+   *
+   * @param array $children
+   * @param string $tag
+   * @return array
+   */
+  public static function makeRoot($children, $tag = 'placeholder') {
+    return [
+      '#tag' => $tag,
+      '#children' => $children,
+    ];
+  }
+
   /**
    * Returns all tags with a certain tag name, e.g. 'af-entity'
    *
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index ec8cb7fdb225..ce45687cb162 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -26,10 +26,7 @@ class FormDataModel {
    *   Parsed summary of the entities used in a given form.
    */
   public static function create($layout) {
-    $root = [
-      '#tag' => 'root',
-      '#children' => $layout,
-    ];
+    $root = AHQ::makeRoot($layout);
     $entities = array_column(AHQ::getTags($root, 'af-entity'), NULL, 'name');
     foreach (array_keys($entities) as $entity) {
       $entities[$entity]['fields'] = [];

From f6c0358e4b1aef202d897284ad6c8ae70e5909a4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 24 Oct 2019 13:05:19 -0400
Subject: [PATCH 508/834] WIP beginning work on GUI

---
 ext/afform/gui/CRM/AfformGui/Page/Gui.php     | 18 ----
 ext/afform/gui/ang/afGuiAdmin.aff.html        |  7 ++
 ext/afform/gui/ang/afGuiAdmin.aff.json        |  7 ++
 ext/afform/gui/ang/afGuiEditor.ang.php        | 16 ++++
 ext/afform/gui/ang/afGuiEditor.css            | 11 +++
 ext/afform/gui/ang/afGuiEditor.js             | 95 +++++++++++++++++++
 ext/afform/gui/ang/afGuiEditor/canvas.html    |  3 +
 ext/afform/gui/ang/afGuiEditor/main.html      |  8 ++
 ext/afform/gui/ang/afGuiEditor/palette.html   | 16 ++++
 ext/afform/gui/ang/afGuiList.aff.html         | 43 +++++++++
 ext/afform/gui/ang/afformGui.ang.php          | 14 ---
 ext/afform/gui/ang/afformGui.css              |  1 -
 ext/afform/gui/ang/afformGui.js               |  4 -
 .../gui/ang/afformGui/afformBuilder.html      |  4 -
 ext/afform/gui/ang/afformGui/afformBuilder.js | 30 ------
 ext/afform/gui/ang/afformGui/afformList.html  | 25 -----
 ext/afform/gui/ang/afformGui/afformList.js    | 27 ------
 ext/afform/html/ang/afHtmlList.aff.html       |  4 +-
 18 files changed, 209 insertions(+), 124 deletions(-)
 delete mode 100644 ext/afform/gui/CRM/AfformGui/Page/Gui.php
 create mode 100644 ext/afform/gui/ang/afGuiAdmin.aff.html
 create mode 100644 ext/afform/gui/ang/afGuiAdmin.aff.json
 create mode 100644 ext/afform/gui/ang/afGuiEditor.ang.php
 create mode 100644 ext/afform/gui/ang/afGuiEditor.css
 create mode 100644 ext/afform/gui/ang/afGuiEditor.js
 create mode 100644 ext/afform/gui/ang/afGuiEditor/canvas.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/main.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/palette.html
 create mode 100644 ext/afform/gui/ang/afGuiList.aff.html
 delete mode 100644 ext/afform/gui/ang/afformGui.ang.php
 delete mode 100644 ext/afform/gui/ang/afformGui.css
 delete mode 100644 ext/afform/gui/ang/afformGui.js
 delete mode 100644 ext/afform/gui/ang/afformGui/afformBuilder.html
 delete mode 100644 ext/afform/gui/ang/afformGui/afformBuilder.js
 delete mode 100644 ext/afform/gui/ang/afformGui/afformList.html
 delete mode 100644 ext/afform/gui/ang/afformGui/afformList.js

diff --git a/ext/afform/gui/CRM/AfformGui/Page/Gui.php b/ext/afform/gui/CRM/AfformGui/Page/Gui.php
deleted file mode 100644
index 8a10ab9ac017..000000000000
--- a/ext/afform/gui/CRM/AfformGui/Page/Gui.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-use CRM_AfformGui_ExtensionUtil as E;
-
-class CRM_AfformGui_Page_Gui extends CRM_Core_Page {
-
-  public function run() {
-    $loader = new \Civi\Angular\AngularLoader();
-    $loader->setModules(['afformGui']);
-    $loader->setPageName('civicrm/admin/afform');
-    $loader->useApp([
-      'defaultRoute' => '/list',
-    ]);
-    $loader->load();
-    CRM_Utils_System::setTitle('CiviCRM');
-    parent::run();
-  }
-
-}
diff --git a/ext/afform/gui/ang/afGuiAdmin.aff.html b/ext/afform/gui/ang/afGuiAdmin.aff.html
new file mode 100644
index 000000000000..a87be4db0f83
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiAdmin.aff.html
@@ -0,0 +1,7 @@
+<div ng-if="!routeParams.name">
+  <div af-gui-list=""></div>
+</div>
+
+<div ng-if="routeParams.name">
+  <div af-gui-editor="{name: routeParams.name}"></div>
+</div>
diff --git a/ext/afform/gui/ang/afGuiAdmin.aff.json b/ext/afform/gui/ang/afGuiAdmin.aff.json
new file mode 100644
index 000000000000..f9663aa59d2a
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiAdmin.aff.json
@@ -0,0 +1,7 @@
+{
+  "title": "Afform Administration",
+  "server_route": "civicrm/admin/afform",
+  "requires": [
+    "afGuiEditor"
+  ]
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.ang.php b/ext/afform/gui/ang/afGuiEditor.ang.php
new file mode 100644
index 000000000000..18459b2234b3
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor.ang.php
@@ -0,0 +1,16 @@
+<?php
+// Angular module for afform gui editor
+return [
+  'js' => [
+    'ang/afGuiEditor.js',
+    'ang/afGuiEditor/*.js',
+  ],
+  'css' => ['ang/afGuiEditor.css'],
+  'partials' => ['ang/afGuiEditor'],
+  'requires' => ['crmUi', 'crmUtil'],
+  'settings' => [],
+  'basePages' => [],
+  'exports' => [
+    'af-gui-editor' => 'A',
+  ],
+];
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
new file mode 100644
index 000000000000..190a4abbb5de
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -0,0 +1,11 @@
+#afGuiEditor-main {
+  display: flex;
+}
+
+#afGuiEditor-palette {
+  flex: 1;
+}
+
+#afGuiEditor-canvas {
+  flex: 1;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
new file mode 100644
index 000000000000..151ed0166117
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -0,0 +1,95 @@
+(function(angular, $, _) {
+  angular.module('afGuiEditor', CRM.angRequires('afGuiEditor'));
+
+  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4) {
+    return {
+      restrict: 'A',
+      //require: 'ngModel',
+      templateUrl: '~/afGuiEditor/main.html',
+      scope: {
+        afGuiEditor: '='
+      },
+      link: function($scope, $el, $attr) {
+        $scope.ts = CRM.ts();
+        $scope.afform = null;
+        $scope.selectedEntity = null;
+        var newForm = {
+          title: ts('Untitled Form'),
+          layout: {
+            '#tag': 'af-form',
+            ctrl: 'modelListCtrl',
+            '#children': [
+              {
+                '#tag': 'af-entity',
+                type: 'Contact',
+                data: {
+                  contact_type: 'Individual'
+                },
+                name: 'Contact1',
+                label: 'Contact 1',
+                'url-autofill': '1',
+                autofill: 'user'
+              }
+            ]
+          }
+        };
+        if ($scope.afGuiEditor.name) {
+          crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]]}, 0)
+            .then(initialize);
+        }
+        else {
+          initialize(newForm);
+        }
+
+        function initialize(afform) {
+          // Todo - show error msg if form is not found
+          $scope.afform = afform;
+          $scope.entities = getTags(afform.layout, 'af-entity', 'name');
+        }
+
+        $scope.addEntity = function(entityType) {
+          var existingEntitiesofThisType = _.map(_.filter($scope.entities, {type: entityType}), 'name'),
+            num = existingEntitiesofThisType.length + 1;
+          // Give this new entity a unique name
+          while (_.contains(existingEntitiesofThisType, entityType + num)) {
+            num++;
+          }
+          $scope.entities[entityType + num] = {
+            '#tag': 'af-entity',
+            type: entityType,
+            name: entityType + num,
+            label: entityType + ' ' + num
+          };
+          $scope.afform.layout['#children'].push($scope.entities[entityType + num]);
+        };
+
+        $scope.removeEntity = function(entityName) {
+          delete $scope.entities[entityName];
+          $scope.afform.layout['#children'].splice(_.findIndex($scope.afform.layout['#children'], {'#tag': 'af-entity', name: entityName}), 1);
+        };
+
+        $scope.selectEntity = function(entityName) {
+          $scope.selectedEntity = entityName;
+        };
+
+      }
+    };
+  });
+
+  function getTags(collection, tagName, indexBy) {
+    var items = [];
+    _.each(collection, function(item) {
+      if (item && typeof item === 'object') {
+        if (item['#tag'] === tagName) {
+          items.push(item);
+        }
+        var childTags = item['#children'] ? getTags(item['#children'], tagName) : [];
+        if (childTags.length) {
+          Array.prototype.push.apply(items, childTags);
+        }
+      }
+    });
+    return indexBy ? _.indexBy(items, indexBy) : items;
+  }
+
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
new file mode 100644
index 000000000000..b80e6e067849
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -0,0 +1,3 @@
+<div>
+
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/gui/ang/afGuiEditor/main.html
new file mode 100644
index 000000000000..bf70aa714519
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/main.html
@@ -0,0 +1,8 @@
+<div crm-ui-debug="afform"></div>
+<div crm-ui-debug="entities"></div>
+<div id="bootstrap-theme">
+  <div id="afGuiEditor-main">
+    <div id="afGuiEditor-palette" ng-include="'~/afGuiEditor/palette.html'"></div>
+    <div id="afGuiEditor-canvas" ng-include="'~/afGuiEditor/canvas.html'"></div>
+  </div>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
new file mode 100644
index 000000000000..66004be1817a
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -0,0 +1,16 @@
+<ul id="afGuiEditor-tabs" class="nav nav-pills nav-stacked">
+  <li role="presentation" ng-class="{active: selectedEntity === null}">
+    <a href ng-click="selectEntity(null)">{{ ts('Form Settings') }}</a>
+  </li>
+  <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
+    <a href ng-click="selectEntity(entity.name)">{{ entity.label }}</a>
+  </li>
+  <li role="presentation" class="dropdown text-right">
+    <a href class="dropdown-toggle" data-toggle="dropdown">
+      <i class="crm-i fa-plus"></i>
+    </a>
+    <ul class="dropdown-menu">
+      <li></li>
+    </ul>
+  </li>
+</ul>
diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/gui/ang/afGuiList.aff.html
new file mode 100644
index 000000000000..ed4a6286ee8c
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiList.aff.html
@@ -0,0 +1,43 @@
+<div
+  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+  af-api4-ctrl="listCtrl">
+
+  <div ng-if="apiData.result.length == 0">
+    {{ts('There are no forms! Tell Aristotle!')}}
+  </div>
+
+  <table>
+    <thead>
+      <tr>
+        <th>{{ts('Name')}}</th>
+        <th>{{ts('Title')}}</th>
+        <th>{{ts('Server Route')}}</th>
+        <th>{{ts('Frontend?')}}</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    <tr ng-repeat="availForm in listCtrl.result">
+      <td>
+        <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
+      </td>
+      <td>{{availForm.title}}</td>
+      <td>
+        <a ng-if="availForm.server_route" ng-href="{{crmUrl(availForm.server_route)}}" target="_blank">
+          <code>{{availForm.server_route}}</code>
+        </a>
+      </td>
+      <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
+      <td>
+        <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
+        <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+           af-api4-start-msg="ts('Reverting...')"
+           af-api4-success-msg="ts('Reverted')"
+           class="btn btn-xs btn-default"
+          >{{ts('Revert')}}</a>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</div>
diff --git a/ext/afform/gui/ang/afformGui.ang.php b/ext/afform/gui/ang/afformGui.ang.php
deleted file mode 100644
index a01ab9f769a2..000000000000
--- a/ext/afform/gui/ang/afformGui.ang.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// This file declares an Angular module which can be autoloaded
-
-return [
-  'js' => [
-    'ang/afformGui.js',
-    'ang/afformGui/*.js',
-    'ang/afformGui/*/*.js',
-  ],
-  'css' => ['ang/afformGui.css'],
-  'partials' => ['ang/afformGui'],
-  'settings' => [],
-  'requires' => ['crmUi', 'crmUtil', 'ngRoute', 'ui.sortable', 'api4'],
-];
diff --git a/ext/afform/gui/ang/afformGui.css b/ext/afform/gui/ang/afformGui.css
deleted file mode 100644
index 9e2005c62793..000000000000
--- a/ext/afform/gui/ang/afformGui.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add any CSS rules for Angular module "afformGui" */
diff --git a/ext/afform/gui/ang/afformGui.js b/ext/afform/gui/ang/afformGui.js
deleted file mode 100644
index 24706af40382..000000000000
--- a/ext/afform/gui/ang/afformGui.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function(angular, $, _) {
-  // Declare a list of dependencies.
-  angular.module('afformGui', CRM.angRequires('afformGui'));
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afformGui/afformBuilder.html b/ext/afform/gui/ang/afformGui/afformBuilder.html
deleted file mode 100644
index 8647a08e9148..000000000000
--- a/ext/afform/gui/ang/afformGui/afformBuilder.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="crm-container">
-  <div crm-ui-debug="afform"></div>
-
-</div>
diff --git a/ext/afform/gui/ang/afformGui/afformBuilder.js b/ext/afform/gui/ang/afformGui/afformBuilder.js
deleted file mode 100644
index aeea181c0621..000000000000
--- a/ext/afform/gui/ang/afformGui/afformBuilder.js
+++ /dev/null
@@ -1,30 +0,0 @@
-(function(angular, $, _) {
-
-  angular.module('afformGui').config(function($routeProvider) {
-    $routeProvider.when('/build/:afformName?', {
-      controller: 'afformBuilder',
-      templateUrl: '~/afformGui/afformBuilder.html',
-      resolve: {
-        afform: function(crmApi4, $route) {
-          var name = $route.current.params.afformName;
-          if (name) {
-            return crmApi4('Afform', 'get', {where: [['name', '=', name]]});
-          }
-        }
-      }
-    });
-  });
-
-  // The controller uses *injection*. This default injects a few things:
-  //   $scope -- This is the set of variables shared between JS and HTML.
-  //   crmApi, crmStatus, crmUiHelp -- These are services provided by civicrm-core.
-  //   myContact -- The current contact, defined above in config().
-  angular.module('afformGui').controller('afformBuilder', function($scope, $routeParams, crmApi4, crmStatus, crmUiHelp, afform) {
-    // The ts() and hs() functions help load strings for this module.
-    var ts = $scope.ts = CRM.ts('afformGui');
-    var hs = $scope.hs = crmUiHelp({file: 'CRM/AfformGui/afformBuilder'});
-    $scope.afform = afform;
-
-  });
-
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afformGui/afformList.html b/ext/afform/gui/ang/afformGui/afformList.html
deleted file mode 100644
index 59fa732c38ef..000000000000
--- a/ext/afform/gui/ang/afformGui/afformList.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="crm-container">
-  <div crm-ui-debug="afforms"></div>
-
-  <h1 crm-page-title>{{ ts('All Forms') }}</h1>
-
-  <table>
-    <thead>
-      <tr>
-        <th>Title</th>
-        <th>Name</th>
-        <th>Route</th>
-        <th>Public</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr ng-repeat="afform in afforms">
-        <td>{{ afform.title }}</td>
-        <td>{{ afform.name }}</td>
-        <td>{{ afform.server_route }}</td>
-        <td>{{ afform.is_public }}</td>
-      </tr>
-    </tbody>
-  </table>
-
-</div>
diff --git a/ext/afform/gui/ang/afformGui/afformList.js b/ext/afform/gui/ang/afformGui/afformList.js
deleted file mode 100644
index 14d78c214c27..000000000000
--- a/ext/afform/gui/ang/afformGui/afformList.js
+++ /dev/null
@@ -1,27 +0,0 @@
-(function(angular, $, _) {
-
-  angular.module('afformGui').config(function($routeProvider) {
-    $routeProvider.when('/list', {
-      controller: 'afformList',
-      templateUrl: '~/afformGui/afformList.html',
-      resolve: {
-        afforms: function(crmApi4) {
-          return crmApi4('Afform', 'get');
-        }
-      }
-    });
-  });
-
-  // The controller uses *injection*. This default injects a few things:
-  //   $scope -- This is the set of variables shared between JS and HTML.
-  //   crmApi, crmStatus, crmUiHelp -- These are services provided by civicrm-core.
-  //   myContact -- The current contact, defined above in config().
-  angular.module('afformGui').controller('afformList', function($scope, crmApi4, crmStatus, crmUiHelp, afforms) {
-    // The ts() and hs() functions help load strings for this module.
-    var ts = $scope.ts = CRM.ts('afformGui');
-    var hs = $scope.hs = crmUiHelp({file: 'CRM/AfformGui/afformList'});
-    $scope.afforms = afforms;
-
-  });
-
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index a0d9fa36c17a..ed4a6286ee8c 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -23,7 +23,9 @@
       </td>
       <td>{{availForm.title}}</td>
       <td>
-        <a ng-href="{{crmUrl(availForm.server_route)}}" target="_blank"><code>{{availForm.server_route}}</code></a>
+        <a ng-if="availForm.server_route" ng-href="{{crmUrl(availForm.server_route)}}" target="_blank">
+          <code>{{availForm.server_route}}</code>
+        </a>
       </td>
       <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
       <td>

From c820e08c2d8bd403dda4026b1299a2bd54ac5a2d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 25 Oct 2019 10:32:24 -0400
Subject: [PATCH 509/834] Add some metadata

---
 .../core/CRM/Afform/Page/AfformBase.php       |  3 +-
 ext/afform/gui/afform_gui.php                 | 73 +++++++++++++------
 ext/afform/gui/ang/afGuiEditor.css            | 33 ++++++++-
 ext/afform/gui/ang/afGuiEditor.js             |  3 +
 ext/afform/gui/ang/afGuiEditor/canvas.html    |  7 +-
 .../gui/ang/afGuiEditor/config-entity.html    |  3 +
 .../gui/ang/afGuiEditor/config-form.html      |  3 +
 ext/afform/gui/ang/afGuiEditor/palette.html   | 19 ++++-
 8 files changed, 113 insertions(+), 31 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/config-entity.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/config-form.html

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 3d389528b605..3ccc1e50ccdc 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -7,6 +7,7 @@ public function run() {
     list ($pagePath, $pageArgs) = func_get_args();
 
     $module = _afform_angular_module_name($pageArgs['afform']);
+    $this->set('afModule', $module);
 
     $loader = new \Civi\Angular\AngularLoader();
     $loader->setModules([$module, 'afformStandalone']);
@@ -18,7 +19,7 @@ public function run() {
     ]);
     $loader->load();
 
-    $afform = civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $pageArgs['afform']]], 'select' => ['title']]);
+    $afform = civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $module]], 'select' => ['title']]);
 
     if (!empty($afform[0]['title'])) {
       CRM_Utils_System::setTitle(strip_tags($afform[0]['title']));
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 9eef57b07f1b..72caa9cf6464 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -141,30 +141,57 @@ function afform_gui_civicrm_themes(&$themes) {
   _afform_gui_civix_civicrm_themes($themes);
 }
 
-// --- Functions below this ship commented out. Uncomment as required. ---
-
 /**
- * Implements hook_civicrm_preProcess().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
- *
-function afform_gui_civicrm_preProcess($formName, &$form) {
-
-} // */
+ * Implements hook_civicrm_pageRun().
+ */
+function afform_gui_civicrm_pageRun(&$page) {
+  if (get_class($page) == 'CRM_Afform_Page_AfformBase' && $page->get('afModule') == 'afGuiAdmin') {
+    Civi::resources()->addScriptUrl(Civi::service('asset_builder')->getUrl('af-gui-vars.js'));
+  }
+}
 
 /**
- * Implements hook_civicrm_navigationMenu().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
+ * Implements hook_civicrm_buildAsset().
  *
-function afform_gui_civicrm_navigationMenu(&$menu) {
-  _afform_gui_civix_insert_navigation_menu($menu, 'Mailings', array(
-    'label' => E::ts('New subliminal message'),
-    'name' => 'mailing_subliminal_message',
-    'url' => 'civicrm/mailing/subliminal',
-    'permission' => 'access CiviMail',
-    'operator' => 'OR',
-    'separator' => 0,
-  ));
-  _afform_gui_civix_navigationMenu($menu);
-} // */
+ * Loads metadata to send to the gui editor.
+ */
+function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
+  if ($asset !== 'af-gui-vars.js') {
+    return;
+  }
+
+  // Things that can't be handled by afform. TODO: Need a better way to do this. Maybe add core metadata about what each entity is for, and filter on that.
+  $entityBlacklist = [
+    'ACL',
+    'ActionSchedule',
+    'ActivityContact',
+    'Afform%',
+    'CaseContact',
+    'EntityTag',
+    'GroupContact',
+    'GroupNesting',
+    'GroupOrganization',
+    'Setting',
+    'System',
+    'UF%',
+  ];
+  $entityApi = Civi\Api4\Entity::get()
+    ->setCheckPermissions(FALSE)
+    ->setSelect(['name', 'description']);
+  foreach ($entityBlacklist as $nono) {
+    $entityApi->addWhere('name', 'NOT LIKE', $nono);
+  }
+
+  $contacts = Civi\Api4\Contact::getFields()
+    ->setCheckPermissions(FALSE)
+    ->setIncludeCustom(TRUE)
+    ->setLoadOptions(TRUE)
+    ->setAction('Create')
+    ->execute();
+
+  $mimeType = 'text/javascript';
+  $content = "CRM.afformAdminData={";
+  $content .= 'entities:' . json_encode((array) $entityApi->execute(), JSON_UNESCAPED_SLASHES) . ',';
+  $content .= 'fields:' . json_encode(['Contact' => (array) $contacts], JSON_UNESCAPED_SLASHES);
+  $content .= '}';
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 190a4abbb5de..e6464c1b5661 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -2,10 +2,39 @@
   display: flex;
 }
 
-#afGuiEditor-palette {
+#afGuiEditor-main .panel.panel-default {
+  margin-bottom: 0;
+}
+
+#afGuiEditor-main #afGuiEditor-palette {
   flex: 1;
+  margin-right: 5px;
+  box-shadow: 0 3px 18px 0 rgba(48,40,40,0.25);
 }
 
-#afGuiEditor-canvas {
+#afGuiEditor-main #afGuiEditor-canvas {
   flex: 1;
+  margin-left: 5px;
+}
+
+#afGuiEditor-main #afGuiEditor-palette-tabs {
+  width: 110px;
+  position: absolute;
+  left: 0;
+  top: 0;
+}
+
+#afGuiEditor-main #afGuiEditor-palette-tabs li > a {
+  padding: 10px 15px;
+  font-size: 12px;
+}
+
+#afGuiEditor-main #afGuiEditor-palette-tabs .dropdown-menu {
+  max-height: 500px;
+  overflow-y: auto;
+}
+
+#afGuiEditor-main #afGuiEditor-palette-config {
+  margin-left: 110px;
+  box-shadow: none;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 151ed0166117..14866eb50077 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -13,6 +13,7 @@
         $scope.ts = CRM.ts();
         $scope.afform = null;
         $scope.selectedEntity = null;
+        $scope.meta = CRM.afformAdminData;
         var newForm = {
           title: ts('Untitled Form'),
           layout: {
@@ -61,11 +62,13 @@
             label: entityType + ' ' + num
           };
           $scope.afform.layout['#children'].push($scope.entities[entityType + num]);
+          $scope.selectEntity(entityType + num);
         };
 
         $scope.removeEntity = function(entityName) {
           delete $scope.entities[entityName];
           $scope.afform.layout['#children'].splice(_.findIndex($scope.afform.layout['#children'], {'#tag': 'af-entity', name: entityName}), 1);
+          $scope.selectEntity(null);
         };
 
         $scope.selectEntity = function(entityName) {
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index b80e6e067849..103dd04c6e37 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -1,3 +1,6 @@
-<div>
-
+<div class="panel panel-default">
+  <div class="panel-heading">
+    {{ ts('Form Layout') }}
+  </div>
+  <div class="panel-body"></div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
new file mode 100644
index 000000000000..b80e6e067849
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -0,0 +1,3 @@
+<div>
+
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
new file mode 100644
index 000000000000..b80e6e067849
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -0,0 +1,3 @@
+<div>
+
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 66004be1817a..61db37a138ad 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -1,16 +1,29 @@
-<ul id="afGuiEditor-tabs" class="nav nav-pills nav-stacked">
+<ul id="afGuiEditor-palette-tabs" class="nav nav-pills nav-stacked">
   <li role="presentation" ng-class="{active: selectedEntity === null}">
     <a href ng-click="selectEntity(null)">{{ ts('Form Settings') }}</a>
   </li>
   <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
     <a href ng-click="selectEntity(entity.name)">{{ entity.label }}</a>
   </li>
-  <li role="presentation" class="dropdown text-right">
+  <li role="presentation" class="dropdown">
     <a href class="dropdown-toggle" data-toggle="dropdown">
       <i class="crm-i fa-plus"></i>
     </a>
     <ul class="dropdown-menu">
-      <li></li>
+      <li ng-repeat="entity in meta.entities">
+        <a href ng-click="addEntity(entity.name)">{{ entity.name }}</a>
+      </li>
     </ul>
   </li>
 </ul>
+<div id="afGuiEditor-palette-config" class="panel panel-default">
+  <div class="panel-heading">
+    <span ng-if="selectedEntity === null">{{ ts('Form Settings') }}</span>
+    <span ng-if="selectedEntity !== null">{{ entities[selectedEntity].label }}</span>
+    <a href ng-if="selectedEntity !== null" ng-click="removeEntity(selectedEntity)" class="pull-right">
+      <i class="crm-i fa-trash"></i>
+    </a>
+  </div>
+  <div class="panel-body" ng-include="'~/afGuiEditor/config-form.html'" ng-if="selectedEntity === null"></div>
+  <div class="panel-body" ng-include="'~/afGuiEditor/config-entity.html'" ng-if="selectedEntity !== null"></div>
+</div>

From a2854e2e50160f4a04b593da6559ea5fd4f8f1ee Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 25 Oct 2019 12:01:48 -0400
Subject: [PATCH 510/834] Horizontal tabs

---
 ext/afform/gui/ang/afGuiEditor.css            | 10 -----
 ext/afform/gui/ang/afGuiEditor.js             | 44 +++++++++++++++++++
 .../gui/ang/afGuiEditor/config-entity.html    |  4 +-
 ext/afform/gui/ang/afGuiEditor/palette.html   | 43 ++++++++----------
 4 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index e6464c1b5661..623114914452 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -9,7 +9,6 @@
 #afGuiEditor-main #afGuiEditor-palette {
   flex: 1;
   margin-right: 5px;
-  box-shadow: 0 3px 18px 0 rgba(48,40,40,0.25);
 }
 
 #afGuiEditor-main #afGuiEditor-canvas {
@@ -17,13 +16,6 @@
   margin-left: 5px;
 }
 
-#afGuiEditor-main #afGuiEditor-palette-tabs {
-  width: 110px;
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
 #afGuiEditor-main #afGuiEditor-palette-tabs li > a {
   padding: 10px 15px;
   font-size: 12px;
@@ -35,6 +27,4 @@
 }
 
 #afGuiEditor-main #afGuiEditor-palette-config {
-  margin-left: 110px;
-  box-shadow: none;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 14866eb50077..6c58bd82144b 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -95,4 +95,48 @@
     return indexBy ? _.indexBy(items, indexBy) : items;
   }
 
+  // Editable titles using ngModel & html5 contenteditable
+  angular.module('afGuiEditor').directive("afGuiEditable", function() {
+    return {
+      restrict: "A",
+      require: "ngModel",
+      link: function(scope, element, attrs, ngModel) {
+        var ts = CRM.ts();
+
+        function read() {
+          var htmlVal = element.html();
+          if (!htmlVal) {
+            htmlVal = ts('Unnamed');
+            element.html(htmlVal);
+          }
+          ngModel.$setViewValue(htmlVal);
+        }
+
+        ngModel.$render = function() {
+          element.html(ngModel.$viewValue || ' ');
+        };
+
+        // Special handling for enter and escape keys
+        element.on('keydown', function(e) {
+          // Enter: prevent line break and save
+          if (e.which === 13) {
+            e.preventDefault();
+            element.blur();
+          }
+          // Escape: undo
+          if (e.which === 27) {
+            element.html(ngModel.$viewValue || ' ');
+            element.blur();
+          }
+        });
+
+        element.on("blur change", function() {
+          scope.$apply(read);
+        });
+
+        element.attr('contenteditable', 'true').addClass('crm-editable-enabled');
+      }
+    };
+  });
+
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index b80e6e067849..bc9dd7f3511f 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -1,3 +1,5 @@
 <div>
-
+  <a href ng-if="selectedEntity !== null" ng-click="removeEntity(selectedEntity)" class="btn btn-sm btn-danger pull-right">
+    <i class="crm-i fa-trash"></i>
+  </a>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 61db37a138ad..fd7418b35918 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -1,29 +1,24 @@
-<ul id="afGuiEditor-palette-tabs" class="nav nav-pills nav-stacked">
-  <li role="presentation" ng-class="{active: selectedEntity === null}">
-    <a href ng-click="selectEntity(null)">{{ ts('Form Settings') }}</a>
-  </li>
-  <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
-    <a href ng-click="selectEntity(entity.name)">{{ entity.label }}</a>
-  </li>
-  <li role="presentation" class="dropdown">
-    <a href class="dropdown-toggle" data-toggle="dropdown">
-      <i class="crm-i fa-plus"></i>
-    </a>
-    <ul class="dropdown-menu">
-      <li ng-repeat="entity in meta.entities">
-        <a href ng-click="addEntity(entity.name)">{{ entity.name }}</a>
+<div id="afGuiEditor-palette-config" class="panel panel-default">
+    <ul id="afGuiEditor-palette-tabs" class="panel-heading nav nav-tabs">
+      <li role="presentation" ng-class="{active: selectedEntity === null}">
+        <a href ng-click="selectEntity(null)">{{ ts('Form Settings') }}</a>
+      </li>
+      <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
+        <a href ng-click="selectEntity(entity.name)">
+          <span af-gui-editable ng-model="entity.label">{{ entity.label }}</span>
+        </a>
+      </li>
+      <li role="presentation" class="dropdown">
+        <a href class="dropdown-toggle" data-toggle="dropdown">
+          <i class="crm-i fa-plus"></i>
+        </a>
+        <ul class="dropdown-menu">
+          <li ng-repeat="entity in meta.entities">
+            <a href ng-click="addEntity(entity.name)">{{ entity.name }}</a>
+          </li>
+        </ul>
       </li>
     </ul>
-  </li>
-</ul>
-<div id="afGuiEditor-palette-config" class="panel panel-default">
-  <div class="panel-heading">
-    <span ng-if="selectedEntity === null">{{ ts('Form Settings') }}</span>
-    <span ng-if="selectedEntity !== null">{{ entities[selectedEntity].label }}</span>
-    <a href ng-if="selectedEntity !== null" ng-click="removeEntity(selectedEntity)" class="pull-right">
-      <i class="crm-i fa-trash"></i>
-    </a>
-  </div>
   <div class="panel-body" ng-include="'~/afGuiEditor/config-form.html'" ng-if="selectedEntity === null"></div>
   <div class="panel-body" ng-include="'~/afGuiEditor/config-entity.html'" ng-if="selectedEntity !== null"></div>
 </div>

From a064e90d194dd3babf634b3e5a47fc5fad5d3b0a Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 27 Oct 2019 21:52:14 -0400
Subject: [PATCH 511/834] Config forms - values section

---
 ext/afform/gui/afform_gui.php                 |   9 +-
 ext/afform/gui/ang/afGuiEditor.css            |  40 ++++--
 ext/afform/gui/ang/afGuiEditor.js             | 114 ++++++++++++++++++
 .../gui/ang/afGuiEditor/config-entity.html    |  16 ++-
 .../gui/ang/afGuiEditor/config-form.html      |  11 +-
 ext/afform/gui/ang/afGuiEditor/main.html      |   3 +-
 ext/afform/gui/ang/afGuiEditor/palette.html   |   8 +-
 7 files changed, 183 insertions(+), 18 deletions(-)

diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 72caa9cf6464..f72cb7f014cb 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -182,16 +182,21 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     $entityApi->addWhere('name', 'NOT LIKE', $nono);
   }
 
-  $contacts = Civi\Api4\Contact::getFields()
+  $contactFields = Civi\Api4\Contact::getFields()
     ->setCheckPermissions(FALSE)
     ->setIncludeCustom(TRUE)
     ->setLoadOptions(TRUE)
     ->setAction('Create')
     ->execute();
 
+  $contactSettings = [
+    'data' => [],
+  ];
+
   $mimeType = 'text/javascript';
   $content = "CRM.afformAdminData={";
   $content .= 'entities:' . json_encode((array) $entityApi->execute(), JSON_UNESCAPED_SLASHES) . ',';
-  $content .= 'fields:' . json_encode(['Contact' => (array) $contacts], JSON_UNESCAPED_SLASHES);
+  $content .= 'fields:' . json_encode(['Contact' => (array) $contactFields], JSON_UNESCAPED_SLASHES) . ',';
+  $content .= 'settings:' . json_encode(['Contact' => $contactSettings], JSON_UNESCAPED_SLASHES);
   $content .= '}';
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 623114914452..93afb919b585 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -1,30 +1,54 @@
-#afGuiEditor-main {
+#afGuiEditor {
   display: flex;
 }
 
-#afGuiEditor-main .panel.panel-default {
-  margin-bottom: 0;
+#afGuiEditor .panel.panel-default {
+  /*margin-bottom: 0;*/
 }
 
-#afGuiEditor-main #afGuiEditor-palette {
+#afGuiEditor #afGuiEditor-palette {
   flex: 1;
   margin-right: 5px;
 }
 
-#afGuiEditor-main #afGuiEditor-canvas {
+#afGuiEditor #afGuiEditor-canvas {
   flex: 1;
   margin-left: 5px;
 }
 
-#afGuiEditor-main #afGuiEditor-palette-tabs li > a {
+#afGuiEditor #afGuiEditor-palette-tabs li {
+  top: 1px;
+}
+
+#afGuiEditor #afGuiEditor-palette-tabs li > a {
   padding: 10px 15px;
   font-size: 12px;
 }
 
-#afGuiEditor-main #afGuiEditor-palette-tabs .dropdown-menu {
+#afGuiEditor #afGuiEditor-palette-tabs .dropdown-menu {
   max-height: 500px;
   overflow-y: auto;
 }
 
-#afGuiEditor-main #afGuiEditor-palette-config {
+#afGuiEditor .crm-editable-enabled,
+#afGuiEditor-palette-tabs > li > a > span {
+  display: inline-block;
+  padding: 0 4px !important;
+  border: 2px solid transparent !important;
+}
+#afGuiEditor .crm-editable-enabled:hover:not(:focus) {
+  border: 2px dashed grey !important;
+}
+#afGuiEditor .crm-editable-enabled:before,
+#afGuiEditor .crm-editable-enabled:after {
+  content: '';
+  display: none;
+}
+
+#afGuiEditor-palette-config .form-inline {
+  margin-bottom: 10px;
+}
+
+#afGuiEditor-palette-config .form-inline label {
+  min-width: 110px;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 6c58bd82144b..6741032c0b36 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -14,6 +14,7 @@
         $scope.afform = null;
         $scope.selectedEntity = null;
         $scope.meta = CRM.afformAdminData;
+        $scope.controls = {};
         var newForm = {
           title: ts('Untitled Form'),
           layout: {
@@ -75,6 +76,28 @@
           $scope.selectedEntity = entityName;
         };
 
+        $scope.getField = function(entityName, fieldName) {
+          return _.filter($scope.meta.fields[entityName], {name: fieldName})[0];
+        };
+
+        $scope.valuesFields = function() {
+          var fields = _.transform($scope.meta.fields[$scope.entities[$scope.selectedEntity].type], function(fields, field) {
+            fields.push({id: field.name, text: field.title, disabled: field.name in $scope.entities[$scope.selectedEntity].data});
+          }, []);
+          return {results: fields};
+        };
+
+        $scope.removeValue = function(entity, fieldName) {
+          delete entity.data[fieldName];
+        };
+
+        $scope.$watch('controls.addValue', function(fieldName) {
+          if (fieldName) {
+            $scope.entities[$scope.selectedEntity].data[fieldName] = '';
+            $scope.controls.addValue = '';
+          }
+        });
+
       }
     };
   });
@@ -96,6 +119,7 @@
   }
 
   // Editable titles using ngModel & html5 contenteditable
+  // Cribbed from ContactLayoutEditor
   angular.module('afGuiEditor').directive("afGuiEditable", function() {
     return {
       restrict: "A",
@@ -139,4 +163,94 @@
     };
   });
 
+  // Cribbed from the Api4 Explorer
+  angular.module('afGuiEditor').directive('afGuiFieldValue', function() {
+    return {
+      scope: {
+        field: '=afGuiFieldValue'
+      },
+      require: 'ngModel',
+      link: function (scope, element, attrs, ctrl) {
+        var ts = scope.ts = CRM.ts(),
+          multi;
+
+        function destroyWidget() {
+          var $el = $(element);
+          if ($el.is('.crm-form-date-wrapper .crm-hidden-date')) {
+            $el.crmDatepicker('destroy');
+          }
+          if ($el.is('.select2-container + input')) {
+            $el.crmEntityRef('destroy');
+          }
+          $(element).removeData().removeAttr('type').removeAttr('placeholder').show();
+        }
+
+        function makeWidget(field) {
+          var $el = $(element),
+            inputType = field.input_type,
+            dataType = field.data_type;
+          multi = field.serialize || dataType === 'Array';
+          if (inputType === 'Date') {
+            $el.crmDatepicker({time: (field.input_attrs && field.input_attrs.time) || false});
+          }
+          else if (field.fk_entity || field.options || dataType === 'Boolean') {
+            if (field.fk_entity) {
+              $el.crmEntityRef({entity: field.fk_entity, select:{multiple: multi}});
+            } else if (field.options) {
+              var options = _.transform(field.options, function(options, val, key) {
+                options.push({id: key, text: val});
+              }, []);
+              $el.select2({data: options, multiple: multi});
+            } else if (dataType === 'Boolean') {
+              $el.attr('placeholder', ts('- select -')).crmSelect2({allowClear: false, multiple: multi, placeholder: ts('- select -'), data: [
+                {id: '1', text: ts('Yes')},
+                {id: '0', text: ts('No')}
+              ]});
+            }
+          } else if (dataType === 'Integer' && !multi) {
+            $el.attr('type', 'number');
+          }
+        }
+
+        // Copied from ng-list but applied conditionally if field is multi-valued
+        var parseList = function(viewValue) {
+          // If the viewValue is invalid (say required but empty) it will be `undefined`
+          if (_.isUndefined(viewValue)) return;
+
+          if (!multi) {
+            return viewValue;
+          }
+
+          var list = [];
+
+          if (viewValue) {
+            _.each(viewValue.split(','), function(value) {
+              if (value) list.push(_.trim(value));
+            });
+          }
+
+          return list;
+        };
+
+        // Copied from ng-list
+        ctrl.$parsers.push(parseList);
+        ctrl.$formatters.push(function(value) {
+          return _.isArray(value) ? value.join(', ') : value;
+        });
+
+        // Copied from ng-list
+        ctrl.$isEmpty = function(value) {
+          return !value || !value.length;
+        };
+
+        scope.$watchCollection('field', function(field) {
+          destroyWidget();
+          if (field) {
+            makeWidget(field);
+          }
+        });
+      }
+    };
+  });
+
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index bc9dd7f3511f..76c71e8a1732 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -1,5 +1,19 @@
 <div>
-  <a href ng-if="selectedEntity !== null" ng-click="removeEntity(selectedEntity)" class="btn btn-sm btn-danger pull-right">
+  <a href ng-click="removeEntity(selectedEntity)" class="btn btn-sm btn-danger pull-right">
     <i class="crm-i fa-trash"></i>
   </a>
+
+  <fieldset>
+    <legend>{{ ts('Values') }}</legend>
+    <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
+      <label>{{ getField(entity.type, fieldName).title }}:</label>
+      <input class="form-control" af-gui-field-value="getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
+      <a href class="pull-right" ng-click="removeValue(entity, fieldName)">
+        <i class="crm-i fa-times"></i>
+      </a>
+    </div>
+    <div class="form-inline">
+      <input class="form-control" ng-model="controls.addValue" crm-ui-select="{data: valuesFields}" placeholder="Add value" />
+    </div>
+  </fieldset>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index b80e6e067849..2af098cdb7e8 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -1,3 +1,8 @@
-<div>
-
-</div>
+<label for="af_config_form_title">
+  {{ ts('Title:') }}
+</label>
+<input ng-model="afform.title" class="form-control" id="af_config_form_title" />
+<label for="af_config_form_server_route">
+  {{ ts('URL:') }}
+</label>
+<input ng-model="afform.server_route" class="form-control" id="af_config_form_server_route" />
diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/gui/ang/afGuiEditor/main.html
index bf70aa714519..499b9465f430 100644
--- a/ext/afform/gui/ang/afGuiEditor/main.html
+++ b/ext/afform/gui/ang/afGuiEditor/main.html
@@ -1,7 +1,8 @@
 <div crm-ui-debug="afform"></div>
 <div crm-ui-debug="entities"></div>
+<div crm-ui-debug="meta"></div>
 <div id="bootstrap-theme">
-  <div id="afGuiEditor-main">
+  <div id="afGuiEditor">
     <div id="afGuiEditor-palette" ng-include="'~/afGuiEditor/palette.html'"></div>
     <div id="afGuiEditor-canvas" ng-include="'~/afGuiEditor/canvas.html'"></div>
   </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index fd7418b35918..78ca04333451 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -1,7 +1,9 @@
 <div id="afGuiEditor-palette-config" class="panel panel-default">
     <ul id="afGuiEditor-palette-tabs" class="panel-heading nav nav-tabs">
       <li role="presentation" ng-class="{active: selectedEntity === null}">
-        <a href ng-click="selectEntity(null)">{{ ts('Form Settings') }}</a>
+        <a href ng-click="selectEntity(null)">
+          <span>{{ ts('Form Settings') }}</span>
+        </a>
       </li>
       <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
         <a href ng-click="selectEntity(entity.name)">
@@ -10,7 +12,7 @@
       </li>
       <li role="presentation" class="dropdown">
         <a href class="dropdown-toggle" data-toggle="dropdown">
-          <i class="crm-i fa-plus"></i>
+          <span><i class="crm-i fa-plus"></i></span>
         </a>
         <ul class="dropdown-menu">
           <li ng-repeat="entity in meta.entities">
@@ -20,5 +22,5 @@
       </li>
     </ul>
   <div class="panel-body" ng-include="'~/afGuiEditor/config-form.html'" ng-if="selectedEntity === null"></div>
-  <div class="panel-body" ng-include="'~/afGuiEditor/config-entity.html'" ng-if="selectedEntity !== null"></div>
+  <div class="panel-body" ng-include="'~/afGuiEditor/config-entity.html'" ng-repeat="entity in entities" ng-if="selectedEntity === entity.name"></div>
 </div>

From 66af693780712986552bdce8d144b2e1c9490fda Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Oct 2019 17:30:23 -0400
Subject: [PATCH 512/834] WIP fields

---
 ext/afform/gui/ang/afGuiAdmin.aff.json        |   3 +-
 ext/afform/gui/ang/afGuiEditor.js             | 110 ++++++++++++++++--
 ext/afform/gui/ang/afGuiEditor/block.html     |   6 +
 ext/afform/gui/ang/afGuiEditor/canvas.html    |   4 +-
 .../gui/ang/afGuiEditor/config-entity.html    |  15 +++
 ext/afform/gui/ang/afGuiEditor/field.html     |   3 +
 ext/afform/gui/ang/afGuiEditor/fieldset.html  |   6 +
 ext/afform/gui/ang/afGuiEditor/main.html      |   2 +
 8 files changed, 138 insertions(+), 11 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/block.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/field.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/fieldset.html

diff --git a/ext/afform/gui/ang/afGuiAdmin.aff.json b/ext/afform/gui/ang/afGuiAdmin.aff.json
index f9663aa59d2a..52fbb7dd3c0b 100644
--- a/ext/afform/gui/ang/afGuiAdmin.aff.json
+++ b/ext/afform/gui/ang/afGuiAdmin.aff.json
@@ -2,6 +2,7 @@
   "title": "Afform Administration",
   "server_route": "civicrm/admin/afform",
   "requires": [
-    "afGuiEditor"
+    "afGuiEditor",
+    "ui.sortable"
   ]
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 6741032c0b36..fc4c72231f9b 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -1,10 +1,9 @@
 (function(angular, $, _) {
   angular.module('afGuiEditor', CRM.angRequires('afGuiEditor'));
 
-  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4) {
+  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse) {
     return {
       restrict: 'A',
-      //require: 'ngModel',
       templateUrl: '~/afGuiEditor/main.html',
       scope: {
         afGuiEditor: '='
@@ -17,7 +16,7 @@
         $scope.controls = {};
         var newForm = {
           title: ts('Untitled Form'),
-          layout: {
+          layout: [{
             '#tag': 'af-form',
             ctrl: 'modelListCtrl',
             '#children': [
@@ -33,10 +32,10 @@
                 autofill: 'user'
               }
             ]
-          }
+          }]
         };
         if ($scope.afGuiEditor.name) {
-          crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]]}, 0)
+          crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]], layoutFormat: 'shallow'}, 0)
             .then(initialize);
         }
         else {
@@ -46,7 +45,11 @@
         function initialize(afform) {
           // Todo - show error msg if form is not found
           $scope.afform = afform;
-          $scope.entities = getTags(afform.layout, 'af-entity', 'name');
+          $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
+          evaluate($scope.layout['#children']);
+          convertTextNodes($scope.layout['#children']);
+          $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
+          $scope.fields = getAllFields($scope.layout['#children']);
         }
 
         $scope.addEntity = function(entityType) {
@@ -62,13 +65,13 @@
             name: entityType + num,
             label: entityType + ' ' + num
           };
-          $scope.afform.layout['#children'].push($scope.entities[entityType + num]);
+          $scope.layout['#children'].unshift($scope.entities[entityType + num]);
           $scope.selectEntity(entityType + num);
         };
 
         $scope.removeEntity = function(entityName) {
           delete $scope.entities[entityName];
-          $scope.afform.layout['#children'].splice(_.findIndex($scope.afform.layout['#children'], {'#tag': 'af-entity', name: entityName}), 1);
+          _.remove($scope.layout['#children'], {'#tag': 'af-entity', name: entityName});
           $scope.selectEntity(null);
         };
 
@@ -82,7 +85,8 @@
 
         $scope.valuesFields = function() {
           var fields = _.transform($scope.meta.fields[$scope.entities[$scope.selectedEntity].type], function(fields, field) {
-            fields.push({id: field.name, text: field.title, disabled: field.name in $scope.entities[$scope.selectedEntity].data});
+            var data = $scope.entities[$scope.selectedEntity].data || {};
+            fields.push({id: field.name, text: field.title, disabled: field.name in data});
           }, []);
           return {results: fields};
         };
@@ -93,11 +97,45 @@
 
         $scope.$watch('controls.addValue', function(fieldName) {
           if (fieldName) {
+            if (!$scope.entities[$scope.selectedEntity].data) {
+              $scope.entities[$scope.selectedEntity].data = {};
+            }
             $scope.entities[$scope.selectedEntity].data[fieldName] = '';
             $scope.controls.addValue = '';
           }
         });
 
+        function evaluate(collection) {
+          _.each(collection, function(item) {
+            if (_.isPlainObject(item)) {
+              evaluate(item['#children']);
+              _.each(item, function(node, idx) {
+                if (_.isString(node)) {
+                  var str = _.trim(node);
+                  if (str[0] === '{' || str[0] === '[' || str.slice(0, 3) === 'ts(') {
+                    item[idx] = $parse(str)({ts: $scope.ts});
+                  }
+                }
+              });
+            }
+          });
+        }
+
+        function convertTextNodes(collection) {
+          // Empty text nodes... just delete them.
+          _.remove(collection, function(item) {
+            return !item || (_.isString(item) && !_.trim(item));
+          });
+          // Convert other text nodes to objects
+          _.each(collection, function(item, idx) {
+            if (_.isPlainObject(item) && item['#children']) {
+              convertTextNodes(item['#children']);
+            } else if (_.isString(item)) {
+              collection[idx] = {'#text': item};
+            }
+          });
+        }
+
       }
     };
   });
@@ -118,6 +156,60 @@
     return indexBy ? _.indexBy(items, indexBy) : items;
   }
 
+  // Lists fields by entity. Note that fields for an entity can be spread across several fieldsets.
+  function getAllFields(layout) {
+    var allFields = {};
+    _.each(getTags(layout, 'af-fieldset'), function(fieldset) {
+      if (!allFields[fieldset.model]) {
+        allFields[fieldset.model] = {};
+      }
+      _.assign(allFields[fieldset.model], getTags(fieldset['#children'], 'af-field', 'name'));
+    });
+    return allFields;
+  }
+
+  angular.module('afGuiEditor').directive('afGuiBlock', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/block.html',
+      scope: {
+        block: '=afGuiBlock'
+      },
+      link: function($scope, element, attrs) {
+        $scope.isItemVisible = function(block) {
+          return (block['#tag'] === 'af-fieldset') || (block['#tag'] === 'div' && _.contains(block['class'], 'af-block'));
+        };
+      }
+    };
+  });
+
+  angular.module('afGuiEditor').directive('afGuiFieldset', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/fieldset.html',
+      scope: {
+        fieldset: '=afGuiFieldset'
+      },
+      link: function($scope, element, attrs) {
+        $scope.isItemVisible = function(block) {
+          return (block['#tag'] === 'af-field') || (block['#tag'] === 'div' && _.contains(block['class'], 'af-block'));
+        };
+      }
+    };
+  });
+
+  angular.module('afGuiEditor').directive('afGuiField', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/field.html',
+      scope: {
+        field: '=afGuiField'
+      },
+      link: function($scope, element, attrs) {
+      }
+    };
+  });
+
   // Editable titles using ngModel & html5 contenteditable
   // Cribbed from ContactLayoutEditor
   angular.module('afGuiEditor').directive("afGuiEditable", function() {
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
new file mode 100644
index 000000000000..8ceeee205644
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -0,0 +1,6 @@
+<div ui-sortable ng-model="block['#children']">
+  <div ng-repeat="item in block['#children']">
+    <div ng-if="isItemVisible(item) && item['#tag'] === 'af-fieldset'" af-gui-fieldset="item" />
+    <div ng-if="isItemVisible(item) && item['#tag'] === 'div'" af-gui-block="item" />
+  </div>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 103dd04c6e37..f1d862d582b8 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -2,5 +2,7 @@
   <div class="panel-heading">
     {{ ts('Form Layout') }}
   </div>
-  <div class="panel-body"></div>
+  <div class="panel-body">
+    <div af-gui-block="layout" />
+  </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index 76c71e8a1732..4dd21cd27177 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -16,4 +16,19 @@
       <input class="form-control" ng-model="controls.addValue" crm-ui-select="{data: valuesFields}" placeholder="Add value" />
     </div>
   </fieldset>
+
+  <fieldset>
+    <legend>{{ ts('Fields') }}</legend>
+    <ul class="crm-checkbox-list">
+      <li ng-repeat="(key, spec) in meta.fields[entity.type]" >
+        <input type="checkbox" id="field-{{ selectedEntity + '-' + key }}" />
+        <label for="field-{{ selectedEntity + '-' + key }}">{{ spec.title }}</label>
+      </li>
+    </ul>
+  </fieldset>
+
+  <fieldset>
+    <legend>{{ ts('Options') }}</legend>
+  </fieldset>
+
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
new file mode 100644
index 000000000000..0f236440c8c8
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -0,0 +1,3 @@
+<div>
+  {{ field.name }}
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/fieldset.html b/ext/afform/gui/ang/afGuiEditor/fieldset.html
new file mode 100644
index 000000000000..b2c85fef13d0
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/fieldset.html
@@ -0,0 +1,6 @@
+<div ui-sortable ng-model="fieldset['#children']">
+  <div ng-repeat="item in fieldset['#children']">
+    <div ng-if="isItemVisible(item) && item['#tag'] === 'af-field'" af-gui-field="item" />
+    <div ng-if="isItemVisible(item) && item['#tag'] === 'div'" af-gui-block="item" />
+  </div>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/gui/ang/afGuiEditor/main.html
index 499b9465f430..bf677ca448e9 100644
--- a/ext/afform/gui/ang/afGuiEditor/main.html
+++ b/ext/afform/gui/ang/afGuiEditor/main.html
@@ -1,5 +1,7 @@
 <div crm-ui-debug="afform"></div>
+<div crm-ui-debug="layout"></div>
 <div crm-ui-debug="entities"></div>
+<div crm-ui-debug="fields"></div>
 <div crm-ui-debug="meta"></div>
 <div id="bootstrap-theme">
   <div id="afGuiEditor">

From 2201c50252e379936a0eff2b2d97b99264a8d03f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 30 Oct 2019 18:18:31 -0400
Subject: [PATCH 513/834] Remove convertTextNodes

The api now returns them as an array so we don't need to worry about this on the client side.
---
 ext/afform/gui/ang/afGuiEditor.js | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index fc4c72231f9b..d5b38680d962 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -47,7 +47,6 @@
           $scope.afform = afform;
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
-          convertTextNodes($scope.layout['#children']);
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
           $scope.fields = getAllFields($scope.layout['#children']);
         }
@@ -121,21 +120,6 @@
           });
         }
 
-        function convertTextNodes(collection) {
-          // Empty text nodes... just delete them.
-          _.remove(collection, function(item) {
-            return !item || (_.isString(item) && !_.trim(item));
-          });
-          // Convert other text nodes to objects
-          _.each(collection, function(item, idx) {
-            if (_.isPlainObject(item) && item['#children']) {
-              convertTextNodes(item['#children']);
-            } else if (_.isString(item)) {
-              collection[idx] = {'#text': item};
-            }
-          });
-        }
-
       }
     };
   });

From f3cd38527f512885ea5c02cc85adff7fb4ab026f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 30 Oct 2019 20:08:47 -0400
Subject: [PATCH 514/834] WIP canvas

---
 ext/afform/gui/ang/afGuiEditor.css            |  56 ++++++-
 ext/afform/gui/ang/afGuiEditor.js             | 157 +++++++++++++++---
 ext/afform/gui/ang/afGuiEditor/block.html     |  19 ++-
 ext/afform/gui/ang/afGuiEditor/canvas.html    |   2 +-
 .../gui/ang/afGuiEditor/config-entity.html    |   6 +-
 ext/afform/gui/ang/afGuiEditor/field.html     |   5 +-
 ext/afform/gui/ang/afGuiEditor/fieldset.html  |   6 -
 ext/afform/gui/ang/afGuiEditor/palette.html   |   6 +-
 ext/afform/gui/ang/afGuiEditor/text.html      |  14 ++
 ext/afform/mock/ang/testAfform.aff.html       |  10 +-
 10 files changed, 235 insertions(+), 46 deletions(-)
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/fieldset.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/text.html

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 93afb919b585..424e5aad54ee 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -12,7 +12,7 @@
 }
 
 #afGuiEditor #afGuiEditor-canvas {
-  flex: 1;
+  flex: 1.5;
   margin-left: 5px;
 }
 
@@ -52,3 +52,57 @@
 #afGuiEditor-palette-config .form-inline label {
   min-width: 110px;
 }
+
+#afGuiEditor .af-gui-bar {
+  cursor: move;
+  visibility: hidden;
+  background-color: #efefef;
+  height: 22px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  padding-left:15px;
+}
+/* grip handle */
+#afGuiEditor .af-gui-bar:before {
+  background-size: cover;
+  background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODg4Ij48L3JlY3Q+Cjwvc3ZnPg==");
+  width: 10px;
+  height: 15px;
+  content: ' ';
+  display: block;
+  position: absolute;
+  left: 4px;
+  top: 5px;
+}
+
+#afGuiEditor-canvas:hover .af-gui-bar {
+  visibility: visible;
+}
+
+#afGuiEditor .af-gui-field,
+#afGuiEditor .af-gui-text,
+#afGuiEditor .af-gui-block {
+  position: relative;
+  padding: 32px 3px 3px;
+  min-height: 40px;
+  border: 2px dashed transparent;
+}
+
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected {
+  border: 2px dashed #0071bd;
+}
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar {
+  background-color: #0071bd;
+  visibility: visible;
+  color: white;
+}
+
+#afGuiEditor .af-gui-block {
+  padding-top: 20px;
+}
+
+#afGuiEditor .af-gui-block:hover {
+  border: 2px dashed #757575;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index d5b38680d962..45ef072bf635 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -8,12 +8,13 @@
       scope: {
         afGuiEditor: '='
       },
-      link: function($scope, $el, $attr) {
+      controller: function($scope) {
         $scope.ts = CRM.ts();
         $scope.afform = null;
         $scope.selectedEntity = null;
         $scope.meta = CRM.afformAdminData;
         $scope.controls = {};
+        $scope.editor = this;
         var newForm = {
           title: ts('Untitled Form'),
           layout: [{
@@ -51,7 +52,7 @@
           $scope.fields = getAllFields($scope.layout['#children']);
         }
 
-        $scope.addEntity = function(entityType) {
+        this.addEntity = function(entityType) {
           var existingEntitiesofThisType = _.map(_.filter($scope.entities, {type: entityType}), 'name'),
             num = existingEntitiesofThisType.length + 1;
           // Give this new entity a unique name
@@ -65,21 +66,29 @@
             label: entityType + ' ' + num
           };
           $scope.layout['#children'].unshift($scope.entities[entityType + num]);
-          $scope.selectEntity(entityType + num);
+          this.selectEntity(entityType + num);
         };
 
-        $scope.removeEntity = function(entityName) {
+        this.removeEntity = function(entityName) {
           delete $scope.entities[entityName];
           _.remove($scope.layout['#children'], {'#tag': 'af-entity', name: entityName});
-          $scope.selectEntity(null);
+          this.selectEntity(null);
         };
 
-        $scope.selectEntity = function(entityName) {
+        this.selectEntity = function(entityName) {
           $scope.selectedEntity = entityName;
         };
 
-        $scope.getField = function(entityName, fieldName) {
-          return _.filter($scope.meta.fields[entityName], {name: fieldName})[0];
+        this.getField = function(entityType, fieldName) {
+          return _.filter($scope.meta.fields[entityType], {name: fieldName})[0];
+        };
+
+        this.getEntity = function(entityName) {
+          return $scope.entities[entityName];
+        };
+
+        this.getSelectedEntity = function() {
+          return $scope.selectedEntity;
         };
 
         $scope.valuesFields = function() {
@@ -152,44 +161,148 @@
     return allFields;
   }
 
+  // Turns a space-separated list (e.g. css classes) into an array
+  function splitClass(str) {
+    if (_.isArray(str)) {
+      return str;
+    }
+    return str ? _.unique(_.trim(str).split(/\s+/g)) : [];
+  }
+
   angular.module('afGuiEditor').directive('afGuiBlock', function() {
     return {
       restrict: 'A',
       templateUrl: '~/afGuiEditor/block.html',
       scope: {
-        block: '=afGuiBlock'
+        node: '=afGuiBlock',
+        entityName: '='
       },
-      link: function($scope, element, attrs) {
-        $scope.isItemVisible = function(block) {
-          return (block['#tag'] === 'af-fieldset') || (block['#tag'] === 'div' && _.contains(block['class'], 'af-block'));
+      require: '^^afGuiEditor',
+      link: function($scope, element, attrs, editor) {
+        $scope.editor = editor;
+      },
+      controller: function($scope) {
+        $scope.block = this;
+        this.node = $scope.node;
+
+        this.modifyClasses = function(item, toRemove, toAdd) {
+          var classes = splitClass(item['class']);
+          if (toRemove) {
+            classes = _.difference(classes, splitClass(toRemove));
+          }
+          if (toAdd) {
+            classes = _.unique(classes.concat(splitClass(toAdd)));
+          }
+          item['class'] = classes.join(' ');
+        };
+
+        this.getNodeType = function(node) {
+          if (!node) {
+            return null;
+          }
+          if (node['#tag'] === 'af-field') {
+            return 'field';
+          }
+          if (node['af-fieldset']) {
+            return 'fieldset';
+          }
+          var classes = splitClass(node['class']);
+          if (_.contains(classes, 'af-block')) {
+            return 'block';
+          }
+          if (_.contains(classes, 'af-text')) {
+            return 'text';
+          }
+          return null;
+        };
+
+        $scope.isSelectedFieldset = function(entityName) {
+          return entityName === $scope.editor.getSelectedEntity();
+        };
+
+        $scope.selectEntity = function() {
+          if ($scope.node['af-fieldset']) {
+            $scope.editor.selectEntity($scope.node['af-fieldset']);
+          }
         };
+
+        $scope.tags = {
+          div: ts('Block'),
+          fieldset: ts('Fieldset')
+        };
+
       }
     };
   });
 
-  angular.module('afGuiEditor').directive('afGuiFieldset', function() {
+  angular.module('afGuiEditor').directive('afGuiField', function() {
     return {
       restrict: 'A',
-      templateUrl: '~/afGuiEditor/fieldset.html',
+      templateUrl: '~/afGuiEditor/field.html',
       scope: {
-        fieldset: '=afGuiFieldset'
+        node: '=afGuiField',
+        entityName: '='
+      },
+      require: '^^afGuiEditor',
+      link: function($scope, element, attrs, editor) {
+        $scope.editor = editor;
       },
-      link: function($scope, element, attrs) {
-        $scope.isItemVisible = function(block) {
-          return (block['#tag'] === 'af-field') || (block['#tag'] === 'div' && _.contains(block['class'], 'af-block'));
+      controller: function($scope) {
+
+        $scope.getEntity = function() {
+          return $scope.editor.getEntity($scope.entityName);
+        };
+
+        $scope.getDefn = function() {
+          return $scope.editor.getField($scope.getEntity().type, $scope.node.name);
         };
       }
     };
   });
 
-  angular.module('afGuiEditor').directive('afGuiField', function() {
+  angular.module('afGuiEditor').directive('afGuiText', function() {
     return {
       restrict: 'A',
-      templateUrl: '~/afGuiEditor/field.html',
+      templateUrl: '~/afGuiEditor/text.html',
       scope: {
-        field: '=afGuiField'
+        node: '=afGuiText'
       },
-      link: function($scope, element, attrs) {
+      require: '^^afGuiBlock',
+      link: {
+        pre: function($scope, element, attrs, block) {
+          $scope.block = block;
+        },
+        post: function($scope, element, attrs) {
+          if ($scope.block.node && $scope.block.node['#tag'] === 'fieldset') {
+            $scope.tags.legend = ts('Fieldset Legend');
+          }
+        }
+      },
+      controller: function($scope) {
+        $scope.tags = {
+          p: ts('Normal Text'),
+          h1: ts('Heading 1'),
+          h2: ts('Heading 2'),
+          h3: ts('Heading 3'),
+          h4: ts('Heading 4'),
+          h5: ts('Heading 5'),
+          h6: ts('Heading 6')
+        };
+
+        $scope.alignments = {
+          'text-left': ts('Align left'),
+          'text-center': ts('Align center'),
+          'text-right': ts('Align right'),
+          'text-justify': ts('Justify')
+        };
+
+        $scope.getAlign = function() {
+          return _.intersection(splitClass($scope.node['class']), _.keys($scope.alignments))[0];
+        };
+
+        $scope.setAlign = function(val) {
+          $scope.block.modifyClasses($scope.node, _.keys($scope.alignments), val);
+        };
       }
     };
   });
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 8ceeee205644..6aca722e1dce 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -1,6 +1,17 @@
-<div ui-sortable ng-model="block['#children']">
-  <div ng-repeat="item in block['#children']">
-    <div ng-if="isItemVisible(item) && item['#tag'] === 'af-fieldset'" af-gui-fieldset="item" />
-    <div ng-if="isItemVisible(item) && item['#tag'] === 'div'" af-gui-block="item" />
+<div class="af-gui-bar" ng-if="node['#tag'] != 'af-form'" ng-click="selectEntity()" >
+  <span ng-if="block.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
+  {{ node['#tag'] }}
+  <select class="pull-right" ng-model="node['#tag']">
+    <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+  </select>
+</div>
+<div ui-sortable="{handle: '.af-gui-bar'}" ng-model="node['#children']">
+  <div ng-repeat="item in node['#children']">
+    <div ng-switch="block.getNodeType(item)">
+      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" />
+      <div ng-switch-when="block" af-gui-block="item" class="af-gui-block" entity-name="entityName" />
+      <div ng-switch-when="field" af-gui-field="item" class="af-gui-field" entity-name="entityName" />
+      <div ng-switch-when="text" af-gui-text="item" class="af-gui-text" />
+    </div>
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index f1d862d582b8..8d0eda2044cb 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -3,6 +3,6 @@
     {{ ts('Form Layout') }}
   </div>
   <div class="panel-body">
-    <div af-gui-block="layout" />
+    <div af-gui-block="layout" entity-name="" />
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index 4dd21cd27177..495319c90755 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -1,13 +1,13 @@
 <div>
-  <a href ng-click="removeEntity(selectedEntity)" class="btn btn-sm btn-danger pull-right">
+  <a href ng-click="editor.removeEntity(selectedEntity)" class="btn btn-sm btn-danger pull-right">
     <i class="crm-i fa-trash"></i>
   </a>
 
   <fieldset>
     <legend>{{ ts('Values') }}</legend>
     <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
-      <label>{{ getField(entity.type, fieldName).title }}:</label>
-      <input class="form-control" af-gui-field-value="getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
+      <label>{{ editor.getField(entity.type, fieldName).title }}:</label>
+      <input class="form-control" af-gui-field-value="editor.getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
       <a href class="pull-right" ng-click="removeValue(entity, fieldName)">
         <i class="crm-i fa-times"></i>
       </a>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index 0f236440c8c8..b67b7730c243 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -1,3 +1,6 @@
+<div class="af-gui-bar">
+  <span>{{ getEntity().label + ': ' + getDefn().title }}</span>
+</div>
 <div>
-  {{ field.name }}
+  {{ node.name }}
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/fieldset.html b/ext/afform/gui/ang/afGuiEditor/fieldset.html
deleted file mode 100644
index b2c85fef13d0..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/fieldset.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div ui-sortable ng-model="fieldset['#children']">
-  <div ng-repeat="item in fieldset['#children']">
-    <div ng-if="isItemVisible(item) && item['#tag'] === 'af-field'" af-gui-field="item" />
-    <div ng-if="isItemVisible(item) && item['#tag'] === 'div'" af-gui-block="item" />
-  </div>
-</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 78ca04333451..5278c642fc49 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -1,12 +1,12 @@
 <div id="afGuiEditor-palette-config" class="panel panel-default">
     <ul id="afGuiEditor-palette-tabs" class="panel-heading nav nav-tabs">
       <li role="presentation" ng-class="{active: selectedEntity === null}">
-        <a href ng-click="selectEntity(null)">
+        <a href ng-click="editor.selectEntity(null)">
           <span>{{ ts('Form Settings') }}</span>
         </a>
       </li>
       <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
-        <a href ng-click="selectEntity(entity.name)">
+        <a href ng-click="editor.selectEntity(entity.name)">
           <span af-gui-editable ng-model="entity.label">{{ entity.label }}</span>
         </a>
       </li>
@@ -16,7 +16,7 @@
         </a>
         <ul class="dropdown-menu">
           <li ng-repeat="entity in meta.entities">
-            <a href ng-click="addEntity(entity.name)">{{ entity.name }}</a>
+            <a href ng-click="editor.addEntity(entity.name)">{{ entity.name }}</a>
           </li>
         </ul>
       </li>
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
new file mode 100644
index 000000000000..4babf0198455
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -0,0 +1,14 @@
+<div class="af-gui-bar">
+  {{ node['#tag'] }}
+  <select class="pull-right" ng-model="node['#tag']">
+    <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+  </select>
+  <div class="btn-group btn-group-xs pull-right" role="group">
+    <button type="button" class="btn btn-default" ng-class="{active: (opt === getAlign()) || (opt === 'text-left' && !getAlign())}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
+      <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
+    </button>
+  </div>
+</div>
+<p af-gui-editable ng-model="node['#children'][0]['#text']" class="{{ getAlign() + ' af-gui-text-' + node['#tag'] }}" >
+  {{ node['#children'][0]['#text'] }}
+</p>
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 8e5e52ea73e5..6dd4ac78752c 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -4,8 +4,8 @@
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
 
-  <div af-fieldset="parent">
-    <h3>About You</h3>
+  <fieldset af-fieldset="parent">
+    <legend class="af-text">About You</legend>
 
     <div class="af-block">
       <af-field name="first_name" />
@@ -15,11 +15,11 @@ <h3>About You</h3>
     <af-field name="constituent_information.Marital_Status" />
     <af-field name="constituent_information.Marriage_Date" />
     <af-field name="constituent_information.Most_Important_Issue" />
-  </div>
+  </fieldset>
 
   <div af-fieldset="spouse" ng-if="modelListCtrl.getData('parent')['constituent_information.Marital_Status'] == 'M'">
-    <h3>About Your Spouse</h3>
-
+    <h3 class="af-text text-center">About Your Spouse</h3>
+    <p class="af-text">Only visible if you are married.</p>
     <af-field name="first_name" defn='{title: ts("Spouse First Name")}' />
     <af-field name="last_name" defn='{title: ts("Spouse Last Name")}' />
     <af-field name="do_not_email" />

From 65c9e7ae141453396b7cfe177f0a93c5041f5fab Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 1 Nov 2019 15:15:59 -0400
Subject: [PATCH 515/834] Fields drag n drop

---
 ext/afform/core/afform.php                    |  1 +
 ext/afform/gui/afform_gui.php                 |  3 +-
 ext/afform/gui/ang/afGuiEditor.css            | 46 +++++++---
 ext/afform/gui/ang/afGuiEditor.js             | 84 +++++++++++++++----
 ext/afform/gui/ang/afGuiEditor/block.html     |  4 +-
 .../gui/ang/afGuiEditor/config-entity.html    | 11 ++-
 ext/afform/gui/ang/afGuiEditor/main.html      |  2 +-
 7 files changed, 113 insertions(+), 38 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index e9decfee32f3..a54dd7fa7f2e 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -316,6 +316,7 @@ function afform_civicrm_alterAngular($angular) {
         }
         $entityType = $entities[$entityName]['type'];
         $getFields = civicrm_api4($entityType, 'getFields', [
+          'action' => 'create',
           'where' => [['name', '=', $fieldName]],
           'select' => ['title', 'input_type', 'input_attrs', 'options'],
           'loadOptions' => TRUE,
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index f72cb7f014cb..5aef321d4002 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -186,7 +186,8 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     ->setCheckPermissions(FALSE)
     ->setIncludeCustom(TRUE)
     ->setLoadOptions(TRUE)
-    ->setAction('Create')
+    ->setAction('create')
+    ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'options'])
     ->execute();
 
   $contactSettings = [
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 424e5aad54ee..95df8383fdf4 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -64,18 +64,6 @@
   width: 100%;
   padding-left:15px;
 }
-/* grip handle */
-#afGuiEditor .af-gui-bar:before {
-  background-size: cover;
-  background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODg4Ij48L3JlY3Q+Cjwvc3ZnPg==");
-  width: 10px;
-  height: 15px;
-  content: ' ';
-  display: block;
-  position: absolute;
-  left: 4px;
-  top: 5px;
-}
 
 #afGuiEditor-canvas:hover .af-gui-bar {
   visibility: visible;
@@ -106,3 +94,37 @@
 #afGuiEditor .af-gui-block:hover {
   border: 2px dashed #757575;
 }
+
+#afGuiEditor [ui-sortable] {
+  min-height: 25px;
+}
+
+#afGuiEditor .af-gui-field-select-list {
+  max-height: 280px;
+  overflow-y: auto;
+}
+
+#afGuiEditor .af-gui-field-select-list > div {
+  cursor: move;
+  padding-left:15px;
+  position: relative;
+}
+#afGuiEditor .af-gui-field-select-list > div.disabled {
+  cursor: auto;
+}
+#afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover {
+  background-color: #efefef;
+}
+/* grip handle */
+#afGuiEditor .af-gui-bar:before,
+#afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover:before {
+  background-size: cover;
+  background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODg4Ij48L3JlY3Q+Cjwvc3ZnPg==");
+  width: 10px;
+  height: 15px;
+  content: ' ';
+  display: block;
+  position: absolute;
+  left: 4px;
+  top: 5px;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 45ef072bf635..95692554266f 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
   angular.module('afGuiEditor', CRM.angRequires('afGuiEditor'));
 
-  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse) {
+  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse, $timeout) {
     return {
       restrict: 'A',
       templateUrl: '~/afGuiEditor/main.html',
@@ -14,6 +14,7 @@
         $scope.selectedEntity = null;
         $scope.meta = CRM.afformAdminData;
         $scope.controls = {};
+        $scope.fieldList = {};
         $scope.editor = this;
         var newForm = {
           title: ts('Untitled Form'),
@@ -49,7 +50,8 @@
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
-          $scope.fields = getAllFields($scope.layout['#children']);
+          expandFields($scope.layout['#children']);
+          _.each(_.keys($scope.entities), buildFieldList);
         }
 
         this.addEntity = function(entityType) {
@@ -91,10 +93,29 @@
           return $scope.selectedEntity;
         };
 
+        $scope.rebuildFieldList = function() {
+          $timeout(function() {
+            $scope.$apply(function() {
+              buildFieldList($scope.selectedEntity);
+            });
+          });
+        };
+
+        function buildFieldList(entityName) {
+          $scope.fieldList[entityName] = $scope.fieldList[entityName] || [];
+          $scope.fieldList[entityName].length = 0;
+          _.each($scope.meta.fields[$scope.entities[entityName].type], function(field) {
+            $scope.fieldList[entityName].push({
+              "#tag": "af-field",
+              name: field.name,
+              defn: _.cloneDeep(_.pick(field, ['title', 'input_type', 'input_attrs']))
+            });
+          });
+        }
+
         $scope.valuesFields = function() {
           var fields = _.transform($scope.meta.fields[$scope.entities[$scope.selectedEntity].type], function(fields, field) {
-            var data = $scope.entities[$scope.selectedEntity].data || {};
-            fields.push({id: field.name, text: field.title, disabled: field.name in data});
+            fields.push({id: field.name, text: field.title, disabled: $scope.fieldInUse($scope.selectedEntity, field.name)});
           }, []);
           return {results: fields};
         };
@@ -113,6 +134,33 @@
           }
         });
 
+        // Checks if a field is on the form or set as a value
+        $scope.fieldInUse = function(entityName, fieldName) {
+          var data = $scope.entities[entityName].data || {},
+            found = false;
+          if (fieldName in data) {
+            return true;
+          }
+          return check($scope.layout['#children']);
+          function check(group) {
+            _.each(group, function(item) {
+              if (found) {
+                return false;
+              }
+              if (_.isPlainObject(item)) {
+                if ((!item['af-fieldset'] || (item['af-fieldset'] === entityName)) && item['#children']) {
+                  check(item['#children']);
+                }
+                if (item['#tag'] === 'af-field' && item.name === fieldName) {
+                  found = true;
+                }
+              }
+            });
+            return found;
+          }
+        };
+
+        // Parse strings of javascript that php couldn't interpret
         function evaluate(collection) {
           _.each(collection, function(item) {
             if (_.isPlainObject(item)) {
@@ -129,6 +177,22 @@
           });
         }
 
+        function expandFields(collection, entityType) {
+          _.each(collection, function (item) {
+            if (_.isPlainObject(item)) {
+              if (item['af-fieldset']) {
+                expandFields(item['#children'], $scope.editor.getEntity(item['af-fieldset']).type);
+              }
+              else if (item['#tag'] === 'af-field') {
+                item.defn = item.defn || {};
+                _.defaults(item.defn, _.cloneDeep(_.pick($scope.editor.getField(entityType, item.name), ['title', 'input_type', 'input_attrs'])));
+              } else {
+                expandFields(item['#children'], entityType);
+              }
+            }
+          });
+        }
+
       }
     };
   });
@@ -149,18 +213,6 @@
     return indexBy ? _.indexBy(items, indexBy) : items;
   }
 
-  // Lists fields by entity. Note that fields for an entity can be spread across several fieldsets.
-  function getAllFields(layout) {
-    var allFields = {};
-    _.each(getTags(layout, 'af-fieldset'), function(fieldset) {
-      if (!allFields[fieldset.model]) {
-        allFields[fieldset.model] = {};
-      }
-      _.assign(allFields[fieldset.model], getTags(fieldset['#children'], 'af-field', 'name'));
-    });
-    return allFields;
-  }
-
   // Turns a space-separated list (e.g. css classes) into an array
   function splitClass(str) {
     if (_.isArray(str)) {
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 6aca722e1dce..e45853423d55 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -5,10 +5,10 @@
     <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
   </select>
 </div>
-<div ui-sortable="{handle: '.af-gui-bar'}" ng-model="node['#children']">
+<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]'}" ng-model="node['#children']">
   <div ng-repeat="item in node['#children']">
     <div ng-switch="block.getNodeType(item)">
-      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" />
+      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
       <div ng-switch-when="block" af-gui-block="item" class="af-gui-block" entity-name="entityName" />
       <div ng-switch-when="field" af-gui-field="item" class="af-gui-field" entity-name="entityName" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index 495319c90755..cf32fadf0311 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -19,12 +19,11 @@
 
   <fieldset>
     <legend>{{ ts('Fields') }}</legend>
-    <ul class="crm-checkbox-list">
-      <li ng-repeat="(key, spec) in meta.fields[entity.type]" >
-        <input type="checkbox" id="field-{{ selectedEntity + '-' + key }}" />
-        <label for="field-{{ selectedEntity + '-' + key }}">{{ spec.title }}</label>
-      </li>
-    </ul>
+    <div class="af-gui-field-select-list" ui-sortable="{update: rebuildFieldList, items: '> div:not(.disabled)', connectWith: '[data-entity=' + selectedEntity + '] [ui-sortable]'}" ng-model="fieldList[selectedEntity]">
+      <div ng-repeat="field in fieldList[selectedEntity]" ng-class="{disabled: fieldInUse(selectedEntity, field.name)}">
+        {{ field.defn.title }}
+      </div>
+    </div>
   </fieldset>
 
   <fieldset>
diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/gui/ang/afGuiEditor/main.html
index bf677ca448e9..bd8b471e1bb3 100644
--- a/ext/afform/gui/ang/afGuiEditor/main.html
+++ b/ext/afform/gui/ang/afGuiEditor/main.html
@@ -1,7 +1,7 @@
 <div crm-ui-debug="afform"></div>
 <div crm-ui-debug="layout"></div>
 <div crm-ui-debug="entities"></div>
-<div crm-ui-debug="fields"></div>
+<div crm-ui-debug="fieldList"></div>
 <div crm-ui-debug="meta"></div>
 <div id="bootstrap-theme">
   <div id="afGuiEditor">

From 8e35b9e3fa0b723920f3040e4d17ecfde973d0cd Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 1 Nov 2019 20:57:27 -0400
Subject: [PATCH 516/834] Fixes #4 - html encode injected properties and enable
 test

---
 ext/afform/core/afform.php                    |  2 +-
 .../tests/phpunit/Civi/Afform/FilterTest.php  | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index a54dd7fa7f2e..7e00dedab56b 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -329,7 +329,7 @@ function afform_civicrm_alterAngular($angular) {
             continue;
           }
           foreach ($field as &$prop) {
-            $prop = json_encode($prop, JSON_UNESCAPED_SLASHES);
+            $prop = htmlspecialchars(CRM_Utils_JS::encode($prop));
           }
           if ($existingFieldDefn) {
             $field = array_merge($field, CRM_Utils_JS::getRawProps($existingFieldDefn));
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
index ec441c2909eb..8f94f03442a5 100644
--- a/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
@@ -44,16 +44,17 @@ public function testDefnInjectionNested() {
     $this->assertEquals('First Name', $myField['defn']['title']);
   }
 
-  //public function testDefnOverrideTitle() {
-  //  $inputHtml = sprintf(self::PERSON_TPL,
-  //    '<div af-fieldset="person"><af-field name="first_name" defn="{title: \'Given name\'}" /></div>');
-  //  $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
-  //  $converter = new \CRM_Afform_ArrayHtml(TRUE);
-  //  $parsed = $converter->convertHtmlToArray($filteredHtml);
-  //
-  //  $myField = $parsed[0]['#children'][1]['#children'][0];
-  //  $this->assertEquals('af-field', $myField['#tag']);
-  //  $this->assertEquals('Given name', $myField['defn']['title']);
-  //}
+  public function testDefnOverrideTitle() {
+    $inputHtml = sprintf(self::PERSON_TPL,
+      '<div af-fieldset="person"><af-field name="first_name" defn="{title: \'Given name\'}" /></div>');
+    $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+    $converter = new \CRM_Afform_ArrayHtml(TRUE);
+    $parsed = $converter->convertHtmlToArray($filteredHtml);
+
+    $myField = $parsed[0]['#children'][1]['#children'][0];
+    $this->assertEquals('af-field', $myField['#tag']);
+    $this->assertEquals('Given name', $myField['defn']['title']);
+    $this->assertEquals('Text', $myField['defn']['input_type']);
+  }
 
 }

From fd6c081442973045dde85b1850bc8d966f7cda9e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 2 Nov 2019 20:14:47 -0400
Subject: [PATCH 517/834] Add forms, add/remove entities

---
 ext/afform/gui/ang/afGuiEditor.js             | 74 +++++++++++--------
 .../gui/ang/afGuiEditor/config-form.html      |  4 +
 ext/afform/gui/ang/afGuiEditor/palette.html   |  2 +-
 ext/afform/gui/ang/afGuiList.aff.html         |  3 +
 4 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 95692554266f..1e65a946fe4e 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -15,37 +15,28 @@
         $scope.meta = CRM.afformAdminData;
         $scope.controls = {};
         $scope.fieldList = {};
-        $scope.editor = this;
+        var editor = $scope.editor = this;
         var newForm = {
           title: ts('Untitled Form'),
           layout: [{
             '#tag': 'af-form',
             ctrl: 'modelListCtrl',
-            '#children': [
-              {
-                '#tag': 'af-entity',
-                type: 'Contact',
-                data: {
-                  contact_type: 'Individual'
-                },
-                name: 'Contact1',
-                label: 'Contact 1',
-                'url-autofill': '1',
-                autofill: 'user'
-              }
-            ]
+            '#children': []
           }]
         };
-        if ($scope.afGuiEditor.name) {
+        if ($scope.afGuiEditor.name && $scope.afGuiEditor.name != '0') {
+          // Todo - show error msg if form is not found
           crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]], layoutFormat: 'shallow'}, 0)
             .then(initialize);
         }
         else {
-          initialize(newForm);
+          $timeout(function() {
+            initialize(_.cloneDeep(newForm));
+            editor.addEntity('Contact');
+          });
         }
 
         function initialize(afform) {
-          // Todo - show error msg if form is not found
           $scope.afform = afform;
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
@@ -68,12 +59,29 @@
             label: entityType + ' ' + num
           };
           $scope.layout['#children'].unshift($scope.entities[entityType + num]);
-          this.selectEntity(entityType + num);
+          $scope.layout['#children'].push({
+            '#tag': 'fieldset',
+            'af-fieldset': entityType + num,
+            '#children': [
+              {
+                '#tag': 'legend',
+                'class': 'af-text',
+                '#children': [
+                  {
+                    '#text': entityType + ' ' + num
+                  }
+                ]
+              }
+            ]
+          });
+          buildFieldList(entityType + num);
+          return entityType + num;
         };
 
         this.removeEntity = function(entityName) {
           delete $scope.entities[entityName];
           _.remove($scope.layout['#children'], {'#tag': 'af-entity', name: entityName});
+          removeRecursive($scope.layout['#children'], {'af-fieldset': entityName});
           this.selectEntity(null);
         };
 
@@ -93,6 +101,11 @@
           return $scope.selectedEntity;
         };
 
+        $scope.addEntity = function(entityType) {
+          var entityName = editor.addEntity(entityType);
+          editor.selectEntity(entityName);
+        };
+
         $scope.rebuildFieldList = function() {
           $timeout(function() {
             $scope.$apply(function() {
@@ -181,11 +194,11 @@
           _.each(collection, function (item) {
             if (_.isPlainObject(item)) {
               if (item['af-fieldset']) {
-                expandFields(item['#children'], $scope.editor.getEntity(item['af-fieldset']).type);
+                expandFields(item['#children'], editor.getEntity(item['af-fieldset']).type);
               }
               else if (item['#tag'] === 'af-field') {
                 item.defn = item.defn || {};
-                _.defaults(item.defn, _.cloneDeep(_.pick($scope.editor.getField(entityType, item.name), ['title', 'input_type', 'input_attrs'])));
+                _.defaults(item.defn, _.cloneDeep(_.pick(editor.getField(entityType, item.name), ['title', 'input_type', 'input_attrs'])));
               } else {
                 expandFields(item['#children'], entityType);
               }
@@ -221,6 +234,15 @@
     return str ? _.unique(_.trim(str).split(/\s+/g)) : [];
   }
 
+  function removeRecursive(collection, removeParams) {
+    _.remove(collection, removeParams);
+    _.each(collection, function(item) {
+      if (_.isPlainObject(item) && item['#children']) {
+        removeRecursive(item['#children'], removeParams);
+      }
+    });
+  }
+
   angular.module('afGuiEditor').directive('afGuiBlock', function() {
     return {
       restrict: 'A',
@@ -320,19 +342,13 @@
         node: '=afGuiText'
       },
       require: '^^afGuiBlock',
-      link: {
-        pre: function($scope, element, attrs, block) {
-          $scope.block = block;
-        },
-        post: function($scope, element, attrs) {
-          if ($scope.block.node && $scope.block.node['#tag'] === 'fieldset') {
-            $scope.tags.legend = ts('Fieldset Legend');
-          }
-        }
+      link: function($scope, element, attrs, block) {
+        $scope.block = block;
       },
       controller: function($scope) {
         $scope.tags = {
           p: ts('Normal Text'),
+          legend: ts('Fieldset Legend'),
           h1: ts('Heading 1'),
           h2: ts('Heading 2'),
           h3: ts('Heading 3'),
diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index 2af098cdb7e8..26794a3cbfc4 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -2,6 +2,10 @@
   {{ ts('Title:') }}
 </label>
 <input ng-model="afform.title" class="form-control" id="af_config_form_title" />
+<label for="af_config_form_description">
+  {{ ts('Description:') }}
+</label>
+<input ng-model="afform.description" class="form-control" id="af_config_form_description" />
 <label for="af_config_form_server_route">
   {{ ts('URL:') }}
 </label>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 5278c642fc49..3e3517aa20d5 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -16,7 +16,7 @@
         </a>
         <ul class="dropdown-menu">
           <li ng-repeat="entity in meta.entities">
-            <a href ng-click="editor.addEntity(entity.name)">{{ entity.name }}</a>
+            <a href ng-click="addEntity(entity.name)">{{ entity.name }}</a>
           </li>
         </ul>
       </li>
diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/gui/ang/afGuiList.aff.html
index ed4a6286ee8c..c87d00947aa8 100644
--- a/ext/afform/gui/ang/afGuiList.aff.html
+++ b/ext/afform/gui/ang/afGuiList.aff.html
@@ -1,3 +1,6 @@
+<a href="#/?name=0" class="btn btn-default">
+  <i class="crm-i fa-plus"></i> {{ ts('New Form') }}
+</a>
 <div
   af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
   af-api4-ctrl="listCtrl">

From 7c3878d0f0802f7cbde439129aac07271e547161 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 4 Nov 2019 08:02:23 -0500
Subject: [PATCH 518/834] Dynamic option lists for select elements

This should respond better to changes in the model.
---
 ext/afform/core/ang/afField/afField.js          | 8 +++++---
 ext/afform/core/ang/afField/widgets/Select.html | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index 6c70a98e700f..bd30e103d8f3 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -17,9 +17,11 @@
         $scope.getData = $scope.afFieldset.getData;
 
         $scope.getOptions = function() {
-          return _.transform($scope.defn.options, function(result, val, key) {
-            result.push({id: key, text: val});
-          }, []);
+          return {
+            results: _.transform($scope.defn.options, function(result, val, key) {
+              result.push({id: key, text: val});
+            }, [])
+          };
         };
 
         $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
diff --git a/ext/afform/core/ang/afField/widgets/Select.html b/ext/afform/core/ang/afField/widgets/Select.html
index e59b2c724e89..01ae74fbe8b6 100644
--- a/ext/afform/core/ang/afField/widgets/Select.html
+++ b/ext/afform/core/ang/afField/widgets/Select.html
@@ -1 +1 @@
-<input crm-ui-select="{data: getOptions(), multiple: defn.input_attrs.multiple}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-select="{data: getOptions, multiple: defn.input_attrs.multiple}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />

From 5eaf91d9c74a277467f68a643bf1f8419bd38be1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 4 Nov 2019 09:40:20 -0500
Subject: [PATCH 519/834] Configure layout style of blocks

---
 ext/afform/core/ang/afCore.css            |  11 +++++++++
 ext/afform/gui/ang/afGuiEditor.css        |  26 ++++++++++++++++++++++
 ext/afform/gui/ang/afGuiEditor.js         |  26 ++++++++++++++++++++--
 ext/afform/gui/ang/afGuiEditor/block.html |   9 ++++++--
 ext/afform/gui/ang/afGuiEditor/text.html  |   2 +-
 ext/afform/gui/images/icons.png           | Bin 0 -> 177 bytes
 ext/afform/gui/images/screenshot.png      | Bin 11775 -> 0 bytes
 ext/afform/mock/ang/testAfform.aff.html   |   2 +-
 8 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 ext/afform/gui/images/icons.png
 delete mode 100644 ext/afform/gui/images/screenshot.png

diff --git a/ext/afform/core/ang/afCore.css b/ext/afform/core/ang/afCore.css
index 83b008df299e..305698c78f2c 100644
--- a/ext/afform/core/ang/afCore.css
+++ b/ext/afform/core/ang/afCore.css
@@ -5,3 +5,14 @@
 a.af-api4-action-idle {
     cursor: pointer;
 }
+
+.af-block.af-layout-cols {
+    display: flex;
+}
+.af-block.af-layout-cols > * {
+    flex: 1;
+}
+.af-block.af-layout-inline > * {
+    display: inline-block;
+    margin-right: .5em;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 95df8383fdf4..a8e333f82e1d 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -128,3 +128,29 @@
   left: 4px;
   top: 5px;
 }
+
+#afGuiEditor .af-gui-layout-icon {
+  width: 12px;
+  height: 11px;
+  display: block;
+  background-image: url('../images/icons.png');
+  background-repeat: no-repeat;
+  margin: 4px 1px;
+}
+#afGuiEditor .af-gui-layout-icon.af-layout-cols {
+  background-position: -12px 0;
+}
+#afGuiEditor .af-gui-layout-icon.af-layout-rows {
+  background-position: -24px 0;
+}
+
+#afGuiEditor .af-gui-layout.af-layout-cols {
+  display: flex;
+}
+#afGuiEditor .af-gui-layout.af-layout-cols > div {
+  flex: 1;
+}
+#afGuiEditor .af-gui-layout.af-layout-inline > div {
+  display: inline-block;
+  width: 300px;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 1e65a946fe4e..acfb5898d3d0 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -38,6 +38,10 @@
 
         function initialize(afform) {
           $scope.afform = afform;
+          // Remove empty text nodes, they just create clutter
+          removeRecursive($scope.afform.layout, function(item) {
+            return ('#text' in item) && _.trim(item['#text']).length === 0;
+          });
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
@@ -305,6 +309,24 @@
           fieldset: ts('Fieldset')
         };
 
+        $scope.layouts = {
+          'af-layout-rows': ts('Contents display as rows'),
+          'af-layout-cols': ts('Contents are evenly-spaced columns'),
+          'af-layout-inline': ts('Contents are arranged inline')
+        };
+
+        $scope.getLayout = function() {
+          return _.intersection(splitClass($scope.node['class']), _.keys($scope.layouts))[0] || 'af-layout-rows';
+        };
+
+        $scope.setLayout = function(val) {
+          var classes = ['af-block'];
+          if (val !== 'af-layout-rows') {
+            classes.push(val);
+          }
+          $scope.block.modifyClasses($scope.node, _.keys($scope.layouts), classes);
+        };
+
       }
     };
   });
@@ -365,11 +387,11 @@
         };
 
         $scope.getAlign = function() {
-          return _.intersection(splitClass($scope.node['class']), _.keys($scope.alignments))[0];
+          return _.intersection(splitClass($scope.node['class']), _.keys($scope.alignments))[0] || 'text-left';
         };
 
         $scope.setAlign = function(val) {
-          $scope.block.modifyClasses($scope.node, _.keys($scope.alignments), val);
+          $scope.block.modifyClasses($scope.node, _.keys($scope.alignments), val === 'text-left' ? null : val);
         };
       }
     };
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index e45853423d55..64570cc63aa4 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -4,9 +4,14 @@
   <select class="pull-right" ng-model="node['#tag']">
     <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
   </select>
+  <div class="btn-group btn-group-xs pull-right" role="group">
+    <button type="button" class="btn btn-default" ng-class="{active: opt === getLayout()}" ng-repeat="(opt, label) in layouts" ng-click="setLayout(opt)" title="{{ label }}">
+      <i class="af-gui-layout-icon {{ opt }}" ></i>
+    </button>
+  </div>
 </div>
-<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]'}" ng-model="node['#children']">
-  <div ng-repeat="item in node['#children']">
+<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
+  <div ng-repeat="item in node['#children']" ng-show="block.getNodeType(item)">
     <div ng-switch="block.getNodeType(item)">
       <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
       <div ng-switch-when="block" af-gui-block="item" class="af-gui-block" entity-name="entityName" />
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index 4babf0198455..85b6889a15d0 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -4,7 +4,7 @@
     <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
   </select>
   <div class="btn-group btn-group-xs pull-right" role="group">
-    <button type="button" class="btn btn-default" ng-class="{active: (opt === getAlign()) || (opt === 'text-left' && !getAlign())}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
+    <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
       <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
     </button>
   </div>
diff --git a/ext/afform/gui/images/icons.png b/ext/afform/gui/images/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..98fc24208e8e09ec316ea57406da0f9a6051bff2
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^DnQK5!3HG7f9Y2PsR~aQ#}JFtdqW(#4j6D4*Z!=V
zH`i>&4yowv4FR*9Oal|swx|o-iT%Fqz|?~ed>;0m3Z3-ihQ<?(0ukjc?i+dD8MprC
zDbX@`=+$`Sv5&5+qV|fC?*dI9I3M)O&Fa;P*NL3#z?mH6Xtr;a(^b1$x1!%xbMSI*
c&3h%xE|zj&=}OtDKsPXWy85}Sb4q9e0MLg*L;wH)

literal 0
HcmV?d00001

diff --git a/ext/afform/gui/images/screenshot.png b/ext/afform/gui/images/screenshot.png
deleted file mode 100644
index 6765b696fa03249ac2cd605d5f0e4aa000ad6dad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11775
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
IrTdTn0|#irRsaA1

diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 6dd4ac78752c..499553e7820e 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -7,7 +7,7 @@
   <fieldset af-fieldset="parent">
     <legend class="af-text">About You</legend>
 
-    <div class="af-block">
+    <div class="af-block af-layout-inline">
       <af-field name="first_name" />
       <af-field name="last_name" />
     </div>

From 465c10b3747ee726c66801c3e89d30b765070de9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 4 Nov 2019 16:47:44 -0500
Subject: [PATCH 520/834] Clarify docblock

---
 ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 4fb269811709..2249edbdf064 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -6,7 +6,7 @@
 use Civi\Api4\Generic\Result;
 
 /**
- * Class Prefill
+ * Shared functionality for form submission processing.
  * @package Civi\Api4\Action\Afform
  */
 abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {

From 28b4ace49441771740f503e6ef6fe537c8ef2233 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 5 Nov 2019 21:35:02 -0500
Subject: [PATCH 521/834] Save button for gui + api

---
 .../core/Civi/Api4/Action/Afform/Create.php   | 13 ++++
 .../core/Civi/Api4/Action/Afform/Get.php      |  9 +--
 .../core/Civi/Api4/Action/Afform/Save.php     | 13 ++++
 .../core/Civi/Api4/Action/Afform/Update.php   | 64 +----------------
 ext/afform/core/Civi/Api4/Afform.php          | 59 +++++++++------
 .../core/Civi/Api4/Utils/AfformSaveTrait.php  | 71 +++++++++++++++++++
 ext/afform/gui/ang/afGuiEditor.css            |  5 ++
 ext/afform/gui/ang/afGuiEditor.js             | 21 ++++++
 ext/afform/gui/ang/afGuiEditor/canvas.html    | 12 +++-
 9 files changed, 177 insertions(+), 90 deletions(-)
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Create.php
 create mode 100644 ext/afform/core/Civi/Api4/Action/Afform/Save.php
 create mode 100644 ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Create.php b/ext/afform/core/Civi/Api4/Action/Afform/Create.php
new file mode 100644
index 000000000000..30729f6eaff6
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Create.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+/**
+ * @inheritDoc
+ * @package Civi\Api4\Action\Afform
+ */
+class Create extends \Civi\Api4\Generic\BasicCreateAction {
+
+  use \Civi\Api4\Utils\AfformSaveTrait;
+
+}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index e6571eb591e3..cb059391fe08 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -2,16 +2,13 @@
 
 namespace Civi\Api4\Action\Afform;
 
-use Civi\Api4\Generic\BasicGetAction;
-use Civi\Api4\Utils\AfformFormatTrait;
-
 /**
- * Class Get
+ * @inheritDoc
  * @package Civi\Api4\Action\Afform
  */
-class Get extends BasicGetAction {
+class Get extends \Civi\Api4\Generic\BasicGetAction {
 
-  use AfformFormatTrait;
+  use \Civi\Api4\Utils\AfformFormatTrait;
 
   public function getRecords() {
     /** @var \CRM_Afform_AfformScanner $scanner */
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Save.php b/ext/afform/core/Civi/Api4/Action/Afform/Save.php
new file mode 100644
index 000000000000..a3b683b08ac7
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Save.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Civi\Api4\Action\Afform;
+
+/**
+ * @inheritDoc
+ * @package Civi\Api4\Action\Afform
+ */
+class Save extends \Civi\Api4\Generic\BasicSaveAction {
+
+  use \Civi\Api4\Utils\AfformSaveTrait;
+
+}
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Update.php b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
index 4ee3130426b0..b67b67761e18 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Update.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Update.php
@@ -2,70 +2,12 @@
 
 namespace Civi\Api4\Action\Afform;
 
-use Civi\Api4\Generic\BasicUpdateAction;
-use Civi\Api4\Utils\AfformFormatTrait;
-
 /**
- * Class Update
+ * @inheritDoc
  * @package Civi\Api4\Action\Afform
  */
-class Update extends BasicUpdateAction {
-
-  use AfformFormatTrait;
-
-  protected function writeRecord($item) {
-    /** @var \CRM_Afform_AfformScanner $scanner */
-    $scanner = \Civi::service('afform_scanner');
-
-    if (empty($item['name']) || !preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
-      throw new \API_Exception("Afform.create: name is a mandatory field. It should use alphanumerics and dashes.");
-    }
-    $name = $item['name'];
-
-    // FIXME validate all field data.
-    $updates = _afform_fields_filter($item);
-
-    // Create or update aff.html.
-    if (isset($updates['layout'])) {
-      $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
-      \ CRM_Utils_File::createDir(dirname($layoutPath));
-      file_put_contents($layoutPath, $this->convertInputToHtml($updates['layout']));
-      // FIXME check for writability then success. Report errors.
-    }
-
-    // Create or update *.aff.json.
-    $orig = \Civi\Api4\Afform::get()
-      ->setCheckPermissions($this->getCheckPermissions())
-      ->addWhere('name', '=', $name)
-      ->execute();
-
-    if (isset($orig[0])) {
-      $meta = _afform_fields_filter(array_merge($orig[0], $updates));
-    }
-    else {
-      $meta = $updates;
-    }
-    unset($meta['layout']);
-    unset($meta['name']);
-    if (!empty($meta)) {
-      $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
-      // printf("[%s] Update meta %s: %s\n", $name, $metaPath, print_R(['updates'=>$updates, 'meta'=>$meta], 1));
-      \CRM_Utils_File::createDir(dirname($metaPath));
-      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
-      // FIXME check for writability then success. Report errors.
-    }
-
-    // We may have changed list of files covered by the cache.
-    _afform_clear();
-
-    if (isset($updates['server_route']) && $updates['server_route'] !== $orig[0]['server_route']) {
-      \CRM_Core_Menu::store();
-      \CRM_Core_BAO_Navigation::resetNavigation();
-    }
-    // FIXME if `server_route` changes, then flush the menu cache.
-    // FIXME if asset-caching is enabled, then flush the asset cache.
+class Update extends \Civi\Api4\Generic\BasicUpdateAction {
 
-    return $updates;
-  }
+  use \Civi\Api4\Utils\AfformSaveTrait;
 
 }
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 86e26a4d9567..8bfecf5b1b7d 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -19,6 +19,41 @@ public static function get() {
     return new \Civi\Api4\Action\Afform\Get('Afform', __FUNCTION__);
   }
 
+  /**
+   * @return \Civi\Api4\Action\Afform\Create
+   */
+  public static function create() {
+    return new \Civi\Api4\Action\Afform\Create('Afform', __FUNCTION__);
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Update
+   */
+  public static function update() {
+    return new \Civi\Api4\Action\Afform\Update('Afform', __FUNCTION__, 'name');
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Save
+   */
+  public static function save() {
+    return new \Civi\Api4\Action\Afform\Save('Afform', __FUNCTION__, 'name');
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Prefill
+   */
+  public static function prefill() {
+    return new \Civi\Api4\Action\Afform\Prefill('Afform', __FUNCTION__);
+  }
+
+  /**
+   * @return \Civi\Api4\Action\Afform\Submit
+   */
+  public static function submit() {
+    return new \Civi\Api4\Action\Afform\Submit('Afform', __FUNCTION__);
+  }
+
   /**
    * @return \Civi\Api4\Generic\BasicBatchAction
    */
@@ -49,29 +84,8 @@ public static function revert() {
     });
   }
 
-  /**
-   * @return \Civi\Api4\Action\Afform\Update
-   */
-  public static function update() {
-    return new \Civi\Api4\Action\Afform\Update('Afform', __FUNCTION__, 'name');
-  }
-
-  /**
-   * @return \Civi\Api4\Action\Afform\Prefill
-   */
-  public static function prefill() {
-    return new \Civi\Api4\Action\Afform\Prefill('Afform', __FUNCTION__);
-  }
-
-  /**
-   * @return \Civi\Api4\Action\Afform\Submit
-   */
-  public static function submit() {
-    return new \Civi\Api4\Action\Afform\Submit('Afform', __FUNCTION__);
-  }
-
   public static function getFields() {
-    return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
+    return new BasicGetFieldsAction('Afform', __FUNCTION__, function($self) {
       return [
         [
           'name' => 'name',
@@ -81,6 +95,7 @@ public static function getFields() {
         ],
         [
           'name' => 'title',
+          'required' => $self->getAction() === 'create',
         ],
         [
           'name' => 'description',
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
new file mode 100644
index 000000000000..6322c50d8063
--- /dev/null
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Civi\Api4\Utils;
+
+/**
+ * Class AfformSaveTrait
+ * @package Civi\Api4\Action\Afform
+ */
+trait AfformSaveTrait {
+
+  use AfformFormatTrait;
+
+  protected function writeRecord($item) {
+    /** @var \CRM_Afform_AfformScanner $scanner */
+    $scanner = \Civi::service('afform_scanner');
+
+    $name = $item['name'] ?? NULL;
+    // If no name given, create a unique name based on the title
+    if (!$name) {
+      $name = \CRM_Utils_String::munge($item['title'], '-');
+      $suffix = '';
+      while (
+        file_exists($scanner->createSiteLocalPath($name . $suffix, \CRM_Afform_AfformScanner::METADATA_FILE))
+        || file_exists($scanner->createSiteLocalPath($name . $suffix, 'aff.html'))
+      ) {
+        $suffix++;
+      }
+      $name .= $suffix;
+    }
+    elseif (!preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $name)) {
+      throw new \API_Exception("Afform.{$this->getActionName()}: name should use alphanumerics and dashes.");
+    }
+
+    // FIXME validate all field data.
+    $updates = _afform_fields_filter($item);
+
+    // Create or update aff.html.
+    if (isset($updates['layout'])) {
+      $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
+      \CRM_Utils_File::createDir(dirname($layoutPath));
+      file_put_contents($layoutPath, $this->convertInputToHtml($updates['layout']));
+      // FIXME check for writability then success. Report errors.
+    }
+
+    $orig = NULL;
+    $meta = $updates;
+    unset($meta['layout']);
+    unset($meta['name']);
+    if (!empty($meta)) {
+      $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
+      if (file_exists($metaPath)) {
+        $orig = $scanner->getMeta($name);
+      }
+      \CRM_Utils_File::createDir(dirname($metaPath));
+      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
+      // FIXME check for writability then success. Report errors.
+    }
+
+    // We may have changed list of files covered by the cache.
+    _afform_clear();
+
+    if (($updates['server_route'] ?? NULL) !== ($orig['server_route'] ?? NULL)) {
+      \CRM_Core_Menu::store();
+      \CRM_Core_BAO_Navigation::resetNavigation();
+    }
+    // FIXME if asset-caching is enabled, then flush the asset cache.
+
+    return $updates;
+  }
+
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index a8e333f82e1d..540a96fafbe0 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -154,3 +154,8 @@
   display: inline-block;
   width: 300px;
 }
+
+#afGuiEditor-canvas .panel-heading .btn-group {
+  position: relative;
+  top: -8px;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index acfb5898d3d0..05a60c422d1a 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -11,6 +11,7 @@
       controller: function($scope) {
         $scope.ts = CRM.ts();
         $scope.afform = null;
+        $scope.saving = false;
         $scope.selectedEntity = null;
         $scope.meta = CRM.afformAdminData;
         $scope.controls = {};
@@ -38,6 +39,7 @@
 
         function initialize(afform) {
           $scope.afform = afform;
+          $scope.changesSaved = 1;
           // Remove empty text nodes, they just create clutter
           removeRecursive($scope.afform.layout, function(item) {
             return ('#text' in item) && _.trim(item['#text']).length === 0;
@@ -47,6 +49,11 @@
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
           expandFields($scope.layout['#children']);
           _.each(_.keys($scope.entities), buildFieldList);
+
+          // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
+          $scope.$watch('afform', function () {
+            $scope.changesSaved = $scope.changesSaved === 1;
+          }, true);
         }
 
         this.addEntity = function(entityType) {
@@ -141,6 +148,17 @@
           delete entity.data[fieldName];
         };
 
+        $scope.save = function() {
+          $scope.saving = true;
+          CRM.api4('Afform', 'save', {records: [JSON.parse(angular.toJson($scope.afform))]})
+            .then(function () {
+              $scope.$apply(function () {
+                $scope.saving = false;
+                $scope.changesSaved = true;
+              });
+            });
+        };
+
         $scope.$watch('controls.addValue', function(fieldName) {
           if (fieldName) {
             if (!$scope.entities[$scope.selectedEntity].data) {
@@ -316,6 +334,9 @@
         };
 
         $scope.getLayout = function() {
+          if (!$scope.node) {
+            return '';
+          }
           return _.intersection(splitClass($scope.node['class']), _.keys($scope.layouts))[0] || 'af-layout-rows';
         };
 
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 8d0eda2044cb..37d7967506f6 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -1,6 +1,16 @@
 <div class="panel panel-default">
   <div class="panel-heading">
-    {{ ts('Form Layout') }}
+    <form class="form-inline">
+      <div class="btn-group btn-group-md pull-right">
+        <button class="btn" ng-class="{'btn-primary': !changesSaved && !saving, 'btn-warning': saving, 'btn-success': changesSaved}" ng-disabled="changesSaved || saving" ng-click="save()">
+          <i class="crm-i" ng-class="{'fa-check': !saving, 'fa-spin fa-spinner': saving}"></i>
+          <span ng-if="changesSaved">{{ ts('Saved') }}</span>
+          <span ng-if="!changesSaved && !saving">{{ ts('Save') }}</span>
+          <span ng-if="saving">{{ ts('Saving...') }}</span>
+        </button>
+      </div>
+      <div>{{ ts('Form Layout') }}</div>
+    </form>
   </div>
   <div class="panel-body">
     <div af-gui-block="layout" entity-name="" />

From cd5ae5b97e53a2ac7adc82674492755a107946de Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Nov 2019 07:25:35 -0500
Subject: [PATCH 522/834] Improve admin bar style

---
 ext/afform/gui/ang/afGuiEditor.css | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 540a96fafbe0..8047a19184d1 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -55,18 +55,23 @@
 
 #afGuiEditor .af-gui-bar {
   cursor: move;
-  visibility: hidden;
   background-color: #efefef;
   height: 22px;
   position: absolute;
   top: 0;
   left: 0;
   width: 100%;
-  padding-left:15px;
+  padding-left: 15px;
+  opacity: 0;
+  transition: opacity 1s 2s;
 }
-
 #afGuiEditor-canvas:hover .af-gui-bar {
-  visibility: visible;
+  opacity: 1;
+  transition: opacity .2s;
+}
+
+#afGuiEditor .af-gui-bar .btn.active {
+  background-color: #b3b3b3;
 }
 
 #afGuiEditor .af-gui-field,

From 5f535e6c13029379818d1668064fa87f1d148101 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Nov 2019 08:29:09 -0500
Subject: [PATCH 523/834] GUI: Add block button

---
 ext/afform/gui/ang/afGuiEditor.css        | 16 +++++++++++++++-
 ext/afform/gui/ang/afGuiEditor.js         | 10 ++++++++++
 ext/afform/gui/ang/afGuiEditor/block.html | 23 ++++++++++++++++-------
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 8047a19184d1..fd025075751f 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -88,7 +88,10 @@
 }
 #afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar {
   background-color: #0071bd;
-  visibility: visible;
+  opacity: 1;
+  transition: opacity 0s;
+}
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > span {
   color: white;
 }
 
@@ -134,6 +137,17 @@
   top: 5px;
 }
 
+#afGuiEditor .af-gui-add-block-button span {
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  border: 2px dashed grey;
+}
+#afGuiEditor .af-gui-add-block-button span i {
+  position: relative;
+  top: -3px;
+}
+
 #afGuiEditor .af-gui-layout-icon {
   width: 12px;
   height: 11px;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 05a60c422d1a..ecbdeddf6e92 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -276,6 +276,7 @@
       require: '^^afGuiEditor',
       link: function($scope, element, attrs, editor) {
         $scope.editor = editor;
+        $scope.ts = CRM.ts();
       },
       controller: function($scope) {
         $scope.block = this;
@@ -312,6 +313,15 @@
           return null;
         };
 
+        $scope.addBlock = function(type) {
+          var newBlock = {
+            '#tag': type === 'text' ? 'p' : 'div',
+            'class': 'af-' + type,
+            '#children': type == 'block' ? [] : [{'#text': ts('Enter text')}]
+          };
+          $scope.node['#children'].push(newBlock);
+        };
+
         $scope.isSelectedFieldset = function(entityName) {
           return entityName === $scope.editor.getSelectedEntity();
         };
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 64570cc63aa4..45d6c3d750b7 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -1,13 +1,22 @@
 <div class="af-gui-bar" ng-if="node['#tag'] != 'af-form'" ng-click="selectEntity()" >
   <span ng-if="block.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
-  {{ node['#tag'] }}
-  <select class="pull-right" ng-model="node['#tag']">
-    <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
-  </select>
-  <div class="btn-group btn-group-xs pull-right" role="group">
-    <button type="button" class="btn btn-default" ng-class="{active: opt === getLayout()}" ng-repeat="(opt, label) in layouts" ng-click="setLayout(opt)" title="{{ label }}">
-      <i class="af-gui-layout-icon {{ opt }}" ></i>
+  <span>{{ node['#tag'] }}</span>
+  <div class="form-inline pull-right">
+    <div class="btn-group btn-group-xs" role="group">
+      <button type="button" class="btn btn-default" ng-class="{active: opt === getLayout()}" ng-repeat="(opt, label) in layouts" ng-click="setLayout(opt)" title="{{ label }}">
+        <i class="af-gui-layout-icon {{ opt }}" ></i>
+      </button>
+    </div>
+    <select ng-model="node['#tag']">
+      <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+    </select>
+    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
+      <span><i class="crm-i fa-plus"></i></span>
     </button>
+    <ul class="dropdown-menu">
+      <li><a href ng-click="addBlock('block')">{{ ts('Add block/fieldset') }}</a></li>
+      <li><a href ng-click="addBlock('text')">{{ ts('Add text box') }}</a></li>
+    </ul>
   </div>
 </div>
 <div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">

From b327093b7bbe36f2bf2c1b4c51ce17897e3a25d9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Nov 2019 08:31:11 -0500
Subject: [PATCH 524/834] GUI: Bare bones field style

---
 ext/afform/gui/ang/afGuiEditor/config-form.html | 2 +-
 ext/afform/gui/ang/afGuiEditor/field.html       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index 26794a3cbfc4..ad83f171eda5 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -5,7 +5,7 @@
 <label for="af_config_form_description">
   {{ ts('Description:') }}
 </label>
-<input ng-model="afform.description" class="form-control" id="af_config_form_description" />
+<textarea ng-model="afform.description" class="form-control" id="af_config_form_description" />
 <label for="af_config_form_server_route">
   {{ ts('URL:') }}
 </label>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index b67b7730c243..e3a55a518f60 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -2,5 +2,6 @@
   <span>{{ getEntity().label + ': ' + getDefn().title }}</span>
 </div>
 <div>
-  {{ node.name }}
+  <label>{{ getDefn().title }}</label>
+  <input class="form-control" disabled placeholder="{{ node.name }}" />
 </div>

From 52cf76a7ab0ab4a42530bce86b1106808903d5dc Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Nov 2019 19:07:20 -0500
Subject: [PATCH 525/834] Don't write field defn unless changed

---
 ext/afform/gui/ang/afGuiEditor.js             | 25 +++++++++++++------
 .../gui/ang/afGuiEditor/config-entity.html    |  2 +-
 ext/afform/gui/ang/afGuiEditor/field.html     |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index ecbdeddf6e92..65a2f86a0bd0 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -34,6 +34,15 @@
           $timeout(function() {
             initialize(_.cloneDeep(newForm));
             editor.addEntity('Contact');
+            $scope.layout['#children'].push({
+              "#tag": "button",
+              "ng-click": "modelListCtrl.submit()",
+              "#children": [
+                {
+                  "#text": "Submit"
+                }
+              ]
+            });
           });
         }
 
@@ -47,7 +56,6 @@
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
-          expandFields($scope.layout['#children']);
           _.each(_.keys($scope.entities), buildFieldList);
 
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
@@ -132,7 +140,7 @@
             $scope.fieldList[entityName].push({
               "#tag": "af-field",
               name: field.name,
-              defn: _.cloneDeep(_.pick(field, ['title', 'input_type', 'input_attrs']))
+              defn: {}
             });
           });
         }
@@ -377,11 +385,11 @@
       controller: function($scope) {
 
         $scope.getEntity = function() {
-          return $scope.editor.getEntity($scope.entityName);
+          return $scope.editor ? $scope.editor.getEntity($scope.entityName) : {};
         };
 
         $scope.getDefn = function() {
-          return $scope.editor.getField($scope.getEntity().type, $scope.node.name);
+          return $scope.editor ? $scope.editor.getField($scope.getEntity().type, $scope.node.name) : {};
         };
       }
     };
@@ -434,20 +442,23 @@
     return {
       restrict: "A",
       require: "ngModel",
+      scope: {
+        defaultValue: '='
+      },
       link: function(scope, element, attrs, ngModel) {
         var ts = CRM.ts();
 
         function read() {
           var htmlVal = element.html();
           if (!htmlVal) {
-            htmlVal = ts('Unnamed');
+            htmlVal = scope.defaultValue;
             element.html(htmlVal);
           }
           ngModel.$setViewValue(htmlVal);
         }
 
         ngModel.$render = function() {
-          element.html(ngModel.$viewValue || ' ');
+          element.html(ngModel.$viewValue || scope.defaultValue);
         };
 
         // Special handling for enter and escape keys
@@ -459,7 +470,7 @@
           }
           // Escape: undo
           if (e.which === 27) {
-            element.html(ngModel.$viewValue || ' ');
+            element.html(ngModel.$viewValue || scope.defaultValue);
             element.blur();
           }
         });
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index cf32fadf0311..e5c48d3ffe24 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -21,7 +21,7 @@
     <legend>{{ ts('Fields') }}</legend>
     <div class="af-gui-field-select-list" ui-sortable="{update: rebuildFieldList, items: '> div:not(.disabled)', connectWith: '[data-entity=' + selectedEntity + '] [ui-sortable]'}" ng-model="fieldList[selectedEntity]">
       <div ng-repeat="field in fieldList[selectedEntity]" ng-class="{disabled: fieldInUse(selectedEntity, field.name)}">
-        {{ field.defn.title }}
+        {{ editor.getField(editor.getEntity(selectedEntity).type, field.name).title }}
       </div>
     </div>
   </fieldset>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index e3a55a518f60..01cc02d74acb 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -2,6 +2,6 @@
   <span>{{ getEntity().label + ': ' + getDefn().title }}</span>
 </div>
 <div>
-  <label>{{ getDefn().title }}</label>
+  <label af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ node.defn.title || getDefn().title }}</label>
   <input class="form-control" disabled placeholder="{{ node.name }}" />
 </div>

From e72f4d8159f5b67d5fd790c27cb2ac487a8278b2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 7 Nov 2019 11:41:08 -0500
Subject: [PATCH 526/834] GUI configure form buttons

---
 ext/afform/gui/ang/afGuiEditor.css            | 21 +++---
 ext/afform/gui/ang/afGuiEditor.js             | 71 +++++++++++++++++++
 ext/afform/gui/ang/afGuiEditor/block.html     | 12 ++--
 ext/afform/gui/ang/afGuiEditor/button.html    | 22 ++++++
 .../gui/ang/afGuiEditor/config-entity.html    |  2 +-
 ext/afform/gui/ang/afGuiEditor/main.html      |  3 +
 ext/afform/mock/ang/testAfform.aff.html       |  2 +-
 7 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/button.html

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index fd025075751f..2665fecc586e 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -74,15 +74,20 @@
   background-color: #b3b3b3;
 }
 
-#afGuiEditor .af-gui-field,
-#afGuiEditor .af-gui-text,
-#afGuiEditor .af-gui-block {
+#afGuiEditor .af-gui-element {
   position: relative;
-  padding: 32px 3px 3px;
+  padding: 22px 3px 3px;
   min-height: 40px;
+}
+
+#afGuiEditor .af-gui-block {
   border: 2px dashed transparent;
 }
 
+#afGuiEditor .af-gui-block:hover {
+  border: 2px dashed #757575;
+}
+
 #afGuiEditor #afGuiEditor-canvas .af-entity-selected {
   border: 2px dashed #0071bd;
 }
@@ -95,14 +100,6 @@
   color: white;
 }
 
-#afGuiEditor .af-gui-block {
-  padding-top: 20px;
-}
-
-#afGuiEditor .af-gui-block:hover {
-  border: 2px dashed #757575;
-}
-
 #afGuiEditor [ui-sortable] {
   min-height: 25px;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 65a2f86a0bd0..835e6d07a18f 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -1,6 +1,8 @@
 (function(angular, $, _) {
   angular.module('afGuiEditor', CRM.angRequires('afGuiEditor'));
 
+  var editingIcon;
+
   angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse, $timeout) {
     return {
       restrict: 'A',
@@ -8,6 +10,20 @@
       scope: {
         afGuiEditor: '='
       },
+      link: function($scope, element, attrs) {
+        // Shoehorn in a non-angular widget for picking icons
+        CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmIconPicker.js').done(function() {
+          $('#af-gui-icon-picker').crmIconPicker().change(function() {
+            if (editingIcon) {
+              $scope.$apply(function() {
+                editingIcon['crm-icon'] = $('#af-gui-icon-picker').val();
+                editingIcon = null;
+                $('#af-gui-icon-picker').val('').change();
+              });
+            }
+          });
+        });
+      },
       controller: function($scope) {
         $scope.ts = CRM.ts();
         $scope.afform = null;
@@ -36,6 +52,8 @@
             editor.addEntity('Contact');
             $scope.layout['#children'].push({
               "#tag": "button",
+              "class": 'af-button btn btn-primary',
+              "crm-icon": 'fa-check',
               "ng-click": "modelListCtrl.submit()",
               "#children": [
                 {
@@ -318,6 +336,9 @@
           if (_.contains(classes, 'af-text')) {
             return 'text';
           }
+          if (_.contains(classes, 'af-button')) {
+            return 'button';
+          }
           return null;
         };
 
@@ -327,6 +348,12 @@
             'class': 'af-' + type,
             '#children': type == 'block' ? [] : [{'#text': ts('Enter text')}]
           };
+          if (type === 'button') {
+            newBlock['#tag'] = 'button';
+            newBlock['class'] += ' btn btn-primary';
+            newBlock['crm-icon'] = 'fa-check';
+            newBlock['ng-click'] = "modelListCtrl.submit()";
+          }
           $scope.node['#children'].push(newBlock);
         };
 
@@ -435,6 +462,50 @@
       }
     };
   });
+  
+  angular.module('afGuiEditor').directive('afGuiButton', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/button.html',
+      scope: {
+        node: '=afGuiButton'
+      },
+      require: '^^afGuiBlock',
+      link: function($scope, element, attrs, block) {
+        $scope.block = block;
+      },
+      controller: function($scope) {
+
+        // TODO: Add action selector to UI
+        // $scope.actions = {
+        //   "modelListCtrl.submit()": ts('Submit Form')
+        // };
+
+        $scope.styles = {
+          'btn-default': ts('Default'),
+          'btn-primary': ts('Primary'),
+          'btn-success': ts('Success'),
+          'btn-info': ts('Info'),
+          'btn-warning': ts('Warning'),
+          'btn-danger': ts('Danger')
+        };
+
+        $scope.getStyle = function() {
+          return _.intersection(splitClass($scope.node['class']), _.keys($scope.styles))[0] || '';
+        };
+
+        $scope.setStyle = function(val) {
+          $scope.block.modifyClasses($scope.node, _.keys($scope.styles), val);
+        };
+
+        $scope.pickIcon = function() {
+          editingIcon = $scope.node;
+          $('#af-gui-icon-picker ~ .crm-icon-picker-button').click();
+        };
+
+      }
+    };
+  });
 
   // Editable titles using ngModel & html5 contenteditable
   // Cribbed from ContactLayoutEditor
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 45d6c3d750b7..28d96ff68c6a 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -16,16 +16,18 @@
     <ul class="dropdown-menu">
       <li><a href ng-click="addBlock('block')">{{ ts('Add block/fieldset') }}</a></li>
       <li><a href ng-click="addBlock('text')">{{ ts('Add text box') }}</a></li>
+      <li><a href ng-click="addBlock('button')">{{ ts('Add button') }}</a></li>
     </ul>
   </div>
 </div>
-<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
+<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in node['#children']" ng-show="block.getNodeType(item)">
     <div ng-switch="block.getNodeType(item)">
-      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
-      <div ng-switch-when="block" af-gui-block="item" class="af-gui-block" entity-name="entityName" />
-      <div ng-switch-when="field" af-gui-field="item" class="af-gui-field" entity-name="entityName" />
-      <div ng-switch-when="text" af-gui-text="item" class="af-gui-text" />
+      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-element af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
+      <div ng-switch-when="block" af-gui-block="item" class="af-gui-element af-gui-block" entity-name="entityName" />
+      <div ng-switch-when="field" af-gui-field="item" class="af-gui-element af-gui-field" entity-name="entityName" />
+      <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
+      <div ng-switch-when="button" af-gui-button="item" class="af-gui-element af-gui-button" />
     </div>
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
new file mode 100644
index 000000000000..996205a13bcf
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -0,0 +1,22 @@
+<div class="af-gui-bar">
+  {{ node['#tag'] }}
+  <div class="form-inline pull-right">
+    <button type="button" class="btn btn-xs dropdown-toggle {{ getStyle() }}-outline" data-toggle="dropdown" title="{{ ts('Style') }}">
+      <span>{{ styles[getStyle()] }}</span>
+      <i class="crm-i fa-caret-down"></i>
+    </button>
+    <ul class="dropdown-menu">
+      <li ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}">
+        <a href ng-click="setStyle(style)">{{ label }}</a>
+      </li>
+    </ul>
+  </div>
+</div>
+<button type="button" class="btn {{ getStyle() }}">
+  <span class="crm-editable-enabled" ng-click="pickIcon()" >
+    <i class="crm-i {{ node['crm-icon'] }}"></i>
+  </span>
+  <span af-gui-editable ng-model="node['#children'][0]['#text']" >
+    {{ node['#children'][0]['#text'] }}
+  </span>
+</button>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index e5c48d3ffe24..25bc6ab1728f 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -1,5 +1,5 @@
 <div>
-  <a href ng-click="editor.removeEntity(selectedEntity)" class="btn btn-sm btn-danger pull-right">
+  <a href ng-click="editor.removeEntity(selectedEntity)" class="btn btn-sm btn-danger-outline pull-right">
     <i class="crm-i fa-trash"></i>
   </a>
 
diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/gui/ang/afGuiEditor/main.html
index bd8b471e1bb3..f7ff60ff4dfe 100644
--- a/ext/afform/gui/ang/afGuiEditor/main.html
+++ b/ext/afform/gui/ang/afGuiEditor/main.html
@@ -8,4 +8,7 @@
     <div id="afGuiEditor-palette" ng-include="'~/afGuiEditor/palette.html'"></div>
     <div id="afGuiEditor-canvas" ng-include="'~/afGuiEditor/canvas.html'"></div>
   </div>
+  <div style="display:none;">
+    <input id="af-gui-icon-picker" title="{{ ts('Choose Icon') }}" />
+  </div>
 </div>
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 499553e7820e..512bc15303a8 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -26,6 +26,6 @@ <h3 class="af-text text-center">About Your Spouse</h3>
   </div>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
-  <button ng-click="modelListCtrl.submit()">Submit</button>
+  <button class="af-button btn btn-primary" crm-icon="fa-check" ng-click="modelListCtrl.submit()">Submit</button>
 
 </af-form>

From edac0d6ef5763f8c76fa6736706c1d98ec544261 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 8 Nov 2019 10:03:28 -0500
Subject: [PATCH 527/834] GUI: Refactor entity panel to directive & add field
 search

---
 ext/afform/gui/ang/afGuiEditor.css            |  22 +-
 ext/afform/gui/ang/afGuiEditor.js             | 191 +++++++++---------
 .../{config-entity.html => entity.html}       |  18 +-
 ext/afform/gui/ang/afGuiEditor/palette.html   |   2 +-
 4 files changed, 135 insertions(+), 98 deletions(-)
 rename ext/afform/gui/ang/afGuiEditor/{config-entity.html => entity.html} (52%)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 2665fecc586e..c1ceee8f184f 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -45,7 +45,7 @@
   display: none;
 }
 
-#afGuiEditor-palette-config .form-inline {
+#afGuiEditor-palette-config .af-gui-entity-values .form-inline {
   margin-bottom: 10px;
 }
 
@@ -53,6 +53,19 @@
   min-width: 110px;
 }
 
+#afGuiEditor input[type=search]::placeholder {
+  font-family: FontAwesome;
+  text-align: right;
+}
+#afGuiEditor input[type=search]:-ms-input-placeholder {
+  font-family: FontAwesome;
+  text-align: right;
+}
+#afGuiEditor input[type=search]::-ms-input-placeholder {
+  font-family: FontAwesome;
+  text-align: right;
+}
+
 #afGuiEditor .af-gui-bar {
   cursor: move;
   background-color: #efefef;
@@ -69,6 +82,9 @@
   opacity: 1;
   transition: opacity .2s;
 }
+#afGuiEditor-canvas .panel-body > div > .af-gui-bar {
+  top: -5px;
+}
 
 #afGuiEditor .af-gui-bar .btn.active {
   background-color: #b3b3b3;
@@ -100,6 +116,10 @@
   color: white;
 }
 
+#afGuiEditor .af-gui-entity-fields legend {
+  margin-bottom: 0 !important;
+}
+
 #afGuiEditor [ui-sortable] {
   min-height: 25px;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 835e6d07a18f..95b7b26b8f80 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -25,13 +25,12 @@
         });
       },
       controller: function($scope) {
-        $scope.ts = CRM.ts();
+        var ts = $scope.ts = CRM.ts();
         $scope.afform = null;
         $scope.saving = false;
         $scope.selectedEntity = null;
-        $scope.meta = CRM.afformAdminData;
-        $scope.controls = {};
-        $scope.fieldList = {};
+        $scope.meta = this.meta = CRM.afformAdminData;
+        this.scope = $scope;
         var editor = $scope.editor = this;
         var newForm = {
           title: ts('Untitled Form'),
@@ -74,7 +73,6 @@
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
-          _.each(_.keys($scope.entities), buildFieldList);
 
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
           $scope.$watch('afform', function () {
@@ -111,7 +109,6 @@
               }
             ]
           });
-          buildFieldList(entityType + num);
           return entityType + num;
         };
 
@@ -143,37 +140,6 @@
           editor.selectEntity(entityName);
         };
 
-        $scope.rebuildFieldList = function() {
-          $timeout(function() {
-            $scope.$apply(function() {
-              buildFieldList($scope.selectedEntity);
-            });
-          });
-        };
-
-        function buildFieldList(entityName) {
-          $scope.fieldList[entityName] = $scope.fieldList[entityName] || [];
-          $scope.fieldList[entityName].length = 0;
-          _.each($scope.meta.fields[$scope.entities[entityName].type], function(field) {
-            $scope.fieldList[entityName].push({
-              "#tag": "af-field",
-              name: field.name,
-              defn: {}
-            });
-          });
-        }
-
-        $scope.valuesFields = function() {
-          var fields = _.transform($scope.meta.fields[$scope.entities[$scope.selectedEntity].type], function(fields, field) {
-            fields.push({id: field.name, text: field.title, disabled: $scope.fieldInUse($scope.selectedEntity, field.name)});
-          }, []);
-          return {results: fields};
-        };
-
-        $scope.removeValue = function(entity, fieldName) {
-          delete entity.data[fieldName];
-        };
-
         $scope.save = function() {
           $scope.saving = true;
           CRM.api4('Afform', 'save', {records: [JSON.parse(angular.toJson($scope.afform))]})
@@ -185,42 +151,6 @@
             });
         };
 
-        $scope.$watch('controls.addValue', function(fieldName) {
-          if (fieldName) {
-            if (!$scope.entities[$scope.selectedEntity].data) {
-              $scope.entities[$scope.selectedEntity].data = {};
-            }
-            $scope.entities[$scope.selectedEntity].data[fieldName] = '';
-            $scope.controls.addValue = '';
-          }
-        });
-
-        // Checks if a field is on the form or set as a value
-        $scope.fieldInUse = function(entityName, fieldName) {
-          var data = $scope.entities[entityName].data || {},
-            found = false;
-          if (fieldName in data) {
-            return true;
-          }
-          return check($scope.layout['#children']);
-          function check(group) {
-            _.each(group, function(item) {
-              if (found) {
-                return false;
-              }
-              if (_.isPlainObject(item)) {
-                if ((!item['af-fieldset'] || (item['af-fieldset'] === entityName)) && item['#children']) {
-                  check(item['#children']);
-                }
-                if (item['#tag'] === 'af-field' && item.name === fieldName) {
-                  found = true;
-                }
-              }
-            });
-            return found;
-          }
-        };
-
         // Parse strings of javascript that php couldn't interpret
         function evaluate(collection) {
           _.each(collection, function(item) {
@@ -238,22 +168,6 @@
           });
         }
 
-        function expandFields(collection, entityType) {
-          _.each(collection, function (item) {
-            if (_.isPlainObject(item)) {
-              if (item['af-fieldset']) {
-                expandFields(item['#children'], editor.getEntity(item['af-fieldset']).type);
-              }
-              else if (item['#tag'] === 'af-field') {
-                item.defn = item.defn || {};
-                _.defaults(item.defn, _.cloneDeep(_.pick(editor.getField(entityType, item.name), ['title', 'input_type', 'input_attrs'])));
-              } else {
-                expandFields(item['#children'], entityType);
-              }
-            }
-          });
-        }
-
       }
     };
   });
@@ -291,6 +205,100 @@
     });
   }
 
+  angular.module('afGuiEditor').directive('afGuiEntity', function($timeout) {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/entity.html',
+      scope: {
+        entity: '=afGuiEntity',
+      },
+      require: '^^afGuiEditor',
+      link: function ($scope, element, attrs, editor) {
+        $scope.editor = editor;
+      },
+      controller: function ($scope) {
+        var ts = $scope.ts = CRM.ts();
+        $scope.controls = {};
+        $scope.fieldList = [];
+
+        $scope.valuesFields = function() {
+          var fields = $scope.editor ? _.transform($scope.editor.meta.fields[$scope.entity.type], function(fields, field) {
+            fields.push({id: field.name, text: field.title, disabled: $scope.fieldInUse(field.name)});
+          }, []) : [];
+          return {results: fields};
+        };
+
+        $scope.removeValue = function(entity, fieldName) {
+          delete entity.data[fieldName];
+        };
+
+        $scope.buildFieldList = function() {
+          $scope.fieldList.length = 0;
+          var search = $scope.controls.fieldSearch ? $scope.controls.fieldSearch.toLowerCase() : null;
+          _.each($scope.editor.meta.fields[$scope.entity.type], function(field) {
+            if (!search || _.contains(field.name, search) || _.contains(field.title.toLowerCase(), search)) {
+              $scope.fieldList.push({
+                "#tag": "af-field",
+                name: field.name,
+                defn: {}
+              });
+            }
+          });
+        };
+
+        $scope.clearSearch = function() {
+          $scope.controls.fieldSearch = '';
+        };
+
+        $scope.rebuildFieldList = function() {
+          $timeout(function() {
+            $scope.$apply(function() {
+              $scope.buildFieldList();
+            });
+          });
+        };
+
+        // Checks if a field is on the form or set as a value
+        $scope.fieldInUse = function(fieldName) {
+          var data = $scope.entity.data || {},
+            found = false;
+          if (fieldName in data) {
+            return true;
+          }
+          return check($scope.editor.scope.layout['#children']);
+          function check(group) {
+            _.each(group, function(item) {
+              if (found) {
+                return false;
+              }
+              if (_.isPlainObject(item)) {
+                if ((!item['af-fieldset'] || (item['af-fieldset'] === $scope.entity.name)) && item['#children']) {
+                  check(item['#children']);
+                }
+                if (item['#tag'] === 'af-field' && item.name === fieldName) {
+                  found = true;
+                }
+              }
+            });
+            return found;
+          }
+        };
+
+        $scope.$watch('controls.addValue', function(fieldName) {
+          if (fieldName) {
+            if (!$scope.entity.data) {
+              $scope.entity.data = {};
+            }
+            $scope.entity.data[fieldName] = '';
+            $scope.controls.addValue = '';
+          }
+        });
+
+        $scope.$watch('controls.fieldSearch', $scope.buildFieldList);
+      }
+    };
+  });
+
   angular.module('afGuiEditor').directive('afGuiBlock', function() {
     return {
       restrict: 'A',
@@ -302,10 +310,10 @@
       require: '^^afGuiEditor',
       link: function($scope, element, attrs, editor) {
         $scope.editor = editor;
-        $scope.ts = CRM.ts();
       },
       controller: function($scope) {
         $scope.block = this;
+        var ts = $scope.ts = CRM.ts();
         this.node = $scope.node;
 
         this.modifyClasses = function(item, toRemove, toAdd) {
@@ -434,6 +442,8 @@
         $scope.block = block;
       },
       controller: function($scope) {
+        var ts = $scope.ts = CRM.ts();
+
         $scope.tags = {
           p: ts('Normal Text'),
           legend: ts('Fieldset Legend'),
@@ -475,6 +485,7 @@
         $scope.block = block;
       },
       controller: function($scope) {
+        var ts = $scope.ts = CRM.ts();
 
         // TODO: Add action selector to UI
         // $scope.actions = {
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
similarity index 52%
rename from ext/afform/gui/ang/afGuiEditor/config-entity.html
rename to ext/afform/gui/ang/afGuiEditor/entity.html
index 25bc6ab1728f..558110b11b78 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -1,9 +1,9 @@
 <div>
-  <a href ng-click="editor.removeEntity(selectedEntity)" class="btn btn-sm btn-danger-outline pull-right">
+  <a href ng-click="editor.removeEntity(entity.name)" class="btn btn-sm btn-danger-outline pull-right">
     <i class="crm-i fa-trash"></i>
   </a>
 
-  <fieldset>
+  <fieldset class="af-gui-entity-values">
     <legend>{{ ts('Values') }}</legend>
     <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
       <label>{{ editor.getField(entity.type, fieldName).title }}:</label>
@@ -17,11 +17,17 @@
     </div>
   </fieldset>
 
-  <fieldset>
+  <fieldset class="af-gui-entity-fields">
     <legend>{{ ts('Fields') }}</legend>
-    <div class="af-gui-field-select-list" ui-sortable="{update: rebuildFieldList, items: '> div:not(.disabled)', connectWith: '[data-entity=' + selectedEntity + '] [ui-sortable]'}" ng-model="fieldList[selectedEntity]">
-      <div ng-repeat="field in fieldList[selectedEntity]" ng-class="{disabled: fieldInUse(selectedEntity, field.name)}">
-        {{ editor.getField(editor.getEntity(selectedEntity).type, field.name).title }}
+    <div class="af-gui-field-search form-inline">
+      <input ng-model="controls.fieldSearch" class="form-control" type="search" placeholder="&#xf002" title="{{ ts('Search fields') }}" />
+      <a href ng-click="clearSearch()" ng-show="!!controls.fieldSearch" title="{{ ts('Clear search') }}">
+        <i class="crm-i fa-times"></i>
+      </a>
+    </div>
+    <div class="af-gui-field-select-list" ui-sortable="{update: rebuildFieldList, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] [ui-sortable]'}" ng-model="fieldList">
+      <div ng-repeat="field in fieldList" ng-class="{disabled: fieldInUse(field.name)}">
+        {{ editor.getField(entity.type, field.name).title }}
       </div>
     </div>
   </fieldset>
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 3e3517aa20d5..9249d3fa2f4c 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -22,5 +22,5 @@
       </li>
     </ul>
   <div class="panel-body" ng-include="'~/afGuiEditor/config-form.html'" ng-if="selectedEntity === null"></div>
-  <div class="panel-body" ng-include="'~/afGuiEditor/config-entity.html'" ng-repeat="entity in entities" ng-if="selectedEntity === entity.name"></div>
+  <div class="panel-body" af-gui-entity="entity" ng-repeat="entity in entities" ng-if="selectedEntity === entity.name"></div>
 </div>

From 3fc5bbff08054cd17c1455ddf69a1566169dcff2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 8 Nov 2019 13:04:21 -0500
Subject: [PATCH 528/834] GUI: Add/remove block buttons

---
 ext/afform/gui/ang/afGuiEditor.css         | 31 +++++++++++++++-------
 ext/afform/gui/ang/afGuiEditor.js          | 25 +++++++++--------
 ext/afform/gui/ang/afGuiEditor/block.html  | 27 +++++++++++++++----
 ext/afform/gui/ang/afGuiEditor/button.html | 28 ++++++++++++-------
 ext/afform/gui/ang/afGuiEditor/text.html   | 24 ++++++++++++-----
 5 files changed, 92 insertions(+), 43 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index c1ceee8f184f..08944397a16b 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -16,6 +16,10 @@
   margin-left: 5px;
 }
 
+#afGuiEditor-canvas .panel-body {
+  padding-top: 5px;
+}
+
 #afGuiEditor #afGuiEditor-palette-tabs li {
   top: 1px;
 }
@@ -67,16 +71,19 @@
 }
 
 #afGuiEditor .af-gui-bar {
+  height: 22px;
+  width: 100%;
+  opacity: 0;
+  transition: opacity 1s 2s;
+  position:relative;
+}
+#afGuiEditor [ui-sortable] .af-gui-bar {
   cursor: move;
   background-color: #efefef;
-  height: 22px;
   position: absolute;
   top: 0;
   left: 0;
-  width: 100%;
   padding-left: 15px;
-  opacity: 0;
-  transition: opacity 1s 2s;
 }
 #afGuiEditor-canvas:hover .af-gui-bar {
   opacity: 1;
@@ -141,7 +148,7 @@
   background-color: #efefef;
 }
 /* grip handle */
-#afGuiEditor .af-gui-bar:before,
+#afGuiEditor [ui-sortable] .af-gui-bar:before,
 #afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover:before {
   background-size: cover;
   background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODg4Ij48L3JlY3Q+Cjwvc3ZnPg==");
@@ -153,12 +160,18 @@
   left: 4px;
   top: 5px;
 }
-
+#afGuiEditor #afGuiEditor-canvas .af-gui-add-canvas-button {
+  border: 2px dashed #0071bd;
+  color: #0071bd;
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
 #afGuiEditor .af-gui-add-block-button span {
   display: inline-block;
-  width: 16px;
-  height: 16px;
-  border: 2px dashed grey;
+  width: 18px;
+  height: 18px;
+  border: 2px dashed #0071bd;
+  color: #0071bd;
 }
 #afGuiEditor .af-gui-add-block-button span i {
   position: relative;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 95b7b26b8f80..eb9009c811e5 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -210,7 +210,7 @@
       restrict: 'A',
       templateUrl: '~/afGuiEditor/entity.html',
       scope: {
-        entity: '=afGuiEntity',
+        entity: '=afGuiEntity'
       },
       require: '^^afGuiEditor',
       link: function ($scope, element, attrs, editor) {
@@ -350,21 +350,20 @@
           return null;
         };
 
-        $scope.addBlock = function(type) {
-          var newBlock = {
-            '#tag': type === 'text' ? 'p' : 'div',
-            'class': 'af-' + type,
-            '#children': type == 'block' ? [] : [{'#text': ts('Enter text')}]
-          };
-          if (type === 'button') {
-            newBlock['#tag'] = 'button';
-            newBlock['class'] += ' btn btn-primary';
-            newBlock['crm-icon'] = 'fa-check';
-            newBlock['ng-click'] = "modelListCtrl.submit()";
-          }
+        $scope.addBlock = function(type, props) {
+          var classes = type.split('.');
+          var newBlock = _.defaults({
+            '#tag': classes.shift(),
+            'class': classes.join(' '),
+            '#children': classes[0] === 'af-block' ? [] : [{'#text': ts('Enter text')}]
+          }, props);
           $scope.node['#children'].push(newBlock);
         };
 
+        this.removeBlock = function(node) {
+          removeRecursive($scope.editor.scope.layout['#children'], {$$hashKey: node.$$hashKey});
+        };
+
         $scope.isSelectedFieldset = function(entityName) {
           return entityName === $scope.editor.getSelectedEntity();
         };
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 28d96ff68c6a..00fad45b9bd2 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -1,4 +1,4 @@
-<div class="af-gui-bar" ng-if="node['#tag'] != 'af-form'" ng-click="selectEntity()" >
+<div class="af-gui-bar" ng-if="node['#tag'] !== 'af-form'" ng-click="selectEntity()" >
   <span ng-if="block.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
   <span>{{ node['#tag'] }}</span>
   <div class="form-inline pull-right">
@@ -7,16 +7,33 @@
         <i class="af-gui-layout-icon {{ opt }}" ></i>
       </button>
     </div>
-    <select ng-model="node['#tag']">
+    <select ng-model="node['#tag']" title="{{ ts('Block type') }}">
       <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
     </select>
     <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
       <span><i class="crm-i fa-plus"></i></span>
     </button>
     <ul class="dropdown-menu">
-      <li><a href ng-click="addBlock('block')">{{ ts('Add block/fieldset') }}</a></li>
-      <li><a href ng-click="addBlock('text')">{{ ts('Add text box') }}</a></li>
-      <li><a href ng-click="addBlock('button')">{{ ts('Add button') }}</a></li>
+      <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
+      <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
+      <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+      <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="af-gui-bar" ng-if="node['#tag'] === 'af-form'" >
+  <div class="form-inline pull-right">
+    <button type="button" class="btn  btn-default btn-sm dropdown-toggle af-gui-add-canvas-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
+      <span>Add <i class="crm-i fa-plus"></i></span>
+    </button>
+    <ul class="dropdown-menu">
+      <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
+      <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
+      <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+      <li role="separator" class="divider"></li>
+      <li ng-repeat="entity in editor.scope.entities">
+        <a href ng-click="addBlock('fieldset.af-block', {'af-fieldset': entity.name})">{{ ts('Fieldset for %1', {1: entity.label}) }}</a>
+      </li>
     </ul>
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
index 996205a13bcf..60d8a0a8c2de 100644
--- a/ext/afform/gui/ang/afGuiEditor/button.html
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -1,15 +1,25 @@
 <div class="af-gui-bar">
   {{ node['#tag'] }}
   <div class="form-inline pull-right">
-    <button type="button" class="btn btn-xs dropdown-toggle {{ getStyle() }}-outline" data-toggle="dropdown" title="{{ ts('Style') }}">
-      <span>{{ styles[getStyle()] }}</span>
-      <i class="crm-i fa-caret-down"></i>
-    </button>
-    <ul class="dropdown-menu">
-      <li ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}">
-        <a href ng-click="setStyle(style)">{{ label }}</a>
-      </li>
-    </ul>
+    <div class="btn-group pull-right">
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+        <span><i class="crm-i fa-gear"></i></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
+      </ul>
+    </div>
+    <div class="btn-group pull-right">
+      <button type="button" class="btn btn-xs dropdown-toggle {{ getStyle() }}-outline" data-toggle="dropdown" title="{{ ts('Style') }}">
+        <span>{{ styles[getStyle()] }}</span>
+        <i class="crm-i fa-caret-down"></i>
+      </button>
+      <ul class="dropdown-menu">
+        <li ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}">
+          <a href ng-click="setStyle(style)">{{ label }}</a>
+        </li>
+      </ul>
+    </div>
   </div>
 </div>
 <button type="button" class="btn {{ getStyle() }}">
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index 85b6889a15d0..f770446d8fe7 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -1,12 +1,22 @@
 <div class="af-gui-bar">
   {{ node['#tag'] }}
-  <select class="pull-right" ng-model="node['#tag']">
-    <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
-  </select>
-  <div class="btn-group btn-group-xs pull-right" role="group">
-    <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
-      <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
-    </button>
+  <div class="form-inline pull-right">
+    <div class="btn-group pull-right">
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+        <span><i class="crm-i fa-gear"></i></span>
+      </button>
+      <ul class="dropdown-menu">
+        <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a></li>
+      </ul>
+    </div>
+    <select class="pull-right" ng-model="node['#tag']" title="{{ ts('Text style') }}">
+      <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+    </select>
+    <div class="btn-group btn-group-xs pull-right" role="group">
+      <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
+        <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
+      </button>
+    </div>
   </div>
 </div>
 <p af-gui-editable ng-model="node['#children'][0]['#text']" class="{{ getAlign() + ' af-gui-text-' + node['#tag'] }}" >

From 9651d93cdb395895a5a40c86e78eccdfb05601d8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 9 Nov 2019 09:07:14 -0500
Subject: [PATCH 529/834] GUI: Entity tab style improvements

---
 ext/afform/gui/ang/afGuiEditor.css         | 49 ++++++++++++++++------
 ext/afform/gui/ang/afGuiEditor/button.html |  2 +-
 ext/afform/gui/ang/afGuiEditor/entity.html | 22 +++++-----
 3 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 08944397a16b..9a3be9332926 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -2,10 +2,6 @@
   display: flex;
 }
 
-#afGuiEditor .panel.panel-default {
-  /*margin-bottom: 0;*/
-}
-
 #afGuiEditor #afGuiEditor-palette {
   flex: 1;
   margin-right: 5px;
@@ -16,8 +12,20 @@
   margin-left: 5px;
 }
 
-#afGuiEditor-canvas .panel-body {
+#afGuiEditor .panel-body {
+  padding: 5px 12px;
+  position: relative;
+}
+
+#afGuiEditor fieldset legend {
   padding-top: 5px;
+  font-size: 16px;
+  margin-bottom: 5px !important;
+}
+
+#afGuiEditor hr {
+  margin-top: 15px;
+  margin-bottom: 10px;
 }
 
 #afGuiEditor #afGuiEditor-palette-tabs li {
@@ -29,9 +37,20 @@
   font-size: 12px;
 }
 
-#afGuiEditor #afGuiEditor-palette-tabs .dropdown-menu {
-  max-height: 500px;
-  overflow-y: auto;
+#afGuiEditor .af-gui-columns {
+  display: flex;
+  position: relative;
+  flex-wrap: wrap;
+}
+#afGuiEditor .af-gui-columns > * {
+  flex: 1;
+  min-width: 200px;
+}
+
+#afGuiEditor .af-gui-remove-entity {
+  position: absolute;
+  right: 3px;
+  top: 3px;
 }
 
 #afGuiEditor .crm-editable-enabled,
@@ -123,10 +142,6 @@
   color: white;
 }
 
-#afGuiEditor .af-gui-entity-fields legend {
-  margin-bottom: 0 !important;
-}
-
 #afGuiEditor [ui-sortable] {
   min-height: 25px;
 }
@@ -208,3 +223,13 @@
   position: relative;
   top: -8px;
 }
+
+#afGuiEditor .af-gui-button > .btn.disabled {
+  cursor: default !important;
+  color: white !important;
+}
+
+#afGuiEditor .af-gui-button > .btn-default.disabled {
+  background-color: lightgrey !important;
+}
+
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
index 60d8a0a8c2de..391130c45a4f 100644
--- a/ext/afform/gui/ang/afGuiEditor/button.html
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -22,7 +22,7 @@
     </div>
   </div>
 </div>
-<button type="button" class="btn {{ getStyle() }}">
+<button type="button" class="btn {{ getStyle() }} disabled">
   <span class="crm-editable-enabled" ng-click="pickIcon()" >
     <i class="crm-i {{ node['crm-icon'] }}"></i>
   </span>
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index 558110b11b78..3359340867e0 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -1,17 +1,14 @@
-<div>
-  <a href ng-click="editor.removeEntity(entity.name)" class="btn btn-sm btn-danger-outline pull-right">
-    <i class="crm-i fa-trash"></i>
-  </a>
-
+<div class="af-gui-columns">
   <fieldset class="af-gui-entity-values">
     <legend>{{ ts('Values') }}</legend>
     <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
-      <label>{{ editor.getField(entity.type, fieldName).title }}:</label>
+      <label>{{ editor.getField(entity.type, fieldName).title }}:</label><br />
       <input class="form-control" af-gui-field-value="editor.getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
-      <a href class="pull-right" ng-click="removeValue(entity, fieldName)">
+      <a href class="" ng-click="removeValue(entity, fieldName)">
         <i class="crm-i fa-times"></i>
       </a>
     </div>
+    <hr />
     <div class="form-inline">
       <input class="form-control" ng-model="controls.addValue" crm-ui-select="{data: valuesFields}" placeholder="Add value" />
     </div>
@@ -31,9 +28,12 @@
       </div>
     </div>
   </fieldset>
+</div>
 
-  <fieldset>
-    <legend>{{ ts('Options') }}</legend>
-  </fieldset>
+<a href ng-click="editor.removeEntity(entity.name)" class="btn btn-sm btn-danger-outline af-gui-remove-entity" title="{{ ts('Remove %1', {1: entity.type}) }}">
+  <i class="crm-i fa-trash"></i>
+</a>
 
-</div>
+<fieldset>
+  <legend>{{ ts('Options') }}</legend>
+</fieldset>

From 1b745abc504486a34b1ce1b52051dec70a0601a4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 11 Nov 2019 22:20:12 -0500
Subject: [PATCH 530/834] GUI: Entity config

---
 ext/afform/gui/afform_gui.php                 | 63 +++++++++----------
 ext/afform/gui/ang/afGuiEditor.js             | 18 ++++--
 ext/afform/gui/ang/afGuiEditor/entity.html    |  3 +-
 .../afGuiEditor/entityConfig/Activity.html    |  1 +
 .../ang/afGuiEditor/entityConfig/Contact.html | 10 +++
 .../ang/afGuiEditor/entityConfig/Generic.html |  6 ++
 .../afGuiEditor/entityDefaults/Activity.json  |  5 ++
 .../afGuiEditor/entityDefaults/Contact.json   |  9 +++
 8 files changed, 77 insertions(+), 38 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json
 create mode 100644 ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json

diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 5aef321d4002..1994e9be980e 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -160,44 +160,41 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     return;
   }
 
-  // Things that can't be handled by afform. TODO: Need a better way to do this. Maybe add core metadata about what each entity is for, and filter on that.
-  $entityBlacklist = [
-    'ACL',
-    'ActionSchedule',
-    'ActivityContact',
-    'Afform%',
-    'CaseContact',
-    'EntityTag',
-    'GroupContact',
-    'GroupNesting',
-    'GroupOrganization',
-    'Setting',
-    'System',
-    'UF%',
-  ];
-  $entityApi = Civi\Api4\Entity::get()
-    ->setCheckPermissions(FALSE)
-    ->setSelect(['name', 'description']);
-  foreach ($entityBlacklist as $nono) {
-    $entityApi->addWhere('name', 'NOT LIKE', $nono);
+  $entityWhitelist = $data = [];
+
+  // First scan the entityDefaults directory for our list of supported entities
+  // FIXME: Need a way to load this from other extensions too
+  foreach (glob(__DIR__ . '/ang/afGuiEditor/entityDefaults/*.json') as $file) {
+    $matches = [];
+    preg_match('/([-a-z_A-Z0-9]*).json/', $file, $matches);
+    $entityWhitelist[] = $entity = $matches[1];
+    // No json_decode, the files are not strict json and will go through angular.$parse clientside
+    $data['defaults'][$entity] = trim(CRM_Utils_JS::stripComments(file_get_contents($file)));
   }
 
-  $contactFields = Civi\Api4\Contact::getFields()
+  $data['entities'] = (array) Civi\Api4\Entity::get()
     ->setCheckPermissions(FALSE)
-    ->setIncludeCustom(TRUE)
-    ->setLoadOptions(TRUE)
-    ->setAction('create')
-    ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'options'])
+    ->setSelect(['name', 'description'])
+    ->addWhere('name', 'IN', $entityWhitelist)
     ->execute();
 
-  $contactSettings = [
-    'data' => [],
-  ];
+  foreach ($entityWhitelist as $entityName) {
+    $api = 'Civi\\Api4\\' . $entityName;
+    $data['fields'][$entityName] = (array) $api::getFields()
+      ->setCheckPermissions(FALSE)
+      ->setIncludeCustom(TRUE)
+      ->setLoadOptions(TRUE)
+      ->setAction('create')
+      ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'options'])
+      ->addWhere('input_type', 'IS NOT NULL')
+      ->execute()
+      ->indexBy('name');
+  }
+
+  // Now adjust the field metadata
+  // FIXME: This should probably be a callback event or something to allow extensions to tweak the metadata for their entities
+  $data['fields']['Contact']['contact_type']['required_data'] = TRUE;
 
   $mimeType = 'text/javascript';
-  $content = "CRM.afformAdminData={";
-  $content .= 'entities:' . json_encode((array) $entityApi->execute(), JSON_UNESCAPED_SLASHES) . ',';
-  $content .= 'fields:' . json_encode(['Contact' => (array) $contactFields], JSON_UNESCAPED_SLASHES) . ',';
-  $content .= 'settings:' . json_encode(['Contact' => $contactSettings], JSON_UNESCAPED_SLASHES);
-  $content .= '}';
+  $content = "CRM.afformAdminData=" . json_encode($data, JSON_UNESCAPED_SLASHES) . ';';
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index eb9009c811e5..7322a8367d77 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -87,12 +87,12 @@
           while (_.contains(existingEntitiesofThisType, entityType + num)) {
             num++;
           }
-          $scope.entities[entityType + num] = {
+          $scope.entities[entityType + num] = _.assign($parse(this.meta.defaults[entityType])($scope), {
             '#tag': 'af-entity',
             type: entityType,
             name: entityType + num,
             label: entityType + ' ' + num
-          };
+          });
           $scope.layout['#children'].unshift($scope.entities[entityType + num]);
           $scope.layout['#children'].push({
             '#tag': 'fieldset',
@@ -124,7 +124,7 @@
         };
 
         this.getField = function(entityType, fieldName) {
-          return _.filter($scope.meta.fields[entityType], {name: fieldName})[0];
+          return $scope.meta.fields[entityType][fieldName];
         };
 
         this.getEntity = function(entityName) {
@@ -151,6 +151,16 @@
             });
         };
 
+        $scope.$watch('afform.title', function(newTitle, oldTitle) {
+          if (typeof oldTitle === 'string') {
+            _.each($scope.entities, function(entity) {
+              if (entity.data && entity.data.source === oldTitle) {
+                entity.data.source = newTitle;
+              }
+            });
+          }
+        });
+
         // Parse strings of javascript that php couldn't interpret
         function evaluate(collection) {
           _.each(collection, function(item) {
@@ -505,7 +515,7 @@
         };
 
         $scope.setStyle = function(val) {
-          $scope.block.modifyClasses($scope.node, _.keys($scope.styles), val);
+          $scope.block.modifyClasses($scope.node, _.keys($scope.styles), ['btn', val]);
         };
 
         $scope.pickIcon = function() {
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index 3359340867e0..6c86b85927e0 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -4,7 +4,7 @@
     <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
       <label>{{ editor.getField(entity.type, fieldName).title }}:</label><br />
       <input class="form-control" af-gui-field-value="editor.getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
-      <a href class="" ng-click="removeValue(entity, fieldName)">
+      <a href class="" ng-click="removeValue(entity, fieldName)" ng-if="!editor.getField(entity.type, fieldName).required_data">
         <i class="crm-i fa-times"></i>
       </a>
     </div>
@@ -36,4 +36,5 @@
 
 <fieldset>
   <legend>{{ ts('Options') }}</legend>
+  <div ng-include="'~/afGuiEditor/entityConfig/' + entity.type + '.html'"></div>
 </fieldset>
diff --git a/ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html b/ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html
new file mode 100644
index 000000000000..15e56f1cbeac
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html
@@ -0,0 +1 @@
+<div ng-include="'~/afGuiEditor/entityConfig/Generic.html'"></div>
diff --git a/ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html b/ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html
new file mode 100644
index 000000000000..252b9c345795
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html
@@ -0,0 +1,10 @@
+<div ng-include="'~/afGuiEditor/entityConfig/Generic.html'"></div>
+<div class="form-inline">
+  <label>
+    {{ ts('Autofill as:') }}
+  </label>
+  <select ng-model="entity.autofill" class="form-control">
+    <option value="">{{ ts('None') }}</option>
+    <option value="user">{{ ts('Current User') }}</option>
+  </select>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html b/ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html
new file mode 100644
index 000000000000..88db90cd9cdf
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html
@@ -0,0 +1,6 @@
+<div class="checkbox">
+  <label>
+    <input type="checkbox" ng-model="entity['url-autofill']" ng-true-value="'1'" ng-false-value="'0'" />
+    {{ ts('Allow url autofill') }}
+  </label>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json b/ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json
new file mode 100644
index 000000000000..41288d8351ef
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json
@@ -0,0 +1,5 @@
+// Default values for creating a new entity.
+// Note this is not strict JSON - it passes through angular.$parse - $scope variables are available.
+{
+  'url-autofill': '1'
+}
diff --git a/ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json b/ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json
new file mode 100644
index 000000000000..2ffa07722089
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json
@@ -0,0 +1,9 @@
+// Default values for creating a new entity.
+// Note this is not strict JSON - it passes through angular.$parse - $scope variables are available.
+{
+  data: {
+    contact_type: 'Individual',
+    source: afform.title
+  },
+  'url-autofill': '1'
+}

From 19b9bdb35ea89c891bae8cc9617702d4bccf2b90 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 12 Nov 2019 07:30:54 -0500
Subject: [PATCH 531/834] Core: Set breadcrumb as well as title

---
 ext/afform/core/CRM/Afform/Page/AfformBase.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 3ccc1e50ccdc..3ae5a722858d 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -22,7 +22,9 @@ public function run() {
     $afform = civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $module]], 'select' => ['title']]);
 
     if (!empty($afform[0]['title'])) {
-      CRM_Utils_System::setTitle(strip_tags($afform[0]['title']));
+      $title = strip_tags($afform[0]['title']);
+      CRM_Utils_System::setTitle($title);
+      CRM_Utils_System::appendBreadCrumb([['title' => $title, 'url' => CRM_Utils_System::url(implode('/', $pagePath), NULL, FALSE, '/')]]);
     }
 
     parent::run();

From 2c33aefd3e52b87c4d62ce19fca617ca4fb3b043 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 13 Nov 2019 10:28:00 -0500
Subject: [PATCH 532/834] Perform deep merge on fieldDefn.input_attrs

---
 ext/afform/core/afform.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 7e00dedab56b..20fe6b1e7767 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -322,19 +322,24 @@ function afform_civicrm_alterAngular($angular) {
           'loadOptions' => TRUE,
         ]);
         // Merge field definition data with whatever's already in the markup
-        foreach ($getFields as $field) {
+        $deep = ['input_attrs'];
+        foreach ($getFields as $fieldInfo) {
           $existingFieldDefn = trim(pq($afField)->attr('defn') ?: '');
           if ($existingFieldDefn && $existingFieldDefn[0] != '{') {
             // If it's not an object, don't mess with it.
             continue;
           }
-          foreach ($field as &$prop) {
-            $prop = htmlspecialchars(CRM_Utils_JS::encode($prop));
+          $fieldDefn = $existingFieldDefn ? CRM_Utils_JS::getRawProps($existingFieldDefn) : [];
+          foreach ($fieldInfo as $name => $prop) {
+            // Merge array props 1 level deep
+            if (in_array($name, $deep) && !empty($fieldDefn[$name])) {
+              $fieldDefn[$name] = CRM_Utils_JS::writeObject(CRM_Utils_JS::getRawProps($fieldDefn[$name]) + array_map(['CRM_Utils_JS', 'encode'], $prop));
+            }
+            elseif (!isset($fieldDefn[$name])) {
+              $fieldDefn[$name] = CRM_Utils_JS::encode($prop);
+            }
           }
-          if ($existingFieldDefn) {
-            $field = array_merge($field, CRM_Utils_JS::getRawProps($existingFieldDefn));
-          }
-          pq($afField)->attr('defn', CRM_Utils_JS::writeObject($field));
+          pq($afField)->attr('defn', htmlspecialchars(CRM_Utils_JS::writeObject($fieldDefn)));
         }
       }
     });

From 4bd440535e67a948a6e5ac2d4c8fc8e261b46a21 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 12 Nov 2019 16:58:55 -0500
Subject: [PATCH 533/834] GUI: Config fields

---
 ext/afform/core/ang/afField/afField.html      |   2 +
 .../core/ang/afField/widgets/Number.html      |   2 +-
 .../core/ang/afField/widgets/Select.html      |   2 +-
 ext/afform/core/ang/afField/widgets/Text.html |   2 +-
 ext/afform/gui/afform_gui.php                 |  10 +-
 ext/afform/gui/ang/afGuiEditor.css            |  93 +++++++++++++++++-
 ext/afform/gui/ang/afGuiEditor.js             |  80 +++++++++++++--
 ext/afform/gui/ang/afGuiEditor/block.html     |   4 +-
 ext/afform/gui/ang/afGuiEditor/button.html    |  21 ++--
 ext/afform/gui/ang/afGuiEditor/field.html     |  54 +++++++++-
 ext/afform/gui/ang/afGuiEditor/main.html      |   1 -
 ext/afform/gui/ang/afGuiEditor/text.html      |  33 ++++---
 .../gui/ang/afGuiEditor/widgets/CheckBox.html |   7 ++
 .../gui/ang/afGuiEditor/widgets/Date.html     |   5 +
 .../gui/ang/afGuiEditor/widgets/Number.html   |   1 +
 .../gui/ang/afGuiEditor/widgets/Radio.html    |   4 +
 .../afGuiEditor/widgets/RichTextEditor.html   |   1 +
 .../gui/ang/afGuiEditor/widgets/Select.html   |   1 +
 .../gui/ang/afGuiEditor/widgets/Text.html     |   1 +
 .../gui/ang/afGuiEditor/widgets/TextArea.html |   1 +
 ext/afform/gui/images/number.png              | Bin 0 -> 152 bytes
 21 files changed, 277 insertions(+), 48 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Date.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Number.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Radio.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Select.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Text.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html
 create mode 100644 ext/afform/gui/images/number.png

diff --git a/ext/afform/core/ang/afField/afField.html b/ext/afform/core/ang/afField/afField.html
index 30fd1ed6a79e..79a0703b9301 100644
--- a/ext/afform/core/ang/afField/afField.html
+++ b/ext/afform/core/ang/afField/afField.html
@@ -1,4 +1,6 @@
 <label class="crm-af-field-label" ng-if="defn.title" for="{{ fieldId }}">
   {{ defn.title }}
 </label>
+<p class="crm-af-field-help-pre" ng-if="defn.help_pre">{{ defn.help_pre }}</p>
 <div class="crm-af-field" ng-include="'~/afField/widgets/' + defn.input_type + '.html'"></div>
+<p class="crm-af-field-help-post" ng-if="defn.help_post">{{ defn.help_post }}</p>
diff --git a/ext/afform/core/ang/afField/widgets/Number.html b/ext/afform/core/ang/afField/widgets/Number.html
index d04da0659556..2028c402c56b 100644
--- a/ext/afform/core/ang/afField/widgets/Number.html
+++ b/ext/afform/core/ang/afField/widgets/Number.html
@@ -1 +1 @@
-<input class="crm-form-text" type="number" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input class="crm-form-text" type="number" id="{{ fieldId }}" ng-model="getData()[fieldName]" placeholder="{{ defn.input_attrs.placeholder }}" />
diff --git a/ext/afform/core/ang/afField/widgets/Select.html b/ext/afform/core/ang/afField/widgets/Select.html
index 01ae74fbe8b6..c0812ab4e4ca 100644
--- a/ext/afform/core/ang/afField/widgets/Select.html
+++ b/ext/afform/core/ang/afField/widgets/Select.html
@@ -1 +1 @@
-<input crm-ui-select="{data: getOptions, multiple: defn.input_attrs.multiple}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-select="{data: getOptions, multiple: defn.input_attrs.multiple, placeholder: defn.input_attrs.placeholder}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/core/ang/afField/widgets/Text.html b/ext/afform/core/ang/afField/widgets/Text.html
index 6f94d24a59fb..619196a07324 100644
--- a/ext/afform/core/ang/afField/widgets/Text.html
+++ b/ext/afform/core/ang/afField/widgets/Text.html
@@ -1 +1 @@
-<input class="crm-form-text" type="text" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input class="crm-form-text" type="text" id="{{ fieldId }}" ng-model="getData()[fieldName]" placeholder="{{ defn.input_attrs.placeholder }}" />
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 1994e9be980e..e63047898f8e 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -185,7 +185,7 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
       ->setIncludeCustom(TRUE)
       ->setLoadOptions(TRUE)
       ->setAction('create')
-      ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'options'])
+      ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize'])
       ->addWhere('input_type', 'IS NOT NULL')
       ->execute()
       ->indexBy('name');
@@ -195,6 +195,14 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   // FIXME: This should probably be a callback event or something to allow extensions to tweak the metadata for their entities
   $data['fields']['Contact']['contact_type']['required_data'] = TRUE;
 
+  // Scan for input types
+  // FIXME: Need a way to load this from other extensions too
+  foreach (glob(__DIR__ . '/ang/afGuiEditor/widgets/*.html') as $file) {
+    $matches = [];
+    preg_match('/([-a-z_A-Z0-9]*).html/', $file, $matches);
+    $data['widgets'][$matches[1]] = $matches[1];
+  }
+
   $mimeType = 'text/javascript';
   $content = "CRM.afformAdminData=" . json_encode($data, JSON_UNESCAPED_SLASHES) . ';';
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 9a3be9332926..6ed42502d08b 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -95,10 +95,12 @@
   opacity: 0;
   transition: opacity 1s 2s;
   position:relative;
+  font-family: "Courier New", Courier, monospace;
+  font-size: 12px;
 }
 #afGuiEditor [ui-sortable] .af-gui-bar {
   cursor: move;
-  background-color: #efefef;
+  background-color: #f2f2f2;
   position: absolute;
   top: 0;
   left: 0;
@@ -118,12 +120,17 @@
 
 #afGuiEditor .af-gui-element {
   position: relative;
-  padding: 22px 3px 3px;
-  min-height: 40px;
+  padding: 0 3px 3px;
 }
 
 #afGuiEditor .af-gui-block {
   border: 2px dashed transparent;
+  padding-top: 22px;
+  min-height: 40px;
+}
+
+#afGuiEditor .af-gui-block-type-fieldset {
+  box-shadow: 0 0 5px #bbbbbb;
 }
 
 #afGuiEditor .af-gui-block:hover {
@@ -224,12 +231,92 @@
   top: -8px;
 }
 
+#afGuiEditor .af-gui-button {
+  padding-left: 15px;
+}
+
 #afGuiEditor .af-gui-button > .btn.disabled {
   cursor: default !important;
   color: white !important;
 }
+#afGuiEditor .af-gui-button > .btn.disabled .crm-editable-enabled:hover:not(:focus) {
+  border-color: #f4f4f4 !important;
+}
 
 #afGuiEditor .af-gui-button > .btn-default.disabled {
   background-color: lightgrey !important;
 }
 
+#afGuiEditor .af-gui-node-title {
+  margin-left: 5px;
+  margin-right: 20px;
+  position: relative;
+}
+
+#afGuiEditor .af-gui-field-required:after {
+  content: '*';
+  color: #cf3458;
+  position: relative;
+  left: -4px;
+}
+
+#afGuiEditor li a.af-gui-field-select-in-dropdown {
+  padding-top: 2px;
+  padding-bottom: 2px;
+  background-color: white !important;
+  cursor: default;
+}
+
+#afGuiEditor .af-gui-field-widget input[type=text].form-control {
+  color: #9a9a9a;
+}
+
+#afGuiEditor .af-gui-field-widget-number input[type=text].form-control {
+  background-image: url('../images/number.png');
+  background-repeat: no-repeat;
+  background-position: center right 6px;
+}
+
+#afGuiEditor .af-gui-field-widget input.crm-form-date {
+  width: 140px;
+  margin-right: -2px;
+}
+#afGuiEditor .af-gui-field-widget input.crm-form-time {
+  width: 80px;
+}
+
+#afGuiEditor .af-gui-text-h1 {
+  font-weight: bolder;
+  font-size: 16px;
+}
+
+#afGuiEditor .af-gui-text-h2 {
+  font-weight: bold;
+  font-size: 15px;
+}
+
+#afGuiEditor .af-gui-text-legend,
+#afGuiEditor .af-gui-text-h3 {
+  font-weight: bold;
+  font-size: 14px;
+}
+
+#afGuiEditor .af-gui-text-legend {
+  text-decoration: underline;
+}
+
+#afGuiEditor .af-gui-text-h4 {
+  font-weight: bold;
+}
+
+#afGuiEditor .af-gui-text-h5 {
+  font-weight: 600;
+}
+
+#afGuiEditor .af-gui-text-h6 {
+  font-weight: 500;
+}
+
+#afGuiEditor .af-gui-field-help {
+  font-style: italic;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 7322a8367d77..542473f94bb7 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -422,11 +422,13 @@
         node: '=afGuiField',
         entityName: '='
       },
-      require: '^^afGuiEditor',
-      link: function($scope, element, attrs, editor) {
-        $scope.editor = editor;
+      require: ['^^afGuiEditor', '^^afGuiBlock'],
+      link: function($scope, element, attrs, ctrls) {
+        $scope.editor = ctrls[0];
+        $scope.block = ctrls[1];
       },
       controller: function($scope) {
+        var ts = $scope.ts = CRM.ts();
 
         $scope.getEntity = function() {
           return $scope.editor ? $scope.editor.getEntity($scope.entityName) : {};
@@ -435,6 +437,68 @@
         $scope.getDefn = function() {
           return $scope.editor ? $scope.editor.getField($scope.getEntity().type, $scope.node.name) : {};
         };
+
+        $scope.getOptions = function() {
+          return {
+            results: _.transform($scope.getProp('options'), function(result, val, key) {
+              result.push({id: key, text: val});
+            }, [])
+          };
+        };
+
+        $scope.getProp = function(propName) {
+          var path = propName.split('.'),
+            item = path.pop(),
+            localDefn = drillDown($scope.node.defn || {}, path);
+          if (typeof localDefn[item] !== 'undefined') {
+            return localDefn[item];
+          }
+          return drillDown($scope.getDefn(), path)[item];
+        };
+
+        $scope.toggleRequired = function() {
+          getSet('required', !getSet('required'));
+          return false;
+        };
+
+        $scope.toggleHelp = function(position) {
+          getSet('help_' + position, getSet('help_' + position) === null ? ($scope.getDefn()['help_' + position] || ts('Enter text')) : null);
+          return false;
+        };
+
+        // Getter/setter for definition props
+        $scope.getSet = function(propName) {
+          return _.wrap(propName, getSet);
+        };
+
+        // Returns a reference to a path n-levels deep within an object
+        function drillDown(parent, path) {
+          var container = parent;
+          _.each(path, function(level) {
+            container[level] = container[level] || {};
+            container = container[level];
+          });
+          return container;
+        }
+
+        // Getter/setter callback
+        function getSet(propName, val) {
+          if (arguments.length > 1) {
+            var path = propName.split('.'),
+              item = path.pop(),
+              localDefn = drillDown($scope.node, ['defn'].concat(path)),
+              fieldDefn = drillDown($scope.getDefn(), path);
+            // Set the value if different than the field defn, otherwise unset it
+            if (typeof val !== 'undefined' && val !== fieldDefn[item]) {
+              localDefn[item] = val;
+            } else {
+              delete localDefn[item];
+            }
+            return val;
+          }
+          return $scope.getProp(propName);
+        }
+
       }
     };
   });
@@ -510,14 +574,14 @@
           'btn-danger': ts('Danger')
         };
 
-        $scope.getStyle = function() {
+        // Getter/setter for ng-model
+        $scope.getSetStyle = function(val) {
+          if (arguments.length) {
+            return $scope.block.modifyClasses($scope.node, _.keys($scope.styles), ['btn', val]);
+          }
           return _.intersection(splitClass($scope.node['class']), _.keys($scope.styles))[0] || '';
         };
 
-        $scope.setStyle = function(val) {
-          $scope.block.modifyClasses($scope.node, _.keys($scope.styles), ['btn', val]);
-        };
-
         $scope.pickIcon = function() {
           editingIcon = $scope.node;
           $('#af-gui-icon-picker ~ .crm-icon-picker-button').click();
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 00fad45b9bd2..11c28be13b15 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -40,8 +40,8 @@
 <div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in node['#children']" ng-show="block.getNodeType(item)">
     <div ng-switch="block.getNodeType(item)">
-      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-element af-gui-block af-gui-fieldset" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
-      <div ng-switch-when="block" af-gui-block="item" class="af-gui-element af-gui-block" entity-name="entityName" />
+      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-element af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
+      <div ng-switch-when="block" af-gui-block="item" class="af-gui-element af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
       <div ng-switch-when="field" af-gui-field="item" class="af-gui-element af-gui-field" entity-name="entityName" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
       <div ng-switch-when="button" af-gui-button="item" class="af-gui-element af-gui-button" />
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
index 391130c45a4f..f566c9b1874e 100644
--- a/ext/afform/gui/ang/afGuiEditor/button.html
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -1,28 +1,23 @@
 <div class="af-gui-bar">
-  {{ node['#tag'] }}
   <div class="form-inline pull-right">
     <div class="btn-group pull-right">
       <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
       <ul class="dropdown-menu">
-        <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
-      </ul>
-    </div>
-    <div class="btn-group pull-right">
-      <button type="button" class="btn btn-xs dropdown-toggle {{ getStyle() }}-outline" data-toggle="dropdown" title="{{ ts('Style') }}">
-        <span>{{ styles[getStyle()] }}</span>
-        <i class="crm-i fa-caret-down"></i>
-      </button>
-      <ul class="dropdown-menu">
-        <li ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}">
-          <a href ng-click="setStyle(style)">{{ label }}</a>
+        <li title="{{ ts('Button style') }}">
+          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown" >
+            <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}">
+              <option ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}" value="{{ style }}">{{ ts('Color: %1', {1: label}) }}</option>
+            </select>
+          </a>
         </li>
+        <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
       </ul>
     </div>
   </div>
 </div>
-<button type="button" class="btn {{ getStyle() }} disabled">
+<button type="button" class="btn {{ getSetStyle() }} disabled">
   <span class="crm-editable-enabled" ng-click="pickIcon()" >
     <i class="crm-i {{ node['crm-icon'] }}"></i>
   </span>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index 01cc02d74acb..0085c9f8d456 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -1,7 +1,51 @@
-<div class="af-gui-bar">
-  <span>{{ getEntity().label + ': ' + getDefn().title }}</span>
+<div class="af-gui-bar" title="{{ getEntity().label + ': ' + getDefn().title }}">
+  <div class="form-inline pull-right">
+
+    <div class="btn-group">
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+        <span><i class="crm-i fa-gear"></i></span>
+      </button>
+      <ul class="dropdown-menu dropdown-menu-right">
+        <li title="{{ ts('Field type') }}">
+          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
+            <select class="form-control" ng-model="getSet('input_type')" ng-model-options="{getterSetter: true}">
+              <option ng-repeat="(opt, label) in editor.meta.widgets" value="{{ opt }}">{{ label }}</option>
+            </select>
+          </a>
+        </li>
+        <li title="{{ ts('Require this field') }}">
+          <a href ng-click="toggleRequired(); $event.stopPropagation();">
+            <i class="crm-i" ng-class="{'fa-square-o': !getProp('required'), 'fa-check-square-o': getProp('required')}"></i>
+            {{ ts('Required') }}
+          </a>
+        </li>
+        <li title="{{ ts('Show help text above this field') }}">
+          <a href ng-click="toggleHelp('pre'); $event.stopPropagation();">
+            <i class="crm-i" ng-class="{'fa-square-o': !getProp('help_pre'), 'fa-check-square-o': getProp('help_pre')}"></i>
+            {{ ts('Pre help text') }}
+          </a>
+        </li>
+        <li title="{{ ts('Show help text below this field') }}">
+          <a href ng-click="toggleHelp('post'); $event.stopPropagation();">
+            <i class="crm-i" ng-class="{'fa-square-o': !getProp('help_post'), 'fa-check-square-o': getProp('help_post')}"></i>
+            {{ ts('Post help text') }}
+          </a>
+        </li>
+        <li title="{{ ts('Remove field from form') }}">
+          <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this field') }}</span></a>
+        </li>
+      </ul>
+    </div>
+  </div>
 </div>
-<div>
-  <label af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ node.defn.title || getDefn().title }}</label>
-  <input class="form-control" disabled placeholder="{{ node.name }}" />
+<label ng-class="{'af-gui-field-required': getProp('required')}" class="af-gui-node-title">
+  <span af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ getProp('title') }}</span>
+</label>
+<div class="af-gui-field-help" ng-if="getProp('help_pre') !== null">
+  <span af-gui-editable ng-model="node.defn.help_pre" default-value="getDefn().help_pre">{{ getProp('help_pre') }}</span>
 </div>
+<div class="af-gui-field-widget af-gui-field-widget-{{ getProp('input_type').toLowerCase() }}" ng-include="'~/afGuiEditor/widgets/' + getProp('input_type') + '.html'"></div>
+<div class="af-gui-field-help" ng-if="getProp('help_post') !== null">
+  <span af-gui-editable ng-model="node.defn.help_post" default-value="getDefn().help_post">{{ getProp('help_post') }}</span>
+</div>
+
diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/gui/ang/afGuiEditor/main.html
index f7ff60ff4dfe..f89bbe1283f9 100644
--- a/ext/afform/gui/ang/afGuiEditor/main.html
+++ b/ext/afform/gui/ang/afGuiEditor/main.html
@@ -1,7 +1,6 @@
 <div crm-ui-debug="afform"></div>
 <div crm-ui-debug="layout"></div>
 <div crm-ui-debug="entities"></div>
-<div crm-ui-debug="fieldList"></div>
 <div crm-ui-debug="meta"></div>
 <div id="bootstrap-theme">
   <div id="afGuiEditor">
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index f770446d8fe7..0b6546179003 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -1,24 +1,33 @@
 <div class="af-gui-bar">
-  {{ node['#tag'] }}
   <div class="form-inline pull-right">
     <div class="btn-group pull-right">
       <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
       <ul class="dropdown-menu">
-        <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a></li>
+        <li title="{{ ts('Text style') }}">
+          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
+            <select class="form-control" ng-model="node['#tag']">
+              <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+            </select>
+          </a>
+        </li>
+        <li>
+          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
+            <div class="btn-group btn-group-sm" role="group">
+              <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
+                <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
+              </button>
+            </div>
+          </a>
+        </li>
+        <li>
+          <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
+        </li>
       </ul>
     </div>
-    <select class="pull-right" ng-model="node['#tag']" title="{{ ts('Text style') }}">
-      <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
-    </select>
-    <div class="btn-group btn-group-xs pull-right" role="group">
-      <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
-        <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
-      </button>
-    </div>
   </div>
 </div>
-<p af-gui-editable ng-model="node['#children'][0]['#text']" class="{{ getAlign() + ' af-gui-text-' + node['#tag'] }}" >
-  {{ node['#children'][0]['#text'] }}
+<p class="af-gui-node-title {{ getAlign() + ' af-gui-text-' + node['#tag'] }}" >
+  <span af-gui-editable ng-model="node['#children'][0]['#text']">{{ node['#children'][0]['#text'] }}</span>
 </p>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html b/ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html
new file mode 100644
index 000000000000..27086e17f179
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html
@@ -0,0 +1,7 @@
+<ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="getProp('options')">
+  <li ng-repeat="(key, val) in getProp('options')" >
+    <input type="checkbox" disabled />
+    <label >{{ val }}</label>
+  </li>
+</ul>
+<input type="checkbox" disabled ng-if="!getProp('options')" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Date.html b/ext/afform/gui/ang/afGuiEditor/widgets/Date.html
new file mode 100644
index 000000000000..aebd73d42f94
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/Date.html
@@ -0,0 +1,5 @@
+<div class="form-inline">
+  <input class="form-control crm-form-date" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+  <span class="addon fa fa-calendar"></span>
+  <input ng-if="getProp('input_attrs.time')" class="form-control crm-form-time" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" />
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Number.html b/ext/afform/gui/ang/afGuiEditor/widgets/Number.html
new file mode 100644
index 000000000000..bfb984aece8a
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/Number.html
@@ -0,0 +1 @@
+<input class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Radio.html b/ext/afform/gui/ang/afGuiEditor/widgets/Radio.html
new file mode 100644
index 000000000000..405007756276
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/Radio.html
@@ -0,0 +1,4 @@
+<label ng-repeat="(key, val) in getProp('options')" >
+  <input class="crm-form-radio" type="radio" disabled value="{{ key }}" />
+  {{ val }}
+</label>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html b/ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html
new file mode 100644
index 000000000000..81acfcd98e69
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html
@@ -0,0 +1 @@
+<textarea class="crm-form-textarea" disabled ></textarea>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Select.html b/ext/afform/gui/ang/afGuiEditor/widgets/Select.html
new file mode 100644
index 000000000000..d096b8a9ef53
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/Select.html
@@ -0,0 +1 @@
+<input crm-ui-select="{data: getOptions, multiple: defn.input_attrs.multiple}" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Text.html b/ext/afform/gui/ang/afGuiEditor/widgets/Text.html
new file mode 100644
index 000000000000..bfb984aece8a
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/Text.html
@@ -0,0 +1 @@
+<input class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html b/ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html
new file mode 100644
index 000000000000..81acfcd98e69
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html
@@ -0,0 +1 @@
+<textarea class="crm-form-textarea" disabled ></textarea>
diff --git a/ext/afform/gui/images/number.png b/ext/afform/gui/images/number.png
new file mode 100644
index 0000000000000000000000000000000000000000..357b11c21dcc60cab120a300dcdb20d884b760b9
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^d_XM7!2~3eR&kvGQk(@Ik;M!Q+`=Ht$S`Y;1W?e+
z)5S4F<9za;A0L&O3mZBcGaP1K`thS;(G;gEiJ@m(PTTlg^{IGr!9{{SG2tPT&X4Be
xhlg4td|btjY8`6v<_lIA4x4On^`cG;<JDPmI|>!ol>kj;@O1TaS?83{1OQ{WG0gw~

literal 0
HcmV?d00001


From b4def6e91903786e5b2de9fe7242aecd8bc067f8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 14 Nov 2019 14:07:37 -0500
Subject: [PATCH 534/834] Edit option lists

---
 ext/afform/core/afform.php                    |   5 +
 ext/afform/core/ang/afField/afField.js        |  14 +-
 .../core/ang/afField/widgets/CheckBox.html    |   8 +-
 .../core/ang/afField/widgets/Radio.html       |   6 +-
 .../core/ang/afField/widgets/Select.html      |   2 +-
 ext/afform/gui/afform_gui.php                 |  16 +-
 ext/afform/gui/ang/afGuiEditor.css            |  89 ++++++++++-
 ext/afform/gui/ang/afGuiEditor.js             | 148 ++++++++++++++++--
 ext/afform/gui/ang/afGuiEditor/block.html     |  15 +-
 ext/afform/gui/ang/afGuiEditor/button.html    |   5 +-
 .../gui/ang/afGuiEditor/editOptions.html      |  30 ++++
 ext/afform/gui/ang/afGuiEditor/field.html     | 110 +++++++------
 .../ang/afGuiEditor/inputType/CheckBox.html   |   7 +
 .../gui/ang/afGuiEditor/inputType/Date.html   |   5 +
 .../gui/ang/afGuiEditor/inputType/Number.html |   1 +
 .../gui/ang/afGuiEditor/inputType/Radio.html  |   6 +
 .../afGuiEditor/inputType/RichTextEditor.html |   1 +
 .../gui/ang/afGuiEditor/inputType/Select.html |   1 +
 .../gui/ang/afGuiEditor/inputType/Text.html   |   1 +
 .../ang/afGuiEditor/inputType/TextArea.html   |   1 +
 ext/afform/gui/ang/afGuiEditor/text.html      |   5 +-
 .../gui/ang/afGuiEditor/widgets/CheckBox.html |   7 -
 .../gui/ang/afGuiEditor/widgets/Date.html     |   5 -
 .../gui/ang/afGuiEditor/widgets/Number.html   |   1 -
 .../gui/ang/afGuiEditor/widgets/Radio.html    |   4 -
 .../afGuiEditor/widgets/RichTextEditor.html   |   1 -
 .../gui/ang/afGuiEditor/widgets/Select.html   |   1 -
 .../gui/ang/afGuiEditor/widgets/Text.html     |   1 -
 .../gui/ang/afGuiEditor/widgets/TextArea.html |   1 -
 ext/afform/mock/ang/testAfform.aff.html       |   2 +-
 30 files changed, 383 insertions(+), 116 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/editOptions.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/Date.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/Number.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/Radio.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/Select.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/Text.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Date.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Number.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Radio.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Select.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/Text.html
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 20fe6b1e7767..a2eebb33ee86 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -329,6 +329,11 @@ function afform_civicrm_alterAngular($angular) {
             // If it's not an object, don't mess with it.
             continue;
           }
+          // TODO: Teach the api to return options in this format
+          if (!empty($fieldInfo['options'])) {
+            $fieldInfo['options'] = CRM_Utils_Array::makeNonAssociative($fieldInfo['options'], 'key', 'label');
+          }
+
           $fieldDefn = $existingFieldDefn ? CRM_Utils_JS::getRawProps($existingFieldDefn) : [];
           foreach ($fieldInfo as $name => $prop) {
             // Merge array props 1 level deep
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/afField/afField.js
index bd30e103d8f3..f6004173236a 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/afField/afField.js
@@ -16,15 +16,21 @@
         $scope.fieldId = $scope.afFieldset.getDefn().modelName + '-' + $scope.fieldName;
         $scope.getData = $scope.afFieldset.getData;
 
+        $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
+      },
+      controller: function($scope) {
+
         $scope.getOptions = function() {
+          return $scope.defn.options || [{key: '1', label: ts('Yes')}, {key: '0', label: ts('No')}];
+        };
+
+        $scope.select2Options = function() {
           return {
-            results: _.transform($scope.defn.options, function(result, val, key) {
-              result.push({id: key, text: val});
+            results: _.transform($scope.getOptions(), function(result, opt) {
+              result.push({id: opt.key, text: opt.label});
             }, [])
           };
         };
-
-        $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
       }
     };
   });
diff --git a/ext/afform/core/ang/afField/widgets/CheckBox.html b/ext/afform/core/ang/afField/widgets/CheckBox.html
index bf0bd8bb9e6a..fbdab6b0b219 100644
--- a/ext/afform/core/ang/afField/widgets/CheckBox.html
+++ b/ext/afform/core/ang/afField/widgets/CheckBox.html
@@ -1,7 +1,7 @@
 <ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="defn.options">
-  <li ng-repeat="(key, val) in defn.options" >
-    <input type="checkbox" checklist-model="getData()[name]" id="{{ fieldId + key }}" checklist-value="key" />
-    <label for="{{ fieldId + key }}">{{ val }}</label>
+  <li ng-repeat="opt in defn.options" >
+    <input type="checkbox" checklist-model="getData()[name]" id="{{ fieldId + opt.key }}" checklist-value="opt.key" />
+    <label for="{{ fieldId + opt.key }}">{{ opt.label }}</label>
   </li>
 </ul>
-<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="getData()[fieldName]" ng-true-value="'1'" ng-false-value="'0'" />
diff --git a/ext/afform/core/ang/afField/widgets/Radio.html b/ext/afform/core/ang/afField/widgets/Radio.html
index c20d3daf0384..f914f64c4377 100644
--- a/ext/afform/core/ang/afField/widgets/Radio.html
+++ b/ext/afform/core/ang/afField/widgets/Radio.html
@@ -1,4 +1,4 @@
-<label ng-repeat="(key, val) in defn.options" >
-  <input class="crm-form-radio" type="radio" ng-model="getData()[fieldName]" value="{{ key }}" />
-  {{ val }}
+<label ng-repeat="(opt in getOptions()" >
+  <input class="crm-form-radio" type="radio" ng-model="getData()[fieldName]" value="{{ opt.key }}" />
+  {{ opt.label }}
 </label>
diff --git a/ext/afform/core/ang/afField/widgets/Select.html b/ext/afform/core/ang/afField/widgets/Select.html
index c0812ab4e4ca..a89e8464ecf3 100644
--- a/ext/afform/core/ang/afField/widgets/Select.html
+++ b/ext/afform/core/ang/afField/widgets/Select.html
@@ -1 +1 @@
-<input crm-ui-select="{data: getOptions, multiple: defn.input_attrs.multiple, placeholder: defn.input_attrs.placeholder}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-select="{data: select2Options, multiple: defn.input_attrs.multiple, placeholder: defn.input_attrs.placeholder}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index e63047898f8e..19a71aa48ad3 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -185,10 +185,20 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
       ->setIncludeCustom(TRUE)
       ->setLoadOptions(TRUE)
       ->setAction('create')
-      ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize'])
+      ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize', 'data_type'])
       ->addWhere('input_type', 'IS NOT NULL')
       ->execute()
       ->indexBy('name');
+
+    // TODO: Teach the api to return options in this format
+    foreach ($data['fields'][$entityName] as $name => $field) {
+      if (!empty($field['options'])) {
+        $data['fields'][$entityName][$name]['options'] = CRM_Utils_Array::makeNonAssociative($field['options'], 'key', 'label');
+      }
+      else {
+        unset($data['fields'][$entityName][$name]['options']);
+      }
+    }
   }
 
   // Now adjust the field metadata
@@ -197,10 +207,10 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
 
   // Scan for input types
   // FIXME: Need a way to load this from other extensions too
-  foreach (glob(__DIR__ . '/ang/afGuiEditor/widgets/*.html') as $file) {
+  foreach (glob(__DIR__ . '/ang/afGuiEditor/inputType/*.html') as $file) {
     $matches = [];
     preg_match('/([-a-z_A-Z0-9]*).html/', $file, $matches);
-    $data['widgets'][$matches[1]] = $matches[1];
+    $data['inputType'][$matches[1]] = $matches[1];
   }
 
   $mimeType = 'text/javascript';
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 6ed42502d08b..2b4667c1fd7b 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -125,7 +125,8 @@
 
 #afGuiEditor .af-gui-block {
   border: 2px dashed transparent;
-  padding-top: 22px;
+  position: relative;
+  padding: 22px 3px 3px;
   min-height: 40px;
 }
 
@@ -171,7 +172,8 @@
 }
 /* grip handle */
 #afGuiEditor [ui-sortable] .af-gui-bar:before,
-#afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover:before {
+#afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover:before,
+#afGuiEditor [af-gui-edit-options] [ui-sortable] li:before {
   background-size: cover;
   background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODg4Ij48L3JlY3Q+Cjwvc3ZnPg==");
   width: 10px;
@@ -267,24 +269,33 @@
   cursor: default;
 }
 
-#afGuiEditor .af-gui-field-widget input[type=text].form-control {
+#afGuiEditor .af-gui-field-input input[type=text].form-control {
   color: #9a9a9a;
 }
 
-#afGuiEditor .af-gui-field-widget-number input[type=text].form-control {
+#afGuiEditor .af-gui-field-input-number input[type=text].form-control {
   background-image: url('../images/number.png');
   background-repeat: no-repeat;
   background-position: center right 6px;
 }
 
-#afGuiEditor .af-gui-field-widget input.crm-form-date {
+#afGuiEditor .af-gui-field-input input.crm-form-date {
   width: 140px;
   margin-right: -2px;
 }
-#afGuiEditor .af-gui-field-widget input.crm-form-time {
+#afGuiEditor .af-gui-field-input input.crm-form-time {
   width: 80px;
 }
 
+#afGuiEditor .af-gui-field-input-type-radio label.radio {
+  font-weight: normal;
+  margin-right: 10px;
+}
+#afGuiEditor .af-gui-field-input-type-radio label.radio input[type=radio] {
+  margin: 0;
+
+}
+
 #afGuiEditor .af-gui-text-h1 {
   font-weight: bolder;
   font-size: 16px;
@@ -320,3 +331,69 @@
 #afGuiEditor .af-gui-field-help {
   font-style: italic;
 }
+
+
+#afGuiEditor.af-gui-editing-options {
+  pointer-events: none;
+  cursor: default;
+}
+#afGuiEditor.af-gui-editing-options .panel-heading,
+#afGuiEditor.af-gui-editing-options .af-gui-element,
+.af-gui-editing-options #afGuiEditor-palette .panel-body > * {
+  opacity: .5;
+}
+#afGuiEditor.af-gui-editing-options .af-gui-block {
+  border: 2px solid transparent;
+}
+#afGuiEditor.af-gui-editing-options .af-gui-bar:not(.af-gui-edit-options-bar) {
+  visibility: hidden;
+}
+#afGuiEditor.af-gui-editing-options .af-gui-bar:before {
+  background: none;
+}
+
+#afGuiEditor [af-gui-edit-options] {
+  border: 2px solid #0071bd;
+  pointer-events: auto;
+  cursor: auto;
+  padding-top: 35px;
+  position: relative;
+}
+
+#afGuiEditor [af-gui-edit-options] .af-gui-edit-options-bar {
+  height: 30px;
+  font-family: "Courier New", Courier, monospace;
+  font-size: 12px;
+  width: 100%;
+  background-color: #f2f2f2;
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding-left: 15px;
+}
+#afGuiEditor [af-gui-edit-options] ul[ui-sortable] {
+  padding: 5px 20px 0;
+}
+#afGuiEditor [af-gui-edit-options] ul[ui-sortable] li {
+  list-style: none;
+  padding-left: 15px;
+  position: relative;
+  background-color:#e7ecf1;
+  cursor: move;
+}
+#afGuiEditor [af-gui-edit-options] ul[ui-sortable] li:nth-child(even) {
+  background-color:#f2f2f2;
+}
+#afGuiEditor [af-gui-edit-options] ul[ui-sortable] li > div {
+  width: calc(100% - 30px);
+  display: inline-block;
+}
+#afGuiEditor [af-gui-edit-options] ul.af-gui-edit-options-deleted li > div {
+  text-decoration: line-through;
+}
+#afGuiEditor [af-gui-edit-options] ul[ui-sortable] li .btn-xs {
+  border: 0 none;
+}
+#afGuiEditor [af-gui-edit-options] h5 {
+  margin-left: 20px;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 542473f94bb7..61eaabac6390 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -429,23 +429,65 @@
       },
       controller: function($scope) {
         var ts = $scope.ts = CRM.ts();
+        $scope.editingOptions = false;
+        var yesNo = [
+          {key: '1', label: ts('Yes')},
+          {key: '0', label: ts('No')}
+        ];
 
         $scope.getEntity = function() {
           return $scope.editor ? $scope.editor.getEntity($scope.entityName) : {};
         };
 
-        $scope.getDefn = function() {
+        $scope.getDefn = this.getDefn = function() {
           return $scope.editor ? $scope.editor.getField($scope.getEntity().type, $scope.node.name) : {};
         };
 
-        $scope.getOptions = function() {
+        $scope.hasOptions = function() {
+          var inputType = $scope.getProp('input_type');
+          return _.contains(['CheckBox', 'Radio', 'Select'], inputType) && !(inputType === 'CheckBox' && !$scope.getDefn().options);
+        };
+
+        $scope.getOptions = this.getOptions = function() {
+          if ($scope.node.defn && $scope.node.defn.options) {
+            return $scope.node.defn.options;
+          }
+          return $scope.getDefn().options || ($scope.getProp('input_type') === 'CheckBox' ? null : yesNo);
+        };
+
+        $scope.select2Options = function() {
           return {
-            results: _.transform($scope.getProp('options'), function(result, val, key) {
-              result.push({id: key, text: val});
+            results: _.transform($scope.getOptions(), function(result, opt) {
+              result.push({id: opt.key, text: opt.label});
             }, [])
           };
         };
 
+        $scope.resetOptions = function() {
+          delete $scope.node.defn.options;
+        };
+
+        $scope.editOptions = function() {
+          $scope.editingOptions = true;
+          $('#afGuiEditor').addClass('af-gui-editing-options');
+        };
+
+        $scope.inputTypeCanBe = function(type) {
+          var defn = $scope.getDefn();
+          switch (type) {
+            case 'CheckBox':
+            case 'Radio':
+            case 'Select':
+              return !(!defn.options && defn.data_type !== 'Boolean');
+
+            case 'TextArea':
+            case 'RichTextEditor':
+              return (defn.data_type === 'Text' || defn.data_type === 'String');
+          }
+          return true;
+        };
+
+        // Returns a value from either the local field defn or the base defn
         $scope.getProp = function(propName) {
           var path = propName.split('.'),
             item = path.pop(),
@@ -456,13 +498,19 @@
           return drillDown($scope.getDefn(), path)[item];
         };
 
+        // Checks for a value in either the local field defn or the base defn
+        $scope.propIsset = function(propName) {
+          var val = $scope.getProp(propName);
+          return !(typeof val === 'undefined' || val === null);
+        };
+
         $scope.toggleRequired = function() {
           getSet('required', !getSet('required'));
           return false;
         };
 
         $scope.toggleHelp = function(position) {
-          getSet('help_' + position, getSet('help_' + position) === null ? ($scope.getDefn()['help_' + position] || ts('Enter text')) : null);
+          getSet('help_' + position, $scope.propIsset('help_' + position) ? null : ($scope.getDefn()['help_' + position] || ts('Enter text')));
           return false;
         };
 
@@ -471,16 +519,6 @@
           return _.wrap(propName, getSet);
         };
 
-        // Returns a reference to a path n-levels deep within an object
-        function drillDown(parent, path) {
-          var container = parent;
-          _.each(path, function(level) {
-            container[level] = container[level] || {};
-            container = container[level];
-          });
-          return container;
-        }
-
         // Getter/setter callback
         function getSet(propName, val) {
           if (arguments.length > 1) {
@@ -498,7 +536,64 @@
           }
           return $scope.getProp(propName);
         }
+        this.getSet = getSet;
+
+        this.setEditingOptions = function(val) {
+          $scope.editingOptions = val;
+        };
+
+        // Returns a reference to a path n-levels deep within an object
+        function drillDown(parent, path) {
+          var container = parent;
+          _.each(path, function(level) {
+            container[level] = container[level] || {};
+            container = container[level];
+          });
+          return container;
+        }
+      }
+    };
+  });
 
+  angular.module('afGuiEditor').directive('afGuiEditOptions', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/editOptions.html',
+      scope: true,
+      require: '^^afGuiField',
+      link: function ($scope, element, attrs, afGuiField) {
+        $scope.field = afGuiField;
+        $scope.options = JSON.parse(angular.toJson(afGuiField.getOptions()));
+        var optionKeys = _.map($scope.options, 'key');
+        $scope.deletedOptions = _.filter(JSON.parse(angular.toJson(afGuiField.getDefn().options || [])), function(item) {
+          return !_.contains(optionKeys, item.key);
+        });
+        $scope.originalLabels = _.transform(afGuiField.getDefn().options || [], function(originalLabels, item) {
+          originalLabels[item.key] = item.label;
+        }, {});
+      },
+      controller: function ($scope) {
+        var ts = $scope.ts = CRM.ts();
+
+        $scope.deleteOption = function(option, $index) {
+          $scope.options.splice($index, 1);
+          $scope.deletedOptions.push(option);
+        };
+
+        $scope.restoreOption = function(option, $index) {
+          $scope.deletedOptions.splice($index, 1);
+          $scope.options.push(option);
+        };
+        
+        $scope.save = function() {
+          $scope.field.getSet('options', JSON.parse(angular.toJson($scope.options)));
+          $scope.close();
+        };
+
+        $scope.close = function() {
+          $scope.field.setEditingOptions(false);
+          $('#afGuiEditor').removeClass('af-gui-editing-options');
+        };
       }
     };
   });
@@ -591,6 +686,29 @@
     };
   });
 
+  // Connect bootstrap dropdown.js with angular
+  // Allows menu content to be conditionally rendered only if open
+  // This gives a large performance boost for a page with lots of menus
+  angular.module('afGuiEditor').directive('afGuiMenu', function() {
+    return {
+      restrict: 'A',
+      link: function($scope, element, attrs) {
+        $scope.menu = {};
+        element
+          .on('show.bs.dropdown', function() {
+            $scope.$apply(function() {
+              $scope.menu.open = true;
+            });
+          })
+          .on('hidden.bs.dropdown', function() {
+            $scope.$apply(function() {
+              $scope.menu.open = false;
+            });
+          });
+      }
+    };
+  });
+
   // Editable titles using ngModel & html5 contenteditable
   // Cribbed from ContactLayoutEditor
   angular.module('afGuiEditor').directive("afGuiEditable", function() {
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 11c28be13b15..d8c862e92ab6 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -1,7 +1,7 @@
 <div class="af-gui-bar" ng-if="node['#tag'] !== 'af-form'" ng-click="selectEntity()" >
   <span ng-if="block.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
   <span>{{ node['#tag'] }}</span>
-  <div class="form-inline pull-right">
+  <div class="form-inline pull-right" af-gui-menu>
     <div class="btn-group btn-group-xs" role="group">
       <button type="button" class="btn btn-default" ng-class="{active: opt === getLayout()}" ng-repeat="(opt, label) in layouts" ng-click="setLayout(opt)" title="{{ label }}">
         <i class="af-gui-layout-icon {{ opt }}" ></i>
@@ -13,20 +13,21 @@
     <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
       <span><i class="crm-i fa-plus"></i></span>
     </button>
-    <ul class="dropdown-menu">
+    <ul class="dropdown-menu" ng-if="menu.open">
       <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
       <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
       <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+      <li role="separator" class="divider"></li>
       <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
     </ul>
   </div>
 </div>
 <div class="af-gui-bar" ng-if="node['#tag'] === 'af-form'" >
-  <div class="form-inline pull-right">
+  <div class="form-inline pull-right" af-gui-menu>
     <button type="button" class="btn  btn-default btn-sm dropdown-toggle af-gui-add-canvas-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
       <span>Add <i class="crm-i fa-plus"></i></span>
     </button>
-    <ul class="dropdown-menu">
+    <ul class="dropdown-menu" ng-if="menu.open">
       <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
       <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
       <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
@@ -40,9 +41,9 @@
 <div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in node['#children']" ng-show="block.getNodeType(item)">
     <div ng-switch="block.getNodeType(item)">
-      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-element af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
-      <div ng-switch-when="block" af-gui-block="item" class="af-gui-element af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
-      <div ng-switch-when="field" af-gui-field="item" class="af-gui-element af-gui-field" entity-name="entityName" />
+      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
+      <div ng-switch-when="block" af-gui-block="item" class="af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
+      <div ng-switch-when="field" af-gui-field="item" entity-name="entityName" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
       <div ng-switch-when="button" af-gui-button="item" class="af-gui-element af-gui-button" />
     </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
index f566c9b1874e..fe35de767484 100644
--- a/ext/afform/gui/ang/afGuiEditor/button.html
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -1,10 +1,10 @@
 <div class="af-gui-bar">
   <div class="form-inline pull-right">
-    <div class="btn-group pull-right">
+    <div class="btn-group pull-right" af-gui-menu>
       <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
-      <ul class="dropdown-menu">
+      <ul class="dropdown-menu" ng-if="menu.open">
         <li title="{{ ts('Button style') }}">
           <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown" >
             <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}">
@@ -12,6 +12,7 @@
             </select>
           </a>
         </li>
+        <li role="separator" class="divider"></li>
         <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
       </ul>
     </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/editOptions.html b/ext/afform/gui/ang/afGuiEditor/editOptions.html
new file mode 100644
index 000000000000..c576262e2d59
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/editOptions.html
@@ -0,0 +1,30 @@
+<div class="af-gui-edit-options-bar" >
+  <h4 class="pull-left">{{ ts('Edit option list') }}</h4>
+  <div class="btn-group-sm pull-right">
+    <button type="button" class="btn btn-default" ng-click="close()">
+      <i class="crm-i fa-times-circle"></i>
+      {{ ts('Cancel') }}
+    </button>
+    <button type="button" class="btn btn-success" ng-click="save()">
+      <i class="crm-i fa-check-circle"></i>
+      {{ ts('Save') }}
+    </button>
+  </div>
+</div>
+<ul ui-sortable="{connectWith: '.af-gui-edit-options-deleted', cancel: 'input,textarea,button,select,option,a,[contenteditable]'}" ng-model="options" class="af-gui-edit-options-enabled">
+  <li ng-repeat="option in options">
+    <div af-gui-editable ng-model="option.label" default-value="originalLabels[option.key]" >{{ option.label }}</div>
+    <button type="button" class="btn btn-danger-outline btn-xs pull-right" ng-click="deleteOption(option, $index)" title="{{ ts('Remove option') }}">
+      <i class="crm-i fa-trash"></i>
+    </button>
+  </li>
+</ul>
+<h5 ng-show="deletedOptions.length">{{ ts('Deleted options') }}</h5>
+<ul ng-if="deletedOptions.length" ui-sortable="{connectWith: '.af-gui-edit-options-enabled'}" ng-model="deletedOptions" class="af-gui-edit-options-deleted">
+  <li ng-repeat="option in deletedOptions">
+    <div>{{ option.label }}</div>
+    <button type="button" class="btn btn-success-outline btn-xs pull-right" ng-click="restoreOption(option, $index)" title="{{ ts('Restore option') }}">
+      <i class="crm-i fa-arrow-circle-o-up"></i>
+    </button>
+  </li>
+</ul>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index 0085c9f8d456..b04caaf51955 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -1,51 +1,67 @@
-<div class="af-gui-bar" title="{{ getEntity().label + ': ' + getDefn().title }}">
-  <div class="form-inline pull-right">
-
-    <div class="btn-group">
-      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
-        <span><i class="crm-i fa-gear"></i></span>
-      </button>
-      <ul class="dropdown-menu dropdown-menu-right">
-        <li title="{{ ts('Field type') }}">
-          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
-            <select class="form-control" ng-model="getSet('input_type')" ng-model-options="{getterSetter: true}">
-              <option ng-repeat="(opt, label) in editor.meta.widgets" value="{{ opt }}">{{ label }}</option>
-            </select>
-          </a>
-        </li>
-        <li title="{{ ts('Require this field') }}">
-          <a href ng-click="toggleRequired(); $event.stopPropagation();">
-            <i class="crm-i" ng-class="{'fa-square-o': !getProp('required'), 'fa-check-square-o': getProp('required')}"></i>
-            {{ ts('Required') }}
-          </a>
-        </li>
-        <li title="{{ ts('Show help text above this field') }}">
-          <a href ng-click="toggleHelp('pre'); $event.stopPropagation();">
-            <i class="crm-i" ng-class="{'fa-square-o': !getProp('help_pre'), 'fa-check-square-o': getProp('help_pre')}"></i>
-            {{ ts('Pre help text') }}
-          </a>
-        </li>
-        <li title="{{ ts('Show help text below this field') }}">
-          <a href ng-click="toggleHelp('post'); $event.stopPropagation();">
-            <i class="crm-i" ng-class="{'fa-square-o': !getProp('help_post'), 'fa-check-square-o': getProp('help_post')}"></i>
-            {{ ts('Post help text') }}
-          </a>
-        </li>
-        <li title="{{ ts('Remove field from form') }}">
-          <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this field') }}</span></a>
-        </li>
-      </ul>
+<div af-gui-edit-options ng-if="editingOptions"></div>
+<div ng-if="!editingOptions" class="af-gui-element af-gui-field" >
+  <div class="af-gui-bar" title="{{ getEntity().label + ': ' + getDefn().title }}">
+    <div class="form-inline pull-right">
+      <div class="btn-group" af-gui-menu >
+        <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+          <span><i class="crm-i fa-gear"></i></span>
+        </button>
+        <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open">
+          <li title="{{ ts('Field type') }}">
+            <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
+              <select class="form-control" ng-model="getSet('input_type')" ng-model-options="{getterSetter: true}">
+                <option ng-repeat="(type, label) in editor.meta.inputType" value="{{ type }}" ng-if="inputTypeCanBe(type)">{{ label }}</option>
+              </select>
+            </a>
+          </li>
+          <li title="{{ ts('Require this field') }}">
+            <a href ng-click="toggleRequired(); $event.stopPropagation();">
+              <i class="crm-i" ng-class="{'fa-square-o': !getProp('required'), 'fa-check-square-o': getProp('required')}"></i>
+              {{ ts('Required') }}
+            </a>
+          </li>
+          <li title="{{ ts('Show help text above this field') }}">
+            <a href ng-click="toggleHelp('pre'); $event.stopPropagation();">
+              <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_pre'), 'fa-check-square-o': propIsset('help_pre')}"></i>
+              {{ ts('Pre help text') }}
+            </a>
+          </li>
+          <li title="{{ ts('Show help text below this field') }}">
+            <a href ng-click="toggleHelp('post'); $event.stopPropagation();">
+              <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_post'), 'fa-check-square-o': propIsset('help_post')}"></i>
+              {{ ts('Post help text') }}
+            </a>
+          </li>
+          <li role="separator" class="divider" ng-if="hasOptions()"></li>
+          <li title="{{ ts('Reset the option list for this field') }}" ng-if="hasOptions()" ng-click="$event.stopPropagation()">
+            <a href ng-click="resetOptions()">
+              <i class="crm-i fa-{{ node.defn.options ? '' : 'check-' }}circle-o"></i>
+              {{ ts('Use default option list') }}
+            </a>
+          </li>
+          <li title="{{ ts('Customize the option list for this field') }}" ng-if="hasOptions()">
+            <a href ng-click="editOptions()">
+              <i class="crm-i fa-{{ !node.defn.options ? '' : 'check-' }}circle-o"></i>
+              {{ ts('Customize field options') }}
+            </a>
+          </li>
+          <li role="separator" class="divider"></li>
+          <li title="{{ ts('Remove field from form') }}">
+            <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this field') }}</span></a>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
-</div>
-<label ng-class="{'af-gui-field-required': getProp('required')}" class="af-gui-node-title">
-  <span af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ getProp('title') }}</span>
-</label>
-<div class="af-gui-field-help" ng-if="getProp('help_pre') !== null">
-  <span af-gui-editable ng-model="node.defn.help_pre" default-value="getDefn().help_pre">{{ getProp('help_pre') }}</span>
-</div>
-<div class="af-gui-field-widget af-gui-field-widget-{{ getProp('input_type').toLowerCase() }}" ng-include="'~/afGuiEditor/widgets/' + getProp('input_type') + '.html'"></div>
-<div class="af-gui-field-help" ng-if="getProp('help_post') !== null">
-  <span af-gui-editable ng-model="node.defn.help_post" default-value="getDefn().help_post">{{ getProp('help_post') }}</span>
+  <label ng-class="{'af-gui-field-required': getProp('required')}" class="af-gui-node-title">
+    <span af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ getProp('title') }}</span>
+  </label>
+  <div class="af-gui-field-help" ng-if="propIsset('help_pre')">
+    <span af-gui-editable ng-model="node.defn.help_pre" default-value="getDefn().help_pre">{{ getProp('help_pre') }}</span>
+  </div>
+  <div class="af-gui-field-input af-gui-field-input-type-{{ getProp('input_type').toLowerCase() }}" ng-include="'~/afGuiEditor/inputType/' + getProp('input_type') + '.html'"></div>
+  <div class="af-gui-field-help" ng-if="propIsset('help_post')">
+    <span af-gui-editable ng-model="node.defn.help_post" default-value="getDefn().help_post">{{ getProp('help_post') }}</span>
+  </div>
 </div>
 
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html b/ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html
new file mode 100644
index 000000000000..08baba1adec8
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html
@@ -0,0 +1,7 @@
+<ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="getOptions()">
+  <li ng-repeat="opt in getOptions()" >
+    <input type="checkbox" disabled />
+    <label>{{ opt.label }}</label>
+  </li>
+</ul>
+<input type="checkbox" disabled ng-if="!getOptions()" />
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Date.html b/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
new file mode 100644
index 000000000000..32ce51104b34
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
@@ -0,0 +1,5 @@
+<div class="form-inline">
+  <input autocomplete="off" class="form-control crm-form-date crm-placeholder-icon" placeholder="&#xF073" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+  <span class="addon fa fa-calendar"></span>
+  <input autocomplete="off" ng-if="getProp('input_attrs.time')" placeholder="&#xF017" class="form-control crm-form-time crm-placeholder-icon" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" />
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Number.html b/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
new file mode 100644
index 000000000000..812d08dae821
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
@@ -0,0 +1 @@
+<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Radio.html b/ext/afform/gui/ang/afGuiEditor/inputType/Radio.html
new file mode 100644
index 000000000000..d1c47b073e2a
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Radio.html
@@ -0,0 +1,6 @@
+<div class="form-inline">
+  <label ng-repeat="opt in getOptions()" class="radio" >
+    <input class="crm-form-radio" type="radio" disabled />
+    {{ opt.label }}
+  </label>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html b/ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html
new file mode 100644
index 000000000000..8c4a77d82ff8
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html
@@ -0,0 +1 @@
+<textarea autocomplete="off" class="crm-form-textarea" disabled ></textarea>
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
new file mode 100644
index 000000000000..549e7a54a0de
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
@@ -0,0 +1 @@
+<input autocomplete="off" crm-ui-select="{data: select2Options, multiple: defn.input_attrs.multiple}" />
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Text.html b/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
new file mode 100644
index 000000000000..812d08dae821
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
@@ -0,0 +1 @@
+<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html b/ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html
new file mode 100644
index 000000000000..8c4a77d82ff8
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html
@@ -0,0 +1 @@
+<textarea autocomplete="off" class="crm-form-textarea" disabled ></textarea>
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index 0b6546179003..7c69daac6416 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -1,10 +1,10 @@
 <div class="af-gui-bar">
   <div class="form-inline pull-right">
-    <div class="btn-group pull-right">
+    <div class="btn-group pull-right" af-gui-menu>
       <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
-      <ul class="dropdown-menu">
+      <ul class="dropdown-menu" ng-if="menu.open">
         <li title="{{ ts('Text style') }}">
           <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
             <select class="form-control" ng-model="node['#tag']">
@@ -21,6 +21,7 @@
             </div>
           </a>
         </li>
+        <li role="separator" class="divider"></li>
         <li>
           <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
         </li>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html b/ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html
deleted file mode 100644
index 27086e17f179..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/CheckBox.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="getProp('options')">
-  <li ng-repeat="(key, val) in getProp('options')" >
-    <input type="checkbox" disabled />
-    <label >{{ val }}</label>
-  </li>
-</ul>
-<input type="checkbox" disabled ng-if="!getProp('options')" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Date.html b/ext/afform/gui/ang/afGuiEditor/widgets/Date.html
deleted file mode 100644
index aebd73d42f94..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/Date.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="form-inline">
-  <input class="form-control crm-form-date" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
-  <span class="addon fa fa-calendar"></span>
-  <input ng-if="getProp('input_attrs.time')" class="form-control crm-form-time" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" />
-</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Number.html b/ext/afform/gui/ang/afGuiEditor/widgets/Number.html
deleted file mode 100644
index bfb984aece8a..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/Number.html
+++ /dev/null
@@ -1 +0,0 @@
-<input class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Radio.html b/ext/afform/gui/ang/afGuiEditor/widgets/Radio.html
deleted file mode 100644
index 405007756276..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/Radio.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<label ng-repeat="(key, val) in getProp('options')" >
-  <input class="crm-form-radio" type="radio" disabled value="{{ key }}" />
-  {{ val }}
-</label>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html b/ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html
deleted file mode 100644
index 81acfcd98e69..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/RichTextEditor.html
+++ /dev/null
@@ -1 +0,0 @@
-<textarea class="crm-form-textarea" disabled ></textarea>
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Select.html b/ext/afform/gui/ang/afGuiEditor/widgets/Select.html
deleted file mode 100644
index d096b8a9ef53..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/Select.html
+++ /dev/null
@@ -1 +0,0 @@
-<input crm-ui-select="{data: getOptions, multiple: defn.input_attrs.multiple}" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/Text.html b/ext/afform/gui/ang/afGuiEditor/widgets/Text.html
deleted file mode 100644
index bfb984aece8a..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/Text.html
+++ /dev/null
@@ -1 +0,0 @@
-<input class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
diff --git a/ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html b/ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html
deleted file mode 100644
index 81acfcd98e69..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/widgets/TextArea.html
+++ /dev/null
@@ -1 +0,0 @@
-<textarea class="crm-form-textarea" disabled ></textarea>
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 512bc15303a8..9e459aefe566 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -11,7 +11,7 @@
       <af-field name="first_name" />
       <af-field name="last_name" />
     </div>
-    <af-field name="gender_id" />
+    <af-field name="gender_id" defn="{options: [{key: 1, label: 'Girl'}, {key: 2, label: 'Boy'}, {key: 3, label: 'Other'}]}"/>
     <af-field name="constituent_information.Marital_Status" />
     <af-field name="constituent_information.Marriage_Date" />
     <af-field name="constituent_information.Most_Important_Issue" />

From b22ac9e50d2586485c3ee34baac82cbd718ac98e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 17 Nov 2019 10:17:48 -0500
Subject: [PATCH 535/834] GUI Fix number field style

---
 ext/afform/gui/ang/afGuiEditor.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 2b4667c1fd7b..057031a2ce83 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -273,7 +273,7 @@
   color: #9a9a9a;
 }
 
-#afGuiEditor .af-gui-field-input-number input[type=text].form-control {
+#afGuiEditor .af-gui-field-input-type-number input[type=text].form-control {
   background-image: url('../images/number.png');
   background-repeat: no-repeat;
   background-position: center right 6px;

From 17d2b6d6ab57f6da51b48d9396ea8fd0999984e6 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 17 Nov 2019 10:19:12 -0500
Subject: [PATCH 536/834] GUI Validate drag-n-drop actions

Prevent fields from being moved outside their entity fieldset(s)
Prevent fieldsets from being dragged into other fieldsets
---
 ext/afform/gui/ang/afGuiEditor.js         | 22 ++++++++++++++++++++++
 ext/afform/gui/ang/afGuiEditor/block.html |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 61eaabac6390..b6fb02bd7b9c 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -384,6 +384,28 @@
           }
         };
 
+        // Validates that a drag-n-drop action is allowed
+        $scope.onDrop = function(event, ui) {
+          var sort = ui.item.sortable;
+          // Check if this is a callback for an item dropped into a different container
+          // @see https://github.com/angular-ui/ui-sortable notes on canceling
+          if (!sort.received && sort.source[0] !== sort.droptarget[0]) {
+            var $source = $(sort.source[0]),
+              $target = $(sort.droptarget[0]),
+              $item = $(ui.item[0]);
+            // Fields cannot be dropped outside their own entity
+            if ($item.is('[af-gui-field]') || $item.has('[af-gui-field]').length) {
+              if ($source.closest('[data-entity]').attr('data-entity') !== $target.closest('[data-entity]').attr('data-entity')) {
+                return sort.cancel();
+              }
+            }
+            // Entity-fieldsets cannot be dropped into other entity-fieldsets
+            if (($item.is('[data-entity]') || $item.has('[data-entity]').length) && $target.closest('[data-entity]').length) {
+              return sort.cancel();
+            }
+          }
+        };
+
         $scope.tags = {
           div: ts('Block'),
           fieldset: ts('Fieldset')
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index d8c862e92ab6..72d916f761df 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -38,8 +38,8 @@
     </ul>
   </div>
 </div>
-<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
-  <div ng-repeat="item in node['#children']" ng-show="block.getNodeType(item)">
+<div ui-sortable="{handle: '.af-gui-bar', update: onDrop, connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
+  <div ng-repeat="item in node['#children']" >
     <div ng-switch="block.getNodeType(item)">
       <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
       <div ng-switch-when="block" af-gui-block="item" class="af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />

From 9c57264159792ae53d63fe625c1991cfe958f55c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 18 Nov 2019 08:22:37 -0500
Subject: [PATCH 537/834] GUI: Cleanup menus

---
 ext/afform/gui/ang/afGuiEditor.css            | 25 +++++++++--
 .../gui/ang/afGuiEditor/block-menu.html       |  5 +++
 ext/afform/gui/ang/afGuiEditor/block.html     |  8 +---
 .../gui/ang/afGuiEditor/button-menu.html      | 10 +++++
 ext/afform/gui/ang/afGuiEditor/button.html    | 12 +----
 .../gui/ang/afGuiEditor/field-menu.html       | 45 +++++++++++++++++++
 ext/afform/gui/ang/afGuiEditor/field.html     | 45 +------------------
 ext/afform/gui/ang/afGuiEditor/text-menu.html | 21 +++++++++
 ext/afform/gui/ang/afGuiEditor/text.html      | 23 +---------
 9 files changed, 106 insertions(+), 88 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/block-menu.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/button-menu.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/field-menu.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/text-menu.html

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 057031a2ce83..2c215c37cf2f 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -262,13 +262,30 @@
   left: -4px;
 }
 
-#afGuiEditor li a.af-gui-field-select-in-dropdown {
-  padding-top: 2px;
-  padding-bottom: 2px;
-  background-color: white !important;
+#afGuiEditor .dropdown-menu li {
   cursor: default;
 }
 
+#afGuiEditor .dropdown-menu li .af-gui-field-select-in-dropdown {
+  padding: 2px 19px 2px 21px;
+  clear: both;
+  font-weight: 400;
+  line-height: 1.5384615385;
+  color: #4d4d69;
+  white-space: nowrap;
+}
+
+#afGuiEditor .dropdown-menu li > * > label {
+  font-weight: normal;
+}
+
+#afGuiEditor .dropdown-menu li .af-gui-field-select-in-dropdown > select {
+  max-width: 120px;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+/* For editing field placeholder text */
 #afGuiEditor .af-gui-field-input input[type=text].form-control {
   color: #9a9a9a;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor/block-menu.html b/ext/afform/gui/ang/afGuiEditor/block-menu.html
new file mode 100644
index 000000000000..f42066e6dbea
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/block-menu.html
@@ -0,0 +1,5 @@
+<li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
+<li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
+<li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+<li role="separator" class="divider"></li>
+<li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 72d916f761df..8fc03edcc4cb 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -13,13 +13,7 @@
     <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
       <span><i class="crm-i fa-plus"></i></span>
     </button>
-    <ul class="dropdown-menu" ng-if="menu.open">
-      <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
-      <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
-      <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
-      <li role="separator" class="divider"></li>
-      <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
-    </ul>
+    <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/block-menu.html'"></ul>
   </div>
 </div>
 <div class="af-gui-bar" ng-if="node['#tag'] === 'af-form'" >
diff --git a/ext/afform/gui/ang/afGuiEditor/button-menu.html b/ext/afform/gui/ang/afGuiEditor/button-menu.html
new file mode 100644
index 000000000000..ab67fb5ccd3a
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/button-menu.html
@@ -0,0 +1,10 @@
+<li>
+  <div ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown form-inline" >
+    <label>{{ ts('Style:') }}</label>
+    <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}" title="{{ ts('Button style') }}">
+      <option ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}" value="{{ style }}">{{ label }}</option>
+    </select>
+  </div>
+</li>
+<li role="separator" class="divider"></li>
+<li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
index fe35de767484..be75644dff57 100644
--- a/ext/afform/gui/ang/afGuiEditor/button.html
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -4,17 +4,7 @@
       <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
-      <ul class="dropdown-menu" ng-if="menu.open">
-        <li title="{{ ts('Button style') }}">
-          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown" >
-            <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}">
-              <option ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}" value="{{ style }}">{{ ts('Color: %1', {1: label}) }}</option>
-            </select>
-          </a>
-        </li>
-        <li role="separator" class="divider"></li>
-        <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
-      </ul>
+      <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/button-menu.html'"></ul>
     </div>
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/field-menu.html b/ext/afform/gui/ang/afGuiEditor/field-menu.html
new file mode 100644
index 000000000000..701dfcf8b5e6
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/field-menu.html
@@ -0,0 +1,45 @@
+<li>
+  <div href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
+    <label>{{ ts('Type:') }}</label>
+    <select class="form-control" ng-model="getSet('input_type')" ng-model-options="{getterSetter: true}" title="{{ ts('Field type') }}">
+      <option ng-repeat="(type, label) in editor.meta.inputType" value="{{ type }}" ng-if="inputTypeCanBe(type)">{{ label }}</option>
+    </select>
+  </div>
+</li>
+<li>
+  <a href ng-click="toggleRequired(); $event.stopPropagation();" title="{{ ts('Require this field') }}">
+    <i class="crm-i" ng-class="{'fa-square-o': !getProp('required'), 'fa-check-square-o': getProp('required')}"></i>
+    {{ ts('Required') }}
+  </a>
+</li>
+<li>
+  <a href ng-click="toggleHelp('pre'); $event.stopPropagation();" title="{{ ts('Show help text above this field') }}">
+    <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_pre'), 'fa-check-square-o': propIsset('help_pre')}"></i>
+    {{ ts('Pre help text') }}
+  </a>
+</li>
+<li>
+  <a href ng-click="toggleHelp('post'); $event.stopPropagation();" title="{{ ts('Show help text below this field') }}">
+    <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_post'), 'fa-check-square-o': propIsset('help_post')}"></i>
+    {{ ts('Post help text') }}
+  </a>
+</li>
+<li role="separator" class="divider" ng-if="hasOptions()"></li>
+<li ng-if="hasOptions()" ng-click="$event.stopPropagation()">
+  <a href ng-click="resetOptions()" title="{{ ts('Reset the option list for this field') }}">
+    <i class="crm-i fa-{{ node.defn.options ? '' : 'check-' }}circle-o"></i>
+    {{ ts('Use default option list') }}
+  </a>
+</li>
+<li ng-if="hasOptions()">
+  <a href ng-click="editOptions()" title="{{ ts('Customize the option list for this field') }}">
+    <i class="crm-i fa-{{ !node.defn.options ? '' : 'check-' }}circle-o"></i>
+    {{ ts('Customize field options') }}
+  </a>
+</li>
+<li role="separator" class="divider"></li>
+<li>
+  <a href ng-click="block.removeBlock(node)" title="{{ ts('Remove field from form') }}">
+    <span class="text-danger">{{ ts('Delete this field') }}</span>
+  </a>
+</li>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index b04caaf51955..70288523f313 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -6,50 +6,7 @@
         <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
           <span><i class="crm-i fa-gear"></i></span>
         </button>
-        <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open">
-          <li title="{{ ts('Field type') }}">
-            <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
-              <select class="form-control" ng-model="getSet('input_type')" ng-model-options="{getterSetter: true}">
-                <option ng-repeat="(type, label) in editor.meta.inputType" value="{{ type }}" ng-if="inputTypeCanBe(type)">{{ label }}</option>
-              </select>
-            </a>
-          </li>
-          <li title="{{ ts('Require this field') }}">
-            <a href ng-click="toggleRequired(); $event.stopPropagation();">
-              <i class="crm-i" ng-class="{'fa-square-o': !getProp('required'), 'fa-check-square-o': getProp('required')}"></i>
-              {{ ts('Required') }}
-            </a>
-          </li>
-          <li title="{{ ts('Show help text above this field') }}">
-            <a href ng-click="toggleHelp('pre'); $event.stopPropagation();">
-              <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_pre'), 'fa-check-square-o': propIsset('help_pre')}"></i>
-              {{ ts('Pre help text') }}
-            </a>
-          </li>
-          <li title="{{ ts('Show help text below this field') }}">
-            <a href ng-click="toggleHelp('post'); $event.stopPropagation();">
-              <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_post'), 'fa-check-square-o': propIsset('help_post')}"></i>
-              {{ ts('Post help text') }}
-            </a>
-          </li>
-          <li role="separator" class="divider" ng-if="hasOptions()"></li>
-          <li title="{{ ts('Reset the option list for this field') }}" ng-if="hasOptions()" ng-click="$event.stopPropagation()">
-            <a href ng-click="resetOptions()">
-              <i class="crm-i fa-{{ node.defn.options ? '' : 'check-' }}circle-o"></i>
-              {{ ts('Use default option list') }}
-            </a>
-          </li>
-          <li title="{{ ts('Customize the option list for this field') }}" ng-if="hasOptions()">
-            <a href ng-click="editOptions()">
-              <i class="crm-i fa-{{ !node.defn.options ? '' : 'check-' }}circle-o"></i>
-              {{ ts('Customize field options') }}
-            </a>
-          </li>
-          <li role="separator" class="divider"></li>
-          <li title="{{ ts('Remove field from form') }}">
-            <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this field') }}</span></a>
-          </li>
-        </ul>
+        <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open" ng-include="'~/afGuiEditor/field-menu.html'"></ul>
       </div>
     </div>
   </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/text-menu.html b/ext/afform/gui/ang/afGuiEditor/text-menu.html
new file mode 100644
index 000000000000..8fed55388d3e
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/text-menu.html
@@ -0,0 +1,21 @@
+<li>
+  <div class="af-gui-field-select-in-dropdown" ng-click="$event.stopPropagation()">
+    <label>{{ ts('Style:') }}</label>
+    <select class="form-control" ng-model="node['#tag']" title="{{ ts('Text style') }}">
+      <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+    </select>
+  </div>
+</li>
+<li>
+  <div class="af-gui-field-select-in-dropdown" ng-click="$event.stopPropagation()">
+    <div class="btn-group btn-group-sm" role="group">
+      <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
+        <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
+      </button>
+    </div>
+  </div>
+</li>
+<li role="separator" class="divider"></li>
+<li>
+  <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
+</li>
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index 7c69daac6416..a5a6261fc621 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -4,28 +4,7 @@
       <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
-      <ul class="dropdown-menu" ng-if="menu.open">
-        <li title="{{ ts('Text style') }}">
-          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
-            <select class="form-control" ng-model="node['#tag']">
-              <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
-            </select>
-          </a>
-        </li>
-        <li>
-          <a href ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown">
-            <div class="btn-group btn-group-sm" role="group">
-              <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
-                <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
-              </button>
-            </div>
-          </a>
-        </li>
-        <li role="separator" class="divider"></li>
-        <li>
-          <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
-        </li>
-      </ul>
+      <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/text-menu.html'"></ul>
     </div>
   </div>
 </div>

From 51ec7d5a5d67f050ecb0668dba8c8741e4f86bb8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 19 Nov 2019 08:42:51 -0500
Subject: [PATCH 538/834] GUI Add controls for text color, block border & block
 background color

---
 ext/afform/gui/afform_gui.php                 |  9 ++
 ext/afform/gui/ang/afGuiEditor.css            |  7 +-
 ext/afform/gui/ang/afGuiEditor.js             | 85 ++++++++++++++++---
 .../gui/ang/afGuiEditor/block-menu.html       | 29 +++++++
 ext/afform/gui/ang/afGuiEditor/block.html     |  4 +-
 .../gui/ang/afGuiEditor/button-menu.html      |  4 +-
 ext/afform/gui/ang/afGuiEditor/text-menu.html |  8 ++
 ext/afform/gui/ang/afGuiEditor/text.html      |  2 +-
 8 files changed, 131 insertions(+), 17 deletions(-)

diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 19a71aa48ad3..e55d0815e23a 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -213,6 +213,15 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     $data['inputType'][$matches[1]] = $matches[1];
   }
 
+  $data['styles'] = [
+    'default' => ts('Default'),
+    'primary' => ts('Primary'),
+    'success' => ts('Success'),
+    'info' => ts('Info'),
+    'warning' => ts('Warning'),
+    'danger' => ts('Danger'),
+  ];
+
   $mimeType = 'text/javascript';
   $content = "CRM.afformAdminData=" . json_encode($data, JSON_UNESCAPED_SLASHES) . ';';
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 2c215c37cf2f..ae9d26e0b7bf 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -285,6 +285,11 @@
   padding-right: 5px;
 }
 
+#afGuiEditor li .af-gui-field-select-in-dropdown input[type=color] {
+  width: 30px;
+  padding: 2px 4px;
+}
+
 /* For editing field placeholder text */
 #afGuiEditor .af-gui-field-input input[type=text].form-control {
   color: #9a9a9a;
@@ -310,7 +315,6 @@
 }
 #afGuiEditor .af-gui-field-input-type-radio label.radio input[type=radio] {
   margin: 0;
-
 }
 
 #afGuiEditor .af-gui-text-h1 {
@@ -349,7 +353,6 @@
   font-style: italic;
 }
 
-
 #afGuiEditor.af-gui-editing-options {
   pointer-events: none;
   cursor: default;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index b6fb02bd7b9c..e8e18cd928cd 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -322,7 +322,7 @@
         $scope.editor = editor;
       },
       controller: function($scope) {
-        $scope.block = this;
+        var block = $scope.block = this;
         var ts = $scope.ts = CRM.ts();
         this.node = $scope.node;
 
@@ -429,9 +429,66 @@
           if (val !== 'af-layout-rows') {
             classes.push(val);
           }
-          $scope.block.modifyClasses($scope.node, _.keys($scope.layouts), classes);
+          block.modifyClasses($scope.node, _.keys($scope.layouts), classes);
         };
 
+        $scope.getSetBorderWidth = function(width) {
+          return getSetBorderProp(0, arguments.length ? width : null);
+        };
+
+        $scope.getSetBorderStyle = function(style) {
+          return getSetBorderProp(1, arguments.length ? style : null);
+        };
+
+        $scope.getSetBorderColor = function(color) {
+          return getSetBorderProp(2, arguments.length ? color : null);
+        };
+
+        $scope.getSetBackgroundColor = function(color) {
+          if (!arguments.length) {
+            return block.getStyles($scope.node)['background-color'] || '#ffffff';
+          }
+          block.setStyle($scope.node, 'background-color', color);
+        };
+        
+        function getSetBorderProp(idx, val) {
+          var border = getBorder() || ['1px', '', '#000000'];
+          if (val === null) {
+            return border[idx];
+          }
+          border[idx] = val;
+          block.setStyle($scope.node, 'border', val ? border.join(' ') : null);
+        }
+
+        this.getStyles = function(node) {
+          return !node || !node.style ? {} : _.transform(node.style.split(';'), function(styles, style) {
+            var keyVal = _.map(style.split(':'), _.trim);
+            if (keyVal.length > 1 && keyVal[1].length) {
+              styles[keyVal[0]] = keyVal[1];
+            }
+          }, {});
+        };
+
+        this.setStyle = function(node, name, val) {
+          var styles = block.getStyles(node);
+          styles[name] = val;
+          if (!val) {
+            delete styles[name];
+          }
+          if (_.isEmpty(styles)) {
+            delete node.style;
+          } else {
+            node.style = _.transform(styles, function(combined, val, name) {
+              combined.push(name + ': ' + val);
+            }, []).join('; ');
+          }
+        };
+
+        function getBorder() {
+          var border = _.map((block.getStyles($scope.node).border || '').split(' '), _.trim);
+          return border.length > 2 ? border : null;
+        }
+
       }
     };
   });
@@ -659,6 +716,19 @@
         $scope.setAlign = function(val) {
           $scope.block.modifyClasses($scope.node, _.keys($scope.alignments), val === 'text-left' ? null : val);
         };
+
+        $scope.styles = _.transform(CRM.afformAdminData.styles, function(styles, val, key) {
+          styles['text-' + key] = val;
+        });
+
+        // Getter/setter for ng-model
+        $scope.getSetStyle = function(val) {
+          if (arguments.length) {
+            return $scope.block.modifyClasses($scope.node, _.keys($scope.styles), val === 'text-default' ? null : val);
+          }
+          return _.intersection(splitClass($scope.node['class']), _.keys($scope.styles))[0] || 'text-default';
+        };
+
       }
     };
   });
@@ -682,14 +752,9 @@
         //   "modelListCtrl.submit()": ts('Submit Form')
         // };
 
-        $scope.styles = {
-          'btn-default': ts('Default'),
-          'btn-primary': ts('Primary'),
-          'btn-success': ts('Success'),
-          'btn-info': ts('Info'),
-          'btn-warning': ts('Warning'),
-          'btn-danger': ts('Danger')
-        };
+        $scope.styles = _.transform(CRM.afformAdminData.styles, function(styles, val, key) {
+          styles['btn-' + key] = val;
+        });
 
         // Getter/setter for ng-model
         $scope.getSetStyle = function(val) {
diff --git a/ext/afform/gui/ang/afGuiEditor/block-menu.html b/ext/afform/gui/ang/afGuiEditor/block-menu.html
index f42066e6dbea..4a01d9ee9249 100644
--- a/ext/afform/gui/ang/afGuiEditor/block-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/block-menu.html
@@ -2,4 +2,33 @@
 <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
 <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
+<li>
+  <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
+    <select class="form-control" ng-model="getSetBorderStyle" ng-model-options="{getterSetter: true}">
+      <option value="">{{ ts('No border') }}</option>
+      <option value="solid">{{ ts('Solid') }}</option>
+      <option value="dotted">{{ ts('Dotted') }}</option>
+      <option value="dashed">{{ ts('Dashed') }}</option>
+      <option value="double">{{ ts('Double') }}</option>
+      <option value="groove">{{ ts('Groove') }}</option>
+      <option value="ridge">{{ ts('Ridge') }}</option>
+      <option value="inset">{{ ts('Inset') }}</option>
+      <option value="outset">{{ ts('Outset') }}</option>
+    </select>
+    <select class="form-control" ng-if="block.getStyles(node).border" ng-model="getSetBorderWidth" ng-model-options="{getterSetter: true}">
+      <option ng-repeat="num in ['1px', '2px', '3px', '4px', '5px', '6px', '7px', '8px', '9px']" value="{{ num }}">{{ num }}</option>
+    </select>
+    <input type="color" class="form-control" ng-if="block.getStyles(node).border" ng-model="getSetBorderColor" ng-model-options="{getterSetter: true}"/>
+  </div>
+</li>
+<li>
+  <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
+    <label>{{ ts('Background:') }}</label>
+    <input type="color" class="form-control" ng-model="getSetBackgroundColor" ng-model-options="{getterSetter: true}"/>
+    <a href class="" ng-click="getSetBackgroundColor(null)" ng-if="block.getStyles(node)['background-color']">
+      <i class="crm-i fa-times"></i>
+    </a>
+  </div>
+</li>
+<li role="separator" class="divider"></li>
 <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 8fc03edcc4cb..1c7df59e4f99 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -35,8 +35,8 @@
 <div ui-sortable="{handle: '.af-gui-bar', update: onDrop, connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in node['#children']" >
     <div ng-switch="block.getNodeType(item)">
-      <div ng-switch-when="fieldset" af-gui-block="item" class="af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
-      <div ng-switch-when="block" af-gui-block="item" class="af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
+      <div ng-switch-when="fieldset" af-gui-block="item" style="{{ item.style }}" class="af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
+      <div ng-switch-when="block" af-gui-block="item" style="{{ item.style }}" class="af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
       <div ng-switch-when="field" af-gui-field="item" entity-name="entityName" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
       <div ng-switch-when="button" af-gui-button="item" class="af-gui-element af-gui-button" />
diff --git a/ext/afform/gui/ang/afGuiEditor/button-menu.html b/ext/afform/gui/ang/afGuiEditor/button-menu.html
index ab67fb5ccd3a..9a55847f18d0 100644
--- a/ext/afform/gui/ang/afGuiEditor/button-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/button-menu.html
@@ -1,7 +1,7 @@
 <li>
   <div ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown form-inline" >
-    <label>{{ ts('Style:') }}</label>
-    <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}" title="{{ ts('Button style') }}">
+    <label>{{ ts('Color:') }}</label>
+    <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}" title="{{ ts('Button color scheme') }}">
       <option ng-repeat="(style, label) in styles" class="{{ style.replace('btn', 'bg') }}" value="{{ style }}">{{ label }}</option>
     </select>
   </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/text-menu.html b/ext/afform/gui/ang/afGuiEditor/text-menu.html
index 8fed55388d3e..7b4ab0ff81e4 100644
--- a/ext/afform/gui/ang/afGuiEditor/text-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/text-menu.html
@@ -15,6 +15,14 @@
     </div>
   </div>
 </li>
+<li>
+  <div ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown form-inline" >
+    <label>{{ ts('Color:') }}</label>
+    <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}" title="{{ ts('Button color scheme') }}">
+      <option ng-repeat="(style, label) in styles" class="{{ style.replace('text', 'bg') }}" value="{{ style }}">{{ label }}</option>
+    </select>
+  </div>
+</li>
 <li role="separator" class="divider"></li>
 <li>
   <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index a5a6261fc621..f7b182532bbd 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -8,6 +8,6 @@
     </div>
   </div>
 </div>
-<p class="af-gui-node-title {{ getAlign() + ' af-gui-text-' + node['#tag'] }}" >
+<p class="af-gui-node-title {{ node['class'] + ' af-gui-text-' + node['#tag'] }}" >
   <span af-gui-editable ng-model="node['#children'][0]['#text']">{{ node['#children'][0]['#text'] }}</span>
 </p>

From 22946dcf75472a488f5cbfe7e0a9e434539ccac2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 19 Nov 2019 09:50:09 -0500
Subject: [PATCH 539/834] GUI: Better widget for editing input type select

---
 ext/afform/core/afform.php                         |  4 ++++
 ext/afform/gui/ang/afGuiEditor.css                 | 13 +++++++++++++
 ext/afform/gui/ang/afGuiEditor.js                  |  8 --------
 .../gui/ang/afGuiEditor/inputType/Select.html      | 14 +++++++++++++-
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index a2eebb33ee86..4e1a8f5da242 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -333,6 +333,10 @@ function afform_civicrm_alterAngular($angular) {
           if (!empty($fieldInfo['options'])) {
             $fieldInfo['options'] = CRM_Utils_Array::makeNonAssociative($fieldInfo['options'], 'key', 'label');
           }
+          // Default placeholder for select inputs
+          if ($fieldInfo['input_type'] === 'Select') {
+            $fieldInfo['input_attrs'] = ($fieldInfo['input_attrs'] ?? []) + ['placeholder' => ts('Select')];
+          }
 
           $fieldDefn = $existingFieldDefn ? CRM_Utils_JS::getRawProps($existingFieldDefn) : [];
           foreach ($fieldInfo as $name => $prop) {
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index ae9d26e0b7bf..e13a9e16beae 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -316,6 +316,19 @@
 #afGuiEditor .af-gui-field-input-type-radio label.radio input[type=radio] {
   margin: 0;
 }
+#afGuiEditor .af-gui-field-input-type-select .input-group-btn {
+  position: initial;
+}
+#afGuiEditor .af-gui-field-input-type-select .input-group .dropdown-toggle {
+  padding: 3px 11px;
+}
+#afGuiEditor .af-gui-field-input-type-select .input-group .dropdown-menu {
+  width: 100%;
+  right: 0;
+}
+#afGuiEditor .af-gui-field-input-type-select .input-group .dropdown-menu a {
+  cursor: default;
+}
 
 #afGuiEditor .af-gui-text-h1 {
   font-weight: bolder;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index e8e18cd928cd..de6518bffb03 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -534,14 +534,6 @@
           return $scope.getDefn().options || ($scope.getProp('input_type') === 'CheckBox' ? null : yesNo);
         };
 
-        $scope.select2Options = function() {
-          return {
-            results: _.transform($scope.getOptions(), function(result, opt) {
-              result.push({id: opt.key, text: opt.label});
-            }, [])
-          };
-        };
-
         $scope.resetOptions = function() {
           delete $scope.node.defn.options;
         };
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
index 549e7a54a0de..6d06d3357189 100644
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
@@ -1 +1,13 @@
-<input autocomplete="off" crm-ui-select="{data: select2Options, multiple: defn.input_attrs.multiple}" />
+<div class="form-inline">
+  <div class="input-group">
+    <input autocomplete="off" class="form-control" placeholder="{{ ts('Select') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+    <div class="input-group-btn" af-gui-menu>
+      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="crm-i fa-caret-down"></i></button>
+      <ul class="dropdown-menu" ng-if="menu.open">
+        <li ng-repeat="opt in getOptions()" >
+          <a href>{{ opt.label }}</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>

From 0cbea2e88b83e01535d2c5cd6bb6404d7f3a670a Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 19 Nov 2019 16:05:12 -0500
Subject: [PATCH 540/834] GUI: Fix entity values selector

---
 ext/afform/gui/ang/afGuiEditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index de6518bffb03..62bb2f88c648 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -870,8 +870,8 @@
             if (field.fk_entity) {
               $el.crmEntityRef({entity: field.fk_entity, select:{multiple: multi}});
             } else if (field.options) {
-              var options = _.transform(field.options, function(options, val, key) {
-                options.push({id: key, text: val});
+              var options = _.transform(field.options, function(options, val) {
+                options.push({id: val.key, text: val.label});
               }, []);
               $el.select2({data: options, multiple: multi});
             } else if (dataType === 'Boolean') {

From 881d52bb0ac6005312d18332778948665b7e291e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 19 Nov 2019 16:22:02 -0500
Subject: [PATCH 541/834] GUI: use strict

---
 ext/afform/gui/ang/afGuiEditor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 62bb2f88c648..f4fb5fa81c35 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -1,4 +1,5 @@
 (function(angular, $, _) {
+  "use strict";
   angular.module('afGuiEditor', CRM.angRequires('afGuiEditor'));
 
   var editingIcon;

From 1f0603578bc746aa7b0d6ad4ade9455a3d696e72 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 21 Nov 2019 17:11:37 -0500
Subject: [PATCH 542/834] GUI: Improve adding/removing entities in correct
 order

---
 ext/afform/gui/ang/afGuiEditor.js           | 66 ++++++++++++---------
 ext/afform/gui/ang/afGuiEditor/palette.html |  8 +--
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index f4fb5fa81c35..9c51eb7305c4 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -29,7 +29,7 @@
         var ts = $scope.ts = CRM.ts();
         $scope.afform = null;
         $scope.saving = false;
-        $scope.selectedEntity = null;
+        $scope.selectedEntityName = null;
         $scope.meta = this.meta = CRM.afformAdminData;
         this.scope = $scope;
         var editor = $scope.editor = this;
@@ -71,9 +71,9 @@
           removeRecursive($scope.afform.layout, function(item) {
             return ('#text' in item) && _.trim(item['#text']).length === 0;
           });
-          $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
+          $scope.layout = findRecursive($scope.afform.layout, {'#tag': 'af-form'})[0];
           evaluate($scope.layout['#children']);
-          $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
+          $scope.entities = findRecursive($scope.layout['#children'], {'#tag': 'af-entity'}, 'name');
 
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
           $scope.$watch('afform', function () {
@@ -94,8 +94,11 @@
             name: entityType + num,
             label: entityType + ' ' + num
           });
-          $scope.layout['#children'].unshift($scope.entities[entityType + num]);
-          $scope.layout['#children'].push({
+          // Add this af-entity tag after the last existing one
+          var pos = 1 + _.findLastIndex($scope.layout['#children'], {'#tag': 'af-entity'});
+          $scope.layout['#children'].splice(pos, 0, $scope.entities[entityType + num]);
+          // Create a new af-fieldset container for the entity
+          var fieldset = {
             '#tag': 'fieldset',
             'af-fieldset': entityType + num,
             '#children': [
@@ -109,19 +112,26 @@
                 ]
               }
             ]
-          });
+          };
+          // Attempt to place the new af-fieldset after the last one on the form
+          pos = 1 + _.findLastIndex($scope.layout['#children'], 'af-fieldset');
+          if (pos) {
+            $scope.layout['#children'].splice(pos, 0, fieldset);
+          } else {
+            $scope.layout['#children'].push(fieldset);
+          }
           return entityType + num;
         };
 
         this.removeEntity = function(entityName) {
           delete $scope.entities[entityName];
-          _.remove($scope.layout['#children'], {'#tag': 'af-entity', name: entityName});
+          removeRecursive($scope.layout['#children'], {'#tag': 'af-entity', name: entityName});
           removeRecursive($scope.layout['#children'], {'af-fieldset': entityName});
           this.selectEntity(null);
         };
 
         this.selectEntity = function(entityName) {
-          $scope.selectedEntity = entityName;
+          $scope.selectedEntityName = entityName;
         };
 
         this.getField = function(entityType, fieldName) {
@@ -132,8 +142,8 @@
           return $scope.entities[entityName];
         };
 
-        this.getSelectedEntity = function() {
-          return $scope.selectedEntity;
+        this.getselectedEntityName = function() {
+          return $scope.selectedEntityName;
         };
 
         $scope.addEntity = function(entityType) {
@@ -183,30 +193,22 @@
     };
   });
 
-  function getTags(collection, tagName, indexBy) {
-    var items = [];
+  // Recursively searches a collection and its children using _.filter
+  // Returns an array of all matches, or an object if the indexBy param is used
+  function findRecursive(collection, predicate, indexBy) {
+    var items = _.filter(collection, predicate);
     _.each(collection, function(item) {
-      if (item && typeof item === 'object') {
-        if (item['#tag'] === tagName) {
-          items.push(item);
-        }
-        var childTags = item['#children'] ? getTags(item['#children'], tagName) : [];
-        if (childTags.length) {
-          Array.prototype.push.apply(items, childTags);
+      if (_.isPlainObject(item) && item['#children']) {
+        var childMatches = findRecursive(item['#children'], predicate);
+        if (childMatches.length) {
+          Array.prototype.push.apply(items, childMatches);
         }
       }
     });
     return indexBy ? _.indexBy(items, indexBy) : items;
   }
 
-  // Turns a space-separated list (e.g. css classes) into an array
-  function splitClass(str) {
-    if (_.isArray(str)) {
-      return str;
-    }
-    return str ? _.unique(_.trim(str).split(/\s+/g)) : [];
-  }
-
+  // Applies _.remove() to an item and its children
   function removeRecursive(collection, removeParams) {
     _.remove(collection, removeParams);
     _.each(collection, function(item) {
@@ -216,6 +218,14 @@
     });
   }
 
+  // Turns a space-separated list (e.g. css classes) into an array
+  function splitClass(str) {
+    if (_.isArray(str)) {
+      return str;
+    }
+    return str ? _.unique(_.trim(str).split(/\s+/g)) : [];
+  }
+
   angular.module('afGuiEditor').directive('afGuiEntity', function($timeout) {
     return {
       restrict: 'A',
@@ -376,7 +386,7 @@
         };
 
         $scope.isSelectedFieldset = function(entityName) {
-          return entityName === $scope.editor.getSelectedEntity();
+          return entityName === $scope.editor.getselectedEntityName();
         };
 
         $scope.selectEntity = function() {
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 9249d3fa2f4c..43c7bf407991 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -1,11 +1,11 @@
 <div id="afGuiEditor-palette-config" class="panel panel-default">
     <ul id="afGuiEditor-palette-tabs" class="panel-heading nav nav-tabs">
-      <li role="presentation" ng-class="{active: selectedEntity === null}">
+      <li role="presentation" ng-class="{active: selectedEntityName === null}">
         <a href ng-click="editor.selectEntity(null)">
           <span>{{ ts('Form Settings') }}</span>
         </a>
       </li>
-      <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntity === entity.name}">
+      <li role="presentation" ng-repeat="entity in entities" ng-class="{active: selectedEntityName === entity.name}">
         <a href ng-click="editor.selectEntity(entity.name)">
           <span af-gui-editable ng-model="entity.label">{{ entity.label }}</span>
         </a>
@@ -21,6 +21,6 @@
         </ul>
       </li>
     </ul>
-  <div class="panel-body" ng-include="'~/afGuiEditor/config-form.html'" ng-if="selectedEntity === null"></div>
-  <div class="panel-body" af-gui-entity="entity" ng-repeat="entity in entities" ng-if="selectedEntity === entity.name"></div>
+  <div class="panel-body" ng-include="'~/afGuiEditor/config-form.html'" ng-if="selectedEntityName === null"></div>
+  <div class="panel-body" af-gui-entity="entity" ng-repeat="entity in entities" ng-if="selectedEntityName === entity.name"></div>
 </div>

From fb5cfee16575cb7f08e0e6efb87098e98e96084e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 22 Nov 2019 12:49:17 -0500
Subject: [PATCH 543/834] Display improvements

---
 ext/afform/gui/ang/afGuiEditor.js                    | 4 ++--
 ext/afform/gui/ang/afGuiEditor/inputType/Date.html   | 4 ++--
 ext/afform/gui/ang/afGuiEditor/inputType/Number.html | 2 +-
 ext/afform/gui/ang/afGuiEditor/inputType/Select.html | 2 +-
 ext/afform/gui/ang/afGuiEditor/inputType/Text.html   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 9c51eb7305c4..16fe6b949cbb 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -815,13 +815,13 @@
           var htmlVal = element.html();
           if (!htmlVal) {
             htmlVal = scope.defaultValue;
-            element.html(htmlVal);
+            element.text(htmlVal);
           }
           ngModel.$setViewValue(htmlVal);
         }
 
         ngModel.$render = function() {
-          element.html(ngModel.$viewValue || scope.defaultValue);
+          element.text(ngModel.$viewValue || scope.defaultValue);
         };
 
         // Special handling for enter and escape keys
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Date.html b/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
index 32ce51104b34..a3d88733eb8e 100644
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Date.html
@@ -1,5 +1,5 @@
 <div class="form-inline">
-  <input autocomplete="off" class="form-control crm-form-date crm-placeholder-icon" placeholder="&#xF073" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+  <input autocomplete="off" class="form-control crm-form-date crm-placeholder-icon" placeholder="&#xF073" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />
   <span class="addon fa fa-calendar"></span>
-  <input autocomplete="off" ng-if="getProp('input_attrs.time')" placeholder="&#xF017" class="form-control crm-form-time crm-placeholder-icon" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" />
+  <input autocomplete="off" ng-if="getProp('input_attrs.time')" placeholder="&#xF017" class="form-control crm-form-time crm-placeholder-icon" ng-model="getSet('input_attrs.timePlaceholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Number.html b/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
index 812d08dae821..91c12c3a3b1d 100644
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Number.html
@@ -1 +1 @@
-<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
index 6d06d3357189..afebdae57049 100644
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Select.html
@@ -1,6 +1,6 @@
 <div class="form-inline">
   <div class="input-group">
-    <input autocomplete="off" class="form-control" placeholder="{{ ts('Select') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+    <input autocomplete="off" class="form-control" placeholder="{{ ts('Select') }}" title="{{ ts('Click to add placeholder text') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
     <div class="input-group-btn" af-gui-menu>
       <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="crm-i fa-caret-down"></i></button>
       <ul class="dropdown-menu" ng-if="menu.open">
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Text.html b/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
index 812d08dae821..91c12c3a3b1d 100644
--- a/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/Text.html
@@ -1 +1 @@
-<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+<input autocomplete="off" class="form-control" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" title="{{ ts('Click to add placeholder text') }}" />

From 192695ae61597fb2b59327d9e8f1022ab37dc19b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 24 Nov 2019 19:52:40 -0500
Subject: [PATCH 544/834] GUI: Add wysiwyg markup block

---
 ext/afform/core/CRM/Afform/ArrayHtml.php      |  29 ++-
 ext/afform/gui/ang/afGuiEditor.css            |  47 +++-
 ext/afform/gui/ang/afGuiEditor.js             | 242 ++++++++++++------
 .../gui/ang/afGuiEditor/block-menu.html       |  31 +--
 ext/afform/gui/ang/afGuiEditor/block.html     |   2 +
 .../gui/ang/afGuiEditor/editOptions.html      |   2 +-
 ext/afform/gui/ang/afGuiEditor/field.html     |   2 +-
 .../gui/ang/afGuiEditor/markup-menu.html      |  10 +
 ext/afform/gui/ang/afGuiEditor/markup.html    |  30 +++
 .../ang/afGuiEditor/menu-item-background.html |   7 +
 .../gui/ang/afGuiEditor/menu-item-border.html |  17 ++
 11 files changed, 290 insertions(+), 129 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/markup-menu.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/markup.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/menu-item-background.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/menu-item-border.html

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index a8f55b22732b..4705ea273184 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -115,6 +115,10 @@ public function convertArrayToHtml(array $array) {
       }
     }
 
+    if (isset($array['#markup'])) {
+      return $buf . '>' . $array['#markup'] . '</' . $tag . '>';
+    }
+
     if (empty($children) && $this->isSelfClosing($tag)) {
       $buf .= ' />';
     }
@@ -175,12 +179,20 @@ public function convertNodeToArray($node) {
       $arr = ['#tag' => $node->tagName];
       foreach ($node->attributes as $attribute) {
         $txt = $attribute->textContent;
-
         $type = $this->pickAttrType($node->tagName, $attribute->name);
         $arr[$attribute->name] = $this->decodeAttrValue($type, $txt);
       }
       if ($node->childNodes->length > 0) {
-        $arr['#children'] = $this->convertNodesToArray($node->childNodes);
+        // In shallow mode, return "af-markup" blocks as-is
+        if (!$this->deepCoding && !empty($arr['class']) && strpos($arr['class'], 'af-markup') !== FALSE) {
+          $arr['#markup'] = '';
+          foreach ($node->childNodes as $child) {
+            $arr['#markup'] .= $child->ownerDocument->saveXML($child);
+          }
+        }
+        else {
+          $arr['#children'] = $this->convertNodesToArray($node->childNodes);
+        }
       }
       return $arr;
     }
@@ -188,8 +200,7 @@ public function convertNodeToArray($node) {
       return ['#text' => $node->textContent];
     }
     elseif ($node instanceof DOMComment) {
-      $arr = ['#comment' => $node->nodeValue];
-      return $arr;
+      return ['#comment' => $node->nodeValue];
     }
     else {
       throw new \RuntimeException("Unrecognized DOM node");
@@ -235,15 +246,7 @@ protected function pickAttrType($tag, $attrName) {
       return 'text';
     }
 
-    if (isset($this->protoSchema[$tag][$attrName])) {
-      return $this->protoSchema[$tag][$attrName];
-    }
-
-    if (isset($this->protoSchema['*'][$attrName])) {
-      return $this->protoSchema['*'][$attrName];
-    }
-
-    return $this->protoSchema['*']['*'];
+    return $this->protoSchema[$tag][$attrName] ?? $this->protoSchema['*'][$attrName] ?? $this->protoSchema['*']['*'];
   }
 
   /**
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index e13a9e16beae..8517b3c39a5b 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -138,6 +138,29 @@
   border: 2px dashed #757575;
 }
 
+#afGuiEditor .af-gui-markup {
+  padding: 22px 3px 3px;
+  position: relative;
+}
+
+#afGuiEditor div.af-gui-markup-content {
+  display: block;
+  position: relative;
+  padding: 0 !important;
+}
+
+#afGuiEditor .af-gui-markup-content-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+#afGuiEditor .af-gui-markup-content:hover .af-gui-markup-content-overlay {
+  background-color: rgba(255, 255, 255, .2);
+}
+
 #afGuiEditor #afGuiEditor-canvas .af-entity-selected {
   border: 2px dashed #0071bd;
 }
@@ -366,34 +389,38 @@
   font-style: italic;
 }
 
-#afGuiEditor.af-gui-editing-options {
+#afGuiEditor.af-gui-editing-content {
   pointer-events: none;
   cursor: default;
 }
-#afGuiEditor.af-gui-editing-options .panel-heading,
-#afGuiEditor.af-gui-editing-options .af-gui-element,
-.af-gui-editing-options #afGuiEditor-palette .panel-body > * {
+#afGuiEditor.af-gui-editing-content .panel-heading,
+#afGuiEditor.af-gui-editing-content .af-gui-element,
+#afGuiEditor.af-gui-editing-content .af-gui-markup-content,
+.af-gui-editing-content #afGuiEditor-palette .panel-body > * {
   opacity: .5;
 }
-#afGuiEditor.af-gui-editing-options .af-gui-block {
+#afGuiEditor.af-gui-editing-content .af-gui-block {
   border: 2px solid transparent;
 }
-#afGuiEditor.af-gui-editing-options .af-gui-bar:not(.af-gui-edit-options-bar) {
+#afGuiEditor.af-gui-editing-content .af-gui-bar {
   visibility: hidden;
 }
-#afGuiEditor.af-gui-editing-options .af-gui-bar:before {
+#afGuiEditor.af-gui-editing-content .af-gui-bar:before {
   background: none;
 }
 
-#afGuiEditor [af-gui-edit-options] {
-  border: 2px solid #0071bd;
+#afGuiEditor .af-gui-content-editing-area {
   pointer-events: auto;
   cursor: auto;
   padding-top: 35px;
   position: relative;
 }
 
-#afGuiEditor [af-gui-edit-options] .af-gui-edit-options-bar {
+#afGuiEditor [af-gui-edit-options] {
+  border: 2px solid #0071bd;
+}
+
+#afGuiEditor .af-gui-content-editing-area .af-gui-edit-options-bar {
   height: 30px;
   font-family: "Courier New", Courier, monospace;
   font-size: 12px;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 16fe6b949cbb..2db100106cc9 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -337,17 +337,6 @@
         var ts = $scope.ts = CRM.ts();
         this.node = $scope.node;
 
-        this.modifyClasses = function(item, toRemove, toAdd) {
-          var classes = splitClass(item['class']);
-          if (toRemove) {
-            classes = _.difference(classes, splitClass(toRemove));
-          }
-          if (toAdd) {
-            classes = _.unique(classes.concat(splitClass(toAdd)));
-          }
-          item['class'] = classes.join(' ');
-        };
-
         this.getNodeType = function(node) {
           if (!node) {
             return null;
@@ -368,6 +357,9 @@
           if (_.contains(classes, 'af-button')) {
             return 'button';
           }
+          if (_.contains(classes, 'af-markup')) {
+            return 'markup';
+          }
           return null;
         };
 
@@ -376,8 +368,12 @@
           var newBlock = _.defaults({
             '#tag': classes.shift(),
             'class': classes.join(' '),
-            '#children': classes[0] === 'af-block' ? [] : [{'#text': ts('Enter text')}]
           }, props);
+          if (classes[0] === 'af-block') {
+            newBlock['#children'] = [];
+          } else if (classes[0] === 'af-text' || classes[0] === 'af-button') {
+            newBlock['#children'] = [{'#text': ts('Enter text')}];
+          }
           $scope.node['#children'].push(newBlock);
         };
 
@@ -440,66 +436,9 @@
           if (val !== 'af-layout-rows') {
             classes.push(val);
           }
-          block.modifyClasses($scope.node, _.keys($scope.layouts), classes);
-        };
-
-        $scope.getSetBorderWidth = function(width) {
-          return getSetBorderProp(0, arguments.length ? width : null);
-        };
-
-        $scope.getSetBorderStyle = function(style) {
-          return getSetBorderProp(1, arguments.length ? style : null);
-        };
-
-        $scope.getSetBorderColor = function(color) {
-          return getSetBorderProp(2, arguments.length ? color : null);
-        };
-
-        $scope.getSetBackgroundColor = function(color) {
-          if (!arguments.length) {
-            return block.getStyles($scope.node)['background-color'] || '#ffffff';
-          }
-          block.setStyle($scope.node, 'background-color', color);
-        };
-        
-        function getSetBorderProp(idx, val) {
-          var border = getBorder() || ['1px', '', '#000000'];
-          if (val === null) {
-            return border[idx];
-          }
-          border[idx] = val;
-          block.setStyle($scope.node, 'border', val ? border.join(' ') : null);
-        }
-
-        this.getStyles = function(node) {
-          return !node || !node.style ? {} : _.transform(node.style.split(';'), function(styles, style) {
-            var keyVal = _.map(style.split(':'), _.trim);
-            if (keyVal.length > 1 && keyVal[1].length) {
-              styles[keyVal[0]] = keyVal[1];
-            }
-          }, {});
-        };
-
-        this.setStyle = function(node, name, val) {
-          var styles = block.getStyles(node);
-          styles[name] = val;
-          if (!val) {
-            delete styles[name];
-          }
-          if (_.isEmpty(styles)) {
-            delete node.style;
-          } else {
-            node.style = _.transform(styles, function(combined, val, name) {
-              combined.push(name + ': ' + val);
-            }, []).join('; ');
-          }
+          modifyClasses($scope.node, _.keys($scope.layouts), classes);
         };
 
-        function getBorder() {
-          var border = _.map((block.getStyles($scope.node).border || '').split(' '), _.trim);
-          return border.length > 2 ? border : null;
-        }
-
       }
     };
   });
@@ -551,7 +490,7 @@
 
         $scope.editOptions = function() {
           $scope.editingOptions = true;
-          $('#afGuiEditor').addClass('af-gui-editing-options');
+          $('#afGuiEditor').addClass('af-gui-editing-content');
         };
 
         $scope.inputTypeCanBe = function(type) {
@@ -674,7 +613,7 @@
 
         $scope.close = function() {
           $scope.field.setEditingOptions(false);
-          $('#afGuiEditor').removeClass('af-gui-editing-options');
+          $('#afGuiEditor').removeClass('af-gui-editing-content');
         };
       }
     };
@@ -717,7 +656,7 @@
         };
 
         $scope.setAlign = function(val) {
-          $scope.block.modifyClasses($scope.node, _.keys($scope.alignments), val === 'text-left' ? null : val);
+          modifyClasses($scope.node, _.keys($scope.alignments), val === 'text-left' ? null : val);
         };
 
         $scope.styles = _.transform(CRM.afformAdminData.styles, function(styles, val, key) {
@@ -727,7 +666,7 @@
         // Getter/setter for ng-model
         $scope.getSetStyle = function(val) {
           if (arguments.length) {
-            return $scope.block.modifyClasses($scope.node, _.keys($scope.styles), val === 'text-default' ? null : val);
+            return modifyClasses($scope.node, _.keys($scope.styles), val === 'text-default' ? null : val);
           }
           return _.intersection(splitClass($scope.node['class']), _.keys($scope.styles))[0] || 'text-default';
         };
@@ -735,7 +674,62 @@
       }
     };
   });
-  
+
+  var richtextId = 0;
+  angular.module('afGuiEditor').directive('afGuiMarkup', function($sce, $timeout) {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/markup.html',
+      scope: {
+        node: '=afGuiMarkup'
+      },
+      require: '^^afGuiBlock',
+      link: function($scope, element, attrs, block) {
+        $scope.block = block;
+        // CRM.wysiwyg doesn't work without a dom id
+        $scope.id = 'af-markup-editor-' + richtextId++;
+
+        // When creating a new markup block, go straight to edit mode
+        $timeout(function() {
+          if ($scope.node['#markup'] === false) {
+            $scope.edit();
+          }
+        });
+      },
+      controller: function($scope) {
+        var ts = $scope.ts = CRM.ts();
+
+        $scope.getMarkup = function() {
+          return $sce.trustAsHtml($scope.node['#markup'] || '');
+        };
+
+        $scope.edit = function() {
+          $('#afGuiEditor').addClass('af-gui-editing-content');
+          $scope.editingMarkup = true;
+          CRM.wysiwyg.create('#' + $scope.id);
+          CRM.wysiwyg.setVal('#' + $scope.id, $scope.node['#markup'] || '<p></p>');
+        };
+
+        $scope.save = function() {
+          $scope.node['#markup'] = CRM.wysiwyg.getVal('#' + $scope.id);
+          $scope.close();
+        };
+
+        $scope.close = function() {
+          CRM.wysiwyg.destroy('#' + $scope.id);
+          $('#afGuiEditor').removeClass('af-gui-editing-content');
+          // If a newly-added block was canceled, just remove it
+          if ($scope.node['#markup'] === false) {
+            $scope.block.removeBlock($scope.node);
+          } else {
+            $scope.editingMarkup = false;
+          }
+        };
+      }
+    };
+  });
+
+
   angular.module('afGuiEditor').directive('afGuiButton', function() {
     return {
       restrict: 'A',
@@ -762,7 +756,7 @@
         // Getter/setter for ng-model
         $scope.getSetStyle = function(val) {
           if (arguments.length) {
-            return $scope.block.modifyClasses($scope.node, _.keys($scope.styles), ['btn', val]);
+            return modifyClasses($scope.node, _.keys($scope.styles), ['btn', val]);
           }
           return _.intersection(splitClass($scope.node['class']), _.keys($scope.styles))[0] || '';
         };
@@ -799,6 +793,67 @@
     };
   });
 
+  // Menu item to control the border property of a node
+  angular.module('afGuiEditor').directive('afGuiMenuItemBorder', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/menu-item-border.html',
+      scope: {
+        node: '=afGuiMenuItemBorder'
+      },
+      link: function($scope, element, attrs) {
+        var ts = $scope.ts = CRM.ts();
+
+        $scope.getSetBorderWidth = function(width) {
+          return getSetBorderProp($scope.node, 0, arguments.length ? width : null);
+        };
+
+        $scope.getSetBorderStyle = function(style) {
+          return getSetBorderProp($scope.node, 1, arguments.length ? style : null);
+        };
+
+        $scope.getSetBorderColor = function(color) {
+          return getSetBorderProp($scope.node, 2, arguments.length ? color : null);
+        };
+
+        function getSetBorderProp(node, idx, val) {
+          var border = getBorder(node) || ['1px', '', '#000000'];
+          if (val === null) {
+            return border[idx];
+          }
+          border[idx] = val;
+          setStyle(node, 'border', val ? border.join(' ') : null);
+        }
+
+        function getBorder(node) {
+          var border = _.map((getStyles(node).border || '').split(' '), _.trim);
+          return border.length > 2 ? border : null;
+        }
+      }
+    };
+  });
+
+  // Menu item to control the background property of a node
+  angular.module('afGuiEditor').directive('afGuiMenuItemBackground', function() {
+    return {
+      restrict: 'A',
+      templateUrl: '~/afGuiEditor/menu-item-background.html',
+      scope: {
+        node: '=afGuiMenuItemBackground'
+      },
+      link: function($scope, element, attrs) {
+        var ts = $scope.ts = CRM.ts();
+
+        $scope.getSetBackgroundColor = function(color) {
+          if (!arguments.length) {
+            return getStyles($scope.node)['background-color'] || '#ffffff';
+          }
+          setStyle($scope.node, 'background-color', color);
+        };
+      }
+    };
+  });
+
   // Editable titles using ngModel & html5 contenteditable
   // Cribbed from ContactLayoutEditor
   angular.module('afGuiEditor').directive("afGuiEditable", function() {
@@ -937,4 +992,39 @@
     };
   });
 
+  function getStyles(node) {
+    return !node || !node.style ? {} : _.transform(node.style.split(';'), function(styles, style) {
+      var keyVal = _.map(style.split(':'), _.trim);
+      if (keyVal.length > 1 && keyVal[1].length) {
+        styles[keyVal[0]] = keyVal[1];
+      }
+    }, {});
+  }
+
+  function setStyle(node, name, val) {
+    var styles = getStyles(node);
+    styles[name] = val;
+    if (!val) {
+      delete styles[name];
+    }
+    if (_.isEmpty(styles)) {
+      delete node.style;
+    } else {
+      node.style = _.transform(styles, function(combined, val, name) {
+        combined.push(name + ': ' + val);
+      }, []).join('; ');
+    }
+  }
+
+  function modifyClasses(node, toRemove, toAdd) {
+    var classes = splitClass(node['class']);
+    if (toRemove) {
+      classes = _.difference(classes, splitClass(toRemove));
+    }
+    if (toAdd) {
+      classes = _.unique(classes.concat(splitClass(toAdd)));
+    }
+    node['class'] = classes.join(' ');
+  }
+
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afGuiEditor/block-menu.html b/ext/afform/gui/ang/afGuiEditor/block-menu.html
index 4a01d9ee9249..29d82ca653de 100644
--- a/ext/afform/gui/ang/afGuiEditor/block-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/block-menu.html
@@ -1,34 +1,9 @@
 <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
 <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
+<li><a href ng-click="addBlock('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
 <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
-<li>
-  <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
-    <select class="form-control" ng-model="getSetBorderStyle" ng-model-options="{getterSetter: true}">
-      <option value="">{{ ts('No border') }}</option>
-      <option value="solid">{{ ts('Solid') }}</option>
-      <option value="dotted">{{ ts('Dotted') }}</option>
-      <option value="dashed">{{ ts('Dashed') }}</option>
-      <option value="double">{{ ts('Double') }}</option>
-      <option value="groove">{{ ts('Groove') }}</option>
-      <option value="ridge">{{ ts('Ridge') }}</option>
-      <option value="inset">{{ ts('Inset') }}</option>
-      <option value="outset">{{ ts('Outset') }}</option>
-    </select>
-    <select class="form-control" ng-if="block.getStyles(node).border" ng-model="getSetBorderWidth" ng-model-options="{getterSetter: true}">
-      <option ng-repeat="num in ['1px', '2px', '3px', '4px', '5px', '6px', '7px', '8px', '9px']" value="{{ num }}">{{ num }}</option>
-    </select>
-    <input type="color" class="form-control" ng-if="block.getStyles(node).border" ng-model="getSetBorderColor" ng-model-options="{getterSetter: true}"/>
-  </div>
-</li>
-<li>
-  <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
-    <label>{{ ts('Background:') }}</label>
-    <input type="color" class="form-control" ng-model="getSetBackgroundColor" ng-model-options="{getterSetter: true}"/>
-    <a href class="" ng-click="getSetBackgroundColor(null)" ng-if="block.getStyles(node)['background-color']">
-      <i class="crm-i fa-times"></i>
-    </a>
-  </div>
-</li>
+<li af-gui-menu-item-border="node"></li>
+<li af-gui-menu-item-background="node"></li>
 <li role="separator" class="divider"></li>
 <li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/block.html
index 1c7df59e4f99..703147083a05 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/block.html
@@ -24,6 +24,7 @@
     <ul class="dropdown-menu" ng-if="menu.open">
       <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
       <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
+      <li><a href ng-click="addBlock('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
       <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
       <li role="separator" class="divider"></li>
       <li ng-repeat="entity in editor.scope.entities">
@@ -39,6 +40,7 @@
       <div ng-switch-when="block" af-gui-block="item" style="{{ item.style }}" class="af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
       <div ng-switch-when="field" af-gui-field="item" entity-name="entityName" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
+      <div ng-switch-when="markup" af-gui-markup="item" class="af-gui-markup" />
       <div ng-switch-when="button" af-gui-button="item" class="af-gui-element af-gui-button" />
     </div>
   </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/editOptions.html b/ext/afform/gui/ang/afGuiEditor/editOptions.html
index c576262e2d59..e961eca7a304 100644
--- a/ext/afform/gui/ang/afGuiEditor/editOptions.html
+++ b/ext/afform/gui/ang/afGuiEditor/editOptions.html
@@ -7,7 +7,7 @@ <h4 class="pull-left">{{ ts('Edit option list') }}</h4>
     </button>
     <button type="button" class="btn btn-success" ng-click="save()">
       <i class="crm-i fa-check-circle"></i>
-      {{ ts('Save') }}
+      {{ ts('Done') }}
     </button>
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index 70288523f313..b44de5df688b 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -1,4 +1,4 @@
-<div af-gui-edit-options ng-if="editingOptions"></div>
+<div af-gui-edit-options ng-if="editingOptions" class="af-gui-content-editing-area"></div>
 <div ng-if="!editingOptions" class="af-gui-element af-gui-field" >
   <div class="af-gui-bar" title="{{ getEntity().label + ': ' + getDefn().title }}">
     <div class="form-inline pull-right">
diff --git a/ext/afform/gui/ang/afGuiEditor/markup-menu.html b/ext/afform/gui/ang/afGuiEditor/markup-menu.html
new file mode 100644
index 000000000000..ff45a264a8f2
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/markup-menu.html
@@ -0,0 +1,10 @@
+<li>
+  <a href ng-click="edit()">{{ ts('Edit content') }}</a>
+</li>
+<li role="separator" class="divider"></li>
+<li af-gui-menu-item-border="node"></li>
+<li af-gui-menu-item-background="node"></li>
+<li role="separator" class="divider"></li>
+<li>
+  <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this content') }}</span></a>
+</li>
diff --git a/ext/afform/gui/ang/afGuiEditor/markup.html b/ext/afform/gui/ang/afGuiEditor/markup.html
new file mode 100644
index 000000000000..c9cd77cfab63
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/markup.html
@@ -0,0 +1,30 @@
+<div class="af-gui-bar">
+  <div class="form-inline pull-right">
+    <div class="btn-group pull-right" af-gui-menu>
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+        <span><i class="crm-i fa-gear"></i></span>
+      </button>
+      <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/markup-menu.html'"></ul>
+    </div>
+  </div>
+</div>
+<div ng-if="!editingMarkup" ng-click="edit()" class="af-gui-markup-content crm-editable-enabled {{ node['class'] }}">
+  <div ng-bind-html="getMarkup()" style="{{ node.style }}"></div>
+  <div class="af-gui-markup-content-overlay"></div>
+</div>
+<div class="af-gui-content-editing-area">
+  <div class="af-gui-edit-options-bar" ng-if="editingMarkup">
+    <h4 class="pull-left">{{ ts('Editing content') }}</h4>
+    <div class="btn-group-sm pull-right">
+      <button type="button" class="btn btn-default" ng-click="close()">
+        <i class="crm-i fa-times-circle"></i>
+        {{ ts('Cancel') }}
+      </button>
+      <button type="button" class="btn btn-success" ng-click="save()">
+        <i class="crm-i fa-check-circle"></i>
+        {{ ts('Done') }}
+      </button>
+    </div>
+  </div>
+  <textarea id="{{ id }}" ng-show="editingMarkup"></textarea>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/menu-item-background.html b/ext/afform/gui/ang/afGuiEditor/menu-item-background.html
new file mode 100644
index 000000000000..ce95c3153e12
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/menu-item-background.html
@@ -0,0 +1,7 @@
+<div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
+  <label>{{ ts('Background:') }}</label>
+  <input type="color" class="form-control" ng-model="getSetBackgroundColor" ng-model-options="{getterSetter: true}"/>
+  <a href class="" ng-click="getSetBackgroundColor(null)" ng-if="block.getStyles(node)['background-color']">
+    <i class="crm-i fa-times"></i>
+  </a>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/menu-item-border.html b/ext/afform/gui/ang/afGuiEditor/menu-item-border.html
new file mode 100644
index 000000000000..abb85c2f12f7
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/menu-item-border.html
@@ -0,0 +1,17 @@
+<div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
+  <select class="form-control" ng-model="getSetBorderStyle" ng-model-options="{getterSetter: true}">
+    <option value="">{{ ts('No border') }}</option>
+    <option value="solid">{{ ts('Solid') }}</option>
+    <option value="dotted">{{ ts('Dotted') }}</option>
+    <option value="dashed">{{ ts('Dashed') }}</option>
+    <option value="double">{{ ts('Double') }}</option>
+    <option value="groove">{{ ts('Groove') }}</option>
+    <option value="ridge">{{ ts('Ridge') }}</option>
+    <option value="inset">{{ ts('Inset') }}</option>
+    <option value="outset">{{ ts('Outset') }}</option>
+  </select>
+  <select class="form-control" ng-if="getSetBorderStyle()" ng-model="getSetBorderWidth" ng-model-options="{getterSetter: true}">
+    <option ng-repeat="num in ['1px', '2px', '3px', '4px', '5px', '6px', '7px', '8px', '9px']" value="{{ num }}">{{ num }}</option>
+  </select>
+  <input type="color" class="form-control" ng-if="getSetBorderStyle()" ng-model="getSetBorderColor" ng-model-options="{getterSetter: true}"/>
+</div>

From 339fea0977a4b0c9050111467c0f22b7a68447e0 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 25 Nov 2019 09:56:25 -0500
Subject: [PATCH 545/834] GUI: Add new block to the top

Creates new items at top of block, underneath the fieldset legend if present
---
 ext/afform/gui/ang/afGuiEditor.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 2db100106cc9..7ad8e075ede3 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -374,7 +374,9 @@
           } else if (classes[0] === 'af-text' || classes[0] === 'af-button') {
             newBlock['#children'] = [{'#text': ts('Enter text')}];
           }
-          $scope.node['#children'].push(newBlock);
+          // Add new block to the top, underneath the fieldset legend if present
+          var pos = $scope.node['#children'].length && $scope.node['#children'][0]['#tag'] === 'legend' ? 1 : 0;
+          $scope.node['#children'].splice(pos, 0, newBlock);
         };
 
         this.removeBlock = function(node) {

From 2f663f462b0048e901982a6d92fd3ad7ea94ef43 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 26 Nov 2019 09:13:49 -0500
Subject: [PATCH 546/834] GUI: Correctly handle naming a newly created form

---
 .../core/Civi/Api4/Utils/AfformSaveTrait.php  | 19 +++++++++----------
 ext/afform/gui/ang/afGuiEditor.js             | 16 ++++++++--------
 ext/afform/gui/ang/afGuiEditor/canvas.html    |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 6322c50d8063..ff0ada980e44 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -14,20 +14,19 @@ protected function writeRecord($item) {
     /** @var \CRM_Afform_AfformScanner $scanner */
     $scanner = \Civi::service('afform_scanner');
 
-    $name = $item['name'] ?? NULL;
     // If no name given, create a unique name based on the title
-    if (!$name) {
-      $name = \CRM_Utils_String::munge($item['title'], '-');
+    if (empty($item['name'])) {
+      $item['name'] = _afform_angular_module_name(\CRM_Utils_String::munge($item['title'], '-'));
       $suffix = '';
       while (
-        file_exists($scanner->createSiteLocalPath($name . $suffix, \CRM_Afform_AfformScanner::METADATA_FILE))
-        || file_exists($scanner->createSiteLocalPath($name . $suffix, 'aff.html'))
+        file_exists($scanner->createSiteLocalPath($item['name'] . $suffix, \CRM_Afform_AfformScanner::METADATA_FILE))
+        || file_exists($scanner->createSiteLocalPath($item['name'] . $suffix, 'aff.html'))
       ) {
         $suffix++;
       }
-      $name .= $suffix;
+      $item['name'] .= $suffix;
     }
-    elseif (!preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $name)) {
+    elseif (!preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
       throw new \API_Exception("Afform.{$this->getActionName()}: name should use alphanumerics and dashes.");
     }
 
@@ -36,7 +35,7 @@ protected function writeRecord($item) {
 
     // Create or update aff.html.
     if (isset($updates['layout'])) {
-      $layoutPath = $scanner->createSiteLocalPath($name, 'aff.html');
+      $layoutPath = $scanner->createSiteLocalPath($item['name'], 'aff.html');
       \CRM_Utils_File::createDir(dirname($layoutPath));
       file_put_contents($layoutPath, $this->convertInputToHtml($updates['layout']));
       // FIXME check for writability then success. Report errors.
@@ -47,9 +46,9 @@ protected function writeRecord($item) {
     unset($meta['layout']);
     unset($meta['name']);
     if (!empty($meta)) {
-      $metaPath = $scanner->createSiteLocalPath($name, \CRM_Afform_AfformScanner::METADATA_FILE);
+      $metaPath = $scanner->createSiteLocalPath($item['name'], \CRM_Afform_AfformScanner::METADATA_FILE);
       if (file_exists($metaPath)) {
-        $orig = $scanner->getMeta($name);
+        $orig = $scanner->getMeta($item['name']);
       }
       \CRM_Utils_File::createDir(dirname($metaPath));
       file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 7ad8e075ede3..4428b72bb892 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -4,7 +4,7 @@
 
   var editingIcon;
 
-  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse, $timeout) {
+  angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse, $timeout, $location) {
     return {
       restrict: 'A',
       templateUrl: '~/afGuiEditor/main.html',
@@ -152,13 +152,13 @@
         };
 
         $scope.save = function() {
-          $scope.saving = true;
-          CRM.api4('Afform', 'save', {records: [JSON.parse(angular.toJson($scope.afform))]})
-            .then(function () {
-              $scope.$apply(function () {
-                $scope.saving = false;
-                $scope.changesSaved = true;
-              });
+          $scope.saving = $scope.changesSaved = true;
+          crmApi4('Afform', 'save', {records: [JSON.parse(angular.toJson($scope.afform))]})
+            .then(function (data) {
+              $scope.saving = false;
+              $scope.afform.name = data[0].name;
+              // FIXME: This causes an unnecessary reload when saving a new form
+              $location.search('name', data[0].name);
             });
         };
 
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 37d7967506f6..2d116faac87c 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -4,7 +4,7 @@
       <div class="btn-group btn-group-md pull-right">
         <button class="btn" ng-class="{'btn-primary': !changesSaved && !saving, 'btn-warning': saving, 'btn-success': changesSaved}" ng-disabled="changesSaved || saving" ng-click="save()">
           <i class="crm-i" ng-class="{'fa-check': !saving, 'fa-spin fa-spinner': saving}"></i>
-          <span ng-if="changesSaved">{{ ts('Saved') }}</span>
+          <span ng-if="changesSaved && !saving">{{ ts('Saved') }}</span>
           <span ng-if="!changesSaved && !saving">{{ ts('Save') }}</span>
           <span ng-if="saving">{{ ts('Saving...') }}</span>
         </button>

From 1787c8cd515f47792b5045e2f80816ee409df5f7 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 26 Nov 2019 09:39:23 -0500
Subject: [PATCH 547/834] Use canonical name in api.afform.get

Names were being munged in the api which led to a mismatch between
filenames and afform names.
---
 ext/afform/core/CRM/Afform/AfformScanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index f7ba60a704b5..d4a2bef678a3 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -194,7 +194,7 @@ private function appendFilePaths(&$formPaths, $parent, $priority) {
 
     foreach ($files as $file) {
       $fileBase = preg_replace(self::FILE_REGEXP, '', $file);
-      $name = _afform_angular_module_name(basename($fileBase));
+      $name = basename($fileBase);
       $formPaths[$name][$priority] = $fileBase;
       ksort($formPaths[$name]);
     }

From faece79db039f038d5beb181e0d4178e67a49372 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 26 Nov 2019 12:27:46 -0500
Subject: [PATCH 548/834] Remove client_route for now; might be yagni

---
 ext/afform/core/CRM/Afform/AfformScanner.php | 2 +-
 ext/afform/core/afform.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index d4a2bef678a3..6a6c79734317 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -120,7 +120,7 @@ public function clear() {
    * @param string $name
    *   Ex: 'view-individual'
    * @return array
-   *   An array with some mix of the following keys: name, title, description, client_route, server_route, requires.
+   *   An array with some mix of the following keys: name, title, description, server_route, requires, is_public.
    *   NOTE: This is only data available in *.aff.json. It does *NOT* include layout.
    *   Ex: [
    *     'name' => 'view-individual',
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 4e1a8f5da242..eee6d1d0250d 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -5,7 +5,7 @@
 use Civi\Api4\Action\Afform\Submit;
 
 function _afform_fields() {
-  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'client_route', 'is_public'];
+  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'is_public'];
 }
 
 /**

From 50868e8df1dd501961d7298f59f8b83c08e2a068 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 26 Nov 2019 13:33:53 -0500
Subject: [PATCH 549/834] Api improvements and test fix

Improve efficiency by not fetching layout if not needed in api.get
Fix test failure by correctly merging existing metadata during update
---
 .../core/Civi/Api4/Action/Afform/Get.php      |  2 +-
 .../core/Civi/Api4/Utils/AfformSaveTrait.php  | 27 ++++++++++---------
 ext/afform/core/afform.php                    | 17 +++++-------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index cb059391fe08..92d5df45644d 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -19,7 +19,7 @@ public function getRecords() {
     $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
-      $layout = $scanner->getLayout($name);
+      $layout = $this->_isFieldSelected('layout') ? $scanner->getLayout($name) : NULL;
       if ($layout !== NULL) {
         // FIXME check for validity?
         $record['layout'] = $this->convertHtmlToOutput($layout);
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index ff0ada980e44..406f99ea4b9a 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -25,31 +25,34 @@ protected function writeRecord($item) {
         $suffix++;
       }
       $item['name'] .= $suffix;
+      $orig = NULL;
     }
     elseif (!preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
       throw new \API_Exception("Afform.{$this->getActionName()}: name should use alphanumerics and dashes.");
     }
+    else {
+      // Fetch existing metadata
+      $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->addSelect('name')->execute()->column('name');
+      unset($fields[array_search('layout', $fields)]);
+      unset($fields[array_search('name', $fields)]);
+      $orig = \Civi\Api4\Afform::get()->setCheckPermissions(FALSE)->addWhere('name', '=', $item['name'])->setSelect($fields)->execute()->first();
+    }
 
     // FIXME validate all field data.
-    $updates = _afform_fields_filter($item);
+    $item = _afform_fields_filter($item);
 
     // Create or update aff.html.
-    if (isset($updates['layout'])) {
+    if (isset($item['layout'])) {
       $layoutPath = $scanner->createSiteLocalPath($item['name'], 'aff.html');
       \CRM_Utils_File::createDir(dirname($layoutPath));
-      file_put_contents($layoutPath, $this->convertInputToHtml($updates['layout']));
+      file_put_contents($layoutPath, $this->convertInputToHtml($item['layout']));
       // FIXME check for writability then success. Report errors.
     }
 
-    $orig = NULL;
-    $meta = $updates;
-    unset($meta['layout']);
-    unset($meta['name']);
+    $meta = $item + (array) $orig;
+    unset($meta['layout'], $meta['name']);
     if (!empty($meta)) {
       $metaPath = $scanner->createSiteLocalPath($item['name'], \CRM_Afform_AfformScanner::METADATA_FILE);
-      if (file_exists($metaPath)) {
-        $orig = $scanner->getMeta($item['name']);
-      }
       \CRM_Utils_File::createDir(dirname($metaPath));
       file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
       // FIXME check for writability then success. Report errors.
@@ -58,13 +61,13 @@ protected function writeRecord($item) {
     // We may have changed list of files covered by the cache.
     _afform_clear();
 
-    if (($updates['server_route'] ?? NULL) !== ($orig['server_route'] ?? NULL)) {
+    if (($item['server_route'] ?? NULL) !== ($orig['server_route'] ?? NULL)) {
       \CRM_Core_Menu::store();
       \CRM_Core_BAO_Navigation::resetNavigation();
     }
     // FIXME if asset-caching is enabled, then flush the asset cache.
 
-    return $updates;
+    return $meta + $item;
   }
 
 }
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index eee6d1d0250d..273ed37c83b8 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -4,10 +4,6 @@
 use CRM_Afform_ExtensionUtil as E;
 use Civi\Api4\Action\Afform\Submit;
 
-function _afform_fields() {
-  return ['name', 'title', 'description', 'requires', 'layout', 'server_route', 'is_public'];
-}
-
 /**
  * Filter the content of $params to only have supported afform fields.
  *
@@ -16,15 +12,16 @@ function _afform_fields() {
  */
 function _afform_fields_filter($params) {
   $result = [];
-  foreach (_afform_fields() as $field) {
-    if (isset($params[$field])) {
-      $result[$field] = $params[$field];
+  $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->execute()->indexBy('name');
+  foreach ($fields as $fieldName => $field) {
+    if (isset($params[$fieldName])) {
+      $result[$fieldName] = $params[$fieldName];
     }
 
-    if (isset($result[$field])) {
-      switch ($field) {
+    if (isset($result[$fieldName])) {
+      switch ($fieldName) {
         case 'is_public':
-          $result[$field] = CRM_Utils_String::strtobool($result[$field]);
+          $result[$fieldName] = CRM_Utils_String::strtobool($result[$fieldName]);
           break;
 
       }

From 31fa01e49457ef9f0422ea614155b8dfb5d1b403 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 27 Nov 2019 17:45:19 -0800
Subject: [PATCH 550/834] AfformTest - Add coverage for weirdly named file.

Also: Clarify that the API input is a formName and not strictly a
directiveName.
---
 ext/afform/mock/ang/mock-weird-name.aff.html  |  1 +
 ext/afform/mock/ang/mock-weird-name.aff.json  |  3 +
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 64 ++++++++++---------
 3 files changed, 39 insertions(+), 29 deletions(-)
 create mode 100644 ext/afform/mock/ang/mock-weird-name.aff.html
 create mode 100644 ext/afform/mock/ang/mock-weird-name.aff.json

diff --git a/ext/afform/mock/ang/mock-weird-name.aff.html b/ext/afform/mock/ang/mock-weird-name.aff.html
new file mode 100644
index 000000000000..a7c626d6d5b5
--- /dev/null
+++ b/ext/afform/mock/ang/mock-weird-name.aff.html
@@ -0,0 +1 @@
+<em>This is just an HTML file with a weird name.</em>
diff --git a/ext/afform/mock/ang/mock-weird-name.aff.json b/ext/afform/mock/ang/mock-weird-name.aff.json
new file mode 100644
index 000000000000..f047ea604f70
--- /dev/null
+++ b/ext/afform/mock/ang/mock-weird-name.aff.json
@@ -0,0 +1,3 @@
+{
+  "title": "Weird Name"
+}
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 0fdbc9ac403d..999d22a8a3f2 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -14,23 +14,28 @@ public function getBasicDirectives() {
       ['mockPage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/mock-page']],
       ['mockBareFile', ['title' => '', 'description' => '']],
       ['mockFoo', ['title' => '', 'description' => '']],
+      ['mock-weird-name', ['title' => 'Weird Name', 'description' => '']],
     ];
   }
 
   /**
    * This takes the bundled `example-page` and performs some API calls on it.
+   *
+   * @param string $formName
+   *   The symbolic name of the form.
+   * @param array $originalMetadata
    * @dataProvider getBasicDirectives
    */
-  public function testGetUpdateRevert($directiveName, $originalMetadata) {
+  public function testGetUpdateRevert($formName, $originalMetadata) {
     $get = function($arr, $key) {
       return isset($arr[$key]) ? $arr[$key] : NULL;
     };
 
-    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
 
     $message = 'The initial Afform.get should return default data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->execute();
-    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->execute();
+    $this->assertEquals($formName, $result[0]['name'], $message);
     $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
     $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
@@ -38,24 +43,24 @@ public function testGetUpdateRevert($directiveName, $originalMetadata) {
 
     $message = 'After updating with Afform.create, the revised data should be returned';
     $result = Civi\Api4\Afform::update()
-      ->addWhere('name', '=', $directiveName)
+      ->addWhere('name', '=', $formName)
       ->addValue('description', 'The temporary description')
       ->execute();
-    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $this->assertEquals($formName, $result[0]['name'], $message);
     $this->assertEquals('The temporary description', $result[0]['description'], $message);
 
     $message = 'After updating, the Afform.get API should return blended data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->execute();
-    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->execute();
+    $this->assertEquals($formName, $result[0]['name'], $message);
     $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
     $this->assertEquals('The temporary description', $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
 
-    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
     $message = 'After reverting, the final Afform.get should return default data';
-    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->execute();
-    $this->assertEquals($directiveName, $result[0]['name'], $message);
+    $result = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->execute();
+    $this->assertEquals($formName, $result[0]['name'], $message);
     $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
     $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
@@ -83,7 +88,8 @@ public function getFormatExamples() {
    * In this test, we update the layout and in one format and then read it back
    * in another format.
    *
-   * @param string $directiveName
+   * @param string $formName
+   *   The symbolic name of the form.
    * @param string $updateFormat
    *   The format with which to write the data.
    *   'html' or 'array'
@@ -98,63 +104,63 @@ public function getFormatExamples() {
    *   (For debug messages) A symbolic name of the example data-set being tested.
    * @dataProvider getFormatExamples
    */
-  public function testUpdateAndGetFormat($directiveName, $updateFormat, $updateLayout, $readFormat, $readLayout, $exampleName) {
-    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+  public function testUpdateAndGetFormat($formName, $updateFormat, $updateLayout, $readFormat, $readLayout, $exampleName) {
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
 
     Civi\Api4\Afform::update()
-      ->addWhere('name', '=', $directiveName)
+      ->addWhere('name', '=', $formName)
       ->setLayoutFormat($updateFormat)
       ->setValues(['layout' => $updateLayout])
       ->execute();
 
     $result = Civi\Api4\Afform::get()
-      ->addWhere('name', '=', $directiveName)
+      ->addWhere('name', '=', $formName)
       ->setLayoutFormat($readFormat)
       ->execute();
 
     $this->assertEquals($readLayout, $result[0]['layout'], "Based on \"$exampleName\", writing content as \"$updateFormat\" and reading back as \"$readFormat\".");
 
-    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
   }
 
   public function testAutoRequires() {
-    $directiveName = 'mockPage';
+    $formName = 'mockPage';
     $this->createLoggedInUser();
 
     // The default mockPage has 1 explicit requirement + 2 automatic requirements.
-    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
-    $angModule = Civi::service('angular')->getModule($directiveName);
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
+    $angModule = Civi::service('angular')->getModule($formName);
     $this->assertEquals(['afCore', 'extraMock', 'mockBareFile', 'mockFoo'], $angModule['requires']);
-    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->addSelect('requires')->execute();
+    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->addSelect('requires')->execute();
     $this->assertEquals(['extraMock'], $storedRequires[0]['requires']);
 
     // Knock down to 1 explicit + 1 automatic.
     Civi\Api4\Afform::update()
-      ->addWhere('name', '=', $directiveName)
+      ->addWhere('name', '=', $formName)
       ->setLayoutFormat('html')
       ->setValues(['layout' => '<div>The bare file says "<span mock-bare-file/>"</div>'])
       ->execute();
-    $angModule = Civi::service('angular')->getModule($directiveName);
+    $angModule = Civi::service('angular')->getModule($formName);
     $this->assertEquals(['afCore', 'extraMock', 'mockBareFile'], $angModule['requires']);
-    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->addSelect('requires')->execute();
+    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->addSelect('requires')->execute();
     $this->assertEquals(['extraMock'], $storedRequires[0]['requires']);
 
     // Remove the last explict and implicit requirements.
     Civi\Api4\Afform::update()
-      ->addWhere('name', '=', $directiveName)
+      ->addWhere('name', '=', $formName)
       ->setLayoutFormat('html')
       ->setValues([
         'layout' => '<div>The file has nothing! <strong>NOTHING!</strong> <em>JUST RANTING!</em></div>',
         'requires' => [],
       ])
       ->execute();
-    $angModule = Civi::service('angular')->getModule($directiveName);
+    $angModule = Civi::service('angular')->getModule($formName);
     $this->assertEquals(['afCore'], $angModule['requires']);
-    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $directiveName)->addSelect('requires')->execute();
+    $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->addSelect('requires')->execute();
     $this->assertEquals([], $storedRequires[0]['requires']);
 
-    Civi\Api4\Afform::revert()->addWhere('name', '=', $directiveName)->execute();
-    $angModule = Civi::service('angular')->getModule($directiveName);
+    Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
+    $angModule = Civi::service('angular')->getModule($formName);
     $this->assertEquals(['afCore', 'extraMock', 'mockBareFile', 'mockFoo'], $angModule['requires']);
   }
 

From 20d4bccc5703cb2648e65f1150c62b9010d5dd89 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 27 Nov 2019 09:42:22 -0500
Subject: [PATCH 551/834] Format whitespace in aff.html files

Adds api options for use in GUI editor to autoformat html whitespace.
Results in much nicer looking markup!
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 53 +++++++++++----
 .../Civi/Api4/Utils/AfformFormatTrait.php     | 23 ++++++-
 ext/afform/gui/ang/afGuiEditor.js             |  8 +--
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 68 ++++++++++++++++---
 .../phpunit/api/v4/formatExamples/apple.php   |  1 +
 .../phpunit/api/v4/formatExamples/banana.php  | 20 +++++-
 .../phpunit/api/v4/formatExamples/cherry.php  |  5 ++
 .../phpunit/api/v4/formatExamples/empty.php   |  1 +
 .../api/v4/formatExamples/self-closing.php    |  7 ++
 .../phpunit/api/v4/formatExamples/string.php  |  1 +
 10 files changed, 153 insertions(+), 34 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 4705ea273184..b0dae5fe7ea3 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -10,6 +10,8 @@ class CRM_Afform_ArrayHtml {
 
   const DEFAULT_TAG = 'div';
 
+  private $indent = -1;
+
   /**
    * This is a minimalist/temporary placeholder for a schema definition.
    * FIXME: It shouldn't be here or look like this.
@@ -56,13 +58,19 @@ class CRM_Afform_ArrayHtml {
    * @var bool
    */
   protected $deepCoding;
+  /**
+   * @var bool
+   */
+  protected $formatWhitespace;
 
   /**
    * CRM_Afform_ArrayHtml constructor.
    * @param bool $deepCoding
+   * @param bool $formatWhitespace
    */
-  public function __construct($deepCoding = TRUE) {
+  public function __construct($deepCoding = TRUE, $formatWhitespace = FALSE) {
     $this->deepCoding = $deepCoding;
+    $this->formatWhitespace = $formatWhitespace;
   }
 
   /**
@@ -75,13 +83,15 @@ public function convertArrayToHtml(array $array) {
     if ($array === []) {
       return '';
     }
+    $indent = $this->formatWhitespace ? str_repeat('  ', $this->indent) : '';
+    $end = $this->formatWhitespace ? "\n" : '';
 
     if (isset($array['#comment'])) {
       if (strpos($array['#comment'], '-->')) {
         Civi::log()->warning('Afform: Cannot store comment with text "-->". Munging.');
         $array['#comment'] = str_replace('-->', '-- >', $array['#comment']);
       }
-      return sprintf('<!--%s-->', $array['#comment']);
+      return $indent . sprintf('<!--%s-->', $array['#comment']) . $end;
     }
 
     if (isset($array['#text'])) {
@@ -93,7 +103,7 @@ public function convertArrayToHtml(array $array) {
     $children = empty($array['#children']) ? [] : $array['#children'];
     unset($array['#children']);
 
-    $buf = '<' . $tag;
+    $buf = $indent . '<' . $tag;
     foreach ($array as $attrName => $attrValue) {
       if ($attrName{0} === '#') {
         continue;
@@ -115,23 +125,34 @@ public function convertArrayToHtml(array $array) {
       }
     }
 
-    if (isset($array['#markup'])) {
-      return $buf . '>' . $array['#markup'] . '</' . $tag . '>';
+    if (isset($array['#markup']) && !$this->formatWhitespace) {
+      $buf .= '>' . $array['#markup'] . '</' . $tag . '>';
     }
-
-    if (empty($children) && $this->isSelfClosing($tag)) {
+    elseif (isset($array['#markup'])) {
+      $indent2 = str_repeat('  ', $this->indent + 1);
+      $buf .= '>' . $end . $indent2 . str_replace("\n<", "\n$indent2<", $array['#markup']) . $end . $indent . '</' . $tag . '>';
+    }
+    elseif (empty($children) && $this->isSelfClosing($tag)) {
       $buf .= ' />';
     }
     else {
-      $buf .= '>';
-      $buf .= $this->convertArraysToHtml($children);
+      $contents = $this->convertArraysToHtml($children);
+      // No indentation if contents are only text
+      if (!$this->formatWhitespace || strpos($contents, '<') === FALSE) {
+        $buf .= '>' . $contents;
+      }
+      else {
+        $buf .= '>' . $end;
+        $buf .= $contents . $indent;
+      }
       $buf .= '</' . $tag . '>';
     }
-    return $buf;
+    return $buf . $end;
   }
 
   public function convertArraysToHtml($children) {
     $buf = '';
+    $this->indent++;
 
     foreach ($children as $child) {
       if (is_string($child)) {
@@ -142,6 +163,7 @@ public function convertArraysToHtml($children) {
       }
     }
 
+    $this->indent--;
     return $buf;
   }
 
@@ -183,7 +205,7 @@ public function convertNodeToArray($node) {
         $arr[$attribute->name] = $this->decodeAttrValue($type, $txt);
       }
       if ($node->childNodes->length > 0) {
-        // In shallow mode, return "af-markup" blocks as-is
+        // In shallow mode, return "af-markup" containers as-is
         if (!$this->deepCoding && !empty($arr['class']) && strpos($arr['class'], 'af-markup') !== FALSE) {
           $arr['#markup'] = '';
           foreach ($node->childNodes as $child) {
@@ -215,7 +237,14 @@ public function convertNodeToArray($node) {
   protected function convertNodesToArray($nodes) {
     $children = [];
     foreach ($nodes as $childNode) {
-      $children[] = $this->convertNodeToArray($childNode);
+      $childArray = $this->convertNodeToArray($childNode);
+      // Remove extra whitespace
+      if ($this->formatWhitespace && isset($childArray['#text'])) {
+        $childArray['#text'] = trim($childArray['#text']);
+      }
+      if (!isset($childArray['#text']) || strlen($childArray['#text'])) {
+        $children[] = $childArray;
+      }
     }
     return $children;
   }
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index 7d224a657f68..4383a11066a4 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -7,15 +7,34 @@
  *
  * @method $this setLayoutFormat(string $layoutFormat)
  * @method string getLayoutFormat()
+ * @method $this setFormatWhitespace(string $layoutFormat)
+ * @method string getFormatWhitespace()
  */
 trait AfformFormatTrait {
 
   /**
+   * Controls the return format of the "layout" property
+   *  - html will return layout html as-is.
+   *  - shallow will convert most html to an array, but leave tag attributes and af-markup containers alone.
+   *  - deep will attempt to convert all html to an array, including tag attributes.
+   *
    * @var string
    * @options html,shallow,deep
    */
   protected $layoutFormat = 'deep';
 
+  /**
+   * Optionally manage whitespace for the "layout" property
+   *
+   * This option will strip whitepace from the returned layout array for "get" actions,
+   * and will auto-indent the aff.html for "save" actions.
+   *
+   * Note: currently this has no affect on "get" with "html" return format, which returns html as-is.
+   *
+   * @var bool
+   */
+  protected $formatWhitespace = FALSE;
+
   /**
    * @param string $html
    * @return mixed
@@ -25,7 +44,7 @@ protected function convertHtmlToOutput($html) {
     if ($this->layoutFormat === 'html') {
       return $html;
     }
-    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow');
+    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow', $this->formatWhitespace);
     return $converter->convertHtmlToArray($html);
   }
 
@@ -38,7 +57,7 @@ protected function convertInputToHtml($mixed) {
     if ($this->layoutFormat === 'html') {
       return $mixed;
     }
-    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow');
+    $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow', $this->formatWhitespace);
     return $converter->convertArraysToHtml($mixed);
   }
 
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 4428b72bb892..3a2f954ca3c3 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -43,7 +43,7 @@
         };
         if ($scope.afGuiEditor.name && $scope.afGuiEditor.name != '0') {
           // Todo - show error msg if form is not found
-          crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]], layoutFormat: 'shallow'}, 0)
+          crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]], layoutFormat: 'shallow', formatWhitespace: true}, 0)
             .then(initialize);
         }
         else {
@@ -67,10 +67,6 @@
         function initialize(afform) {
           $scope.afform = afform;
           $scope.changesSaved = 1;
-          // Remove empty text nodes, they just create clutter
-          removeRecursive($scope.afform.layout, function(item) {
-            return ('#text' in item) && _.trim(item['#text']).length === 0;
-          });
           $scope.layout = findRecursive($scope.afform.layout, {'#tag': 'af-form'})[0];
           evaluate($scope.layout['#children']);
           $scope.entities = findRecursive($scope.layout['#children'], {'#tag': 'af-entity'}, 'name');
@@ -153,7 +149,7 @@
 
         $scope.save = function() {
           $scope.saving = $scope.changesSaved = true;
-          crmApi4('Afform', 'save', {records: [JSON.parse(angular.toJson($scope.afform))]})
+          crmApi4('Afform', 'save', {formatWhitespace: true, records: [JSON.parse(angular.toJson($scope.afform))]})
             .then(function (data) {
               $scope.saving = false;
               $scope.afform.name = data[0].name;
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 999d22a8a3f2..6a7fdd87e198 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -68,20 +68,19 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
   }
 
   public function getFormatExamples() {
-    $es = [];
-
-    foreach (['empty', 'string', 'comments', 'self-closing', 'apple', 'banana', 'cherry'] as $exampleName) {
-      $exampleFile = '/formatExamples/' . $exampleName . '.php';
-      $example = require __DIR__ . $exampleFile;
-      $formats = ['html', 'shallow', 'deep'];
-      foreach ($formats as $updateFormat) {
-        foreach ($formats as $readFormat) {
-          $es[] = ['mockBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
+    $ex = [];
+    $formats = ['html', 'shallow', 'deep'];
+    foreach (glob(__DIR__ . '/formatExamples/*.php') as $exampleFile) {
+      $example = require $exampleFile;
+      if (isset($example['deep'])) {
+        foreach ($formats as $updateFormat) {
+          foreach ($formats as $readFormat) {
+            $ex[] = ['mockBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
+          }
         }
       }
     }
-
-    return $es;
+    return $ex;
   }
 
   /**
@@ -123,6 +122,53 @@ public function testUpdateAndGetFormat($formName, $updateFormat, $updateLayout,
     Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
   }
 
+  public function getWhitespaceExamples() {
+    $ex = [];
+    foreach (glob(__DIR__ . '/formatExamples/*.php') as $exampleFile) {
+      $example = require $exampleFile;
+      if (isset($example['pretty'])) {
+        $ex[] = ['mockBareFile', $example, $exampleFile];
+      }
+    }
+    return $ex;
+  }
+
+  /**
+   * This tests that a non-pretty html string will have its whitespace stripped & reformatted
+   * when using the "formatWhitespace" option.
+   *
+   * @dataProvider getWhitespaceExamples
+   */
+  public function testWhitespaceFormat($directiveName, $example, $exampleName) {
+    Civi\Api4\Afform::save()
+      ->addRecord(['name' => $directiveName, 'layout' => $example['html']])
+      ->setLayoutFormat('html')
+      ->execute();
+
+    $result = Civi\Api4\Afform::get()
+      ->addWhere('name', '=', $directiveName)
+      ->setLayoutFormat('shallow')
+      ->setFormatWhitespace(TRUE)
+      ->execute()
+      ->first();
+
+    $this->assertEquals($example['stripped'] ?? $example['shallow'], $result['layout']);
+
+    Civi\Api4\Afform::save()
+      ->addRecord(['name' => $directiveName, 'layout' => $result['layout']])
+      ->setLayoutFormat('shallow')
+      ->setFormatWhitespace(TRUE)
+      ->execute();
+
+    $result = Civi\Api4\Afform::get()
+      ->addWhere('name', '=', $directiveName)
+      ->setLayoutFormat('html')
+      ->execute()
+      ->first();
+
+    $this->assertEquals($example['pretty'], $result['layout']);
+  }
+
   public function testAutoRequires() {
     $formName = 'mockPage';
     $this->createLoggedInUser();
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
index 28d8ba4be2f6..d0674fc335a3 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -2,6 +2,7 @@
 
 return [
   'html' => '<strong>New text!</strong>',
+  'pretty' => "<strong>New text!</strong>\n",
   'shallow' => [
     ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
   ],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index 7e0a134caaa0..4e2e63db3cf7 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,8 +1,13 @@
 <?php
 
 return [
-  'html' => '<div><strong>New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
-  'shallow' => [
+  'html' => '<div><strong>  New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
+  'pretty' => '<div>
+  <strong>New text!</strong>
+  <af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" />
+</div>
+',
+  'stripped' => [
     [
       '#tag' => 'div',
       '#children' => [
@@ -11,11 +16,20 @@
       ],
     ],
   ],
+  'shallow' => [
+    [
+      '#tag' => 'div',
+      '#children' => [
+        ['#tag' => 'strong', '#children' => [['#text' => '  New text!']]],
+        ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
+      ],
+    ],
+  ],
   'deep' => [
     [
       '#tag' => 'div',
       '#children' => [
-        ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
+        ['#tag' => 'strong', '#children' => [['#text' => '  New text!']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
       ],
     ],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
index f47efed0e462..44376d4cd9e6 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
@@ -2,11 +2,16 @@
 
 return [
   'html' => '<span>First</span> <span>Second</span>',
+  'pretty' => "<span>First</span>\n<span>Second</span>\n",
   'shallow' => [
     ['#tag' => 'span', '#children' => [['#text' => 'First']]],
     ['#text' => ' '],
     ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
   ],
+  'stripped' => [
+    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
+    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
+  ],
   'deep' => [
     ['#tag' => 'span', '#children' => [['#text' => 'First']]],
     ['#text' => ' '],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php
index e08233a2d07e..c8010a5b9bab 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/empty.php
@@ -2,6 +2,7 @@
 
 return [
   'html' => '',
+  'pretty' => '',
   'shallow' => [],
   'deep' => [],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
index ab68d0238b73..62063a80877d 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
@@ -2,6 +2,13 @@
 
 return [
   'html' => '<span class="one"></span><img class="two" /><div><br class="three" /><br /></div>',
+  'pretty' => '<span class="one"></span>
+<img class="two" />
+<div>
+  <br class="three" />
+  <br />
+</div>
+',
   'shallow' => [
     ['#tag' => 'span', 'class' => 'one'],
     ['#tag' => 'img', 'class' => 'two'],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
index 221e1a36f058..28537729f9be 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/string.php
@@ -2,6 +2,7 @@
 
 return [
   'html' => 'hello world',
+  'pretty' => 'hello world',
   'shallow' => [['#text' => 'hello world']],
   'deep' => [['#text' => 'hello world']],
 ];

From 991be095f8c3d8987c7de90de632f5118a32f85f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 27 Nov 2019 18:08:44 -0800
Subject: [PATCH 552/834] Add api/v4/formatExamples/stylized.php

---
 .../api/v4/formatExamples/stylized.php        | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php

diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php
new file mode 100644
index 000000000000..f99f6ba75651
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php
@@ -0,0 +1,22 @@
+<?php
+
+return [
+  'html' => '<p><strong>Stylized</strong> text is <em>wonky</em> text!</p>',
+  'pretty' => "<p><strong>Stylized</strong> text is <em>wonky</em> text!</p>\n",
+  'shallow' => [
+    ['#tag' => 'p', '#children' => [
+      ['#tag' => 'strong', '#children' => [['#text' => 'Stylized']]],
+      ['#text' => ' text is '],
+      ['#tag' => 'em', '#children' => [['#text' => 'wonky']]],
+      ['#text' => ' text!'],
+    ]],
+  ],
+  'deep' => [
+    ['#tag' => 'p', '#children' => [
+      ['#tag' => 'strong', '#children' => [['#text' => 'Stylized']]],
+      ['#text' => ' text is '],
+      ['#tag' => 'em', '#children' => [['#text' => 'wonky']]],
+      ['#text' => ' text!'],
+    ]],
+  ],
+];

From 37b66ed682b6fb5c3401f7f997907d903f58de6e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 30 Nov 2019 10:52:33 -0500
Subject: [PATCH 553/834] In shallow mode, only convert markup to array that
 the GUI editor understands.

Any markup not using a tag/class/attribute understood by the GUI editor
will have its contents preserved "as-is" in a "#markup" string.
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 22 +++++++++++++---
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 25 +++++++++++++++---
 .../phpunit/api/v4/formatExamples/apple.php   |  2 +-
 .../phpunit/api/v4/formatExamples/banana.php  | 17 ++++++++----
 .../phpunit/api/v4/formatExamples/cherry.php  | 21 ++++++++-------
 .../api/v4/formatExamples/comments.php        |  8 +-----
 .../api/v4/formatExamples/self-closing.php    | 11 ++------
 .../api/v4/formatExamples/stylized.php        | 26 +++++++++----------
 8 files changed, 81 insertions(+), 51 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index b0dae5fe7ea3..59c8cae0a5c6 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -125,7 +125,7 @@ public function convertArrayToHtml(array $array) {
       }
     }
 
-    if (isset($array['#markup']) && !$this->formatWhitespace) {
+    if (isset($array['#markup']) && (!$this->formatWhitespace || strpos($array['#markup'], '<') === FALSE)) {
       $buf .= '>' . $array['#markup'] . '</' . $tag . '>';
     }
     elseif (isset($array['#markup'])) {
@@ -179,6 +179,7 @@ public function convertHtmlToArray($html) {
     }
 
     $doc = new DOMDocument();
+    $doc->preserveWhiteSpace = !$this->formatWhitespace;
     @$doc->loadHTML("<html><body>$html</body></html>");
 
     // FIXME: Validate expected number of child nodes
@@ -205,8 +206,8 @@ public function convertNodeToArray($node) {
         $arr[$attribute->name] = $this->decodeAttrValue($type, $txt);
       }
       if ($node->childNodes->length > 0) {
-        // In shallow mode, return "af-markup" containers as-is
-        if (!$this->deepCoding && !empty($arr['class']) && strpos($arr['class'], 'af-markup') !== FALSE) {
+        // In shallow mode, return markup as-is if node isn't supported by the gui editor
+        if (!$this->deepCoding && !$this->isNodeEditable($arr)) {
           $arr['#markup'] = '';
           foreach ($node->childNodes as $child) {
             $arr['#markup'] .= $child->ownerDocument->saveXML($child);
@@ -335,4 +336,19 @@ protected function decodeAttrValue($type, $txtAttrValue) {
     }
   }
 
+  /**
+   * Determine if a node is recognized by the gui editor.
+   *
+   * @param array $item
+   * @return bool
+   */
+  public function isNodeEditable(array $item) {
+    if ($item['#tag'] === 'af-field' || $item['#tag'] === 'af-form' || isset($item['af-fieldset'])) {
+      return TRUE;
+    }
+    $editableClasses = ['af-block', 'af-text', 'af-button'];
+    $classes = explode(' ', $item['class'] ?? '');
+    return (bool) array_intersect($editableClasses, $classes);
+  }
+
 }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 6a7fdd87e198..45bc30c2dc6b 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -9,6 +9,25 @@ class api_v4_AfformTest extends api_v4_AfformTestCase {
   use \Civi\Test\Api3TestTrait;
   use \Civi\Test\ContactTestTrait;
 
+  /**
+   * DOMDocument outputs some tags a little different than they were input.
+   * It's not really a problem but can trip up tests.
+   *
+   * @param array|string $markup
+   * @return array|string
+   */
+  private function fudgeMarkup($markup) {
+    if (is_array($markup)) {
+      foreach ($markup as $idx => $item) {
+        $markup[$idx] = $this->fudgeMarkup($item);
+      }
+      return $markup;
+    }
+    else {
+      return str_replace([' />', '/>'], ['/>', ' />'], $markup);
+    }
+  }
+
   public function getBasicDirectives() {
     return [
       ['mockPage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/mock-page']],
@@ -117,7 +136,7 @@ public function testUpdateAndGetFormat($formName, $updateFormat, $updateLayout,
       ->setLayoutFormat($readFormat)
       ->execute();
 
-    $this->assertEquals($readLayout, $result[0]['layout'], "Based on \"$exampleName\", writing content as \"$updateFormat\" and reading back as \"$readFormat\".");
+    $this->assertEquals($readLayout, $this->fudgeMarkup($result[0]['layout']), "Based on \"$exampleName\", writing content as \"$updateFormat\" and reading back as \"$readFormat\".");
 
     Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
   }
@@ -152,7 +171,7 @@ public function testWhitespaceFormat($directiveName, $example, $exampleName) {
       ->execute()
       ->first();
 
-    $this->assertEquals($example['stripped'] ?? $example['shallow'], $result['layout']);
+    $this->assertEquals($example['stripped'] ?? $example['shallow'], $this->fudgeMarkup($result['layout']));
 
     Civi\Api4\Afform::save()
       ->addRecord(['name' => $directiveName, 'layout' => $result['layout']])
@@ -166,7 +185,7 @@ public function testWhitespaceFormat($directiveName, $example, $exampleName) {
       ->execute()
       ->first();
 
-    $this->assertEquals($example['pretty'], $result['layout']);
+    $this->assertEquals($example['pretty'], $this->fudgeMarkup($result['layout']));
   }
 
   public function testAutoRequires() {
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
index d0674fc335a3..18a4bb0eabe8 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -4,7 +4,7 @@
   'html' => '<strong>New text!</strong>',
   'pretty' => "<strong>New text!</strong>\n",
   'shallow' => [
-    ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
+    ['#tag' => 'strong', '#markup' => 'New text!'],
   ],
   'deep' => [
     ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index 4e2e63db3cf7..da70ac501c14 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,17 +1,20 @@
 <?php
 
 return [
-  'html' => '<div><strong>  New text!</strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
-  'pretty' => '<div>
-  <strong>New text!</strong>
+  'html' => '<div class="af-block"><strong>  New text!</strong><strong class="af-text"> No whitespace! </strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
+  'pretty' => '<div class="af-block">
+  <strong>  New text!</strong>
+  <strong class="af-text">No whitespace!</strong>
   <af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" />
 </div>
 ',
   'stripped' => [
     [
       '#tag' => 'div',
+      'class' => 'af-block',
       '#children' => [
-        ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
+        ['#tag' => 'strong', '#markup' => '  New text!'],
+        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => 'No whitespace!']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
       ],
     ],
@@ -19,8 +22,10 @@
   'shallow' => [
     [
       '#tag' => 'div',
+      'class' => 'af-block',
       '#children' => [
-        ['#tag' => 'strong', '#children' => [['#text' => '  New text!']]],
+        ['#tag' => 'strong', '#markup' => '  New text!'],
+        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => ' No whitespace! ']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
       ],
     ],
@@ -28,8 +33,10 @@
   'deep' => [
     [
       '#tag' => 'div',
+      'class' => 'af-block',
       '#children' => [
         ['#tag' => 'strong', '#children' => [['#text' => '  New text!']]],
+        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => ' No whitespace! ']]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
       ],
     ],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
index 44376d4cd9e6..4060cfb6c87a 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/cherry.php
@@ -1,20 +1,21 @@
 <?php
 
 return [
-  'html' => '<span>First</span> <span>Second</span>',
-  'pretty' => "<span>First</span>\n<span>Second</span>\n",
-  'shallow' => [
-    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
-    ['#text' => ' '],
-    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
-  ],
+  'html' => '<span>First</span>   <span>Second</span>',
+  'pretty' => "<span>First</span>
+<span>Second</span>\n",
   'stripped' => [
-    ['#tag' => 'span', '#children' => [['#text' => 'First']]],
-    ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
+    ['#tag' => 'span', '#markup' => 'First'],
+    ['#tag' => 'span', '#markup' => 'Second'],
+  ],
+  'shallow' => [
+    ['#tag' => 'span', '#markup' => 'First'],
+    ['#text' => '   '],
+    ['#tag' => 'span', '#markup' => 'Second'],
   ],
   'deep' => [
     ['#tag' => 'span', '#children' => [['#text' => 'First']]],
-    ['#text' => ' '],
+    ['#text' => '   '],
     ['#tag' => 'span', '#children' => [['#text' => 'Second']]],
   ],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
index c311e930e67f..e060fb6b53c0 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/comments.php
@@ -5,13 +5,7 @@
   'shallow' => [
     [
       '#tag' => 'div',
-      '#children' => [
-        ['#text' => 'One'],
-        ['#comment' => ' uno '],
-        ['#text' => ' Two '],
-        ['#comment' => 'dos & so on '],
-        ['#text' => ' Three'],
-      ],
+      '#markup' => 'One<!-- uno --> Two <!--dos & so on --> Three',
     ],
     ['#comment' => 'tres-a--b---c'],
   ],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
index 62063a80877d..3132e0b4c25a 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/self-closing.php
@@ -5,20 +5,13 @@
   'pretty' => '<span class="one"></span>
 <img class="two" />
 <div>
-  <br class="three" />
-  <br />
+  <br class="three" /><br />
 </div>
 ',
   'shallow' => [
     ['#tag' => 'span', 'class' => 'one'],
     ['#tag' => 'img', 'class' => 'two'],
-    [
-      '#tag' => 'div',
-      '#children' => [
-        ['#tag' => 'br', 'class' => 'three'],
-        ['#tag' => 'br'],
-      ],
-    ],
+    ['#tag' => 'div', '#markup' => '<br class="three" /><br />'],
   ],
   'deep' => [
     ['#tag' => 'span', 'class' => 'one'],
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php
index f99f6ba75651..65aaede619ff 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/stylized.php
@@ -2,21 +2,21 @@
 
 return [
   'html' => '<p><strong>Stylized</strong> text is <em>wonky</em> text!</p>',
-  'pretty' => "<p><strong>Stylized</strong> text is <em>wonky</em> text!</p>\n",
+  'pretty' => "<p>
+  <strong>Stylized</strong> text is <em>wonky</em> text!
+</p>\n",
   'shallow' => [
-    ['#tag' => 'p', '#children' => [
-      ['#tag' => 'strong', '#children' => [['#text' => 'Stylized']]],
-      ['#text' => ' text is '],
-      ['#tag' => 'em', '#children' => [['#text' => 'wonky']]],
-      ['#text' => ' text!'],
-    ]],
+    ['#tag' => 'p', '#markup' => '<strong>Stylized</strong> text is <em>wonky</em> text!'],
   ],
   'deep' => [
-    ['#tag' => 'p', '#children' => [
-      ['#tag' => 'strong', '#children' => [['#text' => 'Stylized']]],
-      ['#text' => ' text is '],
-      ['#tag' => 'em', '#children' => [['#text' => 'wonky']]],
-      ['#text' => ' text!'],
-    ]],
+    [
+      '#tag' => 'p',
+      '#children' => [
+        ['#tag' => 'strong', '#children' => [['#text' => 'Stylized']]],
+        ['#text' => ' text is '],
+        ['#tag' => 'em', '#children' => [['#text' => 'wonky']]],
+        ['#text' => ' text!'],
+      ],
+    ],
   ],
 ];

From 3a9e5a624237332d69b063f2bc7c816e7ebf9394 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 3 Dec 2019 13:04:13 -0500
Subject: [PATCH 554/834] Fix handling of non-breaking spaces

See https://stackoverflow.com/questions/59215211/why-does-domdocument-mess-up-unicode-nonbreaking-spaces
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      | 42 +++++++++++++++++--
 .../Civi/Api4/Utils/AfformFormatTrait.php     |  2 +-
 .../phpunit/api/v4/formatExamples/apple.php   |  8 ++--
 .../phpunit/api/v4/formatExamples/banana.php  | 10 ++---
 4 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 59c8cae0a5c6..1c0e9f30ee75 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -150,6 +150,12 @@ public function convertArrayToHtml(array $array) {
     return $buf . $end;
   }
 
+  /**
+   * Converts a subset of items into html markup
+   *
+   * @param array $children
+   * @return string html
+   */
   public function convertArraysToHtml($children) {
     $buf = '';
     $this->indent++;
@@ -167,6 +173,17 @@ public function convertArraysToHtml($children) {
     return $buf;
   }
 
+  /**
+   * Converts a full array of items into html markup
+   *
+   * @param array $tree
+   * @return string html
+   */
+  public function convertTreeToHtml($tree) {
+    $this->indent = -1;
+    return $this->replaceUnicodeChars($this->convertArraysToHtml($tree));
+  }
+
   /**
    * @param string $html
    *   Ex: '<div class="greeting">Hello world</div>'
@@ -180,7 +197,7 @@ public function convertHtmlToArray($html) {
 
     $doc = new DOMDocument();
     $doc->preserveWhiteSpace = !$this->formatWhitespace;
-    @$doc->loadHTML("<html><body>$html</body></html>");
+    @$doc->loadHTML("<?xml encoding=\"utf-8\" ?><html><body>$html</body></html>");
 
     // FIXME: Validate expected number of child nodes
 
@@ -210,7 +227,7 @@ public function convertNodeToArray($node) {
         if (!$this->deepCoding && !$this->isNodeEditable($arr)) {
           $arr['#markup'] = '';
           foreach ($node->childNodes as $child) {
-            $arr['#markup'] .= $child->ownerDocument->saveXML($child);
+            $arr['#markup'] .= $this->replaceUnicodeChars($child->ownerDocument->saveXML($child));
           }
         }
         else {
@@ -220,7 +237,7 @@ public function convertNodeToArray($node) {
       return $arr;
     }
     elseif ($node instanceof DOMText) {
-      return ['#text' => $node->textContent];
+      return ['#text' => $this->replaceUnicodeChars($node->textContent)];
     }
     elseif ($node instanceof DOMComment) {
       return ['#comment' => $node->nodeValue];
@@ -336,6 +353,25 @@ protected function decodeAttrValue($type, $txtAttrValue) {
     }
   }
 
+  /**
+   * Convert non-breaking space character to html notation.
+   *
+   * Makes html files easier to read.
+   *
+   * Note: This function does NOT convert all html entities (< to &lt;, etc.)
+   * as the input string is assumed to already be valid markup.
+   *
+   * @param string $markup - some html
+   * @return string
+   */
+  public function replaceUnicodeChars($markup) {
+    // TODO: Potentially replace other unicode characters that can be represented as html entities
+    $replace = [
+      ["\xc2\xa0", '&nbsp;'],
+    ];
+    return str_replace(array_column($replace, 0), array_column($replace, 1), $markup);
+  }
+
   /**
    * Determine if a node is recognized by the gui editor.
    *
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index 4383a11066a4..ea4af10d3634 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -58,7 +58,7 @@ protected function convertInputToHtml($mixed) {
       return $mixed;
     }
     $converter = new \CRM_Afform_ArrayHtml($this->layoutFormat !== 'shallow', $this->formatWhitespace);
-    return $converter->convertArraysToHtml($mixed);
+    return $converter->convertTreeToHtml($mixed);
   }
 
 }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
index 18a4bb0eabe8..b082ae0a5a74 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/apple.php
@@ -1,12 +1,12 @@
 <?php
 
 return [
-  'html' => '<strong>New text!</strong>',
-  'pretty' => "<strong>New text!</strong>\n",
+  'html' => '<strong>New &nbsp; text!</strong>',
+  'pretty' => "<strong>New &nbsp; text!</strong>\n",
   'shallow' => [
-    ['#tag' => 'strong', '#markup' => 'New text!'],
+    ['#tag' => 'strong', '#markup' => 'New &nbsp; text!'],
   ],
   'deep' => [
-    ['#tag' => 'strong', '#children' => [['#text' => 'New text!']]],
+    ['#tag' => 'strong', '#children' => [['#text' => 'New &nbsp; text!']]],
   ],
 ];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index da70ac501c14..122d455b0026 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,10 +1,10 @@
 <?php
 
 return [
-  'html' => '<div class="af-block"><strong>  New text!</strong><strong class="af-text"> No whitespace! </strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
+  'html' => '<div class="af-block"><strong>  New text!</strong><strong class="af-text"> &nbsp; Get a trim! </strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
   'pretty' => '<div class="af-block">
   <strong>  New text!</strong>
-  <strong class="af-text">No whitespace!</strong>
+  <strong class="af-text">&nbsp; Get a trim!</strong>
   <af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" />
 </div>
 ',
@@ -14,7 +14,7 @@
       'class' => 'af-block',
       '#children' => [
         ['#tag' => 'strong', '#markup' => '  New text!'],
-        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => 'No whitespace!']]],
+        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => "&nbsp; Get a trim!"]]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
       ],
     ],
@@ -25,7 +25,7 @@
       'class' => 'af-block',
       '#children' => [
         ['#tag' => 'strong', '#markup' => '  New text!'],
-        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => ' No whitespace! ']]],
+        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => " &nbsp; Get a trim! "]]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => "{label: 'Do not do any of the emailing'}"],
       ],
     ],
@@ -36,7 +36,7 @@
       'class' => 'af-block',
       '#children' => [
         ['#tag' => 'strong', '#children' => [['#text' => '  New text!']]],
-        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => ' No whitespace! ']]],
+        ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => " &nbsp; Get a trim! "]]],
         ['#tag' => 'af-field', 'name' => 'do_not_sms', 'defn' => ['label' => 'Do not do any of the emailing']],
       ],
     ],

From 22f49e3ec9e78d5f3ae1fb48de7f2bea03c4ad68 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 7 Dec 2019 15:29:17 -0500
Subject: [PATCH 555/834] Prettier json

---
 ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 406f99ea4b9a..ed39450d0791 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -54,7 +54,7 @@ protected function writeRecord($item) {
     if (!empty($meta)) {
       $metaPath = $scanner->createSiteLocalPath($item['name'], \CRM_Afform_AfformScanner::METADATA_FILE);
       \CRM_Utils_File::createDir(dirname($metaPath));
-      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT));
+      file_put_contents($metaPath, json_encode($meta, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
       // FIXME check for writability then success. Report errors.
     }
 

From 6fb9e8d275abfa03267d72f6ce9dd850ca447108 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 9 Dec 2019 08:13:30 -0500
Subject: [PATCH 556/834] GUI - Rename af-block => af-container

Free up the term af-block to refer to something more specific than a container.
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      |  2 +-
 ext/afform/core/ang/afCore.css                |  6 +-
 ext/afform/gui/ang/afGuiEditor.css            | 14 ++--
 ext/afform/gui/ang/afGuiEditor.js             | 80 ++++++++-----------
 .../gui/ang/afGuiEditor/block-menu.html       |  9 ---
 .../gui/ang/afGuiEditor/button-menu.html      |  2 +-
 ext/afform/gui/ang/afGuiEditor/button.html    |  2 +-
 .../gui/ang/afGuiEditor/canvas-menu.html      |  8 ++
 ext/afform/gui/ang/afGuiEditor/canvas.html    |  2 +-
 .../gui/ang/afGuiEditor/container-menu.html   |  9 +++
 .../{block.html => container.html}            | 27 +++----
 .../gui/ang/afGuiEditor/field-menu.html       |  2 +-
 ext/afform/gui/ang/afGuiEditor/field.html     |  2 +-
 .../gui/ang/afGuiEditor/markup-menu.html      |  2 +-
 ext/afform/gui/ang/afGuiEditor/markup.html    |  2 +-
 .../ang/afGuiEditor/menu-item-background.html |  2 +-
 ext/afform/gui/ang/afGuiEditor/text-menu.html |  2 +-
 ext/afform/gui/ang/afGuiEditor/text.html      |  2 +-
 ext/afform/mock/ang/testAfform.aff.html       |  2 +-
 .../phpunit/api/v4/formatExamples/banana.php  | 10 +--
 20 files changed, 88 insertions(+), 99 deletions(-)
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/block-menu.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/canvas-menu.html
 create mode 100644 ext/afform/gui/ang/afGuiEditor/container-menu.html
 rename ext/afform/gui/ang/afGuiEditor/{block.html => container.html} (52%)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 1c0e9f30ee75..120ed0a66c4c 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -382,7 +382,7 @@ public function isNodeEditable(array $item) {
     if ($item['#tag'] === 'af-field' || $item['#tag'] === 'af-form' || isset($item['af-fieldset'])) {
       return TRUE;
     }
-    $editableClasses = ['af-block', 'af-text', 'af-button'];
+    $editableClasses = ['af-container', 'af-text', 'af-button'];
     $classes = explode(' ', $item['class'] ?? '');
     return (bool) array_intersect($editableClasses, $classes);
   }
diff --git a/ext/afform/core/ang/afCore.css b/ext/afform/core/ang/afCore.css
index 305698c78f2c..1d7801314139 100644
--- a/ext/afform/core/ang/afCore.css
+++ b/ext/afform/core/ang/afCore.css
@@ -6,13 +6,13 @@ a.af-api4-action-idle {
     cursor: pointer;
 }
 
-.af-block.af-layout-cols {
+.af-container.af-layout-cols {
     display: flex;
 }
-.af-block.af-layout-cols > * {
+.af-container.af-layout-cols > * {
     flex: 1;
 }
-.af-block.af-layout-inline > * {
+.af-container.af-layout-inline > * {
     display: inline-block;
     margin-right: .5em;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 8517b3c39a5b..b9e1cc3883ee 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -123,18 +123,18 @@
   padding: 0 3px 3px;
 }
 
-#afGuiEditor .af-gui-block {
+#afGuiEditor .af-gui-container {
   border: 2px dashed transparent;
   position: relative;
   padding: 22px 3px 3px;
   min-height: 40px;
 }
 
-#afGuiEditor .af-gui-block-type-fieldset {
+#afGuiEditor .af-gui-container-type-fieldset {
   box-shadow: 0 0 5px #bbbbbb;
 }
 
-#afGuiEditor .af-gui-block:hover {
+#afGuiEditor .af-gui-container:hover {
   border: 2px dashed #757575;
 }
 
@@ -213,16 +213,16 @@
   padding-top: 2px;
   padding-bottom: 2px;
 }
-#afGuiEditor .af-gui-add-block-button span {
+#afGuiEditor .af-gui-add-element-button span {
   display: inline-block;
   width: 18px;
   height: 18px;
   border: 2px dashed #0071bd;
   color: #0071bd;
 }
-#afGuiEditor .af-gui-add-block-button span i {
+#afGuiEditor .af-gui-add-element-button span i {
   position: relative;
-  top: -3px;
+  top: -2px;
 }
 
 #afGuiEditor .af-gui-layout-icon {
@@ -399,7 +399,7 @@
 .af-gui-editing-content #afGuiEditor-palette .panel-body > * {
   opacity: .5;
 }
-#afGuiEditor.af-gui-editing-content .af-gui-block {
+#afGuiEditor.af-gui-editing-content .af-gui-container {
   border: 2px solid transparent;
 }
 #afGuiEditor.af-gui-editing-content .af-gui-bar {
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 3a2f954ca3c3..872c7e929eeb 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -316,12 +316,12 @@
     };
   });
 
-  angular.module('afGuiEditor').directive('afGuiBlock', function() {
+  angular.module('afGuiEditor').directive('afGuiContainer', function() {
     return {
       restrict: 'A',
-      templateUrl: '~/afGuiEditor/block.html',
+      templateUrl: '~/afGuiEditor/container.html',
       scope: {
-        node: '=afGuiBlock',
+        node: '=afGuiContainer',
         entityName: '='
       },
       require: '^^afGuiEditor',
@@ -329,7 +329,7 @@
         $scope.editor = editor;
       },
       controller: function($scope) {
-        var block = $scope.block = this;
+        var container = $scope.container = this;
         var ts = $scope.ts = CRM.ts();
         this.node = $scope.node;
 
@@ -343,40 +343,30 @@
           if (node['af-fieldset']) {
             return 'fieldset';
           }
-          var classes = splitClass(node['class']);
-          if (_.contains(classes, 'af-block')) {
-            return 'block';
-          }
-          if (_.contains(classes, 'af-text')) {
-            return 'text';
-          }
-          if (_.contains(classes, 'af-button')) {
-            return 'button';
-          }
-          if (_.contains(classes, 'af-markup')) {
-            return 'markup';
-          }
-          return null;
+          var classes = splitClass(node['class']),
+            types = ['af-container', 'af-text', 'af-button', 'af-markup'],
+            type = _.intersection(types, classes);
+          return type.length ? type[0].replace('af-', '') : null;
         };
 
-        $scope.addBlock = function(type, props) {
+        $scope.addElement = function(type, props) {
           var classes = type.split('.');
-          var newBlock = _.defaults({
+          var element = _.defaults({
             '#tag': classes.shift(),
             'class': classes.join(' '),
           }, props);
-          if (classes[0] === 'af-block') {
-            newBlock['#children'] = [];
-          } else if (classes[0] === 'af-text' || classes[0] === 'af-button') {
-            newBlock['#children'] = [{'#text': ts('Enter text')}];
+          if (_.includes(classes, 'af-container')) {
+            element['#children'] = [];
+          } else if (_.intersection(classes, ['af-text', 'af-button']).length) {
+            element['#children'] = [{'#text': ts('Enter text')}];
           }
-          // Add new block to the top, underneath the fieldset legend if present
+          // Add it to the top, underneath the fieldset legend if present
           var pos = $scope.node['#children'].length && $scope.node['#children'][0]['#tag'] === 'legend' ? 1 : 0;
-          $scope.node['#children'].splice(pos, 0, newBlock);
+          $scope.node['#children'].splice(pos, 0, element);
         };
 
-        this.removeBlock = function(node) {
-          removeRecursive($scope.editor.scope.layout['#children'], {$$hashKey: node.$$hashKey});
+        this.removeElement = function(element) {
+          removeRecursive($scope.editor.scope.layout['#children'], {$$hashKey: element.$$hashKey});
         };
 
         $scope.isSelectedFieldset = function(entityName) {
@@ -412,7 +402,7 @@
         };
 
         $scope.tags = {
-          div: ts('Block'),
+          div: ts('Container'),
           fieldset: ts('Fieldset')
         };
 
@@ -430,7 +420,7 @@
         };
 
         $scope.setLayout = function(val) {
-          var classes = ['af-block'];
+          var classes = ['af-container'];
           if (val !== 'af-layout-rows') {
             classes.push(val);
           }
@@ -449,10 +439,10 @@
         node: '=afGuiField',
         entityName: '='
       },
-      require: ['^^afGuiEditor', '^^afGuiBlock'],
+      require: ['^^afGuiEditor', '^^afGuiContainer'],
       link: function($scope, element, attrs, ctrls) {
         $scope.editor = ctrls[0];
-        $scope.block = ctrls[1];
+        $scope.container = ctrls[1];
       },
       controller: function($scope) {
         var ts = $scope.ts = CRM.ts();
@@ -603,7 +593,7 @@
           $scope.deletedOptions.splice($index, 1);
           $scope.options.push(option);
         };
-        
+
         $scope.save = function() {
           $scope.field.getSet('options', JSON.parse(angular.toJson($scope.options)));
           $scope.close();
@@ -624,9 +614,9 @@
       scope: {
         node: '=afGuiText'
       },
-      require: '^^afGuiBlock',
-      link: function($scope, element, attrs, block) {
-        $scope.block = block;
+      require: '^^afGuiContainer',
+      link: function($scope, element, attrs, container) {
+        $scope.container = container;
       },
       controller: function($scope) {
         var ts = $scope.ts = CRM.ts();
@@ -681,13 +671,13 @@
       scope: {
         node: '=afGuiMarkup'
       },
-      require: '^^afGuiBlock',
-      link: function($scope, element, attrs, block) {
-        $scope.block = block;
+      require: '^^afGuiContainer',
+      link: function($scope, element, attrs, container) {
+        $scope.container = container;
         // CRM.wysiwyg doesn't work without a dom id
         $scope.id = 'af-markup-editor-' + richtextId++;
 
-        // When creating a new markup block, go straight to edit mode
+        // When creating a new markup container, go straight to edit mode
         $timeout(function() {
           if ($scope.node['#markup'] === false) {
             $scope.edit();
@@ -716,9 +706,9 @@
         $scope.close = function() {
           CRM.wysiwyg.destroy('#' + $scope.id);
           $('#afGuiEditor').removeClass('af-gui-editing-content');
-          // If a newly-added block was canceled, just remove it
+          // If a newly-added wysiwyg was canceled, just remove it
           if ($scope.node['#markup'] === false) {
-            $scope.block.removeBlock($scope.node);
+            $scope.container.removeElement($scope.node);
           } else {
             $scope.editingMarkup = false;
           }
@@ -735,9 +725,9 @@
       scope: {
         node: '=afGuiButton'
       },
-      require: '^^afGuiBlock',
-      link: function($scope, element, attrs, block) {
-        $scope.block = block;
+      require: '^^afGuiContainer',
+      link: function($scope, element, attrs, container) {
+        $scope.container = container;
       },
       controller: function($scope) {
         var ts = $scope.ts = CRM.ts();
diff --git a/ext/afform/gui/ang/afGuiEditor/block-menu.html b/ext/afform/gui/ang/afGuiEditor/block-menu.html
deleted file mode 100644
index 29d82ca653de..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/block-menu.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
-<li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
-<li><a href ng-click="addBlock('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
-<li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
-<li role="separator" class="divider"></li>
-<li af-gui-menu-item-border="node"></li>
-<li af-gui-menu-item-background="node"></li>
-<li role="separator" class="divider"></li>
-<li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this block') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/button-menu.html b/ext/afform/gui/ang/afGuiEditor/button-menu.html
index 9a55847f18d0..6d32c415a75c 100644
--- a/ext/afform/gui/ang/afGuiEditor/button-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/button-menu.html
@@ -7,4 +7,4 @@
   </div>
 </li>
 <li role="separator" class="divider"></li>
-<li><a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
+<li><a href ng-click="container.removeElement(node)"><span class="text-danger">{{ ts('Delete this button') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/gui/ang/afGuiEditor/button.html
index be75644dff57..3762917cd857 100644
--- a/ext/afform/gui/ang/afGuiEditor/button.html
+++ b/ext/afform/gui/ang/afGuiEditor/button.html
@@ -1,7 +1,7 @@
 <div class="af-gui-bar">
   <div class="form-inline pull-right">
     <div class="btn-group pull-right" af-gui-menu>
-      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
       <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/button-menu.html'"></ul>
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas-menu.html b/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
new file mode 100644
index 000000000000..cc28c2008f7c
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
@@ -0,0 +1,8 @@
+<li><a href ng-click="addElement('div.af-container')">{{ ts('Add container') }}</a></li>
+<li><a href ng-click="addElement('p.af-text')">{{ ts('Add text box') }}</a></li>
+<li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
+<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+<li role="separator" class="divider"></li>
+<li ng-repeat="entity in editor.scope.entities">
+  <a href ng-click="addElement('fieldset.af-container', {'af-fieldset': entity.name})">{{ ts('Fieldset for %1', {1: entity.label}) }}</a>
+</li>
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 2d116faac87c..85b611631c7c 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -13,6 +13,6 @@
     </form>
   </div>
   <div class="panel-body">
-    <div af-gui-block="layout" entity-name="" />
+    <div af-gui-container="layout" entity-name="" />
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/gui/ang/afGuiEditor/container-menu.html
new file mode 100644
index 000000000000..f4f2c25db0a7
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/container-menu.html
@@ -0,0 +1,9 @@
+<li><a href ng-click="addElement('div.af-container')">{{ ts('Add container') }}</a></li>
+<li><a href ng-click="addElement('p.af-text')">{{ ts('Add text box') }}</a></li>
+<li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
+<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+<li role="separator" class="divider"></li>
+<li af-gui-menu-item-border="node"></li>
+<li af-gui-menu-item-background="node"></li>
+<li role="separator" class="divider"></li>
+<li><a href ng-click="container.removeElement(node)"><span class="text-danger">{{ ts('Delete this container') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/block.html b/ext/afform/gui/ang/afGuiEditor/container.html
similarity index 52%
rename from ext/afform/gui/ang/afGuiEditor/block.html
rename to ext/afform/gui/ang/afGuiEditor/container.html
index 703147083a05..e7ddc10928d5 100644
--- a/ext/afform/gui/ang/afGuiEditor/block.html
+++ b/ext/afform/gui/ang/afGuiEditor/container.html
@@ -1,5 +1,5 @@
 <div class="af-gui-bar" ng-if="node['#tag'] !== 'af-form'" ng-click="selectEntity()" >
-  <span ng-if="block.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
+  <span ng-if="container.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
   <span>{{ node['#tag'] }}</span>
   <div class="form-inline pull-right" af-gui-menu>
     <div class="btn-group btn-group-xs" role="group">
@@ -7,37 +7,28 @@
         <i class="af-gui-layout-icon {{ opt }}" ></i>
       </button>
     </div>
-    <select ng-model="node['#tag']" title="{{ ts('Block type') }}">
+    <select ng-model="node['#tag']" title="{{ ts('Container type') }}">
       <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
     </select>
-    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
+    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{ ts('Add Element') }}">
       <span><i class="crm-i fa-plus"></i></span>
     </button>
-    <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/block-menu.html'"></ul>
+    <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/container-menu.html'"></ul>
   </div>
 </div>
 <div class="af-gui-bar" ng-if="node['#tag'] === 'af-form'" >
   <div class="form-inline pull-right" af-gui-menu>
-    <button type="button" class="btn  btn-default btn-sm dropdown-toggle af-gui-add-canvas-button" data-toggle="dropdown" title="{{ ts('Add block') }}">
+    <button type="button" class="btn  btn-default btn-sm dropdown-toggle af-gui-add-canvas-button" data-toggle="dropdown" title="{{ ts('Add Element') }}">
       <span>Add <i class="crm-i fa-plus"></i></span>
     </button>
-    <ul class="dropdown-menu" ng-if="menu.open">
-      <li><a href ng-click="addBlock('div.af-block')">{{ ts('Add block') }}</a></li>
-      <li><a href ng-click="addBlock('p.af-text')">{{ ts('Add text box') }}</a></li>
-      <li><a href ng-click="addBlock('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
-      <li><a href ng-click="addBlock('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
-      <li role="separator" class="divider"></li>
-      <li ng-repeat="entity in editor.scope.entities">
-        <a href ng-click="addBlock('fieldset.af-block', {'af-fieldset': entity.name})">{{ ts('Fieldset for %1', {1: entity.label}) }}</a>
-      </li>
-    </ul>
+    <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/canvas-menu.html'"></ul>
   </div>
 </div>
 <div ui-sortable="{handle: '.af-gui-bar', update: onDrop, connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in node['#children']" >
-    <div ng-switch="block.getNodeType(item)">
-      <div ng-switch-when="fieldset" af-gui-block="item" style="{{ item.style }}" class="af-gui-block af-gui-fieldset af-gui-block-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
-      <div ng-switch-when="block" af-gui-block="item" style="{{ item.style }}" class="af-gui-block af-gui-block-type-{{ item['#tag'] }}" entity-name="entityName" />
+    <div ng-switch="container.getNodeType(item)">
+      <div ng-switch-when="fieldset" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-fieldset af-gui-container-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
+      <div ng-switch-when="container" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-container-type-{{ item['#tag'] }}" entity-name="entityName" />
       <div ng-switch-when="field" af-gui-field="item" entity-name="entityName" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
       <div ng-switch-when="markup" af-gui-markup="item" class="af-gui-markup" />
diff --git a/ext/afform/gui/ang/afGuiEditor/field-menu.html b/ext/afform/gui/ang/afGuiEditor/field-menu.html
index 701dfcf8b5e6..f572c5fac1fe 100644
--- a/ext/afform/gui/ang/afGuiEditor/field-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/field-menu.html
@@ -39,7 +39,7 @@
 </li>
 <li role="separator" class="divider"></li>
 <li>
-  <a href ng-click="block.removeBlock(node)" title="{{ ts('Remove field from form') }}">
+  <a href ng-click="container.removeElement(node)" title="{{ ts('Remove field from form') }}">
     <span class="text-danger">{{ ts('Delete this field') }}</span>
   </a>
 </li>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index b44de5df688b..fe2988f63449 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -3,7 +3,7 @@
   <div class="af-gui-bar" title="{{ getEntity().label + ': ' + getDefn().title }}">
     <div class="form-inline pull-right">
       <div class="btn-group" af-gui-menu >
-        <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+        <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
           <span><i class="crm-i fa-gear"></i></span>
         </button>
         <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open" ng-include="'~/afGuiEditor/field-menu.html'"></ul>
diff --git a/ext/afform/gui/ang/afGuiEditor/markup-menu.html b/ext/afform/gui/ang/afGuiEditor/markup-menu.html
index ff45a264a8f2..80d1f4c10259 100644
--- a/ext/afform/gui/ang/afGuiEditor/markup-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/markup-menu.html
@@ -6,5 +6,5 @@
 <li af-gui-menu-item-background="node"></li>
 <li role="separator" class="divider"></li>
 <li>
-  <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this content') }}</span></a>
+  <a href ng-click="container.removeElement(node)"><span class="text-danger">{{ ts('Delete this content') }}</span></a>
 </li>
diff --git a/ext/afform/gui/ang/afGuiEditor/markup.html b/ext/afform/gui/ang/afGuiEditor/markup.html
index c9cd77cfab63..4831be286cfe 100644
--- a/ext/afform/gui/ang/afGuiEditor/markup.html
+++ b/ext/afform/gui/ang/afGuiEditor/markup.html
@@ -1,7 +1,7 @@
 <div class="af-gui-bar">
   <div class="form-inline pull-right">
     <div class="btn-group pull-right" af-gui-menu>
-      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
       <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/markup-menu.html'"></ul>
diff --git a/ext/afform/gui/ang/afGuiEditor/menu-item-background.html b/ext/afform/gui/ang/afGuiEditor/menu-item-background.html
index ce95c3153e12..0fa451dccf9e 100644
--- a/ext/afform/gui/ang/afGuiEditor/menu-item-background.html
+++ b/ext/afform/gui/ang/afGuiEditor/menu-item-background.html
@@ -1,7 +1,7 @@
 <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
   <label>{{ ts('Background:') }}</label>
   <input type="color" class="form-control" ng-model="getSetBackgroundColor" ng-model-options="{getterSetter: true}"/>
-  <a href class="" ng-click="getSetBackgroundColor(null)" ng-if="block.getStyles(node)['background-color']">
+  <a href class="" ng-click="getSetBackgroundColor(null)" ng-if="container.getStyles(node)['background-color']">
     <i class="crm-i fa-times"></i>
   </a>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/text-menu.html b/ext/afform/gui/ang/afGuiEditor/text-menu.html
index 7b4ab0ff81e4..ee379c753395 100644
--- a/ext/afform/gui/ang/afGuiEditor/text-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/text-menu.html
@@ -25,5 +25,5 @@
 </li>
 <li role="separator" class="divider"></li>
 <li>
-  <a href ng-click="block.removeBlock(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
+  <a href ng-click="container.removeElement(node)"><span class="text-danger">{{ ts('Delete this text') }}</span></a>
 </li>
diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/gui/ang/afGuiEditor/text.html
index f7b182532bbd..e7a0eb5e2674 100644
--- a/ext/afform/gui/ang/afGuiEditor/text.html
+++ b/ext/afform/gui/ang/afGuiEditor/text.html
@@ -1,7 +1,7 @@
 <div class="af-gui-bar">
   <div class="form-inline pull-right">
     <div class="btn-group pull-right" af-gui-menu>
-      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-block-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
+      <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{ ts('Configure') }}">
         <span><i class="crm-i fa-gear"></i></span>
       </button>
       <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/text-menu.html'"></ul>
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index 9e459aefe566..3a105a319043 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -7,7 +7,7 @@
   <fieldset af-fieldset="parent">
     <legend class="af-text">About You</legend>
 
-    <div class="af-block af-layout-inline">
+    <div class="af-container af-layout-inline">
       <af-field name="first_name" />
       <af-field name="last_name" />
     </div>
diff --git a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
index 122d455b0026..6d70851f39b6 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/formatExamples/banana.php
@@ -1,8 +1,8 @@
 <?php
 
 return [
-  'html' => '<div class="af-block"><strong>  New text!</strong><strong class="af-text"> &nbsp; Get a trim! </strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
-  'pretty' => '<div class="af-block">
+  'html' => '<div class="af-container"><strong>  New text!</strong><strong class="af-text"> &nbsp; Get a trim! </strong><af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" /></div>',
+  'pretty' => '<div class="af-container">
   <strong>  New text!</strong>
   <strong class="af-text">&nbsp; Get a trim!</strong>
   <af-field name="do_not_sms" defn="{label: \'Do not do any of the emailing\'}" />
@@ -11,7 +11,7 @@
   'stripped' => [
     [
       '#tag' => 'div',
-      'class' => 'af-block',
+      'class' => 'af-container',
       '#children' => [
         ['#tag' => 'strong', '#markup' => '  New text!'],
         ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => "&nbsp; Get a trim!"]]],
@@ -22,7 +22,7 @@
   'shallow' => [
     [
       '#tag' => 'div',
-      'class' => 'af-block',
+      'class' => 'af-container',
       '#children' => [
         ['#tag' => 'strong', '#markup' => '  New text!'],
         ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => " &nbsp; Get a trim! "]]],
@@ -33,7 +33,7 @@
   'deep' => [
     [
       '#tag' => 'div',
-      'class' => 'af-block',
+      'class' => 'af-container',
       '#children' => [
         ['#tag' => 'strong', '#children' => [['#text' => '  New text!']]],
         ['#tag' => 'strong', 'class' => 'af-text', '#children' => [['#text' => " &nbsp; Get a trim! "]]],

From a365a0c3ff3e0c0df3bdabce47fa38f6d2648ff8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 9 Dec 2019 10:49:02 -0500
Subject: [PATCH 557/834] Stricter directives with better docs

---
 ext/afform/core/ang/af.ang.php      | 4 ++--
 ext/afform/core/ang/af/Entity.js    | 5 ++---
 ext/afform/core/ang/af/Fieldset.js  | 7 +++----
 ext/afform/core/ang/af/Form.js      | 6 ++----
 ext/afform/core/ang/afField.ang.php | 2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index 0dae45cef56c..249a7a6e395a 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -15,8 +15,8 @@
   'settings' => [],
   'basePages' => [],
   'exports' => [
-    'af-entity' => 'AE',
+    'af-entity' => 'E',
     'af-fieldset' => 'A',
-    'af-form' => 'AE',
+    'af-form' => 'E',
   ],
 ];
diff --git a/ext/afform/core/ang/af/Entity.js b/ext/afform/core/ang/af/Entity.js
index 561563d6cabf..fdb791e20f90 100644
--- a/ext/afform/core/ang/af/Entity.js
+++ b/ext/afform/core/ang/af/Entity.js
@@ -1,6 +1,5 @@
 (function(angular, $, _) {
-  // "afEntity" is a basic skeletal directive.
-  // Example usage: <af-form>... <af-entity name="myModel" type="Individual" /> ...</af-form>
+  // Example usage: <af-form><af-entity name="Person" type="Contact" /> ... <fieldset af-fieldset="Person> ... </fieldset></af-form>
   angular.module('af').directive('afEntity', function() {
     // Whitelist of all allowed properties of an af-fieldset
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
@@ -12,7 +11,7 @@
       autofill: '@'
     };
     return {
-      restrict: 'AE',
+      restrict: 'E',
       require: '^afForm',
       scope: modelProps,
       link: function($scope, $el, $attr, afFormCtrl) {
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index 63e338554d6e..47da0424588c 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -1,6 +1,5 @@
 (function(angular, $, _) {
-  // "afFieldset" is a basic skeletal directive.
-  // Example usage: <af-form>... <div af-fieldset="myModel">...</div> ...</af-form>
+  // Example usage: <af-form><af-entity name="Person" type="Contact" /> ... <fieldset af-fieldset="Person> ... </fieldset></af-form>
   angular.module('af').directive('afFieldset', function() {
     return {
       restrict: 'A',
@@ -12,7 +11,7 @@
         $scope.afFormCtrl = afFormCtrl;
         // This is faster than waiting for each field directive to register itself
         $('af-field', $el).each(function() {
-          afFormCtrl.registerField($scope.modelName, $(this).attr('name'))
+          afFormCtrl.registerField($scope.modelName, $(this).attr('name'));
         });
       },
       controller: function($scope){
@@ -25,7 +24,7 @@
         };
         this.getName = function() {
           return $scope.modelName;
-        }
+        };
       }
     };
   });
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 2810e8cfe1ea..1083ebc63428 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -1,11 +1,9 @@
 (function(angular, $, _) {
-  // "afForm" is a basic skeletal directive.
-  // Example usage: <af-form ctrl="myCtrl">
+  // Example usage: <af-form ctrl="modelListCtrl">
   angular.module('af').directive('afForm', function() {
     return {
-      restrict: 'AE',
+      restrict: 'E',
       scope: {
-        // afForm: '=',
         ctrl: '@'
       },
       link: {
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
index a50114e60d8b..6f426743723b 100644
--- a/ext/afform/core/ang/afField.ang.php
+++ b/ext/afform/core/ang/afField.ang.php
@@ -18,6 +18,6 @@
   'settings' => [],
   'basePages' => [],
   'exports' => [
-    'af-field' => 'AE',
+    'af-field' => 'E',
   ],
 ];

From 4b644b8432418046aab8c3129cb63284fc8f0d40 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 9 Dec 2019 20:58:33 -0800
Subject: [PATCH 558/834] afform_gui - Add skeletal upgrader

---
 ext/afform/gui/CRM/AfformGui/Upgrader.php     | 134 +++++++
 .../gui/CRM/AfformGui/Upgrader/Base.php       | 376 ++++++++++++++++++
 2 files changed, 510 insertions(+)
 create mode 100644 ext/afform/gui/CRM/AfformGui/Upgrader.php
 create mode 100644 ext/afform/gui/CRM/AfformGui/Upgrader/Base.php

diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/gui/CRM/AfformGui/Upgrader.php
new file mode 100644
index 000000000000..068d9e76dd69
--- /dev/null
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader.php
@@ -0,0 +1,134 @@
+<?php
+use CRM_AfformGui_ExtensionUtil as E;
+
+/**
+ * Collection of upgrade steps.
+ */
+class CRM_AfformGui_Upgrader extends CRM_AfformGui_Upgrader_Base {
+
+  // By convention, functions that look like "function upgrade_NNNN()" are
+  // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
+
+  /**
+   * Example: Run an external SQL script when the module is installed.
+   *
+  public function install() {
+    $this->executeSqlFile('sql/myinstall.sql');
+  }
+
+  /**
+   * Example: Work with entities usually not available during the install step.
+   *
+   * This method can be used for any post-install tasks. For example, if a step
+   * of your installation depends on accessing an entity that is itself
+   * created during the installation (e.g., a setting or a managed entity), do
+   * so here to avoid order of operation problems.
+   *
+  public function postInstall() {
+    $customFieldId = civicrm_api3('CustomField', 'getvalue', array(
+      'return' => array("id"),
+      'name' => "customFieldCreatedViaManagedHook",
+    ));
+    civicrm_api3('Setting', 'create', array(
+      'myWeirdFieldSetting' => array('id' => $customFieldId, 'weirdness' => 1),
+    ));
+  }
+
+  /**
+   * Example: Run an external SQL script when the module is uninstalled.
+   *
+  public function uninstall() {
+   $this->executeSqlFile('sql/myuninstall.sql');
+  }
+
+  /**
+   * Example: Run a simple query when a module is enabled.
+   *
+  public function enable() {
+    CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar = "whiz"');
+  }
+
+  /**
+   * Example: Run a simple query when a module is disabled.
+   *
+  public function disable() {
+    CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar = "whiz"');
+  }
+
+  /**
+   * Example: Run a couple simple queries.
+   *
+   * @return TRUE on success
+   * @throws Exception
+   *
+  public function upgrade_4200() {
+    $this->ctx->log->info('Applying update 4200');
+    CRM_Core_DAO::executeQuery('UPDATE foo SET bar = "whiz"');
+    CRM_Core_DAO::executeQuery('DELETE FROM bang WHERE willy = wonka(2)');
+    return TRUE;
+  } // */
+
+
+  /**
+   * Example: Run an external SQL script.
+   *
+   * @return TRUE on success
+   * @throws Exception
+  public function upgrade_4201() {
+    $this->ctx->log->info('Applying update 4201');
+    // this path is relative to the extension base dir
+    $this->executeSqlFile('sql/upgrade_4201.sql');
+    return TRUE;
+  } // */
+
+
+  /**
+   * Example: Run a slow upgrade process by breaking it up into smaller chunk.
+   *
+   * @return TRUE on success
+   * @throws Exception
+  public function upgrade_4202() {
+    $this->ctx->log->info('Planning update 4202'); // PEAR Log interface
+
+    $this->addTask(E::ts('Process first step'), 'processPart1', $arg1, $arg2);
+    $this->addTask(E::ts('Process second step'), 'processPart2', $arg3, $arg4);
+    $this->addTask(E::ts('Process second step'), 'processPart3', $arg5);
+    return TRUE;
+  }
+  public function processPart1($arg1, $arg2) { sleep(10); return TRUE; }
+  public function processPart2($arg3, $arg4) { sleep(10); return TRUE; }
+  public function processPart3($arg5) { sleep(10); return TRUE; }
+  // */
+
+
+  /**
+   * Example: Run an upgrade with a query that touches many (potentially
+   * millions) of records by breaking it up into smaller chunks.
+   *
+   * @return TRUE on success
+   * @throws Exception
+  public function upgrade_4203() {
+    $this->ctx->log->info('Planning update 4203'); // PEAR Log interface
+
+    $minId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(min(id),0) FROM civicrm_contribution');
+    $maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM civicrm_contribution');
+    for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
+      $endId = $startId + self::BATCH_SIZE - 1;
+      $title = E::ts('Upgrade Batch (%1 => %2)', array(
+        1 => $startId,
+        2 => $endId,
+      ));
+      $sql = '
+        UPDATE civicrm_contribution SET foobar = whiz(wonky()+wanker)
+        WHERE id BETWEEN %1 and %2
+      ';
+      $params = array(
+        1 => array($startId, 'Integer'),
+        2 => array($endId, 'Integer'),
+      );
+      $this->addTask($title, 'executeSql', $sql, $params);
+    }
+    return TRUE;
+  } // */
+
+}
diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php b/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php
new file mode 100644
index 000000000000..0dad88389733
--- /dev/null
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php
@@ -0,0 +1,376 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+use CRM_AfformGui_ExtensionUtil as E;
+
+/**
+ * Base class which provides helpers to execute upgrade logic
+ */
+class CRM_AfformGui_Upgrader_Base {
+
+  /**
+   * @var varies, subclass of this
+   */
+  static $instance;
+
+  /**
+   * @var CRM_Queue_TaskContext
+   */
+  protected $ctx;
+
+  /**
+   * @var string, eg 'com.example.myextension'
+   */
+  protected $extensionName;
+
+  /**
+   * @var string, full path to the extension's source tree
+   */
+  protected $extensionDir;
+
+  /**
+   * @var array(revisionNumber) sorted numerically
+   */
+  private $revisions;
+
+  /**
+   * @var boolean
+   *   Flag to clean up extension revision data in civicrm_setting
+   */
+  private $revisionStorageIsDeprecated = FALSE;
+
+  /**
+   * Obtain a reference to the active upgrade handler.
+   */
+  static public function instance() {
+    if (!self::$instance) {
+      // FIXME auto-generate
+      self::$instance = new CRM_AfformGui_Upgrader(
+        'org.civicrm.afform-gui',
+        realpath(__DIR__ . '/../../../')
+      );
+    }
+    return self::$instance;
+  }
+
+  /**
+   * Adapter that lets you add normal (non-static) member functions to the queue.
+   *
+   * Note: Each upgrader instance should only be associated with one
+   * task-context; otherwise, this will be non-reentrant.
+   *
+   * @code
+   * CRM_AfformGui_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
+   * @endcode
+   */
+  static public function _queueAdapter() {
+    $instance = self::instance();
+    $args = func_get_args();
+    $instance->ctx = array_shift($args);
+    $instance->queue = $instance->ctx->queue;
+    $method = array_shift($args);
+    return call_user_func_array(array($instance, $method), $args);
+  }
+
+  public function __construct($extensionName, $extensionDir) {
+    $this->extensionName = $extensionName;
+    $this->extensionDir = $extensionDir;
+  }
+
+  // ******** Task helpers ********
+
+  /**
+   * Run a CustomData file.
+   *
+   * @param string $relativePath the CustomData XML file path (relative to this extension's dir)
+   * @return bool
+   */
+  public function executeCustomDataFile($relativePath) {
+    $xml_file = $this->extensionDir . '/' . $relativePath;
+    return $this->executeCustomDataFileByAbsPath($xml_file);
+  }
+
+  /**
+   * Run a CustomData file
+   *
+   * @param string $xml_file  the CustomData XML file path (absolute path)
+   *
+   * @return bool
+   */
+  protected static function executeCustomDataFileByAbsPath($xml_file) {
+    $import = new CRM_Utils_Migrate_Import();
+    $import->run($xml_file);
+    return TRUE;
+  }
+
+  /**
+   * Run a SQL file.
+   *
+   * @param string $relativePath the SQL file path (relative to this extension's dir)
+   *
+   * @return bool
+   */
+  public function executeSqlFile($relativePath) {
+    CRM_Utils_File::sourceSQLFile(
+      CIVICRM_DSN,
+      $this->extensionDir . DIRECTORY_SEPARATOR . $relativePath
+    );
+    return TRUE;
+  }
+
+  /**
+   * @param string $tplFile
+   *   The SQL file path (relative to this extension's dir).
+   *   Ex: "sql/mydata.mysql.tpl".
+   * @return bool
+   */
+  public function executeSqlTemplate($tplFile) {
+    // Assign multilingual variable to Smarty.
+    $upgrade = new CRM_Upgrade_Form();
+
+    $tplFile = CRM_Utils_File::isAbsolute($tplFile) ? $tplFile : $this->extensionDir . DIRECTORY_SEPARATOR . $tplFile;
+    $smarty = CRM_Core_Smarty::singleton();
+    $smarty->assign('domainID', CRM_Core_Config::domainID());
+    CRM_Utils_File::sourceSQLFile(
+      CIVICRM_DSN, $smarty->fetch($tplFile), NULL, TRUE
+    );
+    return TRUE;
+  }
+
+  /**
+   * Run one SQL query.
+   *
+   * This is just a wrapper for CRM_Core_DAO::executeSql, but it
+   * provides syntatic sugar for queueing several tasks that
+   * run different queries
+   */
+  public function executeSql($query, $params = array()) {
+    // FIXME verify that we raise an exception on error
+    CRM_Core_DAO::executeQuery($query, $params);
+    return TRUE;
+  }
+
+  /**
+   * Syntatic sugar for enqueuing a task which calls a function in this class.
+   *
+   * The task is weighted so that it is processed
+   * as part of the currently-pending revision.
+   *
+   * After passing the $funcName, you can also pass parameters that will go to
+   * the function. Note that all params must be serializable.
+   */
+  public function addTask($title) {
+    $args = func_get_args();
+    $title = array_shift($args);
+    $task = new CRM_Queue_Task(
+      array(get_class($this), '_queueAdapter'),
+      $args,
+      $title
+    );
+    return $this->queue->createItem($task, array('weight' => -1));
+  }
+
+  // ******** Revision-tracking helpers ********
+
+  /**
+   * Determine if there are any pending revisions.
+   *
+   * @return bool
+   */
+  public function hasPendingRevisions() {
+    $revisions = $this->getRevisions();
+    $currentRevision = $this->getCurrentRevision();
+
+    if (empty($revisions)) {
+      return FALSE;
+    }
+    if (empty($currentRevision)) {
+      return TRUE;
+    }
+
+    return ($currentRevision < max($revisions));
+  }
+
+  /**
+   * Add any pending revisions to the queue.
+   */
+  public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
+    $this->queue = $queue;
+
+    $currentRevision = $this->getCurrentRevision();
+    foreach ($this->getRevisions() as $revision) {
+      if ($revision > $currentRevision) {
+        $title = ts('Upgrade %1 to revision %2', array(
+          1 => $this->extensionName,
+          2 => $revision,
+        ));
+
+        // note: don't use addTask() because it sets weight=-1
+
+        $task = new CRM_Queue_Task(
+          array(get_class($this), '_queueAdapter'),
+          array('upgrade_' . $revision),
+          $title
+        );
+        $this->queue->createItem($task);
+
+        $task = new CRM_Queue_Task(
+          array(get_class($this), '_queueAdapter'),
+          array('setCurrentRevision', $revision),
+          $title
+        );
+        $this->queue->createItem($task);
+      }
+    }
+  }
+
+  /**
+   * Get a list of revisions.
+   *
+   * @return array(revisionNumbers) sorted numerically
+   */
+  public function getRevisions() {
+    if (!is_array($this->revisions)) {
+      $this->revisions = array();
+
+      $clazz = new ReflectionClass(get_class($this));
+      $methods = $clazz->getMethods();
+      foreach ($methods as $method) {
+        if (preg_match('/^upgrade_(.*)/', $method->name, $matches)) {
+          $this->revisions[] = $matches[1];
+        }
+      }
+      sort($this->revisions, SORT_NUMERIC);
+    }
+
+    return $this->revisions;
+  }
+
+  public function getCurrentRevision() {
+    $revision = CRM_Core_BAO_Extension::getSchemaVersion($this->extensionName);
+    if (!$revision) {
+      $revision = $this->getCurrentRevisionDeprecated();
+    }
+    return $revision;
+  }
+
+  private function getCurrentRevisionDeprecated() {
+    $key = $this->extensionName . ':version';
+    if ($revision = CRM_Core_BAO_Setting::getItem('Extension', $key)) {
+      $this->revisionStorageIsDeprecated = TRUE;
+    }
+    return $revision;
+  }
+
+  public function setCurrentRevision($revision) {
+    CRM_Core_BAO_Extension::setSchemaVersion($this->extensionName, $revision);
+    // clean up legacy schema version store (CRM-19252)
+    $this->deleteDeprecatedRevision();
+    return TRUE;
+  }
+
+  private function deleteDeprecatedRevision() {
+    if ($this->revisionStorageIsDeprecated) {
+      $setting = new CRM_Core_BAO_Setting();
+      $setting->name = $this->extensionName . ':version';
+      $setting->delete();
+      CRM_Core_Error::debug_log_message("Migrated extension schema revision ID for {$this->extensionName} from civicrm_setting (deprecated) to civicrm_extension.\n");
+    }
+  }
+
+  // ******** Hook delegates ********
+
+  /**
+   * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+   */
+  public function onInstall() {
+    $files = glob($this->extensionDir . '/sql/*_install.sql');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
+      }
+    }
+    $files = glob($this->extensionDir . '/sql/*_install.mysql.tpl');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        $this->executeSqlTemplate($file);
+      }
+    }
+    $files = glob($this->extensionDir . '/xml/*_install.xml');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        $this->executeCustomDataFileByAbsPath($file);
+      }
+    }
+    if (is_callable(array($this, 'install'))) {
+      $this->install();
+    }
+  }
+
+  /**
+   * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+   */
+  public function onPostInstall() {
+    $revisions = $this->getRevisions();
+    if (!empty($revisions)) {
+      $this->setCurrentRevision(max($revisions));
+    }
+    if (is_callable(array($this, 'postInstall'))) {
+      $this->postInstall();
+    }
+  }
+
+  /**
+   * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+   */
+  public function onUninstall() {
+    $files = glob($this->extensionDir . '/sql/*_uninstall.mysql.tpl');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        $this->executeSqlTemplate($file);
+      }
+    }
+    if (is_callable(array($this, 'uninstall'))) {
+      $this->uninstall();
+    }
+    $files = glob($this->extensionDir . '/sql/*_uninstall.sql');
+    if (is_array($files)) {
+      foreach ($files as $file) {
+        CRM_Utils_File::sourceSQLFile(CIVICRM_DSN, $file);
+      }
+    }
+  }
+
+  /**
+   * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+   */
+  public function onEnable() {
+    // stub for possible future use
+    if (is_callable(array($this, 'enable'))) {
+      $this->enable();
+    }
+  }
+
+  /**
+   * @see https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+   */
+  public function onDisable() {
+    // stub for possible future use
+    if (is_callable(array($this, 'disable'))) {
+      $this->disable();
+    }
+  }
+
+  public function onUpgrade($op, CRM_Queue_Queue $queue = NULL) {
+    switch ($op) {
+      case 'check':
+        return array($this->hasPendingRevisions());
+
+      case 'enqueue':
+        return $this->enqueuePendingRevisions($queue);
+
+      default:
+    }
+  }
+
+}

From ce8b69575a3f6b0915e2a97a9d058dc8e1be9fde Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 9 Dec 2019 21:01:32 -0800
Subject: [PATCH 559/834] afform_gui - Add nav item under "Administer =>
 Customize Data and Screens"

---
 ext/afform/gui/CRM/AfformGui/Upgrader.php | 37 +++++++++++++++++++----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/gui/CRM/AfformGui/Upgrader.php
index 068d9e76dd69..ce85f6b6cfd7 100644
--- a/ext/afform/gui/CRM/AfformGui/Upgrader.php
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader.php
@@ -10,10 +10,30 @@ class CRM_AfformGui_Upgrader extends CRM_AfformGui_Upgrader_Base {
   // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
 
   /**
-   * Example: Run an external SQL script when the module is installed.
-   *
+   * Setup navigation item on new installs
+   */
   public function install() {
-    $this->executeSqlFile('sql/myinstall.sql');
+    // $this->executeSqlFile('sql/myinstall.sql');
+    try {
+      $existing = civicrm_api3('Navigation', 'getcount', [
+        'name' => 'afform_gui',
+        'domain_id' => CRM_Core_Config::domainID(),
+      ]);
+      if (!$existing) {
+        civicrm_api3('Navigation', 'create', [
+          'parent_id' => 'Customize Data and Screens',
+          'label' => ts('Afforms'),
+          'weight' => 1,
+          'name' => 'afform_gui',
+          'permission' => 'administer CiviCRM',
+          'url' => 'civicrm/admin/afform',
+          'is_active' => 1,
+        ]);
+      }
+    }
+    catch (Exception $e) {
+      // Couldn't create menu item.
+    }
   }
 
   /**
@@ -35,10 +55,15 @@ public function postInstall() {
   }
 
   /**
-   * Example: Run an external SQL script when the module is uninstalled.
-   *
+   * Cleanup navigtaion upon removal
+   */
   public function uninstall() {
-   $this->executeSqlFile('sql/myuninstall.sql');
+   // $this->executeSqlFile('sql/myuninstall.sql');
+    civicrm_api3('Navigation', 'get', [
+      'name' => 'afform_gui',
+      'return' => ['id'],
+      'api.Navigation.delete' => [],
+    ]);
   }
 
   /**

From 10fd70a3b8004bb8d063d21319d6be967d352527 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 9 Dec 2019 22:05:10 -0800
Subject: [PATCH 560/834] Afform.get - Return computed fields, `has_local` and
 `has_packaged`

---
 ext/afform/core/CRM/Afform/AfformScanner.php      | 15 +++++++++++++++
 ext/afform/core/Civi/Api4/Action/Afform/Get.php   |  1 +
 ext/afform/core/Civi/Api4/Afform.php              | 13 ++++++++++++-
 .../core/Civi/Api4/Utils/AfformSaveTrait.php      |  2 ++
 .../mock/tests/phpunit/api/v4/AfformTest.php      |  6 ++++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 6a6c79734317..f0cc0f6f4d24 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -152,6 +152,21 @@ public function getMeta($name) {
     }
   }
 
+  public function getComputedFields($name) {
+    // Ex: $allPaths['viewIndividual'][0] == '/var/www/foo/afform/view-individual'].
+    $allPaths = $this->findFilePaths()[$name];
+    // $activeLayoutPath = $this->findFilePath($name, self::LAYOUT_FILE);
+    // $activeMetaPath = $this->findFilePath($name, self::METADATA_FILE);
+    $localLayoutPath = $this->createSiteLocalPath($name, self::LAYOUT_FILE);
+    $localMetaPath = $this->createSiteLocalPath($name, self::METADATA_FILE);
+
+    $fields = [];
+    $fields['has_local'] = file_exists($localLayoutPath) || file_exists($localMetaPath);
+    $fields['has_packaged'] = ($fields['has_local'] && count($allPaths) > 1)
+      || (!$fields['has_local'] && count($allPaths) > 0);
+    return $fields;
+  }
+
   /**
    * @param string $formName
    *   Ex: 'view-individual'
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 92d5df45644d..13288cc7394b 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -19,6 +19,7 @@ public function getRecords() {
     $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
+      $record = array_merge($record, $scanner->getComputedFields($name));
       $layout = $this->_isFieldSelected('layout') ? $scanner->getLayout($name) : NULL;
       if ($layout !== NULL) {
         // FIXME check for validity?
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 8bfecf5b1b7d..9dc720ddf86c 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -86,7 +86,7 @@ public static function revert() {
 
   public static function getFields() {
     return new BasicGetFieldsAction('Afform', __FUNCTION__, function($self) {
-      return [
+      $fields = [
         [
           'name' => 'name',
         ],
@@ -111,6 +111,17 @@ public static function getFields() {
           'name' => 'layout',
         ],
       ];
+
+      if ($self->getAction() === 'get') {
+        $fields[] = [
+          'name' => 'has_local',
+        ];
+        $fields[] = [
+          'name' => 'has_packaged',
+        ];
+      }
+
+      return $fields;
     });
   }
 
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index ed39450d0791..700146ce951c 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -35,6 +35,8 @@ protected function writeRecord($item) {
       $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->addSelect('name')->execute()->column('name');
       unset($fields[array_search('layout', $fields)]);
       unset($fields[array_search('name', $fields)]);
+      unset($fields[array_search('has_local', $fields)]);
+      unset($fields[array_search('has_packaged', $fields)]);
       $orig = \Civi\Api4\Afform::get()->setCheckPermissions(FALSE)->addWhere('name', '=', $item['name'])->setSelect($fields)->execute()->first();
     }
 
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 45bc30c2dc6b..c8645bf17b45 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -59,6 +59,8 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
+    $this->assertEquals(FALSE, $get($result[0], 'has_local'), $message);
 
     $message = 'After updating with Afform.create, the revised data should be returned';
     $result = Civi\Api4\Afform::update()
@@ -75,6 +77,8 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals('The temporary description', $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_local'), $message);
 
     Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
     $message = 'After reverting, the final Afform.get should return default data';
@@ -84,6 +88,8 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
+    $this->assertEquals(FALSE, $get($result[0], 'has_local'), $message);
   }
 
   public function getFormatExamples() {

From 1cad5eb233e687a8957e1f277417f16a852c6953 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 9 Dec 2019 22:12:01 -0800
Subject: [PATCH 561/834] afform_gui, afform_html - Adjust "Revert" button
 based on actual status

---
 ext/afform/gui/ang/afGuiList.aff.html   | 9 ++++++++-
 ext/afform/html/ang/afHtmlList.aff.html | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/gui/ang/afGuiList.aff.html
index c87d00947aa8..71d77be451d8 100644
--- a/ext/afform/gui/ang/afGuiList.aff.html
+++ b/ext/afform/gui/ang/afGuiList.aff.html
@@ -2,7 +2,7 @@
   <i class="crm-i fa-plus"></i> {{ ts('New Form') }}
 </a>
 <div
-  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route','has_local','has_packaged'], orderBy: {name:'ASC'}}]"
   af-api4-ctrl="listCtrl">
 
   <div ng-if="apiData.result.length == 0">
@@ -37,7 +37,14 @@
            af-api4-start-msg="ts('Reverting...')"
            af-api4-success-msg="ts('Reverted')"
            class="btn btn-xs btn-default"
+           ng-if="availForm.has_local && availForm.has_packaged"
           >{{ts('Revert')}}</a>
+        <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+           af-api4-start-msg="ts('Deleting...')"
+           af-api4-success-msg="ts('Deleted')"
+           class="btn btn-xs btn-default"
+           ng-if="availForm.has_local && !availForm.has_packaged"
+        >{{ts('Delete')}}</a>
       </td>
     </tr>
     </tbody>
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index ed4a6286ee8c..9533ec1d58bc 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -1,5 +1,5 @@
 <div
-  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route', 'has_local', 'has_packaged'], orderBy: {name:'ASC'}}]"
   af-api4-ctrl="listCtrl">
 
   <div ng-if="apiData.result.length == 0">
@@ -34,7 +34,14 @@
            af-api4-start-msg="ts('Reverting...')"
            af-api4-success-msg="ts('Reverted')"
            class="btn btn-xs btn-default"
+           ng-if="availForm.has_local && availForm.has_packaged"
           >{{ts('Revert')}}</a>
+        <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+           af-api4-start-msg="ts('Deleting...')"
+           af-api4-success-msg="ts('Deleted')"
+           class="btn btn-xs btn-default"
+           ng-if="availForm.has_local && !availForm.has_packaged"
+        >{{ts('Delete')}}</a>
       </td>
     </tr>
     </tbody>

From 5bf3fa63c01c88bdf3902cb02ddc087c3226a93a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 9 Dec 2019 22:21:04 -0800
Subject: [PATCH 562/834] afform_gui, afform_html - Refresh after reverting

---
 ext/afform/gui/ang/afGuiList.aff.html   | 2 ++
 ext/afform/html/ang/afHtmlList.aff.html | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/gui/ang/afGuiList.aff.html
index 71d77be451d8..f51bdf19fcfa 100644
--- a/ext/afform/gui/ang/afGuiList.aff.html
+++ b/ext/afform/gui/ang/afGuiList.aff.html
@@ -36,12 +36,14 @@
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Reverting...')"
            af-api4-success-msg="ts('Reverted')"
+           af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
            ng-if="availForm.has_local && availForm.has_packaged"
           >{{ts('Revert')}}</a>
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Deleting...')"
            af-api4-success-msg="ts('Deleted')"
+           af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
            ng-if="availForm.has_local && !availForm.has_packaged"
         >{{ts('Delete')}}</a>
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index 9533ec1d58bc..e306b3f2ee01 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -33,12 +33,14 @@
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Reverting...')"
            af-api4-success-msg="ts('Reverted')"
+           af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
            ng-if="availForm.has_local && availForm.has_packaged"
           >{{ts('Revert')}}</a>
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Deleting...')"
            af-api4-success-msg="ts('Deleted')"
+           af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
            ng-if="availForm.has_local && !availForm.has_packaged"
         >{{ts('Delete')}}</a>

From a2ea91baf068581a000324436dbc44b8486edec1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 10 Dec 2019 15:10:49 -0500
Subject: [PATCH 563/834] Fix ngRepeat syntax error

---
 ext/afform/core/ang/afField/widgets/Radio.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/ang/afField/widgets/Radio.html b/ext/afform/core/ang/afField/widgets/Radio.html
index f914f64c4377..b3e9917b6098 100644
--- a/ext/afform/core/ang/afField/widgets/Radio.html
+++ b/ext/afform/core/ang/afField/widgets/Radio.html
@@ -1,4 +1,4 @@
-<label ng-repeat="(opt in getOptions()" >
+<label ng-repeat="opt in getOptions()" >
   <input class="crm-form-radio" type="radio" ng-model="getData()[fieldName]" value="{{ opt.key }}" />
   {{ opt.label }}
 </label>

From be47f409d2ccd42aed15debaa8aea57ca1078085 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 10 Dec 2019 13:07:35 -0800
Subject: [PATCH 564/834] afform_gui - Tweak nav label

---
 ext/afform/gui/CRM/AfformGui/Upgrader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/gui/CRM/AfformGui/Upgrader.php
index ce85f6b6cfd7..5959224578fd 100644
--- a/ext/afform/gui/CRM/AfformGui/Upgrader.php
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader.php
@@ -22,7 +22,7 @@ public function install() {
       if (!$existing) {
         civicrm_api3('Navigation', 'create', [
           'parent_id' => 'Customize Data and Screens',
-          'label' => ts('Afforms'),
+          'label' => ts('Forms'),
           'weight' => 1,
           'name' => 'afform_gui',
           'permission' => 'administer CiviCRM',

From 0d97b1376664dfe0dd9a246bc21bb8f17ca90a2b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Dec 2019 09:05:21 -0500
Subject: [PATCH 565/834] GUI - Add option to hide field labels

---
 ext/afform/gui/ang/afGuiEditor.js              | 9 +++++++++
 ext/afform/gui/ang/afGuiEditor/field-menu.html | 6 ++++++
 ext/afform/gui/ang/afGuiEditor/field.html      | 2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 872c7e929eeb..fbe3fd89007f 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -513,6 +513,15 @@
           return !(typeof val === 'undefined' || val === null);
         };
 
+        $scope.toggleLabel = function() {
+          $scope.node.defn = $scope.node.defn || {};
+          if ($scope.node.defn.title === false) {
+            delete $scope.node.defn.title;
+          } else {
+            $scope.node.defn.title = false;
+          }
+        };
+
         $scope.toggleRequired = function() {
           getSet('required', !getSet('required'));
           return false;
diff --git a/ext/afform/gui/ang/afGuiEditor/field-menu.html b/ext/afform/gui/ang/afGuiEditor/field-menu.html
index f572c5fac1fe..2fdf38aa37a7 100644
--- a/ext/afform/gui/ang/afGuiEditor/field-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/field-menu.html
@@ -12,6 +12,12 @@
     {{ ts('Required') }}
   </a>
 </li>
+<li>
+  <a href ng-click="toggleLabel(); $event.stopPropagation();" title="{{ ts('Show field label') }}">
+    <i class="crm-i" ng-class="{'fa-square-o': node.defn.title === false, 'fa-check-square-o': node.defn.title !== false}"></i>
+    {{ ts('Label') }}
+  </a>
+</li>
 <li>
   <a href ng-click="toggleHelp('pre'); $event.stopPropagation();" title="{{ ts('Show help text above this field') }}">
     <i class="crm-i" ng-class="{'fa-square-o': !propIsset('help_pre'), 'fa-check-square-o': propIsset('help_pre')}"></i>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index fe2988f63449..efcb4fc6ca74 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -10,7 +10,7 @@
       </div>
     </div>
   </div>
-  <label ng-class="{'af-gui-field-required': getProp('required')}" class="af-gui-node-title">
+  <label ng-style="{visibility: node.defn.title === false ? 'hidden' : 'visible'}" ng-class="{'af-gui-field-required': getProp('required')}" class="af-gui-node-title">
     <span af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ getProp('title') }}</span>
   </label>
   <div class="af-gui-field-help" ng-if="propIsset('help_pre')">

From 4585f2a7f78311a3df4c6d6861334229094076b3 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Dec 2019 09:38:50 -0500
Subject: [PATCH 566/834] Merge afField module into af module

---
 ext/afform/core/ang/af.ang.php                |  3 ++-
 .../ang/{afField/afField.js => af/Field.js}   |  6 ++---
 .../core/ang/{afField => af}/afField.html     |  2 +-
 .../widgets => af/fields}/CheckBox.html       |  0
 .../{afField/widgets => af/fields}/Date.html  |  0
 .../widgets => af/fields}/Number.html         |  0
 .../{afField/widgets => af/fields}/Radio.html |  0
 .../widgets => af/fields}/RichTextEditor.html |  0
 .../widgets => af/fields}/Select.html         |  0
 .../{afField/widgets => af/fields}/Text.html  |  0
 .../widgets => af/fields}/TextArea.html       |  0
 ext/afform/core/ang/afField.ang.php           | 23 -------------------
 ext/afform/core/ang/afField.css               |  1 -
 ext/afform/core/ang/afField.js                |  4 ----
 ext/afform/mock/ang/afex.aff.json             |  2 +-
 15 files changed, 7 insertions(+), 34 deletions(-)
 rename ext/afform/core/ang/{afField/afField.js => af/Field.js} (88%)
 rename ext/afform/core/ang/{afField => af}/afField.html (73%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/CheckBox.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/Date.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/Number.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/Radio.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/RichTextEditor.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/Select.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/Text.html (100%)
 rename ext/afform/core/ang/{afField/widgets => af/fields}/TextArea.html (100%)
 delete mode 100644 ext/afform/core/ang/afField.ang.php
 delete mode 100644 ext/afform/core/ang/afField.css
 delete mode 100644 ext/afform/core/ang/afField.js

diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index 249a7a6e395a..d4230409da02 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -10,7 +10,7 @@
     'ang/af/*/*.js',
   ],
   // 'css' => ['ang/af.css'],
-  // 'partials' => ['ang/af'],
+  'partials' => ['ang/af'],
   'requires' => ['crmUtil'],
   'settings' => [],
   'basePages' => [],
@@ -18,5 +18,6 @@
     'af-entity' => 'E',
     'af-fieldset' => 'A',
     'af-form' => 'E',
+    'af-field' => 'E',
   ],
 ];
diff --git a/ext/afform/core/ang/afField/afField.js b/ext/afform/core/ang/af/Field.js
similarity index 88%
rename from ext/afform/core/ang/afField/afField.js
rename to ext/afform/core/ang/af/Field.js
index f6004173236a..08b637734fb8 100644
--- a/ext/afform/core/ang/afField/afField.js
+++ b/ext/afform/core/ang/af/Field.js
@@ -1,12 +1,12 @@
 (function(angular, $, _) {
   // Example usage: <div af-fieldset="myModel"><af-field name="do_not_email" /></div>
-  angular.module('afField').directive('afField', function() {
+  angular.module('af').directive('afField', function() {
     return {
       restrict: 'E',
       require: ['^afFieldset', '^afForm'],
-      templateUrl: '~/afField/afField.html',
+      templateUrl: '~/af/afField.html',
       scope: {
-        fieldName: '@name', // TEST ME
+        fieldName: '@name',
         defn: '='
       },
       link: function($scope, $el, $attr, ctrls) {
diff --git a/ext/afform/core/ang/afField/afField.html b/ext/afform/core/ang/af/afField.html
similarity index 73%
rename from ext/afform/core/ang/afField/afField.html
rename to ext/afform/core/ang/af/afField.html
index 79a0703b9301..709a7cbefba6 100644
--- a/ext/afform/core/ang/afField/afField.html
+++ b/ext/afform/core/ang/af/afField.html
@@ -2,5 +2,5 @@
   {{ defn.title }}
 </label>
 <p class="crm-af-field-help-pre" ng-if="defn.help_pre">{{ defn.help_pre }}</p>
-<div class="crm-af-field" ng-include="'~/afField/widgets/' + defn.input_type + '.html'"></div>
+<div class="crm-af-field" ng-include="'~/af/fields/' + defn.input_type + '.html'"></div>
 <p class="crm-af-field-help-post" ng-if="defn.help_post">{{ defn.help_post }}</p>
diff --git a/ext/afform/core/ang/afField/widgets/CheckBox.html b/ext/afform/core/ang/af/fields/CheckBox.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/CheckBox.html
rename to ext/afform/core/ang/af/fields/CheckBox.html
diff --git a/ext/afform/core/ang/afField/widgets/Date.html b/ext/afform/core/ang/af/fields/Date.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/Date.html
rename to ext/afform/core/ang/af/fields/Date.html
diff --git a/ext/afform/core/ang/afField/widgets/Number.html b/ext/afform/core/ang/af/fields/Number.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/Number.html
rename to ext/afform/core/ang/af/fields/Number.html
diff --git a/ext/afform/core/ang/afField/widgets/Radio.html b/ext/afform/core/ang/af/fields/Radio.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/Radio.html
rename to ext/afform/core/ang/af/fields/Radio.html
diff --git a/ext/afform/core/ang/afField/widgets/RichTextEditor.html b/ext/afform/core/ang/af/fields/RichTextEditor.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/RichTextEditor.html
rename to ext/afform/core/ang/af/fields/RichTextEditor.html
diff --git a/ext/afform/core/ang/afField/widgets/Select.html b/ext/afform/core/ang/af/fields/Select.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/Select.html
rename to ext/afform/core/ang/af/fields/Select.html
diff --git a/ext/afform/core/ang/afField/widgets/Text.html b/ext/afform/core/ang/af/fields/Text.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/Text.html
rename to ext/afform/core/ang/af/fields/Text.html
diff --git a/ext/afform/core/ang/afField/widgets/TextArea.html b/ext/afform/core/ang/af/fields/TextArea.html
similarity index 100%
rename from ext/afform/core/ang/afField/widgets/TextArea.html
rename to ext/afform/core/ang/af/fields/TextArea.html
diff --git a/ext/afform/core/ang/afField.ang.php b/ext/afform/core/ang/afField.ang.php
deleted file mode 100644
index 6f426743723b..000000000000
--- a/ext/afform/core/ang/afField.ang.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// This file declares an Angular module which can be autoloaded
-// in CiviCRM. See also:
-// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
-
-return [
-  'js' => [
-    'ang/afField.js',
-    'ang/afField/*.js',
-    'ang/afField/*/*.js',
-  ],
-  'css' => ['ang/afField.css'],
-  'partials' => ['ang/afField'],
-  'requires' => [
-    'crmUi',
-    'crmUtil',
-  ],
-  'settings' => [],
-  'basePages' => [],
-  'exports' => [
-    'af-field' => 'E',
-  ],
-];
diff --git a/ext/afform/core/ang/afField.css b/ext/afform/core/ang/afField.css
deleted file mode 100644
index f7242cc0b7cf..000000000000
--- a/ext/afform/core/ang/afField.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add any CSS rules for Angular module "afField" */
diff --git a/ext/afform/core/ang/afField.js b/ext/afform/core/ang/afField.js
deleted file mode 100644
index 617a10b090b4..000000000000
--- a/ext/afform/core/ang/afField.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function(angular, $, _) {
-  // Declare a list of dependencies.
-  angular.module('afField', CRM.angRequires('afField'));
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/mock/ang/afex.aff.json b/ext/afform/mock/ang/afex.aff.json
index 7cb07054e8ab..57a6679e72fa 100644
--- a/ext/afform/mock/ang/afex.aff.json
+++ b/ext/afform/mock/ang/afex.aff.json
@@ -1,4 +1,4 @@
 {
   "server_route": "civicrm/afex",
-  "requires":["mockFoo", "mockBareFile", "af", "afBlock", "afField"]
+  "requires":["mockFoo", "mockBareFile", "af", "afBlock"]
 }

From 7c107c85c15d1ae364867dbdd7dfaf7b597f67b1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Dec 2019 09:44:23 -0500
Subject: [PATCH 567/834] Remove redundant afformStandalone file

---
 ext/afform/core/ang/afformStandalone.ang.php     |  5 -----
 ext/afform/core/ang/afformStandalone.js          | 12 ++++++++++++
 ext/afform/core/ang/afformStandalone/PageCtrl.js | 12 ------------
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 ext/afform/core/ang/afformStandalone/PageCtrl.js

diff --git a/ext/afform/core/ang/afformStandalone.ang.php b/ext/afform/core/ang/afformStandalone.ang.php
index 3b145af59c87..6f5f89f8a013 100644
--- a/ext/afform/core/ang/afformStandalone.ang.php
+++ b/ext/afform/core/ang/afformStandalone.ang.php
@@ -6,13 +6,8 @@
 return [
   'js' => [
     'ang/afformStandalone.js',
-    'ang/afformStandalone/*.js',
-    'ang/afformStandalone/*/*.js',
   ],
   'css' => [],
-  'partials' => [
-    'ang/afformStandalone',
-  ],
   'settings' => [],
   'requires' => ['ngRoute'],
 ];
diff --git a/ext/afform/core/ang/afformStandalone.js b/ext/afform/core/ang/afformStandalone.js
index c7b03a2a86d9..4d65f3809065 100644
--- a/ext/afform/core/ang/afformStandalone.js
+++ b/ext/afform/core/ang/afformStandalone.js
@@ -1,4 +1,16 @@
 (function(angular, $, _) {
   // Declare a list of dependencies.
   angular.module('afformStandalone', CRM.angRequires('afformStandalone'));
+
+  angular.module('afformStandalone', CRM.angular.modules)
+    .config(function($routeProvider) {
+      $routeProvider.when('/', {
+        controller: 'AfformStandalonePageCtrl',
+        template: function() {
+          return '<div ' + CRM.afform.open + '="{}"></div>';
+        }
+      });
+    })
+    .controller('AfformStandalonePageCtrl', function($scope) {});
+
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afformStandalone/PageCtrl.js b/ext/afform/core/ang/afformStandalone/PageCtrl.js
deleted file mode 100644
index 7f597b022384..000000000000
--- a/ext/afform/core/ang/afformStandalone/PageCtrl.js
+++ /dev/null
@@ -1,12 +0,0 @@
-(function(angular, $, _) {
-
-  angular.module('afformStandalone', CRM.angular.modules)
-    .config(function($routeProvider) {
-      $routeProvider.when('/', {
-        controller: 'AfformStandalonePageCtrl',
-        template: function() {return '<div ' + CRM.afform.open + '="{}"></div>'; }
-      });
-    })
-    .controller('AfformStandalonePageCtrl', function($scope) {});
-
-})(angular, CRM.$, CRM._);

From 27a7e64158153341bd0d42d6314af538dc46924c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 10 Dec 2019 22:01:16 -0500
Subject: [PATCH 568/834] Use dynamic snippet for afform module layout.

---
 ext/afform/core/afform.php                            | 11 +++++------
 .../core/templates/afform/AfformAngularModule.tpl     |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 273ed37c83b8..62759fe6b47c 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -165,20 +165,19 @@ function afform_civicrm_angularModules(&$angularModules) {
   $names = array_keys($scanner->findFilePaths());
   foreach ($names as $name) {
     $meta = $scanner->getMeta($name);
+    $layout = $scanner->getLayout($name);
     $angularModules[_afform_angular_module_name($name, 'camel')] = [
       'ext' => E::LONG_NAME,
       'js' => ['assetBuilder://afform.js?name=' . urlencode($name)],
       'requires' => $meta['requires'],
       'basePages' => [],
+      'snippets' => [
+        "~afform/$name.aff.html" => $layout,
+      ],
       'exports' => [
         _afform_angular_module_name($name, 'dash') => 'AE',
       ],
     ];
-
-    // FIXME: The HTML layout template is embedded in the JS asset.
-    // This works at runtime for basic usage, but it bypasses
-    // the normal workflow for templates (e.g. translation).
-    // We should update core so that 'partials' can be specified more dynamically.
   }
 }
 
@@ -413,7 +412,7 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     'camel' => _afform_angular_module_name($name, 'camel'),
     'meta' => $meta,
     'metaJson' => json_encode($meta),
-    'layout' => _afform_html_filter($name, $scanner->getLayout($name)),
+    'templateUrl' => "~afform/$name.aff.html",
   ]);
   $mimeType = 'text/javascript';
   $content = $smarty->fetch('afform/AfformAngularModule.tpl');
diff --git a/ext/afform/core/templates/afform/AfformAngularModule.tpl b/ext/afform/core/templates/afform/AfformAngularModule.tpl
index 4a04137884e7..3af54b317898 100644
--- a/ext/afform/core/templates/afform/AfformAngularModule.tpl
+++ b/ext/afform/core/templates/afform/AfformAngularModule.tpl
@@ -10,8 +10,8 @@
   angular.module('{/literal}{$afform.camel}{literal}', CRM.angRequires('{/literal}{$afform.camel}{literal}'));
   angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function(afCoreDirective) {
     return afCoreDirective({/literal}{$afform.camel|json},{$afform.metaJson}{literal}, {
-      template: {/literal}{$afform.layout|json}{literal}
+      templateUrl: {/literal}{$afform.templateUrl|json}{literal}
     });
   });
 })(angular, CRM.$, CRM._);
-{/literal}
\ No newline at end of file
+{/literal}

From dd10599cda0c72e22b8ee9b1369751373bd7e975 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 10 Dec 2019 22:22:03 -0500
Subject: [PATCH 569/834] Fix afform partial name

ng-include was failing with ~afform* but works with ~/afform*
---
 ext/afform/core/afform.php                    | 22 +++----------------
 .../tests/phpunit/Civi/Afform/FilterTest.php  | 20 ++++++++++++++---
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 62759fe6b47c..5824fca8703e 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -172,7 +172,7 @@ function afform_civicrm_angularModules(&$angularModules) {
       'requires' => $meta['requires'],
       'basePages' => [],
       'snippets' => [
-        "~afform/$name.aff.html" => $layout,
+        "~/afform/$name.aff.html" => $layout,
       ],
       'exports' => [
         _afform_angular_module_name($name, 'dash') => 'AE',
@@ -300,7 +300,7 @@ function _afform_reverse_deps_find($formName, $html, $revMap) {
  */
 function afform_civicrm_alterAngular($angular) {
   $fieldMetadata = \Civi\Angular\ChangeSet::create('fieldMetadata')
-    ->alterHtml(';^~afform/;', function($doc, $path) {
+    ->alterHtml(';\\.aff\\.html$;', function($doc, $path) {
       $entities = _afform_getMetadata($doc);
 
       foreach (pq('af-field', $doc) as $afField) {
@@ -412,28 +412,12 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     'camel' => _afform_angular_module_name($name, 'camel'),
     'meta' => $meta,
     'metaJson' => json_encode($meta),
-    'templateUrl' => "~afform/$name.aff.html",
+    'templateUrl' => "~/afform/$name.aff.html",
   ]);
   $mimeType = 'text/javascript';
   $content = $smarty->fetch('afform/AfformAngularModule.tpl');
 }
 
-/**
- * Apply any filters to an HTML partial.
- *
- * @param string $formName
- * @param string $html
- *   Original HTML.
- * @return string
- *   Modified HTML.
- */
-function _afform_html_filter($formName, $html) {
-  $fileName = '~afform/' . _afform_angular_module_name($formName, 'camel');
-  $htmls = [$fileName => $html];
-  $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(Civi::service('angular')->getChangeSets(), 'partials', $htmls);
-  return $htmls[$fileName];
-}
-
 /**
  * Implements hook_civicrm_alterMenu().
  */
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
index 8f94f03442a5..fba7e5e028b3 100644
--- a/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FilterTest.php
@@ -20,10 +20,24 @@ public function setUpHeadless() {
     return \Civi\Test::headless()->installMe(__DIR__)->apply();
   }
 
+  /**
+   * Apply any filters to an HTML partial.
+   *
+   * @param string $fileName
+   * @param string $html
+   *   Original HTML.
+   * @return string
+   *   Modified HTML.
+   */
+  private function htmlFilter($fileName, $html) {
+    $htmls = \Civi\Angular\ChangeSet::applyResourceFilters(\Civi::service('angular')->getChangeSets(), 'partials', [$fileName => $html]);
+    return $htmls[$fileName];
+  }
+
   public function testDefnInjection() {
     $inputHtml = sprintf(self::PERSON_TPL,
       '<div af-fieldset="person"><af-field name="first_name" /></div>');
-    $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+    $filteredHtml = $this->htmlFilter('~/afform/MyForm.aff.html', $inputHtml);
     $converter = new \CRM_Afform_ArrayHtml(TRUE);
     $parsed = $converter->convertHtmlToArray($filteredHtml);
 
@@ -35,7 +49,7 @@ public function testDefnInjection() {
   public function testDefnInjectionNested() {
     $inputHtml = sprintf(self::PERSON_TPL,
       '<span><div af-fieldset="person"><foo><af-field name="first_name" /></foo></div></span>');
-    $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+    $filteredHtml = $this->htmlFilter('~/afform/MyForm.aff.html', $inputHtml);
     $converter = new \CRM_Afform_ArrayHtml(TRUE);
     $parsed = $converter->convertHtmlToArray($filteredHtml);
 
@@ -47,7 +61,7 @@ public function testDefnInjectionNested() {
   public function testDefnOverrideTitle() {
     $inputHtml = sprintf(self::PERSON_TPL,
       '<div af-fieldset="person"><af-field name="first_name" defn="{title: \'Given name\'}" /></div>');
-    $filteredHtml = _afform_html_filter('~afform/MyForm.html', $inputHtml);
+    $filteredHtml = $this->htmlFilter('~/afform/MyForm.aff.html', $inputHtml);
     $converter = new \CRM_Afform_ArrayHtml(TRUE);
     $parsed = $converter->convertHtmlToArray($filteredHtml);
 

From 905b0fd51c30e1431b510e5e70246993f160f8dd Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 12 Dec 2019 08:14:03 -0500
Subject: [PATCH 570/834] Rename modelListCtrl => afform

---
 ext/afform/gui/ang/afGuiEditor.js                  | 6 +++---
 ext/afform/gui/ang/afGuiEditor/canvas-menu.html    | 2 +-
 ext/afform/gui/ang/afGuiEditor/container-menu.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index fbe3fd89007f..ae7b3eec0b10 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -37,7 +37,7 @@
           title: ts('Untitled Form'),
           layout: [{
             '#tag': 'af-form',
-            ctrl: 'modelListCtrl',
+            ctrl: 'afform',
             '#children': []
           }]
         };
@@ -54,7 +54,7 @@
               "#tag": "button",
               "class": 'af-button btn btn-primary',
               "crm-icon": 'fa-check',
-              "ng-click": "modelListCtrl.submit()",
+              "ng-click": "afform.submit()",
               "#children": [
                 {
                   "#text": "Submit"
@@ -743,7 +743,7 @@
 
         // TODO: Add action selector to UI
         // $scope.actions = {
-        //   "modelListCtrl.submit()": ts('Submit Form')
+        //   "afform.submit()": ts('Submit Form')
         // };
 
         $scope.styles = _.transform(CRM.afformAdminData.styles, function(styles, val, key) {
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas-menu.html b/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
index cc28c2008f7c..9d1932c7dac7 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
@@ -1,7 +1,7 @@
 <li><a href ng-click="addElement('div.af-container')">{{ ts('Add container') }}</a></li>
 <li><a href ng-click="addElement('p.af-text')">{{ ts('Add text box') }}</a></li>
 <li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
-<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
 <li ng-repeat="entity in editor.scope.entities">
   <a href ng-click="addElement('fieldset.af-container', {'af-fieldset': entity.name})">{{ ts('Fieldset for %1', {1: entity.label}) }}</a>
diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/gui/ang/afGuiEditor/container-menu.html
index f4f2c25db0a7..f50b533dae5f 100644
--- a/ext/afform/gui/ang/afGuiEditor/container-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/container-menu.html
@@ -1,7 +1,7 @@
 <li><a href ng-click="addElement('div.af-container')">{{ ts('Add container') }}</a></li>
 <li><a href ng-click="addElement('p.af-text')">{{ ts('Add text box') }}</a></li>
 <li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
-<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'modelListCtrl.submit()'})">{{ ts('Add button') }}</a></li>
+<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
 <li af-gui-menu-item-border="node"></li>
 <li af-gui-menu-item-background="node"></li>

From aa6abb776c751c6215695d7e5fd638923b73b337 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Dec 2019 15:48:42 -0800
Subject: [PATCH 571/834] Generate partials via callback

Technically, it's two changes:

1. Changing `snippets` to `partialsCallback` to reduce the amount of upfront IO/memory.
2. Changing the mocked-up filename to start with `~/theAngModule/`. So modules implemented in
   afform look more look other modules. Makes it work with `cv ang:html:list` and `cv ang:html:show`.
---
 ext/afform/core/afform.php | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 5824fca8703e..3ec7664af04b 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -165,15 +165,13 @@ function afform_civicrm_angularModules(&$angularModules) {
   $names = array_keys($scanner->findFilePaths());
   foreach ($names as $name) {
     $meta = $scanner->getMeta($name);
-    $layout = $scanner->getLayout($name);
     $angularModules[_afform_angular_module_name($name, 'camel')] = [
       'ext' => E::LONG_NAME,
       'js' => ['assetBuilder://afform.js?name=' . urlencode($name)],
       'requires' => $meta['requires'],
       'basePages' => [],
-      'snippets' => [
-        "~/afform/$name.aff.html" => $layout,
-      ],
+      'partialsCallback' => '_afform_get_partials',
+      '_afform' => $name,
       'exports' => [
         _afform_angular_module_name($name, 'dash') => 'AE',
       ],
@@ -181,6 +179,24 @@ function afform_civicrm_angularModules(&$angularModules) {
   }
 }
 
+/**
+ * Construct a list of partials for a given afform/angular module.
+ *
+ * @param string $moduleName
+ *   The module name.
+ * @param array $module
+ *   The module definition.
+ * @return array
+ *   Array(string $filename => string $html).
+ */
+function _afform_get_partials($moduleName, $module) {
+  /** @var CRM_Afform_AfformScanner $scanner */
+  $scanner = Civi::service('afform_scanner');
+  return [
+    "~/$moduleName/$moduleName.aff.html" => $scanner->getLayout($module['_afform']),
+  ];
+}
+
 /**
  * Scan the list of Angular modules and inject automatic-requirements.
  *
@@ -406,13 +422,14 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   /** @var \CRM_Afform_AfformScanner $scanner */
   $scanner = Civi::service('afform_scanner');
   $meta = $scanner->getMeta($name);
+  $moduleName = _afform_angular_module_name($name, 'camel');
 
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
-    'camel' => _afform_angular_module_name($name, 'camel'),
+    'camel' => $moduleName,
     'meta' => $meta,
     'metaJson' => json_encode($meta),
-    'templateUrl' => "~/afform/$name.aff.html",
+    'templateUrl' => "~/$moduleName/$moduleName.aff.html",
   ]);
   $mimeType = 'text/javascript';
   $content = $smarty->fetch('afform/AfformAngularModule.tpl');

From fc7ac3c0613e5dce769226dd1eb980156e0961cd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Dec 2019 15:58:29 -0800
Subject: [PATCH 572/834] info.xml - Bump minimum version. Needs revised
 hook_civicrm_angularModules.

---
 ext/afform/core/info.xml | 2 +-
 ext/afform/gui/info.xml  | 2 +-
 ext/afform/html/info.xml | 2 +-
 ext/afform/mock/info.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index b61ebf9332d0..34d246d6d680 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -18,7 +18,7 @@
   <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.18</ver>
+    <ver>5.22</ver>
   </compatibility>
   <requires>
     <ext version="~4.5">org.civicrm.api4</ext>
diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
index 25397be3c260..929c2f64dc2a 100644
--- a/ext/afform/gui/info.xml
+++ b/ext/afform/gui/info.xml
@@ -18,7 +18,7 @@
   <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.18</ver>
+    <ver>5.22</ver>
   </compatibility>
   <comments>This is a new, undeveloped module</comments>
   <requires>
diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index 2ff167ea8a80..af38f55b4748 100644
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -18,7 +18,7 @@
   <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.18</ver>
+    <ver>5.22</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>
diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index 489ffc30f82d..27555b447317 100644
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -18,7 +18,7 @@
   <version>0.3</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.18</ver>
+    <ver>5.22</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>

From 17535d7f23fa18b4641bbcc21efa5b161f9e67a9 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 17:59:46 -0800
Subject: [PATCH 573/834] Store 'permission' property for each form

---
 ext/afform/core/CRM/Afform/AfformScanner.php        |  1 +
 ext/afform/core/Civi/Api4/Afform.php                |  3 +++
 ext/afform/mock/ang/mockPage.aff.json               |  2 +-
 ext/afform/mock/tests/phpunit/api/v4/AfformTest.php | 12 ++++++++----
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index f0cc0f6f4d24..61ac85c95ef6 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -138,6 +138,7 @@ public function getMeta($name) {
       'title' => '',
       'description' => '',
       'is_public' => FALSE,
+      'permission' => 'access CiviCRM',
     ];
 
     $metaFile = $this->findFilePath($name, self::METADATA_FILE);
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 9dc720ddf86c..cca20d19d381 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -107,6 +107,9 @@ public static function getFields() {
         [
           'name' => 'server_route',
         ],
+        [
+          'name' => 'permission',
+        ],
         [
           'name' => 'layout',
         ],
diff --git a/ext/afform/mock/ang/mockPage.aff.json b/ext/afform/mock/ang/mockPage.aff.json
index 9b45e0bfbebc..de1f8212ec5f 100644
--- a/ext/afform/mock/ang/mockPage.aff.json
+++ b/ext/afform/mock/ang/mockPage.aff.json
@@ -1 +1 @@
-{"server_route": "civicrm/mock-page", "requires":["extraMock"]}
+{"server_route": "civicrm/mock-page", "requires":["extraMock"], "permission": "access Foobar" }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index c8645bf17b45..cd1af772d220 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -30,10 +30,10 @@ private function fudgeMarkup($markup) {
 
   public function getBasicDirectives() {
     return [
-      ['mockPage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/mock-page']],
-      ['mockBareFile', ['title' => '', 'description' => '']],
-      ['mockFoo', ['title' => '', 'description' => '']],
-      ['mock-weird-name', ['title' => 'Weird Name', 'description' => '']],
+      ['mockPage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/mock-page', 'permission' => 'access Foobar']],
+      ['mockBareFile', ['title' => '', 'description' => '', 'permission' => 'access CiviCRM']],
+      ['mockFoo', ['title' => '', 'description' => '', 'permission' => 'access CiviCRM']],
+      ['mock-weird-name', ['title' => 'Weird Name', 'description' => '', 'permission' => 'access CiviCRM']],
     ];
   }
 
@@ -58,6 +58,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
     $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
+    $this->assertEquals($get($originalMetadata, 'permission'), $get($result[0], 'permission'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
     $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
     $this->assertEquals(FALSE, $get($result[0], 'has_local'), $message);
@@ -66,6 +67,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $result = Civi\Api4\Afform::update()
       ->addWhere('name', '=', $formName)
       ->addValue('description', 'The temporary description')
+      ->addValue('permission', 'access foo')
       ->execute();
     $this->assertEquals($formName, $result[0]['name'], $message);
     $this->assertEquals('The temporary description', $result[0]['description'], $message);
@@ -76,6 +78,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
     $this->assertEquals('The temporary description', $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
+    $this->assertEquals('access foo', $get($result[0], 'permission'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
     $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
     $this->assertEquals(TRUE, $get($result[0], 'has_local'), $message);
@@ -87,6 +90,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'title'), $get($result[0], 'title'), $message);
     $this->assertEquals($get($originalMetadata, 'description'), $get($result[0], 'description'), $message);
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
+    $this->assertEquals($get($originalMetadata, 'permission'), $get($result[0], 'permission'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
     $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
     $this->assertEquals(FALSE, $get($result[0], 'has_local'), $message);

From fdabc6d75d0f6ceedbddca7d59b3865f3f4c10b6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 19:03:53 -0800
Subject: [PATCH 574/834] afform_mock - The extra dep should be a real module

Using a real Angular module means that the page can be opened in an E2E test.
---
 ext/afform/mock/ang/mockBespoke.ang.php       | 29 +++++++++++++++++++
 ext/afform/mock/ang/mockBespoke.css           |  1 +
 ext/afform/mock/ang/mockBespoke.js            |  4 +++
 ext/afform/mock/ang/mockPage.aff.json         |  2 +-
 .../mock/tests/phpunit/api/v4/AfformTest.php  | 10 +++----
 5 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 ext/afform/mock/ang/mockBespoke.ang.php
 create mode 100644 ext/afform/mock/ang/mockBespoke.css
 create mode 100644 ext/afform/mock/ang/mockBespoke.js

diff --git a/ext/afform/mock/ang/mockBespoke.ang.php b/ext/afform/mock/ang/mockBespoke.ang.php
new file mode 100644
index 000000000000..ecbfb40aa946
--- /dev/null
+++ b/ext/afform/mock/ang/mockBespoke.ang.php
@@ -0,0 +1,29 @@
+<?php
+// This file declares an Angular module which can be autoloaded
+// in CiviCRM. See also:
+// \https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules/n
+return array (
+  'js' =>
+  array (
+    0 => 'ang/mockBespoke.js',
+    1 => 'ang/mockBespoke/*.js',
+    2 => 'ang/mockBespoke/*/*.js',
+  ),
+  'css' =>
+  array (
+    0 => 'ang/mockBespoke.css',
+  ),
+  'partials' =>
+  array (
+    0 => 'ang/mockBespoke',
+  ),
+  'requires' =>
+  array (
+    0 => 'crmUi',
+    1 => 'crmUtil',
+    2 => 'ngRoute',
+  ),
+  'settings' =>
+  array (
+  ),
+);
diff --git a/ext/afform/mock/ang/mockBespoke.css b/ext/afform/mock/ang/mockBespoke.css
new file mode 100644
index 000000000000..3e347a353378
--- /dev/null
+++ b/ext/afform/mock/ang/mockBespoke.css
@@ -0,0 +1 @@
+/* Add any CSS rules for Angular module "mockBespoke" */
diff --git a/ext/afform/mock/ang/mockBespoke.js b/ext/afform/mock/ang/mockBespoke.js
new file mode 100644
index 000000000000..9eaf76640f30
--- /dev/null
+++ b/ext/afform/mock/ang/mockBespoke.js
@@ -0,0 +1,4 @@
+(function(angular, $, _) {
+  // Declare a list of dependencies.
+  angular.module('mockBespoke', CRM.angRequires('mockBespoke'));
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/mock/ang/mockPage.aff.json b/ext/afform/mock/ang/mockPage.aff.json
index de1f8212ec5f..2bdf31cc781f 100644
--- a/ext/afform/mock/ang/mockPage.aff.json
+++ b/ext/afform/mock/ang/mockPage.aff.json
@@ -1 +1 @@
-{"server_route": "civicrm/mock-page", "requires":["extraMock"], "permission": "access Foobar" }
+{"server_route": "civicrm/mock-page", "requires":["mockBespoke"], "permission": "access Foobar" }
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index cd1af772d220..392e9f95010f 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -205,9 +205,9 @@ public function testAutoRequires() {
     // The default mockPage has 1 explicit requirement + 2 automatic requirements.
     Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
     $angModule = Civi::service('angular')->getModule($formName);
-    $this->assertEquals(['afCore', 'extraMock', 'mockBareFile', 'mockFoo'], $angModule['requires']);
+    $this->assertEquals(['afCore', 'mockBespoke', 'mockBareFile', 'mockFoo'], $angModule['requires']);
     $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->addSelect('requires')->execute();
-    $this->assertEquals(['extraMock'], $storedRequires[0]['requires']);
+    $this->assertEquals(['mockBespoke'], $storedRequires[0]['requires']);
 
     // Knock down to 1 explicit + 1 automatic.
     Civi\Api4\Afform::update()
@@ -216,9 +216,9 @@ public function testAutoRequires() {
       ->setValues(['layout' => '<div>The bare file says "<span mock-bare-file/>"</div>'])
       ->execute();
     $angModule = Civi::service('angular')->getModule($formName);
-    $this->assertEquals(['afCore', 'extraMock', 'mockBareFile'], $angModule['requires']);
+    $this->assertEquals(['afCore', 'mockBespoke', 'mockBareFile'], $angModule['requires']);
     $storedRequires = Civi\Api4\Afform::get()->addWhere('name', '=', $formName)->addSelect('requires')->execute();
-    $this->assertEquals(['extraMock'], $storedRequires[0]['requires']);
+    $this->assertEquals(['mockBespoke'], $storedRequires[0]['requires']);
 
     // Remove the last explict and implicit requirements.
     Civi\Api4\Afform::update()
@@ -236,7 +236,7 @@ public function testAutoRequires() {
 
     Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
     $angModule = Civi::service('angular')->getModule($formName);
-    $this->assertEquals(['afCore', 'extraMock', 'mockBareFile', 'mockFoo'], $angModule['requires']);
+    $this->assertEquals(['afCore', 'mockBespoke', 'mockBareFile', 'mockFoo'], $angModule['requires']);
   }
 
 }

From 1aebf5b0e361db2fe491ff53b67b96ca248ac403 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 20:56:49 -0800
Subject: [PATCH 575/834] Afform.get - Fix warning/test-failure when trying to
 load non-existent record

---
 ext/afform/core/Civi/Api4/Action/Afform/Get.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 13288cc7394b..0f16028e9786 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -19,7 +19,9 @@ public function getRecords() {
     $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
-      $record = array_merge($record, $scanner->getComputedFields($name));
+      if ($record) {
+        $record = array_merge($record, $scanner->getComputedFields($name));
+      }
       $layout = $this->_isFieldSelected('layout') ? $scanner->getLayout($name) : NULL;
       if ($layout !== NULL) {
         // FIXME check for validity?

From f16b2aeed0866c654a8d418fc913cc6ed21be061 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 20:11:52 -0800
Subject: [PATCH 576/834] Enforce customizable `permission` for server routes.
 Add E2E test for server-routes.

---
 ext/afform/bin/test-all.sh                    |  8 +-
 ext/afform/core/afform.php                    | 23 ++++-
 .../phpunit/api/v4/AfformRoutingTest.php      | 99 +++++++++++++++++++
 3 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/AfformRoutingTest.php

diff --git a/ext/afform/bin/test-all.sh b/ext/afform/bin/test-all.sh
index c1a7cf77abde..fdb01887e11b 100755
--- a/ext/afform/bin/test-all.sh
+++ b/ext/afform/bin/test-all.sh
@@ -18,7 +18,13 @@ pushd "$AFF_CORE" >> /dev/null
 popd >> /dev/null
 
 pushd "$AFF_MOCK" >> /dev/null
-  if ! phpunit6 "$@" ; then
+  if ! phpunit6 --group e2e "$@" ; then
+    EXIT=1
+  fi
+popd >> /dev/null
+
+pushd "$AFF_MOCK" >> /dev/null
+  if ! phpunit6 --group headless "$@" ; then
     EXIT=1
   fi
 popd >> /dev/null
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 3ec7664af04b..b10378182426 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -452,13 +452,34 @@ function afform_civicrm_alterMenu(&$items) {
         'page_callback' => 'CRM_Afform_Page_AfformBase',
         'page_arguments' => 'afform=' . urlencode($name),
         'title' => $meta['title'] ?? '',
-        'access_arguments' => [['access CiviCRM'], 'and'], // FIXME
+        'access_arguments' => [["@afform:$name"], 'and'],
         'is_public' => $meta['is_public'],
       ];
     }
   }
 }
 
+/**
+ * Implements hook_civicrm_permission_check().
+ *
+ * @see CRM_Utils_Hook::permission_check()
+ */
+function afform_civicrm_permission_check($permission, &$granted, $contactId) {
+  if ($permission{0} !== '@') {
+    // Micro-optimization - this function may get hit a lot.
+    return;
+  }
+
+  if (preg_match('/^@afform:(.*)/', $permission, $m)) {
+    $name = $m[1];
+
+    /** @var CRM_Afform_AfformScanner $scanner */
+    $scanner = \Civi::container()->get('afform_scanner');
+    $meta = $scanner->getMeta($name);
+    $granted = CRM_Core_Permission::check($meta['permission'], $contactId);
+  }
+}
+
 /**
  * Clear any local/in-memory caches based on afform data.
  */
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformRoutingTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformRoutingTest.php
new file mode 100644
index 000000000000..3fd74d34e1f8
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformRoutingTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * Ensure that the routes created by Afform are working.
+ * @group e2e
+ */
+class api_v4_AfformRoutingTest extends \PHPUnit\Framework\TestCase implements \Civi\Test\EndToEndInterface {
+
+  protected $formName = 'mockPage';
+
+  public static function setUpBeforeClass() {
+    \Civi\Test::e2e()
+      ->install(['org.civicrm.afform', 'org.civicrm.afform-mock'])
+      ->apply();
+  }
+
+  public function setUp() {
+    parent::setUp();
+    Civi\Api4\Afform::revert()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->execute();
+  }
+
+  public function tearDown() {
+    parent::tearDown();
+    Civi\Api4\Afform::revert()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->execute();
+  }
+
+  public function testChangingPermissions() {
+    $http = new \GuzzleHttp\Client(['http_errors' => FALSE]);
+    $url = function ($path, $query = NULL) {
+      return CRM_Utils_System::url($path, $query, TRUE, NULL, FALSE);
+    };
+
+    $result = $http->get($url('civicrm/mock-page'));
+    $this->assertNotAuthorized($result);
+
+    Civi\Api4\Afform::update()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->addValue('permission', CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION)
+      ->execute();
+
+    $result = $http->get($url('civicrm/mock-page'));
+    $this->assertOpensPage($result, 'mock-page');
+  }
+
+  public function testChangingPath() {
+    $http = new \GuzzleHttp\Client(['http_errors' => FALSE]);
+    $url = function ($path, $query = NULL) {
+      return CRM_Utils_System::url($path, $query, TRUE, NULL, FALSE);
+    };
+
+    Civi\Api4\Afform::update()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->addValue('permission', CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION)
+      ->execute();
+
+    $this->assertOpensPage($http->get($url('civicrm/mock-page')), 'mock-page');
+    $this->assertNotAuthorized($http->get($url('civicrm/mock-page-renamed')));
+
+    Civi\Api4\Afform::update()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->addValue('server_route', 'civicrm/mock-page-renamed')
+      ->execute();
+
+    $this->assertNotAuthorized($http->get($url('civicrm/mock-page')));
+    $this->assertOpensPage($http->get($url('civicrm/mock-page-renamed')), 'mock-page');
+  }
+
+  /**
+   * @param $result
+   */
+  private function assertNotAuthorized(Psr\Http\Message\ResponseInterface $result) {
+    $contents = $result->getBody()->getContents();
+    $this->assertEquals(403, $result->getStatusCode());
+    $this->assertRegExp(';You are not authorized to access;', $contents);
+    $this->assertNotRegExp(';afform":\{"open":".*"\};', $contents);
+  }
+
+  /**
+   * @param $result
+   * @param string $directive
+   *   The name of the directive which auto-opens.
+   */
+  private function assertOpensPage(Psr\Http\Message\ResponseInterface $result, $directive) {
+    $contents = $result->getBody()->getContents();
+    $this->assertEquals(200, $result->getStatusCode());
+    $this->assertNotRegExp(';You are not authorized to access;', $contents);
+    $this->assertRegExp(';afform":\{"open":"' . preg_quote($directive, ';') . '"\};', $contents);
+  }
+
+}

From 59ccb5c253797a594484b7735025a9061f8145d5 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 21:42:24 -0800
Subject: [PATCH 577/834] AfformUsageTest - Add a basic test case of
 prefill/submit APIs

---
 .../tests/phpunit/api/v4/AfformUsageTest.php  | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php

diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
new file mode 100644
index 000000000000..128475d1f8c9
--- /dev/null
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Test case for Afform.prefill and Afform.submit.
+ *
+ * @group headless
+ */
+class api_v4_AfformUsageTest extends api_v4_AfformTestCase {
+  use \Civi\Test\Api3TestTrait;
+  use \Civi\Test\ContactTestTrait;
+
+  protected static $layouts = [];
+
+  protected $formName;
+
+  public static function setUpBeforeClass() {
+    parent::setUpBeforeClass();
+    self::$layouts['aboutMe'] = <<<EOHTML
+<af-form ctrl="modelListCtrl">
+  <af-entity type="Contact" data="{contact_type: 'Individual'}" name="me" label="Myself" url-autofill="1" autofill="user" />
+  <fieldset af-fieldset="me">
+      <af-field name="first_name" />
+      <af-field name="last_name" />
+  </fieldset>
+</af-form>
+EOHTML;
+  }
+
+  public function setUp() {
+    parent::setUp();
+    $this->formName = 'mock' . rand(0, 100000);
+  }
+
+  public function tearDown() {
+    Civi\Api4\Afform::revert()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $this->formName)
+      ->execute();
+    parent::tearDown();
+  }
+
+  public function testAboutMeAllowed() {
+    $this->useValues([
+      'layout' => self::$layouts['aboutMe'],
+      'permission' => CRM_Core_Permission::ALWAYS_ALLOW_PERMISSION,
+    ]);
+
+    $cid = $this->createLoggedInUser();
+    CRM_Core_Config::singleton()->userPermissionTemp = new CRM_Core_Permission_Temp();
+
+    $prefill = Civi\Api4\Afform::prefill()
+      ->setName($this->formName)
+      ->setArgs([])
+      ->execute()
+      ->indexBy('name');
+    $this->assertEquals('Logged In', $prefill['me']['values']['first_name']);
+    $this->assertRegExp('/^User/', $prefill['me']['values']['last_name']);
+
+    $me = $prefill['me']['values'];
+    $me['first_name'] = 'Firsty';
+    $me['last_name'] = 'Lasty';
+
+    Civi\Api4\Afform::submit()
+      ->setName($this->formName)
+      ->setArgs([])
+      ->setValues(['me' => $me])
+      ->execute();
+
+    $contact = Civi\Api4\Contact::get()->setCheckPermissions(FALSE)->addWhere('id', '=', $cid)->execute()->first();
+    $this->assertEquals('Firsty', $contact['first_name']);
+    $this->assertEquals('Lasty', $contact['last_name']);
+  }
+
+  protected function useValues($values) {
+    $defaults = [
+      'title' => 'My form',
+      'name' => $this->formName,
+    ];
+    $full = array_merge($defaults, $values);
+    Civi\Api4\Afform::create()
+      ->setCheckPermissions(FALSE)
+      ->setLayoutFormat('html')
+      ->setValues($full)
+      ->execute();
+  }
+
+}

From 01aa61a33a956c80b148799a27f64b1787d63277 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 21:43:05 -0800
Subject: [PATCH 578/834] Afform.{prefill,submit} - APIs should respect
 `permission`

---
 .../Api4/Action/Afform/AbstractProcessor.php  |  6 ++++
 .../tests/phpunit/api/v4/AfformUsageTest.php  | 36 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 2249edbdf064..e5cc41258fdd 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -35,6 +35,12 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
   public function _run(Result $result) {
     // This will throw an exception if the form doesn't exist
     $this->_afform = (array) civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $this->name]]], 0);
+    if ($this->getCheckPermissions()) {
+      if (!\CRM_Core_Permission::check("@afform:" . $this->_afform['name'])) {
+        throw new \Civi\API\Exception\UnauthorizedException("Authorization failed: Cannot process form " . $this->_afform['name']);
+      }
+    }
+
     $this->_formDataModel = FormDataModel::create($this->_afform['layout']);
     $this->validateArgs();
     $result->exchangeArray($this->processForm());
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
index 128475d1f8c9..14823d2b4272 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
@@ -71,6 +71,42 @@ public function testAboutMeAllowed() {
     $this->assertEquals('Lasty', $contact['last_name']);
   }
 
+  public function testAboutMeForbidden() {
+    $this->useValues([
+      'layout' => self::$layouts['aboutMe'],
+      'permission' => CRM_Core_Permission::ALWAYS_DENY_PERMISSION,
+    ]);
+
+    $this->createLoggedInUser();
+    CRM_Core_Config::singleton()->userPermissionTemp = new CRM_Core_Permission_Temp();
+
+    try {
+      Civi\Api4\Afform::prefill()
+        ->setName($this->formName)
+        ->setArgs([])
+        ->execute()
+        ->indexBy('name');
+      $this->fail('Expected authorization exception from Afform.prefill');
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertRegExp(';Authorization failed: Cannot process form mock\d+;', $e->getMessage());
+    }
+
+    try {
+      Civi\Api4\Afform::submit()
+        ->setName($this->formName)
+        ->setArgs([])
+        ->setValues([
+          'does.n' => 'tmatter',
+        ])
+        ->execute();
+      $this->fail('Expected authorization exception from Afform.submit');
+    }
+    catch (\Civi\API\Exception\UnauthorizedException $e) {
+      $this->assertRegExp(';Authorization failed: Cannot process form mock\d+;', $e->getMessage());
+    }
+  }
+
   protected function useValues($values) {
     $defaults = [
       'title' => 'My form',

From bca1e4f881d2126b32bb2652fa6965e9a858b1ee Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 20:12:54 -0800
Subject: [PATCH 579/834] (REF) AfformSaveTrait - Extract helper $isChanged

I was originally expecting to need to flush the menu whenever the
`permission` changed.  That's not necessary now (because the true permission
check is deferred until it's needed), but the cleanup may still be helpful
in the future (e.g.  if we enable nav-menu integration or change the way
permissions are implemented).
---
 ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 700146ce951c..eae07c5ee449 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -63,7 +63,11 @@ protected function writeRecord($item) {
     // We may have changed list of files covered by the cache.
     _afform_clear();
 
-    if (($item['server_route'] ?? NULL) !== ($orig['server_route'] ?? NULL)) {
+    $isChanged = function($field) use ($item, $orig) {
+      return ($item[$field] ?? NULL) !== ($orig[$field] ?? NULL);
+    };
+    // Right now, permission-checks are completely on-demand.
+    if ($isChanged('server_route') /* || $isChanged('permission') */) {
       \CRM_Core_Menu::store();
       \CRM_Core_BAO_Navigation::resetNavigation();
     }

From 1a56e95b206d3e991e518f40a52fdd1ed75a66da Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 20:23:14 -0800
Subject: [PATCH 580/834] afform_{html,gui} - Require "administer CiviCRM" to
 open editor

---
 ext/afform/gui/ang/afGuiAdmin.aff.json   | 1 +
 ext/afform/html/ang/afHtmlAdmin.aff.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/gui/ang/afGuiAdmin.aff.json b/ext/afform/gui/ang/afGuiAdmin.aff.json
index 52fbb7dd3c0b..2ad6e8c107a0 100644
--- a/ext/afform/gui/ang/afGuiAdmin.aff.json
+++ b/ext/afform/gui/ang/afGuiAdmin.aff.json
@@ -1,6 +1,7 @@
 {
   "title": "Afform Administration",
   "server_route": "civicrm/admin/afform",
+  "permission": "administer CiviCRM",
   "requires": [
     "afGuiEditor",
     "ui.sortable"
diff --git a/ext/afform/html/ang/afHtmlAdmin.aff.json b/ext/afform/html/ang/afHtmlAdmin.aff.json
index b67e195f41f2..4feaa980aa9d 100644
--- a/ext/afform/html/ang/afHtmlAdmin.aff.json
+++ b/ext/afform/html/ang/afHtmlAdmin.aff.json
@@ -1,4 +1,5 @@
 {
   "title": "Afform HTML Administration",
-  "server_route": "civicrm/admin/afform-html"
+  "server_route": "civicrm/admin/afform-html",
+  "permission": "administer CiviCRM"
 }

From d69ba1b4f816c021ea19780df2d423273a2e1090 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 20:23:41 -0800
Subject: [PATCH 581/834] afform_{html,gui} - Allow editing the `permission`
 via web UI

---
 ext/afform/gui/ang/afGuiEditor/config-form.html | 4 ++++
 ext/afform/html/ang/afHtmlEditor.aff.html       | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index ad83f171eda5..60c43dab4b63 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -10,3 +10,7 @@
   {{ ts('URL:') }}
 </label>
 <input ng-model="afform.server_route" class="form-control" id="af_config_form_server_route" />
+<label for="af_config_form_permission">
+  {{ ts('Permission:') }}
+</label>
+<input ng-model="afform.permission" class="form-control" id="af_config_form_permission" />
diff --git a/ext/afform/html/ang/afHtmlEditor.aff.html b/ext/afform/html/ang/afHtmlEditor.aff.html
index a17b66d6baa1..7d474d44e5a5 100644
--- a/ext/afform/html/ang/afHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afHtmlEditor.aff.html
@@ -20,7 +20,8 @@
       <legend>{{ts('Properties')}}</legend>
       <div><label>{{ts('Name')}}:</label> {{resultForm.name}}</div>
       <div><label>{{ts('Title')}}:</label> <input ng-model="resultForm.title" type="text" /></div>
-      <div><label>{{ts('Server Router')}}:</label> <input ng-model="resultForm.server_route" type="text" /></div>
+      <div><label>{{ts('Server Route')}}:</label> <input ng-model="resultForm.server_route" type="text" /></div>
+      <div><label>{{ts('Permission')}}:</label> <input ng-model="resultForm.permission" type="text" /></div>
       <div><label>{{ts('Description')}}:</label> <textarea ng-model="resultForm.description"></textarea></div>
     </fieldset>
 

From 586344a7d28cfc5439de232f545365b76a5bd609 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 18 Dec 2019 22:47:10 -0800
Subject: [PATCH 582/834] (NFC) Expand docblock for
 afform_civicrm_permission_check()

---
 ext/afform/core/afform.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index b10378182426..3ec331b376b1 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -462,6 +462,13 @@ function afform_civicrm_alterMenu(&$items) {
 /**
  * Implements hook_civicrm_permission_check().
  *
+ * This extends the list of permissions available in `CRM_Core_Permission:check()`
+ * by introducing virtual-permissions named `@afform:myForm`. The evaluation
+ * of these virtual-permissions is dependent on the settings for `myForm`.
+ * `myForm` may be exposed/integrated through multiple subsystems (routing,
+ * nav-menu, API, etc), and the use of virtual-permissions makes easy to enforce
+ * consistent permissions across any relevant subsystems.
+ *
  * @see CRM_Utils_Hook::permission_check()
  */
 function afform_civicrm_permission_check($permission, &$granted, $contactId) {

From afc0cd72d586cb48a01bac5dcd9b069a5adb850b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 19 Dec 2019 08:28:58 -0500
Subject: [PATCH 583/834] GUI - dropdown select for permissions field

---
 ext/afform/gui/afform_gui.php                   | 9 +++++++++
 ext/afform/gui/ang/afGuiEditor/config-form.html | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index e55d0815e23a..5abf1c18b185 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -222,6 +222,15 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     'danger' => ts('Danger'),
   ];
 
+  $data['permissions'] = [];
+  foreach (CRM_Core_Permission::basicPermissions(TRUE, TRUE) as $name => $perm) {
+    $data['permissions'][] = [
+      'id' => $name,
+      'text' => $perm[0],
+      'description' => $perm[1] ?? NULL,
+    ];
+  }
+
   $mimeType = 'text/javascript';
   $content = "CRM.afformAdminData=" . json_encode($data, JSON_UNESCAPED_SLASHES) . ';';
 }
diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index 60c43dab4b63..8b602aee3180 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -13,4 +13,4 @@
 <label for="af_config_form_permission">
   {{ ts('Permission:') }}
 </label>
-<input ng-model="afform.permission" class="form-control" id="af_config_form_permission" />
+<input ng-model="afform.permission" class="form-control" id="af_config_form_permission" crm-ui-select="{data: editor.meta.permissions, placeholder: ts('Open access')}" />

From 2d4bfef17400f129975d5c3b6bf0122e7161a3ef Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 19 Dec 2019 21:24:08 -0500
Subject: [PATCH 584/834] Toward #6 - use API instead of scanner to retrieve
 afforms

---
 ext/afform/core/CRM/Afform/AfformScanner.php  |  2 +-
 .../core/Civi/Api4/Action/Afform/Get.php      |  2 +-
 ext/afform/core/Civi/Api4/Afform.php          |  2 +-
 .../core/Civi/Api4/Utils/AfformSaveTrait.php  |  2 +-
 ext/afform/core/afform.php                    | 59 +++++++++++--------
 .../templates/afform/AfformAngularModule.tpl  |  3 +-
 ext/afform/gui/ang/afGuiList.aff.html         |  6 +-
 ext/afform/html/ang/afHtmlList.aff.html       |  6 +-
 .../mock/tests/phpunit/api/v4/AfformTest.php  |  6 +-
 9 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index 61ac85c95ef6..bce6323a63d3 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -163,7 +163,7 @@ public function getComputedFields($name) {
 
     $fields = [];
     $fields['has_local'] = file_exists($localLayoutPath) || file_exists($localMetaPath);
-    $fields['has_packaged'] = ($fields['has_local'] && count($allPaths) > 1)
+    $fields['has_base'] = ($fields['has_local'] && count($allPaths) > 1)
       || (!$fields['has_local'] && count($allPaths) > 0);
     return $fields;
   }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 0f16028e9786..a752f5a8c1dd 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -19,7 +19,7 @@ public function getRecords() {
     $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
-      if ($record) {
+      if ($record && ($this->_isFieldSelected('has_local') || $this->_isFieldSelected('has_base'))) {
         $record = array_merge($record, $scanner->getComputedFields($name));
       }
       $layout = $this->_isFieldSelected('layout') ? $scanner->getLayout($name) : NULL;
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index cca20d19d381..3f84a8042c1d 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -120,7 +120,7 @@ public static function getFields() {
           'name' => 'has_local',
         ];
         $fields[] = [
-          'name' => 'has_packaged',
+          'name' => 'has_base',
         ];
       }
 
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index eae07c5ee449..8581583e34fc 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -36,7 +36,7 @@ protected function writeRecord($item) {
       unset($fields[array_search('layout', $fields)]);
       unset($fields[array_search('name', $fields)]);
       unset($fields[array_search('has_local', $fields)]);
-      unset($fields[array_search('has_packaged', $fields)]);
+      unset($fields[array_search('has_base', $fields)]);
       $orig = \Civi\Api4\Afform::get()->setCheckPermissions(FALSE)->addWhere('name', '=', $item['name'])->setSelect($fields)->execute()->first();
     }
 
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 3ec331b376b1..deac5cf41bb0 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -160,27 +160,30 @@ function afform_civicrm_caseTypes(&$caseTypes) {
 function afform_civicrm_angularModules(&$angularModules) {
   _afform_civix_civicrm_angularModules($angularModules);
 
-  /** @var CRM_Afform_AfformScanner $scanner */
-  $scanner = Civi::service('afform_scanner');
-  $names = array_keys($scanner->findFilePaths());
-  foreach ($names as $name) {
-    $meta = $scanner->getMeta($name);
-    $angularModules[_afform_angular_module_name($name, 'camel')] = [
+  $afforms = \Civi\Api4\Afform::get()
+    ->setCheckPermissions(FALSE)
+    ->setSelect(['name', 'requires'])
+    ->execute();
+
+  foreach ($afforms as $afform) {
+    $angularModules[_afform_angular_module_name($afform['name'], 'camel')] = [
       'ext' => E::LONG_NAME,
-      'js' => ['assetBuilder://afform.js?name=' . urlencode($name)],
-      'requires' => $meta['requires'],
+      'js' => ['assetBuilder://afform.js?name=' . urlencode($afform['name'])],
+      'requires' => $afform['requires'],
       'basePages' => [],
       'partialsCallback' => '_afform_get_partials',
-      '_afform' => $name,
+      '_afform' => $afform['name'],
       'exports' => [
-        _afform_angular_module_name($name, 'dash') => 'AE',
+        _afform_angular_module_name($afform['name'], 'dash') => 'AE',
       ],
     ];
   }
 }
 
 /**
- * Construct a list of partials for a given afform/angular module.
+ * Callback to retrieve partials for a given afform/angular module.
+ *
+ * @see afform_civicrm_angularModules
  *
  * @param string $moduleName
  *   The module name.
@@ -188,12 +191,17 @@ function afform_civicrm_angularModules(&$angularModules) {
  *   The module definition.
  * @return array
  *   Array(string $filename => string $html).
+ * @throws API_Exception
  */
 function _afform_get_partials($moduleName, $module) {
-  /** @var CRM_Afform_AfformScanner $scanner */
-  $scanner = Civi::service('afform_scanner');
+  $afform = civicrm_api4('Afform', 'get', [
+    'where' => [['name', '=', $module['_afform']]],
+    'select' => ['layout'],
+    'layoutFormat' => 'html',
+    'checkPermissions' => FALSE,
+  ], 0);
   return [
-    "~/$moduleName/$moduleName.aff.html" => $scanner->getLayout($module['_afform']),
+    "~/$moduleName/$moduleName.aff.html" => $afform['layout'],
   ];
 }
 
@@ -418,17 +426,11 @@ function afform_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     throw new RuntimeException("Missing required parameter: afform.js?name=NAME");
   }
 
-  $name = $params['name'];
-  /** @var \CRM_Afform_AfformScanner $scanner */
-  $scanner = Civi::service('afform_scanner');
-  $meta = $scanner->getMeta($name);
-  $moduleName = _afform_angular_module_name($name, 'camel');
-
+  $moduleName = _afform_angular_module_name($params['name'], 'camel');
   $smarty = CRM_Core_Smarty::singleton();
   $smarty->assign('afform', [
     'camel' => $moduleName,
-    'meta' => $meta,
-    'metaJson' => json_encode($meta),
+    'meta' => ['name' => $params['name']],
     'templateUrl' => "~/$moduleName/$moduleName.aff.html",
   ]);
   $mimeType = 'text/javascript';
@@ -480,10 +482,15 @@ function afform_civicrm_permission_check($permission, &$granted, $contactId) {
   if (preg_match('/^@afform:(.*)/', $permission, $m)) {
     $name = $m[1];
 
-    /** @var CRM_Afform_AfformScanner $scanner */
-    $scanner = \Civi::container()->get('afform_scanner');
-    $meta = $scanner->getMeta($name);
-    $granted = CRM_Core_Permission::check($meta['permission'], $contactId);
+    $afform = \Civi\Api4\Afform::get()
+      ->setCheckPermissions(FALSE)
+      ->addWhere('name', '=', $name)
+      ->setSelect(['permission'])
+      ->execute()
+      ->first();
+    if ($afform) {
+      $granted = CRM_Core_Permission::check($afform['permission'], $contactId);
+    }
   }
 }
 
diff --git a/ext/afform/core/templates/afform/AfformAngularModule.tpl b/ext/afform/core/templates/afform/AfformAngularModule.tpl
index 3af54b317898..1e96eb5a7bde 100644
--- a/ext/afform/core/templates/afform/AfformAngularModule.tpl
+++ b/ext/afform/core/templates/afform/AfformAngularModule.tpl
@@ -2,14 +2,13 @@
 
  @param string $afform.camel     The full camel-case name of the AngularJS module being created
  @param array  $afform.meta      The full metadata record of the form
- @param string $afform.metaJson  The full metadata record of the form
  @param string $afform.layout    The template content (HTML)
  *}
 {literal}
 (function(angular, $, _) {
   angular.module('{/literal}{$afform.camel}{literal}', CRM.angRequires('{/literal}{$afform.camel}{literal}'));
   angular.module('{/literal}{$afform.camel}{literal}').directive('{/literal}{$afform.camel}{literal}', function(afCoreDirective) {
-    return afCoreDirective({/literal}{$afform.camel|json},{$afform.metaJson}{literal}, {
+    return afCoreDirective({/literal}{$afform.camel|json}, {$afform.meta|@json_encode}{literal}, {
       templateUrl: {/literal}{$afform.templateUrl|json}{literal}
     });
   });
diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/gui/ang/afGuiList.aff.html
index f51bdf19fcfa..763ca8547f63 100644
--- a/ext/afform/gui/ang/afGuiList.aff.html
+++ b/ext/afform/gui/ang/afGuiList.aff.html
@@ -2,7 +2,7 @@
   <i class="crm-i fa-plus"></i> {{ ts('New Form') }}
 </a>
 <div
-  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route','has_local','has_packaged'], orderBy: {name:'ASC'}}]"
+  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route','has_local','has_base'], orderBy: {name:'ASC'}}]"
   af-api4-ctrl="listCtrl">
 
   <div ng-if="apiData.result.length == 0">
@@ -38,14 +38,14 @@
            af-api4-success-msg="ts('Reverted')"
            af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
-           ng-if="availForm.has_local && availForm.has_packaged"
+           ng-if="availForm.has_local && availForm.has_base"
           >{{ts('Revert')}}</a>
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Deleting...')"
            af-api4-success-msg="ts('Deleted')"
            af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
-           ng-if="availForm.has_local && !availForm.has_packaged"
+           ng-if="availForm.has_local && !availForm.has_base"
         >{{ts('Delete')}}</a>
       </td>
     </tr>
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index e306b3f2ee01..4f70a552bccb 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -1,5 +1,5 @@
 <div
-  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route', 'has_local', 'has_packaged'], orderBy: {name:'ASC'}}]"
+  af-api4="['Afform', 'get', {select: ['name','title','is_public','server_route', 'has_local', 'has_base'], orderBy: {name:'ASC'}}]"
   af-api4-ctrl="listCtrl">
 
   <div ng-if="apiData.result.length == 0">
@@ -35,14 +35,14 @@
            af-api4-success-msg="ts('Reverted')"
            af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
-           ng-if="availForm.has_local && availForm.has_packaged"
+           ng-if="availForm.has_local && availForm.has_base"
           >{{ts('Revert')}}</a>
         <a af-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
            af-api4-start-msg="ts('Deleting...')"
            af-api4-success-msg="ts('Deleted')"
            af-api4-success="listCtrl.refresh()"
            class="btn btn-xs btn-default"
-           ng-if="availForm.has_local && !availForm.has_packaged"
+           ng-if="availForm.has_local && !availForm.has_base"
         >{{ts('Delete')}}</a>
       </td>
     </tr>
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 392e9f95010f..19de132180d3 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -60,7 +60,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertEquals($get($originalMetadata, 'permission'), $get($result[0], 'permission'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
-    $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_base'), $message);
     $this->assertEquals(FALSE, $get($result[0], 'has_local'), $message);
 
     $message = 'After updating with Afform.create, the revised data should be returned';
@@ -80,7 +80,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertEquals('access foo', $get($result[0], 'permission'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
-    $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_base'), $message);
     $this->assertEquals(TRUE, $get($result[0], 'has_local'), $message);
 
     Civi\Api4\Afform::revert()->addWhere('name', '=', $formName)->execute();
@@ -92,7 +92,7 @@ public function testGetUpdateRevert($formName, $originalMetadata) {
     $this->assertEquals($get($originalMetadata, 'server_route'), $get($result[0], 'server_route'), $message);
     $this->assertEquals($get($originalMetadata, 'permission'), $get($result[0], 'permission'), $message);
     $this->assertTrue(is_array($result[0]['layout']), $message);
-    $this->assertEquals(TRUE, $get($result[0], 'has_packaged'), $message);
+    $this->assertEquals(TRUE, $get($result[0], 'has_base'), $message);
     $this->assertEquals(FALSE, $get($result[0], 'has_local'), $message);
   }
 

From d676549aea2519b3092100737bb924438823ef10 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 19 Dec 2019 23:41:10 -0800
Subject: [PATCH 585/834] AfformScanner - Simplify cache. Fix CLI/web sync bug.

Example bug:

1. Find a packaged (non-overriden) form - e.g. `mockPage`
2. Run `cv api4 Afform.update +w name=mockPage +v permissions='*always allow*'
3. Run `curl http://localhost/civicrm/mock-page`
4. Observe: the page-load fails even though the permissions say it should work

The call to `Afform.update` should trigger a cache-clear, but it only fixes
on the CLI...  because the CLI and web have different runtime IDs.

The runtime-id was included preventively in anticipation that oddball
multisite arrangements might need to store these things separately.  But I
think it's overdone, because the runtime-ID factors in things like
`SCRIPT_FILENAME` which has no bearing on the whether to use the same cache.

Let's KISS and *if* there's any kind of multisite issue, then we can revisit.
---
 ext/afform/core/CRM/Afform/AfformScanner.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index bce6323a63d3..a6bce85418b2 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -29,7 +29,10 @@ class CRM_Afform_AfformScanner {
   public function __construct() {
     // TODO Manage this is a service, and inject the cache service.
     $this->cache = new CRM_Utils_Cache_SqlGroup([
-      'group' => md5('afform_' . CRM_Core_Config_Runtime::getId() . $this->getSiteLocalPath()),
+      // Note: If there are edge-case bugs with multisite, consider changing
+      // the group key - but tread carefully to ensure that (eg) CLI+web workers
+      // see the same cache.
+      'group' => 'afform_scanner',
       'prefetch' => FALSE,
     ]);
     // $this->cache = new CRM_Utils_Cache_Arraycache([]);

From ab06ec41c4b71e5dfd9bc0147d60deac3c06d7ce Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 19 Dec 2019 23:53:13 -0800
Subject: [PATCH 586/834] AfformScanner - Just use the long cache

The long cache didn't exist when this class was first created, but it seems
better suited. #knockonwood
---
 ext/afform/core/CRM/Afform/AfformScanner.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index a6bce85418b2..ce7b96c6dc79 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -27,15 +27,7 @@ class CRM_Afform_AfformScanner {
    * CRM_Afform_AfformScanner constructor.
    */
   public function __construct() {
-    // TODO Manage this is a service, and inject the cache service.
-    $this->cache = new CRM_Utils_Cache_SqlGroup([
-      // Note: If there are edge-case bugs with multisite, consider changing
-      // the group key - but tread carefully to ensure that (eg) CLI+web workers
-      // see the same cache.
-      'group' => 'afform_scanner',
-      'prefetch' => FALSE,
-    ]);
-    // $this->cache = new CRM_Utils_Cache_Arraycache([]);
+    $this->cache = Civi::cache('long');
   }
 
   /**
@@ -47,7 +39,7 @@ public function __construct() {
   public function findFilePaths() {
     if (!CRM_Core_Config::singleton()->debug) {
       // FIXME: Use a separate setting. Maybe use the asset-builder cache setting?
-      $paths = $this->cache->get('allPaths');
+      $paths = $this->cache->get('afformAllPaths');
       if ($paths !== NULL) {
         return $paths;
       }
@@ -70,7 +62,7 @@ public function findFilePaths() {
 
     $this->appendFilePaths($paths, $this->getSiteLocalPath(), 10);
 
-    $this->cache->set('allPaths', $paths);
+    $this->cache->set('afformAllPaths', $paths);
     return $paths;
   }
 
@@ -114,7 +106,7 @@ public function createSiteLocalPath($formName, $file) {
   }
 
   public function clear() {
-    $this->cache->flush();
+    $this->cache->delete('afformAllPaths');
   }
 
   /**

From 7491380f1b3d0bd21e24438447943b094a600bf5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 20 Dec 2019 07:18:45 -0500
Subject: [PATCH 587/834] Update docs to reflect less metadata in default
 afform scope

---
 ext/afform/core/templates/afform/AfformAngularModule.tpl | 2 +-
 ext/afform/docs/writing.md                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/templates/afform/AfformAngularModule.tpl b/ext/afform/core/templates/afform/AfformAngularModule.tpl
index 1e96eb5a7bde..e4bc0ca8aa08 100644
--- a/ext/afform/core/templates/afform/AfformAngularModule.tpl
+++ b/ext/afform/core/templates/afform/AfformAngularModule.tpl
@@ -1,7 +1,7 @@
 {* This takes an $afform and generates an AngularJS module.
 
  @param string $afform.camel     The full camel-case name of the AngularJS module being created
- @param array  $afform.meta      The full metadata record of the form
+ @param array  $afform.meta      Relevant form metadata
  @param string $afform.layout    The template content (HTML)
  *}
 {literal}
diff --git a/ext/afform/docs/writing.md b/ext/afform/docs/writing.md
index 7ed5a41c9362..5cc2ee64e04e 100644
--- a/ext/afform/docs/writing.md
+++ b/ext/afform/docs/writing.md
@@ -8,7 +8,7 @@ creates a scope with these variables:
 
 * `routeParams`: This is a reference to the [$routeParams](https://docs.angularjs.org/api/ngRoute/service/$routeParams)
   service. In the example, we used `routeParams` to get a reference to a `name` from the URL.
-* `meta`: The stored meta data (`*.aff.json`) for this form.
+* `meta`: Object which for now contains just the form name but could potentially have other metadata if needed.
 * `ts`: This is a utility function which translates strings, as in `{{ts('Hello world')}}`.
 
 Additionally, AngularJS allows *directives* -- these are extensions to HTML (custom tags and attributes) which create behavior. For example:

From 2b2866474d45740ac051f172d419837d5fa1c58e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 20 Dec 2019 19:51:51 -0500
Subject: [PATCH 588/834] GUI - set default permission for new forms

---
 ext/afform/gui/ang/afGuiEditor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index ae7b3eec0b10..27a898848b96 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -35,6 +35,7 @@
         var editor = $scope.editor = this;
         var newForm = {
           title: ts('Untitled Form'),
+          permission: 'access CiviCRM',
           layout: [{
             '#tag': 'af-form',
             ctrl: 'afform',

From 8cc0fa936843b78f2a48be42a729d334ef6c39fc Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 21 Dec 2019 20:10:49 -0500
Subject: [PATCH 589/834] Remove unnecessary registerField process

---
 ext/afform/core/ang/af/Entity.js   | 1 -
 ext/afform/core/ang/af/Fieldset.js | 4 ----
 ext/afform/core/ang/af/Form.js     | 3 ---
 3 files changed, 8 deletions(-)

diff --git a/ext/afform/core/ang/af/Entity.js b/ext/afform/core/ang/af/Entity.js
index fdb791e20f90..2c522a603074 100644
--- a/ext/afform/core/ang/af/Entity.js
+++ b/ext/afform/core/ang/af/Entity.js
@@ -18,7 +18,6 @@
         var ts = $scope.ts = CRM.ts('afform'),
           entity = _.pick($scope, _.keys(modelProps));
         entity.id = null;
-        entity.fields = [];
         afFormCtrl.registerEntity(entity);
         // $scope.$watch('afEntity', function(newValue){$scope.myOptions = newValue;});
       }
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index 47da0424588c..69dde11b1576 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -9,10 +9,6 @@
       },
       link: function($scope, $el, $attr, afFormCtrl) {
         $scope.afFormCtrl = afFormCtrl;
-        // This is faster than waiting for each field directive to register itself
-        $('af-field', $el).each(function() {
-          afFormCtrl.registerField($scope.modelName, $(this).attr('name'));
-        });
       },
       controller: function($scope){
         this.getDefn = function getDefn() {
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 1083ebc63428..6ca2e47fa33b 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -22,9 +22,6 @@
           schema[entity.modelName] = entity;
           data[entity.modelName] = entity.data || {};
         };
-        this.registerField = function(entityName, fieldName) {
-          schema[entityName].fields.push(fieldName);
-        };
         this.getEntity = function getEntity(name) {
           return schema[name];
         };

From 43d8dd79ecd345e06bf5975ffc66de6958f08296 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 27 Dec 2019 20:23:30 -0500
Subject: [PATCH 590/834] Fix #10 add prefix to new afforms to prevent name
 conflicts

---
 ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 8581583e34fc..48e21b27f1cb 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -16,7 +16,8 @@ protected function writeRecord($item) {
 
     // If no name given, create a unique name based on the title
     if (empty($item['name'])) {
-      $item['name'] = _afform_angular_module_name(\CRM_Utils_String::munge($item['title'], '-'));
+      $prefix = !empty($item['join']) ? "afjoin-{$item['join']}" : !empty($item['block']) ? 'afblock-' . str_replace('*', 'all', $item['block']) : 'afform';
+      $item['name'] = _afform_angular_module_name($prefix . '-' . \CRM_Utils_String::munge($item['title'], '-'));
       $suffix = '';
       while (
         file_exists($scanner->createSiteLocalPath($item['name'] . $suffix, \CRM_Afform_AfformScanner::METADATA_FILE))

From d51b27b3111429eb116acd59903a431abd077e8c Mon Sep 17 00:00:00 2001
From: eileen <eileen@mcnaughty.com>
Date: Thu, 2 Jan 2020 18:57:18 +0000
Subject: [PATCH 591/834] Update git clone url

Note other updates around installation still needed
---
 ext/afform/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index f1ef35975ede..4f9201b76d81 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -46,7 +46,7 @@ Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git)
 install it with the command-line tool [cv](https://github.com/civicrm/cv).
 
 ```bash
-git clone https://github.com/totten/afform.git
+git clone https://lab.civicrm.org/extensions/afform.git
 cv en afform
 ```
 

From e1aca85329e09570d5726580d6e718678fdb3306 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 10 Dec 2019 15:03:42 -0500
Subject: [PATCH 592/834] Implement afform blocks for Email, Phone, IM, Website

Blocks are reusable, repeatable afforms that extend other entities
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      |   2 +-
 ext/afform/core/Civi/Afform/AHQ.php           |   2 +-
 ext/afform/core/Civi/Afform/FormDataModel.php |  39 ++-
 .../Api4/Action/Afform/AbstractProcessor.php  |   4 +
 .../core/Civi/Api4/Action/Afform/Prefill.php  |  17 +-
 .../core/Civi/Api4/Action/Afform/Submit.php   |  76 +++-
 ext/afform/core/Civi/Api4/Afform.php          |  10 +
 .../Civi/Api4/Utils/AfformFormatTrait.php     |   2 +-
 ext/afform/core/afform.php                    | 107 +++---
 ext/afform/core/ang/af.ang.php                |   2 +
 ext/afform/core/ang/af/Block.js               |  63 ++++
 ext/afform/core/ang/af/Field.js               |  14 +-
 ext/afform/core/ang/af/Form.js                |   3 +-
 ext/afform/core/ang/af/afBlock.html           |   5 +
 ext/afform/core/ang/afBlock.ang.php           |  24 --
 ext/afform/core/ang/afBlock.css               |   1 -
 ext/afform/core/ang/afBlock.js                |   4 -
 ext/afform/core/ang/afBlock/ContactEmail.html |   1 -
 ext/afform/core/ang/afBlock/ContactEmail.js   |  15 -
 ext/afform/core/ang/afBlock/ContactName.html  |   8 -
 ext/afform/core/ang/afBlock/ContactName.js    |  14 -
 ext/afform/core/ang/afCore.css                |  11 +
 .../core/ang/blockEmailDefault.aff.html       |   4 +
 .../core/ang/blockEmailDefault.aff.json       |   6 +
 ext/afform/core/ang/blockIMDefault.aff.html   |   5 +
 ext/afform/core/ang/blockIMDefault.aff.json   |   6 +
 .../core/ang/blockPhoneDefault.aff.html       |   5 +
 .../core/ang/blockPhoneDefault.aff.json       |   6 +
 .../core/ang/blockWebsiteDefault.aff.html     |   4 +
 .../core/ang/blockWebsiteDefault.aff.json     |   6 +
 .../phpunit/Civi/Afform/FormDataModelTest.php |   7 +-
 ext/afform/gui/afform_gui.php                 |  82 ++++-
 ext/afform/gui/ang/afGuiEditor.css            |  35 +-
 ext/afform/gui/ang/afGuiEditor.js             | 330 ++++++++++++++----
 .../gui/ang/afGuiEditor/container-menu.html   |  32 +-
 ext/afform/gui/ang/afGuiEditor/container.html |  38 +-
 .../gui/ang/afGuiEditor/editOptions.html      |   4 +-
 ext/afform/gui/ang/afGuiEditor/entity.html    |  40 ++-
 .../gui/ang/afGuiEditor/field-menu.html       |   4 +-
 ext/afform/gui/ang/afGuiEditor/field.html     |   7 +-
 ext/afform/gui/ang/afGuiEditor/text-menu.html |  12 +-
 ext/afform/mock/ang/afex.aff.json             |   2 +-
 42 files changed, 773 insertions(+), 286 deletions(-)
 create mode 100644 ext/afform/core/ang/af/Block.js
 create mode 100644 ext/afform/core/ang/af/afBlock.html
 delete mode 100644 ext/afform/core/ang/afBlock.ang.php
 delete mode 100644 ext/afform/core/ang/afBlock.css
 delete mode 100644 ext/afform/core/ang/afBlock.js
 delete mode 100644 ext/afform/core/ang/afBlock/ContactEmail.html
 delete mode 100644 ext/afform/core/ang/afBlock/ContactEmail.js
 delete mode 100644 ext/afform/core/ang/afBlock/ContactName.html
 delete mode 100644 ext/afform/core/ang/afBlock/ContactName.js
 create mode 100644 ext/afform/core/ang/blockEmailDefault.aff.html
 create mode 100644 ext/afform/core/ang/blockEmailDefault.aff.json
 create mode 100644 ext/afform/core/ang/blockIMDefault.aff.html
 create mode 100644 ext/afform/core/ang/blockIMDefault.aff.json
 create mode 100644 ext/afform/core/ang/blockPhoneDefault.aff.html
 create mode 100644 ext/afform/core/ang/blockPhoneDefault.aff.json
 create mode 100644 ext/afform/core/ang/blockWebsiteDefault.aff.html
 create mode 100644 ext/afform/core/ang/blockWebsiteDefault.aff.json

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 120ed0a66c4c..803442906877 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -379,7 +379,7 @@ public function replaceUnicodeChars($markup) {
    * @return bool
    */
   public function isNodeEditable(array $item) {
-    if ($item['#tag'] === 'af-field' || $item['#tag'] === 'af-form' || isset($item['af-fieldset'])) {
+    if ($item['#tag'] === 'af-field' || $item['#tag'] === 'af-form' || isset($item['af-fieldset']) || isset($item['af-block'])) {
       return TRUE;
     }
     $editableClasses = ['af-container', 'af-text', 'af-button'];
diff --git a/ext/afform/core/Civi/Afform/AHQ.php b/ext/afform/core/Civi/Afform/AHQ.php
index e87512f5a53d..be7d91bd7dc7 100644
--- a/ext/afform/core/Civi/Afform/AHQ.php
+++ b/ext/afform/core/Civi/Afform/AHQ.php
@@ -33,7 +33,7 @@ public static function makeRoot($children, $tag = 'placeholder') {
    * @return array
    */
   public static function getTags($element, $tagName) {
-    if ($element === [] || is_string($element) || isset($element['#text'])) {
+    if (!is_array($element) || !isset($element['#tag'])) {
       return [];
     }
     $results = [];
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index ce45687cb162..3a9a811c89d3 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -18,7 +18,7 @@ class FormDataModel {
   protected $entities;
 
   /**
-   * Gets entity metadata and all fields from the form
+   * Gets entity metadata and all blocks & fields from the form
    *
    * @param array $layout
    *   The root element of the layout, in shallow/deep format.
@@ -29,9 +29,9 @@ public static function create($layout) {
     $root = AHQ::makeRoot($layout);
     $entities = array_column(AHQ::getTags($root, 'af-entity'), NULL, 'name');
     foreach (array_keys($entities) as $entity) {
-      $entities[$entity]['fields'] = [];
+      $entities[$entity]['fields'] = $entities[$entity]['blocks'] = [];
     }
-    self::parseFields($root, $entities);
+    self::parseFields($layout, $entities);
 
     $self = new static();
     $self->entities = $entities;
@@ -39,26 +39,29 @@ public static function create($layout) {
   }
 
   /**
-   * @param array $element
-   *   The root element of the layout, in shallow/deep format.
+   * @param array $nodes
    * @param array $entities
-   *   A list of entities, keyed by named.
-   *   This will be updated to include 'fields'.
-   *   Ex: $entities['spouse']['type'] = 'Contact';
+   *   A list of entities, keyed by name.
+   *     This will be updated to populate 'fields' and 'blocks'.
+   *     Ex: $entities['spouse']['type'] = 'Contact';
+   * @param string $entity
    */
-  protected static function parseFields($element, &$entities) {
-    if (!isset($element['#children'])) {
-      return;
-    }
-    foreach ($element['#children'] as $child) {
-      if (is_string($child) || isset($child['#text'])) {
+  protected static function parseFields($nodes, &$entities, $entity = NULL) {
+    foreach ($nodes as $node) {
+      if (!is_array($node) || !isset($node['#tag'])) {
         //nothing
       }
-      elseif (!empty($child['af-fieldset']) && !empty($child['#children'])) {
-        $entities[$child['af-fieldset']]['fields'] = array_merge($entities[$child['af-fieldset']]['fields'] ?? [], AHQ::getTags($child, 'af-field'));
+      elseif (!empty($node['af-fieldset'])) {
+        self::parseFields($node['#children'], $entities, $node['af-fieldset']);
+      }
+      elseif ($entity && $node['#tag'] === 'af-field') {
+        $entities[$entity]['fields'][$node['name']] = AHQ::getProps($node);
+      }
+      elseif ($entity && !empty($node['af-block'])) {
+        $entities[$entity]['blocks'][$node['af-block']] = AHQ::getProps($node);
       }
-      else {
-        self::parseFields($child, $entities);
+      elseif (!empty($node['#children'])) {
+        self::parseFields($node['#children'], $entities, $entity);
       }
     }
   }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index e5cc41258fdd..abd8805806ba 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -32,6 +32,10 @@ abstract class AbstractProcessor extends \Civi\Api4\Generic\AbstractAction {
    */
   protected $_formDataModel;
 
+  /**
+   * @param \Civi\Api4\Generic\Result $result
+   * @throws \API_Exception
+   */
   public function _run(Result $result) {
     // This will throw an exception if the form doesn't exist
     $this->_afform = (array) civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $this->name]]], 0);
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index 5ce5918c9ab9..5332066dcac7 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -29,7 +29,7 @@ protected function processForm() {
   }
 
   /**
-   * Fetch all fields needed to display a given entity on this form
+   * Fetch all data needed to display a given entity on this form
    *
    * @param $entity
    * @param $id
@@ -46,11 +46,20 @@ private function loadEntity($entity, $id) {
     }
     $result = civicrm_api4($entity['type'], 'get', [
       'where' => [['id', '=', $id]],
-      'select' => array_column($entity['fields'], 'name'),
+      'select' => array_keys($entity['fields']),
       'checkPermissions' => $checkPermissions,
     ]);
-    if ($result->first()) {
-      $this->_data[$entity['name']] = $result->first();
+    $data = $result->first();
+    if ($data) {
+      $data['blocks'] = [];
+      foreach ($entity['blocks'] ?? [] as $blockEntity => $block) {
+        $data['blocks'][$blockEntity] = (array) civicrm_api4($blockEntity, 'get', [
+          'where' => [['contact_id', '=', $data['id']]],
+          'limit' => $block['max'] ?? 0,
+          'checkPermissions' => $checkPermissions,
+        ]);
+      }
+      $this->_data[$entity['name']] = $data;
     }
   }
 
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 85b88ea449e3..2f563cfe1c24 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -3,6 +3,7 @@
 namespace Civi\Api4\Action\Afform;
 
 use Civi\Afform\Event\AfformSubmitEvent;
+use Civi\API\Exception\NotImplementedException;
 
 /**
  * Class Submit
@@ -38,22 +39,42 @@ protected function processForm() {
     return [];
   }
 
-  ///**
-  // * @param \Civi\Afform\Event\AfformSubmitEvent $event
-  // * @see afform_civicrm_config
-  // */
-  //public function processContacts(AfformSubmitEvent $event) {
-  //  if (empty($event->entityValues['Contact'])) {
-  //    return;
-  //  }
-  //  foreach ($event->entityValues['Contact'] as $entityName => $contact) {
-  //    // Do something
-  //    unset($event->entityValues['Contact'][$entityName]);
-  //  }
-  //}
+  /**
+   * @param \Civi\Afform\Event\AfformSubmitEvent $event
+   * @throws \API_Exception
+   * @see afform_civicrm_config
+   */
+  public function processContacts(AfformSubmitEvent $event) {
+    foreach ($event->entityValues['Contact'] ?? [] as $entityName => $contact) {
+      $blocks = $contact['blocks'] ?? [];
+      unset($contact['blocks']);
+      $saved = civicrm_api4('Contact', 'save', ['records' => [$contact]])->first();
+      foreach ($blocks as $entity => $block) {
+        $values = self::filterEmptyBlocks($entity, $block);
+        // FIXME: Replace/delete should only be done to known contacts
+        if ($values) {
+          civicrm_api4($entity, 'replace', [
+            'where' => [['contact_id', '=', $saved['id']]],
+            'records' => $values,
+          ]);
+        }
+        else {
+          try {
+            civicrm_api4($entity, 'delete', [
+              'where' => [['contact_id', '=', $saved['id']]],
+            ]);
+          } catch (\API_Exception $e) {
+            // No records to delete
+          }
+        }
+      }
+    }
+    unset($event->entityValues['Contact']);
+  }
 
   /**
    * @param \Civi\Afform\Event\AfformSubmitEvent $event
+   * @throws \API_Exception
    * @see afform_civicrm_config
    */
   public static function processGenericEntity(AfformSubmitEvent $event) {
@@ -65,4 +86,33 @@ public static function processGenericEntity(AfformSubmitEvent $event) {
     }
   }
 
+  /**
+   * Filter out blocks that have been left blank on the form
+   *
+   * @param $entity
+   * @param $block
+   * @return array
+   */
+  private static function filterEmptyBlocks($entity, $block) {
+    return array_filter($block, function($item) use($entity) {
+      switch ($entity) {
+        case 'Email':
+          return !empty($item['email']);
+
+        case 'Phone':
+          return !empty($item['phone']);
+
+        case 'IM':
+          return !empty($item['name']);
+
+        case 'Website':
+          return !empty($item['url']);
+
+        default:
+          \CRM_Utils_Array::remove($item, 'id', 'is_primary', 'location_type_id', 'entity_id', 'contact_id', 'entity_table');
+          return (bool) array_filter($item);
+      }
+    });
+  }
+
 }
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 3f84a8042c1d..7dd1522f06b6 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -93,6 +93,12 @@ public static function getFields() {
         [
           'name' => 'requires',
         ],
+        [
+          'name' => 'block',
+        ],
+        [
+          'name' => 'extends',
+        ],
         [
           'name' => 'title',
           'required' => $self->getAction() === 'create',
@@ -104,6 +110,10 @@ public static function getFields() {
           'name' => 'is_public',
           'data_type' => 'Boolean',
         ],
+        [
+          'name' => 'repeatable',
+          'data_type' => 'Boolean',
+        ],
         [
           'name' => 'server_route',
         ],
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
index ea4af10d3634..f70b36143ed4 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformFormatTrait.php
@@ -7,7 +7,7 @@
  *
  * @method $this setLayoutFormat(string $layoutFormat)
  * @method string getLayoutFormat()
- * @method $this setFormatWhitespace(string $layoutFormat)
+ * @method $this setFormatWhitespace(string $formatWhitespace)
  * @method string getFormatWhitespace()
  */
 trait AfformFormatTrait {
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index deac5cf41bb0..7e145440122d 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -54,7 +54,7 @@ function afform_civicrm_config(&$config) {
   }
   Civi::$statics[__FUNCTION__] = 1;
 
-  // Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processContacts'], -500);
+  Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processContacts'], 500);
   Civi::dispatcher()->addListener(Submit::EVENT_NAME, [Submit::class, 'processGenericEntity'], -1000);
   Civi::dispatcher()->addListener('hook_civicrm_angularModules', '_afform_civicrm_angularModules_autoReq', -1000);
 }
@@ -150,12 +150,7 @@ function afform_civicrm_caseTypes(&$caseTypes) {
 /**
  * Implements hook_civicrm_angularModules().
  *
- * Generate a list of Angular modules.
- *
- * Note: This hook only runs in CiviCRM 4.5+. It may
- * use features only available in v4.6+.
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
+ * Generate a list of Afform Angular modules.
  */
 function afform_civicrm_angularModules(&$angularModules) {
   _afform_civix_civicrm_angularModules($angularModules);
@@ -325,56 +320,74 @@ function _afform_reverse_deps_find($formName, $html, $revMap) {
 function afform_civicrm_alterAngular($angular) {
   $fieldMetadata = \Civi\Angular\ChangeSet::create('fieldMetadata')
     ->alterHtml(';\\.aff\\.html$;', function($doc, $path) {
-      $entities = _afform_getMetadata($doc);
+      /** @var \CRM_Afform_AfformScanner $scanner */
+      $scanner = Civi::service('afform_scanner');
+      $meta = $scanner->getMeta(basename($path, '.aff.html'));
+      $blockEntity = $meta['block'] ?? NULL;
+      if (!$blockEntity) {
+        $entities = _afform_getMetadata($doc);
+      }
 
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
-        $fieldName = $afField->getAttribute('name');
         $entityName = pq($afField)->parents('[af-fieldset]')->attr('af-fieldset');
-        if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
+        $blockName = pq($afField)->parents('[af-block]')->attr('af-block');
+        if (!$blockEntity && !preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
-        $entityType = $entities[$entityName]['type'];
-        $getFields = civicrm_api4($entityType, 'getFields', [
-          'action' => 'create',
-          'where' => [['name', '=', $fieldName]],
-          'select' => ['title', 'input_type', 'input_attrs', 'options'],
-          'loadOptions' => TRUE,
-        ]);
-        // Merge field definition data with whatever's already in the markup
-        $deep = ['input_attrs'];
-        foreach ($getFields as $fieldInfo) {
-          $existingFieldDefn = trim(pq($afField)->attr('defn') ?: '');
-          if ($existingFieldDefn && $existingFieldDefn[0] != '{') {
-            // If it's not an object, don't mess with it.
-            continue;
-          }
-          // TODO: Teach the api to return options in this format
-          if (!empty($fieldInfo['options'])) {
-            $fieldInfo['options'] = CRM_Utils_Array::makeNonAssociative($fieldInfo['options'], 'key', 'label');
-          }
-          // Default placeholder for select inputs
-          if ($fieldInfo['input_type'] === 'Select') {
-            $fieldInfo['input_attrs'] = ($fieldInfo['input_attrs'] ?? []) + ['placeholder' => ts('Select')];
-          }
-
-          $fieldDefn = $existingFieldDefn ? CRM_Utils_JS::getRawProps($existingFieldDefn) : [];
-          foreach ($fieldInfo as $name => $prop) {
-            // Merge array props 1 level deep
-            if (in_array($name, $deep) && !empty($fieldDefn[$name])) {
-              $fieldDefn[$name] = CRM_Utils_JS::writeObject(CRM_Utils_JS::getRawProps($fieldDefn[$name]) + array_map(['CRM_Utils_JS', 'encode'], $prop));
-            }
-            elseif (!isset($fieldDefn[$name])) {
-              $fieldDefn[$name] = CRM_Utils_JS::encode($prop);
-            }
-          }
-          pq($afField)->attr('defn', htmlspecialchars(CRM_Utils_JS::writeObject($fieldDefn)));
-        }
+        $entityType = $blockEntity ?? $entities[$entityName]['type'];
+        _af_fill_field_metadata($blockName ? $blockName : $entityType, $afField);
       }
     });
   $angular->add($fieldMetadata);
 }
 
+/**
+ * Merge field definition metadata into an afform field's definition
+ *
+ * @param $entityType
+ * @param DOMElement $afField
+ * @throws API_Exception
+ */
+function _af_fill_field_metadata($entityType, DOMElement $afField) {
+  $fieldName = $afField->getAttribute('name');
+  $getFields = civicrm_api4($entityType, 'getFields', [
+    'action' => 'create',
+    'where' => [['name', '=', $fieldName]],
+    'select' => ['title', 'input_type', 'input_attrs', 'options'],
+    'loadOptions' => TRUE,
+  ]);
+  // Merge field definition data with whatever's already in the markup
+  $deep = ['input_attrs'];
+  foreach ($getFields as $fieldInfo) {
+    $existingFieldDefn = trim(pq($afField)->attr('defn') ?: '');
+    if ($existingFieldDefn && $existingFieldDefn[0] != '{') {
+      // If it's not an object, don't mess with it.
+      continue;
+    }
+    // TODO: Teach the api to return options in this format
+    if (!empty($fieldInfo['options'])) {
+      $fieldInfo['options'] = CRM_Utils_Array::makeNonAssociative($fieldInfo['options'], 'key', 'label');
+    }
+    // Default placeholder for select inputs
+    if ($fieldInfo['input_type'] === 'Select') {
+      $fieldInfo['input_attrs'] = ($fieldInfo['input_attrs'] ?? []) + ['placeholder' => ts('Select')];
+    }
+
+    $fieldDefn = $existingFieldDefn ? CRM_Utils_JS::getRawProps($existingFieldDefn) : [];
+    foreach ($fieldInfo as $name => $prop) {
+      // Merge array props 1 level deep
+      if (in_array($name, $deep) && !empty($fieldDefn[$name])) {
+        $fieldDefn[$name] = CRM_Utils_JS::writeObject(CRM_Utils_JS::getRawProps($fieldDefn[$name]) + array_map(['CRM_Utils_JS', 'encode'], $prop));
+      }
+      elseif (!isset($fieldDefn[$name])) {
+        $fieldDefn[$name] = CRM_Utils_JS::encode($prop);
+      }
+    }
+    pq($afField)->attr('defn', htmlspecialchars(CRM_Utils_JS::writeObject($fieldDefn)));
+  }
+}
+
 function _afform_getMetadata(phpQueryObject $doc) {
   $entities = [];
   foreach ($doc->find('af-entity') as $afmModelProp) {
@@ -412,8 +425,6 @@ function afform_civicrm_themes(&$themes) {
   _afform_civix_civicrm_themes($themes);
 }
 
-// --- Functions below this ship commented out. Uncomment as required. ---
-
 /**
  * Implements hook_civicrm_buildAsset().
  */
diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index d4230409da02..1949657794f3 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -18,6 +18,8 @@
     'af-entity' => 'E',
     'af-fieldset' => 'A',
     'af-form' => 'E',
+    'af-block' => 'A',
+    'af-block-item' => 'A',
     'af-field' => 'E',
   ],
 ];
diff --git a/ext/afform/core/ang/af/Block.js b/ext/afform/core/ang/af/Block.js
new file mode 100644
index 000000000000..68e9a7b4a5cf
--- /dev/null
+++ b/ext/afform/core/ang/af/Block.js
@@ -0,0 +1,63 @@
+(function(angular, $, _) {
+  // Example usage: <div af-block="Email" min="1" max="3" add-label="Add email" ><div block-email-default /></div>
+  angular.module('af')
+    .directive('afBlock', function() {
+      return {
+        restrict: 'A',
+        require: ['^^afFieldset'],
+        scope: {
+          blockName: '@afBlock',
+          min: '=',
+          max: '=',
+          addLabel: '@',
+          addIcon: '@'
+        },
+        transclude: true,
+        templateUrl: '~/af/afBlock.html',
+        link: function($scope, $el, $attr, ctrls) {
+          var ts = $scope.ts = CRM.ts('afform');
+          $scope.afFieldset = ctrls[0];
+        },
+        controller: function($scope) {
+          this.getItems = $scope.getItems = function() {
+            var data = $scope.afFieldset.getData();
+            data.blocks = data.blocks || {};
+            var block = (data.blocks[$scope.blockName] = data.blocks[$scope.blockName] || []);
+            while ($scope.min && block.length < $scope.min) {
+              block.push({});
+            }
+            return block;
+          };
+
+          $scope.addItem = function() {
+            $scope.getItems().push({});
+          };
+
+          $scope.removeItem = function(index) {
+            $scope.getItems().splice(index, 1);
+          };
+
+          $scope.canAdd = function() {
+            return !$scope.max || $scope.getItems().length < $scope.max;
+          };
+
+          $scope.canRemove = function() {
+            return !$scope.min || $scope.getItems().length > $scope.min;
+          };
+        }
+      };
+    })
+    .directive('afBlockItem', function() {
+      return {
+        restrict: 'A',
+        scope: {
+          item: '=afBlockItem'
+        },
+        controller: function($scope) {
+          this.getData = function() {
+            return $scope.item;
+          };
+        }
+      };
+    });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/Field.js b/ext/afform/core/ang/af/Field.js
index 08b637734fb8..e55b13c8a42f 100644
--- a/ext/afform/core/ang/af/Field.js
+++ b/ext/afform/core/ang/af/Field.js
@@ -3,22 +3,20 @@
   angular.module('af').directive('afField', function() {
     return {
       restrict: 'E',
-      require: ['^afFieldset', '^afForm'],
+      require: ['^^afFieldset', '?^afBlockItem'],
       templateUrl: '~/af/afField.html',
       scope: {
         fieldName: '@name',
         defn: '='
       },
       link: function($scope, $el, $attr, ctrls) {
-        var ts = $scope.ts = CRM.ts('afform');
-        $scope.afFieldset = ctrls[0];
-        var modelList = ctrls[1];
-        $scope.fieldId = $scope.afFieldset.getDefn().modelName + '-' + $scope.fieldName;
-        $scope.getData = $scope.afFieldset.getData;
+        var ts = $scope.ts = CRM.ts('afform'),
+          afFieldset = ctrls[0],
+          blockItem = ctrls[1];
+        $scope.fieldId = afFieldset.getDefn().modelName + '-' + $scope.fieldName;
+        $scope.getData = blockItem ? blockItem.getData : afFieldset.getData;
 
         $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
-      },
-      controller: function($scope) {
 
         $scope.getOptions = function() {
           return $scope.defn.options || [{key: '1', label: ts('Yes')}, {key: '0', label: ts('No')}];
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 6ca2e47fa33b..fcf699df03f3 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -47,7 +47,8 @@
             crmApi4('Afform', 'prefill', {name: this.getFormMeta().name, args: $routeParams})
               .then(function(result) {
                 _.each(result, function(item) {
-                  data[item.name] = _.extend(item.values, schema[item.name].data || {});
+                  data[item.name] = data[item.name] || {};
+                  _.extend(data[item.name], item.values, schema[item.name].data || {});
                 });
               });
           }
diff --git a/ext/afform/core/ang/af/afBlock.html b/ext/afform/core/ang/af/afBlock.html
new file mode 100644
index 000000000000..463f38348e2a
--- /dev/null
+++ b/ext/afform/core/ang/af/afBlock.html
@@ -0,0 +1,5 @@
+<div af-block-item="item" ng-repeat="item in getItems()">
+  <ng-transclude />
+  <button crm-icon="fa-ban" class="btn btn-xs af-block-remove-btn" ng-if="canRemove()" ng-click="removeItem($index)"></button>
+</div>
+<button crm-icon="{{ addIcon || 'fa-plus' }}" class="btn btn-sm af-block-add-btn" ng-if="canAdd()" ng-click="addItem()">{{ addLabel }}</button>
diff --git a/ext/afform/core/ang/afBlock.ang.php b/ext/afform/core/ang/afBlock.ang.php
deleted file mode 100644
index ccf473bb1fb1..000000000000
--- a/ext/afform/core/ang/afBlock.ang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-// This file declares an Angular module which can be autoloaded
-// in CiviCRM. See also:
-// http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
-
-return [
-  'js' => [
-    'ang/afBlock.js',
-    'ang/afBlock/*.js',
-    'ang/afBlock/*/*.js',
-  ],
-  'css' => ['ang/afBlock.css'],
-  'partials' => ['ang/afBlock'],
-  'requires' => [
-    'crmUi',
-    'crmUtil',
-  ],
-  'settings' => [],
-  'basePages' => [],
-  'exports' => [
-    'af-block-contact-name' => 'AE',
-    'af-block-contact-email' => 'AE',
-  ],
-];
diff --git a/ext/afform/core/ang/afBlock.css b/ext/afform/core/ang/afBlock.css
deleted file mode 100644
index 4ea218a1320d..000000000000
--- a/ext/afform/core/ang/afBlock.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Add any CSS rules for Angular module "afBlock" */
diff --git a/ext/afform/core/ang/afBlock.js b/ext/afform/core/ang/afBlock.js
deleted file mode 100644
index 7eccc58d6804..000000000000
--- a/ext/afform/core/ang/afBlock.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function(angular, $, _) {
-  // Declare a list of dependencies.
-  angular.module('afBlock', CRM.angRequires('afBlock'));
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.html b/ext/afform/core/ang/afBlock/ContactEmail.html
deleted file mode 100644
index 295dcbada0d8..000000000000
--- a/ext/afform/core/ang/afBlock/ContactEmail.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>{{ts('Contact email block for a model of type %1 named %2', {1: afFieldset.getDefn().type, 2: afFieldset.getDefn().modelName})}}</div>
diff --git a/ext/afform/core/ang/afBlock/ContactEmail.js b/ext/afform/core/ang/afBlock/ContactEmail.js
deleted file mode 100644
index 44c3b23ebb67..000000000000
--- a/ext/afform/core/ang/afBlock/ContactEmail.js
+++ /dev/null
@@ -1,15 +0,0 @@
-(function(angular, $, _) {
-  // Example usage: <div af-block-contact-email="{foo: 1, bar: 2}"></div>
-  angular.module('afBlock').directive('afBlockContactEmail', function() {
-    return {
-      restrict: 'AE',
-      require: ['^afFieldset'],
-      templateUrl: '~/afBlock/ContactEmail.html',
-      scope: {},
-      link: function($scope, $el, $attr, ctrls) {
-        var ts = $scope.ts = CRM.ts('afform');
-        $scope.afFieldset = ctrls[0];
-      }
-    };
-  });
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afBlock/ContactName.html b/ext/afform/core/ang/afBlock/ContactName.html
deleted file mode 100644
index 8585c9b824e1..000000000000
--- a/ext/afform/core/ang/afBlock/ContactName.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<af-form>
-  <af-entity name="$parent.model" type="Contact" label="Target Contact" />
-  <div af-fieldset="$parent.model">
-    <af-field name="prefix" />
-    <af-field name="first_name" />
-    <af-field name="last_name" />
-  </div>
-</af-form>
diff --git a/ext/afform/core/ang/afBlock/ContactName.js b/ext/afform/core/ang/afBlock/ContactName.js
deleted file mode 100644
index 2de0136783ae..000000000000
--- a/ext/afform/core/ang/afBlock/ContactName.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function(angular, $, _) {
-  angular.module('afBlock').directive('afBlockContactName', function() {
-    return {
-      restrict: 'AE',
-      require: ['^afFieldset'],
-      templateUrl: '~/afBlock/ContactName.html',
-      scope: {},
-      link: function($scope, $el, $attr, ctrls) {
-        var ts = $scope.ts = CRM.ts('afform');
-        $scope.afFieldset = ctrls[0];
-      }
-    };
-  });
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/afCore.css b/ext/afform/core/ang/afCore.css
index 1d7801314139..209c8420abfa 100644
--- a/ext/afform/core/ang/afCore.css
+++ b/ext/afform/core/ang/afCore.css
@@ -15,4 +15,15 @@ a.af-api4-action-idle {
 .af-container.af-layout-inline > * {
     display: inline-block;
     margin-right: .5em;
+    vertical-align: bottom;
+}
+
+[af-block-item] {
+  position: relative;
+}
+#bootstrap-theme [af-block-item] .af-block-remove-btn {
+  min-width: 30px;
+  position: absolute;
+  top: 0;
+  right: 0;
 }
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.html b/ext/afform/core/ang/blockEmailDefault.aff.html
new file mode 100644
index 000000000000..71feccef5bce
--- /dev/null
+++ b/ext/afform/core/ang/blockEmailDefault.aff.html
@@ -0,0 +1,4 @@
+<div class="af-container af-layout-inline">
+  <af-field name="email" />
+  <af-field name="location_type_id" />
+</div>
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.json b/ext/afform/core/ang/blockEmailDefault.aff.json
new file mode 100644
index 000000000000..12d6107473b5
--- /dev/null
+++ b/ext/afform/core/ang/blockEmailDefault.aff.json
@@ -0,0 +1,6 @@
+{
+  "title": "Email Block (default)",
+  "block": "Email",
+  "extends": "Contact",
+  "repeatable": true
+}
diff --git a/ext/afform/core/ang/blockIMDefault.aff.html b/ext/afform/core/ang/blockIMDefault.aff.html
new file mode 100644
index 000000000000..796881103d90
--- /dev/null
+++ b/ext/afform/core/ang/blockIMDefault.aff.html
@@ -0,0 +1,5 @@
+<div class="af-container af-layout-inline">
+  <af-field name="name" />
+  <af-field name="location_type_id" />
+  <af-field name="provider_id" />
+</div>
diff --git a/ext/afform/core/ang/blockIMDefault.aff.json b/ext/afform/core/ang/blockIMDefault.aff.json
new file mode 100644
index 000000000000..776f64f28583
--- /dev/null
+++ b/ext/afform/core/ang/blockIMDefault.aff.json
@@ -0,0 +1,6 @@
+{
+  "title": "IM Block (default)",
+  "block": "IM",
+  "extends": "Contact",
+  "repeatable": true
+}
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.html b/ext/afform/core/ang/blockPhoneDefault.aff.html
new file mode 100644
index 000000000000..c1ffc3ebc84d
--- /dev/null
+++ b/ext/afform/core/ang/blockPhoneDefault.aff.html
@@ -0,0 +1,5 @@
+<div class="af-container af-layout-inline">
+  <af-field name="phone" />
+  <af-field name="location_type_id" />
+  <af-field name="phone_type_id" />
+</div>
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.json b/ext/afform/core/ang/blockPhoneDefault.aff.json
new file mode 100644
index 000000000000..00fb70916c7a
--- /dev/null
+++ b/ext/afform/core/ang/blockPhoneDefault.aff.json
@@ -0,0 +1,6 @@
+{
+  "title": "Phone Block (default)",
+  "block": "Phone",
+  "extends": "Contact",
+  "repeatable": true
+}
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.html b/ext/afform/core/ang/blockWebsiteDefault.aff.html
new file mode 100644
index 000000000000..f357a16f709e
--- /dev/null
+++ b/ext/afform/core/ang/blockWebsiteDefault.aff.html
@@ -0,0 +1,4 @@
+<div class="af-container af-layout-inline">
+  <af-field name="url" />
+  <af-field name="website_type_id" />
+</div>
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.json b/ext/afform/core/ang/blockWebsiteDefault.aff.json
new file mode 100644
index 000000000000..c6530dcf4ec8
--- /dev/null
+++ b/ext/afform/core/ang/blockWebsiteDefault.aff.json
@@ -0,0 +1,6 @@
+{
+  "title": "Website Block (default)",
+  "block": "Website",
+  "extends": "Contact",
+  "repeatable": true
+}
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
index b75619d8efc7..76aafd70b352 100644
--- a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
@@ -45,9 +45,10 @@ public function getEntityExamples() {
           'type' => 'Foo',
           'name' => 'foobar',
           'fields' => [
-            ['name' => 'propA'],
-            ['name' => 'propB', 'defn' => ['title' => 'Whiz']],
+            'propA' => ['name' => 'propA'],
+            'propB' => ['name' => 'propB', 'defn' => ['title' => 'Whiz']],
           ],
+          'blocks' => [],
         ],
       ],
     ];
@@ -59,11 +60,13 @@ public function getEntityExamples() {
           'type' => 'Foo',
           'name' => 'foobar',
           'fields' => [],
+          'blocks' => [],
         ],
         'whiz_bang' => [
           'type' => 'Whiz',
           'name' => 'whiz_bang',
           'fields' => [],
+          'blocks' => [],
         ],
       ],
     ];
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 5abf1c18b185..ad7028e743af 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -154,6 +154,8 @@ function afform_gui_civicrm_pageRun(&$page) {
  * Implements hook_civicrm_buildAsset().
  *
  * Loads metadata to send to the gui editor.
+ *
+ * FIXME: This is a prototype and should get broken out into separate callbacks with hooks, events, etc.
  */
 function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   if ($asset !== 'af-gui-vars.js') {
@@ -172,23 +174,81 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     $data['defaults'][$entity] = trim(CRM_Utils_JS::stripComments(file_get_contents($file)));
   }
 
+  // Load main entities
   $data['entities'] = (array) Civi\Api4\Entity::get()
     ->setCheckPermissions(FALSE)
     ->setSelect(['name', 'description'])
     ->addWhere('name', 'IN', $entityWhitelist)
     ->execute();
 
-  foreach ($entityWhitelist as $entityName) {
-    $api = 'Civi\\Api4\\' . $entityName;
-    $data['fields'][$entityName] = (array) $api::getFields()
-      ->setCheckPermissions(FALSE)
-      ->setIncludeCustom(TRUE)
-      ->setLoadOptions(TRUE)
-      ->setAction('create')
-      ->setSelect(['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize', 'data_type'])
-      ->addWhere('input_type', 'IS NOT NULL')
-      ->execute()
-      ->indexBy('name');
+  // Load blocks
+  $data['blocks'] = [];
+  $blockData = \Civi\Api4\Afform::get()
+    ->setCheckPermissions(FALSE)
+    ->addWhere('block', 'IS NOT NULL')
+    ->setSelect(['name', 'title', 'block', 'extends', 'layout', 'repeatable'])
+    ->setFormatWhitespace(TRUE)
+    ->setLayoutFormat('shallow')
+    ->execute();
+  foreach ($blockData as $block) {
+    $entityWhitelist[] = $block['block'];
+    $data['blocks'][_afform_angular_module_name($block['name'], 'dash')] = $block;
+  }
+
+  // Todo: scan for other elements
+  $data['elements'] = [
+    'container' => [
+      'title' => ts('Container'),
+      'element' => [
+        '#tag' => 'div',
+        'class' => 'af-container',
+        '#children' => [],
+      ],
+    ],
+    'text' => [
+      'title' => ts('Text box'),
+      'element' => [
+        '#tag' => 'p',
+        'class' => 'af-text',
+        '#children' => [
+          ['#text' => ts('Enter text')],
+        ],
+      ],
+    ],
+    'markup' => [
+      'title' => ts('Rich content'),
+      'element' => [
+        '#tag' => 'div',
+        'class' => 'af-markup',
+        '#markup' => FALSE,
+      ],
+    ],
+    'button' => [
+      'title' => ts('Button'),
+      'element' => [
+        '#tag' => 'button',
+        'class' => 'af-button btn-primary',
+        'crm-icon' => 'fa-check',
+        'ng-click' => 'afform.submit()',
+        '#children' => [
+          ['#text' => ts('Enter text')],
+        ],
+      ],
+    ],
+  ];
+
+  $getFieldParams = [
+    'checkPermissions' => FALSE,
+    'includeCustom' => TRUE,
+    'loadOptions' => TRUE,
+    'action' => 'create',
+    'select' => ['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize', 'data_type'],
+    'where' => [['input_type', 'IS NOT NULL']],
+  ];
+
+  // Get fields for main entities + block entities
+  foreach (array_unique($entityWhitelist) as $entityName) {
+    $data['fields'][$entityName] = (array) civicrm_api4($entityName, 'getFields', $getFieldParams, 'name');
 
     // TODO: Teach the api to return options in this format
     foreach ($data['fields'][$entityName] as $name => $field) {
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index b9e1cc3883ee..9616e7434692 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -76,6 +76,16 @@
   min-width: 110px;
 }
 
+#afGuiEditor-palette-config .af-gui-entity-palette [type=search] {
+  width: 120px;
+  padding: 3px 3px 3px 5px;
+  height: 22px;
+  font-weight: normal;
+  position: relative;
+  top: -3px;
+  font-size: 12px;
+}
+
 #afGuiEditor input[type=search]::placeholder {
   font-family: FontAwesome;
   text-align: right;
@@ -177,25 +187,25 @@
   min-height: 25px;
 }
 
-#afGuiEditor .af-gui-field-select-list {
-  max-height: 280px;
+#afGuiEditor .af-gui-entity-palette-select-list {
+  max-height: 400px;
   overflow-y: auto;
 }
 
-#afGuiEditor .af-gui-field-select-list > div {
+#afGuiEditor .af-gui-entity-palette-select-list [ui-sortable] > div {
   cursor: move;
-  padding-left:15px;
+  padding-left: 10px;
   position: relative;
 }
-#afGuiEditor .af-gui-field-select-list > div.disabled {
+#afGuiEditor .af-gui-entity-palette-select-list [ui-sortable] > div.disabled {
   cursor: auto;
 }
-#afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover {
+#afGuiEditor .af-gui-entity-palette-select-list [ui-sortable] > div:not(.disabled):hover {
   background-color: #efefef;
 }
 /* grip handle */
 #afGuiEditor [ui-sortable] .af-gui-bar:before,
-#afGuiEditor .af-gui-field-select-list > div:not(.disabled):hover:before,
+#afGuiEditor .af-gui-entity-palette-select-list [ui-sortable] > div:not(.disabled):hover:before,
 #afGuiEditor [af-gui-edit-options] [ui-sortable] li:before {
   background-size: cover;
   background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1IiBoZWlnaHQ9IjUiPgo8cmVjdCB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBmaWxsPSIjODg4Ij48L3JlY3Q+Cjwvc3ZnPg==");
@@ -300,6 +310,7 @@
 
 #afGuiEditor .dropdown-menu li > * > label {
   font-weight: normal;
+  cursor: pointer;
 }
 
 #afGuiEditor .dropdown-menu li .af-gui-field-select-in-dropdown > select {
@@ -313,6 +324,11 @@
   padding: 2px 4px;
 }
 
+#afGuiEditor li .af-gui-field-select-in-dropdown input[type=number] {
+  width: 50px;
+  padding-right: 0;
+}
+
 /* For editing field placeholder text */
 #afGuiEditor .af-gui-field-input input[type=text].form-control {
   color: #9a9a9a;
@@ -431,6 +447,11 @@
   left: 0;
   padding-left: 15px;
 }
+#afGuiEditor .af-gui-edit-options-bar .btn-group-sm {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
 #afGuiEditor [af-gui-edit-options] ul[ui-sortable] {
   padding: 5px 20px 0;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 27a898848b96..1b5340b11d26 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -2,8 +2,6 @@
   "use strict";
   angular.module('afGuiEditor', CRM.angRequires('afGuiEditor'));
 
-  var editingIcon;
-
   angular.module('afGuiEditor').directive('afGuiEditor', function(crmApi4, $parse, $timeout, $location) {
     return {
       restrict: 'A',
@@ -17,7 +15,7 @@
           $('#af-gui-icon-picker').crmIconPicker().change(function() {
             if (editingIcon) {
               $scope.$apply(function() {
-                editingIcon['crm-icon'] = $('#af-gui-icon-picker').val();
+                editingIcon[editingIconProp] = $('#af-gui-icon-picker').val();
                 editingIcon = null;
                 $('#af-gui-icon-picker').val('').change();
               });
@@ -31,6 +29,9 @@
         $scope.saving = false;
         $scope.selectedEntityName = null;
         $scope.meta = this.meta = CRM.afformAdminData;
+        _.each($scope.meta.blocks, function(block) {
+          evaluate(block.layout);
+        });
         this.scope = $scope;
         var editor = $scope.editor = this;
         var newForm = {
@@ -238,6 +239,9 @@
         var ts = $scope.ts = CRM.ts();
         $scope.controls = {};
         $scope.fieldList = [];
+        $scope.blockList = [];
+        $scope.elementList = [];
+        $scope.elementTitles = [];
 
         $scope.valuesFields = function() {
           var fields = $scope.editor ? _.transform($scope.editor.meta.fields[$scope.entity.type], function(fields, field) {
@@ -250,58 +254,101 @@
           delete entity.data[fieldName];
         };
 
-        $scope.buildFieldList = function() {
-          $scope.fieldList.length = 0;
+        function buildPaletteLists() {
           var search = $scope.controls.fieldSearch ? $scope.controls.fieldSearch.toLowerCase() : null;
+          buildFieldList(search);
+          buildBlockList(search);
+          buildElementList(search);
+        }
+
+        function buildFieldList(search) {
+          $scope.fieldList.length = 0;
           _.each($scope.editor.meta.fields[$scope.entity.type], function(field) {
             if (!search || _.contains(field.name, search) || _.contains(field.title.toLowerCase(), search)) {
               $scope.fieldList.push({
                 "#tag": "af-field",
-                name: field.name,
-                defn: {}
+                name: field.name
               });
             }
           });
-        };
+        }
+
+        function buildBlockList(search) {
+          $scope.blockList.length = 0;
+          _.each($scope.editor.meta.blocks, function(block, directive) {
+            if (!search || _.contains(block.name.toLowerCase(), search) || _.contains(block.title.toLowerCase(), search)) {
+              $scope.blockList.push({
+                "#tag": "div",
+                "af-block": block.block,
+                "add-label": ts('Add'),
+                min: '1',
+                "#children": [
+                  {"#tag": directive}
+                ]
+              });
+            }
+          });
+        }
+
+        function buildElementList(search) {
+          $scope.elementList.length = 0;
+          $scope.elementTitles.length = 0;
+          _.each($scope.editor.meta.elements, function(element, name) {
+            if (!search || _.contains(name, search) || _.contains(element.title.toLowerCase(), search)) {
+              $scope.elementList.push(_.cloneDeep(element.element));
+              $scope.elementTitles.push(element.title);
+            }
+          });
+        }
 
         $scope.clearSearch = function() {
           $scope.controls.fieldSearch = '';
         };
 
-        $scope.rebuildFieldList = function() {
+        // This gets called from jquery-ui so we have to manually apply changes to scope
+        $scope.buildPaletteLists = function() {
           $timeout(function() {
             $scope.$apply(function() {
-              $scope.buildFieldList();
+              buildPaletteLists();
             });
           });
         };
 
         // Checks if a field is on the form or set as a value
         $scope.fieldInUse = function(fieldName) {
-          var data = $scope.entity.data || {},
-            found = false;
+          var data = $scope.entity.data || {};
           if (fieldName in data) {
             return true;
           }
-          return check($scope.editor.scope.layout['#children']);
-          function check(group) {
-            _.each(group, function(item) {
-              if (found) {
-                return false;
-              }
-              if (_.isPlainObject(item)) {
-                if ((!item['af-fieldset'] || (item['af-fieldset'] === $scope.entity.name)) && item['#children']) {
-                  check(item['#children']);
-                }
-                if (item['#tag'] === 'af-field' && item.name === fieldName) {
-                  found = true;
-                }
-              }
-            });
-            return found;
-          }
+          return check($scope.editor.scope.layout['#children'], {'#tag': 'af-field', name: fieldName});
+        };
+
+        $scope.blockInUse = function(blockType) {
+          return check($scope.editor.scope.layout['#children'], {'af-block': blockType});
         };
 
+        // Recursively check for a matching object in a multi-level collection
+        function check(group, criteria, found) {
+          if (!found) {
+            found = {};
+          }
+          if (_.find(group, criteria)) {
+            found.match = true;
+            return true;
+          }
+          _.each(group, function(item) {
+            if (found.match) {
+              return false;
+            }
+            if (_.isPlainObject(item)) {
+              if ((!item['af-fieldset'] || (item['af-fieldset'] === $scope.entity.name)) && item['#children']) {
+                check(item['#children'], criteria, found);
+              }
+            }
+          });
+          return found.match;
+        }
+
         $scope.$watch('controls.addValue', function(fieldName) {
           if (fieldName) {
             if (!$scope.entity.data) {
@@ -312,7 +359,7 @@
           }
         });
 
-        $scope.$watch('controls.fieldSearch', $scope.buildFieldList);
+        $scope.$watch('controls.fieldSearch', buildPaletteLists);
       }
     };
   });
@@ -323,11 +370,13 @@
       templateUrl: '~/afGuiEditor/container.html',
       scope: {
         node: '=afGuiContainer',
+        block: '=',
         entityName: '='
       },
-      require: '^^afGuiEditor',
-      link: function($scope, element, attrs, editor) {
-        $scope.editor = editor;
+      require: ['^^afGuiEditor', '?^^afGuiContainer'],
+      link: function($scope, element, attrs, ctrls) {
+        $scope.editor = ctrls[0];
+        $scope.parentContainer = ctrls[1];
       },
       controller: function($scope) {
         var container = $scope.container = this;
@@ -344,6 +393,9 @@
           if (node['af-fieldset']) {
             return 'fieldset';
           }
+          if (node['af-block']) {
+            return 'block';
+          }
           var classes = splitClass(node['class']),
             types = ['af-container', 'af-text', 'af-button', 'af-markup'],
             type = _.intersection(types, classes);
@@ -361,13 +413,31 @@
           } else if (_.intersection(classes, ['af-text', 'af-button']).length) {
             element['#children'] = [{'#text': ts('Enter text')}];
           }
-          // Add it to the top, underneath the fieldset legend if present
-          var pos = $scope.node['#children'].length && $scope.node['#children'][0]['#tag'] === 'legend' ? 1 : 0;
-          $scope.node['#children'].splice(pos, 0, element);
+          var children = $scope.getSetChildren();
+          if (children) {
+            // Add it to the top, underneath the fieldset legend if present
+            var pos = children.length && children[0]['#tag'] === 'legend' ? 1 : 0;
+            children.splice(pos, 0, element);
+          }
         };
 
         this.removeElement = function(element) {
-          removeRecursive($scope.editor.scope.layout['#children'], {$$hashKey: element.$$hashKey});
+          removeRecursive($scope.getSetChildren(), {$$hashKey: element.$$hashKey});
+        };
+
+        this.getEntityName = function() {
+          return $scope.entityName.split('-block-')[0];
+        };
+
+        // Returns the primary entity type for this container e.g. "Contact"
+        this.getMainEntityType = function() {
+          return $scope.editor && $scope.editor.getEntity(container.getEntityName()).type;
+        };
+
+        // Returns the entity type for fields within this conainer (block entity type if this is a block, else the primary entity type)
+        this.getFieldEntityType = function() {
+          var blockType = $scope.entityName.split('-block-');
+          return blockType[1] || ($scope.editor && $scope.editor.getEntity(blockType[0]).type);
         };
 
         $scope.isSelectedFieldset = function(entityName) {
@@ -389,6 +459,10 @@
             var $source = $(sort.source[0]),
               $target = $(sort.droptarget[0]),
               $item = $(ui.item[0]);
+            // Dropping onto palette is ok; works like a trash can
+            if ($target.closest('#afGuiEditor-palette-config').length) {
+              return;
+            }
             // Fields cannot be dropped outside their own entity
             if ($item.is('[af-gui-field]') || $item.has('[af-gui-field]').length) {
               if ($source.closest('[data-entity]').attr('data-entity') !== $target.closest('[data-entity]').attr('data-entity')) {
@@ -396,7 +470,7 @@
               }
             }
             // Entity-fieldsets cannot be dropped into other entity-fieldsets
-            if (($item.is('[data-entity]') || $item.has('[data-entity]').length) && $target.closest('[data-entity]').length) {
+            if (($item.hasClass('af-gui-fieldset') || $item.has('.af-gui-fieldset').length) && $target.closest('.af-gui-fieldset').length) {
               return sort.cancel();
             }
           }
@@ -407,27 +481,146 @@
           fieldset: ts('Fieldset')
         };
 
-        $scope.layouts = {
-          'af-layout-rows': ts('Contents display as rows'),
-          'af-layout-cols': ts('Contents are evenly-spaced columns'),
-          'af-layout-inline': ts('Contents are arranged inline')
+        // Block settings
+        var selectedBlock = $scope.selectedBlock = {
+          name: null,
+          layout: null,
+          override: false,
+          options: [],
         };
 
-        $scope.getLayout = function() {
-          if (!$scope.node) {
-            return '';
-          }
-          return _.intersection(splitClass($scope.node['class']), _.keys($scope.layouts))[0] || 'af-layout-rows';
+        $scope.getSetChildren = function(val) {
+          var collection = selectedBlock.layout || ($scope.node && $scope.node['#children']);
+          return arguments.length ? (collection = val) : collection;
         };
 
-        $scope.setLayout = function(val) {
-          var classes = ['af-container'];
-          if (val !== 'af-layout-rows') {
-            classes.push(val);
-          }
-          modifyClasses($scope.node, _.keys($scope.layouts), classes);
-        };
+        function getBlockOptions() {
+          var blockOptions = [];
+          _.each($scope.editor.meta.blocks, function(block, id) {
+            if (block.block === $scope.container.getFieldEntityType()) {
+              blockOptions.push({
+                id: id,
+                text: block.title + (selectedBlock.name === id && selectedBlock.override ? ' ' + ts('(overridden)') : ''),
+              });
+            }
+          });
+          return blockOptions;
+        }
+
+        if ($scope.block) {
+
+          $scope.isRepeatable = function() {
+            return "fixme";
+          };
+
+          $scope.toggleRepeat = function() {
+            if ($scope.node.min === '1' && $scope.node.max === '1') {
+              delete $scope.node.max;
+              delete $scope.node.min;
+              $scope.node['add-label'] = ts('Add');
+            } else {
+              $scope.node.min = $scope.node.max = '1';
+              delete $scope.node['add-label'];
+            }
+          };
+
+          $scope.getSetMin = function(val) {
+            if (arguments.length) {
+              if ($scope.node.max && val >= parseInt($scope.node.max, 10)) {
+                $scope.node.max = '' + (1 + val);
+              }
+              if (!val) {
+                delete $scope.node.min;
+              }
+              else {
+                $scope.node.min = '' + val;
+              }
+            }
+            return $scope.node.min ? parseInt($scope.node.min, 10) : null;
+          };
+
+          $scope.getSetMax = function(val) {
+            if (arguments.length) {
+              if (!$scope.node.max && $scope.node.min === '1' && val === 1) {
+                val++;
+              }
+              if ($scope.node.min && val && val <= parseInt($scope.node.min, 10)) {
+                $scope.node.min = '' + (val - 1);
+              }
+              if (typeof val !== 'number') {
+                delete $scope.node.max;
+              }
+              else {
+                $scope.node.max = '' + val;
+              }
+            }
+            return $scope.node.max ? parseInt($scope.node.max, 10) : null;
+          };
+
+          $scope.pickAddIcon = function() {
+            openIconPicker($scope.node, 'add-icon');
+          };
 
+          $scope.$watch('selectedBlock.name', function (name, oldVal) {
+            if (name && name !== oldVal) {
+              selectedBlock.layout = _.cloneDeep($scope.editor.meta.blocks[name].layout);
+              $scope.node['#children'] = [{'#tag': name}];
+              selectedBlock.override = false;
+              selectedBlock.options = getBlockOptions();
+            }
+            else if (!name && oldVal) {
+              if (selectedBlock.layout) {
+                $scope.node['#children'] = selectedBlock.layout;
+              }
+              selectedBlock.override = false;
+              selectedBlock.layout = null;
+              selectedBlock.options = getBlockOptions();
+            }
+          });
+
+          $scope.$watch('selectedBlock.layout', function (layout, oldVal) {
+            if (selectedBlock.name && !selectedBlock.override && layout && layout !== oldVal && !angular.equals(layout, $scope.editor.meta.blocks[selectedBlock.name].layout)) {
+              $scope.node['#children'] = selectedBlock.layout;
+              selectedBlock.override = true;
+              selectedBlock.layout = null;
+              selectedBlock.options = getBlockOptions();
+            }
+          }, true);
+
+          $scope.$watch("node['#children']", function (children) {
+            if (!selectedBlock.name && children && children.length === 1 && children[0]['#tag'] in $scope.editor.meta.blocks) {
+              selectedBlock.name = children[0]['#tag'];
+              selectedBlock.override = false;
+            } else if (selectedBlock.name && selectedBlock.override && !selectedBlock.layout && children && angular.equals(children, $scope.editor.meta.blocks[selectedBlock.name].layout)) {
+              selectedBlock.layout = _.cloneDeep($scope.editor.meta.blocks[selectedBlock.name].layout);
+              $scope.node['#children'] = [{'#tag': selectedBlock.name}];
+              selectedBlock.override = false;
+            }
+            selectedBlock.options = getBlockOptions();
+          }, true);
+        }
+        else {
+          $scope.layouts = {
+            'af-layout-rows': ts('Contents display as rows'),
+            'af-layout-cols': ts('Contents are evenly-spaced columns'),
+            'af-layout-inline': ts('Contents are arranged inline')
+          };
+
+          $scope.getLayout = function() {
+            if (!$scope.node) {
+              return '';
+            }
+            return _.intersection(splitClass($scope.node['class']), _.keys($scope.layouts))[0] || 'af-layout-rows';
+          };
+
+          $scope.setLayout = function(val) {
+            var classes = ['af-container'];
+            if (val !== 'af-layout-rows') {
+              classes.push(val);
+            }
+            modifyClasses($scope.node, _.keys($scope.layouts), classes);
+          };
+        }
       }
     };
   });
@@ -437,8 +630,7 @@
       restrict: 'A',
       templateUrl: '~/afGuiEditor/field.html',
       scope: {
-        node: '=afGuiField',
-        entityName: '='
+        node: '=afGuiField'
       },
       require: ['^^afGuiEditor', '^^afGuiContainer'],
       link: function($scope, element, attrs, ctrls) {
@@ -454,11 +646,11 @@
         ];
 
         $scope.getEntity = function() {
-          return $scope.editor ? $scope.editor.getEntity($scope.entityName) : {};
+          return $scope.editor ? $scope.editor.getEntity($scope.container.getEntityName()) : {};
         };
 
         $scope.getDefn = this.getDefn = function() {
-          return $scope.editor ? $scope.editor.getField($scope.getEntity().type, $scope.node.name) : {};
+          return $scope.editor ? $scope.editor.getField($scope.container.getFieldEntityType(), $scope.node.name) : {};
         };
 
         $scope.hasOptions = function() {
@@ -546,10 +738,11 @@
               localDefn = drillDown($scope.node, ['defn'].concat(path)),
               fieldDefn = drillDown($scope.getDefn(), path);
             // Set the value if different than the field defn, otherwise unset it
-            if (typeof val !== 'undefined' && val !== fieldDefn[item]) {
+            if (typeof val !== 'undefined' && (val !== fieldDefn[item] && !(!val && !fieldDefn[item]))) {
               localDefn[item] = val;
             } else {
               delete localDefn[item];
+              clearOut($scope.node, ['defn'].concat(path));
             }
             return val;
           }
@@ -570,6 +763,15 @@
           });
           return container;
         }
+
+        // Recursively clears out empty arrays and objects
+        function clearOut(parent, path) {
+          var item;
+          while (path.length && _.every(drillDown(parent, path), _.isEmpty)) {
+            item = path.pop();
+            delete drillDown(parent, path)[item];
+          }
+        }
       }
     };
   });
@@ -760,8 +962,7 @@
         };
 
         $scope.pickIcon = function() {
-          editingIcon = $scope.node;
-          $('#af-gui-icon-picker ~ .crm-icon-picker-button').click();
+          openIconPicker($scope.node, 'crm-icon');
         };
 
       }
@@ -1025,4 +1226,11 @@
     node['class'] = classes.join(' ');
   }
 
+  var editingIcon, editingIconProp;
+  function openIconPicker(node, propName) {
+    editingIcon = node;
+    editingIconProp = propName;
+    $('#af-gui-icon-picker ~ .crm-icon-picker-button').click();
+  }
+
 })(angular, CRM.$, CRM._);
diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/gui/ang/afGuiEditor/container-menu.html
index f50b533dae5f..2d0b54a38100 100644
--- a/ext/afform/gui/ang/afGuiEditor/container-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/container-menu.html
@@ -3,7 +3,37 @@
 <li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
 <li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
+<li>
+  <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
+    {{ ts('Element:') }}
+    <select class="form-control" ng-model="node['#tag']" title="{{ ts('Container type') }}">
+      <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+    </select>
+  </div>
+</li>
+<li ng-if="block && isRepeatable()" ng-click="$event.stopPropagation()">
+  <div class="af-gui-field-select-in-dropdown form-inline">
+    <label ng-click="toggleRepeat()">
+      <i class="crm-i fa-{{ node.min === '1' && node.max === '1' ? '' : 'check-' }}square-o"></i>
+      {{ ts('Repeat') }}
+    </label>
+    <span ng-style="{visibility: node.min === '1' && node.max === '1' ? 'hidden' : 'visible'}">
+      <input type="number" class="form-control" ng-model="getSetMin" ng-model-options="{getterSetter: true}" placeholder="{{ ts('min') }}" min="0" step="1" />
+      - <input type="number" class="form-control" ng-model="getSetMax" ng-model-options="{getterSetter: true}" placeholder="{{ ts('max') }}" min="1" step="1" />
+    </span>
+  </div>
+</li>
+<li ng-click="$event.stopPropagation()" ng-if="!block">
+  <div class="af-gui-field-select-in-dropdown form-inline">
+    {{ ts('Layout:') }}
+    <div class="btn-group btn-group-sm" role="group">
+      <button type="button" class="btn btn-default" ng-class="{active: opt === getLayout()}" ng-repeat="(opt, label) in layouts" ng-click="setLayout(opt)" title="{{ label }}">
+        <i class="af-gui-layout-icon {{ opt }}"></i>
+      </button>
+    </div>
+  </div>
+</li>
 <li af-gui-menu-item-border="node"></li>
 <li af-gui-menu-item-background="node"></li>
 <li role="separator" class="divider"></li>
-<li><a href ng-click="container.removeElement(node)"><span class="text-danger">{{ ts('Delete this container') }}</span></a></li>
+<li><a href ng-click="parentContainer.removeElement(node)"><span class="text-danger">{{ !block ? ts('Delete this container') : ts('Delete this block') }}</span></a></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/container.html b/ext/afform/gui/ang/afGuiEditor/container.html
index e7ddc10928d5..b77dcf17d73f 100644
--- a/ext/afform/gui/ang/afGuiEditor/container.html
+++ b/ext/afform/gui/ang/afGuiEditor/container.html
@@ -1,19 +1,16 @@
 <div class="af-gui-bar" ng-if="node['#tag'] !== 'af-form'" ng-click="selectEntity()" >
-  <span ng-if="container.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
-  <span>{{ node['#tag'] }}</span>
-  <div class="form-inline pull-right" af-gui-menu>
-    <div class="btn-group btn-group-xs" role="group">
-      <button type="button" class="btn btn-default" ng-class="{active: opt === getLayout()}" ng-repeat="(opt, label) in layouts" ng-click="setLayout(opt)" title="{{ label }}">
-        <i class="af-gui-layout-icon {{ opt }}" ></i>
-      </button>
-    </div>
-    <select ng-model="node['#tag']" title="{{ ts('Container type') }}">
-      <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
+  <div class="form-inline" af-gui-menu>
+    <span ng-if="container.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
+    <span ng-if="block">{{ ts('%1 block:', {1: block}) }}</span>
+    <span ng-if="!block">{{ tags[node['#tag']].toLowerCase() }}</span>
+    <select ng-if="block" ng-model="selectedBlock.name">
+      <option value="">{{ ts('Custom') }}</option>
+      <option value="{{ option.id }}" ng-repeat="option in selectedBlock.options track by option.id">{{ option.text }}</option>
     </select>
-    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button" data-toggle="dropdown" title="{{ ts('Add Element') }}">
+    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button pull-right" data-toggle="dropdown" title="{{ ts('Add Element') }}">
       <span><i class="crm-i fa-plus"></i></span>
     </button>
-    <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/container-menu.html'"></ul>
+    <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open" ng-include="'~/afGuiEditor/container-menu.html'"></ul>
   </div>
 </div>
 <div class="af-gui-bar" ng-if="node['#tag'] === 'af-form'" >
@@ -24,15 +21,24 @@
     <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/canvas-menu.html'"></ul>
   </div>
 </div>
-<div ui-sortable="{handle: '.af-gui-bar', update: onDrop, connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a'}" ng-model="node['#children']" class="af-gui-layout {{ getLayout() }}">
-  <div ng-repeat="item in node['#children']" >
+<div ui-sortable="{handle: '.af-gui-bar', update: onDrop, connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a,.dropdown-menu'}" ng-model="getSetChildren" ng-model-options="{getterSetter: true}" class="af-gui-layout {{ getLayout() }}">
+  <div ng-repeat="item in getSetChildren()" >
     <div ng-switch="container.getNodeType(item)">
       <div ng-switch-when="fieldset" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-fieldset af-gui-container-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
-      <div ng-switch-when="container" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-container-type-{{ item['#tag'] }}" entity-name="entityName" />
-      <div ng-switch-when="field" af-gui-field="item" entity-name="entityName" />
+      <div ng-switch-when="container" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-container-type-{{ item['#tag'] }}" entity-name="entityName" data-entity="{{ entityName }}" />
+      <div ng-switch-when="block" af-gui-container="item"  style="{{ item.style }}" class="af-gui-container af-gui-block" block="item['af-block']" entity-name="entityName + '-block-' + item['af-block']" data-entity="{{ entityName + '-block-' + item['af-block'] }}" />
+      <div ng-switch-when="field" af-gui-field="item" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
       <div ng-switch-when="markup" af-gui-markup="item" class="af-gui-markup" />
       <div ng-switch-when="button" af-gui-button="item" class="af-gui-element af-gui-button" />
     </div>
   </div>
 </div>
+<div ng-if="block && !(node.min === '1' && node.max === '1')" class="af-gui-button">
+  <button class="btn btn-xs btn-primary disabled">
+    <span class="crm-editable-enabled" ng-click="pickAddIcon()" >
+      <i class="crm-i {{ node['add-icon'] || 'fa-plus' }}"></i>
+    </span>
+    <span af-gui-editable ng-model="node['add-label']">{{ node['add-label'] }}</span>
+  </button>
+</div>
diff --git a/ext/afform/gui/ang/afGuiEditor/editOptions.html b/ext/afform/gui/ang/afGuiEditor/editOptions.html
index e961eca7a304..38797ebbce21 100644
--- a/ext/afform/gui/ang/afGuiEditor/editOptions.html
+++ b/ext/afform/gui/ang/afGuiEditor/editOptions.html
@@ -1,6 +1,6 @@
 <div class="af-gui-edit-options-bar" >
-  <h4 class="pull-left">{{ ts('Edit option list') }}</h4>
-  <div class="btn-group-sm pull-right">
+  <h4 class="pull-left">{{ ts('Customize options') }}</h4>
+  <div class="btn-group-sm">
     <button type="button" class="btn btn-default" ng-click="close()">
       <i class="crm-i fa-times-circle"></i>
       {{ ts('Cancel') }}
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index 6c86b85927e0..874fa119a448 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -1,6 +1,6 @@
 <div class="af-gui-columns">
   <fieldset class="af-gui-entity-values">
-    <legend>{{ ts('Values') }}</legend>
+    <legend>{{ ts('Values:') }}</legend>
     <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
       <label>{{ editor.getField(entity.type, fieldName).title }}:</label><br />
       <input class="form-control" af-gui-field-value="editor.getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
@@ -14,17 +14,35 @@
     </div>
   </fieldset>
 
-  <fieldset class="af-gui-entity-fields">
-    <legend>{{ ts('Fields') }}</legend>
-    <div class="af-gui-field-search form-inline">
+  <fieldset class="af-gui-entity-palette">
+    <legend class="form-inline">
+      {{ ts('Add:') }}
       <input ng-model="controls.fieldSearch" class="form-control" type="search" placeholder="&#xf002" title="{{ ts('Search fields') }}" />
-      <a href ng-click="clearSearch()" ng-show="!!controls.fieldSearch" title="{{ ts('Clear search') }}">
-        <i class="crm-i fa-times"></i>
-      </a>
-    </div>
-    <div class="af-gui-field-select-list" ui-sortable="{update: rebuildFieldList, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] [ui-sortable]'}" ng-model="fieldList">
-      <div ng-repeat="field in fieldList" ng-class="{disabled: fieldInUse(field.name)}">
-        {{ editor.getField(entity.type, field.name).title }}
+    </legend>
+    <div class="af-gui-entity-palette-select-list">
+      <div ng-if="blockList.length">
+        <label>{{ ts('Blocks') }}</label>
+        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] &gt; [ui-sortable]'}" ng-model="blockList">
+          <div ng-repeat="block in blockList" ng-class="{disabled: blockInUse(block['af-block'])}">
+            {{ editor.meta.blocks[block['#children'][0]['#tag']].title }}
+          </div>
+        </div>
+      </div>
+      <div ng-if="elementList.length">
+        <label>{{ ts('Elements') }}</label>
+        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[ui-sortable]'}" ng-model="elementList">
+          <div ng-repeat="element in elementList" >
+            {{ elementTitles[$index] }}
+          </div>
+        </div>
+      </div>
+      <div ng-if="fieldList.length">
+        <label>{{ ts('Fields') }}</label>
+        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] &gt; [ui-sortable]'}" ng-model="fieldList">
+          <div ng-repeat="field in fieldList" ng-class="{disabled: fieldInUse(field.name)}">
+            {{ editor.getField(entity.type, field.name).title }}
+          </div>
+        </div>
       </div>
     </div>
   </fieldset>
diff --git a/ext/afform/gui/ang/afGuiEditor/field-menu.html b/ext/afform/gui/ang/afGuiEditor/field-menu.html
index 2fdf38aa37a7..95b9925999dc 100644
--- a/ext/afform/gui/ang/afGuiEditor/field-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/field-menu.html
@@ -34,13 +34,13 @@
 <li ng-if="hasOptions()" ng-click="$event.stopPropagation()">
   <a href ng-click="resetOptions()" title="{{ ts('Reset the option list for this field') }}">
     <i class="crm-i fa-{{ node.defn.options ? '' : 'check-' }}circle-o"></i>
-    {{ ts('Use default option list') }}
+    {{ ts('Default option list') }}
   </a>
 </li>
 <li ng-if="hasOptions()">
   <a href ng-click="editOptions()" title="{{ ts('Customize the option list for this field') }}">
     <i class="crm-i fa-{{ !node.defn.options ? '' : 'check-' }}circle-o"></i>
-    {{ ts('Customize field options') }}
+    {{ ts('Customize options') }}
   </a>
 </li>
 <li role="separator" class="divider"></li>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index efcb4fc6ca74..04f9c97eccc0 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -11,14 +11,13 @@
     </div>
   </div>
   <label ng-style="{visibility: node.defn.title === false ? 'hidden' : 'visible'}" ng-class="{'af-gui-field-required': getProp('required')}" class="af-gui-node-title">
-    <span af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ getProp('title') }}</span>
+    <span af-gui-editable ng-model="getSet('title')" ng-model-options="{getterSetter: true}" default-value="getDefn().title">{{ getProp('title') }}</span>
   </label>
   <div class="af-gui-field-help" ng-if="propIsset('help_pre')">
-    <span af-gui-editable ng-model="node.defn.help_pre" default-value="getDefn().help_pre">{{ getProp('help_pre') }}</span>
+    <span af-gui-editable ng-model="getSet('help_pre')" ng-model-options="{getterSetter: true}" default-value="getDefn().help_pre">{{ getProp('help_pre') }}</span>
   </div>
   <div class="af-gui-field-input af-gui-field-input-type-{{ getProp('input_type').toLowerCase() }}" ng-include="'~/afGuiEditor/inputType/' + getProp('input_type') + '.html'"></div>
   <div class="af-gui-field-help" ng-if="propIsset('help_post')">
-    <span af-gui-editable ng-model="node.defn.help_post" default-value="getDefn().help_post">{{ getProp('help_post') }}</span>
+    <span af-gui-editable ng-model="getSet('help_post')" ng-model-options="{getterSetter: true}" default-value="getDefn().help_post">{{ getProp('help_post') }}</span>
   </div>
 </div>
-
diff --git a/ext/afform/gui/ang/afGuiEditor/text-menu.html b/ext/afform/gui/ang/afGuiEditor/text-menu.html
index ee379c753395..7a06d8f44796 100644
--- a/ext/afform/gui/ang/afGuiEditor/text-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/text-menu.html
@@ -1,13 +1,13 @@
-<li>
-  <div class="af-gui-field-select-in-dropdown" ng-click="$event.stopPropagation()">
+<li ng-click="$event.stopPropagation()">
+  <div class="af-gui-field-select-in-dropdown">
     <label>{{ ts('Style:') }}</label>
     <select class="form-control" ng-model="node['#tag']" title="{{ ts('Text style') }}">
       <option ng-repeat="(opt, label) in tags" value="{{ opt }}">{{ label }}</option>
     </select>
   </div>
 </li>
-<li>
-  <div class="af-gui-field-select-in-dropdown" ng-click="$event.stopPropagation()">
+<li ng-click="$event.stopPropagation()">
+  <div class="af-gui-field-select-in-dropdown">
     <div class="btn-group btn-group-sm" role="group">
       <button type="button" class="btn btn-default" ng-class="{active: opt === getAlign()}" ng-repeat="(opt, label) in alignments" ng-click="setAlign(opt)" title="{{ label }}">
         <i class="crm-i fa-{{ opt.replace('text', 'align') }}" ></i>
@@ -15,8 +15,8 @@
     </div>
   </div>
 </li>
-<li>
-  <div ng-click="$event.stopPropagation()" class="af-gui-field-select-in-dropdown form-inline" >
+<li ng-click="$event.stopPropagation()">
+  <div class="af-gui-field-select-in-dropdown form-inline" >
     <label>{{ ts('Color:') }}</label>
     <select class="form-control {{ getSetStyle().replace('btn', 'text') }}" ng-model="getSetStyle" ng-model-options="{getterSetter: true}" title="{{ ts('Button color scheme') }}">
       <option ng-repeat="(style, label) in styles" class="{{ style.replace('text', 'bg') }}" value="{{ style }}">{{ label }}</option>
diff --git a/ext/afform/mock/ang/afex.aff.json b/ext/afform/mock/ang/afex.aff.json
index 57a6679e72fa..e0dc03664d14 100644
--- a/ext/afform/mock/ang/afex.aff.json
+++ b/ext/afform/mock/ang/afex.aff.json
@@ -1,4 +1,4 @@
 {
   "server_route": "civicrm/afex",
-  "requires":["mockFoo", "mockBareFile", "af", "afBlock"]
+  "requires":["mockFoo", "mockBareFile", "af"]
 }

From 9c84a124cd89491309eb3b458b0f85393b0d7d33 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 20 Dec 2019 15:47:02 -0500
Subject: [PATCH 593/834] Implement afform blocks for multi-value custom groups

---
 ext/afform/core/CRM/Afform/AfformScanner.php  | 18 ++--
 .../core/Civi/Api4/Action/Afform/Get.php      | 98 +++++++++++++++++--
 ext/afform/core/afform.php                    | 14 ++-
 .../tests/phpunit/CRM/Afform/UtilTest.php     |  7 ++
 4 files changed, 117 insertions(+), 20 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/AfformScanner.php b/ext/afform/core/CRM/Afform/AfformScanner.php
index ce7b96c6dc79..4ee84cbda433 100644
--- a/ext/afform/core/CRM/Afform/AfformScanner.php
+++ b/ext/afform/core/CRM/Afform/AfformScanner.php
@@ -148,7 +148,13 @@ public function getMeta($name) {
     }
   }
 
-  public function getComputedFields($name) {
+  /**
+   * Adds has_local & has_base to an afform metadata record
+   *
+   * @param array $record
+   */
+  public function addComputedFields(&$record) {
+    $name = $record['name'];
     // Ex: $allPaths['viewIndividual'][0] == '/var/www/foo/afform/view-individual'].
     $allPaths = $this->findFilePaths()[$name];
     // $activeLayoutPath = $this->findFilePath($name, self::LAYOUT_FILE);
@@ -156,11 +162,11 @@ public function getComputedFields($name) {
     $localLayoutPath = $this->createSiteLocalPath($name, self::LAYOUT_FILE);
     $localMetaPath = $this->createSiteLocalPath($name, self::METADATA_FILE);
 
-    $fields = [];
-    $fields['has_local'] = file_exists($localLayoutPath) || file_exists($localMetaPath);
-    $fields['has_base'] = ($fields['has_local'] && count($allPaths) > 1)
-      || (!$fields['has_local'] && count($allPaths) > 0);
-    return $fields;
+    $record['has_local'] = file_exists($localLayoutPath) || file_exists($localMetaPath);
+    if (!isset($record['has_base'])) {
+      $record['has_base'] = ($record['has_local'] && count($allPaths) > 1)
+        || (!$record['has_local'] && count($allPaths) > 0);
+    }
   }
 
   /**
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index a752f5a8c1dd..65b56ba5f1a9 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -2,6 +2,9 @@
 
 namespace Civi\Api4\Action\Afform;
 
+use Civi\Api4\CustomField;
+use Civi\Api4\CustomGroup;
+
 /**
  * @inheritDoc
  * @package Civi\Api4\Action\Afform
@@ -13,23 +16,100 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
   public function getRecords() {
     /** @var \CRM_Afform_AfformScanner $scanner */
     $scanner = \Civi::service('afform_scanner');
+    $getComputed = $this->_isFieldSelected('has_local') || $this->_isFieldSelected('has_base');
+    $getLayout = $this->_isFieldSelected('layout');
+
+    $toGet = $this->_itemsToGet('name');
+    $names = $toGet ?? array_keys($scanner->findFilePaths());
 
-    $names = $this->_itemsToGet('name') ?? array_keys($scanner->findFilePaths());
+    $values = $this->getAutoGenerated($names, $toGet, $getLayout);
 
-    $values = [];
     foreach ($names as $name) {
       $record = $scanner->getMeta($name);
-      if ($record && ($this->_isFieldSelected('has_local') || $this->_isFieldSelected('has_base'))) {
-        $record = array_merge($record, $scanner->getComputedFields($name));
+      if (!$record && !isset($values[$name])) {
+        continue;
+      }
+      $values[$name] = array_merge($values[$name] ?? [], $record ?? []);
+      if ($getComputed) {
+        $scanner->addComputedFields($values[$name]);
       }
-      $layout = $this->_isFieldSelected('layout') ? $scanner->getLayout($name) : NULL;
-      if ($layout !== NULL) {
-        // FIXME check for validity?
-        $record['layout'] = $this->convertHtmlToOutput($layout);
+      if ($getLayout) {
+        $values[$name]['layout'] = $scanner->getLayout($name) ?? $values[$name]['layout'] ?? '';
       }
-      $values[] = $record;
     }
 
+    if ($getLayout && $this->layoutFormat !== 'html') {
+      foreach ($values as $name => $record) {
+        $values[$name]['layout'] = $this->convertHtmlToOutput($record['layout']);
+      }
+    }
+
+    return $values;
+  }
+
+  /**
+   * Generates afform blocks from custom field sets.
+   *
+   * @param $names
+   * @param $toGet
+   * @param $getLayout
+   * @return array
+   * @throws \API_Exception
+   */
+  protected function getAutoGenerated(&$names, $toGet, $getLayout) {
+    $values = $groupNames = [];
+    foreach ($toGet ?? [] as $name) {
+      if (strpos($name, 'blockCustom_') === 0 && strlen($name) > 12) {
+        $groupNames[] = substr($name, 12);
+      }
+    }
+    if ($toGet && !$groupNames) {
+      return $values;
+    }
+    $customApi = CustomGroup::get()
+      ->setCheckPermissions(FALSE)
+      ->setSelect(['name', 'title', 'help_pre', 'help_post'])
+      ->addWhere('is_multiple', '=', 1)
+      ->addWhere('is_active', '=', 1);
+    if ($groupNames) {
+      $customApi->addWhere('name', 'IN', $groupNames);
+    }
+    if ($getLayout) {
+      $customApi->addSelect('help_pre')->addSelect('help_post');
+      $customApi->addChain('fields', CustomField::get()
+        ->setCheckPermissions(FALSE)
+        ->addSelect('name')
+        ->addWhere('custom_group_id', '=', '$id')
+        ->addWhere('is_active', '=', 1)
+        ->addOrderBy('weight', 'ASC')
+      );
+    }
+    foreach ($customApi->execute() as $custom) {
+      $name = 'blockCustom_' . $custom['name'];
+      if (!in_array($name, $names)) {
+        $names[] = $name;
+      }
+      $item = [
+        'name' => $name,
+        'requires' => [],
+        'title' => ts('%1 block (default)', [1 => $custom['title']]),
+        'description' => '',
+        'is_public' => FALSE,
+        'permission' => 'access CiviCRM',
+        'block' => 'Custom_' . $custom['name'],
+        'extends' => 'Contact',
+        'repeatable' => TRUE,
+        'has_base' => TRUE,
+      ];
+      if ($getLayout) {
+        $item['layout'] = ($custom['help_pre'] ? '<div class="af-markup">' . $custom['help_pre'] . "</div>\n" : '');
+        foreach ($custom['fields'] as $field) {
+          $item['layout'] .= "<af-field name=\"{$field['name']}\" />\n";
+        }
+        $item['layout'] .= ($custom['help_post'] ? '<div class="af-markup">' . $custom['help_post'] . "</div>\n" : '');
+      }
+      $values[$name] = $item;
+    }
     return $values;
   }
 
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 7e145440122d..3a4f8ae871c8 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -320,9 +320,13 @@ function _afform_reverse_deps_find($formName, $html, $revMap) {
 function afform_civicrm_alterAngular($angular) {
   $fieldMetadata = \Civi\Angular\ChangeSet::create('fieldMetadata')
     ->alterHtml(';\\.aff\\.html$;', function($doc, $path) {
-      /** @var \CRM_Afform_AfformScanner $scanner */
-      $scanner = Civi::service('afform_scanner');
-      $meta = $scanner->getMeta(basename($path, '.aff.html'));
+      try {
+        $module = \Civi::service('angular')->getModule(basename($path, '.aff.html'));
+        $meta = \Civi\Api4\Afform::get()->addWhere('name', '=', $module['_afform'])->addSelect('block')->setCheckPermissions(FALSE)->execute()->first();
+      }
+      catch (Exception $e) {
+      }
+
       $blockEntity = $meta['block'] ?? NULL;
       if (!$blockEntity) {
         $entities = _afform_getMetadata($doc);
@@ -530,13 +534,13 @@ function _afform_angular_module_name($fileBaseName, $format = 'camel') {
   switch ($format) {
     case 'camel':
       $camelCase = '';
-      foreach (explode('-', $fileBaseName) as $shortNamePart) {
+      foreach (preg_split('/[-_ ]/', $fileBaseName, NULL, PREG_SPLIT_NO_EMPTY) as $shortNamePart) {
         $camelCase .= ucfirst($shortNamePart);
       }
       return strtolower($camelCase{0}) . substr($camelCase, 1);
 
     case 'dash':
-      return strtolower(implode('-', array_filter(preg_split('/(?=[A-Z])/', $fileBaseName))));
+      return strtolower(implode('-', preg_split('/[-_ ]|(?=[A-Z])/', $fileBaseName, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE)));
 
     default:
       throw new \Exception("Unrecognized format");
diff --git a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
index d355dfe3af11..e3884febf7c4 100644
--- a/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
+++ b/ext/afform/core/tests/phpunit/CRM/Afform/UtilTest.php
@@ -38,6 +38,13 @@ public function getNameExamples() {
     $exs[] = ['abCd23', 'dash', 'ab-cd23'];
     $exs[] = ['AbCd23', 'dash', 'ab-cd23'];
 
+    $exs[] = ['Custom_fooBar', 'camel', 'customFooBar'];
+    $exs[] = ['Custom_Foo__Bar', 'camel', 'customFooBar'];
+    $exs[] = ['Custom Foo_ _Bar', 'camel', 'customFooBar'];
+    $exs[] = ['Custom_fooBar', 'dash', 'custom-foo-bar'];
+    $exs[] = ['Custom_Foo__Bar', 'dash', 'custom-foo-bar'];
+    $exs[] = ['Custom Foo_ _Bar', 'dash', 'custom-foo-bar'];
+
     return $exs;
   }
 

From 344e8290127f78eb32c4b66322bbca24bffb7e4a Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 27 Dec 2019 14:55:49 -0500
Subject: [PATCH 594/834] Refactor af-block directive into af-repeat and
 af-join

This allows mix-n-match between blocks and repeatable things, allowing
entity fieldsets to be repeated, as well as arbitrary non-repeatable blocks.
---
 ext/afform/core/CRM/Afform/ArrayHtml.php      |   2 +-
 ext/afform/core/Civi/Afform/FormDataModel.php |  67 ++--
 .../Api4/Action/Afform/AbstractProcessor.php  |  29 +-
 .../core/Civi/Api4/Action/Afform/Get.php      |   4 +-
 .../core/Civi/Api4/Action/Afform/Prefill.php  |  17 +-
 .../core/Civi/Api4/Action/Afform/Submit.php   |  83 ++--
 ext/afform/core/Civi/Api4/Afform.php          |   6 +-
 ext/afform/core/afform.php                    |   8 +-
 ext/afform/core/ang/af.ang.php                |   5 +-
 ext/afform/core/ang/af/Block.js               |  63 ---
 ext/afform/core/ang/af/Field.js               |  11 +-
 ext/afform/core/ang/af/Fieldset.js            |  27 +-
 ext/afform/core/ang/af/Form.js                |   2 +-
 ext/afform/core/ang/af/Join.js                |  47 +++
 ext/afform/core/ang/af/Repeat.js              |  70 ++++
 ext/afform/core/ang/af/afBlock.html           |   5 -
 ext/afform/core/ang/af/afRepeat.html          |   5 +
 ext/afform/core/ang/af/fields/CheckBox.html   |   4 +-
 ext/afform/core/ang/af/fields/Date.html       |   2 +-
 ext/afform/core/ang/af/fields/Number.html     |   2 +-
 ext/afform/core/ang/af/fields/Radio.html      |   2 +-
 .../core/ang/af/fields/RichTextEditor.html    |   2 +-
 ext/afform/core/ang/af/fields/Select.html     |   2 +-
 ext/afform/core/ang/af/fields/Text.html       |   2 +-
 ext/afform/core/ang/af/fields/TextArea.html   |   2 +-
 ext/afform/core/ang/afCore.css                |   4 +-
 .../core/ang/blockEmailDefault.aff.json       |   6 +-
 ext/afform/core/ang/blockIMDefault.aff.json   |   6 +-
 .../core/ang/blockNameIndividual.aff.html     |   5 +
 .../core/ang/blockNameIndividual.aff.json     |   4 +
 .../core/ang/blockPhoneDefault.aff.json       |   6 +-
 .../core/ang/blockWebsiteDefault.aff.json     |   6 +-
 .../phpunit/Civi/Afform/FormDataModelTest.php |   8 +-
 ext/afform/gui/afform_gui.php                 |   8 +-
 ext/afform/gui/ang/afGuiEditor.js             | 370 ++++++++++--------
 ext/afform/gui/ang/afGuiEditor/canvas.html    |   2 +-
 .../gui/ang/afGuiEditor/container-menu.html   |  10 +-
 ext/afform/gui/ang/afGuiEditor/container.html |  12 +-
 ext/afform/gui/ang/afGuiEditor/entity.html    |   4 +-
 .../tests/phpunit/api/v4/AfformUsageTest.php  |   8 +-
 40 files changed, 544 insertions(+), 384 deletions(-)
 delete mode 100644 ext/afform/core/ang/af/Block.js
 create mode 100644 ext/afform/core/ang/af/Join.js
 create mode 100644 ext/afform/core/ang/af/Repeat.js
 delete mode 100644 ext/afform/core/ang/af/afBlock.html
 create mode 100644 ext/afform/core/ang/af/afRepeat.html
 create mode 100644 ext/afform/core/ang/blockNameIndividual.aff.html
 create mode 100644 ext/afform/core/ang/blockNameIndividual.aff.json

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 803442906877..84a4ae15d420 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -379,7 +379,7 @@ public function replaceUnicodeChars($markup) {
    * @return bool
    */
   public function isNodeEditable(array $item) {
-    if ($item['#tag'] === 'af-field' || $item['#tag'] === 'af-form' || isset($item['af-fieldset']) || isset($item['af-block'])) {
+    if ($item['#tag'] === 'af-field' || $item['#tag'] === 'af-form' || isset($item['af-fieldset']) || isset($item['af-join'])) {
       return TRUE;
     }
     $editableClasses = ['af-container', 'af-text', 'af-button'];
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index 3a9a811c89d3..b256584aa0ee 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -2,12 +2,13 @@
 
 namespace Civi\Afform;
 
+use Civi\Api4\Afform;
+
 /**
  * Class FormDataModel
  * @package Civi\Afform
  *
- * The FormDataModel examines a form and determines the list of entities/fields
- * which are used by the form.
+ * Examines a form and determines the entities, fields & joins in use.
  */
 class FormDataModel {
 
@@ -18,50 +19,58 @@ class FormDataModel {
   protected $entities;
 
   /**
-   * Gets entity metadata and all blocks & fields from the form
-   *
-   * @param array $layout
-   *   The root element of the layout, in shallow/deep format.
-   * @return static
-   *   Parsed summary of the entities used in a given form.
+   * @var array
    */
-  public static function create($layout) {
+  protected $blocks = [];
+
+  public function __construct($layout) {
     $root = AHQ::makeRoot($layout);
-    $entities = array_column(AHQ::getTags($root, 'af-entity'), NULL, 'name');
-    foreach (array_keys($entities) as $entity) {
-      $entities[$entity]['fields'] = $entities[$entity]['blocks'] = [];
+    $this->entities = array_column(AHQ::getTags($root, 'af-entity'), NULL, 'name');
+    foreach (Afform::get()->setCheckPermissions(FALSE)->addSelect('name')->execute() as $block) {
+      $this->blocks[_afform_angular_module_name($block['name'], 'dash')] = $block;
     }
-    self::parseFields($layout, $entities);
-
-    $self = new static();
-    $self->entities = $entities;
-    return $self;
+    foreach (array_keys($this->entities) as $entity) {
+      $this->entities[$entity]['fields'] = $this->entities[$entity]['joins'] = [];
+    }
+    $this->parseFields($layout);
   }
 
   /**
    * @param array $nodes
-   * @param array $entities
-   *   A list of entities, keyed by name.
-   *     This will be updated to populate 'fields' and 'blocks'.
-   *     Ex: $entities['spouse']['type'] = 'Contact';
    * @param string $entity
+   * @param string $join
    */
-  protected static function parseFields($nodes, &$entities, $entity = NULL) {
+  protected function parseFields($nodes, $entity = NULL, $join = NULL) {
     foreach ($nodes as $node) {
       if (!is_array($node) || !isset($node['#tag'])) {
-        //nothing
+        continue;
       }
-      elseif (!empty($node['af-fieldset'])) {
-        self::parseFields($node['#children'], $entities, $node['af-fieldset']);
+      elseif (!empty($node['af-fieldset']) && !empty($node['#children'])) {
+        $this->parseFields($node['#children'], $node['af-fieldset'], $join);
       }
       elseif ($entity && $node['#tag'] === 'af-field') {
-        $entities[$entity]['fields'][$node['name']] = AHQ::getProps($node);
+        if ($join) {
+          $this->entities[$entity]['joins'][$join]['fields'][$node['name']] = AHQ::getProps($node);
+        }
+        else {
+          $this->entities[$entity]['fields'][$node['name']] = AHQ::getProps($node);
+        }
       }
-      elseif ($entity && !empty($node['af-block'])) {
-        $entities[$entity]['blocks'][$node['af-block']] = AHQ::getProps($node);
+      elseif ($entity && !empty($node['af-join'])) {
+        $this->entities[$entity]['joins'][$node['af-join']] = AHQ::getProps($node);
+        $this->parseFields($node['#children'] ?? [], $entity, $node['af-join']);
       }
       elseif (!empty($node['#children'])) {
-        self::parseFields($node['#children'], $entities, $entity);
+        $this->parseFields($node['#children'], $entity, $join);
+      }
+      // Recurse into embedded blocks
+      if (isset($this->blocks[$node['#tag']])) {
+        if (!isset($this->blocks[$node['#tag']]['layout'])) {
+          $this->blocks[$node['#tag']] = Afform::get()->setCheckPermissions(FALSE)->setSelect(['name', 'layout'])->addWhere('name', '=', $this->blocks[$node['#tag']]['name'])->execute()->first();
+        }
+        if (!empty($this->blocks[$node['#tag']]['layout'])) {
+          $this->parseFields($this->blocks[$node['#tag']]['layout'], $entity, $join);
+        }
       }
     }
   }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index abd8805806ba..416bde2d9098 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -45,7 +45,7 @@ public function _run(Result $result) {
       }
     }
 
-    $this->_formDataModel = FormDataModel::create($this->_afform['layout']);
+    $this->_formDataModel = new FormDataModel($this->_afform['layout']);
     $this->validateArgs();
     $result->exchangeArray($this->processForm());
   }
@@ -69,4 +69,31 @@ protected function validateArgs() {
    */
   abstract protected function processForm();
 
+  /**
+   * @param $mainEntityName
+   * @param $joinEntityName
+   * @param $mainEntityId
+   * @return array
+   * @throws \API_Exception
+   */
+  protected static function getJoinWhereClause($mainEntityName, $joinEntityName, $mainEntityId) {
+    $joinMeta = \Civi::$statics[__CLASS__][__FUNCTION__][$joinEntityName] ?? NULL;
+    $params = [];
+    if (!$joinMeta) {
+      $joinMeta = civicrm_api4($joinEntityName, 'getFields', ['checkPermissions' => FALSE, 'action' => 'create', 'select' => ['name']])->column('name');
+      \Civi::$statics[__CLASS__][__FUNCTION__][$joinEntityName] = $joinMeta;
+    }
+    if (in_array('entity_id', $joinMeta)) {
+      $params[] = ['entity_id', '=', $mainEntityId];
+      if (in_array('entity_table', $joinMeta)) {
+        $params[] = ['entity_table', '=', 'civicrm_' . _civicrm_api_get_entity_name_from_camel($mainEntityName)];
+      }
+    }
+    else {
+      $mainEntityField = _civicrm_api_get_entity_name_from_camel($mainEntityName) . '_id';
+      $params[] = [$mainEntityField, '=', $mainEntityId];
+    }
+    return $params;
+  }
+
 }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 65b56ba5f1a9..0f2dda46bd8b 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -96,9 +96,9 @@ protected function getAutoGenerated(&$names, $toGet, $getLayout) {
         'description' => '',
         'is_public' => FALSE,
         'permission' => 'access CiviCRM',
-        'block' => 'Custom_' . $custom['name'],
+        'join' => 'Custom_' . $custom['name'],
         'extends' => 'Contact',
-        'repeatable' => TRUE,
+        'repeat' => TRUE,
         'has_base' => TRUE,
       ];
       if ($getLayout) {
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index 5332066dcac7..dd9ba9980798 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -49,17 +49,17 @@ private function loadEntity($entity, $id) {
       'select' => array_keys($entity['fields']),
       'checkPermissions' => $checkPermissions,
     ]);
-    $data = $result->first();
-    if ($data) {
-      $data['blocks'] = [];
-      foreach ($entity['blocks'] ?? [] as $blockEntity => $block) {
-        $data['blocks'][$blockEntity] = (array) civicrm_api4($blockEntity, 'get', [
-          'where' => [['contact_id', '=', $data['id']]],
-          'limit' => $block['max'] ?? 0,
+    foreach ($result as $item) {
+      $data = ['fields' => $item];
+      foreach ($entity['joins'] ?? [] as $joinEntity => $join) {
+        $data['joins'][$joinEntity] = (array) civicrm_api4($joinEntity, 'get', [
+          'where' => $this->getJoinWhereClause($entity['type'], $joinEntity, $item['id']),
+          'limit' => !empty($join['af-repeat']) ? $join['max'] ?? 0 : 1,
+          'select' => array_keys($join['fields']),
           'checkPermissions' => $checkPermissions,
         ]);
       }
-      $this->_data[$entity['name']] = $data;
+      $this->_data[$entity['name']][] = $data;
     }
   }
 
@@ -68,6 +68,7 @@ private function loadEntity($entity, $id) {
    *
    * @param $entity
    * @param $mode
+   * @throws \API_Exception
    */
   private function autoFillEntity($entity, $mode) {
     $id = NULL;
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
index 2f563cfe1c24..54a36f49d132 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Submit.php
@@ -3,7 +3,6 @@
 namespace Civi\Api4\Action\Afform;
 
 use Civi\Afform\Event\AfformSubmitEvent;
-use Civi\API\Exception\NotImplementedException;
 
 /**
  * Class Submit
@@ -23,8 +22,15 @@ class Submit extends AbstractProcessor {
   protected function processForm() {
     $entityValues = [];
     foreach ($this->_formDataModel->getEntities() as $entityName => $entity) {
-      // Predetermined values override submitted values
-      $entityValues[$entity['type']][$entityName] = ($entity['af-values'] ?? []) + ($this->values[$entityName] ?? []);
+      foreach ($this->values[$entityName] ?? [] as $values) {
+        $entityValues[$entity['type']][$entityName][] = $values + ['fields' => []];
+        // Predetermined values override submitted values
+        if (!empty($entity['af-values'])) {
+          foreach ($entityValues[$entity['type']][$entityName] as $index => $vals) {
+            $entityValues[$entity['type']][$entityName][$index]['fields'] = $entity['af-values'] + $vals['fields'];
+          }
+        }
+      }
     }
 
     $event = new AfformSubmitEvent($this->_formDataModel->getEntities(), $entityValues);
@@ -44,29 +50,11 @@ protected function processForm() {
    * @throws \API_Exception
    * @see afform_civicrm_config
    */
-  public function processContacts(AfformSubmitEvent $event) {
-    foreach ($event->entityValues['Contact'] ?? [] as $entityName => $contact) {
-      $blocks = $contact['blocks'] ?? [];
-      unset($contact['blocks']);
-      $saved = civicrm_api4('Contact', 'save', ['records' => [$contact]])->first();
-      foreach ($blocks as $entity => $block) {
-        $values = self::filterEmptyBlocks($entity, $block);
-        // FIXME: Replace/delete should only be done to known contacts
-        if ($values) {
-          civicrm_api4($entity, 'replace', [
-            'where' => [['contact_id', '=', $saved['id']]],
-            'records' => $values,
-          ]);
-        }
-        else {
-          try {
-            civicrm_api4($entity, 'delete', [
-              'where' => [['contact_id', '=', $saved['id']]],
-            ]);
-          } catch (\API_Exception $e) {
-            // No records to delete
-          }
-        }
+  public static function processContacts(AfformSubmitEvent $event) {
+    foreach ($event->entityValues['Contact'] ?? [] as $entityName => $contacts) {
+      foreach ($contacts as $contact) {
+        $saved = civicrm_api4('Contact', 'save', ['records' => [$contact['fields']]])->first();
+        self::saveJoins('Contact', $saved['id'], $contact['joins'] ?? []);
       }
     }
     unset($event->entityValues['Contact']);
@@ -78,23 +66,50 @@ public function processContacts(AfformSubmitEvent $event) {
    * @see afform_civicrm_config
    */
   public static function processGenericEntity(AfformSubmitEvent $event) {
-    foreach ($event->entityValues as $entityType => $records) {
-      civicrm_api4($entityType, 'save', [
-        'records' => $records,
-      ]);
+    foreach ($event->entityValues as $entityType => $entities) {
+      // Each record is an array of one or more items (can be > 1 if af-repeat is used)
+      foreach ($entities as $entityName => $records) {
+        foreach ($records as $record) {
+          $saved = civicrm_api4($entityType, 'save', ['records' => [$record['fields']]])->first();
+          self::saveJoins($entityType, $saved['id'], $record['joins'] ?? []);
+        }
+      }
       unset($event->entityValues[$entityType]);
     }
   }
 
+  protected static function saveJoins($mainEntityName, $entityId, $joins) {
+    foreach ($joins as $joinEntityName => $join) {
+      $values = self::filterEmptyJoins($joinEntityName, $join);
+      // FIXME: Replace/delete should only be done to known contacts
+      if ($values) {
+        civicrm_api4($joinEntityName, 'replace', [
+          'where' => self::getJoinWhereClause($mainEntityName, $joinEntityName, $entityId),
+          'records' => $values,
+        ]);
+      }
+      else {
+        try {
+          civicrm_api4($joinEntityName, 'delete', [
+            'where' => self::getJoinWhereClause($mainEntityName, $joinEntityName, $entityId),
+          ]);
+        }
+        catch (\API_Exception $e) {
+          // No records to delete
+        }
+      }
+    }
+  }
+
   /**
-   * Filter out blocks that have been left blank on the form
+   * Filter out joins that have been left blank on the form
    *
    * @param $entity
-   * @param $block
+   * @param $join
    * @return array
    */
-  private static function filterEmptyBlocks($entity, $block) {
-    return array_filter($block, function($item) use($entity) {
+  private static function filterEmptyJoins($entity, $join) {
+    return array_filter($join, function($item) use($entity) {
       switch ($entity) {
         case 'Email':
           return !empty($item['email']);
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 7dd1522f06b6..f289477b8df6 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -97,7 +97,7 @@ public static function getFields() {
           'name' => 'block',
         ],
         [
-          'name' => 'extends',
+          'name' => 'join',
         ],
         [
           'name' => 'title',
@@ -111,8 +111,8 @@ public static function getFields() {
           'data_type' => 'Boolean',
         ],
         [
-          'name' => 'repeatable',
-          'data_type' => 'Boolean',
+          'name' => 'repeat',
+          'data_type' => 'Mixed',
         ],
         [
           'name' => 'server_route',
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 3a4f8ae871c8..8502faeb120a 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -322,12 +322,12 @@ function afform_civicrm_alterAngular($angular) {
     ->alterHtml(';\\.aff\\.html$;', function($doc, $path) {
       try {
         $module = \Civi::service('angular')->getModule(basename($path, '.aff.html'));
-        $meta = \Civi\Api4\Afform::get()->addWhere('name', '=', $module['_afform'])->addSelect('block')->setCheckPermissions(FALSE)->execute()->first();
+        $meta = \Civi\Api4\Afform::get()->addWhere('name', '=', $module['_afform'])->setSelect(['join', 'block'])->setCheckPermissions(FALSE)->execute()->first();
       }
       catch (Exception $e) {
       }
 
-      $blockEntity = $meta['block'] ?? NULL;
+      $blockEntity = $meta['join'] ?? $meta['block'] ?? NULL;
       if (!$blockEntity) {
         $entities = _afform_getMetadata($doc);
       }
@@ -335,12 +335,12 @@ function afform_civicrm_alterAngular($angular) {
       foreach (pq('af-field', $doc) as $afField) {
         /** @var DOMElement $afField */
         $entityName = pq($afField)->parents('[af-fieldset]')->attr('af-fieldset');
-        $blockName = pq($afField)->parents('[af-block]')->attr('af-block');
+        $joinName = pq($afField)->parents('[af-join]')->attr('af-join');
         if (!$blockEntity && !preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
           throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
         }
         $entityType = $blockEntity ?? $entities[$entityName]['type'];
-        _af_fill_field_metadata($blockName ? $blockName : $entityType, $afField);
+        _af_fill_field_metadata($joinName ? $joinName : $entityType, $afField);
       }
     });
   $angular->add($fieldMetadata);
diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index 1949657794f3..d927eb8a3493 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -18,8 +18,9 @@
     'af-entity' => 'E',
     'af-fieldset' => 'A',
     'af-form' => 'E',
-    'af-block' => 'A',
-    'af-block-item' => 'A',
+    'af-join' => 'A',
+    'af-repeat' => 'A',
+    'af-repeat-item' => 'A',
     'af-field' => 'E',
   ],
 ];
diff --git a/ext/afform/core/ang/af/Block.js b/ext/afform/core/ang/af/Block.js
deleted file mode 100644
index 68e9a7b4a5cf..000000000000
--- a/ext/afform/core/ang/af/Block.js
+++ /dev/null
@@ -1,63 +0,0 @@
-(function(angular, $, _) {
-  // Example usage: <div af-block="Email" min="1" max="3" add-label="Add email" ><div block-email-default /></div>
-  angular.module('af')
-    .directive('afBlock', function() {
-      return {
-        restrict: 'A',
-        require: ['^^afFieldset'],
-        scope: {
-          blockName: '@afBlock',
-          min: '=',
-          max: '=',
-          addLabel: '@',
-          addIcon: '@'
-        },
-        transclude: true,
-        templateUrl: '~/af/afBlock.html',
-        link: function($scope, $el, $attr, ctrls) {
-          var ts = $scope.ts = CRM.ts('afform');
-          $scope.afFieldset = ctrls[0];
-        },
-        controller: function($scope) {
-          this.getItems = $scope.getItems = function() {
-            var data = $scope.afFieldset.getData();
-            data.blocks = data.blocks || {};
-            var block = (data.blocks[$scope.blockName] = data.blocks[$scope.blockName] || []);
-            while ($scope.min && block.length < $scope.min) {
-              block.push({});
-            }
-            return block;
-          };
-
-          $scope.addItem = function() {
-            $scope.getItems().push({});
-          };
-
-          $scope.removeItem = function(index) {
-            $scope.getItems().splice(index, 1);
-          };
-
-          $scope.canAdd = function() {
-            return !$scope.max || $scope.getItems().length < $scope.max;
-          };
-
-          $scope.canRemove = function() {
-            return !$scope.min || $scope.getItems().length > $scope.min;
-          };
-        }
-      };
-    })
-    .directive('afBlockItem', function() {
-      return {
-        restrict: 'A',
-        scope: {
-          item: '=afBlockItem'
-        },
-        controller: function($scope) {
-          this.getData = function() {
-            return $scope.item;
-          };
-        }
-      };
-    });
-})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/Field.js b/ext/afform/core/ang/af/Field.js
index e55b13c8a42f..5bf7c9b8db67 100644
--- a/ext/afform/core/ang/af/Field.js
+++ b/ext/afform/core/ang/af/Field.js
@@ -1,9 +1,10 @@
 (function(angular, $, _) {
+  var id = 0;
   // Example usage: <div af-fieldset="myModel"><af-field name="do_not_email" /></div>
   angular.module('af').directive('afField', function() {
     return {
       restrict: 'E',
-      require: ['^^afFieldset', '?^afBlockItem'],
+      require: ['^^afForm', '^^afFieldset', '?^^afJoin', '?^^afRepeatItem'],
       templateUrl: '~/af/afField.html',
       scope: {
         fieldName: '@name',
@@ -11,10 +12,10 @@
       },
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform'),
-          afFieldset = ctrls[0],
-          blockItem = ctrls[1];
-        $scope.fieldId = afFieldset.getDefn().modelName + '-' + $scope.fieldName;
-        $scope.getData = blockItem ? blockItem.getData : afFieldset.getData;
+          closestController = $($el).closest('[af-fieldset],[af-join],[af-repeat-item]'),
+          afForm = ctrls[0];
+        $scope.dataProvider = closestController.is('[af-repeat-item]') ? ctrls[3] : ctrls[2] || ctrls[1];
+        $scope.fieldId = afForm.getFormMeta().name + '-' + $scope.fieldName + '-' + id++;
 
         $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
 
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index 69dde11b1576..a62483cc85f0 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -3,23 +3,30 @@
   angular.module('af').directive('afFieldset', function() {
     return {
       restrict: 'A',
-      require: '^afForm',
-      scope: {
+      require: ['afFieldset', '^afForm'],
+      bindToController: {
         modelName: '@afFieldset'
       },
-      link: function($scope, $el, $attr, afFormCtrl) {
-        $scope.afFormCtrl = afFormCtrl;
+      link: function($scope, $el, $attr, ctrls) {
+        var self = ctrls[0];
+        self.afFormCtrl = ctrls[1];
       },
       controller: function($scope){
-        this.getDefn = function getDefn() {
-          return $scope.afFormCtrl.getEntity($scope.modelName);
-          // return $scope.modelDefn;
+        this.getDefn = function() {
+          return this.afFormCtrl.getEntity(this.modelName);
         };
-        this.getData = function getData() {
-          return $scope.afFormCtrl.getData($scope.modelName);
+        this.getData = function() {
+          return this.afFormCtrl.getData(this.modelName);
         };
         this.getName = function() {
-          return $scope.modelName;
+          return this.modelName;
+        };
+        this.getFieldData = function() {
+          var data = this.getData();
+          if (!data.length) {
+            data.push({fields: {}});
+          }
+          return data[0].fields;
         };
       }
     };
diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index fcf699df03f3..06f3b9d18342 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -20,7 +20,7 @@
 
         this.registerEntity = function registerEntity(entity) {
           schema[entity.modelName] = entity;
-          data[entity.modelName] = entity.data || {};
+          data[entity.modelName] = [];
         };
         this.getEntity = function getEntity(name) {
           return schema[name];
diff --git a/ext/afform/core/ang/af/Join.js b/ext/afform/core/ang/af/Join.js
new file mode 100644
index 000000000000..35d6b350ed45
--- /dev/null
+++ b/ext/afform/core/ang/af/Join.js
@@ -0,0 +1,47 @@
+(function(angular, $, _) {
+  // Example usage: <div af-join="Email" min="1" max="3" add-label="Add email" ><div join-email-default /></div>
+  angular.module('af')
+    .directive('afJoin', function() {
+      return {
+        restrict: 'A',
+        require: ['afJoin', '^^afFieldset', '?^^afRepeatItem'],
+        bindToController: {
+          entity: '@afJoin',
+        },
+        link: function($scope, $el, $attr, ctrls) {
+          var self = ctrls[0];
+          self.afFieldset = ctrls[1];
+          self.repeatItem = ctrls[2];
+        },
+        controller: function($scope) {
+          var self = this;
+          this.getData = function() {
+            var data, fieldsetData;
+            if (self.repeatItem) {
+              data = self.repeatItem.item;
+            } else {
+              fieldsetData = self.afFieldset.getData();
+              if (!fieldsetData.length) {
+                fieldsetData.push({fields: {}, joins: {}});
+              }
+              data = fieldsetData[0];
+            }
+            if (!data.joins) {
+              data.joins = {};
+            }
+            if (!data.joins[self.entity]) {
+              data.joins[self.entity] = [];
+            }
+            return data.joins[self.entity];
+          };
+          this.getFieldData = function() {
+            var data = this.getData();
+            if (!data.length) {
+              data.push({});
+            }
+            return data[0];
+          };
+        }
+      };
+    });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/Repeat.js b/ext/afform/core/ang/af/Repeat.js
new file mode 100644
index 000000000000..52337c927659
--- /dev/null
+++ b/ext/afform/core/ang/af/Repeat.js
@@ -0,0 +1,70 @@
+(function(angular, $, _) {
+  // Example usage: <div af-repeat="Email" min="1" max="3" add-label="Add email" ><div repeat-email-default /></div>
+  angular.module('af')
+    .directive('afRepeat', function() {
+      return {
+        restrict: 'A',
+        require: ['?afFieldset', '?afJoin'],
+        transclude: true,
+        scope: {
+          min: '=',
+          max: '=',
+          addLabel: '@afRepeat',
+          addIcon: '@'
+        },
+        templateUrl: '~/af/afRepeat.html',
+        link: function($scope, $el, $attr, ctrls) {
+          $scope.afFieldset = ctrls[0];
+          $scope.afJoin = ctrls[1];
+        },
+        controller: function($scope) {
+          this.getItems = $scope.getItems = function() {
+            var data = $scope.afJoin ? $scope.afJoin.getData() : $scope.afFieldset.getData();
+            while ($scope.min && data.length < $scope.min) {
+              data.push(getRepeatType() === 'join' ? {} : {fields: {}, joins: {}});
+            }
+            return data;
+          };
+
+          function getRepeatType() {
+            return $scope.afJoin ? 'join' : 'fieldset';
+          }
+          this.getRepeatType = getRepeatType;
+
+          $scope.addItem = function() {
+            $scope.getItems().push(getRepeatType() === 'join' ? {} : {fields: {}});
+          };
+
+          $scope.removeItem = function(index) {
+            $scope.getItems().splice(index, 1);
+          };
+
+          $scope.canAdd = function() {
+            return !$scope.max || $scope.getItems().length < $scope.max;
+          };
+
+          $scope.canRemove = function() {
+            return !$scope.min || $scope.getItems().length > $scope.min;
+          };
+        }
+      };
+    })
+    .directive('afRepeatItem', function() {
+      return {
+        restrict: 'A',
+        require: ['afRepeatItem', '^^afRepeat'],
+        bindToController: {
+          item: '=afRepeatItem'
+        },
+        link: function($scope, $el, $attr, ctrls) {
+          var self = ctrls[0];
+          self.afRepeat = ctrls[1];
+        },
+        controller: function($scope) {
+          this.getFieldData = function() {
+            return this.afRepeat.getRepeatType() === 'join' ? this.item : this.item.fields;
+          };
+        }
+      };
+    });
+})(angular, CRM.$, CRM._);
diff --git a/ext/afform/core/ang/af/afBlock.html b/ext/afform/core/ang/af/afBlock.html
deleted file mode 100644
index 463f38348e2a..000000000000
--- a/ext/afform/core/ang/af/afBlock.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div af-block-item="item" ng-repeat="item in getItems()">
-  <ng-transclude />
-  <button crm-icon="fa-ban" class="btn btn-xs af-block-remove-btn" ng-if="canRemove()" ng-click="removeItem($index)"></button>
-</div>
-<button crm-icon="{{ addIcon || 'fa-plus' }}" class="btn btn-sm af-block-add-btn" ng-if="canAdd()" ng-click="addItem()">{{ addLabel }}</button>
diff --git a/ext/afform/core/ang/af/afRepeat.html b/ext/afform/core/ang/af/afRepeat.html
new file mode 100644
index 000000000000..98346d3fe92d
--- /dev/null
+++ b/ext/afform/core/ang/af/afRepeat.html
@@ -0,0 +1,5 @@
+<div af-repeat-item="item" ng-repeat="item in getItems()">
+  <ng-transclude />
+  <button crm-icon="fa-ban" class="btn btn-xs af-repeat-remove-btn" ng-if="canRemove()" ng-click="removeItem($index)"></button>
+</div>
+<button crm-icon="{{ addIcon || 'fa-plus' }}" class="btn btn-sm af-repeat-add-btn" ng-if="canAdd()" ng-click="addItem()">{{ addLabel }}</button>
diff --git a/ext/afform/core/ang/af/fields/CheckBox.html b/ext/afform/core/ang/af/fields/CheckBox.html
index fbdab6b0b219..be20b9efe578 100644
--- a/ext/afform/core/ang/af/fields/CheckBox.html
+++ b/ext/afform/core/ang/af/fields/CheckBox.html
@@ -1,7 +1,7 @@
 <ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="defn.options">
   <li ng-repeat="opt in defn.options" >
-    <input type="checkbox" checklist-model="getData()[name]" id="{{ fieldId + opt.key }}" checklist-value="opt.key" />
+    <input type="checkbox" checklist-model="dataProvider.getFieldData()[fieldName]" id="{{ fieldId + opt.key }}" checklist-value="opt.key" />
     <label for="{{ fieldId + opt.key }}">{{ opt.label }}</label>
   </li>
 </ul>
-<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="getData()[fieldName]" ng-true-value="'1'" ng-false-value="'0'" />
+<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" ng-true-value="'1'" ng-false-value="'0'" />
diff --git a/ext/afform/core/ang/af/fields/Date.html b/ext/afform/core/ang/af/fields/Date.html
index 8e46274415af..5e7d7c21d7aa 100644
--- a/ext/afform/core/ang/af/fields/Date.html
+++ b/ext/afform/core/ang/af/fields/Date.html
@@ -1 +1 @@
-<input crm-ui-datepicker="defn.input_attrs" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-datepicker="defn.input_attrs" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" />
diff --git a/ext/afform/core/ang/af/fields/Number.html b/ext/afform/core/ang/af/fields/Number.html
index 2028c402c56b..111549c78654 100644
--- a/ext/afform/core/ang/af/fields/Number.html
+++ b/ext/afform/core/ang/af/fields/Number.html
@@ -1 +1 @@
-<input class="crm-form-text" type="number" id="{{ fieldId }}" ng-model="getData()[fieldName]" placeholder="{{ defn.input_attrs.placeholder }}" />
+<input class="crm-form-text" type="number" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" placeholder="{{ defn.input_attrs.placeholder }}" />
diff --git a/ext/afform/core/ang/af/fields/Radio.html b/ext/afform/core/ang/af/fields/Radio.html
index b3e9917b6098..f4ee1fae4289 100644
--- a/ext/afform/core/ang/af/fields/Radio.html
+++ b/ext/afform/core/ang/af/fields/Radio.html
@@ -1,4 +1,4 @@
 <label ng-repeat="opt in getOptions()" >
-  <input class="crm-form-radio" type="radio" ng-model="getData()[fieldName]" value="{{ opt.key }}" />
+  <input class="crm-form-radio" type="radio" ng-model="dataProvider.getFieldData()[fieldName]" value="{{ opt.key }}" />
   {{ opt.label }}
 </label>
diff --git a/ext/afform/core/ang/af/fields/RichTextEditor.html b/ext/afform/core/ang/af/fields/RichTextEditor.html
index cedb7221047a..e2dbc6e9d1d3 100644
--- a/ext/afform/core/ang/af/fields/RichTextEditor.html
+++ b/ext/afform/core/ang/af/fields/RichTextEditor.html
@@ -1 +1 @@
-<textarea crm-ui-richtext id="{{ fieldId }}" ng-model="getData()[fieldName]" ></textarea>
+<textarea crm-ui-richtext id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" ></textarea>
diff --git a/ext/afform/core/ang/af/fields/Select.html b/ext/afform/core/ang/af/fields/Select.html
index a89e8464ecf3..a3cb1e2abd7b 100644
--- a/ext/afform/core/ang/af/fields/Select.html
+++ b/ext/afform/core/ang/af/fields/Select.html
@@ -1 +1 @@
-<input crm-ui-select="{data: select2Options, multiple: defn.input_attrs.multiple, placeholder: defn.input_attrs.placeholder}" id="{{ fieldId }}" ng-model="getData()[fieldName]" />
+<input crm-ui-select="{data: select2Options, multiple: defn.input_attrs.multiple, placeholder: defn.input_attrs.placeholder}" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" />
diff --git a/ext/afform/core/ang/af/fields/Text.html b/ext/afform/core/ang/af/fields/Text.html
index 619196a07324..008b3441c693 100644
--- a/ext/afform/core/ang/af/fields/Text.html
+++ b/ext/afform/core/ang/af/fields/Text.html
@@ -1 +1 @@
-<input class="crm-form-text" type="text" id="{{ fieldId }}" ng-model="getData()[fieldName]" placeholder="{{ defn.input_attrs.placeholder }}" />
+<input class="crm-form-text" type="text" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" placeholder="{{ defn.input_attrs.placeholder }}" />
diff --git a/ext/afform/core/ang/af/fields/TextArea.html b/ext/afform/core/ang/af/fields/TextArea.html
index f19d4c9771bb..66a2c5a37509 100644
--- a/ext/afform/core/ang/af/fields/TextArea.html
+++ b/ext/afform/core/ang/af/fields/TextArea.html
@@ -1 +1 @@
-<textarea class="crm-form-textarea" id="{{ fieldId }}" ng-model="getData()[fieldName]" ></textarea>
+<textarea class="crm-form-textarea" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" ></textarea>
diff --git a/ext/afform/core/ang/afCore.css b/ext/afform/core/ang/afCore.css
index 209c8420abfa..59070b0df50e 100644
--- a/ext/afform/core/ang/afCore.css
+++ b/ext/afform/core/ang/afCore.css
@@ -18,10 +18,10 @@ a.af-api4-action-idle {
     vertical-align: bottom;
 }
 
-[af-block-item] {
+[af-repeat-item] {
   position: relative;
 }
-#bootstrap-theme [af-block-item] .af-block-remove-btn {
+#bootstrap-theme [af-repeat-item] .af-repeat-remove-btn {
   min-width: 30px;
   position: absolute;
   top: 0;
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.json b/ext/afform/core/ang/blockEmailDefault.aff.json
index 12d6107473b5..107756e1c15b 100644
--- a/ext/afform/core/ang/blockEmailDefault.aff.json
+++ b/ext/afform/core/ang/blockEmailDefault.aff.json
@@ -1,6 +1,6 @@
 {
   "title": "Email Block (default)",
-  "block": "Email",
-  "extends": "Contact",
-  "repeatable": true
+  "block": "Contact",
+  "join": "Email",
+  "repeat": true
 }
diff --git a/ext/afform/core/ang/blockIMDefault.aff.json b/ext/afform/core/ang/blockIMDefault.aff.json
index 776f64f28583..261df8a830cc 100644
--- a/ext/afform/core/ang/blockIMDefault.aff.json
+++ b/ext/afform/core/ang/blockIMDefault.aff.json
@@ -1,6 +1,6 @@
 {
   "title": "IM Block (default)",
-  "block": "IM",
-  "extends": "Contact",
-  "repeatable": true
+  "block": "Contact",
+  "join": "IM",
+  "repeat": true
 }
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.html b/ext/afform/core/ang/blockNameIndividual.aff.html
new file mode 100644
index 000000000000..1142cd9d33b3
--- /dev/null
+++ b/ext/afform/core/ang/blockNameIndividual.aff.html
@@ -0,0 +1,5 @@
+<div class="af-container af-layout-inline">
+  <af-field name="first_name" />
+  <af-field name="middle_name" />
+  <af-field name="last_name" />
+</div>
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.json b/ext/afform/core/ang/blockNameIndividual.aff.json
new file mode 100644
index 000000000000..9a328cac39fa
--- /dev/null
+++ b/ext/afform/core/ang/blockNameIndividual.aff.json
@@ -0,0 +1,4 @@
+{
+  "title": "Individual Name (default)",
+  "block": "Contact"
+}
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.json b/ext/afform/core/ang/blockPhoneDefault.aff.json
index 00fb70916c7a..9419dbdb17fe 100644
--- a/ext/afform/core/ang/blockPhoneDefault.aff.json
+++ b/ext/afform/core/ang/blockPhoneDefault.aff.json
@@ -1,6 +1,6 @@
 {
   "title": "Phone Block (default)",
-  "block": "Phone",
-  "extends": "Contact",
-  "repeatable": true
+  "block": "Contact",
+  "join": "Phone",
+  "repeat": true
 }
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.json b/ext/afform/core/ang/blockWebsiteDefault.aff.json
index c6530dcf4ec8..71b1e68a78a2 100644
--- a/ext/afform/core/ang/blockWebsiteDefault.aff.json
+++ b/ext/afform/core/ang/blockWebsiteDefault.aff.json
@@ -1,6 +1,6 @@
 {
   "title": "Website Block (default)",
-  "block": "Website",
-  "extends": "Contact",
-  "repeatable": true
+  "block": "Contact",
+  "join": "Website",
+  "repeat": true
 }
diff --git a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
index 76aafd70b352..43a4a557440e 100644
--- a/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
+++ b/ext/afform/core/tests/phpunit/Civi/Afform/FormDataModelTest.php
@@ -48,7 +48,7 @@ public function getEntityExamples() {
             'propA' => ['name' => 'propA'],
             'propB' => ['name' => 'propB', 'defn' => ['title' => 'Whiz']],
           ],
-          'blocks' => [],
+          'joins' => [],
         ],
       ],
     ];
@@ -60,13 +60,13 @@ public function getEntityExamples() {
           'type' => 'Foo',
           'name' => 'foobar',
           'fields' => [],
-          'blocks' => [],
+          'joins' => [],
         ],
         'whiz_bang' => [
           'type' => 'Whiz',
           'name' => 'whiz_bang',
           'fields' => [],
-          'blocks' => [],
+          'joins' => [],
         ],
       ],
     ];
@@ -81,7 +81,7 @@ public function getEntityExamples() {
    */
   public function testGetEntities($html, $expectEntities) {
     $parser = new \CRM_Afform_ArrayHtml();
-    $fdm = FormDataModel::create($parser->convertHtmlToArray($html));
+    $fdm = new FormDataModel($parser->convertHtmlToArray($html));
     $this->assertEquals($expectEntities, $fdm->getEntities());
   }
 
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index ad7028e743af..db98953764d8 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -186,12 +186,14 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
   $blockData = \Civi\Api4\Afform::get()
     ->setCheckPermissions(FALSE)
     ->addWhere('block', 'IS NOT NULL')
-    ->setSelect(['name', 'title', 'block', 'extends', 'layout', 'repeatable'])
+    ->setSelect(['name', 'title', 'block', 'join', 'layout', 'repeat'])
     ->setFormatWhitespace(TRUE)
     ->setLayoutFormat('shallow')
     ->execute();
   foreach ($blockData as $block) {
-    $entityWhitelist[] = $block['block'];
+    if (!empty($block['join']) && !in_array($block['join'], $entityWhitelist)) {
+      $entityWhitelist[] = $block['join'];
+    }
     $data['blocks'][_afform_angular_module_name($block['name'], 'dash')] = $block;
   }
 
@@ -246,7 +248,7 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     'where' => [['input_type', 'IS NOT NULL']],
   ];
 
-  // Get fields for main entities + block entities
+  // Get fields for main entities + joined entities
   foreach (array_unique($entityWhitelist) as $entityName) {
     $data['fields'][$entityName] = (array) civicrm_api4($entityName, 'getFields', $getFieldParams, 'name');
 
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 1b5340b11d26..2297fcbafa15 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -240,6 +240,7 @@
         $scope.controls = {};
         $scope.fieldList = [];
         $scope.blockList = [];
+        $scope.blockTitles = [];
         $scope.elementList = [];
         $scope.elementTitles = [];
 
@@ -275,17 +276,23 @@
 
         function buildBlockList(search) {
           $scope.blockList.length = 0;
+          $scope.blockTitles.length = 0;
           _.each($scope.editor.meta.blocks, function(block, directive) {
-            if (!search || _.contains(block.name.toLowerCase(), search) || _.contains(block.title.toLowerCase(), search)) {
-              $scope.blockList.push({
-                "#tag": "div",
-                "af-block": block.block,
-                "add-label": ts('Add'),
-                min: '1',
-                "#children": [
-                  {"#tag": directive}
-                ]
-              });
+            if (!search || _.contains(directive, search) || _.contains(block.name.toLowerCase(), search) || _.contains(block.title.toLowerCase(), search)) {
+              var item = {"#tag": block.join ? "div" : directive};
+              if (block.join) {
+                item['af-join'] = block.join;
+                item['#children'] = [{"#tag": directive}];
+              }
+              if (block.repeat) {
+                item['af-repeat'] = ts('Add');
+                item.min = '1';
+                if (typeof block.repeat === 'number') {
+                  item.max = '' + block.repeat;
+                }
+              }
+              $scope.blockList.push(item);
+              $scope.blockTitles.push(block.title);
             }
           });
         }
@@ -323,11 +330,18 @@
           return check($scope.editor.scope.layout['#children'], {'#tag': 'af-field', name: fieldName});
         };
 
-        $scope.blockInUse = function(blockType) {
-          return check($scope.editor.scope.layout['#children'], {'af-block': blockType});
+        $scope.blockInUse = function(block) {
+          if (block['af-join']) {
+            return check($scope.editor.scope.layout['#children'], {'af-join': block['af-join']});
+          }
+          var fieldsInBlock = _.pluck(findRecursive($scope.editor.meta.blocks[block['#tag']].layout, {'#tag': 'af-field'}), 'name');
+          return check($scope.editor.scope.layout['#children'], function(item) {
+            return item['#tag'] === 'af-field' && _.includes(fieldsInBlock, item.name);
+          });
         };
 
-        // Recursively check for a matching object in a multi-level collection
+        // Check for a matching item for this entity
+        // Recursively checks the form layout, including block directives
         function check(group, criteria, found) {
           if (!found) {
             found = {};
@@ -341,9 +355,14 @@
               return false;
             }
             if (_.isPlainObject(item)) {
+              // Recurse through everything but skip fieldsets for other entities
               if ((!item['af-fieldset'] || (item['af-fieldset'] === $scope.entity.name)) && item['#children']) {
                 check(item['#children'], criteria, found);
               }
+              // Recurse into block directives
+              else if (item['#tag'] && item['#tag'] in $scope.editor.meta.blocks) {
+                check($scope.editor.meta.blocks[item['#tag']].layout, criteria, found);
+              }
             }
           });
           return found.match;
@@ -370,37 +389,14 @@
       templateUrl: '~/afGuiEditor/container.html',
       scope: {
         node: '=afGuiContainer',
-        block: '=',
+        join: '=',
         entityName: '='
       },
       require: ['^^afGuiEditor', '?^^afGuiContainer'],
       link: function($scope, element, attrs, ctrls) {
+        var ts = $scope.ts = CRM.ts();
         $scope.editor = ctrls[0];
         $scope.parentContainer = ctrls[1];
-      },
-      controller: function($scope) {
-        var container = $scope.container = this;
-        var ts = $scope.ts = CRM.ts();
-        this.node = $scope.node;
-
-        this.getNodeType = function(node) {
-          if (!node) {
-            return null;
-          }
-          if (node['#tag'] === 'af-field') {
-            return 'field';
-          }
-          if (node['af-fieldset']) {
-            return 'fieldset';
-          }
-          if (node['af-block']) {
-            return 'block';
-          }
-          var classes = splitClass(node['class']),
-            types = ['af-container', 'af-text', 'af-button', 'af-markup'],
-            type = _.intersection(types, classes);
-          return type.length ? type[0].replace('af-', '') : null;
-        };
 
         $scope.addElement = function(type, props) {
           var classes = type.split('.');
@@ -421,25 +417,6 @@
           }
         };
 
-        this.removeElement = function(element) {
-          removeRecursive($scope.getSetChildren(), {$$hashKey: element.$$hashKey});
-        };
-
-        this.getEntityName = function() {
-          return $scope.entityName.split('-block-')[0];
-        };
-
-        // Returns the primary entity type for this container e.g. "Contact"
-        this.getMainEntityType = function() {
-          return $scope.editor && $scope.editor.getEntity(container.getEntityName()).type;
-        };
-
-        // Returns the entity type for fields within this conainer (block entity type if this is a block, else the primary entity type)
-        this.getFieldEntityType = function() {
-          var blockType = $scope.entityName.split('-block-');
-          return blockType[1] || ($scope.editor && $scope.editor.getEntity(blockType[0]).type);
-        };
-
         $scope.isSelectedFieldset = function(entityName) {
           return entityName === $scope.editor.getselectedEntityName();
         };
@@ -482,145 +459,202 @@
         };
 
         // Block settings
-        var selectedBlock = $scope.selectedBlock = {
-          name: null,
-          layout: null,
-          override: false,
-          options: [],
-        };
+        var block = {};
+        $scope.block = null;
 
         $scope.getSetChildren = function(val) {
-          var collection = selectedBlock.layout || ($scope.node && $scope.node['#children']);
+          var collection = block.layout || ($scope.node && $scope.node['#children']);
           return arguments.length ? (collection = val) : collection;
         };
 
-        function getBlockOptions() {
-          var blockOptions = [];
-          _.each($scope.editor.meta.blocks, function(block, id) {
-            if (block.block === $scope.container.getFieldEntityType()) {
-              blockOptions.push({
-                id: id,
-                text: block.title + (selectedBlock.name === id && selectedBlock.override ? ' ' + ts('(overridden)') : ''),
-              });
-            }
-          });
-          return blockOptions;
-        }
-
-        if ($scope.block) {
+        $scope.isRepeatable = function() {
+          return $scope.node['af-fieldset'] || (block.directive && $scope.editor.meta.blocks[block.directive].repeat) || $scope.join;
+        };
 
-          $scope.isRepeatable = function() {
-            return "fixme";
-          };
+        $scope.toggleRepeat = function() {
+          if ('af-repeat' in $scope.node) {
+            delete $scope.node.max;
+            delete $scope.node.min;
+            delete $scope.node['af-repeat'];
+            delete $scope.node['add-icon'];
+          } else {
+            $scope.node.min = '1';
+            $scope.node['af-repeat'] = ts('Add');
+          }
+        };
 
-          $scope.toggleRepeat = function() {
-            if ($scope.node.min === '1' && $scope.node.max === '1') {
-              delete $scope.node.max;
+        $scope.getSetMin = function(val) {
+          if (arguments.length) {
+            if ($scope.node.max && val > parseInt($scope.node.max, 10)) {
+              $scope.node.max = '' + val;
+            }
+            if (!val) {
               delete $scope.node.min;
-              $scope.node['add-label'] = ts('Add');
-            } else {
-              $scope.node.min = $scope.node.max = '1';
-              delete $scope.node['add-label'];
             }
-          };
-
-          $scope.getSetMin = function(val) {
-            if (arguments.length) {
-              if ($scope.node.max && val >= parseInt($scope.node.max, 10)) {
-                $scope.node.max = '' + (1 + val);
-              }
-              if (!val) {
-                delete $scope.node.min;
-              }
-              else {
-                $scope.node.min = '' + val;
-              }
+            else {
+              $scope.node.min = '' + val;
             }
-            return $scope.node.min ? parseInt($scope.node.min, 10) : null;
-          };
+          }
+          return $scope.node.min ? parseInt($scope.node.min, 10) : null;
+        };
 
-          $scope.getSetMax = function(val) {
-            if (arguments.length) {
-              if (!$scope.node.max && $scope.node.min === '1' && val === 1) {
-                val++;
-              }
-              if ($scope.node.min && val && val <= parseInt($scope.node.min, 10)) {
-                $scope.node.min = '' + (val - 1);
-              }
-              if (typeof val !== 'number') {
-                delete $scope.node.max;
-              }
-              else {
-                $scope.node.max = '' + val;
-              }
+        $scope.getSetMax = function(val) {
+          if (arguments.length) {
+            if ($scope.node.min && val && val < parseInt($scope.node.min, 10)) {
+              $scope.node.min = '' + val;
             }
-            return $scope.node.max ? parseInt($scope.node.max, 10) : null;
-          };
+            if (typeof val !== 'number') {
+              delete $scope.node.max;
+            }
+            else {
+              $scope.node.max = '' + val;
+            }
+          }
+          return $scope.node.max ? parseInt($scope.node.max, 10) : null;
+        };
+
+        $scope.pickAddIcon = function() {
+          openIconPicker($scope.node, 'add-icon');
+        };
+
+        function getBlockNode() {
+          return !$scope.join ? $scope.node : ($scope.node['#children'] && $scope.node['#children'].length === 1 ? $scope.node['#children'][0] : null);
+        }
+
+        function setBlockDirective(directive) {
+          if ($scope.join) {
+            $scope.node['#children'] = [{'#tag': directive}];
+          } else {
+            delete $scope.node['#children'];
+            delete $scope.node['class'];
+            $scope.node['#tag'] = directive;
+          }
+        }
+
+        function overrideBlockContents(layout) {
+          $scope.node['#children'] = layout || [];
+          if (!$scope.join) {
+            $scope.node['#tag'] = 'div';
+            $scope.node['class'] = 'af-container';
+          }
+          block.override = true;
+          block.layout = null;
+        }
+
+        $scope.layouts = {
+          'af-layout-rows': ts('Contents display as rows'),
+          'af-layout-cols': ts('Contents are evenly-spaced columns'),
+          'af-layout-inline': ts('Contents are arranged inline')
+        };
 
-          $scope.pickAddIcon = function() {
-            openIconPicker($scope.node, 'add-icon');
+        $scope.getLayout = function() {
+          if (!$scope.node) {
+            return '';
+          }
+          return _.intersection(splitClass($scope.node['class']), _.keys($scope.layouts))[0] || 'af-layout-rows';
+        };
+
+        $scope.setLayout = function(val) {
+          var classes = ['af-container'];
+          if (val !== 'af-layout-rows') {
+            classes.push(val);
+          }
+          modifyClasses($scope.node, _.keys($scope.layouts), classes);
+        };
+
+        if (($scope.node['#tag'] in $scope.editor.meta.blocks) || $scope.join) {
+
+          block = $scope.block = {
+            directive: null,
+            layout: null,
+            override: false,
+            options: [],
           };
 
-          $scope.$watch('selectedBlock.name', function (name, oldVal) {
-            if (name && name !== oldVal) {
-              selectedBlock.layout = _.cloneDeep($scope.editor.meta.blocks[name].layout);
-              $scope.node['#children'] = [{'#tag': name}];
-              selectedBlock.override = false;
-              selectedBlock.options = getBlockOptions();
+          _.each($scope.editor.meta.blocks, function(blockInfo, directive) {
+            if (directive === $scope.node['#tag'] || blockInfo.join === $scope.container.getFieldEntityType()) {
+              block.options.push({
+                id: directive,
+                text: blockInfo.title
+              });
             }
-            else if (!name && oldVal) {
-              if (selectedBlock.layout) {
-                $scope.node['#children'] = selectedBlock.layout;
-              }
-              selectedBlock.override = false;
-              selectedBlock.layout = null;
-              selectedBlock.options = getBlockOptions();
+          });
+
+          $scope.$watch('block.directive', function (directive, oldVal) {
+            if (directive && directive !== oldVal) {
+              block.layout = _.cloneDeep($scope.editor.meta.blocks[directive].layout);
+              setBlockDirective(directive);
+              block.override = false;
+            }
+            else if (!directive && oldVal) {
+              overrideBlockContents(block.layout);
+              block.override = false;
             }
           });
 
-          $scope.$watch('selectedBlock.layout', function (layout, oldVal) {
-            if (selectedBlock.name && !selectedBlock.override && layout && layout !== oldVal && !angular.equals(layout, $scope.editor.meta.blocks[selectedBlock.name].layout)) {
-              $scope.node['#children'] = selectedBlock.layout;
-              selectedBlock.override = true;
-              selectedBlock.layout = null;
-              selectedBlock.options = getBlockOptions();
+          $scope.$watch('block.layout', function (layout, oldVal) {
+            if (block.directive && !block.override && layout && layout !== oldVal && !angular.equals(layout, $scope.editor.meta.blocks[block.directive].layout)) {
+              overrideBlockContents(block.layout);
             }
           }, true);
 
           $scope.$watch("node['#children']", function (children) {
-            if (!selectedBlock.name && children && children.length === 1 && children[0]['#tag'] in $scope.editor.meta.blocks) {
-              selectedBlock.name = children[0]['#tag'];
-              selectedBlock.override = false;
-            } else if (selectedBlock.name && selectedBlock.override && !selectedBlock.layout && children && angular.equals(children, $scope.editor.meta.blocks[selectedBlock.name].layout)) {
-              selectedBlock.layout = _.cloneDeep($scope.editor.meta.blocks[selectedBlock.name].layout);
-              $scope.node['#children'] = [{'#tag': selectedBlock.name}];
-              selectedBlock.override = false;
+            if (getBlockNode() && getBlockNode()['#tag'] in $scope.editor.meta.blocks) {
+              block.directive = getBlockNode()['#tag'];
+              block.override = false;
+            } else if (block.directive && block.override && !block.layout && children && angular.equals(children, $scope.editor.meta.blocks[block.directive].layout)) {
+              block.layout = _.cloneDeep($scope.editor.meta.blocks[block.directive].layout);
+              $scope.node['#children'] = [{'#tag': block.directive}];
+              block.override = false;
             }
-            selectedBlock.options = getBlockOptions();
           }, true);
         }
-        else {
-          $scope.layouts = {
-            'af-layout-rows': ts('Contents display as rows'),
-            'af-layout-cols': ts('Contents are evenly-spaced columns'),
-            'af-layout-inline': ts('Contents are arranged inline')
-          };
+      },
+      controller: function($scope) {
+        var container = $scope.container = this;
+        this.node = $scope.node;
 
-          $scope.getLayout = function() {
-            if (!$scope.node) {
-              return '';
-            }
-            return _.intersection(splitClass($scope.node['class']), _.keys($scope.layouts))[0] || 'af-layout-rows';
-          };
+        this.getNodeType = function(node) {
+          if (!node) {
+            return null;
+          }
+          if (node['#tag'] === 'af-field') {
+            return 'field';
+          }
+          if (node['af-fieldset']) {
+            return 'fieldset';
+          }
+          if (node['af-join']) {
+            return 'join';
+          }
+          if (node['#tag'] && node['#tag'] in $scope.editor.meta.blocks) {
+            return 'container';
+          }
+          var classes = splitClass(node['class']),
+            types = ['af-container', 'af-text', 'af-button', 'af-markup'],
+            type = _.intersection(types, classes);
+          return type.length ? type[0].replace('af-', '') : null;
+        };
+
+        this.removeElement = function(element) {
+          removeRecursive($scope.getSetChildren(), {$$hashKey: element.$$hashKey});
+        };
+
+        this.getEntityName = function() {
+          return $scope.entityName.split('-join-')[0];
+        };
+
+        // Returns the primary entity type for this container e.g. "Contact"
+        this.getMainEntityType = function() {
+          return $scope.editor && $scope.editor.getEntity(container.getEntityName()).type;
+        };
+
+        // Returns the entity type for fields within this conainer (join entity type if this is a join, else the primary entity type)
+        this.getFieldEntityType = function() {
+          var joinType = $scope.entityName.split('-join-');
+          return joinType[1] || ($scope.editor && $scope.editor.getEntity(joinType[0]).type);
+        };
 
-          $scope.setLayout = function(val) {
-            var classes = ['af-container'];
-            if (val !== 'af-layout-rows') {
-              classes.push(val);
-            }
-            modifyClasses($scope.node, _.keys($scope.layouts), classes);
-          };
-        }
       }
     };
   });
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 85b611631c7c..5dbad937dcab 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -13,6 +13,6 @@
     </form>
   </div>
   <div class="panel-body">
-    <div af-gui-container="layout" entity-name="" />
+    <div ng-if="layout" af-gui-container="layout" entity-name="" />
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/gui/ang/afGuiEditor/container-menu.html
index 2d0b54a38100..6c9b62176c37 100644
--- a/ext/afform/gui/ang/afGuiEditor/container-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/container-menu.html
@@ -3,7 +3,7 @@
 <li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
 <li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
-<li>
+<li ng-if="tags[node['#tag']]">
   <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
     {{ ts('Element:') }}
     <select class="form-control" ng-model="node['#tag']" title="{{ ts('Container type') }}">
@@ -11,15 +11,15 @@
     </select>
   </div>
 </li>
-<li ng-if="block && isRepeatable()" ng-click="$event.stopPropagation()">
+<li ng-if="isRepeatable()" ng-click="$event.stopPropagation()">
   <div class="af-gui-field-select-in-dropdown form-inline">
     <label ng-click="toggleRepeat()">
-      <i class="crm-i fa-{{ node.min === '1' && node.max === '1' ? '' : 'check-' }}square-o"></i>
+      <i class="crm-i fa-{{ node['af-repeat'] || node['af-repeat'] === '' ? 'check-' : '' }}square-o"></i>
       {{ ts('Repeat') }}
     </label>
-    <span ng-style="{visibility: node.min === '1' && node.max === '1' ? 'hidden' : 'visible'}">
+    <span ng-style="{visibility: node['af-repeat'] || node['af-repeat'] === '' ? 'visible' : 'hidden'}">
       <input type="number" class="form-control" ng-model="getSetMin" ng-model-options="{getterSetter: true}" placeholder="{{ ts('min') }}" min="0" step="1" />
-      - <input type="number" class="form-control" ng-model="getSetMax" ng-model-options="{getterSetter: true}" placeholder="{{ ts('max') }}" min="1" step="1" />
+      - <input type="number" class="form-control" ng-model="getSetMax" ng-model-options="{getterSetter: true}" placeholder="{{ ts('max') }}" min="2" step="1" />
     </span>
   </div>
 </li>
diff --git a/ext/afform/gui/ang/afGuiEditor/container.html b/ext/afform/gui/ang/afGuiEditor/container.html
index b77dcf17d73f..d620e8923234 100644
--- a/ext/afform/gui/ang/afGuiEditor/container.html
+++ b/ext/afform/gui/ang/afGuiEditor/container.html
@@ -1,11 +1,11 @@
 <div class="af-gui-bar" ng-if="node['#tag'] !== 'af-form'" ng-click="selectEntity()" >
   <div class="form-inline" af-gui-menu>
     <span ng-if="container.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
-    <span ng-if="block">{{ ts('%1 block:', {1: block}) }}</span>
+    <span ng-if="block">{{ join ? ts(join) + ':' : ts('Block:') }}</span>
     <span ng-if="!block">{{ tags[node['#tag']].toLowerCase() }}</span>
-    <select ng-if="block" ng-model="selectedBlock.name">
+    <select ng-if="block" ng-model="block.directive">
       <option value="">{{ ts('Custom') }}</option>
-      <option value="{{ option.id }}" ng-repeat="option in selectedBlock.options track by option.id">{{ option.text }}</option>
+      <option value="{{ option.id }}" ng-repeat="option in block.options track by option.id">{{ option.text }}</option>
     </select>
     <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button pull-right" data-toggle="dropdown" title="{{ ts('Add Element') }}">
       <span><i class="crm-i fa-plus"></i></span>
@@ -26,7 +26,7 @@
     <div ng-switch="container.getNodeType(item)">
       <div ng-switch-when="fieldset" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-fieldset af-gui-container-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
       <div ng-switch-when="container" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-container-type-{{ item['#tag'] }}" entity-name="entityName" data-entity="{{ entityName }}" />
-      <div ng-switch-when="block" af-gui-container="item"  style="{{ item.style }}" class="af-gui-container af-gui-block" block="item['af-block']" entity-name="entityName + '-block-' + item['af-block']" data-entity="{{ entityName + '-block-' + item['af-block'] }}" />
+      <div ng-switch-when="join" af-gui-container="item"  style="{{ item.style }}" class="af-gui-container" join="item['af-join']" entity-name="entityName + '-join-' + item['af-join']" data-entity="{{ entityName + '-join-' + item['af-join'] }}" />
       <div ng-switch-when="field" af-gui-field="item" />
       <div ng-switch-when="text" af-gui-text="item" class="af-gui-element af-gui-text" />
       <div ng-switch-when="markup" af-gui-markup="item" class="af-gui-markup" />
@@ -34,11 +34,11 @@
     </div>
   </div>
 </div>
-<div ng-if="block && !(node.min === '1' && node.max === '1')" class="af-gui-button">
+<div ng-if="node['af-repeat'] || node['af-repeat'] === ''" class="af-gui-button">
   <button class="btn btn-xs btn-primary disabled">
     <span class="crm-editable-enabled" ng-click="pickAddIcon()" >
       <i class="crm-i {{ node['add-icon'] || 'fa-plus' }}"></i>
     </span>
-    <span af-gui-editable ng-model="node['add-label']">{{ node['add-label'] }}</span>
+    <span af-gui-editable ng-model="node['af-repeat']">{{ node['af-repeat'] }}</span>
   </button>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index 874fa119a448..dcc760aa0ceb 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -23,8 +23,8 @@
       <div ng-if="blockList.length">
         <label>{{ ts('Blocks') }}</label>
         <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] &gt; [ui-sortable]'}" ng-model="blockList">
-          <div ng-repeat="block in blockList" ng-class="{disabled: blockInUse(block['af-block'])}">
-            {{ editor.meta.blocks[block['#children'][0]['#tag']].title }}
+          <div ng-repeat="block in blockList" ng-class="{disabled: blockInUse(block)}">
+            {{ blockTitles[$index] }}
           </div>
         </div>
       </div>
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
index 14823d2b4272..b79d9d532fac 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformUsageTest.php
@@ -53,12 +53,12 @@ public function testAboutMeAllowed() {
       ->setArgs([])
       ->execute()
       ->indexBy('name');
-    $this->assertEquals('Logged In', $prefill['me']['values']['first_name']);
-    $this->assertRegExp('/^User/', $prefill['me']['values']['last_name']);
+    $this->assertEquals('Logged In', $prefill['me']['values'][0]['fields']['first_name']);
+    $this->assertRegExp('/^User/', $prefill['me']['values'][0]['fields']['last_name']);
 
     $me = $prefill['me']['values'];
-    $me['first_name'] = 'Firsty';
-    $me['last_name'] = 'Lasty';
+    $me[0]['fields']['first_name'] = 'Firsty';
+    $me[0]['fields']['last_name'] = 'Lasty';
 
     Civi\Api4\Afform::submit()
       ->setName($this->formName)

From 0406c8f9babc630b2c85fb14875329462a91ee15 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 29 Dec 2019 23:29:18 -0500
Subject: [PATCH 595/834] GUI - present Individual/Organization/Household as
 seperate entities

Also adds per-contact-type default name blocks.
---
 .../core/ang/blockNameHousehold.aff.html      |  4 +
 .../core/ang/blockNameHousehold.aff.json      |  4 +
 .../core/ang/blockNameIndividual.aff.json     |  2 +-
 .../core/ang/blockNameOrganization.aff.html   |  5 +
 .../core/ang/blockNameOrganization.aff.json   |  4 +
 ext/afform/gui/afformEntities/Activity.php    |  6 ++
 ext/afform/gui/afformEntities/Household.php   | 12 +++
 ext/afform/gui/afformEntities/Individual.php  | 12 +++
 .../gui/afformEntities/Organization.php       | 12 +++
 ext/afform/gui/afform_gui.php                 | 92 +++++++++++--------
 ext/afform/gui/ang/afGuiEditor.js             | 51 ++++++----
 ext/afform/gui/ang/afGuiEditor/entity.html    |  8 +-
 ext/afform/gui/ang/afGuiEditor/palette.html   |  4 +-
 13 files changed, 149 insertions(+), 67 deletions(-)
 create mode 100644 ext/afform/core/ang/blockNameHousehold.aff.html
 create mode 100644 ext/afform/core/ang/blockNameHousehold.aff.json
 create mode 100644 ext/afform/core/ang/blockNameOrganization.aff.html
 create mode 100644 ext/afform/core/ang/blockNameOrganization.aff.json
 create mode 100644 ext/afform/gui/afformEntities/Activity.php
 create mode 100644 ext/afform/gui/afformEntities/Household.php
 create mode 100644 ext/afform/gui/afformEntities/Individual.php
 create mode 100644 ext/afform/gui/afformEntities/Organization.php

diff --git a/ext/afform/core/ang/blockNameHousehold.aff.html b/ext/afform/core/ang/blockNameHousehold.aff.html
new file mode 100644
index 000000000000..a4f7a4cb7a7e
--- /dev/null
+++ b/ext/afform/core/ang/blockNameHousehold.aff.html
@@ -0,0 +1,4 @@
+<div class="af-container af-layout-inline">
+  <af-field name="household_name" />
+  <af-field name="nick_name" />
+</div>
diff --git a/ext/afform/core/ang/blockNameHousehold.aff.json b/ext/afform/core/ang/blockNameHousehold.aff.json
new file mode 100644
index 000000000000..dc0847fc135d
--- /dev/null
+++ b/ext/afform/core/ang/blockNameHousehold.aff.json
@@ -0,0 +1,4 @@
+{
+  "title": "Household Name (default)",
+  "block": "Household"
+}
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.json b/ext/afform/core/ang/blockNameIndividual.aff.json
index 9a328cac39fa..3d05402fb088 100644
--- a/ext/afform/core/ang/blockNameIndividual.aff.json
+++ b/ext/afform/core/ang/blockNameIndividual.aff.json
@@ -1,4 +1,4 @@
 {
   "title": "Individual Name (default)",
-  "block": "Contact"
+  "block": "Individual"
 }
diff --git a/ext/afform/core/ang/blockNameOrganization.aff.html b/ext/afform/core/ang/blockNameOrganization.aff.html
new file mode 100644
index 000000000000..6ab5eb2b49d0
--- /dev/null
+++ b/ext/afform/core/ang/blockNameOrganization.aff.html
@@ -0,0 +1,5 @@
+<div class="af-container af-layout-inline">
+  <af-field name="organization_name" />
+  <af-field name="legal_name" />
+  <af-field name="nick_name" />
+</div>
diff --git a/ext/afform/core/ang/blockNameOrganization.aff.json b/ext/afform/core/ang/blockNameOrganization.aff.json
new file mode 100644
index 000000000000..34ab2fd53d6b
--- /dev/null
+++ b/ext/afform/core/ang/blockNameOrganization.aff.json
@@ -0,0 +1,4 @@
+{
+  "title": "Organization Name (default)",
+  "block": "Organization"
+}
diff --git a/ext/afform/gui/afformEntities/Activity.php b/ext/afform/gui/afformEntities/Activity.php
new file mode 100644
index 000000000000..4d362f1fdac3
--- /dev/null
+++ b/ext/afform/gui/afformEntities/Activity.php
@@ -0,0 +1,6 @@
+<?php
+return [
+  'entity' => 'Activity',
+  'label' => ts('Activity'),
+  'defaults' => "{'url-autofill': '1'}",
+];
diff --git a/ext/afform/gui/afformEntities/Household.php b/ext/afform/gui/afformEntities/Household.php
new file mode 100644
index 000000000000..0788e51fe1c8
--- /dev/null
+++ b/ext/afform/gui/afformEntities/Household.php
@@ -0,0 +1,12 @@
+<?php
+return [
+  'entity' => 'Contact',
+  'contact_type' => 'Household',
+  'defaults' => "{
+    data: {
+      contact_type: 'Household',
+      source: afform.title
+    },
+    'url-autofill': '1'
+  }",
+];
diff --git a/ext/afform/gui/afformEntities/Individual.php b/ext/afform/gui/afformEntities/Individual.php
new file mode 100644
index 000000000000..626518f3bf65
--- /dev/null
+++ b/ext/afform/gui/afformEntities/Individual.php
@@ -0,0 +1,12 @@
+<?php
+return [
+  'entity' => 'Contact',
+  'contact_type' => 'Individual',
+  'defaults' => "{
+    data: {
+      contact_type: 'Individual',
+      source: afform.title
+    },
+    'url-autofill': '1'
+  }",
+];
diff --git a/ext/afform/gui/afformEntities/Organization.php b/ext/afform/gui/afformEntities/Organization.php
new file mode 100644
index 000000000000..358dcf3cda0f
--- /dev/null
+++ b/ext/afform/gui/afformEntities/Organization.php
@@ -0,0 +1,12 @@
+<?php
+return [
+  'entity' => 'Contact',
+  'contact_type' => 'Organization',
+  'defaults' => "{
+    data: {
+      contact_type: 'Organization',
+      source: afform.title
+    },
+    'url-autofill': '1'
+  }",
+];
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index db98953764d8..040fc2e1a8de 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -162,27 +162,51 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     return;
   }
 
-  $entityWhitelist = $data = [];
+  $getFieldParams = [
+    'checkPermissions' => FALSE,
+    'includeCustom' => TRUE,
+    'loadOptions' => TRUE,
+    'action' => 'create',
+    'select' => ['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize', 'data_type'],
+    'where' => [['input_type', 'IS NOT NULL']],
+  ];
 
-  // First scan the entityDefaults directory for our list of supported entities
-  // FIXME: Need a way to load this from other extensions too
-  foreach (glob(__DIR__ . '/ang/afGuiEditor/entityDefaults/*.json') as $file) {
-    $matches = [];
-    preg_match('/([-a-z_A-Z0-9]*).json/', $file, $matches);
-    $entityWhitelist[] = $entity = $matches[1];
-    // No json_decode, the files are not strict json and will go through angular.$parse clientside
-    $data['defaults'][$entity] = trim(CRM_Utils_JS::stripComments(file_get_contents($file)));
-  }
+  $data = [
+    'entities' => [
+      'Contact' => [
+        'entity' => 'Contact',
+        'label' => ts('Contact'),
+        'fields' => (array) civicrm_api4('Contact', 'getFields', $getFieldParams, 'name'),
+      ],
+    ],
+    'blocks' => [],
+  ];
 
-  // Load main entities
-  $data['entities'] = (array) Civi\Api4\Entity::get()
-    ->setCheckPermissions(FALSE)
-    ->setSelect(['name', 'description'])
-    ->addWhere('name', 'IN', $entityWhitelist)
-    ->execute();
+  $contactTypes = CRM_Contact_BAO_ContactType::basicTypeInfo();
+
+  // Scan all extensions for our list of supported entities
+  foreach (CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles() as $ext) {
+    $dir = CRM_Utils_File::addTrailingSlash(dirname($ext['filePath'])) . 'afformEntities';
+    if (is_dir($dir)) {
+      foreach (glob($dir . '/*.php') as $file) {
+        $entity = include $file;
+        // Skip disabled contact types
+        if (!empty($entity['contact_type']) && !isset($contactTypes[$entity['contact_type']])) {
+          continue;
+        }
+        if (!empty($entity['contact_type'])) {
+          $entity['label'] = $contactTypes[$entity['contact_type']]['label'];
+        }
+        // For Contact pseudo-entities (Individual, Organization, Household)
+        $values = array_intersect_key($entity, ['contact_type' => NULL]);
+        $afformEntity = $entity['contact_type'] ?? $entity['entity'];
+        $entity['fields'] = (array) civicrm_api4($entity['entity'], 'getFields', $getFieldParams + ['values' => $values], 'name');
+        $data['entities'][$afformEntity] = $entity;
+      }
+    }
+  }
 
   // Load blocks
-  $data['blocks'] = [];
   $blockData = \Civi\Api4\Afform::get()
     ->setCheckPermissions(FALSE)
     ->addWhere('block', 'IS NOT NULL')
@@ -191,8 +215,11 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     ->setLayoutFormat('shallow')
     ->execute();
   foreach ($blockData as $block) {
-    if (!empty($block['join']) && !in_array($block['join'], $entityWhitelist)) {
-      $entityWhitelist[] = $block['join'];
+    if (!empty($block['join']) && !isset($data['entities'][$block['join']]['fields'])) {
+      $data['entities'][$block['join']]['entity'] = $block['join'];
+      // Normally you shouldn't pass variables to ts() but very common strings like "Email" should already exist
+      $data['entities'][$block['join']]['label'] = ts($block['join']);
+      $data['entities'][$block['join']]['fields'] = (array) civicrm_api4($block['join'], 'getFields', $getFieldParams, 'name');
     }
     $data['blocks'][_afform_angular_module_name($block['name'], 'dash')] = $block;
   }
@@ -239,34 +266,19 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     ],
   ];
 
-  $getFieldParams = [
-    'checkPermissions' => FALSE,
-    'includeCustom' => TRUE,
-    'loadOptions' => TRUE,
-    'action' => 'create',
-    'select' => ['name', 'title', 'input_type', 'input_attrs', 'required', 'options', 'help_pre', 'help_post', 'serialize', 'data_type'],
-    'where' => [['input_type', 'IS NOT NULL']],
-  ];
-
-  // Get fields for main entities + joined entities
-  foreach (array_unique($entityWhitelist) as $entityName) {
-    $data['fields'][$entityName] = (array) civicrm_api4($entityName, 'getFields', $getFieldParams, 'name');
-
-    // TODO: Teach the api to return options in this format
-    foreach ($data['fields'][$entityName] as $name => $field) {
+  // Reformat options
+  // TODO: Teach the api to return options in this format
+  foreach ($data['entities'] as $entityName => $entity) {
+    foreach ($entity['fields'] as $name => $field) {
       if (!empty($field['options'])) {
-        $data['fields'][$entityName][$name]['options'] = CRM_Utils_Array::makeNonAssociative($field['options'], 'key', 'label');
+        $data['entities'][$entityName]['fields'][$name]['options'] = CRM_Utils_Array::makeNonAssociative($field['options'], 'key', 'label');
       }
       else {
-        unset($data['fields'][$entityName][$name]['options']);
+        unset($data['entities'][$entityName]['fields'][$name]['options']);
       }
     }
   }
 
-  // Now adjust the field metadata
-  // FIXME: This should probably be a callback event or something to allow extensions to tweak the metadata for their entities
-  $data['fields']['Contact']['contact_type']['required_data'] = TRUE;
-
   // Scan for input types
   // FIXME: Need a way to load this from other extensions too
   foreach (glob(__DIR__ . '/ang/afGuiEditor/inputType/*.html') as $file) {
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 2297fcbafa15..39bdca95c227 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -51,7 +51,7 @@
         else {
           $timeout(function() {
             initialize(_.cloneDeep(newForm));
-            editor.addEntity('Contact');
+            editor.addEntity('Individual');
             $scope.layout['#children'].push({
               "#tag": "button",
               "class": 'af-button btn btn-primary',
@@ -79,38 +79,42 @@
           }, true);
         }
 
-        this.addEntity = function(entityType) {
-          var existingEntitiesofThisType = _.map(_.filter($scope.entities, {type: entityType}), 'name'),
-            num = existingEntitiesofThisType.length + 1;
+        this.addEntity = function(type) {
+          var meta = editor.meta.entities[type],
+            num = 1;
           // Give this new entity a unique name
-          while (_.contains(existingEntitiesofThisType, entityType + num)) {
+          while (!!$scope.entities[type + num]) {
             num++;
           }
-          $scope.entities[entityType + num] = _.assign($parse(this.meta.defaults[entityType])($scope), {
+          $scope.entities[type + num] = _.assign($parse(meta.defaults)($scope), {
             '#tag': 'af-entity',
-            type: entityType,
-            name: entityType + num,
-            label: entityType + ' ' + num
+            type: meta.entity,
+            name: type + num,
+            label: meta.label + ' ' + num
           });
           // Add this af-entity tag after the last existing one
           var pos = 1 + _.findLastIndex($scope.layout['#children'], {'#tag': 'af-entity'});
-          $scope.layout['#children'].splice(pos, 0, $scope.entities[entityType + num]);
+          $scope.layout['#children'].splice(pos, 0, $scope.entities[type + num]);
           // Create a new af-fieldset container for the entity
           var fieldset = {
             '#tag': 'fieldset',
-            'af-fieldset': entityType + num,
+            'af-fieldset': type + num,
             '#children': [
               {
                 '#tag': 'legend',
                 'class': 'af-text',
                 '#children': [
                   {
-                    '#text': entityType + ' ' + num
+                    '#text': meta.label + ' ' + num
                   }
                 ]
               }
             ]
           };
+          // Add default contact name block
+          if (meta.entity === 'Contact') {
+            fieldset['#children'].push({'#tag': 'block-name-' + type.toLowerCase()});
+          }
           // Attempt to place the new af-fieldset after the last one on the form
           pos = 1 + _.findLastIndex($scope.layout['#children'], 'af-fieldset');
           if (pos) {
@@ -118,7 +122,7 @@
           } else {
             $scope.layout['#children'].push(fieldset);
           }
-          return entityType + num;
+          return type + num;
         };
 
         this.removeEntity = function(entityName) {
@@ -133,14 +137,14 @@
         };
 
         this.getField = function(entityType, fieldName) {
-          return $scope.meta.fields[entityType][fieldName];
+          return $scope.meta.entities[entityType].fields[fieldName];
         };
 
         this.getEntity = function(entityName) {
           return $scope.entities[entityName];
         };
 
-        this.getselectedEntityName = function() {
+        this.getSelectedEntityName = function() {
           return $scope.selectedEntityName;
         };
 
@@ -244,10 +248,15 @@
         $scope.elementList = [];
         $scope.elementTitles = [];
 
+        $scope.getMeta = function() {
+          var type = $scope.entity.type === 'Contact' ? $scope.entity.data.contact_type : $scope.entity.type;
+          return $scope.editor ? $scope.editor.meta.entities[type] : {};
+        };
+
         $scope.valuesFields = function() {
-          var fields = $scope.editor ? _.transform($scope.editor.meta.fields[$scope.entity.type], function(fields, field) {
+          var fields = _.transform($scope.getMeta().fields, function(fields, field) {
             fields.push({id: field.name, text: field.title, disabled: $scope.fieldInUse(field.name)});
-          }, []) : [];
+          }, []);
           return {results: fields};
         };
 
@@ -264,7 +273,7 @@
 
         function buildFieldList(search) {
           $scope.fieldList.length = 0;
-          _.each($scope.editor.meta.fields[$scope.entity.type], function(field) {
+          _.each($scope.getMeta().fields, function(field) {
             if (!search || _.contains(field.name, search) || _.contains(field.title.toLowerCase(), search)) {
               $scope.fieldList.push({
                 "#tag": "af-field",
@@ -278,7 +287,9 @@
           $scope.blockList.length = 0;
           $scope.blockTitles.length = 0;
           _.each($scope.editor.meta.blocks, function(block, directive) {
-            if (!search || _.contains(directive, search) || _.contains(block.name.toLowerCase(), search) || _.contains(block.title.toLowerCase(), search)) {
+            if ((!search || _.contains(directive, search) || _.contains(block.name.toLowerCase(), search) || _.contains(block.title.toLowerCase(), search)) &&
+              (block.block === '*' || block.block === $scope.entity.type || ($scope.entity.type === 'Contact' && block.block === $scope.entity.data.contact_type))
+            ) {
               var item = {"#tag": block.join ? "div" : directive};
               if (block.join) {
                 item['af-join'] = block.join;
@@ -418,7 +429,7 @@
         };
 
         $scope.isSelectedFieldset = function(entityName) {
-          return entityName === $scope.editor.getselectedEntityName();
+          return entityName === $scope.editor.getSelectedEntityName();
         };
 
         $scope.selectEntity = function() {
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index dcc760aa0ceb..e89dfc220dd7 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -1,10 +1,10 @@
 <div class="af-gui-columns">
   <fieldset class="af-gui-entity-values">
     <legend>{{ ts('Values:') }}</legend>
-    <div class="form-inline" ng-if="entity.data" ng-repeat="(fieldName, value) in entity.data">
-      <label>{{ editor.getField(entity.type, fieldName).title }}:</label><br />
+    <div class="form-inline" ng-if="getMeta().fields[fieldName]" ng-repeat="(fieldName, value) in entity.data">
+      <label>{{ getMeta().fields[fieldName].title }}:</label><br />
       <input class="form-control" af-gui-field-value="editor.getField(entity.type, fieldName)" ng-model="entity.data[fieldName]" />
-      <a href class="" ng-click="removeValue(entity, fieldName)" ng-if="!editor.getField(entity.type, fieldName).required_data">
+      <a href ng-click="removeValue(entity, fieldName)">
         <i class="crm-i fa-times"></i>
       </a>
     </div>
@@ -48,7 +48,7 @@
   </fieldset>
 </div>
 
-<a href ng-click="editor.removeEntity(entity.name)" class="btn btn-sm btn-danger-outline af-gui-remove-entity" title="{{ ts('Remove %1', {1: entity.type}) }}">
+<a href ng-click="editor.removeEntity(entity.name)" class="btn btn-sm btn-danger-outline af-gui-remove-entity" title="{{ ts('Remove %1', {1: getMeta().label}) }}">
   <i class="crm-i fa-trash"></i>
 </a>
 
diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/gui/ang/afGuiEditor/palette.html
index 43c7bf407991..e5855b8eb47c 100644
--- a/ext/afform/gui/ang/afGuiEditor/palette.html
+++ b/ext/afform/gui/ang/afGuiEditor/palette.html
@@ -15,8 +15,8 @@
           <span><i class="crm-i fa-plus"></i></span>
         </a>
         <ul class="dropdown-menu">
-          <li ng-repeat="entity in meta.entities">
-            <a href ng-click="addEntity(entity.name)">{{ entity.name }}</a>
+          <li ng-repeat="(entityName, entity) in meta.entities" ng-if="entity.defaults">
+            <a href ng-click="addEntity(entityName)">{{ entity.label }}</a>
           </li>
         </ul>
       </li>

From 21dff7043ff319bc33df96de760ceced517ff620 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 31 Dec 2019 12:45:00 -0500
Subject: [PATCH 596/834] Implement Address block with chainSelect state/county

---
 ext/afform/core/ang/af/Field.js               | 24 ++++++++++++++++++-
 ext/afform/core/ang/af/Fieldset.js            |  3 +++
 ext/afform/core/ang/af/Join.js                |  3 +++
 ext/afform/core/ang/af/Repeat.js              | 11 ++++++++-
 .../core/ang/af/fields/ChainSelect.html       |  1 +
 .../core/ang/blockAddressDefault.aff.html     | 10 ++++++++
 .../core/ang/blockAddressDefault.aff.json     |  6 +++++
 ext/afform/gui/ang/afGuiEditor.css            |  1 +
 .../afGuiEditor/inputType/ChainSelect.html    |  8 +++++++
 9 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 ext/afform/core/ang/af/fields/ChainSelect.html
 create mode 100644 ext/afform/core/ang/blockAddressDefault.aff.html
 create mode 100644 ext/afform/core/ang/blockAddressDefault.aff.json
 create mode 100644 ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html

diff --git a/ext/afform/core/ang/af/Field.js b/ext/afform/core/ang/af/Field.js
index 5bf7c9b8db67..554eb8221804 100644
--- a/ext/afform/core/ang/af/Field.js
+++ b/ext/afform/core/ang/af/Field.js
@@ -1,7 +1,7 @@
 (function(angular, $, _) {
   var id = 0;
   // Example usage: <div af-fieldset="myModel"><af-field name="do_not_email" /></div>
-  angular.module('af').directive('afField', function() {
+  angular.module('af').directive('afField', function(crmApi4) {
     return {
       restrict: 'E',
       require: ['^^afForm', '^^afFieldset', '?^^afJoin', '?^^afRepeatItem'],
@@ -30,6 +30,28 @@
             }, [])
           };
         };
+
+        // ChainSelect - watch control field & reload options as needed
+        if ($scope.defn.input_type === 'ChainSelect') {
+          $scope.$watch('dataProvider.getFieldData()[defn.input_attrs.controlField]', function(val) {
+            if (val) {
+              var params = {
+                where: [['name', '=', $scope.fieldName]],
+                select: ['options'],
+                loadOptions: true,
+                values: {}
+              };
+              params.values[$scope.defn.input_attrs.controlField] = val;
+              crmApi4($scope.dataProvider.getEntityType(), 'getFields', params, 0)
+                .then(function(data) {
+                  $scope.defn.options.length = 0;
+                  _.transform(data.options, function(options, label, key) {
+                    options.push({key: key, label: label});
+                  }, $scope.defn.options);
+                });
+            }
+          });
+        }
       }
     };
   });
diff --git a/ext/afform/core/ang/af/Fieldset.js b/ext/afform/core/ang/af/Fieldset.js
index a62483cc85f0..4294ee7c58ec 100644
--- a/ext/afform/core/ang/af/Fieldset.js
+++ b/ext/afform/core/ang/af/Fieldset.js
@@ -21,6 +21,9 @@
         this.getName = function() {
           return this.modelName;
         };
+        this.getEntityType = function() {
+          return this.afFormCtrl.getEntity(this.modelName).type;
+        };
         this.getFieldData = function() {
           var data = this.getData();
           if (!data.length) {
diff --git a/ext/afform/core/ang/af/Join.js b/ext/afform/core/ang/af/Join.js
index 35d6b350ed45..16de30079f8c 100644
--- a/ext/afform/core/ang/af/Join.js
+++ b/ext/afform/core/ang/af/Join.js
@@ -15,6 +15,9 @@
         },
         controller: function($scope) {
           var self = this;
+          this.getEntityType = function() {
+            return this.entity;
+          };
           this.getData = function() {
             var data, fieldsetData;
             if (self.repeatItem) {
diff --git a/ext/afform/core/ang/af/Repeat.js b/ext/afform/core/ang/af/Repeat.js
index 52337c927659..bb25e5f820e9 100644
--- a/ext/afform/core/ang/af/Repeat.js
+++ b/ext/afform/core/ang/af/Repeat.js
@@ -19,7 +19,7 @@
         },
         controller: function($scope) {
           this.getItems = $scope.getItems = function() {
-            var data = $scope.afJoin ? $scope.afJoin.getData() : $scope.afFieldset.getData();
+            var data = getEntityController().getData();
             while ($scope.min && data.length < $scope.min) {
               data.push(getRepeatType() === 'join' ? {} : {fields: {}, joins: {}});
             }
@@ -31,6 +31,11 @@
           }
           this.getRepeatType = getRepeatType;
 
+          function getEntityController() {
+            return $scope.afJoin || $scope.afFieldset;
+          }
+          this.getEntityController = getEntityController;
+
           $scope.addItem = function() {
             $scope.getItems().push(getRepeatType() === 'join' ? {} : {fields: {}});
           };
@@ -64,6 +69,10 @@
           this.getFieldData = function() {
             return this.afRepeat.getRepeatType() === 'join' ? this.item : this.item.fields;
           };
+
+          this.getEntityType = function() {
+            return this.afRepeat.getEntityController().getEntityType();
+          };
         }
       };
     });
diff --git a/ext/afform/core/ang/af/fields/ChainSelect.html b/ext/afform/core/ang/af/fields/ChainSelect.html
new file mode 100644
index 000000000000..a3cb1e2abd7b
--- /dev/null
+++ b/ext/afform/core/ang/af/fields/ChainSelect.html
@@ -0,0 +1 @@
+<input crm-ui-select="{data: select2Options, multiple: defn.input_attrs.multiple, placeholder: defn.input_attrs.placeholder}" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" />
diff --git a/ext/afform/core/ang/blockAddressDefault.aff.html b/ext/afform/core/ang/blockAddressDefault.aff.html
new file mode 100644
index 000000000000..76d21e406ff7
--- /dev/null
+++ b/ext/afform/core/ang/blockAddressDefault.aff.html
@@ -0,0 +1,10 @@
+<div class="af-container af-layout-inline">
+  <af-field name="street_address" />
+  <af-field name="location_type_id" />
+</div>
+<div class="af-container af-layout-inline">
+  <af-field name="city" />
+  <af-field name="state_province_id" />
+  <af-field name="country_id" />
+  <af-field name="postal_code" />
+</div>
diff --git a/ext/afform/core/ang/blockAddressDefault.aff.json b/ext/afform/core/ang/blockAddressDefault.aff.json
new file mode 100644
index 000000000000..2a26888f4a1f
--- /dev/null
+++ b/ext/afform/core/ang/blockAddressDefault.aff.json
@@ -0,0 +1,6 @@
+{
+  "title": "Address Block (default)",
+  "block": "Contact",
+  "join": "Address",
+  "repeat": true
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 9616e7434692..bfa548f3498c 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -358,6 +358,7 @@
 #afGuiEditor .af-gui-field-input-type-select .input-group-btn {
   position: initial;
 }
+#afGuiEditor .af-gui-field-input-type-chainselect .input-group .dropdown-toggle,
 #afGuiEditor .af-gui-field-input-type-select .input-group .dropdown-toggle {
   padding: 3px 11px;
 }
diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html b/ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html
new file mode 100644
index 000000000000..bca0c9474e97
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html
@@ -0,0 +1,8 @@
+<div class="form-inline">
+  <div class="input-group">
+    <input autocomplete="off" class="form-control" placeholder="{{ ts('Select') }}" title="{{ ts('Click to add placeholder text') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="{getterSetter: true}" type="text" />
+    <div class="input-group-btn">
+      <button type="button" class="btn btn-default disabled dropdown-toggle"><i class="crm-i fa-caret-down"></i></button>
+    </div>
+  </div>
+</div>

From 9633741a59a7f49f9a7a64e753a8e89f51423656 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 2 Jan 2020 22:01:19 -0500
Subject: [PATCH 597/834] GUI - Implement Save Block feature

---
 ext/afform/gui/afform_gui.php                 |  17 +-
 ext/afform/gui/ang/afGuiEditor.ang.php        |   2 +-
 ext/afform/gui/ang/afGuiEditor.js             | 172 ++++++++++++------
 .../gui/ang/afGuiEditor/container-menu.html   |   2 +
 ext/afform/gui/ang/afGuiEditor/container.html |   5 +-
 ext/afform/gui/ang/afGuiEditor/saveBlock.html |  30 +++
 6 files changed, 161 insertions(+), 67 deletions(-)
 create mode 100644 ext/afform/gui/ang/afGuiEditor/saveBlock.html

diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 040fc2e1a8de..ff9db85758c3 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -206,22 +206,19 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     }
   }
 
-  // Load blocks
+  // Load fields from entity joins
   $blockData = \Civi\Api4\Afform::get()
     ->setCheckPermissions(FALSE)
-    ->addWhere('block', 'IS NOT NULL')
-    ->setSelect(['name', 'title', 'block', 'join', 'layout', 'repeat'])
-    ->setFormatWhitespace(TRUE)
-    ->setLayoutFormat('shallow')
+    ->addWhere('join', 'IS NOT NULL')
+    ->setSelect(['join'])
     ->execute();
   foreach ($blockData as $block) {
-    if (!empty($block['join']) && !isset($data['entities'][$block['join']]['fields'])) {
+    if (!isset($data['entities'][$block['join']]['fields'])) {
       $data['entities'][$block['join']]['entity'] = $block['join'];
       // Normally you shouldn't pass variables to ts() but very common strings like "Email" should already exist
       $data['entities'][$block['join']]['label'] = ts($block['join']);
       $data['entities'][$block['join']]['fields'] = (array) civicrm_api4($block['join'], 'getFields', $getFieldParams, 'name');
     }
-    $data['blocks'][_afform_angular_module_name($block['name'], 'dash')] = $block;
   }
 
   // Todo: scan for other elements
@@ -252,15 +249,15 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
         '#markup' => FALSE,
       ],
     ],
-    'button' => [
-      'title' => ts('Button'),
+    'submit' => [
+      'title' => ts('Submit Button'),
       'element' => [
         '#tag' => 'button',
         'class' => 'af-button btn-primary',
         'crm-icon' => 'fa-check',
         'ng-click' => 'afform.submit()',
         '#children' => [
-          ['#text' => ts('Enter text')],
+          ['#text' => ts('Submit')],
         ],
       ],
     ],
diff --git a/ext/afform/gui/ang/afGuiEditor.ang.php b/ext/afform/gui/ang/afGuiEditor.ang.php
index 18459b2234b3..cea47a8d19f2 100644
--- a/ext/afform/gui/ang/afGuiEditor.ang.php
+++ b/ext/afform/gui/ang/afGuiEditor.ang.php
@@ -7,7 +7,7 @@
   ],
   'css' => ['ang/afGuiEditor.css'],
   'partials' => ['ang/afGuiEditor'],
-  'requires' => ['crmUi', 'crmUtil'],
+  'requires' => ['crmUi', 'crmUtil', 'dialogService', 'api4'],
   'settings' => [],
   'basePages' => [],
   'exports' => [
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 39bdca95c227..1a2655227d3b 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -43,36 +43,37 @@
             '#children': []
           }]
         };
-        if ($scope.afGuiEditor.name && $scope.afGuiEditor.name != '0') {
-          // Todo - show error msg if form is not found
-          crmApi4('Afform', 'get', {where: [['name', '=', $scope.afGuiEditor.name]], layoutFormat: 'shallow', formatWhitespace: true}, 0)
-            .then(initialize);
-        }
-        else {
-          $timeout(function() {
-            initialize(_.cloneDeep(newForm));
-            editor.addEntity('Individual');
-            $scope.layout['#children'].push({
-              "#tag": "button",
-              "class": 'af-button btn btn-primary',
-              "crm-icon": 'fa-check',
-              "ng-click": "afform.submit()",
-              "#children": [
-                {
-                  "#text": "Submit"
-                }
-              ]
-            });
+        // Fetch the current form plus all blocks
+        crmApi4('Afform', 'get', {where: [["OR", [["name", "=", $scope.afGuiEditor.name], ["block", "IS NOT NULL"]]]], layoutFormat: 'shallow', formatWhitespace: true})
+          .then(initialize);
+
+        // Initialize the current form + list of blocks
+        function initialize(afforms) {
+          $scope.meta.blocks = {};
+          _.each(afforms, function(form) {
+            evaluate(form.layout);
+            if (form.block) {
+              $scope.meta.blocks[_.kebabCase(form.name)] = form;
+            }
+            if (form.name === $scope.afGuiEditor.name) {
+              $scope.afform = form;
+            }
           });
-        }
-
-        function initialize(afform) {
-          $scope.afform = afform;
+          if (!$scope.afform) {
+            $scope.afform = _.cloneDeep(newForm);
+            if ($scope.afGuiEditor.name != '0') {
+              alert('Error: could not find form ' + $scope.afGuiEditor.name);
+            }
+          }
           $scope.changesSaved = 1;
           $scope.layout = findRecursive($scope.afform.layout, {'#tag': 'af-form'})[0];
-          evaluate($scope.layout['#children']);
           $scope.entities = findRecursive($scope.layout['#children'], {'#tag': 'af-entity'}, 'name');
 
+          if ($scope.afGuiEditor.name == '0') {
+            editor.addEntity('Individual');
+            $scope.layout['#children'].push($scope.meta.elements.submit.element);
+          }
+
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
           $scope.$watch('afform', function () {
             $scope.changesSaved = $scope.changesSaved === 1;
@@ -394,7 +395,7 @@
     };
   });
 
-  angular.module('afGuiEditor').directive('afGuiContainer', function() {
+  angular.module('afGuiEditor').directive('afGuiContainer', function(crmApi4, dialogService) {
     return {
       restrict: 'A',
       templateUrl: '~/afGuiEditor/container.html',
@@ -548,8 +549,7 @@
             $scope.node['#tag'] = 'div';
             $scope.node['class'] = 'af-container';
           }
-          block.override = true;
-          block.layout = null;
+          block.layout = block.directive = null;
         }
 
         $scope.layouts = {
@@ -573,13 +573,34 @@
           modifyClasses($scope.node, _.keys($scope.layouts), classes);
         };
 
+        $scope.selectBlockDirective = function() {
+          if (block.directive) {
+            block.layout = _.cloneDeep($scope.editor.meta.blocks[block.directive].layout);
+            block.original = block.directive;
+            setBlockDirective(block.directive);
+          }
+          else {
+            overrideBlockContents(block.layout);
+          }
+        };
+
         if (($scope.node['#tag'] in $scope.editor.meta.blocks) || $scope.join) {
+          initializeBlockContainer();
+        }
+
+        function initializeBlockContainer() {
+
+          // Cancel the below $watch expressions if already set
+          _.each(block.listeners, function(deregister) {
+            deregister();
+          });
 
           block = $scope.block = {
             directive: null,
             layout: null,
-            override: false,
+            original: null,
             options: [],
+            listeners: []
           };
 
           _.each($scope.editor.meta.blocks, function(blockInfo, directive) {
@@ -591,35 +612,49 @@
             }
           });
 
-          $scope.$watch('block.directive', function (directive, oldVal) {
-            if (directive && directive !== oldVal) {
-              block.layout = _.cloneDeep($scope.editor.meta.blocks[directive].layout);
-              setBlockDirective(directive);
-              block.override = false;
-            }
-            else if (!directive && oldVal) {
-              overrideBlockContents(block.layout);
-              block.override = false;
-            }
-          });
+          if (getBlockNode() && getBlockNode()['#tag'] in $scope.editor.meta.blocks) {
+            block.directive = block.original = getBlockNode()['#tag'];
+            block.layout = _.cloneDeep($scope.editor.meta.blocks[block.directive].layout);
+          }
 
-          $scope.$watch('block.layout', function (layout, oldVal) {
-            if (block.directive && !block.override && layout && layout !== oldVal && !angular.equals(layout, $scope.editor.meta.blocks[block.directive].layout)) {
+          block.listeners.push($scope.$watch('block.layout', function (layout, oldVal) {
+            if (block.directive && layout && layout !== oldVal && !angular.equals(layout, $scope.editor.meta.blocks[block.directive].layout)) {
               overrideBlockContents(block.layout);
             }
-          }, true);
-
-          $scope.$watch("node['#children']", function (children) {
-            if (getBlockNode() && getBlockNode()['#tag'] in $scope.editor.meta.blocks) {
-              block.directive = getBlockNode()['#tag'];
-              block.override = false;
-            } else if (block.directive && block.override && !block.layout && children && angular.equals(children, $scope.editor.meta.blocks[block.directive].layout)) {
-              block.layout = _.cloneDeep($scope.editor.meta.blocks[block.directive].layout);
-              $scope.node['#children'] = [{'#tag': block.directive}];
-              block.override = false;
-            }
-          }, true);
+          }, true));
         }
+
+        $scope.saveBlock = function() {
+          var options = CRM.utils.adjustDialogDefaults({
+            width: '500px',
+            height: '300px',
+            autoOpen: false,
+            title: ts('Save block')
+          });
+          var model = {
+            title: '',
+            name: null,
+            layout: $scope.node['#children']
+          };
+          if ($scope.join) {
+            model.join = $scope.join;
+          }
+          if ($scope.block && $scope.block.original) {
+            model.title = $scope.editor.meta.blocks[$scope.block.original].title;
+            model.name = $scope.editor.meta.blocks[$scope.block.original].name;
+            model.block = $scope.editor.meta.blocks[$scope.block.original].block;
+          }
+          else {
+            model.block = $scope.container.getFieldEntityType() || '*';
+          }
+          dialogService.open('saveBlockDialog', '~/afGuiEditor/saveBlock.html', model, options)
+            .then(function(block) {
+              $scope.editor.meta.blocks[_.kebabCase(block.name)] = block;
+              setBlockDirective(_.kebabCase(block.name));
+              initializeBlockContainer();
+            });
+        };
+
       },
       controller: function($scope) {
         var container = $scope.container = this;
@@ -670,6 +705,35 @@
     };
   });
 
+  angular.module('afGuiEditor').controller('afGuiSaveBlock', function($scope, crmApi4, dialogService) {
+    var ts = $scope.ts = CRM.ts(),
+      model = $scope.model,
+      original = $scope.original = {
+        title: model.title,
+        name: model.name
+      };
+    if (model.name) {
+      $scope.$watch('model.name', function(val, oldVal) {
+        if (!val && model.title === original.title) {
+          model.title += ' ' + ts('(copy)');
+        }
+        else if (val === original.name && val !== oldVal) {
+          model.title = original.title;
+        }
+      });
+    }
+    $scope.cancel = function() {
+      dialogService.cancel('saveBlockDialog');
+    };
+    $scope.save = function() {
+      $('.ui-dialog:visible').block();
+      crmApi4('Afform', 'save', {formatWhitespace: true, records: [JSON.parse(angular.toJson(model))]})
+        .then(function(result) {
+          dialogService.close('saveBlockDialog', result[0]);
+        });
+    };
+  });
+
   angular.module('afGuiEditor').directive('afGuiField', function() {
     return {
       restrict: 'A',
diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/gui/ang/afGuiEditor/container-menu.html
index 6c9b62176c37..44d25ba23933 100644
--- a/ext/afform/gui/ang/afGuiEditor/container-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/container-menu.html
@@ -3,6 +3,8 @@
 <li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
 <li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
 <li role="separator" class="divider"></li>
+<li ng-if="!node['af-fieldset'] && !block.layout"><a href ng-click="saveBlock()">{{ ts('Save as block') }}</a></li>
+<li ng-if="!node['af-fieldset'] && !block.layout" role="separator" class="divider"></li>
 <li ng-if="tags[node['#tag']]">
   <div class="af-gui-field-select-in-dropdown form-inline" ng-click="$event.stopPropagation()">
     {{ ts('Element:') }}
diff --git a/ext/afform/gui/ang/afGuiEditor/container.html b/ext/afform/gui/ang/afGuiEditor/container.html
index d620e8923234..0f71f098d396 100644
--- a/ext/afform/gui/ang/afGuiEditor/container.html
+++ b/ext/afform/gui/ang/afGuiEditor/container.html
@@ -3,10 +3,11 @@
     <span ng-if="container.getNodeType(node) == 'fieldset'">{{ editor.getEntity(entityName).label }}</span>
     <span ng-if="block">{{ join ? ts(join) + ':' : ts('Block:') }}</span>
     <span ng-if="!block">{{ tags[node['#tag']].toLowerCase() }}</span>
-    <select ng-if="block" ng-model="block.directive">
+    <select ng-if="block" ng-model="block.directive" ng-change="selectBlockDirective()">
       <option value="">{{ ts('Custom') }}</option>
-      <option value="{{ option.id }}" ng-repeat="option in block.options track by option.id">{{ option.text }}</option>
+      <option ng-value="option.id" ng-repeat="option in block.options track by option.id">{{ option.text }}</option>
     </select>
+    <button type="button" class="btn btn-default btn-xs" ng-if="block && !block.layout" ng-click="saveBlock()">{{ ts('Save...') }}</button>
     <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button pull-right" data-toggle="dropdown" title="{{ ts('Add Element') }}">
       <span><i class="crm-i fa-plus"></i></span>
     </button>
diff --git a/ext/afform/gui/ang/afGuiEditor/saveBlock.html b/ext/afform/gui/ang/afGuiEditor/saveBlock.html
new file mode 100644
index 000000000000..d652b2ea8173
--- /dev/null
+++ b/ext/afform/gui/ang/afGuiEditor/saveBlock.html
@@ -0,0 +1,30 @@
+<form id="bootstrap-theme">
+  <div ng-controller="afGuiSaveBlock">
+    <div class="alert alert-info">
+      {{ ts('Saving a container as a block allows it to be reused across forms.') }}
+    </div>
+    <div>
+      <label for="af-gui-save-block-title">{{ ts('Title:') }} <span class="crm-marker">*</span></label>
+      <input id="af-gui-save-block-title" class="form-control" ng-model="model.title" required>
+    </div>
+    <div class="form-inline" ng-if="original.name">
+      <label>
+        <input type="radio" name="save-as" ng-value="original.name" ng-model="model.name" />
+        {{ ts('Update %1', {1: original.title}) }}
+      </label>
+      &nbsp;
+      <label>
+        <input type="radio" name="save-as" ng-value="null" ng-model="model.name" />
+        {{ ts('Save new block') }}
+      </label>
+    </div>
+    <div class="alert alert-warning" ng-show="model.name">
+      {{ ts('Affects every form that uses this block, system-wide.') }}
+    </div>
+    <hr />
+    <div class="buttons pull-right">
+      <button ng-click="save()" class="btn btn-primary" ng-disabled="!model.title">{{ ts('Save') }}</button>
+      <button ng-click="cancel()" class="btn btn-danger">{{ ts('Cancel') }}</button>
+    </div>
+  </div>
+</form>

From 54dbfd0501dbb34432c20ab858229978f84f23c9 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 3 Jan 2020 15:40:39 -0500
Subject: [PATCH 598/834] GUI - Add block fields to field palette

---
 ext/afform/gui/ang/afGuiEditor.css         |  6 +++-
 ext/afform/gui/ang/afGuiEditor.js          | 35 ++++++++++++++++++----
 ext/afform/gui/ang/afGuiEditor/entity.html | 12 ++++----
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index bfa548f3498c..3399f74cd0be 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -23,6 +23,10 @@
   margin-bottom: 5px !important;
 }
 
+#afGuiEditor-palette fieldset legend {
+  height: 30px;
+}
+
 #afGuiEditor hr {
   margin-top: 15px;
   margin-bottom: 10px;
@@ -79,7 +83,7 @@
 #afGuiEditor-palette-config .af-gui-entity-palette [type=search] {
   width: 120px;
   padding: 3px 3px 3px 5px;
-  height: 22px;
+  height: 25px;
   font-weight: normal;
   position: relative;
   top: -3px;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 1a2655227d3b..609de11e2f71 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -249,9 +249,12 @@
         $scope.elementList = [];
         $scope.elementTitles = [];
 
+        function getEntityType() {
+          return $scope.entity.type === 'Contact' ? $scope.entity.data.contact_type : $scope.entity.type;
+        }
+
         $scope.getMeta = function() {
-          var type = $scope.entity.type === 'Contact' ? $scope.entity.data.contact_type : $scope.entity.type;
-          return $scope.editor ? $scope.editor.meta.entities[type] : {};
+          return $scope.editor ? $scope.editor.meta.entities[getEntityType()] : {};
         };
 
         $scope.valuesFields = function() {
@@ -274,14 +277,34 @@
 
         function buildFieldList(search) {
           $scope.fieldList.length = 0;
-          _.each($scope.getMeta().fields, function(field) {
-            if (!search || _.contains(field.name, search) || _.contains(field.title.toLowerCase(), search)) {
+          $scope.fieldList.push({
+            entityName: $scope.entity.name,
+            entityType: getEntityType(),
+            label: ts('%1 Fields', {1: $scope.getMeta().label}),
+            fields: filterFields($scope.getMeta().fields)
+          });
+
+          _.each($scope.editor.meta.entities, function(entity, entityName) {
+            if (check($scope.editor.scope.layout['#children'], {'af-join': entityName})) {
               $scope.fieldList.push({
-                "#tag": "af-field",
-                name: field.name
+                entityName: $scope.entity.name + '-join-' + entityName,
+                entityType: entityName,
+                label: ts('%1 Fields', {1: entity.label}),
+                fields: filterFields(entity.fields)
               });
             }
           });
+
+          function filterFields(fields) {
+            return _.transform(fields, function(fieldList, field) {
+              if (!search || _.contains(field.name, search) || _.contains(field.title.toLowerCase(), search)) {
+                fieldList.push({
+                  "#tag": "af-field",
+                  name: field.name
+                });
+              }
+            }, []);
+          }
         }
 
         function buildBlockList(search) {
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index e89dfc220dd7..a6c9b26aa83c 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -36,11 +36,13 @@
           </div>
         </div>
       </div>
-      <div ng-if="fieldList.length">
-        <label>{{ ts('Fields') }}</label>
-        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] &gt; [ui-sortable]'}" ng-model="fieldList">
-          <div ng-repeat="field in fieldList" ng-class="{disabled: fieldInUse(field.name)}">
-            {{ editor.getField(entity.type, field.name).title }}
+      <div ng-repeat="fieldGroup in fieldList">
+        <div ng-if="fieldGroup.fields.length">
+          <label>{{ fieldGroup.label }}</label>
+          <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + fieldGroup.entityName + '] &gt; [ui-sortable]'}" ng-model="fieldGroup.fields">
+            <div ng-repeat="field in fieldGroup.fields" ng-class="{disabled: fieldInUse(field.name)}">
+              {{ editor.getField(fieldGroup.entityType, field.name).title }}
+            </div>
           </div>
         </div>
       </div>

From ee1a7fb6c5a7ca0aa8dc419b20576ba53a10abb4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 3 Jan 2020 20:42:59 -0500
Subject: [PATCH 599/834] Rename blocks & require form name

---
 ...usehold.aff.html => afblockNameHousehold.aff.html} |  0
 ...usehold.aff.json => afblockNameHousehold.aff.json} |  0
 ...vidual.aff.html => afblockNameIndividual.aff.html} |  0
 ...vidual.aff.json => afblockNameIndividual.aff.json} |  0
 ...tion.aff.html => afblockNameOrganization.aff.html} |  0
 ...tion.aff.json => afblockNameOrganization.aff.json} |  0
 ...Default.aff.html => afjoinAddressDefault.aff.html} |  0
 ...Default.aff.json => afjoinAddressDefault.aff.json} |  0
 ...ilDefault.aff.html => afjoinEmailDefault.aff.html} |  0
 ...ilDefault.aff.json => afjoinEmailDefault.aff.json} |  2 +-
 ...ockIMDefault.aff.html => afjoinIMDefault.aff.html} |  0
 ...ockIMDefault.aff.json => afjoinIMDefault.aff.json} |  2 +-
 ...neDefault.aff.html => afjoinPhoneDefault.aff.html} |  0
 ...neDefault.aff.json => afjoinPhoneDefault.aff.json} |  2 +-
 ...Default.aff.html => afjoinWebsiteDefault.aff.html} |  0
 ...Default.aff.json => afjoinWebsiteDefault.aff.json} |  2 +-
 ext/afform/gui/ang/afGuiEditor.js                     | 11 ++++-------
 ext/afform/gui/ang/afGuiEditor/canvas.html            |  2 +-
 ext/afform/gui/ang/afGuiEditor/config-form.html       |  4 ++--
 19 files changed, 11 insertions(+), 14 deletions(-)
 rename ext/afform/core/ang/{blockNameHousehold.aff.html => afblockNameHousehold.aff.html} (100%)
 rename ext/afform/core/ang/{blockNameHousehold.aff.json => afblockNameHousehold.aff.json} (100%)
 rename ext/afform/core/ang/{blockNameIndividual.aff.html => afblockNameIndividual.aff.html} (100%)
 rename ext/afform/core/ang/{blockNameIndividual.aff.json => afblockNameIndividual.aff.json} (100%)
 rename ext/afform/core/ang/{blockNameOrganization.aff.html => afblockNameOrganization.aff.html} (100%)
 rename ext/afform/core/ang/{blockNameOrganization.aff.json => afblockNameOrganization.aff.json} (100%)
 rename ext/afform/core/ang/{blockAddressDefault.aff.html => afjoinAddressDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockAddressDefault.aff.json => afjoinAddressDefault.aff.json} (100%)
 rename ext/afform/core/ang/{blockEmailDefault.aff.html => afjoinEmailDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockEmailDefault.aff.json => afjoinEmailDefault.aff.json} (63%)
 rename ext/afform/core/ang/{blockIMDefault.aff.html => afjoinIMDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockIMDefault.aff.json => afjoinIMDefault.aff.json} (64%)
 rename ext/afform/core/ang/{blockPhoneDefault.aff.html => afjoinPhoneDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockPhoneDefault.aff.json => afjoinPhoneDefault.aff.json} (63%)
 rename ext/afform/core/ang/{blockWebsiteDefault.aff.html => afjoinWebsiteDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockWebsiteDefault.aff.json => afjoinWebsiteDefault.aff.json} (62%)

diff --git a/ext/afform/core/ang/blockNameHousehold.aff.html b/ext/afform/core/ang/afblockNameHousehold.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockNameHousehold.aff.html
rename to ext/afform/core/ang/afblockNameHousehold.aff.html
diff --git a/ext/afform/core/ang/blockNameHousehold.aff.json b/ext/afform/core/ang/afblockNameHousehold.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockNameHousehold.aff.json
rename to ext/afform/core/ang/afblockNameHousehold.aff.json
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.html b/ext/afform/core/ang/afblockNameIndividual.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockNameIndividual.aff.html
rename to ext/afform/core/ang/afblockNameIndividual.aff.html
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.json b/ext/afform/core/ang/afblockNameIndividual.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockNameIndividual.aff.json
rename to ext/afform/core/ang/afblockNameIndividual.aff.json
diff --git a/ext/afform/core/ang/blockNameOrganization.aff.html b/ext/afform/core/ang/afblockNameOrganization.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockNameOrganization.aff.html
rename to ext/afform/core/ang/afblockNameOrganization.aff.html
diff --git a/ext/afform/core/ang/blockNameOrganization.aff.json b/ext/afform/core/ang/afblockNameOrganization.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockNameOrganization.aff.json
rename to ext/afform/core/ang/afblockNameOrganization.aff.json
diff --git a/ext/afform/core/ang/blockAddressDefault.aff.html b/ext/afform/core/ang/afjoinAddressDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockAddressDefault.aff.html
rename to ext/afform/core/ang/afjoinAddressDefault.aff.html
diff --git a/ext/afform/core/ang/blockAddressDefault.aff.json b/ext/afform/core/ang/afjoinAddressDefault.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockAddressDefault.aff.json
rename to ext/afform/core/ang/afjoinAddressDefault.aff.json
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.html b/ext/afform/core/ang/afjoinEmailDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockEmailDefault.aff.html
rename to ext/afform/core/ang/afjoinEmailDefault.aff.html
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.json b/ext/afform/core/ang/afjoinEmailDefault.aff.json
similarity index 63%
rename from ext/afform/core/ang/blockEmailDefault.aff.json
rename to ext/afform/core/ang/afjoinEmailDefault.aff.json
index 107756e1c15b..b09da6a075b7 100644
--- a/ext/afform/core/ang/blockEmailDefault.aff.json
+++ b/ext/afform/core/ang/afjoinEmailDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "Email Block (default)",
+  "title": "Email (default)",
   "block": "Contact",
   "join": "Email",
   "repeat": true
diff --git a/ext/afform/core/ang/blockIMDefault.aff.html b/ext/afform/core/ang/afjoinIMDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockIMDefault.aff.html
rename to ext/afform/core/ang/afjoinIMDefault.aff.html
diff --git a/ext/afform/core/ang/blockIMDefault.aff.json b/ext/afform/core/ang/afjoinIMDefault.aff.json
similarity index 64%
rename from ext/afform/core/ang/blockIMDefault.aff.json
rename to ext/afform/core/ang/afjoinIMDefault.aff.json
index 261df8a830cc..2ef6b577cba5 100644
--- a/ext/afform/core/ang/blockIMDefault.aff.json
+++ b/ext/afform/core/ang/afjoinIMDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "IM Block (default)",
+  "title": "IM (default)",
   "block": "Contact",
   "join": "IM",
   "repeat": true
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.html b/ext/afform/core/ang/afjoinPhoneDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockPhoneDefault.aff.html
rename to ext/afform/core/ang/afjoinPhoneDefault.aff.html
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.json b/ext/afform/core/ang/afjoinPhoneDefault.aff.json
similarity index 63%
rename from ext/afform/core/ang/blockPhoneDefault.aff.json
rename to ext/afform/core/ang/afjoinPhoneDefault.aff.json
index 9419dbdb17fe..c40af8dcb2ca 100644
--- a/ext/afform/core/ang/blockPhoneDefault.aff.json
+++ b/ext/afform/core/ang/afjoinPhoneDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "Phone Block (default)",
+  "title": "Phone (default)",
   "block": "Contact",
   "join": "Phone",
   "repeat": true
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.html b/ext/afform/core/ang/afjoinWebsiteDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockWebsiteDefault.aff.html
rename to ext/afform/core/ang/afjoinWebsiteDefault.aff.html
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.json b/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
similarity index 62%
rename from ext/afform/core/ang/blockWebsiteDefault.aff.json
rename to ext/afform/core/ang/afjoinWebsiteDefault.aff.json
index 71b1e68a78a2..4819bc92d848 100644
--- a/ext/afform/core/ang/blockWebsiteDefault.aff.json
+++ b/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "Website Block (default)",
+  "title": "Website (default)",
   "block": "Contact",
   "join": "Website",
   "repeat": true
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 609de11e2f71..d8316b713cb3 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -29,13 +29,10 @@
         $scope.saving = false;
         $scope.selectedEntityName = null;
         $scope.meta = this.meta = CRM.afformAdminData;
-        _.each($scope.meta.blocks, function(block) {
-          evaluate(block.layout);
-        });
         this.scope = $scope;
         var editor = $scope.editor = this;
         var newForm = {
-          title: ts('Untitled Form'),
+          title: '',
           permission: 'access CiviCRM',
           layout: [{
             '#tag': 'af-form',
@@ -62,10 +59,9 @@
           if (!$scope.afform) {
             $scope.afform = _.cloneDeep(newForm);
             if ($scope.afGuiEditor.name != '0') {
-              alert('Error: could not find form ' + $scope.afGuiEditor.name);
+              alert('Error: unknown form "' + $scope.afGuiEditor.name + '"');
             }
           }
-          $scope.changesSaved = 1;
           $scope.layout = findRecursive($scope.afform.layout, {'#tag': 'af-form'})[0];
           $scope.entities = findRecursive($scope.layout['#children'], {'#tag': 'af-entity'}, 'name');
 
@@ -75,6 +71,7 @@
           }
 
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
+          $scope.changesSaved = $scope.afGuiEditor.name == '0' ? false : 1;
           $scope.$watch('afform', function () {
             $scope.changesSaved = $scope.changesSaved === 1;
           }, true);
@@ -114,7 +111,7 @@
           };
           // Add default contact name block
           if (meta.entity === 'Contact') {
-            fieldset['#children'].push({'#tag': 'block-name-' + type.toLowerCase()});
+            fieldset['#children'].push({'#tag': 'afblock-name-' + type.toLowerCase()});
           }
           // Attempt to place the new af-fieldset after the last one on the form
           pos = 1 + _.findLastIndex($scope.layout['#children'], 'af-fieldset');
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 5dbad937dcab..10e3950b0504 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -2,7 +2,7 @@
   <div class="panel-heading">
     <form class="form-inline">
       <div class="btn-group btn-group-md pull-right">
-        <button class="btn" ng-class="{'btn-primary': !changesSaved && !saving, 'btn-warning': saving, 'btn-success': changesSaved}" ng-disabled="changesSaved || saving" ng-click="save()">
+        <button type="submit" class="btn" ng-class="{'btn-primary': !changesSaved && !saving, 'btn-warning': saving, 'btn-success': changesSaved}" ng-disabled="changesSaved || saving || !afform.title" ng-click="save()">
           <i class="crm-i" ng-class="{'fa-check': !saving, 'fa-spin fa-spinner': saving}"></i>
           <span ng-if="changesSaved && !saving">{{ ts('Saved') }}</span>
           <span ng-if="!changesSaved && !saving">{{ ts('Save') }}</span>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index 8b602aee3180..a3169e8bb204 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -1,7 +1,7 @@
 <label for="af_config_form_title">
-  {{ ts('Title:') }}
+  {{ ts('Title:') }} <span class="crm-marker">*</span>
 </label>
-<input ng-model="afform.title" class="form-control" id="af_config_form_title" />
+<input ng-model="afform.title" class="form-control" id="af_config_form_title" required />
 <label for="af_config_form_description">
   {{ ts('Description:') }}
 </label>

From eb4f581a3eda578aaf45f2691b9de73924117d15 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 4 Jan 2020 15:13:00 -0500
Subject: [PATCH 600/834] Fix loading fields for contact type blocks

---
 ext/afform/core/afform.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 8502faeb120a..ab90805ae04f 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -354,13 +354,17 @@ function afform_civicrm_alterAngular($angular) {
  * @throws API_Exception
  */
 function _af_fill_field_metadata($entityType, DOMElement $afField) {
-  $fieldName = $afField->getAttribute('name');
-  $getFields = civicrm_api4($entityType, 'getFields', [
+  $params = [
     'action' => 'create',
-    'where' => [['name', '=', $fieldName]],
+    'where' => [['name', '=', $afField->getAttribute('name')]],
     'select' => ['title', 'input_type', 'input_attrs', 'options'],
     'loadOptions' => TRUE,
-  ]);
+  ];
+  if (in_array($entityType, CRM_Contact_BAO_ContactType::basicTypes(TRUE))) {
+    $params['values'] = ['contact_type' => $entityType];
+    $entityType = 'Contact';
+  }
+  $getFields = civicrm_api4($entityType, 'getFields', $params);
   // Merge field definition data with whatever's already in the markup
   $deep = ['input_attrs'];
   foreach ($getFields as $fieldInfo) {

From e9dc7ca500fc71d6643c13052eb844680dfab640 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 4 Jan 2020 21:10:11 -0500
Subject: [PATCH 601/834] Improve drag-n-drop placeholder & validation

---
 ext/afform/gui/afform_gui.php                 | 18 +++++
 ext/afform/gui/ang/afGuiEditor.css            |  8 +-
 ext/afform/gui/ang/afGuiEditor.js             | 74 ++++++++-----------
 ext/afform/gui/ang/afGuiEditor/canvas.html    |  2 +-
 ext/afform/gui/ang/afGuiEditor/container.html |  2 +-
 ext/afform/gui/ang/afGuiEditor/entity.html    |  6 +-
 6 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index ff9db85758c3..8f0effff6479 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -261,6 +261,24 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
         ],
       ],
     ],
+    'fieldset' => [
+      'title' => ts('Fieldset'),
+      'element' => [
+        '#tag' => 'fieldset',
+        'af-fieldset' => NULL,
+        '#children' => [
+          [
+            '#tag' => 'legend',
+            'class' => 'af-text',
+            '#children' => [
+              [
+                '#text' => ts('Enter title'),
+              ],
+            ],
+          ],
+        ],
+      ],
+    ],
   ];
 
   // Reformat options
diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 3399f74cd0be..7848835d6ab0 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -124,7 +124,7 @@
   opacity: 1;
   transition: opacity .2s;
 }
-#afGuiEditor-canvas .panel-body > div > .af-gui-bar {
+#afGuiEditor-canvas-body > div > .af-gui-bar {
   top: -5px;
 }
 
@@ -483,3 +483,9 @@
 #afGuiEditor [af-gui-edit-options] h5 {
   margin-left: 20px;
 }
+
+#afGuiEditor .af-gui-dropzone {
+  background-color: #e9eeff;
+  border: 2px solid #0071bd;
+  min-height: 30px;
+}
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index d8316b713cb3..37336c281055 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -94,21 +94,9 @@
           var pos = 1 + _.findLastIndex($scope.layout['#children'], {'#tag': 'af-entity'});
           $scope.layout['#children'].splice(pos, 0, $scope.entities[type + num]);
           // Create a new af-fieldset container for the entity
-          var fieldset = {
-            '#tag': 'fieldset',
-            'af-fieldset': type + num,
-            '#children': [
-              {
-                '#tag': 'legend',
-                'class': 'af-text',
-                '#children': [
-                  {
-                    '#text': meta.label + ' ' + num
-                  }
-                ]
-              }
-            ]
-          };
+          var fieldset = _.cloneDeep(editor.meta.elements.fieldset.element);
+          fieldset['af-fieldset'] = type + num;
+          fieldset['#children'][0]['#children'][0]['#text'] = meta.label + ' ' + num;
           // Add default contact name block
           if (meta.entity === 'Contact') {
             fieldset['#children'].push({'#tag': 'afblock-name-' + type.toLowerCase()});
@@ -146,6 +134,28 @@
           return $scope.selectedEntityName;
         };
 
+        // Validates that a drag-n-drop action is allowed
+        this.onDrop = function(event, ui) {
+          var sort = ui.item.sortable;
+          // Check if this is a callback for an item dropped into a different container
+          // @see https://github.com/angular-ui/ui-sortable notes on canceling
+          if (!sort.received && sort.source[0] !== sort.droptarget[0]) {
+            var $source = $(sort.source[0]),
+              $target = $(sort.droptarget[0]),
+              $item = $(ui.item[0]);
+            // Fields cannot be dropped outside their own entity
+            if ($item.is('[af-gui-field]') || $item.has('[af-gui-field]').length) {
+              if ($source.closest('[data-entity]').attr('data-entity') !== $target.closest('[data-entity]').attr('data-entity')) {
+                return sort.cancel();
+              }
+            }
+            // Entity-fieldsets cannot be dropped into other entity-fieldsets
+            if ((sort.model['af-fieldset'] || $item.has('.af-gui-fieldset').length) && $target.closest('.af-gui-fieldset').length) {
+              return sort.cancel();
+            }
+          }
+        };
+
         $scope.addEntity = function(entityType) {
           var entityName = editor.addEntity(entityType);
           editor.selectEntity(entityName);
@@ -334,8 +344,12 @@
           $scope.elementTitles.length = 0;
           _.each($scope.editor.meta.elements, function(element, name) {
             if (!search || _.contains(name, search) || _.contains(element.title.toLowerCase(), search)) {
-              $scope.elementList.push(_.cloneDeep(element.element));
-              $scope.elementTitles.push(element.title);
+              var node = _.cloneDeep(element.element);
+              if (name === 'fieldset') {
+                node['af-fieldset'] = $scope.entity.name;
+              }
+              $scope.elementList.push(node);
+              $scope.elementTitles.push(name === 'fieldset' ? ts('Fieldset for %1', {1: $scope.entity.label}) : element.title);
             }
           });
         }
@@ -459,32 +473,6 @@
           }
         };
 
-        // Validates that a drag-n-drop action is allowed
-        $scope.onDrop = function(event, ui) {
-          var sort = ui.item.sortable;
-          // Check if this is a callback for an item dropped into a different container
-          // @see https://github.com/angular-ui/ui-sortable notes on canceling
-          if (!sort.received && sort.source[0] !== sort.droptarget[0]) {
-            var $source = $(sort.source[0]),
-              $target = $(sort.droptarget[0]),
-              $item = $(ui.item[0]);
-            // Dropping onto palette is ok; works like a trash can
-            if ($target.closest('#afGuiEditor-palette-config').length) {
-              return;
-            }
-            // Fields cannot be dropped outside their own entity
-            if ($item.is('[af-gui-field]') || $item.has('[af-gui-field]').length) {
-              if ($source.closest('[data-entity]').attr('data-entity') !== $target.closest('[data-entity]').attr('data-entity')) {
-                return sort.cancel();
-              }
-            }
-            // Entity-fieldsets cannot be dropped into other entity-fieldsets
-            if (($item.hasClass('af-gui-fieldset') || $item.has('.af-gui-fieldset').length) && $target.closest('.af-gui-fieldset').length) {
-              return sort.cancel();
-            }
-          }
-        };
-
         $scope.tags = {
           div: ts('Container'),
           fieldset: ts('Fieldset')
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 10e3950b0504..fc2553fb9585 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -12,7 +12,7 @@
       <div>{{ ts('Form Layout') }}</div>
     </form>
   </div>
-  <div class="panel-body">
+  <div id="afGuiEditor-canvas-body" class="panel-body">
     <div ng-if="layout" af-gui-container="layout" entity-name="" />
   </div>
 </div>
diff --git a/ext/afform/gui/ang/afGuiEditor/container.html b/ext/afform/gui/ang/afGuiEditor/container.html
index 0f71f098d396..31c30b4715e3 100644
--- a/ext/afform/gui/ang/afGuiEditor/container.html
+++ b/ext/afform/gui/ang/afGuiEditor/container.html
@@ -22,7 +22,7 @@
     <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/canvas-menu.html'"></ul>
   </div>
 </div>
-<div ui-sortable="{handle: '.af-gui-bar', update: onDrop, connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a,.dropdown-menu'}" ng-model="getSetChildren" ng-model-options="{getterSetter: true}" class="af-gui-layout {{ getLayout() }}">
+<div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a,.dropdown-menu', placeholder: 'af-gui-dropzone', containment: '#afGuiEditor-canvas-body'}" ui-sortable-update="editor.onDrop" ng-model="getSetChildren" ng-model-options="{getterSetter: true}" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in getSetChildren()" >
     <div ng-switch="container.getNodeType(item)">
       <div ng-switch-when="fieldset" af-gui-container="item" style="{{ item.style }}" class="af-gui-container af-gui-fieldset af-gui-container-type-{{ item['#tag'] }}" ng-class="{'af-entity-selected': isSelectedFieldset(item['af-fieldset'])}" entity-name="item['af-fieldset']" data-entity="{{ item['af-fieldset'] }}" />
diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/gui/ang/afGuiEditor/entity.html
index a6c9b26aa83c..f709cff6bdc3 100644
--- a/ext/afform/gui/ang/afGuiEditor/entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/entity.html
@@ -22,7 +22,7 @@
     <div class="af-gui-entity-palette-select-list">
       <div ng-if="blockList.length">
         <label>{{ ts('Blocks') }}</label>
-        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] &gt; [ui-sortable]'}" ng-model="blockList">
+        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + entity.name + '] &gt; [ui-sortable]', placeholder: 'af-gui-dropzone'}" ui-sortable-update="editor.onDrop" ng-model="blockList">
           <div ng-repeat="block in blockList" ng-class="{disabled: blockInUse(block)}">
             {{ blockTitles[$index] }}
           </div>
@@ -30,7 +30,7 @@
       </div>
       <div ng-if="elementList.length">
         <label>{{ ts('Elements') }}</label>
-        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[ui-sortable]'}" ng-model="elementList">
+        <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[ui-sortable]', placeholder: 'af-gui-dropzone'}" ui-sortable-update="editor.onDrop" ng-model="elementList">
           <div ng-repeat="element in elementList" >
             {{ elementTitles[$index] }}
           </div>
@@ -39,7 +39,7 @@
       <div ng-repeat="fieldGroup in fieldList">
         <div ng-if="fieldGroup.fields.length">
           <label>{{ fieldGroup.label }}</label>
-          <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + fieldGroup.entityName + '] &gt; [ui-sortable]'}" ng-model="fieldGroup.fields">
+          <div ui-sortable="{update: buildPaletteLists, items: '&gt; div:not(.disabled)', connectWith: '[data-entity=' + fieldGroup.entityName + '] &gt; [ui-sortable]', placeholder: 'af-gui-dropzone'}" ui-sortable-update="editor.onDrop" ng-model="fieldGroup.fields">
             <div ng-repeat="field in fieldGroup.fields" ng-class="{disabled: fieldInUse(field.name)}">
               {{ editor.getField(fieldGroup.entityType, field.name).title }}
             </div>

From d6e403420b11ad49d3f8128bd892109a28080ef7 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 4 Jan 2020 22:29:20 -0500
Subject: [PATCH 602/834] GUI - simplify menus; only add items from palette

---
 ext/afform/gui/ang/afGuiEditor.css            |  9 ---------
 ext/afform/gui/ang/afGuiEditor.js             | 19 -------------------
 .../gui/ang/afGuiEditor/canvas-menu.html      |  8 --------
 .../gui/ang/afGuiEditor/container-menu.html   |  5 -----
 ext/afform/gui/ang/afGuiEditor/container.html | 12 ++----------
 5 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 ext/afform/gui/ang/afGuiEditor/canvas-menu.html

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 7848835d6ab0..139f45a3bb99 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -124,9 +124,6 @@
   opacity: 1;
   transition: opacity .2s;
 }
-#afGuiEditor-canvas-body > div > .af-gui-bar {
-  top: -5px;
-}
 
 #afGuiEditor .af-gui-bar .btn.active {
   background-color: #b3b3b3;
@@ -221,12 +218,6 @@
   left: 4px;
   top: 5px;
 }
-#afGuiEditor #afGuiEditor-canvas .af-gui-add-canvas-button {
-  border: 2px dashed #0071bd;
-  color: #0071bd;
-  padding-top: 2px;
-  padding-bottom: 2px;
-}
 #afGuiEditor .af-gui-add-element-button span {
   display: inline-block;
   width: 18px;
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 37336c281055..43fae53d2971 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -444,25 +444,6 @@
         $scope.editor = ctrls[0];
         $scope.parentContainer = ctrls[1];
 
-        $scope.addElement = function(type, props) {
-          var classes = type.split('.');
-          var element = _.defaults({
-            '#tag': classes.shift(),
-            'class': classes.join(' '),
-          }, props);
-          if (_.includes(classes, 'af-container')) {
-            element['#children'] = [];
-          } else if (_.intersection(classes, ['af-text', 'af-button']).length) {
-            element['#children'] = [{'#text': ts('Enter text')}];
-          }
-          var children = $scope.getSetChildren();
-          if (children) {
-            // Add it to the top, underneath the fieldset legend if present
-            var pos = children.length && children[0]['#tag'] === 'legend' ? 1 : 0;
-            children.splice(pos, 0, element);
-          }
-        };
-
         $scope.isSelectedFieldset = function(entityName) {
           return entityName === $scope.editor.getSelectedEntityName();
         };
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas-menu.html b/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
deleted file mode 100644
index 9d1932c7dac7..000000000000
--- a/ext/afform/gui/ang/afGuiEditor/canvas-menu.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<li><a href ng-click="addElement('div.af-container')">{{ ts('Add container') }}</a></li>
-<li><a href ng-click="addElement('p.af-text')">{{ ts('Add text box') }}</a></li>
-<li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
-<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
-<li role="separator" class="divider"></li>
-<li ng-repeat="entity in editor.scope.entities">
-  <a href ng-click="addElement('fieldset.af-container', {'af-fieldset': entity.name})">{{ ts('Fieldset for %1', {1: entity.label}) }}</a>
-</li>
diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/gui/ang/afGuiEditor/container-menu.html
index 44d25ba23933..9dcf83487a7e 100644
--- a/ext/afform/gui/ang/afGuiEditor/container-menu.html
+++ b/ext/afform/gui/ang/afGuiEditor/container-menu.html
@@ -1,8 +1,3 @@
-<li><a href ng-click="addElement('div.af-container')">{{ ts('Add container') }}</a></li>
-<li><a href ng-click="addElement('p.af-text')">{{ ts('Add text box') }}</a></li>
-<li><a href ng-click="addElement('div.af-markup', {'#markup': false})">{{ ts('Add rich content') }}</a></li>
-<li><a href ng-click="addElement('button.af-button.btn-primary', {'crm-icon': 'fa-check', 'ng-click': 'afform.submit()'})">{{ ts('Add button') }}</a></li>
-<li role="separator" class="divider"></li>
 <li ng-if="!node['af-fieldset'] && !block.layout"><a href ng-click="saveBlock()">{{ ts('Save as block') }}</a></li>
 <li ng-if="!node['af-fieldset'] && !block.layout" role="separator" class="divider"></li>
 <li ng-if="tags[node['#tag']]">
diff --git a/ext/afform/gui/ang/afGuiEditor/container.html b/ext/afform/gui/ang/afGuiEditor/container.html
index 31c30b4715e3..450b6501d7dd 100644
--- a/ext/afform/gui/ang/afGuiEditor/container.html
+++ b/ext/afform/gui/ang/afGuiEditor/container.html
@@ -8,20 +8,12 @@
       <option ng-value="option.id" ng-repeat="option in block.options track by option.id">{{ option.text }}</option>
     </select>
     <button type="button" class="btn btn-default btn-xs" ng-if="block && !block.layout" ng-click="saveBlock()">{{ ts('Save...') }}</button>
-    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button pull-right" data-toggle="dropdown" title="{{ ts('Add Element') }}">
-      <span><i class="crm-i fa-plus"></i></span>
+    <button type="button" class="btn btn-default btn-xs dropdown-toggle af-gui-add-element-button pull-right" data-toggle="dropdown" title="{{ ts('Configure') }}">
+      <span><i class="crm-i fa-gear"></i></span>
     </button>
     <ul class="dropdown-menu dropdown-menu-right" ng-if="menu.open" ng-include="'~/afGuiEditor/container-menu.html'"></ul>
   </div>
 </div>
-<div class="af-gui-bar" ng-if="node['#tag'] === 'af-form'" >
-  <div class="form-inline pull-right" af-gui-menu>
-    <button type="button" class="btn  btn-default btn-sm dropdown-toggle af-gui-add-canvas-button" data-toggle="dropdown" title="{{ ts('Add Element') }}">
-      <span>Add <i class="crm-i fa-plus"></i></span>
-    </button>
-    <ul class="dropdown-menu" ng-if="menu.open" ng-include="'~/afGuiEditor/canvas-menu.html'"></ul>
-  </div>
-</div>
 <div ui-sortable="{handle: '.af-gui-bar', connectWith: '[ui-sortable]', cancel: 'input,textarea,button,select,option,a,.dropdown-menu', placeholder: 'af-gui-dropzone', containment: '#afGuiEditor-canvas-body'}" ui-sortable-update="editor.onDrop" ng-model="getSetChildren" ng-model-options="{getterSetter: true}" class="af-gui-layout {{ getLayout() }}">
   <div ng-repeat="item in getSetChildren()" >
     <div ng-switch="container.getNodeType(item)">

From 70a14f697ebf41e6f3864270f3554778a0aed11f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 4 Jan 2020 22:30:17 -0500
Subject: [PATCH 603/834] GUI - improve menu button appearance

---
 ext/afform/gui/ang/afGuiEditor.css | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/gui/ang/afGuiEditor.css
index 139f45a3bb99..fa0d8fddc997 100644
--- a/ext/afform/gui/ang/afGuiEditor.css
+++ b/ext/afform/gui/ang/afGuiEditor.css
@@ -180,9 +180,15 @@
   opacity: 1;
   transition: opacity 0s;
 }
-#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > span {
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > button > span,
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > span {
   color: white;
 }
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > button:hover > span,
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .open > button > span,
+#afGuiEditor #afGuiEditor-canvas .af-entity-selected > .af-gui-bar > .form-inline > button:focus > span {
+  color: #0071bd;
+}
 
 #afGuiEditor [ui-sortable] {
   min-height: 25px;
@@ -218,17 +224,15 @@
   left: 4px;
   top: 5px;
 }
+#afGuiEditor .af-gui-add-element-button {
+  background-color: transparent;
+}
 #afGuiEditor .af-gui-add-element-button span {
   display: inline-block;
   width: 18px;
   height: 18px;
-  border: 2px dashed #0071bd;
   color: #0071bd;
 }
-#afGuiEditor .af-gui-add-element-button span i {
-  position: relative;
-  top: -2px;
-}
 
 #afGuiEditor .af-gui-layout-icon {
   width: 12px;

From 2e100a6bd782b47b41ef477ce06b781a96d70c73 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 5 Jan 2020 14:47:35 -0500
Subject: [PATCH 604/834] Load join blocks primary first

---
 .../Api4/Action/Afform/AbstractProcessor.php  | 31 ++++++++++++++-----
 .../core/Civi/Api4/Action/Afform/Prefill.php  |  3 +-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 416bde2d9098..74a5da495a20 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -77,15 +77,10 @@ abstract protected function processForm();
    * @throws \API_Exception
    */
   protected static function getJoinWhereClause($mainEntityName, $joinEntityName, $mainEntityId) {
-    $joinMeta = \Civi::$statics[__CLASS__][__FUNCTION__][$joinEntityName] ?? NULL;
     $params = [];
-    if (!$joinMeta) {
-      $joinMeta = civicrm_api4($joinEntityName, 'getFields', ['checkPermissions' => FALSE, 'action' => 'create', 'select' => ['name']])->column('name');
-      \Civi::$statics[__CLASS__][__FUNCTION__][$joinEntityName] = $joinMeta;
-    }
-    if (in_array('entity_id', $joinMeta)) {
+    if (self::fieldExists($joinEntityName, 'entity_id')) {
       $params[] = ['entity_id', '=', $mainEntityId];
-      if (in_array('entity_table', $joinMeta)) {
+      if (self::fieldExists($joinEntityName, 'entity_table')) {
         $params[] = ['entity_table', '=', 'civicrm_' . _civicrm_api_get_entity_name_from_camel($mainEntityName)];
       }
     }
@@ -96,4 +91,26 @@ protected static function getJoinWhereClause($mainEntityName, $joinEntityName, $
     return $params;
   }
 
+  /**
+   * Check if a field exists for a given entity
+   *
+   * @param $entityName
+   * @param $fieldName
+   * @return bool
+   * @throws \API_Exception
+   */
+  public static function fieldExists($entityName, $fieldName) {
+    if (empty(\Civi::$statics[__CLASS__][__FUNCTION__][$entityName])) {
+      $getFields = \Civi\Api4\Utils\ActionUtil::getAction($entityName, 'getFields');
+      $getFields->setCheckPermissions(FALSE);
+      $getFields->setAction('create');
+      $getFields->addSelect('name');
+      if (property_exists($getFields, 'includeCustom')) {
+        $getFields->setIncludeCustom(FALSE);
+      }
+      \Civi::$statics[__CLASS__][__FUNCTION__][$entityName] = $getFields->execute()->column('name');
+    }
+    return in_array($fieldName, \Civi::$statics[__CLASS__][__FUNCTION__][$entityName]);
+  }
+
 }
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
index dd9ba9980798..e4b93be85f42 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Prefill.php
@@ -53,10 +53,11 @@ private function loadEntity($entity, $id) {
       $data = ['fields' => $item];
       foreach ($entity['joins'] ?? [] as $joinEntity => $join) {
         $data['joins'][$joinEntity] = (array) civicrm_api4($joinEntity, 'get', [
-          'where' => $this->getJoinWhereClause($entity['type'], $joinEntity, $item['id']),
+          'where' => self::getJoinWhereClause($entity['type'], $joinEntity, $item['id']),
           'limit' => !empty($join['af-repeat']) ? $join['max'] ?? 0 : 1,
           'select' => array_keys($join['fields']),
           'checkPermissions' => $checkPermissions,
+          'orderBy' => self::fieldExists($joinEntity, 'is_primary') ? ['is_primary' => 'DESC'] : [],
         ]);
       }
       $this->_data[$entity['name']][] = $data;

From 25f2b36b5c35cb03f2c554291389905c905d6791 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 6 Jan 2020 17:45:01 -0500
Subject: [PATCH 605/834] Api - output module_name & directive_name

---
 ext/afform/core/Civi/Api4/Action/Afform/Get.php | 15 ++++++++++++++-
 ext/afform/core/Civi/Api4/Afform.php            |  8 +++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 0f2dda46bd8b..beeca1179721 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -22,14 +22,27 @@ public function getRecords() {
     $toGet = $this->_itemsToGet('name');
     $names = $toGet ?? array_keys($scanner->findFilePaths());
 
+    // Optimize lookups by module/directive name
+    if (!$toGet) {
+      $moduleNames = $this->_itemsToGet('module_name');
+      $directiveNames = $this->_itemsToGet('directive_name');
+    }
+
     $values = $this->getAutoGenerated($names, $toGet, $getLayout);
 
     foreach ($names as $name) {
+      $info = [
+        'module_name' => _afform_angular_module_name($name, 'camel'),
+        'directive_name' => _afform_angular_module_name($name, 'dash'),
+      ];
+      if (($moduleNames && !in_array($info['module_name'], $moduleNames)) || ($directiveNames && !in_array($info['directive_name'], $directiveNames))) {
+        continue;
+      }
       $record = $scanner->getMeta($name);
       if (!$record && !isset($values[$name])) {
         continue;
       }
-      $values[$name] = array_merge($values[$name] ?? [], $record ?? []);
+      $values[$name] = array_merge($values[$name] ?? [], $record ?? [], $info);
       if ($getComputed) {
         $scanner->addComputedFields($values[$name]);
       }
diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index f289477b8df6..40dbbe763761 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -7,7 +7,7 @@
 use Civi\Api4\Generic\BasicGetFieldsAction;
 
 /**
- * Class Afform
+ * User-configurable forms
  * @package Civi\Api4
  */
 class Afform extends AbstractEntity {
@@ -126,6 +126,12 @@ public static function getFields() {
       ];
 
       if ($self->getAction() === 'get') {
+        $fields[] = [
+          'name' => 'module_name',
+        ];
+        $fields[] = [
+          'name' => 'directive_name',
+        ];
         $fields[] = [
           'name' => 'has_local',
         ];

From edf837b4cf8f0227f768246327005c92bebd6630 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 7 Jan 2020 17:35:33 -0500
Subject: [PATCH 606/834] Rename custom blocks and optimize api get by
 file/module/directive name

---
 .../core/Civi/Api4/Action/Afform/Get.php      | 35 +++++++++++--------
 ext/afform/gui/afform_gui.php                 |  4 +--
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index beeca1179721..e3bfe1e6bf97 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -19,24 +19,27 @@ public function getRecords() {
     $getComputed = $this->_isFieldSelected('has_local') || $this->_isFieldSelected('has_base');
     $getLayout = $this->_isFieldSelected('layout');
 
-    $toGet = $this->_itemsToGet('name');
-    $names = $toGet ?? array_keys($scanner->findFilePaths());
+    // This helps optimize lookups by file/module/directive name
+    $toGet = array_filter([
+      'name' => $this->_itemsToGet('name'),
+      'module_name' => $this->_itemsToGet('module_name'),
+      'directive_name' => $this->_itemsToGet('directive_name'),
+    ]);
 
-    // Optimize lookups by module/directive name
-    if (!$toGet) {
-      $moduleNames = $this->_itemsToGet('module_name');
-      $directiveNames = $this->_itemsToGet('directive_name');
-    }
+    $names = $toGet['name'] ?? array_keys($scanner->findFilePaths());
 
     $values = $this->getAutoGenerated($names, $toGet, $getLayout);
 
     foreach ($names as $name) {
       $info = [
+        'name' => $name,
         'module_name' => _afform_angular_module_name($name, 'camel'),
         'directive_name' => _afform_angular_module_name($name, 'dash'),
       ];
-      if (($moduleNames && !in_array($info['module_name'], $moduleNames)) || ($directiveNames && !in_array($info['directive_name'], $directiveNames))) {
-        continue;
+      foreach ($toGet as $key => $get) {
+        if (!in_array($info[$key], $get)) {
+          continue;
+        }
       }
       $record = $scanner->getMeta($name);
       if (!$record && !isset($values[$name])) {
@@ -71,12 +74,16 @@ public function getRecords() {
    */
   protected function getAutoGenerated(&$names, $toGet, $getLayout) {
     $values = $groupNames = [];
-    foreach ($toGet ?? [] as $name) {
-      if (strpos($name, 'blockCustom_') === 0 && strlen($name) > 12) {
-        $groupNames[] = substr($name, 12);
+    foreach ($toGet['name'] ?? [] as $name) {
+      if (strpos($name, 'afjoinCustom_') === 0 && strlen($name) > 13) {
+        $groupNames[] = substr($name, 13);
       }
     }
-    if ($toGet && !$groupNames) {
+    if (
+      (!empty($toGet['name']) && !$groupNames)
+      || (!empty($toGet['module_name']) && !strstr(implode(' ', $toGet['module_name']), 'afjoinCustom'))
+      || (!empty($toGet['directive_name']) && !strstr(implode(' ', $toGet['directive_name']), 'afjoin-custom'))
+    ) {
       return $values;
     }
     $customApi = CustomGroup::get()
@@ -98,7 +105,7 @@ protected function getAutoGenerated(&$names, $toGet, $getLayout) {
       );
     }
     foreach ($customApi->execute() as $custom) {
-      $name = 'blockCustom_' . $custom['name'];
+      $name = 'afjoinCustom_' . $custom['name'];
       if (!in_array($name, $names)) {
         $names[] = $name;
       }
diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/gui/afform_gui.php
index 8f0effff6479..c5fe4e309125 100644
--- a/ext/afform/gui/afform_gui.php
+++ b/ext/afform/gui/afform_gui.php
@@ -206,7 +206,7 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     }
   }
 
-  // Load fields from entity joins
+  // Load fields from afform blocks with joins
   $blockData = \Civi\Api4\Afform::get()
     ->setCheckPermissions(FALSE)
     ->addWhere('join', 'IS NOT NULL')
@@ -221,7 +221,7 @@ function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) {
     }
   }
 
-  // Todo: scan for other elements
+  // Todo: add method for extensions to define other elements
   $data['elements'] = [
     'container' => [
       'title' => ts('Container'),

From e38db494470694ae28cd80d8a05179bee4dfa2ed Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 8 Jan 2020 08:20:54 -0500
Subject: [PATCH 607/834] Use api to get directive/module names

---
 ext/afform/core/CRM/Afform/Page/AfformBase.php | 18 +++++++++++-------
 ext/afform/core/Civi/Afform/FormDataModel.php  |  5 ++---
 .../core/Civi/Api4/Utils/AfformSaveTrait.php   |  7 +++----
 ext/afform/core/afform.php                     | 17 ++++++-----------
 ext/afform/gui/ang/afGuiEditor.js              |  6 +++---
 5 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 3ae5a722858d..ce191dd6fba1 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -6,23 +6,27 @@ class CRM_Afform_Page_AfformBase extends CRM_Core_Page {
   public function run() {
     list ($pagePath, $pageArgs) = func_get_args();
 
-    $module = _afform_angular_module_name($pageArgs['afform']);
-    $this->set('afModule', $module);
+    $afform = civicrm_api4('Afform', 'get', [
+      'checkPermissions' => FALSE,
+      'where' => [['name', '=', $pageArgs['afform']]],
+      'select' => ['title', 'module_name', 'directive_name'],
+    ], 0);
+
+    $this->set('afModule', $afform['module_name']);
 
     $loader = new \Civi\Angular\AngularLoader();
-    $loader->setModules([$module, 'afformStandalone']);
+    $loader->setModules([$afform['module_name'], 'afformStandalone']);
     $loader->setPageName(implode('/', $pagePath));
     $loader->getRes()->addSetting([
       'afform' => [
-        'open' => _afform_angular_module_name($pageArgs['afform'], 'dash'),
+        'open' => $afform['directive_name'],
       ],
     ]);
     $loader->load();
 
-    $afform = civicrm_api4('Afform', 'get', ['checkPermissions' => FALSE, 'where' => [['name', '=', $module]], 'select' => ['title']]);
 
-    if (!empty($afform[0]['title'])) {
-      $title = strip_tags($afform[0]['title']);
+    if (!empty($afform['title'])) {
+      $title = strip_tags($afform['title']);
       CRM_Utils_System::setTitle($title);
       CRM_Utils_System::appendBreadCrumb([['title' => $title, 'url' => CRM_Utils_System::url(implode('/', $pagePath), NULL, FALSE, '/')]]);
     }
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index b256584aa0ee..fc89bb267f2b 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -26,12 +26,11 @@ class FormDataModel {
   public function __construct($layout) {
     $root = AHQ::makeRoot($layout);
     $this->entities = array_column(AHQ::getTags($root, 'af-entity'), NULL, 'name');
-    foreach (Afform::get()->setCheckPermissions(FALSE)->addSelect('name')->execute() as $block) {
-      $this->blocks[_afform_angular_module_name($block['name'], 'dash')] = $block;
-    }
     foreach (array_keys($this->entities) as $entity) {
       $this->entities[$entity]['fields'] = $this->entities[$entity]['joins'] = [];
     }
+    // Pre-load full list of afforms in case this layout embeds other afform directives
+    $this->blocks = (array) Afform::get()->setCheckPermissions(FALSE)->setSelect(['name', 'directive_name'])->execute()->indexBy('directive_name');
     $this->parseFields($layout);
   }
 
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 48e21b27f1cb..837af3b5696b 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -33,11 +33,8 @@ protected function writeRecord($item) {
     }
     else {
       // Fetch existing metadata
-      $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->addSelect('name')->execute()->column('name');
+      $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->setAction('create')->addSelect('name')->execute()->column('name');
       unset($fields[array_search('layout', $fields)]);
-      unset($fields[array_search('name', $fields)]);
-      unset($fields[array_search('has_local', $fields)]);
-      unset($fields[array_search('has_base', $fields)]);
       $orig = \Civi\Api4\Afform::get()->setCheckPermissions(FALSE)->addWhere('name', '=', $item['name'])->setSelect($fields)->execute()->first();
     }
 
@@ -74,6 +71,8 @@ protected function writeRecord($item) {
     }
     // FIXME if asset-caching is enabled, then flush the asset cache.
 
+    $item['module_name'] = _afform_angular_module_name($item['name'], 'camel');
+    $item['directive_name'] = _afform_angular_module_name($item['name'], 'dash');
     return $meta + $item;
   }
 
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index ab90805ae04f..9d445ab6a648 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -12,18 +12,13 @@
  */
 function _afform_fields_filter($params) {
   $result = [];
-  $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->execute()->indexBy('name');
+  $fields = \Civi\Api4\Afform::getfields()->setCheckPermissions(FALSE)->setAction('create')->execute()->indexBy('name');
   foreach ($fields as $fieldName => $field) {
     if (isset($params[$fieldName])) {
       $result[$fieldName] = $params[$fieldName];
-    }
-
-    if (isset($result[$fieldName])) {
-      switch ($fieldName) {
-        case 'is_public':
-          $result[$fieldName] = CRM_Utils_String::strtobool($result[$fieldName]);
-          break;
 
+      if ($field['data_type'] === 'Boolean' && !is_bool($params[$fieldName])) {
+        $result[$fieldName] = CRM_Utils_String::strtobool($params[$fieldName]);
       }
     }
   }
@@ -157,11 +152,11 @@ function afform_civicrm_angularModules(&$angularModules) {
 
   $afforms = \Civi\Api4\Afform::get()
     ->setCheckPermissions(FALSE)
-    ->setSelect(['name', 'requires'])
+    ->setSelect(['name', 'requires', 'module_name', 'directive_name'])
     ->execute();
 
   foreach ($afforms as $afform) {
-    $angularModules[_afform_angular_module_name($afform['name'], 'camel')] = [
+    $angularModules[$afform['module_name']] = [
       'ext' => E::LONG_NAME,
       'js' => ['assetBuilder://afform.js?name=' . urlencode($afform['name'])],
       'requires' => $afform['requires'],
@@ -169,7 +164,7 @@ function afform_civicrm_angularModules(&$angularModules) {
       'partialsCallback' => '_afform_get_partials',
       '_afform' => $afform['name'],
       'exports' => [
-        _afform_angular_module_name($afform['name'], 'dash') => 'AE',
+        $afform['directive_name'] => 'AE',
       ],
     ];
   }
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 43fae53d2971..d0c760f4f8e2 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -50,7 +50,7 @@
           _.each(afforms, function(form) {
             evaluate(form.layout);
             if (form.block) {
-              $scope.meta.blocks[_.kebabCase(form.name)] = form;
+              $scope.meta.blocks[form.directive_name] = form;
             }
             if (form.name === $scope.afGuiEditor.name) {
               $scope.afform = form;
@@ -638,8 +638,8 @@
           }
           dialogService.open('saveBlockDialog', '~/afGuiEditor/saveBlock.html', model, options)
             .then(function(block) {
-              $scope.editor.meta.blocks[_.kebabCase(block.name)] = block;
-              setBlockDirective(_.kebabCase(block.name));
+              $scope.editor.meta.blocks[block.directive_name] = block;
+              setBlockDirective(block.directive_name);
               initializeBlockContainer();
             });
         };

From 48dde1255f3e4c48fad7617c3999ec3705020fe1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 8 Jan 2020 08:23:03 -0500
Subject: [PATCH 608/834] Loosen restrictions on file names - allow underscores

---
 ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 837af3b5696b..d35689ce8a4a 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -28,8 +28,8 @@ protected function writeRecord($item) {
       $item['name'] .= $suffix;
       $orig = NULL;
     }
-    elseif (!preg_match('/^[a-zA-Z][a-zA-Z0-9\-]*$/', $item['name'])) {
-      throw new \API_Exception("Afform.{$this->getActionName()}: name should use alphanumerics and dashes.");
+    elseif (!preg_match('/^[a-zA-Z][-_a-zA-Z0-9]*$/', $item['name'])) {
+      throw new \API_Exception("Afform.{$this->getActionName()}: name should begin with a letter and only contain alphanumerics underscores and dashes.");
     }
     else {
       // Fetch existing metadata

From c697cf5fcfe61ad59168cf63a5a7f33aac47765c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 9 Jan 2020 15:11:15 -0500
Subject: [PATCH 609/834] Release v0.4

---
 ext/afform/core/info.xml | 6 +++---
 ext/afform/gui/info.xml  | 6 +++---
 ext/afform/html/info.xml | 6 +++---
 ext/afform/mock/info.xml | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 34d246d6d680..5cc0e38e69a4 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -14,8 +14,8 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2018-06-12</releaseDate>
-  <version>0.3</version>
+  <releaseDate>2020-01-09</releaseDate>
+  <version>0.4</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.22</ver>
@@ -23,7 +23,7 @@
   <requires>
     <ext version="~4.5">org.civicrm.api4</ext>
   </requires>
-  <comments>This is a new, undeveloped module</comments>
+  <comments>Core functionality for CiviCRM Afforms</comments>
   <civix>
     <namespace>CRM/Afform</namespace>
   </civix>
diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
index 929c2f64dc2a..4f38c118b54d 100644
--- a/ext/afform/gui/info.xml
+++ b/ext/afform/gui/info.xml
@@ -14,13 +14,13 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2019-02-08</releaseDate>
-  <version>0.3</version>
+  <releaseDate>2020-01-09</releaseDate>
+  <version>0.4</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.22</ver>
   </compatibility>
-  <comments>This is a new, undeveloped module</comments>
+  <comments>Drag-n-drop form builder for CiviCRM Afforms.</comments>
   <requires>
     <ext>org.civicrm.afform</ext>
     <ext>org.civicrm.api4</ext>
diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index af38f55b4748..12073096b25b 100644
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -14,8 +14,8 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2019-05-03</releaseDate>
-  <version>0.3</version>
+  <releaseDate>2020-01-09</releaseDate>
+  <version>0.4</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.22</ver>
@@ -23,7 +23,7 @@
   <requires>
     <ext>org.civicrm.afform</ext>
   </requires>
-  <comments>This is a new, undeveloped module</comments>
+  <comments>Code-based form editor for CiviCRM Afforms.</comments>
   <civix>
     <namespace>CRM/AfformHtml</namespace>
   </civix>
diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index 27555b447317..7e7ea1cca042 100644
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -14,8 +14,8 @@
     <url desc="Support">http://FIXME</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2019-02-08</releaseDate>
-  <version>0.3</version>
+  <releaseDate>2020-01-09</releaseDate>
+  <version>0.4</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.22</ver>
@@ -23,7 +23,7 @@
   <requires>
     <ext>org.civicrm.afform</ext>
   </requires>
-  <comments>This is a new, undeveloped module</comments>
+  <comments>Examples and tests for CiviCRM Afforms.</comments>
   <civix>
     <namespace>CRM/AfformMock</namespace>
   </civix>

From 36376a39c63f7da18d1ad81fdcf26c88198ced57 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 10 Jan 2020 14:05:28 +1300
Subject: [PATCH 610/834] Increment suggested version to reflect info.xml

Arguably afform still works on older versions but breaking changes have happened & if people
use it on older you want a buyer-beware type feeling
---
 ext/afform/README.md     | 2 +-
 ext/afform/docs/embed.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/README.md b/ext/afform/README.md
index 4f9201b76d81..97e890ad787b 100644
--- a/ext/afform/README.md
+++ b/ext/afform/README.md
@@ -22,7 +22,7 @@ if you already have a basic understanding of CiviCRM API and AngularJS.  It is l
 ## Requirements
 
 * PHP v7.0+
-* CiviCRM v5.7+
+* CiviCRM v5.22+
 
 <!--
 ## Installation (Web UI)
diff --git a/ext/afform/docs/embed.md b/ext/afform/docs/embed.md
index 58698f75bb35..3e291dab417c 100644
--- a/ext/afform/docs/embed.md
+++ b/ext/afform/docs/embed.md
@@ -73,4 +73,4 @@ cv open 'civicrm/contact?cid=100'
 
 What does this buy us?  It means that a downstream admin (using APIs/GUIs) can fork `ang/myContactName.aff.html` --
 but all the other components can cleanly track the canonical release. This significantly reduces the costs and risks
-of manging upgrades and changes.
+of managing upgrades and changes.

From 69c2d1a2601dff14a744d21e83ce46f2648c1a51 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 10 Jan 2020 14:09:34 +1300
Subject: [PATCH 611/834] Reinstate parsing of data from the form

This means that data can be set in an embedded form e.g

 <af-entity data='{name_a : options.name_a,  name_b : options.name_b, is_name_b_nickname: options.is_name_b_nickname, is_name_b_inferior: options.is_name_b_inferior}' .... />

In this case the options.name_as comes from the directive that instantiates this afform
---
 ext/afform/core/ang/af/Form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index 06f3b9d18342..e97a40e9df1f 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -20,7 +20,10 @@
 
         this.registerEntity = function registerEntity(entity) {
           schema[entity.modelName] = entity;
-          data[entity.modelName] = [];
+          // Permitting entity.data allows the afform to specify variables like
+          // that has been passing into the afform with the directive that initiates it.
+          // This is an advanced usage & afJoin is more normal.
+          data[entity.modelName] = entity.data || {};
         };
         this.getEntity = function getEntity(name) {
           return schema[name];

From 4e35388cb4e75d12d8805247a9e623680def3553 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 10 Jan 2020 12:59:49 -0500
Subject: [PATCH 612/834] More efficient select options handling

The afField.getOptions function was causing infinite recursion by recreating the boolean options array every time.
Passing this variable by refernce solves the problem, and adding "track by" to the ng-repeat follows best-practices for efficiency.
---
 ext/afform/core/ang/af/Field.js             | 5 +++--
 ext/afform/core/ang/af/fields/CheckBox.html | 2 +-
 ext/afform/core/ang/af/fields/Radio.html    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/ang/af/Field.js b/ext/afform/core/ang/af/Field.js
index 554eb8221804..e23beaefbd03 100644
--- a/ext/afform/core/ang/af/Field.js
+++ b/ext/afform/core/ang/af/Field.js
@@ -13,14 +13,15 @@
       link: function($scope, $el, $attr, ctrls) {
         var ts = $scope.ts = CRM.ts('afform'),
           closestController = $($el).closest('[af-fieldset],[af-join],[af-repeat-item]'),
-          afForm = ctrls[0];
+          afForm = ctrls[0],
+          boolOptions = [{key: '1', label: ts('Yes')}, {key: '0', label: ts('No')}];
         $scope.dataProvider = closestController.is('[af-repeat-item]') ? ctrls[3] : ctrls[2] || ctrls[1];
         $scope.fieldId = afForm.getFormMeta().name + '-' + $scope.fieldName + '-' + id++;
 
         $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
 
         $scope.getOptions = function() {
-          return $scope.defn.options || [{key: '1', label: ts('Yes')}, {key: '0', label: ts('No')}];
+          return $scope.defn.options || boolOptions;
         };
 
         $scope.select2Options = function() {
diff --git a/ext/afform/core/ang/af/fields/CheckBox.html b/ext/afform/core/ang/af/fields/CheckBox.html
index be20b9efe578..de7d94c85f5c 100644
--- a/ext/afform/core/ang/af/fields/CheckBox.html
+++ b/ext/afform/core/ang/af/fields/CheckBox.html
@@ -1,5 +1,5 @@
 <ul class="crm-checkbox-list" id="{{ fieldId }}" ng-if="defn.options">
-  <li ng-repeat="opt in defn.options" >
+  <li ng-repeat="opt in defn.options track by opt.key" >
     <input type="checkbox" checklist-model="dataProvider.getFieldData()[fieldName]" id="{{ fieldId + opt.key }}" checklist-value="opt.key" />
     <label for="{{ fieldId + opt.key }}">{{ opt.label }}</label>
   </li>
diff --git a/ext/afform/core/ang/af/fields/Radio.html b/ext/afform/core/ang/af/fields/Radio.html
index f4ee1fae4289..5df0bba49e6c 100644
--- a/ext/afform/core/ang/af/fields/Radio.html
+++ b/ext/afform/core/ang/af/fields/Radio.html
@@ -1,4 +1,4 @@
-<label ng-repeat="opt in getOptions()" >
+<label ng-repeat="opt in getOptions() track by opt.key" >
   <input class="crm-form-radio" type="radio" ng-model="dataProvider.getFieldData()[fieldName]" value="{{ opt.key }}" />
   {{ opt.label }}
 </label>

From 243ce6d386b1c0130e7e95a70796839f84fd0873 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 16 Jan 2020 10:53:24 -0500
Subject: [PATCH 613/834] Support is_primary fields and boolean options.

Civi 5.23 changes boolean options to be real true and false instead of '1' and '0'
so added version bump to keep in step.
---
 ext/afform/core/ang/af/Field.js               | 23 +++++++++++++++++--
 ext/afform/core/ang/af/Repeat.js              |  3 ++-
 ext/afform/core/ang/af/afRepeat.html          |  2 +-
 ext/afform/core/ang/af/fields/CheckBox.html   |  2 +-
 ext/afform/core/ang/af/fields/Radio.html      |  2 +-
 .../core/ang/afjoinAddressDefault.aff.html    |  1 +
 .../core/ang/afjoinEmailDefault.aff.html      |  1 +
 ext/afform/core/ang/afjoinIMDefault.aff.html  |  1 +
 .../core/ang/afjoinPhoneDefault.aff.html      |  1 +
 ext/afform/core/info.xml                      |  4 ++--
 ext/afform/gui/info.xml                       |  4 ++--
 ext/afform/html/info.xml                      |  4 ++--
 ext/afform/mock/info.xml                      |  4 ++--
 13 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/ext/afform/core/ang/af/Field.js b/ext/afform/core/ang/af/Field.js
index e23beaefbd03..12c1726ad001 100644
--- a/ext/afform/core/ang/af/Field.js
+++ b/ext/afform/core/ang/af/Field.js
@@ -14,14 +14,16 @@
         var ts = $scope.ts = CRM.ts('afform'),
           closestController = $($el).closest('[af-fieldset],[af-join],[af-repeat-item]'),
           afForm = ctrls[0],
-          boolOptions = [{key: '1', label: ts('Yes')}, {key: '0', label: ts('No')}];
+          boolOptions = [{key: true, label: ts('Yes')}, {key: false, label: ts('No')}],
+          // Only used for is_primary radio button
+          noOptions = [{key: true, label: ''}];
         $scope.dataProvider = closestController.is('[af-repeat-item]') ? ctrls[3] : ctrls[2] || ctrls[1];
         $scope.fieldId = afForm.getFormMeta().name + '-' + $scope.fieldName + '-' + id++;
 
         $el.addClass('af-field-type-' + _.kebabCase($scope.defn.input_type));
 
         $scope.getOptions = function() {
-          return $scope.defn.options || boolOptions;
+          return $scope.defn.options || ($scope.fieldName === 'is_primary' && $scope.defn.input_type === 'Radio' ? noOptions : boolOptions);
         };
 
         $scope.select2Options = function() {
@@ -32,6 +34,23 @@
           };
         };
 
+        // is_primary field - watch others in this afRepeat block to ensure only one is selected
+        if ($scope.fieldName === 'is_primary' && 'repeatIndex' in $scope.dataProvider) {
+          $scope.$watch('dataProvider.afRepeat.getEntityController().getData()', function (items, prev) {
+            var index = $scope.dataProvider.repeatIndex;
+            // Set first item to primary if there isn't a primary
+            if (items && !index && !_.find(items, 'is_primary')) {
+              $scope.dataProvider.getFieldData().is_primary = true;
+            }
+            // Set this item to not primary if another has been selected
+            if (items && prev && items.length === prev.length && items[index].is_primary && prev[index].is_primary &&
+              _.filter(items, 'is_primary').length > 1
+            ) {
+              $scope.dataProvider.getFieldData().is_primary = false;
+            }
+          }, true);
+        }
+
         // ChainSelect - watch control field & reload options as needed
         if ($scope.defn.input_type === 'ChainSelect') {
           $scope.$watch('dataProvider.getFieldData()[defn.input_attrs.controlField]', function(val) {
diff --git a/ext/afform/core/ang/af/Repeat.js b/ext/afform/core/ang/af/Repeat.js
index bb25e5f820e9..2055f7edce47 100644
--- a/ext/afform/core/ang/af/Repeat.js
+++ b/ext/afform/core/ang/af/Repeat.js
@@ -59,7 +59,8 @@
         restrict: 'A',
         require: ['afRepeatItem', '^^afRepeat'],
         bindToController: {
-          item: '=afRepeatItem'
+          item: '=afRepeatItem',
+          repeatIndex: '='
         },
         link: function($scope, $el, $attr, ctrls) {
           var self = ctrls[0];
diff --git a/ext/afform/core/ang/af/afRepeat.html b/ext/afform/core/ang/af/afRepeat.html
index 98346d3fe92d..7c7ef36eb1ef 100644
--- a/ext/afform/core/ang/af/afRepeat.html
+++ b/ext/afform/core/ang/af/afRepeat.html
@@ -1,4 +1,4 @@
-<div af-repeat-item="item" ng-repeat="item in getItems()">
+<div af-repeat-item="item" repeat-index="$index" ng-repeat="item in getItems()">
   <ng-transclude />
   <button crm-icon="fa-ban" class="btn btn-xs af-repeat-remove-btn" ng-if="canRemove()" ng-click="removeItem($index)"></button>
 </div>
diff --git a/ext/afform/core/ang/af/fields/CheckBox.html b/ext/afform/core/ang/af/fields/CheckBox.html
index de7d94c85f5c..8788043cb98d 100644
--- a/ext/afform/core/ang/af/fields/CheckBox.html
+++ b/ext/afform/core/ang/af/fields/CheckBox.html
@@ -4,4 +4,4 @@
     <label for="{{ fieldId + opt.key }}">{{ opt.label }}</label>
   </li>
 </ul>
-<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" ng-true-value="'1'" ng-false-value="'0'" />
+<input type="checkbox" ng-if="!defn.options" id="{{ fieldId }}" ng-model="dataProvider.getFieldData()[fieldName]" />
diff --git a/ext/afform/core/ang/af/fields/Radio.html b/ext/afform/core/ang/af/fields/Radio.html
index 5df0bba49e6c..7237a698c511 100644
--- a/ext/afform/core/ang/af/fields/Radio.html
+++ b/ext/afform/core/ang/af/fields/Radio.html
@@ -1,4 +1,4 @@
 <label ng-repeat="opt in getOptions() track by opt.key" >
-  <input class="crm-form-radio" type="radio" ng-model="dataProvider.getFieldData()[fieldName]" value="{{ opt.key }}" />
+  <input class="crm-form-radio" type="radio" ng-model="dataProvider.getFieldData()[fieldName]" ng-value="opt.key" />
   {{ opt.label }}
 </label>
diff --git a/ext/afform/core/ang/afjoinAddressDefault.aff.html b/ext/afform/core/ang/afjoinAddressDefault.aff.html
index 76d21e406ff7..ddb1f017ed45 100644
--- a/ext/afform/core/ang/afjoinAddressDefault.aff.html
+++ b/ext/afform/core/ang/afjoinAddressDefault.aff.html
@@ -1,6 +1,7 @@
 <div class="af-container af-layout-inline">
   <af-field name="street_address" />
   <af-field name="location_type_id" />
+  <af-field name="is_primary" />
 </div>
 <div class="af-container af-layout-inline">
   <af-field name="city" />
diff --git a/ext/afform/core/ang/afjoinEmailDefault.aff.html b/ext/afform/core/ang/afjoinEmailDefault.aff.html
index 71feccef5bce..9b1ed00145c1 100644
--- a/ext/afform/core/ang/afjoinEmailDefault.aff.html
+++ b/ext/afform/core/ang/afjoinEmailDefault.aff.html
@@ -1,4 +1,5 @@
 <div class="af-container af-layout-inline">
   <af-field name="email" />
   <af-field name="location_type_id" />
+  <af-field name="is_primary" />
 </div>
diff --git a/ext/afform/core/ang/afjoinIMDefault.aff.html b/ext/afform/core/ang/afjoinIMDefault.aff.html
index 796881103d90..decf4c7af1ab 100644
--- a/ext/afform/core/ang/afjoinIMDefault.aff.html
+++ b/ext/afform/core/ang/afjoinIMDefault.aff.html
@@ -2,4 +2,5 @@
   <af-field name="name" />
   <af-field name="location_type_id" />
   <af-field name="provider_id" />
+  <af-field name="is_primary" />
 </div>
diff --git a/ext/afform/core/ang/afjoinPhoneDefault.aff.html b/ext/afform/core/ang/afjoinPhoneDefault.aff.html
index c1ffc3ebc84d..9d9ebc510854 100644
--- a/ext/afform/core/ang/afjoinPhoneDefault.aff.html
+++ b/ext/afform/core/ang/afjoinPhoneDefault.aff.html
@@ -2,4 +2,5 @@
   <af-field name="phone" />
   <af-field name="location_type_id" />
   <af-field name="phone_type_id" />
+  <af-field name="is_primary" />
 </div>
diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 5cc0e38e69a4..a0c34129e1b8 100644
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>0.4</version>
+  <version>0.5</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.22</ver>
+    <ver>5.23</ver>
   </compatibility>
   <requires>
     <ext version="~4.5">org.civicrm.api4</ext>
diff --git a/ext/afform/gui/info.xml b/ext/afform/gui/info.xml
index 4f38c118b54d..b03aca593ef8 100644
--- a/ext/afform/gui/info.xml
+++ b/ext/afform/gui/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>0.4</version>
+  <version>0.5</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.22</ver>
+    <ver>5.23</ver>
   </compatibility>
   <comments>Drag-n-drop form builder for CiviCRM Afforms.</comments>
   <requires>
diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index 12073096b25b..fca64082a3fa 100644
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>0.4</version>
+  <version>0.5</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.22</ver>
+    <ver>5.23</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>
diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index 7e7ea1cca042..7fefe5b47e53 100644
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -15,10 +15,10 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>0.4</version>
+  <version>0.5</version>
   <develStage>alpha</develStage>
   <compatibility>
-    <ver>5.22</ver>
+    <ver>5.23</ver>
   </compatibility>
   <requires>
     <ext>org.civicrm.afform</ext>

From eb3f4e1d6fd7e1777e5e00030ac73099d63de284 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 16 Jan 2020 19:49:47 -0500
Subject: [PATCH 614/834] Revert "Reinstate parsing of data from the form"

This reverts commit d31206f9e08703ae4f11b7e34673d7ece92b1630.
---
 ext/afform/core/ang/af/Form.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ext/afform/core/ang/af/Form.js b/ext/afform/core/ang/af/Form.js
index e97a40e9df1f..06f3b9d18342 100644
--- a/ext/afform/core/ang/af/Form.js
+++ b/ext/afform/core/ang/af/Form.js
@@ -20,10 +20,7 @@
 
         this.registerEntity = function registerEntity(entity) {
           schema[entity.modelName] = entity;
-          // Permitting entity.data allows the afform to specify variables like
-          // that has been passing into the afform with the directive that initiates it.
-          // This is an advanced usage & afJoin is more normal.
-          data[entity.modelName] = entity.data || {};
+          data[entity.modelName] = [];
         };
         this.getEntity = function getEntity(name) {
           return schema[name];

From c3273f0186fae5e255ca9ad47dbcaae95c838ef8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 31 Jan 2020 11:39:40 -0500
Subject: [PATCH 615/834] Code comment

---
 ext/afform/core/Civi/Api4/Action/Afform/Get.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index e3bfe1e6bf97..5923017e2a2c 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -79,8 +79,8 @@ protected function getAutoGenerated(&$names, $toGet, $getLayout) {
         $groupNames[] = substr($name, 13);
       }
     }
-    if (
-      (!empty($toGet['name']) && !$groupNames)
+    // Early return if this api call is fetching afforms by name and those names are not custom-related
+    if ((!empty($toGet['name']) && !$groupNames)
       || (!empty($toGet['module_name']) && !strstr(implode(' ', $toGet['module_name']), 'afjoinCustom'))
       || (!empty($toGet['directive_name']) && !strstr(implode(' ', $toGet['directive_name']), 'afjoin-custom'))
     ) {

From 4a439e7a503d170bf0414bea59c09a2a53f999b7 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 31 Jan 2020 11:40:26 -0500
Subject: [PATCH 616/834] Use built-in php function to do what we were trying
 to do with str_replace

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 84a4ae15d420..464363f5bf69 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -365,11 +365,7 @@ protected function decodeAttrValue($type, $txtAttrValue) {
    * @return string
    */
   public function replaceUnicodeChars($markup) {
-    // TODO: Potentially replace other unicode characters that can be represented as html entities
-    $replace = [
-      ["\xc2\xa0", '&nbsp;'],
-    ];
-    return str_replace(array_column($replace, 0), array_column($replace, 1), $markup);
+    return mb_convert_encoding($markup, 'HTML-ENTITIES', 'UTF-8');
   }
 
   /**

From 7d54c92ca945647bbf632ebde53b66d653999716 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 1 Feb 2020 11:44:44 -0500
Subject: [PATCH 617/834] Update API docblock.

---
 ext/afform/core/Civi/Api4/Afform.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index 40dbbe763761..cb2f251be829 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -7,7 +7,17 @@
 use Civi\Api4\Generic\BasicGetFieldsAction;
 
 /**
- * User-configurable forms
+ * User-configurable forms.
+ *
+ * Afform stands for *The Affable Administrative Angular Form Framework*.
+ *
+ * This API provides actions for
+ *   1. **_Managing_ forms:**
+ *      The `create`, `get`, `save`, `update`, & `revert` actions read/write form html & json files.
+ *   2. **_Using_ forms:**
+ *      The `prefill` and `submit` actions are used for preparing forms and processing submissions.
+ *
+ * @see https://lab.civicrm.org/extensions/afform
  * @package Civi\Api4
  */
 class Afform extends AbstractEntity {

From be951ee2d0dcc880baec4e3350d1c0d99b7f191d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 12 Feb 2020 11:21:16 -0500
Subject: [PATCH 618/834] Use standard api for getFields

---
 .../Civi/Api4/Action/Afform/AbstractProcessor.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
index 74a5da495a20..baa12b91e5a4 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/AbstractProcessor.php
@@ -101,14 +101,13 @@ protected static function getJoinWhereClause($mainEntityName, $joinEntityName, $
    */
   public static function fieldExists($entityName, $fieldName) {
     if (empty(\Civi::$statics[__CLASS__][__FUNCTION__][$entityName])) {
-      $getFields = \Civi\Api4\Utils\ActionUtil::getAction($entityName, 'getFields');
-      $getFields->setCheckPermissions(FALSE);
-      $getFields->setAction('create');
-      $getFields->addSelect('name');
-      if (property_exists($getFields, 'includeCustom')) {
-        $getFields->setIncludeCustom(FALSE);
-      }
-      \Civi::$statics[__CLASS__][__FUNCTION__][$entityName] = $getFields->execute()->column('name');
+      $fields = civicrm_api4($entityName, 'getFields', [
+        'checkPermissions' => FALSE,
+        'action' => 'create',
+        'select' => ['name'],
+        'includeCustom' => FALSE,
+      ]);
+      \Civi::$statics[__CLASS__][__FUNCTION__][$entityName] = $fields->column('name');
     }
     return in_array($fieldName, \Civi::$statics[__CLASS__][__FUNCTION__][$entityName]);
   }

From c847b30c2743e04ed0924522ce4de6d10a1c30fa Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 17 Jul 2020 10:07:09 -0400
Subject: [PATCH 619/834] Update API factory functions with checkPermissions

---
 ext/afform/core/Civi/Api4/Afform.php        | 71 +++++++++++++--------
 ext/afform/core/Civi/Api4/AfformPalette.php | 25 ++++----
 ext/afform/core/Civi/Api4/AfformTag.php     | 25 ++++----
 3 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/ext/afform/core/Civi/Api4/Afform.php b/ext/afform/core/Civi/Api4/Afform.php
index cb2f251be829..3527442f4187 100644
--- a/ext/afform/core/Civi/Api4/Afform.php
+++ b/ext/afform/core/Civi/Api4/Afform.php
@@ -2,9 +2,7 @@
 
 namespace Civi\Api4;
 
-use Civi\Api4\Generic\AbstractEntity;
 use Civi\Api4\Generic\BasicBatchAction;
-use Civi\Api4\Generic\BasicGetFieldsAction;
 
 /**
  * User-configurable forms.
@@ -20,55 +18,68 @@
  * @see https://lab.civicrm.org/extensions/afform
  * @package Civi\Api4
  */
-class Afform extends AbstractEntity {
+class Afform extends Generic\AbstractEntity {
 
   /**
-   * @return \Civi\Api4\Action\Afform\Get
+   * @param bool $checkPermissions
+   * @return Action\Afform\Get
    */
-  public static function get() {
-    return new \Civi\Api4\Action\Afform\Get('Afform', __FUNCTION__);
+  public static function get($checkPermissions = TRUE) {
+    return (new Action\Afform\Get('Afform', __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Create
+   * @param bool $checkPermissions
+   * @return Action\Afform\Create
    */
-  public static function create() {
-    return new \Civi\Api4\Action\Afform\Create('Afform', __FUNCTION__);
+  public static function create($checkPermissions = TRUE) {
+    return (new Action\Afform\Create('Afform', __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Update
+   * @param bool $checkPermissions
+   * @return Action\Afform\Update
    */
-  public static function update() {
-    return new \Civi\Api4\Action\Afform\Update('Afform', __FUNCTION__, 'name');
+  public static function update($checkPermissions = TRUE) {
+    return (new Action\Afform\Update('Afform', __FUNCTION__, 'name'))
+      ->setCheckPermissions($checkPermissions);
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Save
+   * @param bool $checkPermissions
+   * @return Action\Afform\Save
    */
-  public static function save() {
-    return new \Civi\Api4\Action\Afform\Save('Afform', __FUNCTION__, 'name');
+  public static function save($checkPermissions = TRUE) {
+    return (new Action\Afform\Save('Afform', __FUNCTION__, 'name'))
+      ->setCheckPermissions($checkPermissions);
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Prefill
+   * @param bool $checkPermissions
+   * @return Action\Afform\Prefill
    */
-  public static function prefill() {
-    return new \Civi\Api4\Action\Afform\Prefill('Afform', __FUNCTION__);
+  public static function prefill($checkPermissions = TRUE) {
+    return (new Action\Afform\Prefill('Afform', __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
   }
 
   /**
-   * @return \Civi\Api4\Action\Afform\Submit
+   * @param bool $checkPermissions
+   * @return Action\Afform\Submit
    */
-  public static function submit() {
-    return new \Civi\Api4\Action\Afform\Submit('Afform', __FUNCTION__);
+  public static function submit($checkPermissions = TRUE) {
+    return (new Action\Afform\Submit('Afform', __FUNCTION__))
+      ->setCheckPermissions($checkPermissions);
   }
 
   /**
-   * @return \Civi\Api4\Generic\BasicBatchAction
+   * @param bool $checkPermissions
+   * @return Generic\BasicBatchAction
    */
-  public static function revert() {
-    return new BasicBatchAction('Afform', __FUNCTION__, ['name'], function($item, BasicBatchAction $action) {
+  public static function revert($checkPermissions = TRUE) {
+    return (new BasicBatchAction('Afform', __FUNCTION__, ['name'], function($item, BasicBatchAction $action) {
       $scanner = \Civi::service('afform_scanner');
       $files = [
         \CRM_Afform_AfformScanner::METADATA_FILE,
@@ -91,11 +102,15 @@ public static function revert() {
       // FIXME if asset-caching is enabled, then flush the asset cache
 
       return $item;
-    });
+    }))->setCheckPermissions($checkPermissions);
   }
 
-  public static function getFields() {
-    return new BasicGetFieldsAction('Afform', __FUNCTION__, function($self) {
+  /**
+   * @param bool $checkPermissions
+   * @return Generic\BasicGetFieldsAction
+   */
+  public static function getFields($checkPermissions = TRUE) {
+    return (new Generic\BasicGetFieldsAction('Afform', __FUNCTION__, function($self) {
       $fields = [
         [
           'name' => 'name',
@@ -151,7 +166,7 @@ public static function getFields() {
       }
 
       return $fields;
-    });
+    }))->setCheckPermissions($checkPermissions);
   }
 
   /**
diff --git a/ext/afform/core/Civi/Api4/AfformPalette.php b/ext/afform/core/Civi/Api4/AfformPalette.php
index d6bb94687907..981d5ad9a921 100644
--- a/ext/afform/core/Civi/Api4/AfformPalette.php
+++ b/ext/afform/core/Civi/Api4/AfformPalette.php
@@ -2,21 +2,18 @@
 
 namespace Civi\Api4;
 
-use Civi\Api4\Generic\AbstractEntity;
-use Civi\Api4\Generic\BasicGetAction;
-use Civi\Api4\Generic\BasicGetFieldsAction;
-
 /**
  * Class AfformPalette
  * @package Civi\Api4
  */
-class AfformPalette extends AbstractEntity {
+class AfformPalette extends Generic\AbstractEntity {
 
   /**
-   * @return BasicGetAction
+   * @param bool $checkPermissions
+   * @return Generic\BasicGetAction
    */
-  public static function get() {
-    return new BasicGetAction('AfformPalette', __FUNCTION__, function (BasicGetAction $action) {
+  public static function get($checkPermissions = TRUE) {
+    return (new Generic\BasicGetAction('AfformPalette', __FUNCTION__, function() {
       return [
         [
           'id' => 'Parent:afl-name',
@@ -31,11 +28,15 @@ public static function get() {
           'template' => '<afl-address contact-id="entities.parent.id" afl-label="Address"/>',
         ],
       ];
-    });
+    }))->setCheckPermissions($checkPermissions);
   }
 
-  public static function getFields() {
-    return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
+  /**
+   * @param bool $checkPermissions
+   * @return Generic\BasicGetFieldsAction
+   */
+  public static function getFields($checkPermissions = TRUE) {
+    return (new Generic\BasicGetFieldsAction('AfformPalette', __FUNCTION__, function() {
       return [
         [
           'name' => 'id',
@@ -50,7 +51,7 @@ public static function getFields() {
           'name' => 'template',
         ],
       ];
-    });
+    }))->setCheckPermissions($checkPermissions);
   }
 
   /**
diff --git a/ext/afform/core/Civi/Api4/AfformTag.php b/ext/afform/core/Civi/Api4/AfformTag.php
index a5f91d5f4c76..e2b5b77e93fc 100644
--- a/ext/afform/core/Civi/Api4/AfformTag.php
+++ b/ext/afform/core/Civi/Api4/AfformTag.php
@@ -1,21 +1,18 @@
 <?php
 namespace Civi\Api4;
 
-use Civi\Api4\Generic\AbstractEntity;
-use Civi\Api4\Generic\BasicGetAction;
-use Civi\Api4\Generic\BasicGetFieldsAction;
-
 /**
  * Class AfformTag
  * @package Civi\Api4
  */
-class AfformTag extends AbstractEntity {
+class AfformTag extends Generic\AbstractEntity {
 
   /**
-   * @return BasicGetAction
+   * @param bool $checkPermissions
+   * @return Generic\BasicGetAction
    */
-  public static function get() {
-    return new BasicGetAction('AfformTag', __FUNCTION__, function (BasicGetAction $action) {
+  public static function get($checkPermissions = TRUE) {
+    return (new Generic\BasicGetAction('AfformTag', __FUNCTION__, function() {
       return [
         [
           'name' => 'afl-entity',
@@ -30,11 +27,15 @@ public static function get() {
           'attrs' => ['contact-id', 'afl-label'],
         ],
       ];
-    });
+    }))->setCheckPermissions($checkPermissions);
   }
 
-  public static function getFields() {
-    return new BasicGetFieldsAction('Afform', __FUNCTION__, function() {
+  /**
+   * @param bool $checkPermissions
+   * @return Generic\BasicGetFieldsAction
+   */
+  public static function getFields($checkPermissions = TRUE) {
+    return (new Generic\BasicGetFieldsAction('AfformTag', __FUNCTION__, function() {
       return [
         [
           'name' => 'name',
@@ -43,7 +44,7 @@ public static function getFields() {
           'name' => 'attrs',
         ],
       ];
-    });
+    }))->setCheckPermissions($checkPermissions);
   }
 
   /**

From d9cc2e0d83b18bb4a7053437d1f90be62dc9e55e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 09:17:02 +1200
Subject: [PATCH 620/834] Re-run civix

---
 ext/afform/core/afform.civix.php      | 16 ++++++++--------
 ext/afform/gui/afform_gui.civix.php   | 16 ++++++++--------
 ext/afform/html/afform_html.civix.php | 16 ++++++++--------
 ext/afform/mock/afform_mock.civix.php | 16 ++++++++--------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ext/afform/core/afform.civix.php b/ext/afform/core/afform.civix.php
index 17db0361bdd5..a43b055281f8 100644
--- a/ext/afform/core/afform.civix.php
+++ b/ext/afform/core/afform.civix.php
@@ -193,8 +193,9 @@ function _afform_civix_civicrm_disable() {
  * @param $op string, the type of operation being performed; 'check' or 'enqueue'
  * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
  *
- * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
- *                for 'enqueue', returns void
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
@@ -225,7 +226,7 @@ function _afform_civix_upgrader() {
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
  *
- * @return array(string)
+ * @return array
  */
 function _afform_civix_find_files($dir, $pattern) {
   if (is_callable(['CRM_Utils_File', 'findFiles'])) {
@@ -244,7 +245,7 @@ function _afform_civix_find_files($dir, $pattern) {
     if ($dh = opendir($subdir)) {
       while (FALSE !== ($entry = readdir($dh))) {
         $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry{0} == '.') {
+        if ($entry[0] == '.') {
         }
         elseif (is_dir($path)) {
           $todos[] = $path;
@@ -255,6 +256,7 @@ function _afform_civix_find_files($dir, $pattern) {
   }
   return $result;
 }
+
 /**
  * (Delegated) Implements hook_civicrm_managed().
  *
@@ -362,7 +364,7 @@ function _afform_civix_civicrm_themes(&$themes) {
  * @link http://php.net/glob
  * @param string $pattern
  *
- * @return array, possibly empty
+ * @return array
  */
 function _afform_civix_glob($pattern) {
   $result = glob($pattern);
@@ -470,8 +472,6 @@ function _afform_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
-
 function _afform_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, array (
-  ));
+  $entityTypes = array_merge($entityTypes, []);
 }
diff --git a/ext/afform/gui/afform_gui.civix.php b/ext/afform/gui/afform_gui.civix.php
index c8a4f361cdc5..b384f42b276c 100644
--- a/ext/afform/gui/afform_gui.civix.php
+++ b/ext/afform/gui/afform_gui.civix.php
@@ -193,8 +193,9 @@ function _afform_gui_civix_civicrm_disable() {
  * @param $op string, the type of operation being performed; 'check' or 'enqueue'
  * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
  *
- * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
- *                for 'enqueue', returns void
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
@@ -225,7 +226,7 @@ function _afform_gui_civix_upgrader() {
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
  *
- * @return array(string)
+ * @return array
  */
 function _afform_gui_civix_find_files($dir, $pattern) {
   if (is_callable(['CRM_Utils_File', 'findFiles'])) {
@@ -244,7 +245,7 @@ function _afform_gui_civix_find_files($dir, $pattern) {
     if ($dh = opendir($subdir)) {
       while (FALSE !== ($entry = readdir($dh))) {
         $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry{0} == '.') {
+        if ($entry[0] == '.') {
         }
         elseif (is_dir($path)) {
           $todos[] = $path;
@@ -255,6 +256,7 @@ function _afform_gui_civix_find_files($dir, $pattern) {
   }
   return $result;
 }
+
 /**
  * (Delegated) Implements hook_civicrm_managed().
  *
@@ -362,7 +364,7 @@ function _afform_gui_civix_civicrm_themes(&$themes) {
  * @link http://php.net/glob
  * @param string $pattern
  *
- * @return array, possibly empty
+ * @return array
  */
 function _afform_gui_civix_glob($pattern) {
   $result = glob($pattern);
@@ -470,8 +472,6 @@ function _afform_gui_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
-
 function _afform_gui_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, array (
-  ));
+  $entityTypes = array_merge($entityTypes, []);
 }
diff --git a/ext/afform/html/afform_html.civix.php b/ext/afform/html/afform_html.civix.php
index 3e06b6081760..948f0ce17b7a 100644
--- a/ext/afform/html/afform_html.civix.php
+++ b/ext/afform/html/afform_html.civix.php
@@ -193,8 +193,9 @@ function _afform_html_civix_civicrm_disable() {
  * @param $op string, the type of operation being performed; 'check' or 'enqueue'
  * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
  *
- * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
- *                for 'enqueue', returns void
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
@@ -225,7 +226,7 @@ function _afform_html_civix_upgrader() {
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
  *
- * @return array(string)
+ * @return array
  */
 function _afform_html_civix_find_files($dir, $pattern) {
   if (is_callable(['CRM_Utils_File', 'findFiles'])) {
@@ -244,7 +245,7 @@ function _afform_html_civix_find_files($dir, $pattern) {
     if ($dh = opendir($subdir)) {
       while (FALSE !== ($entry = readdir($dh))) {
         $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry{0} == '.') {
+        if ($entry[0] == '.') {
         }
         elseif (is_dir($path)) {
           $todos[] = $path;
@@ -255,6 +256,7 @@ function _afform_html_civix_find_files($dir, $pattern) {
   }
   return $result;
 }
+
 /**
  * (Delegated) Implements hook_civicrm_managed().
  *
@@ -362,7 +364,7 @@ function _afform_html_civix_civicrm_themes(&$themes) {
  * @link http://php.net/glob
  * @param string $pattern
  *
- * @return array, possibly empty
+ * @return array
  */
 function _afform_html_civix_glob($pattern) {
   $result = glob($pattern);
@@ -470,8 +472,6 @@ function _afform_html_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NUL
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
-
 function _afform_html_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, array (
-  ));
+  $entityTypes = array_merge($entityTypes, []);
 }
diff --git a/ext/afform/mock/afform_mock.civix.php b/ext/afform/mock/afform_mock.civix.php
index 04c6b632f19d..32aad3e5563d 100644
--- a/ext/afform/mock/afform_mock.civix.php
+++ b/ext/afform/mock/afform_mock.civix.php
@@ -193,8 +193,9 @@ function _afform_mock_civix_civicrm_disable() {
  * @param $op string, the type of operation being performed; 'check' or 'enqueue'
  * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
  *
- * @return mixed  based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
- *                for 'enqueue', returns void
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
  */
@@ -225,7 +226,7 @@ function _afform_mock_civix_upgrader() {
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
  *
- * @return array(string)
+ * @return array
  */
 function _afform_mock_civix_find_files($dir, $pattern) {
   if (is_callable(['CRM_Utils_File', 'findFiles'])) {
@@ -244,7 +245,7 @@ function _afform_mock_civix_find_files($dir, $pattern) {
     if ($dh = opendir($subdir)) {
       while (FALSE !== ($entry = readdir($dh))) {
         $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry{0} == '.') {
+        if ($entry[0] == '.') {
         }
         elseif (is_dir($path)) {
           $todos[] = $path;
@@ -255,6 +256,7 @@ function _afform_mock_civix_find_files($dir, $pattern) {
   }
   return $result;
 }
+
 /**
  * (Delegated) Implements hook_civicrm_managed().
  *
@@ -362,7 +364,7 @@ function _afform_mock_civix_civicrm_themes(&$themes) {
  * @link http://php.net/glob
  * @param string $pattern
  *
- * @return array, possibly empty
+ * @return array
  */
 function _afform_mock_civix_glob($pattern) {
   $result = glob($pattern);
@@ -470,8 +472,6 @@ function _afform_mock_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NUL
  *
  * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
  */
-
 function _afform_mock_civix_civicrm_entityTypes(&$entityTypes) {
-  $entityTypes = array_merge($entityTypes, array (
-  ));
+  $entityTypes = array_merge($entityTypes, []);
 }

From 866c3273e0ae556eaad2fb5afe8e8b75bf4b6a9f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 09:31:41 +1200
Subject: [PATCH 621/834] Re-run civix upgrader

---
 .../gui/CRM/AfformGui/Upgrader/Base.php       | 91 ++++++++++++-------
 1 file changed, 56 insertions(+), 35 deletions(-)

diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php b/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php
index 0dad88389733..d9632679d7a5 100644
--- a/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader/Base.php
@@ -9,9 +9,9 @@
 class CRM_AfformGui_Upgrader_Base {
 
   /**
-   * @var varies, subclass of this
+   * @var CRM_AfformGui_Upgrader_Base
    */
-  static $instance;
+  public static $instance;
 
   /**
    * @var CRM_Queue_TaskContext
@@ -19,22 +19,25 @@ class CRM_AfformGui_Upgrader_Base {
   protected $ctx;
 
   /**
-   * @var string, eg 'com.example.myextension'
+   * @var string
+   *   eg 'com.example.myextension'
    */
   protected $extensionName;
 
   /**
-   * @var string, full path to the extension's source tree
+   * @var string
+   *   full path to the extension's source tree
    */
   protected $extensionDir;
 
   /**
-   * @var array(revisionNumber) sorted numerically
+   * @var revisionNumber[]
+   *   sorted numerically
    */
   private $revisions;
 
   /**
-   * @var boolean
+   * @var bool
    *   Flag to clean up extension revision data in civicrm_setting
    */
   private $revisionStorageIsDeprecated = FALSE;
@@ -42,7 +45,7 @@ class CRM_AfformGui_Upgrader_Base {
   /**
    * Obtain a reference to the active upgrade handler.
    */
-  static public function instance() {
+  public static function instance() {
     if (!self::$instance) {
       // FIXME auto-generate
       self::$instance = new CRM_AfformGui_Upgrader(
@@ -59,19 +62,25 @@ static public function instance() {
    * Note: Each upgrader instance should only be associated with one
    * task-context; otherwise, this will be non-reentrant.
    *
-   * @code
+   * ```
    * CRM_AfformGui_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
-   * @endcode
+   * ```
    */
-  static public function _queueAdapter() {
+  public static function _queueAdapter() {
     $instance = self::instance();
     $args = func_get_args();
     $instance->ctx = array_shift($args);
     $instance->queue = $instance->ctx->queue;
     $method = array_shift($args);
-    return call_user_func_array(array($instance, $method), $args);
+    return call_user_func_array([$instance, $method], $args);
   }
 
+  /**
+   * CRM_AfformGui_Upgrader_Base constructor.
+   *
+   * @param $extensionName
+   * @param $extensionDir
+   */
   public function __construct($extensionName, $extensionDir) {
     $this->extensionName = $extensionName;
     $this->extensionDir = $extensionDir;
@@ -82,7 +91,8 @@ public function __construct($extensionName, $extensionDir) {
   /**
    * Run a CustomData file.
    *
-   * @param string $relativePath the CustomData XML file path (relative to this extension's dir)
+   * @param string $relativePath
+   *   the CustomData XML file path (relative to this extension's dir)
    * @return bool
    */
   public function executeCustomDataFile($relativePath) {
@@ -93,11 +103,12 @@ public function executeCustomDataFile($relativePath) {
   /**
    * Run a CustomData file
    *
-   * @param string $xml_file  the CustomData XML file path (absolute path)
+   * @param string $xml_file
+   *   the CustomData XML file path (absolute path)
    *
    * @return bool
    */
-  protected static function executeCustomDataFileByAbsPath($xml_file) {
+  protected function executeCustomDataFileByAbsPath($xml_file) {
     $import = new CRM_Utils_Migrate_Import();
     $import->run($xml_file);
     return TRUE;
@@ -106,7 +117,8 @@ protected static function executeCustomDataFileByAbsPath($xml_file) {
   /**
    * Run a SQL file.
    *
-   * @param string $relativePath the SQL file path (relative to this extension's dir)
+   * @param string $relativePath
+   *   the SQL file path (relative to this extension's dir)
    *
    * @return bool
    */
@@ -119,10 +131,14 @@ public function executeSqlFile($relativePath) {
   }
 
   /**
+   * Run the sql commands in the specified file.
+   *
    * @param string $tplFile
    *   The SQL file path (relative to this extension's dir).
    *   Ex: "sql/mydata.mysql.tpl".
+   *
    * @return bool
+   * @throws \CRM_Core_Exception
    */
   public function executeSqlTemplate($tplFile) {
     // Assign multilingual variable to Smarty.
@@ -141,17 +157,19 @@ public function executeSqlTemplate($tplFile) {
    * Run one SQL query.
    *
    * This is just a wrapper for CRM_Core_DAO::executeSql, but it
-   * provides syntatic sugar for queueing several tasks that
+   * provides syntactic sugar for queueing several tasks that
    * run different queries
+   *
+   * @return bool
    */
-  public function executeSql($query, $params = array()) {
+  public function executeSql($query, $params = []) {
     // FIXME verify that we raise an exception on error
     CRM_Core_DAO::executeQuery($query, $params);
     return TRUE;
   }
 
   /**
-   * Syntatic sugar for enqueuing a task which calls a function in this class.
+   * Syntactic sugar for enqueuing a task which calls a function in this class.
    *
    * The task is weighted so that it is processed
    * as part of the currently-pending revision.
@@ -163,11 +181,11 @@ public function addTask($title) {
     $args = func_get_args();
     $title = array_shift($args);
     $task = new CRM_Queue_Task(
-      array(get_class($this), '_queueAdapter'),
+      [get_class($this), '_queueAdapter'],
       $args,
       $title
     );
-    return $this->queue->createItem($task, array('weight' => -1));
+    return $this->queue->createItem($task, ['weight' => -1]);
   }
 
   // ******** Revision-tracking helpers ********
@@ -193,6 +211,8 @@ public function hasPendingRevisions() {
 
   /**
    * Add any pending revisions to the queue.
+   *
+   * @param CRM_Queue_Queue $queue
    */
   public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
     $this->queue = $queue;
@@ -200,23 +220,23 @@ public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
     $currentRevision = $this->getCurrentRevision();
     foreach ($this->getRevisions() as $revision) {
       if ($revision > $currentRevision) {
-        $title = ts('Upgrade %1 to revision %2', array(
+        $title = E::ts('Upgrade %1 to revision %2', [
           1 => $this->extensionName,
           2 => $revision,
-        ));
+        ]);
 
         // note: don't use addTask() because it sets weight=-1
 
         $task = new CRM_Queue_Task(
-          array(get_class($this), '_queueAdapter'),
-          array('upgrade_' . $revision),
+          [get_class($this), '_queueAdapter'],
+          ['upgrade_' . $revision],
           $title
         );
         $this->queue->createItem($task);
 
         $task = new CRM_Queue_Task(
-          array(get_class($this), '_queueAdapter'),
-          array('setCurrentRevision', $revision),
+          [get_class($this), '_queueAdapter'],
+          ['setCurrentRevision', $revision],
           $title
         );
         $this->queue->createItem($task);
@@ -227,11 +247,12 @@ public function enqueuePendingRevisions(CRM_Queue_Queue $queue) {
   /**
    * Get a list of revisions.
    *
-   * @return array(revisionNumbers) sorted numerically
+   * @return array
+   *   revisionNumbers sorted numerically
    */
   public function getRevisions() {
     if (!is_array($this->revisions)) {
-      $this->revisions = array();
+      $this->revisions = [];
 
       $clazz = new ReflectionClass(get_class($this));
       $methods = $clazz->getMethods();
@@ -256,7 +277,7 @@ public function getCurrentRevision() {
 
   private function getCurrentRevisionDeprecated() {
     $key = $this->extensionName . ':version';
-    if ($revision = CRM_Core_BAO_Setting::getItem('Extension', $key)) {
+    if ($revision = \Civi::settings()->get($key)) {
       $this->revisionStorageIsDeprecated = TRUE;
     }
     return $revision;
@@ -302,7 +323,7 @@ public function onInstall() {
         $this->executeCustomDataFileByAbsPath($file);
       }
     }
-    if (is_callable(array($this, 'install'))) {
+    if (is_callable([$this, 'install'])) {
       $this->install();
     }
   }
@@ -315,7 +336,7 @@ public function onPostInstall() {
     if (!empty($revisions)) {
       $this->setCurrentRevision(max($revisions));
     }
-    if (is_callable(array($this, 'postInstall'))) {
+    if (is_callable([$this, 'postInstall'])) {
       $this->postInstall();
     }
   }
@@ -330,7 +351,7 @@ public function onUninstall() {
         $this->executeSqlTemplate($file);
       }
     }
-    if (is_callable(array($this, 'uninstall'))) {
+    if (is_callable([$this, 'uninstall'])) {
       $this->uninstall();
     }
     $files = glob($this->extensionDir . '/sql/*_uninstall.sql');
@@ -346,7 +367,7 @@ public function onUninstall() {
    */
   public function onEnable() {
     // stub for possible future use
-    if (is_callable(array($this, 'enable'))) {
+    if (is_callable([$this, 'enable'])) {
       $this->enable();
     }
   }
@@ -356,7 +377,7 @@ public function onEnable() {
    */
   public function onDisable() {
     // stub for possible future use
-    if (is_callable(array($this, 'disable'))) {
+    if (is_callable([$this, 'disable'])) {
       $this->disable();
     }
   }
@@ -364,7 +385,7 @@ public function onDisable() {
   public function onUpgrade($op, CRM_Queue_Queue $queue = NULL) {
     switch ($op) {
       case 'check':
-        return array($this->hasPendingRevisions());
+        return [$this->hasPendingRevisions()];
 
       case 'enqueue':
         return $this->enqueuePendingRevisions($queue);

From 6ff7dae7a6ac2da75d3f69a3222ecc3dbcd3ddf5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 09:31:53 +1200
Subject: [PATCH 622/834] Misc style fix

---
 ext/afform/core/CRM/Afform/Page/AfformBase.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index ce191dd6fba1..3a64be2f6fab 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -24,7 +24,6 @@ public function run() {
     ]);
     $loader->load();
 
-
     if (!empty($afform['title'])) {
       $title = strip_tags($afform['title']);
       CRM_Utils_System::setTitle($title);

From c0fdbd77cfc15f1460b7d7acfd121ac587f3d507 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 13:18:00 +1200
Subject: [PATCH 623/834] Style fixes

I removed the commented out functions rather than figuring out how to style them right
---
 ext/afform/mock/afform_mock.php               | 28 -------------
 ext/afform/mock/ang/mockBespoke.ang.php       | 40 +++++++++----------
 .../phpunit/api/v4/AfformPaletteTest.php      |  3 --
 3 files changed, 19 insertions(+), 52 deletions(-)

diff --git a/ext/afform/mock/afform_mock.php b/ext/afform/mock/afform_mock.php
index b101e0d2d10b..578aed00f9c9 100644
--- a/ext/afform/mock/afform_mock.php
+++ b/ext/afform/mock/afform_mock.php
@@ -140,31 +140,3 @@ function afform_mock_civicrm_entityTypes(&$entityTypes) {
 function afform_mock_civicrm_themes(&$themes) {
   _afform_mock_civix_civicrm_themes($themes);
 }
-
-// --- Functions below this ship commented out. Uncomment as required. ---
-
-/**
- * Implements hook_civicrm_preProcess().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
- *
-function afform_mock_civicrm_preProcess($formName, &$form) {
-
-} // */
-
-/**
- * Implements hook_civicrm_navigationMenu().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
- *
-function afform_mock_civicrm_navigationMenu(&$menu) {
-  _afform_mock_civix_insert_navigation_menu($menu, 'Mailings', array(
-    'label' => E::ts('New subliminal message'),
-    'name' => 'mailing_subliminal_message',
-    'url' => 'civicrm/mailing/subliminal',
-    'permission' => 'access CiviMail',
-    'operator' => 'OR',
-    'separator' => 0,
-  ));
-  _afform_mock_civix_navigationMenu($menu);
-} // */
diff --git a/ext/afform/mock/ang/mockBespoke.ang.php b/ext/afform/mock/ang/mockBespoke.ang.php
index ecbfb40aa946..467b5894df5f 100644
--- a/ext/afform/mock/ang/mockBespoke.ang.php
+++ b/ext/afform/mock/ang/mockBespoke.ang.php
@@ -2,28 +2,26 @@
 // This file declares an Angular module which can be autoloaded
 // in CiviCRM. See also:
 // \https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules/n
-return array (
+return [
   'js' =>
-  array (
-    0 => 'ang/mockBespoke.js',
-    1 => 'ang/mockBespoke/*.js',
-    2 => 'ang/mockBespoke/*/*.js',
-  ),
+    [
+      0 => 'ang/mockBespoke.js',
+      1 => 'ang/mockBespoke/*.js',
+      2 => 'ang/mockBespoke/*/*.js',
+    ],
   'css' =>
-  array (
-    0 => 'ang/mockBespoke.css',
-  ),
+    [
+      0 => 'ang/mockBespoke.css',
+    ],
   'partials' =>
-  array (
-    0 => 'ang/mockBespoke',
-  ),
+    [
+      0 => 'ang/mockBespoke',
+    ],
   'requires' =>
-  array (
-    0 => 'crmUi',
-    1 => 'crmUtil',
-    2 => 'ngRoute',
-  ),
-  'settings' =>
-  array (
-  ),
-);
+    [
+      0 => 'crmUi',
+      1 => 'crmUtil',
+      2 => 'ngRoute',
+    ],
+  'settings' => [],
+];
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php
index c181150bbd8a..7f2ec858779e 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformPaletteTest.php
@@ -1,8 +1,5 @@
 <?php
 
-use Civi\Test\HeadlessInterface;
-use Civi\Test\TransactionalInterface;
-
 /**
  * AfformPalette API Test
  * @group headless

From c761f875afedbb9095efa639e153f91bf24fabad Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 15:09:37 +1200
Subject: [PATCH 624/834] Remove more commented out function

---
 ext/afform/html/afform_html.php | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/ext/afform/html/afform_html.php b/ext/afform/html/afform_html.php
index 3a06031fc4df..8b45581d59a0 100644
--- a/ext/afform/html/afform_html.php
+++ b/ext/afform/html/afform_html.php
@@ -145,34 +145,6 @@ function afform_html_civicrm_themes(&$themes) {
   _afform_html_civix_civicrm_themes($themes);
 }
 
-// --- Functions below this ship commented out. Uncomment as required. ---
-
-/**
- * Implements hook_civicrm_preProcess().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_preProcess
- *
-function afform_html_civicrm_preProcess($formName, &$form) {
-
-} // */
-
-/**
- * Implements hook_civicrm_navigationMenu().
- *
- * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_navigationMenu
- *
-function afform_html_civicrm_navigationMenu(&$menu) {
-  _afform_html_civix_insert_navigation_menu($menu, 'Mailings', array(
-    'label' => E::ts('New subliminal message'),
-    'name' => 'mailing_subliminal_message',
-    'url' => 'civicrm/mailing/subliminal',
-    'permission' => 'access CiviMail',
-    'operator' => 'OR',
-    'separator' => 0,
-  ));
-  _afform_html_civix_navigationMenu($menu);
-} // */
-
 /**
  * Implements hook_civicrm_check().
  */

From 0372843bb05cc6c418017183e6894808b9bd67c3 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 15:41:36 +1200
Subject: [PATCH 625/834] Remove more commented out code that is upsetting CI

---
 ext/afform/gui/CRM/AfformGui/Upgrader.php | 110 +---------------------
 1 file changed, 1 insertion(+), 109 deletions(-)

diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/gui/CRM/AfformGui/Upgrader.php
index 5959224578fd..328e7d6a3324 100644
--- a/ext/afform/gui/CRM/AfformGui/Upgrader.php
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader.php
@@ -37,25 +37,7 @@ public function install() {
   }
 
   /**
-   * Example: Work with entities usually not available during the install step.
-   *
-   * This method can be used for any post-install tasks. For example, if a step
-   * of your installation depends on accessing an entity that is itself
-   * created during the installation (e.g., a setting or a managed entity), do
-   * so here to avoid order of operation problems.
-   *
-  public function postInstall() {
-    $customFieldId = civicrm_api3('CustomField', 'getvalue', array(
-      'return' => array("id"),
-      'name' => "customFieldCreatedViaManagedHook",
-    ));
-    civicrm_api3('Setting', 'create', array(
-      'myWeirdFieldSetting' => array('id' => $customFieldId, 'weirdness' => 1),
-    ));
-  }
-
-  /**
-   * Cleanup navigtaion upon removal
+   * Cleanup navigation upon removal
    */
   public function uninstall() {
    // $this->executeSqlFile('sql/myuninstall.sql');
@@ -66,94 +48,4 @@ public function uninstall() {
     ]);
   }
 
-  /**
-   * Example: Run a simple query when a module is enabled.
-   *
-  public function enable() {
-    CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 1 WHERE bar = "whiz"');
-  }
-
-  /**
-   * Example: Run a simple query when a module is disabled.
-   *
-  public function disable() {
-    CRM_Core_DAO::executeQuery('UPDATE foo SET is_active = 0 WHERE bar = "whiz"');
-  }
-
-  /**
-   * Example: Run a couple simple queries.
-   *
-   * @return TRUE on success
-   * @throws Exception
-   *
-  public function upgrade_4200() {
-    $this->ctx->log->info('Applying update 4200');
-    CRM_Core_DAO::executeQuery('UPDATE foo SET bar = "whiz"');
-    CRM_Core_DAO::executeQuery('DELETE FROM bang WHERE willy = wonka(2)');
-    return TRUE;
-  } // */
-
-
-  /**
-   * Example: Run an external SQL script.
-   *
-   * @return TRUE on success
-   * @throws Exception
-  public function upgrade_4201() {
-    $this->ctx->log->info('Applying update 4201');
-    // this path is relative to the extension base dir
-    $this->executeSqlFile('sql/upgrade_4201.sql');
-    return TRUE;
-  } // */
-
-
-  /**
-   * Example: Run a slow upgrade process by breaking it up into smaller chunk.
-   *
-   * @return TRUE on success
-   * @throws Exception
-  public function upgrade_4202() {
-    $this->ctx->log->info('Planning update 4202'); // PEAR Log interface
-
-    $this->addTask(E::ts('Process first step'), 'processPart1', $arg1, $arg2);
-    $this->addTask(E::ts('Process second step'), 'processPart2', $arg3, $arg4);
-    $this->addTask(E::ts('Process second step'), 'processPart3', $arg5);
-    return TRUE;
-  }
-  public function processPart1($arg1, $arg2) { sleep(10); return TRUE; }
-  public function processPart2($arg3, $arg4) { sleep(10); return TRUE; }
-  public function processPart3($arg5) { sleep(10); return TRUE; }
-  // */
-
-
-  /**
-   * Example: Run an upgrade with a query that touches many (potentially
-   * millions) of records by breaking it up into smaller chunks.
-   *
-   * @return TRUE on success
-   * @throws Exception
-  public function upgrade_4203() {
-    $this->ctx->log->info('Planning update 4203'); // PEAR Log interface
-
-    $minId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(min(id),0) FROM civicrm_contribution');
-    $maxId = CRM_Core_DAO::singleValueQuery('SELECT coalesce(max(id),0) FROM civicrm_contribution');
-    for ($startId = $minId; $startId <= $maxId; $startId += self::BATCH_SIZE) {
-      $endId = $startId + self::BATCH_SIZE - 1;
-      $title = E::ts('Upgrade Batch (%1 => %2)', array(
-        1 => $startId,
-        2 => $endId,
-      ));
-      $sql = '
-        UPDATE civicrm_contribution SET foobar = whiz(wonky()+wanker)
-        WHERE id BETWEEN %1 and %2
-      ';
-      $params = array(
-        1 => array($startId, 'Integer'),
-        2 => array($endId, 'Integer'),
-      );
-      $this->addTask($title, 'executeSql', $sql, $params);
-    }
-    return TRUE;
-  } // */
-
 }

From 1b08632f437ab09fb64d601c5e8359db800eb39a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Sep 2020 15:47:37 +1200
Subject: [PATCH 626/834] Remove commented out line

---
 ext/afform/gui/CRM/AfformGui/Upgrader.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/gui/CRM/AfformGui/Upgrader.php
index 328e7d6a3324..a421855de16e 100644
--- a/ext/afform/gui/CRM/AfformGui/Upgrader.php
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader.php
@@ -40,7 +40,6 @@ public function install() {
    * Cleanup navigation upon removal
    */
   public function uninstall() {
-   // $this->executeSqlFile('sql/myuninstall.sql');
     civicrm_api3('Navigation', 'get', [
       'name' => 'afform_gui',
       'return' => ['id'],

From f02b1a3cd2e759dd707f54d719a54f2c9546124f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 11 Sep 2020 08:34:50 +1200
Subject: [PATCH 627/834] Phpcs fix

---
 ext/afform/core/tests/phpunit/bootstrap.php | 3 ++-
 ext/afform/mock/tests/phpunit/bootstrap.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/tests/phpunit/bootstrap.php b/ext/afform/core/tests/phpunit/bootstrap.php
index afa827e95ae8..a5b49253c819 100644
--- a/ext/afform/core/tests/phpunit/bootstrap.php
+++ b/ext/afform/core/tests/phpunit/bootstrap.php
@@ -2,8 +2,9 @@
 
 ini_set('memory_limit', '2G');
 ini_set('safe_mode', 0);
+// phpcs:disable
 eval(cv('php:boot --level=classloader', 'phpcode'));
-
+// phpcs:enable
 // Allow autoloading of PHPUnit helper classes in this extension.
 $loader = new \Composer\Autoload\ClassLoader();
 $loader->add('CRM_', __DIR__);
diff --git a/ext/afform/mock/tests/phpunit/bootstrap.php b/ext/afform/mock/tests/phpunit/bootstrap.php
index 65dcdaadabf9..bc7558e582fc 100644
--- a/ext/afform/mock/tests/phpunit/bootstrap.php
+++ b/ext/afform/mock/tests/phpunit/bootstrap.php
@@ -2,7 +2,9 @@
 
 ini_set('memory_limit', '2G');
 ini_set('safe_mode', 0);
+// phpcs:disable
 eval(cv('php:boot --level=classloader', 'phpcode'));
+// phpcs:enable
 
 // Allow autoloading of PHPUnit helper classes in this extension.
 foreach ([__DIR__] as $dir) {

From 349e79ad0aad4abc54e133f51e3a5a46e75e7a6b Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 14:50:09 +1200
Subject: [PATCH 628/834] dev/core#2043 remove pass-by-reference

Technical details in https://lab.civicrm.org/dev/core/-/issues/2043
---
 CRM/Core/BAO/Block.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 0689b0a495bd..8e7d86869250 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -197,14 +197,14 @@ public static function getBlockIds($blockName, $contactId = NULL, $entityElement
    * @param string $blockName
    *   Block name.
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
-   * @param null $entity
+   *   Array of name/value pairs.
+   * @param string $entity
    * @param int $contactId
    *
-   * @return object
-   *   CRM_Core_BAO_Block object on success, null otherwise
+   * @return array|null
+   *   Array of created location entities or NULL if none to create.
    */
-  public static function create($blockName, &$params, $entity = NULL, $contactId = NULL) {
+  public static function create($blockName, $params, $entity = NULL, $contactId = NULL) {
     if (!self::blockExists($blockName, $params)) {
       return NULL;
     }

From b1106e394efb05de9cbdaee8738d2dd128109eb6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 12:52:52 +1200
Subject: [PATCH 629/834] dev/core#2039 Set is_primary to 1 on email, address
 for domain contacts

I'm digging into the places where the code handles is_primary due to duplicate handling/ queries
- see https://lab.civicrm.org/dev/core/-/issues/2039

One distraction is that the domain contact's address & email are not marked is_primary. This
doesn't make sense to me as they ARE a contact in the DB
---
 sql/test_data_second_domain.mysql | 4 ++--
 xml/templates/civicrm_data.tpl    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql
index c9dd5008dac2..02be43b1922a 100644
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -10,13 +10,13 @@ SELECT @addId := id from civicrm_address where street_address = '15 Main St';
 
 INSERT INTO civicrm_email (contact_id, location_type_id, email, is_primary, is_billing, on_hold, hold_date, reset_date)
       VALUES
-      (@contactID, 1, '"Domain Email" <domainemail2@example.org>', 0, 0, 0, NULL, NULL);
+      (@contactID, 1, 'domainemail2@example.org', 1, 0, 0, NULL, NULL);
 
 SELECT @emailId := id from civicrm_email where email = 'domainemail2@example.org';
 
 INSERT INTO civicrm_phone (contact_id, location_type_id, is_primary, is_billing, mobile_provider_id, phone, phone_type_id)
       VALUES
-      (@contactID, 1, 0, 0, NULL,'204 555-1001', 1);
+      (@contactID, 1, 1, 0, NULL,'204 555-1001', 1);
 
 SELECT @phoneId := id from civicrm_phone where phone = '204 555-1001';
 
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index ee4fae30c0cb..a65d033c71e6 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -33,7 +33,7 @@ SET @contactID := LAST_INSERT_ID();
 
 INSERT INTO civicrm_email (contact_id, location_type_id, email, is_primary, is_billing, on_hold, hold_date, reset_date)
 VALUES
-(@contactID, 1, 'fixme.domainemail@example.org', 0, 0, 0, NULL, NULL);
+(@contactID, 1, 'fixme.domainemail@example.org', 1, 0, 0, NULL, NULL);
 
 INSERT INTO civicrm_domain (name, version, contact_id) VALUES (@domainName, '2.2', @contactID);
 SELECT @domainID := id FROM civicrm_domain where name = 'Default Domain Name';

From 839e7bf1c8ef5c6b6d50b0f2958f7a6bd15591d2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 14:03:04 +1200
Subject: [PATCH 630/834] Regenerate sql

---
 sql/civicrm_generated.mysql | 66 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 8349eba43811..cc0230c48a58 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.26, for osx10.10 (x86_64)
 --
--- Host: 127.0.0.1    Database: 47testcivi_yg7kx
+-- Host: 127.0.0.1    Database: dmastercivi
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.26
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -87,7 +87,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_activity` WRITE;
 /*!40000 ALTER TABLE `civicrm_activity` DISABLE KEYS */;
-INSERT INTO `civicrm_activity` (`id`, `source_record_id`, `activity_type_id`, `subject`, `activity_date_time`, `duration`, `location`, `phone_id`, `phone_number`, `details`, `status_id`, `priority_id`, `parent_id`, `is_test`, `medium_id`, `is_auto`, `relationship_id`, `is_current_revision`, `original_id`, `result`, `is_deleted`, `campaign_id`, `engagement_level`, `weight`, `is_star`, `created_date`, `modified_date`) VALUES (1,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 22:36:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(2,NULL,9,'Subject for Tell a Friend','2020-07-10 09:36:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(3,NULL,9,'Subject for Tell a Friend','2019-10-23 21:11:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(4,NULL,10,'Subject for Pledge Acknowledgment','2020-01-25 21:48:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(5,NULL,9,'Subject for Tell a Friend','2020-04-09 13:53:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(6,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 12:45:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(7,NULL,10,'Subject for Pledge Acknowledgment','2019-11-25 11:57:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(8,NULL,9,'Subject for Tell a Friend','2020-07-01 21:13:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(9,NULL,9,'Subject for Tell a Friend','2019-12-04 18:07:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(10,NULL,9,'Subject for Tell a Friend','2020-01-10 18:16:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(11,NULL,10,'Subject for Pledge Acknowledgment','2019-11-12 17:06:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(12,NULL,9,'Subject for Tell a Friend','2019-10-09 00:12:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(13,NULL,9,'Subject for Tell a Friend','2019-12-28 00:37:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(14,NULL,10,'Subject for Pledge Acknowledgment','2019-09-18 15:30:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(15,NULL,9,'Subject for Tell a Friend','2020-04-23 01:33:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(16,NULL,10,'Subject for Pledge Acknowledgment','2020-02-06 22:59:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(17,NULL,9,'Subject for Tell a Friend','2020-05-14 08:33:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(18,NULL,9,'Subject for Tell a Friend','2020-03-03 16:08:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(19,NULL,9,'Subject for Tell a Friend','2020-01-02 11:31:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(20,NULL,9,'Subject for Tell a Friend','2020-01-21 15:32:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(21,NULL,9,'Subject for Tell a Friend','2019-11-19 15:55:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(22,NULL,10,'Subject for Pledge Acknowledgment','2020-02-09 19:43:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(23,NULL,9,'Subject for Tell a Friend','2020-04-23 07:17:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(24,NULL,9,'Subject for Tell a Friend','2020-05-06 04:29:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(25,NULL,9,'Subject for Tell a Friend','2019-11-10 18:19:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(26,NULL,10,'Subject for Pledge Acknowledgment','2020-03-16 23:19:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(27,NULL,9,'Subject for Tell a Friend','2020-07-01 12:22:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(28,NULL,10,'Subject for Pledge Acknowledgment','2020-07-19 00:40:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(29,NULL,10,'Subject for Pledge Acknowledgment','2020-05-25 00:37:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(30,NULL,10,'Subject for Pledge Acknowledgment','2020-05-19 14:18:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(31,NULL,10,'Subject for Pledge Acknowledgment','2020-07-01 04:28:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(32,NULL,9,'Subject for Tell a Friend','2019-08-15 21:07:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(33,NULL,10,'Subject for Pledge Acknowledgment','2020-05-11 15:40:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(34,NULL,9,'Subject for Tell a Friend','2020-02-12 20:09:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(35,NULL,10,'Subject for Pledge Acknowledgment','2019-11-26 11:16:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(36,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 03:25:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(37,NULL,9,'Subject for Tell a Friend','2020-07-15 01:35:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(38,NULL,9,'Subject for Tell a Friend','2020-02-19 22:18:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(39,NULL,9,'Subject for Tell a Friend','2020-05-29 00:51:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(40,NULL,9,'Subject for Tell a Friend','2020-04-08 16:09:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(41,NULL,9,'Subject for Tell a Friend','2019-11-30 17:37:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(42,NULL,10,'Subject for Pledge Acknowledgment','2019-08-29 22:36:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(43,NULL,10,'Subject for Pledge Acknowledgment','2019-07-27 04:48:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(44,NULL,9,'Subject for Tell a Friend','2020-02-07 08:33:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(45,NULL,10,'Subject for Pledge Acknowledgment','2019-10-08 06:33:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(46,NULL,9,'Subject for Tell a Friend','2019-11-07 05:39:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(47,NULL,9,'Subject for Tell a Friend','2020-07-16 04:56:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(48,NULL,10,'Subject for Pledge Acknowledgment','2020-06-24 04:44:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(49,NULL,9,'Subject for Tell a Friend','2019-09-05 17:00:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(50,NULL,9,'Subject for Tell a Friend','2019-12-16 01:54:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(51,NULL,10,'Subject for Pledge Acknowledgment','2020-06-22 23:12:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(52,NULL,10,'Subject for Pledge Acknowledgment','2019-08-01 06:53:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(53,NULL,9,'Subject for Tell a Friend','2019-09-09 21:56:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(54,NULL,9,'Subject for Tell a Friend','2020-06-25 15:15:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(55,NULL,9,'Subject for Tell a Friend','2020-04-20 19:09:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(56,NULL,9,'Subject for Tell a Friend','2020-01-28 00:48:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(57,NULL,9,'Subject for Tell a Friend','2020-05-31 02:51:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(58,NULL,10,'Subject for Pledge Acknowledgment','2019-10-01 15:16:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(59,NULL,10,'Subject for Pledge Acknowledgment','2020-02-24 09:22:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(60,NULL,10,'Subject for Pledge Acknowledgment','2019-12-11 02:10:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(61,NULL,10,'Subject for Pledge Acknowledgment','2020-07-21 06:13:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(62,NULL,10,'Subject for Pledge Acknowledgment','2020-05-01 05:20:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(63,NULL,9,'Subject for Tell a Friend','2020-01-09 06:28:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(64,NULL,9,'Subject for Tell a Friend','2020-01-15 21:39:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(65,NULL,10,'Subject for Pledge Acknowledgment','2020-02-12 10:56:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(66,NULL,9,'Subject for Tell a Friend','2019-10-14 23:33:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(67,NULL,10,'Subject for Pledge Acknowledgment','2020-05-02 17:30:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(68,NULL,9,'Subject for Tell a Friend','2019-09-07 02:51:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(69,NULL,9,'Subject for Tell a Friend','2019-11-18 18:30:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(70,NULL,10,'Subject for Pledge Acknowledgment','2020-01-02 13:01:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(71,NULL,10,'Subject for Pledge Acknowledgment','2019-08-19 11:52:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(72,NULL,9,'Subject for Tell a Friend','2019-10-25 18:35:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(73,NULL,9,'Subject for Tell a Friend','2019-09-29 08:51:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(74,NULL,10,'Subject for Pledge Acknowledgment','2020-06-02 16:46:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(75,NULL,10,'Subject for Pledge Acknowledgment','2020-01-20 03:15:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(76,NULL,10,'Subject for Pledge Acknowledgment','2020-06-13 14:51:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(77,NULL,10,'Subject for Pledge Acknowledgment','2020-05-09 23:16:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(78,NULL,9,'Subject for Tell a Friend','2019-12-07 02:04:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(79,NULL,10,'Subject for Pledge Acknowledgment','2019-11-11 07:23:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(80,NULL,10,'Subject for Pledge Acknowledgment','2020-01-26 14:54:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(81,NULL,10,'Subject for Pledge Acknowledgment','2020-06-21 19:10:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(82,NULL,10,'Subject for Pledge Acknowledgment','2020-05-09 04:20:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(83,NULL,9,'Subject for Tell a Friend','2019-11-30 23:20:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(84,NULL,9,'Subject for Tell a Friend','2019-11-03 17:00:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(85,NULL,10,'Subject for Pledge Acknowledgment','2020-07-24 05:06:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(86,NULL,10,'Subject for Pledge Acknowledgment','2020-07-10 13:36:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(87,NULL,10,'Subject for Pledge Acknowledgment','2019-10-22 05:26:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(88,NULL,10,'Subject for Pledge Acknowledgment','2020-03-08 05:00:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(89,NULL,10,'Subject for Pledge Acknowledgment','2020-04-22 11:44:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(90,NULL,9,'Subject for Tell a Friend','2020-03-14 00:53:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(91,NULL,10,'Subject for Pledge Acknowledgment','2019-08-10 22:23:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(92,NULL,9,'Subject for Tell a Friend','2020-04-08 23:35:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(93,NULL,9,'Subject for Tell a Friend','2019-12-29 00:02:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(94,NULL,9,'Subject for Tell a Friend','2020-02-28 23:00:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(95,NULL,9,'Subject for Tell a Friend','2019-08-06 11:09:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(96,NULL,10,'Subject for Pledge Acknowledgment','2019-12-13 16:50:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(97,NULL,10,'Subject for Pledge Acknowledgment','2019-11-02 22:14:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(98,NULL,9,'Subject for Tell a Friend','2019-08-08 17:07:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(99,NULL,9,'Subject for Tell a Friend','2020-01-04 06:20:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(100,NULL,9,'Subject for Tell a Friend','2020-01-08 07:54:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(101,NULL,9,'Subject for Tell a Friend','2020-02-18 02:05:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(102,NULL,10,'Subject for Pledge Acknowledgment','2020-06-07 05:18:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(103,NULL,10,'Subject for Pledge Acknowledgment','2019-11-16 01:08:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(104,NULL,9,'Subject for Tell a Friend','2020-06-02 23:35:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(105,NULL,10,'Subject for Pledge Acknowledgment','2020-03-09 08:49:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(106,NULL,9,'Subject for Tell a Friend','2019-12-20 12:35:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(107,NULL,10,'Subject for Pledge Acknowledgment','2019-12-16 12:53:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(108,NULL,9,'Subject for Tell a Friend','2020-06-25 08:57:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(109,NULL,9,'Subject for Tell a Friend','2020-07-24 02:07:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(110,NULL,10,'Subject for Pledge Acknowledgment','2020-03-12 13:01:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(111,NULL,9,'Subject for Tell a Friend','2020-05-03 10:42:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(112,NULL,9,'Subject for Tell a Friend','2020-05-27 20:44:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(113,NULL,10,'Subject for Pledge Acknowledgment','2020-05-07 22:55:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(114,NULL,9,'Subject for Tell a Friend','2020-03-09 00:54:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(115,NULL,9,'Subject for Tell a Friend','2019-10-07 20:47:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(116,NULL,10,'Subject for Pledge Acknowledgment','2020-01-19 09:08:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(117,NULL,10,'Subject for Pledge Acknowledgment','2020-06-03 04:14:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(118,NULL,10,'Subject for Pledge Acknowledgment','2020-02-16 10:07:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(119,NULL,9,'Subject for Tell a Friend','2019-10-13 06:54:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(120,NULL,9,'Subject for Tell a Friend','2019-08-15 17:03:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(121,NULL,10,'Subject for Pledge Acknowledgment','2020-05-10 03:12:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(122,NULL,9,'Subject for Tell a Friend','2020-06-19 13:14:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(123,NULL,9,'Subject for Tell a Friend','2020-05-27 01:04:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(124,NULL,9,'Subject for Tell a Friend','2020-03-23 01:13:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(125,NULL,10,'Subject for Pledge Acknowledgment','2020-05-27 03:27:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(126,NULL,9,'Subject for Tell a Friend','2020-06-07 01:14:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(127,NULL,9,'Subject for Tell a Friend','2020-03-19 10:17:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(128,NULL,10,'Subject for Pledge Acknowledgment','2020-02-08 22:25:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(129,NULL,9,'Subject for Tell a Friend','2019-10-06 17:15:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(130,NULL,9,'Subject for Tell a Friend','2019-09-14 11:17:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(131,NULL,9,'Subject for Tell a Friend','2019-10-20 23:58:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(132,NULL,9,'Subject for Tell a Friend','2019-11-07 13:58:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(133,NULL,9,'Subject for Tell a Friend','2019-11-18 14:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(134,NULL,9,'Subject for Tell a Friend','2019-09-17 13:14:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(135,NULL,9,'Subject for Tell a Friend','2020-04-10 02:52:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(136,NULL,9,'Subject for Tell a Friend','2020-01-09 10:16:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(137,NULL,10,'Subject for Pledge Acknowledgment','2020-02-26 00:42:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(138,NULL,10,'Subject for Pledge Acknowledgment','2020-07-18 16:35:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(139,NULL,9,'Subject for Tell a Friend','2019-11-17 16:14:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(140,NULL,10,'Subject for Pledge Acknowledgment','2019-10-06 04:50:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(141,NULL,10,'Subject for Pledge Acknowledgment','2019-10-06 11:23:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(142,NULL,10,'Subject for Pledge Acknowledgment','2020-06-05 13:39:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(143,NULL,10,'Subject for Pledge Acknowledgment','2020-05-04 09:52:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(144,NULL,10,'Subject for Pledge Acknowledgment','2020-06-13 21:43:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(145,NULL,10,'Subject for Pledge Acknowledgment','2019-11-04 15:35:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(146,NULL,9,'Subject for Tell a Friend','2019-11-16 17:27:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(147,NULL,10,'Subject for Pledge Acknowledgment','2020-02-13 01:40:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(148,NULL,10,'Subject for Pledge Acknowledgment','2019-08-13 22:41:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(149,NULL,10,'Subject for Pledge Acknowledgment','2020-04-11 07:00:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(150,NULL,10,'Subject for Pledge Acknowledgment','2020-06-11 03:48:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(151,NULL,9,'Subject for Tell a Friend','2019-10-13 12:26:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(152,NULL,9,'Subject for Tell a Friend','2020-03-13 08:10:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(153,NULL,9,'Subject for Tell a Friend','2019-12-18 06:53:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(154,NULL,10,'Subject for Pledge Acknowledgment','2019-12-31 11:27:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(155,NULL,10,'Subject for Pledge Acknowledgment','2019-09-06 16:09:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(156,NULL,10,'Subject for Pledge Acknowledgment','2019-11-05 20:33:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(157,NULL,10,'Subject for Pledge Acknowledgment','2019-09-08 18:46:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(158,NULL,10,'Subject for Pledge Acknowledgment','2019-11-14 02:03:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(159,NULL,10,'Subject for Pledge Acknowledgment','2019-09-05 12:00:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(160,NULL,10,'Subject for Pledge Acknowledgment','2019-11-04 18:20:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(161,NULL,10,'Subject for Pledge Acknowledgment','2019-09-02 20:02:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(162,NULL,9,'Subject for Tell a Friend','2019-08-04 07:24:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(163,NULL,10,'Subject for Pledge Acknowledgment','2019-12-30 12:40:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(164,NULL,9,'Subject for Tell a Friend','2020-01-13 09:55:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:03','2020-07-24 05:34:03'),(165,NULL,9,'Subject for Tell a Friend','2020-05-22 02:13:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(166,NULL,10,'Subject for Pledge Acknowledgment','2020-03-07 20:20:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(167,NULL,9,'Subject for Tell a Friend','2019-12-07 17:37:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(168,NULL,9,'Subject for Tell a Friend','2020-01-23 05:29:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(169,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 01:58:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(170,NULL,10,'Subject for Pledge Acknowledgment','2020-05-02 05:51:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(171,NULL,9,'Subject for Tell a Friend','2020-02-23 09:46:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(172,NULL,10,'Subject for Pledge Acknowledgment','2020-02-19 18:24:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(173,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 01:44:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(174,NULL,9,'Subject for Tell a Friend','2019-12-20 10:58:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(175,NULL,10,'Subject for Pledge Acknowledgment','2019-12-13 01:20:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(176,NULL,9,'Subject for Tell a Friend','2019-09-08 10:07:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(177,NULL,10,'Subject for Pledge Acknowledgment','2019-11-07 14:17:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(178,NULL,9,'Subject for Tell a Friend','2019-12-11 02:01:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(179,NULL,10,'Subject for Pledge Acknowledgment','2019-11-20 00:32:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(180,NULL,10,'Subject for Pledge Acknowledgment','2020-05-20 05:10:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(181,NULL,9,'Subject for Tell a Friend','2019-08-09 15:29:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(182,NULL,10,'Subject for Pledge Acknowledgment','2019-12-08 14:38:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(183,NULL,9,'Subject for Tell a Friend','2020-06-27 14:10:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(184,NULL,10,'Subject for Pledge Acknowledgment','2019-09-18 01:16:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(185,NULL,10,'Subject for Pledge Acknowledgment','2020-06-26 06:46:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(186,NULL,9,'Subject for Tell a Friend','2020-01-27 11:13:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(187,NULL,9,'Subject for Tell a Friend','2019-07-31 00:01:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(188,NULL,10,'Subject for Pledge Acknowledgment','2019-07-31 03:25:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(189,NULL,9,'Subject for Tell a Friend','2020-06-29 10:20:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(190,NULL,9,'Subject for Tell a Friend','2020-01-10 02:53:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(191,NULL,10,'Subject for Pledge Acknowledgment','2020-02-25 13:46:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(192,NULL,10,'Subject for Pledge Acknowledgment','2020-05-31 10:43:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(193,NULL,9,'Subject for Tell a Friend','2019-11-23 11:48:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(194,NULL,10,'Subject for Pledge Acknowledgment','2019-12-14 14:32:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(195,NULL,10,'Subject for Pledge Acknowledgment','2020-03-11 19:59:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(196,NULL,9,'Subject for Tell a Friend','2020-07-19 16:48:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(197,NULL,10,'Subject for Pledge Acknowledgment','2020-07-06 05:44:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(198,NULL,9,'Subject for Tell a Friend','2020-04-12 17:17:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(199,NULL,10,'Subject for Pledge Acknowledgment','2020-02-07 08:00:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(200,NULL,9,'Subject for Tell a Friend','2020-03-01 09:47:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(201,NULL,9,'Subject for Tell a Friend','2019-11-17 03:20:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(202,NULL,9,'Subject for Tell a Friend','2020-05-19 11:32:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(203,NULL,10,'Subject for Pledge Acknowledgment','2020-06-12 16:55:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(204,NULL,9,'Subject for Tell a Friend','2020-03-11 19:26:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(205,NULL,9,'Subject for Tell a Friend','2020-04-08 08:16:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(206,NULL,9,'Subject for Tell a Friend','2020-06-30 04:29:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(207,NULL,10,'Subject for Pledge Acknowledgment','2020-02-11 02:21:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(208,NULL,10,'Subject for Pledge Acknowledgment','2020-01-11 21:31:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(209,NULL,9,'Subject for Tell a Friend','2019-09-02 16:14:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(210,NULL,10,'Subject for Pledge Acknowledgment','2020-06-05 16:10:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(211,NULL,10,'Subject for Pledge Acknowledgment','2019-11-20 17:01:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(212,NULL,10,'Subject for Pledge Acknowledgment','2020-03-07 17:14:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(213,NULL,9,'Subject for Tell a Friend','2020-05-09 23:38:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(214,NULL,9,'Subject for Tell a Friend','2019-10-27 17:22:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(215,NULL,10,'Subject for Pledge Acknowledgment','2020-06-28 16:21:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(216,NULL,9,'Subject for Tell a Friend','2019-11-14 23:18:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(217,NULL,10,'Subject for Pledge Acknowledgment','2020-01-22 09:26:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(218,NULL,9,'Subject for Tell a Friend','2019-12-30 22:38:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(219,NULL,10,'Subject for Pledge Acknowledgment','2020-05-29 16:35:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(220,NULL,9,'Subject for Tell a Friend','2019-08-22 08:39:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(221,NULL,10,'Subject for Pledge Acknowledgment','2020-06-12 09:26:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(222,NULL,10,'Subject for Pledge Acknowledgment','2020-04-16 20:38:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(223,NULL,9,'Subject for Tell a Friend','2020-02-07 05:03:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(224,NULL,10,'Subject for Pledge Acknowledgment','2020-07-06 12:55:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(225,NULL,9,'Subject for Tell a Friend','2020-06-19 11:31:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(226,NULL,10,'Subject for Pledge Acknowledgment','2020-02-23 18:01:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(227,NULL,10,'Subject for Pledge Acknowledgment','2020-06-26 14:42:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(228,NULL,10,'Subject for Pledge Acknowledgment','2019-11-06 23:22:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(229,NULL,9,'Subject for Tell a Friend','2019-08-08 11:36:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(230,NULL,9,'Subject for Tell a Friend','2020-05-27 01:43:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(231,NULL,10,'Subject for Pledge Acknowledgment','2019-11-20 04:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(232,NULL,9,'Subject for Tell a Friend','2020-01-15 13:23:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(233,NULL,9,'Subject for Tell a Friend','2019-08-14 16:16:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(234,NULL,9,'Subject for Tell a Friend','2020-07-03 19:32:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(235,NULL,9,'Subject for Tell a Friend','2019-09-06 19:28:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(236,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 00:44:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(237,NULL,10,'Subject for Pledge Acknowledgment','2020-05-01 22:31:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(238,NULL,9,'Subject for Tell a Friend','2020-04-28 23:59:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(239,NULL,10,'Subject for Pledge Acknowledgment','2020-03-08 04:37:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(240,NULL,9,'Subject for Tell a Friend','2019-12-07 22:06:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(241,NULL,9,'Subject for Tell a Friend','2020-02-29 20:52:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(242,NULL,9,'Subject for Tell a Friend','2020-06-12 21:13:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(243,NULL,9,'Subject for Tell a Friend','2020-06-13 08:27:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(244,NULL,10,'Subject for Pledge Acknowledgment','2019-10-29 18:25:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(245,NULL,9,'Subject for Tell a Friend','2020-06-28 09:05:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(246,NULL,10,'Subject for Pledge Acknowledgment','2020-06-23 03:41:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(247,NULL,9,'Subject for Tell a Friend','2020-05-17 06:36:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(248,NULL,9,'Subject for Tell a Friend','2019-12-07 12:45:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(249,NULL,9,'Subject for Tell a Friend','2019-10-10 07:28:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(250,NULL,9,'Subject for Tell a Friend','2020-01-27 08:09:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(251,NULL,9,'Subject for Tell a Friend','2020-05-06 10:14:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(252,NULL,10,'Subject for Pledge Acknowledgment','2020-02-11 08:57:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(253,NULL,9,'Subject for Tell a Friend','2019-09-19 13:01:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(254,NULL,10,'Subject for Pledge Acknowledgment','2020-02-06 19:48:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(255,NULL,10,'Subject for Pledge Acknowledgment','2020-03-21 10:07:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(256,NULL,9,'Subject for Tell a Friend','2020-04-26 07:02:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(257,NULL,10,'Subject for Pledge Acknowledgment','2019-10-03 03:50:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(258,NULL,10,'Subject for Pledge Acknowledgment','2019-09-14 20:44:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(259,NULL,9,'Subject for Tell a Friend','2020-01-21 02:50:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(260,NULL,9,'Subject for Tell a Friend','2019-10-18 20:45:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(261,NULL,9,'Subject for Tell a Friend','2019-11-04 21:46:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(262,NULL,9,'Subject for Tell a Friend','2019-09-19 16:50:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(263,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 05:54:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(264,NULL,10,'Subject for Pledge Acknowledgment','2019-12-09 20:53:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(265,NULL,9,'Subject for Tell a Friend','2020-05-27 22:39:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(266,NULL,10,'Subject for Pledge Acknowledgment','2019-09-05 22:01:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(267,NULL,9,'Subject for Tell a Friend','2019-12-19 23:37:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(268,NULL,9,'Subject for Tell a Friend','2020-01-13 08:31:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(269,NULL,10,'Subject for Pledge Acknowledgment','2019-12-16 23:57:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(270,NULL,9,'Subject for Tell a Friend','2020-07-22 20:24:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(271,NULL,10,'Subject for Pledge Acknowledgment','2020-04-05 19:39:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(272,NULL,9,'Subject for Tell a Friend','2019-09-14 20:38:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(273,NULL,10,'Subject for Pledge Acknowledgment','2020-01-21 06:14:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(274,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 05:43:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(275,NULL,10,'Subject for Pledge Acknowledgment','2020-02-08 01:11:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(276,NULL,10,'Subject for Pledge Acknowledgment','2020-05-06 03:12:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(277,NULL,10,'Subject for Pledge Acknowledgment','2020-06-27 01:08:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(278,NULL,10,'Subject for Pledge Acknowledgment','2019-11-04 02:21:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(279,NULL,9,'Subject for Tell a Friend','2020-03-10 08:13:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(280,NULL,10,'Subject for Pledge Acknowledgment','2019-12-17 00:22:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(281,NULL,10,'Subject for Pledge Acknowledgment','2019-11-05 08:09:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(282,NULL,9,'Subject for Tell a Friend','2020-02-07 20:17:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(283,NULL,9,'Subject for Tell a Friend','2020-03-31 02:35:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(284,NULL,9,'Subject for Tell a Friend','2019-08-29 22:50:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(285,NULL,10,'Subject for Pledge Acknowledgment','2020-07-07 17:26:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(286,NULL,10,'Subject for Pledge Acknowledgment','2019-09-07 06:13:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(287,NULL,10,'Subject for Pledge Acknowledgment','2020-04-12 02:30:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(288,NULL,10,'Subject for Pledge Acknowledgment','2019-09-29 03:07:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(289,NULL,9,'Subject for Tell a Friend','2019-10-15 09:15:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(290,NULL,9,'Subject for Tell a Friend','2019-10-07 17:32:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(291,NULL,10,'Subject for Pledge Acknowledgment','2019-08-17 03:43:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(292,NULL,9,'Subject for Tell a Friend','2019-12-21 06:36:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(293,NULL,10,'Subject for Pledge Acknowledgment','2020-03-28 13:15:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(294,NULL,10,'Subject for Pledge Acknowledgment','2020-07-01 01:51:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(295,NULL,10,'Subject for Pledge Acknowledgment','2020-01-17 14:41:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(296,NULL,9,'Subject for Tell a Friend','2019-09-26 17:24:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(297,NULL,9,'Subject for Tell a Friend','2019-12-21 16:03:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(298,NULL,9,'Subject for Tell a Friend','2020-04-21 21:33:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(299,NULL,9,'Subject for Tell a Friend','2020-02-14 20:10:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(300,NULL,10,'Subject for Pledge Acknowledgment','2020-01-24 14:23:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(301,NULL,9,'Subject for Tell a Friend','2019-12-01 21:35:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(302,NULL,10,'Subject for Pledge Acknowledgment','2020-02-14 21:34:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(303,NULL,10,'Subject for Pledge Acknowledgment','2020-04-08 14:59:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(304,NULL,9,'Subject for Tell a Friend','2020-02-29 19:42:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(305,NULL,10,'Subject for Pledge Acknowledgment','2020-03-05 05:50:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(306,NULL,10,'Subject for Pledge Acknowledgment','2019-08-06 00:49:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(307,NULL,9,'Subject for Tell a Friend','2020-01-07 20:38:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(308,NULL,10,'Subject for Pledge Acknowledgment','2020-01-24 22:18:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(309,NULL,9,'Subject for Tell a Friend','2020-07-16 16:49:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(310,NULL,10,'Subject for Pledge Acknowledgment','2020-02-05 12:19:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(311,NULL,10,'Subject for Pledge Acknowledgment','2019-08-30 17:55:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(312,NULL,9,'Subject for Tell a Friend','2020-02-26 10:22:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(313,NULL,10,'Subject for Pledge Acknowledgment','2020-05-23 08:57:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(314,NULL,9,'Subject for Tell a Friend','2020-03-05 17:20:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(315,NULL,10,'Subject for Pledge Acknowledgment','2020-05-17 01:32:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(316,NULL,10,'Subject for Pledge Acknowledgment','2020-01-14 23:30:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(317,NULL,9,'Subject for Tell a Friend','2020-02-18 06:24:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(318,NULL,9,'Subject for Tell a Friend','2020-06-19 11:37:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(319,NULL,9,'Subject for Tell a Friend','2019-09-29 08:14:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(320,NULL,9,'Subject for Tell a Friend','2020-02-22 00:37:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(321,NULL,10,'Subject for Pledge Acknowledgment','2019-12-08 18:25:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(322,NULL,10,'Subject for Pledge Acknowledgment','2019-10-17 10:56:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(323,NULL,10,'Subject for Pledge Acknowledgment','2020-04-23 01:57:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(324,NULL,10,'Subject for Pledge Acknowledgment','2020-06-27 17:47:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(325,NULL,10,'Subject for Pledge Acknowledgment','2020-03-19 18:32:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(326,NULL,10,'Subject for Pledge Acknowledgment','2019-09-17 22:07:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(327,NULL,10,'Subject for Pledge Acknowledgment','2019-11-13 18:58:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(328,NULL,10,'Subject for Pledge Acknowledgment','2020-04-08 04:02:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(329,NULL,10,'Subject for Pledge Acknowledgment','2020-04-01 09:38:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(330,NULL,9,'Subject for Tell a Friend','2020-07-22 05:32:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(331,NULL,9,'Subject for Tell a Friend','2019-10-16 20:27:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(332,NULL,10,'Subject for Pledge Acknowledgment','2020-05-11 22:33:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(333,NULL,10,'Subject for Pledge Acknowledgment','2020-01-30 06:55:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(334,NULL,10,'Subject for Pledge Acknowledgment','2020-04-24 18:48:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(335,NULL,10,'Subject for Pledge Acknowledgment','2019-09-28 14:50:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(336,NULL,9,'Subject for Tell a Friend','2019-08-12 20:49:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(337,NULL,9,'Subject for Tell a Friend','2019-11-13 10:04:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(338,NULL,10,'Subject for Pledge Acknowledgment','2020-02-08 16:21:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(339,NULL,10,'Subject for Pledge Acknowledgment','2020-06-29 19:20:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(340,NULL,10,'Subject for Pledge Acknowledgment','2019-08-22 01:48:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(341,NULL,9,'Subject for Tell a Friend','2019-10-25 08:48:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(342,NULL,10,'Subject for Pledge Acknowledgment','2020-05-31 11:03:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(343,NULL,9,'Subject for Tell a Friend','2019-08-18 03:55:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(344,NULL,9,'Subject for Tell a Friend','2019-07-30 00:06:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(345,NULL,9,'Subject for Tell a Friend','2019-10-12 17:31:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(346,NULL,9,'Subject for Tell a Friend','2019-10-27 18:37:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(347,NULL,10,'Subject for Pledge Acknowledgment','2020-06-09 01:47:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(348,NULL,9,'Subject for Tell a Friend','2020-06-02 23:04:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(349,NULL,9,'Subject for Tell a Friend','2020-01-20 04:15:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(350,NULL,10,'Subject for Pledge Acknowledgment','2020-06-27 05:57:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(351,NULL,10,'Subject for Pledge Acknowledgment','2020-01-25 12:44:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(352,NULL,10,'Subject for Pledge Acknowledgment','2020-01-28 17:13:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(353,NULL,10,'Subject for Pledge Acknowledgment','2020-01-14 21:30:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(354,NULL,10,'Subject for Pledge Acknowledgment','2020-03-10 11:48:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(355,NULL,10,'Subject for Pledge Acknowledgment','2020-06-22 18:03:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(356,NULL,9,'Subject for Tell a Friend','2020-04-09 08:16:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(357,NULL,9,'Subject for Tell a Friend','2019-11-28 20:50:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(358,NULL,10,'Subject for Pledge Acknowledgment','2020-05-31 07:03:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(359,NULL,10,'Subject for Pledge Acknowledgment','2019-10-23 11:48:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(360,NULL,9,'Subject for Tell a Friend','2019-11-18 11:48:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(361,NULL,10,'Subject for Pledge Acknowledgment','2019-08-22 01:51:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(362,NULL,10,'Subject for Pledge Acknowledgment','2020-02-18 17:40:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(363,NULL,10,'Subject for Pledge Acknowledgment','2019-10-23 04:11:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(364,NULL,10,'Subject for Pledge Acknowledgment','2020-02-07 14:10:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(365,NULL,10,'Subject for Pledge Acknowledgment','2020-05-14 20:15:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(366,NULL,9,'Subject for Tell a Friend','2020-05-05 23:45:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(367,NULL,10,'Subject for Pledge Acknowledgment','2019-09-24 07:43:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(368,NULL,10,'Subject for Pledge Acknowledgment','2020-06-10 04:34:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(369,NULL,10,'Subject for Pledge Acknowledgment','2019-08-08 11:17:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(370,NULL,10,'Subject for Pledge Acknowledgment','2020-04-08 08:41:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(371,NULL,10,'Subject for Pledge Acknowledgment','2020-06-13 22:12:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(372,NULL,9,'Subject for Tell a Friend','2020-05-30 07:26:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(373,NULL,9,'Subject for Tell a Friend','2020-04-09 09:28:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(374,NULL,10,'Subject for Pledge Acknowledgment','2020-03-15 22:12:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(375,NULL,10,'Subject for Pledge Acknowledgment','2019-09-05 18:06:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(376,NULL,9,'Subject for Tell a Friend','2020-06-12 22:31:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(377,NULL,10,'Subject for Pledge Acknowledgment','2019-11-29 07:58:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(378,NULL,9,'Subject for Tell a Friend','2020-05-28 04:19:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(379,NULL,9,'Subject for Tell a Friend','2019-09-02 12:53:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(380,NULL,9,'Subject for Tell a Friend','2019-10-05 03:57:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(381,NULL,9,'Subject for Tell a Friend','2019-12-15 02:41:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(382,NULL,9,'Subject for Tell a Friend','2020-06-18 14:58:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(383,NULL,10,'Subject for Pledge Acknowledgment','2019-12-25 10:03:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(384,NULL,10,'Subject for Pledge Acknowledgment','2020-07-22 08:38:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(385,NULL,10,'Subject for Pledge Acknowledgment','2020-03-22 19:02:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(386,NULL,9,'Subject for Tell a Friend','2020-04-02 17:16:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(387,NULL,10,'Subject for Pledge Acknowledgment','2019-11-16 08:11:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(388,NULL,10,'Subject for Pledge Acknowledgment','2020-05-18 08:39:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(389,NULL,10,'Subject for Pledge Acknowledgment','2019-09-24 02:32:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(390,NULL,9,'Subject for Tell a Friend','2020-07-03 14:14:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(391,NULL,10,'Subject for Pledge Acknowledgment','2019-08-20 12:40:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(392,NULL,10,'Subject for Pledge Acknowledgment','2019-08-02 01:56:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(393,NULL,9,'Subject for Tell a Friend','2020-06-09 22:00:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(394,NULL,10,'Subject for Pledge Acknowledgment','2020-05-05 23:00:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(395,NULL,9,'Subject for Tell a Friend','2019-07-31 09:57:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(396,NULL,9,'Subject for Tell a Friend','2020-03-05 04:12:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(397,NULL,9,'Subject for Tell a Friend','2020-04-02 17:34:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(398,NULL,10,'Subject for Pledge Acknowledgment','2020-05-04 10:26:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(399,NULL,10,'Subject for Pledge Acknowledgment','2019-11-16 18:32:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(400,NULL,9,'Subject for Tell a Friend','2020-05-23 19:16:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(401,NULL,9,'Subject for Tell a Friend','2019-08-30 22:46:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(402,NULL,10,'Subject for Pledge Acknowledgment','2020-04-08 15:29:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(403,NULL,9,'Subject for Tell a Friend','2020-02-16 04:02:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(404,NULL,10,'Subject for Pledge Acknowledgment','2019-12-26 07:54:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(405,NULL,10,'Subject for Pledge Acknowledgment','2019-12-18 16:37:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(406,NULL,10,'Subject for Pledge Acknowledgment','2019-08-08 16:44:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(407,NULL,9,'Subject for Tell a Friend','2020-04-19 04:26:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(408,NULL,9,'Subject for Tell a Friend','2020-03-25 23:46:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(409,NULL,10,'Subject for Pledge Acknowledgment','2020-02-26 12:32:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(410,NULL,9,'Subject for Tell a Friend','2019-10-06 18:55:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(411,NULL,10,'Subject for Pledge Acknowledgment','2020-01-13 02:54:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(412,NULL,9,'Subject for Tell a Friend','2019-07-30 11:10:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(413,NULL,10,'Subject for Pledge Acknowledgment','2020-07-02 20:51:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(414,NULL,10,'Subject for Pledge Acknowledgment','2020-03-28 14:14:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(415,NULL,10,'Subject for Pledge Acknowledgment','2019-10-29 11:43:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(416,NULL,9,'Subject for Tell a Friend','2020-07-03 09:41:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(417,NULL,9,'Subject for Tell a Friend','2020-01-25 20:49:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(418,NULL,10,'Subject for Pledge Acknowledgment','2020-02-04 07:28:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(419,NULL,9,'Subject for Tell a Friend','2019-09-17 21:01:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(420,NULL,9,'Subject for Tell a Friend','2019-12-10 11:40:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(421,NULL,10,'Subject for Pledge Acknowledgment','2020-05-15 20:52:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(422,NULL,10,'Subject for Pledge Acknowledgment','2020-04-13 21:09:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(423,NULL,9,'Subject for Tell a Friend','2020-06-03 21:24:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(424,NULL,10,'Subject for Pledge Acknowledgment','2019-08-23 01:19:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(425,NULL,10,'Subject for Pledge Acknowledgment','2019-10-13 18:46:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(426,NULL,9,'Subject for Tell a Friend','2020-03-26 09:54:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(427,NULL,10,'Subject for Pledge Acknowledgment','2019-10-12 08:31:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(428,NULL,10,'Subject for Pledge Acknowledgment','2019-10-29 00:26:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(429,NULL,9,'Subject for Tell a Friend','2020-07-02 11:54:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(430,NULL,10,'Subject for Pledge Acknowledgment','2019-12-20 06:30:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(431,NULL,10,'Subject for Pledge Acknowledgment','2020-04-21 02:15:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(432,NULL,10,'Subject for Pledge Acknowledgment','2020-01-19 14:07:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(433,NULL,9,'Subject for Tell a Friend','2020-07-17 01:52:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(434,NULL,9,'Subject for Tell a Friend','2019-11-09 15:37:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(435,NULL,10,'Subject for Pledge Acknowledgment','2019-08-29 11:56:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(436,NULL,9,'Subject for Tell a Friend','2019-10-06 13:22:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(437,NULL,9,'Subject for Tell a Friend','2020-07-14 03:54:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(438,NULL,10,'Subject for Pledge Acknowledgment','2019-10-18 16:58:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(439,NULL,9,'Subject for Tell a Friend','2020-02-12 15:48:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(440,NULL,10,'Subject for Pledge Acknowledgment','2019-08-08 09:50:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(441,NULL,10,'Subject for Pledge Acknowledgment','2019-10-15 01:03:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(442,NULL,9,'Subject for Tell a Friend','2020-01-30 01:44:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(443,NULL,9,'Subject for Tell a Friend','2020-06-10 21:00:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(444,NULL,10,'Subject for Pledge Acknowledgment','2019-12-09 16:05:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(445,NULL,9,'Subject for Tell a Friend','2020-02-10 03:53:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(446,NULL,10,'Subject for Pledge Acknowledgment','2019-08-12 20:53:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(447,NULL,9,'Subject for Tell a Friend','2020-03-19 16:30:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(448,NULL,9,'Subject for Tell a Friend','2019-12-23 14:30:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(449,NULL,10,'Subject for Pledge Acknowledgment','2019-12-08 21:53:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(450,NULL,9,'Subject for Tell a Friend','2020-06-28 01:45:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(451,1,6,'$ 125.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(452,2,6,'$ 50.00-Online: Save the Penguins','2010-03-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(453,3,6,'$ 25.00-Apr 2007 Mailer 1','2010-04-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(454,4,6,'$ 50.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(455,5,6,'$ 500.00-Apr 2007 Mailer 1','2010-04-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(456,6,6,'$ 175.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(457,7,6,'$ 50.00-Online: Save the Penguins','2010-03-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(458,8,6,'$ 10.00-Online: Save the Penguins','2010-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(459,9,6,'$ 250.00-Online: Save the Penguins','2010-04-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(460,10,6,NULL,'2009-07-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(461,11,6,NULL,'2009-07-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(462,12,6,NULL,'2009-10-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(463,13,6,NULL,'2009-12-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(464,1,7,'General','2020-07-24 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(465,2,7,'Student','2020-07-23 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(466,3,7,'General','2020-07-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(467,4,7,'Student','2020-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(468,5,7,'General','2018-06-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(469,6,7,'Student','2020-07-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(470,7,7,'General','2020-07-18 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(471,8,7,'Student','2020-07-17 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(472,9,7,'General','2020-07-16 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(473,10,7,'General','2018-05-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(474,11,7,'Lifetime','2020-07-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(475,12,7,'Student','2020-07-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(476,13,7,'General','2020-07-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(477,14,7,'Student','2020-07-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(478,15,7,'General','2018-04-03 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(479,16,7,'Student','2020-07-09 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(480,17,7,'General','2020-07-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(481,18,7,'Student','2020-07-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(482,19,7,'General','2020-07-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(483,20,7,'Student','2019-07-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(484,21,7,'General','2020-07-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(485,22,7,'Lifetime','2020-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(486,23,7,'General','2020-07-02 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(487,24,7,'Student','2020-07-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(488,25,7,'General','2018-01-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(489,26,7,'Student','2020-06-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(490,27,7,'General','2020-06-28 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(491,28,7,'Student','2020-06-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(492,29,7,'General','2020-06-26 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(493,30,7,'Student','2019-06-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(494,14,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(495,15,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(496,16,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(497,17,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(498,18,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(499,19,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(500,20,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(501,21,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(502,22,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(503,23,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(504,24,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(505,25,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(506,26,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(507,27,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(508,28,6,'$ 100.00 - General Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(509,29,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(510,30,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(511,31,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(512,32,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(513,33,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(514,34,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(515,35,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(516,36,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(517,37,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(518,38,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(519,39,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(520,40,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(521,41,6,'$ 50.00 - Student Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(522,42,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(523,43,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(525,1,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(526,2,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(527,3,5,'NULL','2008-05-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(528,4,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(529,5,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(530,6,5,'NULL','2008-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(531,7,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(532,8,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(533,9,5,'NULL','2008-02-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(534,10,5,'NULL','2008-02-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(535,11,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(536,12,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(537,13,5,'NULL','2008-06-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(538,14,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(539,15,5,'NULL','2008-07-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(540,16,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(541,17,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(542,18,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(543,19,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(544,20,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(545,21,5,'NULL','2008-03-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(546,22,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(547,23,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(548,24,5,'NULL','2008-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(549,25,5,'NULL','2008-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(550,26,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(551,27,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(552,28,5,'NULL','2009-12-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(553,29,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(554,30,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(555,31,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(556,32,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(557,33,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(558,34,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(559,35,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(560,36,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(561,37,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(562,38,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(563,39,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(564,40,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(565,41,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(566,42,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(567,43,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(568,44,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(569,45,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(570,46,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(571,47,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(572,48,5,'NULL','2009-12-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(573,49,5,'NULL','2009-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(574,50,5,'NULL','2009-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(575,45,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(576,46,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(577,47,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(578,48,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(579,49,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(580,50,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(581,51,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(582,52,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(583,53,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(584,54,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(585,55,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(586,56,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(587,57,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(588,58,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(589,59,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(590,60,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(591,61,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(592,62,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(593,63,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(594,64,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(595,65,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(596,66,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(597,67,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(598,68,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(599,69,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(600,70,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(601,71,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(602,72,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(603,73,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(604,74,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(605,75,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(606,76,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(607,77,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(608,78,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(609,79,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(610,80,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(611,81,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(612,82,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(613,83,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(614,84,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(615,85,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(616,86,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(617,87,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(618,88,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(619,89,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(620,90,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(621,91,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(622,92,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(623,93,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04'),(624,94,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-07-24 15:34:04',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-07-24 05:34:04','2020-07-24 05:34:04');
+INSERT INTO `civicrm_activity` (`id`, `source_record_id`, `activity_type_id`, `subject`, `activity_date_time`, `duration`, `location`, `phone_id`, `phone_number`, `details`, `status_id`, `priority_id`, `parent_id`, `is_test`, `medium_id`, `is_auto`, `relationship_id`, `is_current_revision`, `original_id`, `result`, `is_deleted`, `campaign_id`, `engagement_level`, `weight`, `is_star`, `created_date`, `modified_date`) VALUES (1,NULL,9,'Subject for Tell a Friend','2019-10-16 13:50:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(2,NULL,9,'Subject for Tell a Friend','2020-08-26 00:37:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(3,NULL,9,'Subject for Tell a Friend','2020-07-13 14:58:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(4,NULL,9,'Subject for Tell a Friend','2020-07-12 02:50:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(5,NULL,9,'Subject for Tell a Friend','2020-07-25 09:34:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(6,NULL,9,'Subject for Tell a Friend','2020-07-24 01:55:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(7,NULL,10,'Subject for Pledge Acknowledgment','2019-11-19 17:52:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(8,NULL,9,'Subject for Tell a Friend','2020-03-01 13:28:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(9,NULL,10,'Subject for Pledge Acknowledgment','2019-10-17 21:59:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(10,NULL,9,'Subject for Tell a Friend','2020-07-24 11:46:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(11,NULL,10,'Subject for Pledge Acknowledgment','2020-08-02 04:57:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(12,NULL,9,'Subject for Tell a Friend','2019-11-07 20:00:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(13,NULL,9,'Subject for Tell a Friend','2020-02-07 01:01:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(14,NULL,9,'Subject for Tell a Friend','2019-11-24 05:56:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(15,NULL,10,'Subject for Pledge Acknowledgment','2020-05-05 20:47:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(16,NULL,9,'Subject for Tell a Friend','2020-04-01 22:46:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(17,NULL,10,'Subject for Pledge Acknowledgment','2019-12-02 09:16:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(18,NULL,10,'Subject for Pledge Acknowledgment','2019-11-27 14:24:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(19,NULL,9,'Subject for Tell a Friend','2020-04-20 23:10:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(20,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 08:12:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(21,NULL,9,'Subject for Tell a Friend','2019-10-04 17:38:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(22,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 10:45:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(23,NULL,9,'Subject for Tell a Friend','2020-04-24 11:33:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(24,NULL,9,'Subject for Tell a Friend','2020-07-09 23:04:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(25,NULL,10,'Subject for Pledge Acknowledgment','2019-12-19 16:39:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(26,NULL,10,'Subject for Pledge Acknowledgment','2020-02-12 21:52:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(27,NULL,10,'Subject for Pledge Acknowledgment','2020-02-24 15:16:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(28,NULL,10,'Subject for Pledge Acknowledgment','2020-03-10 05:00:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(29,NULL,10,'Subject for Pledge Acknowledgment','2019-10-15 16:01:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(30,NULL,9,'Subject for Tell a Friend','2020-05-24 05:47:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(31,NULL,10,'Subject for Pledge Acknowledgment','2020-05-11 19:54:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(32,NULL,10,'Subject for Pledge Acknowledgment','2020-03-23 15:30:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(33,NULL,10,'Subject for Pledge Acknowledgment','2019-11-25 02:03:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(34,NULL,9,'Subject for Tell a Friend','2020-04-03 07:02:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(35,NULL,10,'Subject for Pledge Acknowledgment','2020-06-24 20:36:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(36,NULL,10,'Subject for Pledge Acknowledgment','2019-12-22 03:59:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(37,NULL,9,'Subject for Tell a Friend','2020-05-13 02:38:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(38,NULL,10,'Subject for Pledge Acknowledgment','2019-09-21 10:35:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(39,NULL,9,'Subject for Tell a Friend','2020-08-18 11:16:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(40,NULL,9,'Subject for Tell a Friend','2020-02-20 19:49:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(41,NULL,9,'Subject for Tell a Friend','2020-03-03 11:50:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(42,NULL,9,'Subject for Tell a Friend','2020-02-24 09:23:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(43,NULL,9,'Subject for Tell a Friend','2019-11-18 10:49:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(44,NULL,9,'Subject for Tell a Friend','2019-11-07 02:34:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(45,NULL,10,'Subject for Pledge Acknowledgment','2020-07-21 10:01:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(46,NULL,10,'Subject for Pledge Acknowledgment','2020-05-23 18:38:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(47,NULL,9,'Subject for Tell a Friend','2019-12-06 22:52:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(48,NULL,9,'Subject for Tell a Friend','2020-07-31 06:27:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(49,NULL,9,'Subject for Tell a Friend','2019-12-29 21:50:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(50,NULL,9,'Subject for Tell a Friend','2020-02-06 14:57:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(51,NULL,9,'Subject for Tell a Friend','2020-01-21 21:31:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(52,NULL,9,'Subject for Tell a Friend','2020-07-15 10:58:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(53,NULL,9,'Subject for Tell a Friend','2019-09-20 21:01:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(54,NULL,10,'Subject for Pledge Acknowledgment','2020-07-08 17:51:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(55,NULL,10,'Subject for Pledge Acknowledgment','2020-06-20 17:21:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(56,NULL,9,'Subject for Tell a Friend','2019-11-05 04:39:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(57,NULL,9,'Subject for Tell a Friend','2020-09-13 09:26:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(58,NULL,10,'Subject for Pledge Acknowledgment','2019-10-03 00:19:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(59,NULL,9,'Subject for Tell a Friend','2020-05-02 06:51:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(60,NULL,10,'Subject for Pledge Acknowledgment','2020-02-24 09:33:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(61,NULL,10,'Subject for Pledge Acknowledgment','2019-11-05 04:54:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(62,NULL,10,'Subject for Pledge Acknowledgment','2020-04-21 11:56:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(63,NULL,9,'Subject for Tell a Friend','2019-09-17 23:17:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(64,NULL,9,'Subject for Tell a Friend','2020-02-23 14:22:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(65,NULL,9,'Subject for Tell a Friend','2019-12-24 16:19:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(66,NULL,10,'Subject for Pledge Acknowledgment','2020-08-11 17:29:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(67,NULL,9,'Subject for Tell a Friend','2020-05-11 14:17:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(68,NULL,9,'Subject for Tell a Friend','2020-06-10 08:56:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(69,NULL,10,'Subject for Pledge Acknowledgment','2019-09-26 18:39:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(70,NULL,9,'Subject for Tell a Friend','2019-09-20 00:22:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(71,NULL,9,'Subject for Tell a Friend','2020-07-24 19:14:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(72,NULL,9,'Subject for Tell a Friend','2020-03-26 07:22:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(73,NULL,10,'Subject for Pledge Acknowledgment','2020-03-28 12:24:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(74,NULL,9,'Subject for Tell a Friend','2019-11-08 02:49:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(75,NULL,9,'Subject for Tell a Friend','2020-02-17 12:41:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(76,NULL,10,'Subject for Pledge Acknowledgment','2020-03-16 07:45:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(77,NULL,10,'Subject for Pledge Acknowledgment','2019-10-26 17:42:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(78,NULL,9,'Subject for Tell a Friend','2020-05-07 00:59:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(79,NULL,9,'Subject for Tell a Friend','2020-01-02 19:27:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(80,NULL,9,'Subject for Tell a Friend','2020-03-23 06:37:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(81,NULL,9,'Subject for Tell a Friend','2020-03-17 03:56:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(82,NULL,9,'Subject for Tell a Friend','2020-03-11 01:47:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(83,NULL,9,'Subject for Tell a Friend','2020-01-15 12:15:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(84,NULL,10,'Subject for Pledge Acknowledgment','2020-07-01 08:40:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(85,NULL,10,'Subject for Pledge Acknowledgment','2020-03-15 03:29:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(86,NULL,9,'Subject for Tell a Friend','2020-09-03 04:38:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(87,NULL,9,'Subject for Tell a Friend','2020-02-17 20:06:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(88,NULL,10,'Subject for Pledge Acknowledgment','2020-09-02 06:50:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(89,NULL,10,'Subject for Pledge Acknowledgment','2020-03-14 20:13:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(90,NULL,9,'Subject for Tell a Friend','2020-09-13 01:11:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(91,NULL,9,'Subject for Tell a Friend','2020-04-18 01:21:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(92,NULL,10,'Subject for Pledge Acknowledgment','2020-07-27 07:34:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(93,NULL,9,'Subject for Tell a Friend','2020-03-01 10:29:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(94,NULL,9,'Subject for Tell a Friend','2019-10-16 23:54:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(95,NULL,9,'Subject for Tell a Friend','2020-03-09 21:29:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(96,NULL,10,'Subject for Pledge Acknowledgment','2020-01-06 10:43:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(97,NULL,9,'Subject for Tell a Friend','2020-05-16 10:50:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(98,NULL,9,'Subject for Tell a Friend','2020-07-25 18:40:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(99,NULL,9,'Subject for Tell a Friend','2020-07-24 09:31:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(100,NULL,10,'Subject for Pledge Acknowledgment','2020-07-27 06:02:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(101,NULL,10,'Subject for Pledge Acknowledgment','2020-05-08 18:55:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(102,NULL,9,'Subject for Tell a Friend','2020-05-25 00:35:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(103,NULL,9,'Subject for Tell a Friend','2020-01-14 08:27:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(104,NULL,9,'Subject for Tell a Friend','2020-06-15 05:27:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(105,NULL,9,'Subject for Tell a Friend','2019-10-22 03:25:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(106,NULL,9,'Subject for Tell a Friend','2020-02-14 16:40:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(107,NULL,9,'Subject for Tell a Friend','2019-10-31 20:16:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(108,NULL,9,'Subject for Tell a Friend','2019-09-28 03:14:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(109,NULL,9,'Subject for Tell a Friend','2020-09-08 11:09:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(110,NULL,10,'Subject for Pledge Acknowledgment','2020-01-09 01:47:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(111,NULL,9,'Subject for Tell a Friend','2020-04-08 09:29:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(112,NULL,9,'Subject for Tell a Friend','2019-10-04 22:00:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(113,NULL,9,'Subject for Tell a Friend','2020-01-28 08:28:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(114,NULL,9,'Subject for Tell a Friend','2019-12-22 06:33:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(115,NULL,10,'Subject for Pledge Acknowledgment','2020-07-29 23:30:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(116,NULL,9,'Subject for Tell a Friend','2020-03-10 07:20:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(117,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 04:05:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(118,NULL,9,'Subject for Tell a Friend','2020-05-14 14:15:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(119,NULL,10,'Subject for Pledge Acknowledgment','2020-04-19 15:17:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(120,NULL,10,'Subject for Pledge Acknowledgment','2020-01-23 14:35:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(121,NULL,9,'Subject for Tell a Friend','2020-06-11 02:52:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(122,NULL,9,'Subject for Tell a Friend','2020-04-25 17:51:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(123,NULL,10,'Subject for Pledge Acknowledgment','2020-03-30 20:34:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(124,NULL,9,'Subject for Tell a Friend','2019-09-22 08:02:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(125,NULL,9,'Subject for Tell a Friend','2020-05-20 02:30:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(126,NULL,10,'Subject for Pledge Acknowledgment','2020-01-11 19:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(127,NULL,9,'Subject for Tell a Friend','2020-04-23 10:53:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(128,NULL,10,'Subject for Pledge Acknowledgment','2020-07-08 00:14:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(129,NULL,10,'Subject for Pledge Acknowledgment','2020-08-05 03:46:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(130,NULL,9,'Subject for Tell a Friend','2020-04-22 05:02:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(131,NULL,10,'Subject for Pledge Acknowledgment','2019-12-01 22:48:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(132,NULL,10,'Subject for Pledge Acknowledgment','2020-06-04 21:18:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(133,NULL,9,'Subject for Tell a Friend','2020-02-20 21:15:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(134,NULL,9,'Subject for Tell a Friend','2020-02-19 21:54:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(135,NULL,9,'Subject for Tell a Friend','2020-01-02 10:44:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(136,NULL,9,'Subject for Tell a Friend','2020-04-17 06:22:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(137,NULL,9,'Subject for Tell a Friend','2019-10-18 15:10:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(138,NULL,10,'Subject for Pledge Acknowledgment','2020-06-21 20:32:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(139,NULL,9,'Subject for Tell a Friend','2019-11-01 18:24:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(140,NULL,10,'Subject for Pledge Acknowledgment','2020-07-28 08:52:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(141,NULL,10,'Subject for Pledge Acknowledgment','2019-11-24 02:43:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(142,NULL,9,'Subject for Tell a Friend','2019-10-20 13:11:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(143,NULL,10,'Subject for Pledge Acknowledgment','2020-03-01 01:56:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(144,NULL,10,'Subject for Pledge Acknowledgment','2020-03-14 18:06:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(145,NULL,9,'Subject for Tell a Friend','2019-12-24 09:33:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(146,NULL,9,'Subject for Tell a Friend','2020-09-09 06:38:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(147,NULL,9,'Subject for Tell a Friend','2020-07-29 13:10:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(148,NULL,9,'Subject for Tell a Friend','2020-06-15 16:27:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(149,NULL,9,'Subject for Tell a Friend','2019-09-30 15:23:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(150,NULL,9,'Subject for Tell a Friend','2020-06-06 21:19:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(151,NULL,10,'Subject for Pledge Acknowledgment','2020-07-07 04:57:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(152,NULL,9,'Subject for Tell a Friend','2020-07-17 17:49:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(153,NULL,10,'Subject for Pledge Acknowledgment','2019-12-06 12:55:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(154,NULL,10,'Subject for Pledge Acknowledgment','2019-12-04 22:44:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(155,NULL,9,'Subject for Tell a Friend','2020-06-17 19:25:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(156,NULL,10,'Subject for Pledge Acknowledgment','2020-05-29 17:08:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(157,NULL,10,'Subject for Pledge Acknowledgment','2019-10-07 22:18:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(158,NULL,9,'Subject for Tell a Friend','2020-08-13 20:04:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(159,NULL,9,'Subject for Tell a Friend','2020-08-27 22:29:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(160,NULL,10,'Subject for Pledge Acknowledgment','2020-09-01 05:01:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(161,NULL,9,'Subject for Tell a Friend','2020-03-27 11:17:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(162,NULL,10,'Subject for Pledge Acknowledgment','2020-07-15 23:43:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(163,NULL,9,'Subject for Tell a Friend','2019-10-13 04:20:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(164,NULL,9,'Subject for Tell a Friend','2020-04-04 01:06:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(165,NULL,10,'Subject for Pledge Acknowledgment','2020-04-27 01:02:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(166,NULL,9,'Subject for Tell a Friend','2019-11-19 02:08:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(167,NULL,10,'Subject for Pledge Acknowledgment','2020-06-24 22:55:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(168,NULL,9,'Subject for Tell a Friend','2019-11-14 01:42:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(169,NULL,9,'Subject for Tell a Friend','2020-04-13 22:38:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(170,NULL,10,'Subject for Pledge Acknowledgment','2020-07-07 22:16:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(171,NULL,9,'Subject for Tell a Friend','2019-12-13 18:42:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(172,NULL,9,'Subject for Tell a Friend','2020-05-24 12:26:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(173,NULL,10,'Subject for Pledge Acknowledgment','2019-09-25 17:10:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(174,NULL,9,'Subject for Tell a Friend','2020-04-17 21:28:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(175,NULL,10,'Subject for Pledge Acknowledgment','2020-01-18 10:02:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(176,NULL,9,'Subject for Tell a Friend','2020-09-08 18:44:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(177,NULL,10,'Subject for Pledge Acknowledgment','2020-04-08 22:55:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(178,NULL,10,'Subject for Pledge Acknowledgment','2019-12-21 03:22:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(179,NULL,10,'Subject for Pledge Acknowledgment','2020-01-29 08:31:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(180,NULL,9,'Subject for Tell a Friend','2020-05-26 07:35:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(181,NULL,10,'Subject for Pledge Acknowledgment','2020-01-01 05:28:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(182,NULL,10,'Subject for Pledge Acknowledgment','2020-09-02 10:23:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(183,NULL,9,'Subject for Tell a Friend','2020-07-09 16:15:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(184,NULL,9,'Subject for Tell a Friend','2019-09-23 15:53:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(185,NULL,9,'Subject for Tell a Friend','2020-04-20 16:55:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(186,NULL,10,'Subject for Pledge Acknowledgment','2020-01-23 17:35:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(187,NULL,10,'Subject for Pledge Acknowledgment','2020-06-14 16:26:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(188,NULL,10,'Subject for Pledge Acknowledgment','2020-07-17 16:25:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(189,NULL,9,'Subject for Tell a Friend','2020-05-06 14:10:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(190,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 01:23:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(191,NULL,9,'Subject for Tell a Friend','2020-01-22 10:42:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(192,NULL,9,'Subject for Tell a Friend','2020-07-10 09:04:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(193,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 07:19:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(194,NULL,9,'Subject for Tell a Friend','2020-08-14 21:37:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(195,NULL,9,'Subject for Tell a Friend','2020-06-08 09:23:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(196,NULL,10,'Subject for Pledge Acknowledgment','2019-11-16 03:27:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(197,NULL,10,'Subject for Pledge Acknowledgment','2020-02-13 16:59:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(198,NULL,10,'Subject for Pledge Acknowledgment','2020-01-08 05:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(199,NULL,9,'Subject for Tell a Friend','2020-02-18 05:09:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(200,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 14:19:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(201,NULL,9,'Subject for Tell a Friend','2020-09-12 05:05:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(202,NULL,10,'Subject for Pledge Acknowledgment','2019-12-11 07:35:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(203,NULL,9,'Subject for Tell a Friend','2020-07-09 16:55:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(204,NULL,10,'Subject for Pledge Acknowledgment','2020-06-21 08:46:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(205,NULL,10,'Subject for Pledge Acknowledgment','2020-01-15 17:00:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(206,NULL,10,'Subject for Pledge Acknowledgment','2019-11-13 01:26:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(207,NULL,10,'Subject for Pledge Acknowledgment','2020-05-15 10:18:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(208,NULL,10,'Subject for Pledge Acknowledgment','2020-03-31 13:18:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(209,NULL,9,'Subject for Tell a Friend','2019-12-01 20:27:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(210,NULL,9,'Subject for Tell a Friend','2020-07-04 03:20:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(211,NULL,9,'Subject for Tell a Friend','2019-11-03 07:13:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(212,NULL,10,'Subject for Pledge Acknowledgment','2020-06-26 07:36:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(213,NULL,9,'Subject for Tell a Friend','2019-11-21 09:37:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(214,NULL,9,'Subject for Tell a Friend','2020-06-25 16:40:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(215,NULL,9,'Subject for Tell a Friend','2019-10-13 01:46:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(216,NULL,9,'Subject for Tell a Friend','2019-11-23 19:58:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(217,NULL,9,'Subject for Tell a Friend','2020-03-18 05:40:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(218,NULL,9,'Subject for Tell a Friend','2020-02-15 06:56:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(219,NULL,9,'Subject for Tell a Friend','2020-02-05 22:20:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(220,NULL,10,'Subject for Pledge Acknowledgment','2020-07-04 21:54:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(221,NULL,10,'Subject for Pledge Acknowledgment','2020-09-10 20:57:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(222,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 10:50:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(223,NULL,10,'Subject for Pledge Acknowledgment','2020-08-18 07:39:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(224,NULL,9,'Subject for Tell a Friend','2020-05-14 06:48:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(225,NULL,9,'Subject for Tell a Friend','2019-12-17 14:25:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(226,NULL,10,'Subject for Pledge Acknowledgment','2019-11-11 03:32:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(227,NULL,9,'Subject for Tell a Friend','2020-01-29 15:58:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(228,NULL,10,'Subject for Pledge Acknowledgment','2020-01-13 11:36:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(229,NULL,10,'Subject for Pledge Acknowledgment','2020-01-09 07:30:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(230,NULL,9,'Subject for Tell a Friend','2020-01-17 07:26:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(231,NULL,9,'Subject for Tell a Friend','2020-03-26 21:48:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(232,NULL,10,'Subject for Pledge Acknowledgment','2020-07-05 13:02:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(233,NULL,9,'Subject for Tell a Friend','2020-08-16 06:30:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(234,NULL,10,'Subject for Pledge Acknowledgment','2020-08-16 10:17:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(235,NULL,10,'Subject for Pledge Acknowledgment','2019-12-25 01:35:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(236,NULL,10,'Subject for Pledge Acknowledgment','2020-08-13 22:44:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(237,NULL,10,'Subject for Pledge Acknowledgment','2020-07-17 09:46:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(238,NULL,10,'Subject for Pledge Acknowledgment','2019-10-28 19:22:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(239,NULL,10,'Subject for Pledge Acknowledgment','2020-05-12 08:00:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(240,NULL,9,'Subject for Tell a Friend','2020-02-06 02:38:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(241,NULL,10,'Subject for Pledge Acknowledgment','2020-08-28 20:51:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(242,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 05:44:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(243,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 00:09:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(244,NULL,10,'Subject for Pledge Acknowledgment','2020-06-18 08:27:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(245,NULL,10,'Subject for Pledge Acknowledgment','2020-05-27 22:56:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(246,NULL,10,'Subject for Pledge Acknowledgment','2020-06-22 17:21:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(247,NULL,10,'Subject for Pledge Acknowledgment','2020-02-15 14:41:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(248,NULL,9,'Subject for Tell a Friend','2019-09-27 09:04:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(249,NULL,9,'Subject for Tell a Friend','2020-07-22 10:48:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(250,NULL,10,'Subject for Pledge Acknowledgment','2019-11-08 16:20:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(251,NULL,9,'Subject for Tell a Friend','2020-06-26 00:45:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(252,NULL,9,'Subject for Tell a Friend','2019-10-05 02:54:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(253,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 06:33:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(254,NULL,9,'Subject for Tell a Friend','2020-02-11 01:01:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(255,NULL,10,'Subject for Pledge Acknowledgment','2020-01-11 20:03:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(256,NULL,9,'Subject for Tell a Friend','2019-09-26 10:20:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(257,NULL,10,'Subject for Pledge Acknowledgment','2019-12-11 18:26:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(258,NULL,10,'Subject for Pledge Acknowledgment','2020-02-27 02:43:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(259,NULL,10,'Subject for Pledge Acknowledgment','2019-10-25 10:20:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(260,NULL,9,'Subject for Tell a Friend','2020-03-18 06:22:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(261,NULL,9,'Subject for Tell a Friend','2020-01-26 00:17:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(262,NULL,10,'Subject for Pledge Acknowledgment','2020-02-12 04:08:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(263,NULL,9,'Subject for Tell a Friend','2020-04-06 13:30:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(264,NULL,10,'Subject for Pledge Acknowledgment','2020-03-21 10:05:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(265,NULL,10,'Subject for Pledge Acknowledgment','2019-10-02 22:22:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(266,NULL,9,'Subject for Tell a Friend','2020-08-19 07:44:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(267,NULL,9,'Subject for Tell a Friend','2020-06-13 14:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(268,NULL,9,'Subject for Tell a Friend','2020-02-12 15:07:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(269,NULL,9,'Subject for Tell a Friend','2019-12-09 05:21:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(270,NULL,9,'Subject for Tell a Friend','2020-08-09 03:47:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(271,NULL,9,'Subject for Tell a Friend','2019-12-25 15:19:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(272,NULL,9,'Subject for Tell a Friend','2019-11-13 00:03:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(273,NULL,10,'Subject for Pledge Acknowledgment','2020-07-13 01:29:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(274,NULL,10,'Subject for Pledge Acknowledgment','2020-04-12 04:53:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(275,NULL,9,'Subject for Tell a Friend','2020-09-11 06:45:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(276,NULL,10,'Subject for Pledge Acknowledgment','2020-06-19 19:44:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(277,NULL,10,'Subject for Pledge Acknowledgment','2020-01-03 13:28:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(278,NULL,10,'Subject for Pledge Acknowledgment','2020-07-23 23:01:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(279,NULL,10,'Subject for Pledge Acknowledgment','2019-11-14 14:57:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(280,NULL,10,'Subject for Pledge Acknowledgment','2020-02-21 17:06:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(281,NULL,9,'Subject for Tell a Friend','2019-11-19 17:16:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(282,NULL,10,'Subject for Pledge Acknowledgment','2020-01-17 22:33:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(283,NULL,9,'Subject for Tell a Friend','2020-03-13 12:03:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(284,NULL,9,'Subject for Tell a Friend','2020-06-27 07:41:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(285,NULL,10,'Subject for Pledge Acknowledgment','2019-11-24 12:03:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(286,NULL,10,'Subject for Pledge Acknowledgment','2020-02-01 16:38:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(287,NULL,9,'Subject for Tell a Friend','2020-06-28 14:48:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(288,NULL,10,'Subject for Pledge Acknowledgment','2020-01-03 13:20:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(289,NULL,10,'Subject for Pledge Acknowledgment','2020-05-09 11:25:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(290,NULL,10,'Subject for Pledge Acknowledgment','2019-12-24 01:16:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(291,NULL,10,'Subject for Pledge Acknowledgment','2019-12-04 21:44:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(292,NULL,10,'Subject for Pledge Acknowledgment','2019-11-26 09:08:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(293,NULL,9,'Subject for Tell a Friend','2020-07-26 12:41:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(294,NULL,9,'Subject for Tell a Friend','2019-10-05 03:58:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(295,NULL,9,'Subject for Tell a Friend','2020-07-12 01:43:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(296,NULL,9,'Subject for Tell a Friend','2020-06-10 02:53:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(297,NULL,9,'Subject for Tell a Friend','2020-02-16 15:44:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(298,NULL,9,'Subject for Tell a Friend','2020-02-10 06:40:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(299,NULL,9,'Subject for Tell a Friend','2019-09-24 02:23:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(300,NULL,9,'Subject for Tell a Friend','2020-09-12 03:00:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(301,NULL,9,'Subject for Tell a Friend','2020-07-23 12:48:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(302,NULL,9,'Subject for Tell a Friend','2020-04-29 10:42:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(303,NULL,9,'Subject for Tell a Friend','2019-10-28 15:05:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(304,NULL,10,'Subject for Pledge Acknowledgment','2020-09-04 19:33:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(305,NULL,10,'Subject for Pledge Acknowledgment','2020-04-21 05:02:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(306,NULL,10,'Subject for Pledge Acknowledgment','2020-06-19 13:58:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(307,NULL,10,'Subject for Pledge Acknowledgment','2020-02-28 19:50:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(308,NULL,10,'Subject for Pledge Acknowledgment','2020-02-15 03:07:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(309,NULL,9,'Subject for Tell a Friend','2020-05-05 09:48:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(310,NULL,9,'Subject for Tell a Friend','2020-05-29 19:33:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(311,NULL,9,'Subject for Tell a Friend','2020-08-19 05:44:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(312,NULL,10,'Subject for Pledge Acknowledgment','2020-05-31 09:35:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(313,NULL,10,'Subject for Pledge Acknowledgment','2020-04-29 13:22:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(314,NULL,9,'Subject for Tell a Friend','2019-10-14 17:41:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(315,NULL,10,'Subject for Pledge Acknowledgment','2020-05-07 19:54:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(316,NULL,10,'Subject for Pledge Acknowledgment','2020-01-30 23:14:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(317,NULL,10,'Subject for Pledge Acknowledgment','2019-09-29 05:05:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(318,NULL,9,'Subject for Tell a Friend','2020-03-10 07:43:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(319,NULL,9,'Subject for Tell a Friend','2020-07-03 13:15:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(320,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 06:53:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(321,NULL,9,'Subject for Tell a Friend','2020-06-03 07:47:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(322,NULL,9,'Subject for Tell a Friend','2020-05-16 23:30:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(323,NULL,9,'Subject for Tell a Friend','2020-06-19 11:44:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(324,NULL,9,'Subject for Tell a Friend','2020-06-03 15:32:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(325,NULL,10,'Subject for Pledge Acknowledgment','2019-12-25 02:56:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(326,NULL,9,'Subject for Tell a Friend','2020-06-30 15:16:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(327,NULL,9,'Subject for Tell a Friend','2020-03-08 06:26:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(328,NULL,10,'Subject for Pledge Acknowledgment','2020-05-20 11:38:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(329,NULL,10,'Subject for Pledge Acknowledgment','2019-10-28 02:53:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(330,NULL,9,'Subject for Tell a Friend','2020-07-08 15:18:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(331,NULL,9,'Subject for Tell a Friend','2020-08-23 00:45:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(332,NULL,10,'Subject for Pledge Acknowledgment','2020-06-17 15:11:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(333,NULL,9,'Subject for Tell a Friend','2020-02-19 06:01:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(334,NULL,10,'Subject for Pledge Acknowledgment','2019-12-30 22:37:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(335,NULL,9,'Subject for Tell a Friend','2019-11-11 15:43:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(336,NULL,9,'Subject for Tell a Friend','2019-10-22 22:37:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(337,NULL,9,'Subject for Tell a Friend','2020-09-07 14:45:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(338,NULL,10,'Subject for Pledge Acknowledgment','2019-10-31 19:20:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(339,NULL,9,'Subject for Tell a Friend','2020-07-04 23:18:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(340,NULL,9,'Subject for Tell a Friend','2019-10-12 01:01:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(341,NULL,10,'Subject for Pledge Acknowledgment','2020-07-01 22:30:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(342,NULL,10,'Subject for Pledge Acknowledgment','2020-04-05 13:53:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(343,NULL,9,'Subject for Tell a Friend','2020-01-23 09:00:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(344,NULL,10,'Subject for Pledge Acknowledgment','2020-08-29 06:23:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(345,NULL,10,'Subject for Pledge Acknowledgment','2020-02-14 04:19:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(346,NULL,9,'Subject for Tell a Friend','2019-12-31 10:18:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(347,NULL,9,'Subject for Tell a Friend','2020-02-09 21:18:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(348,NULL,9,'Subject for Tell a Friend','2019-12-22 10:01:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(349,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 07:54:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(350,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 09:23:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(351,NULL,9,'Subject for Tell a Friend','2020-02-25 15:14:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(352,NULL,10,'Subject for Pledge Acknowledgment','2020-07-19 02:27:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(353,NULL,10,'Subject for Pledge Acknowledgment','2020-04-14 22:08:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(354,NULL,10,'Subject for Pledge Acknowledgment','2019-09-18 20:42:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(355,NULL,9,'Subject for Tell a Friend','2020-05-29 02:48:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(356,NULL,10,'Subject for Pledge Acknowledgment','2020-07-06 20:16:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(357,NULL,9,'Subject for Tell a Friend','2020-04-24 19:52:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(358,NULL,10,'Subject for Pledge Acknowledgment','2020-08-12 02:52:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(359,NULL,10,'Subject for Pledge Acknowledgment','2020-06-18 06:58:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(360,NULL,9,'Subject for Tell a Friend','2020-04-28 15:43:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(361,NULL,10,'Subject for Pledge Acknowledgment','2019-09-27 17:15:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(362,NULL,10,'Subject for Pledge Acknowledgment','2020-03-05 04:43:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(363,NULL,9,'Subject for Tell a Friend','2020-06-13 11:19:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(364,NULL,10,'Subject for Pledge Acknowledgment','2020-05-25 17:53:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(365,NULL,9,'Subject for Tell a Friend','2020-04-11 12:47:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(366,NULL,9,'Subject for Tell a Friend','2020-05-18 14:03:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(367,NULL,10,'Subject for Pledge Acknowledgment','2019-10-06 10:00:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(368,NULL,10,'Subject for Pledge Acknowledgment','2020-05-30 07:40:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(369,NULL,10,'Subject for Pledge Acknowledgment','2019-12-10 00:31:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(370,NULL,10,'Subject for Pledge Acknowledgment','2020-09-13 11:17:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(371,NULL,10,'Subject for Pledge Acknowledgment','2020-07-21 09:00:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(372,NULL,9,'Subject for Tell a Friend','2020-03-13 23:46:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(373,NULL,10,'Subject for Pledge Acknowledgment','2019-11-23 14:02:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(374,NULL,9,'Subject for Tell a Friend','2019-12-04 07:42:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(375,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 07:25:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(376,NULL,10,'Subject for Pledge Acknowledgment','2020-05-07 20:30:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(377,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 08:53:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(378,NULL,9,'Subject for Tell a Friend','2020-05-05 15:50:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(379,NULL,10,'Subject for Pledge Acknowledgment','2020-03-15 11:12:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(380,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 09:11:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(381,NULL,10,'Subject for Pledge Acknowledgment','2019-10-13 03:45:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(382,NULL,10,'Subject for Pledge Acknowledgment','2020-07-19 05:13:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(383,NULL,9,'Subject for Tell a Friend','2020-01-15 06:24:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(384,NULL,9,'Subject for Tell a Friend','2020-08-16 16:49:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(385,NULL,10,'Subject for Pledge Acknowledgment','2020-08-18 13:40:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(386,NULL,9,'Subject for Tell a Friend','2019-12-27 13:55:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(387,NULL,10,'Subject for Pledge Acknowledgment','2020-04-01 02:38:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(388,NULL,10,'Subject for Pledge Acknowledgment','2020-05-11 13:45:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(389,NULL,9,'Subject for Tell a Friend','2020-02-24 17:06:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(390,NULL,9,'Subject for Tell a Friend','2020-01-21 19:47:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(391,NULL,9,'Subject for Tell a Friend','2020-07-07 15:17:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(392,NULL,9,'Subject for Tell a Friend','2020-02-29 20:07:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(393,NULL,9,'Subject for Tell a Friend','2019-10-11 12:38:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(394,NULL,9,'Subject for Tell a Friend','2020-01-01 13:36:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(395,NULL,10,'Subject for Pledge Acknowledgment','2019-12-29 23:54:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(396,NULL,9,'Subject for Tell a Friend','2019-12-26 03:42:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(397,NULL,10,'Subject for Pledge Acknowledgment','2020-05-17 20:49:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(398,NULL,10,'Subject for Pledge Acknowledgment','2020-08-13 14:10:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(399,NULL,10,'Subject for Pledge Acknowledgment','2019-09-26 18:30:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(400,NULL,9,'Subject for Tell a Friend','2020-03-14 23:57:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(401,NULL,9,'Subject for Tell a Friend','2020-01-04 12:54:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(402,NULL,10,'Subject for Pledge Acknowledgment','2020-04-19 03:37:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(403,NULL,9,'Subject for Tell a Friend','2020-01-02 14:13:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(404,NULL,9,'Subject for Tell a Friend','2020-06-28 17:46:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(405,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 16:31:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(406,NULL,10,'Subject for Pledge Acknowledgment','2020-02-23 11:19:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(407,NULL,9,'Subject for Tell a Friend','2020-07-18 04:21:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(408,NULL,10,'Subject for Pledge Acknowledgment','2020-08-15 14:10:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(409,NULL,9,'Subject for Tell a Friend','2020-05-16 22:11:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(410,NULL,10,'Subject for Pledge Acknowledgment','2020-01-07 16:26:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(411,NULL,10,'Subject for Pledge Acknowledgment','2020-07-13 20:54:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(412,NULL,10,'Subject for Pledge Acknowledgment','2020-02-02 12:52:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(413,NULL,9,'Subject for Tell a Friend','2019-12-27 23:18:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(414,NULL,10,'Subject for Pledge Acknowledgment','2020-03-11 17:30:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(415,NULL,9,'Subject for Tell a Friend','2020-02-28 14:05:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(416,NULL,9,'Subject for Tell a Friend','2020-04-04 04:36:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(417,NULL,9,'Subject for Tell a Friend','2020-05-20 22:30:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(418,NULL,10,'Subject for Pledge Acknowledgment','2020-05-29 09:05:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(419,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 01:16:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(420,NULL,10,'Subject for Pledge Acknowledgment','2020-01-08 16:04:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(421,NULL,9,'Subject for Tell a Friend','2020-03-05 04:19:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(422,NULL,9,'Subject for Tell a Friend','2020-01-15 22:03:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(423,NULL,10,'Subject for Pledge Acknowledgment','2019-09-24 07:29:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(424,NULL,10,'Subject for Pledge Acknowledgment','2019-09-25 01:39:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(425,NULL,9,'Subject for Tell a Friend','2020-06-07 12:04:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(426,NULL,9,'Subject for Tell a Friend','2019-12-10 06:28:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(427,NULL,10,'Subject for Pledge Acknowledgment','2020-08-10 21:11:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(428,NULL,9,'Subject for Tell a Friend','2020-08-19 15:34:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(429,NULL,10,'Subject for Pledge Acknowledgment','2020-03-22 22:09:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(430,NULL,9,'Subject for Tell a Friend','2020-05-20 06:08:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(431,NULL,9,'Subject for Tell a Friend','2020-04-17 21:40:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(432,NULL,9,'Subject for Tell a Friend','2020-04-29 13:11:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(433,NULL,10,'Subject for Pledge Acknowledgment','2020-02-29 16:27:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(434,NULL,10,'Subject for Pledge Acknowledgment','2019-10-06 05:03:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(435,NULL,9,'Subject for Tell a Friend','2019-12-31 17:28:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(436,NULL,9,'Subject for Tell a Friend','2020-06-28 15:40:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(437,NULL,10,'Subject for Pledge Acknowledgment','2020-03-11 19:44:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(438,NULL,10,'Subject for Pledge Acknowledgment','2019-12-02 17:58:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(439,NULL,10,'Subject for Pledge Acknowledgment','2019-10-21 22:11:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(440,NULL,9,'Subject for Tell a Friend','2020-07-21 18:34:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(441,NULL,10,'Subject for Pledge Acknowledgment','2020-03-28 19:15:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(442,NULL,9,'Subject for Tell a Friend','2019-11-28 22:19:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(443,NULL,10,'Subject for Pledge Acknowledgment','2020-07-17 04:35:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(444,NULL,9,'Subject for Tell a Friend','2020-01-30 02:27:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(445,NULL,10,'Subject for Pledge Acknowledgment','2019-11-22 13:28:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(446,NULL,10,'Subject for Pledge Acknowledgment','2020-05-14 21:04:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(447,NULL,10,'Subject for Pledge Acknowledgment','2019-11-12 15:02:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(448,NULL,10,'Subject for Pledge Acknowledgment','2019-12-09 17:28:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(449,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 23:34:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(450,NULL,9,'Subject for Tell a Friend','2019-11-08 05:33:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(451,1,6,'$ 125.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(452,2,6,'$ 50.00-Online: Save the Penguins','2010-03-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(453,3,6,'$ 25.00-Apr 2007 Mailer 1','2010-04-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(454,4,6,'$ 50.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(455,5,6,'$ 500.00-Apr 2007 Mailer 1','2010-04-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(456,6,6,'$ 175.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(457,7,6,'$ 50.00-Online: Save the Penguins','2010-03-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(458,8,6,'$ 10.00-Online: Save the Penguins','2010-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(459,9,6,'$ 250.00-Online: Save the Penguins','2010-04-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(460,10,6,NULL,'2009-07-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(461,11,6,NULL,'2009-07-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(462,12,6,NULL,'2009-10-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(463,13,6,NULL,'2009-12-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(464,1,7,'General','2020-09-16 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(465,2,7,'Student','2020-09-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(466,3,7,'General','2020-09-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(467,4,7,'Student','2020-09-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(468,5,7,'Student','2019-09-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(469,6,7,'Student','2020-09-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(470,7,7,'General','2020-09-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(471,8,7,'Student','2020-09-09 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(472,9,7,'General','2020-09-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(473,10,7,'Student','2019-09-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(474,11,7,'Lifetime','2020-09-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(475,12,7,'Student','2020-09-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(476,13,7,'General','2020-09-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(477,14,7,'Student','2020-09-03 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(478,15,7,'Student','2019-09-02 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(479,16,7,'Student','2020-09-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(480,17,7,'General','2020-08-31 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(481,18,7,'Student','2020-08-30 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(482,19,7,'General','2020-08-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(483,20,7,'Student','2019-08-28 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(484,21,7,'General','2020-08-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(485,22,7,'Lifetime','2020-08-26 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(486,23,7,'General','2020-08-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(487,24,7,'Student','2020-08-24 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(488,25,7,'General','2018-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(489,26,7,'Student','2020-08-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(490,27,7,'General','2020-08-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(491,28,7,'Student','2020-08-20 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(492,29,7,'General','2020-08-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(493,30,7,'Student','2019-08-18 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(494,14,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(495,15,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(496,16,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(497,17,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(498,18,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(499,19,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(500,20,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(501,21,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(502,22,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(503,23,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(504,24,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(505,25,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(506,26,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(507,27,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(508,28,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(509,29,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(510,30,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(511,31,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(512,32,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(513,33,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(514,34,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(515,35,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(516,36,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(517,37,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(518,38,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(519,39,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(520,40,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(521,41,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(522,42,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(523,43,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(525,1,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(526,2,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(527,3,5,'NULL','2008-05-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(528,4,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(529,5,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(530,6,5,'NULL','2008-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(531,7,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(532,8,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(533,9,5,'NULL','2008-02-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(534,10,5,'NULL','2008-02-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(535,11,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(536,12,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(537,13,5,'NULL','2008-06-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(538,14,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(539,15,5,'NULL','2008-07-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(540,16,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(541,17,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(542,18,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(543,19,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(544,20,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(545,21,5,'NULL','2008-03-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(546,22,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(547,23,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(548,24,5,'NULL','2008-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(549,25,5,'NULL','2008-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(550,26,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(551,27,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(552,28,5,'NULL','2009-12-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(553,29,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(554,30,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(555,31,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(556,32,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(557,33,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(558,34,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(559,35,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(560,36,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(561,37,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(562,38,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(563,39,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(564,40,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(565,41,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(566,42,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(567,43,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(568,44,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(569,45,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(570,46,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(571,47,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(572,48,5,'NULL','2009-12-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(573,49,5,'NULL','2009-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(574,50,5,'NULL','2009-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(575,45,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(576,46,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(577,47,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(578,48,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(579,49,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(580,50,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(581,51,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(582,52,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(583,53,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(584,54,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(585,55,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(586,56,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(587,57,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(588,58,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(589,59,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(590,60,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(591,61,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(592,62,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(593,63,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(594,64,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(595,65,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(596,66,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(597,67,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(598,68,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(599,69,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(600,70,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(601,71,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(602,72,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(603,73,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(604,74,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(605,75,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(606,76,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(607,77,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(608,78,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(609,79,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(610,80,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(611,81,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(612,82,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(613,83,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(614,84,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(615,85,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(616,86,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(617,87,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(618,88,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(619,89,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(620,90,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(621,91,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(622,92,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(623,93,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(624,94,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32');
 /*!40000 ALTER TABLE `civicrm_activity` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -97,7 +97,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_activity_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_activity_contact` DISABLE KEYS */;
-INSERT INTO `civicrm_activity_contact` (`id`, `activity_id`, `contact_id`, `record_type_id`) VALUES (323,214,1,3),(235,153,2,3),(562,379,2,3),(585,395,2,3),(668,451,2,2),(78,49,3,3),(86,54,3,3),(159,104,3,3),(452,299,3,3),(189,123,4,3),(263,174,4,3),(650,439,4,3),(669,452,4,2),(364,241,5,3),(684,467,5,2),(727,510,5,2),(760,543,5,2),(312,206,6,3),(670,453,6,2),(772,555,6,2),(62,39,7,3),(115,73,7,3),(698,481,7,2),(733,516,7,2),(84,53,8,3),(448,297,8,3),(640,433,8,3),(664,448,8,3),(671,454,8,2),(756,539,8,2),(303,201,9,3),(403,265,9,3),(414,272,9,3),(129,84,10,3),(33,20,11,3),(259,171,11,3),(21,13,12,3),(326,216,12,3),(514,344,12,3),(611,412,12,3),(685,468,12,2),(713,496,12,2),(667,450,13,3),(708,491,13,2),(737,520,13,2),(656,443,14,3),(196,127,15,3),(230,151,15,2),(232,152,15,2),(234,153,15,2),(236,154,15,2),(237,155,15,2),(238,156,15,2),(239,157,15,2),(240,158,15,2),(241,159,15,2),(242,160,15,2),(243,161,15,2),(244,162,15,2),(246,163,15,2),(247,164,15,2),(249,165,15,2),(251,166,15,2),(252,167,15,2),(254,168,15,2),(256,169,15,2),(257,170,15,2),(258,171,15,2),(260,172,15,2),(261,173,15,2),(262,174,15,2),(264,175,15,2),(265,176,15,2),(267,177,15,2),(268,178,15,2),(270,179,15,2),(271,180,15,2),(272,181,15,2),(273,181,15,3),(274,182,15,2),(275,183,15,2),(277,184,15,2),(278,185,15,2),(279,186,15,2),(281,187,15,2),(283,188,15,2),(284,189,15,2),(286,190,15,2),(288,191,15,2),(289,192,15,2),(290,193,15,2),(292,194,15,2),(293,195,15,2),(294,196,15,2),(296,197,15,2),(297,198,15,2),(299,199,15,2),(300,200,15,2),(302,201,15,2),(304,202,15,2),(306,203,15,2),(307,204,15,2),(309,205,15,2),(311,206,15,2),(313,207,15,2),(314,208,15,2),(315,209,15,2),(317,210,15,2),(318,211,15,2),(319,212,15,2),(320,213,15,2),(322,214,15,2),(324,215,15,2),(325,216,15,2),(327,217,15,2),(328,218,15,2),(330,219,15,2),(331,220,15,2),(333,221,15,2),(334,222,15,2),(335,223,15,2),(337,224,15,2),(338,225,15,2),(340,226,15,2),(341,227,15,2),(342,228,15,2),(343,229,15,2),(345,230,15,2),(347,231,15,2),(348,232,15,2),(350,233,15,2),(352,234,15,2),(354,235,15,2),(356,236,15,2),(357,237,15,2),(358,238,15,2),(360,239,15,2),(361,240,15,2),(363,241,15,2),(365,242,15,2),(367,243,15,2),(369,244,15,2),(370,245,15,2),(372,246,15,2),(373,247,15,2),(375,248,15,2),(377,249,15,2),(379,250,15,2),(381,251,15,2),(383,252,15,2),(384,253,15,2),(386,254,15,2),(387,255,15,2),(388,256,15,2),(390,257,15,2),(391,258,15,2),(392,259,15,2),(394,260,15,2),(396,261,15,2),(398,262,15,2),(400,263,15,2),(401,264,15,2),(402,265,15,2),(404,266,15,2),(405,267,15,2),(407,268,15,2),(409,269,15,2),(410,270,15,2),(412,271,15,2),(413,272,15,2),(415,273,15,2),(416,274,15,2),(417,275,15,2),(418,276,15,2),(419,277,15,2),(420,278,15,2),(421,279,15,2),(423,280,15,2),(424,281,15,2),(425,282,15,2),(427,283,15,2),(429,284,15,2),(431,285,15,2),(432,286,15,2),(433,287,15,2),(434,288,15,2),(435,289,15,2),(437,290,15,2),(439,291,15,2),(440,292,15,2),(442,293,15,2),(443,294,15,2),(444,295,15,2),(445,296,15,2),(447,297,15,2),(449,298,15,2),(451,299,15,2),(453,300,15,2),(35,21,16,3),(408,268,16,3),(436,289,16,3),(470,312,16,3),(512,343,16,3),(621,419,16,3),(672,455,16,2),(385,253,17,3),(696,479,17,2),(732,515,17,2),(51,32,18,3),(175,114,18,3),(177,115,18,3),(225,146,18,3),(780,563,18,2),(673,456,19,2),(768,551,19,2),(155,101,20,3),(389,256,20,3),(703,486,20,2),(722,505,20,2),(127,83,21,3),(209,134,21,3),(463,307,21,3),(518,346,21,3),(767,550,21,2),(90,56,22,3),(496,331,22,3),(473,314,23,3),(544,366,23,3),(779,562,23,2),(336,223,24,3),(344,229,24,3),(765,548,24,2),(19,12,25,3),(521,348,25,3),(149,98,26,3),(316,209,26,3),(450,298,26,3),(509,341,26,3),(568,382,28,3),(54,34,29,3),(64,40,29,3),(104,66,29,3),(109,69,29,3),(382,251,29,3),(40,24,30,3),(770,553,30,2),(205,132,31,3),(753,536,31,2),(374,247,32,3),(399,262,32,3),(679,462,32,2),(680,463,32,2),(1,1,33,2),(2,2,33,2),(4,3,33,2),(6,4,33,2),(7,5,33,2),(9,6,33,2),(10,7,33,2),(11,8,33,2),(13,9,33,2),(15,10,33,2),(17,11,33,2),(18,12,33,2),(20,13,33,2),(22,14,33,2),(23,15,33,2),(25,16,33,2),(26,17,33,2),(28,18,33,2),(30,19,33,2),(32,20,33,2),(34,21,33,2),(36,22,33,2),(37,23,33,2),(39,24,33,2),(41,25,33,2),(43,26,33,2),(44,27,33,2),(46,28,33,2),(47,29,33,2),(48,30,33,2),(49,31,33,2),(50,32,33,2),(52,33,33,2),(53,34,33,2),(55,35,33,2),(56,36,33,2),(57,37,33,2),(59,38,33,2),(61,39,33,2),(63,40,33,2),(65,41,33,2),(67,42,33,2),(68,43,33,2),(69,44,33,2),(71,45,33,2),(72,46,33,2),(74,47,33,2),(76,48,33,2),(77,49,33,2),(79,50,33,2),(81,51,33,2),(82,52,33,2),(83,53,33,2),(85,54,33,2),(87,55,33,2),(89,56,33,2),(91,57,33,2),(93,58,33,2),(94,59,33,2),(95,60,33,2),(96,61,33,2),(97,62,33,2),(98,63,33,2),(100,64,33,2),(102,65,33,2),(103,66,33,2),(105,67,33,2),(106,68,33,2),(108,69,33,2),(110,70,33,2),(111,71,33,2),(112,72,33,2),(114,73,33,2),(116,74,33,2),(117,75,33,2),(118,76,33,2),(119,77,33,2),(120,78,33,2),(122,79,33,2),(123,80,33,2),(124,81,33,2),(125,82,33,2),(126,83,33,2),(128,84,33,2),(130,85,33,2),(131,86,33,2),(132,87,33,2),(133,88,33,2),(134,89,33,2),(135,90,33,2),(137,91,33,2),(138,92,33,2),(140,93,33,2),(142,94,33,2),(144,95,33,2),(146,96,33,2),(147,97,33,2),(148,98,33,2),(150,99,33,2),(152,100,33,2),(154,101,33,2),(156,102,33,2),(157,103,33,2),(158,104,33,2),(160,105,33,2),(161,106,33,2),(163,107,33,2),(164,108,33,2),(166,109,33,2),(168,110,33,2),(169,111,33,2),(171,112,33,2),(173,113,33,2),(174,114,33,2),(176,115,33,2),(178,116,33,2),(179,117,33,2),(180,118,33,2),(181,119,33,2),(183,120,33,2),(185,121,33,2),(186,122,33,2),(188,123,33,2),(190,124,33,2),(192,125,33,2),(193,126,33,2),(195,127,33,2),(197,128,33,2),(198,129,33,2),(200,130,33,2),(202,131,33,2),(204,132,33,2),(206,133,33,2),(208,134,33,2),(210,135,33,2),(212,136,33,2),(214,137,33,2),(215,138,33,2),(216,139,33,2),(218,140,33,2),(219,141,33,2),(220,142,33,2),(221,143,33,2),(222,144,33,2),(223,145,33,2),(224,146,33,2),(226,147,33,2),(227,148,33,2),(228,149,33,2),(229,150,33,2),(301,200,33,3),(380,250,33,3),(441,292,33,3),(676,459,34,2),(31,19,35,3),(248,164,35,3),(3,2,36,3),(121,78,36,3),(143,94,36,3),(12,8,37,3),(217,139,37,3),(245,162,37,3),(481,319,37,3),(566,381,37,3),(446,296,38,3),(329,218,39,3),(406,267,39,3),(531,356,39,3),(688,471,39,2),(729,512,39,2),(80,50,41,3),(701,484,41,2),(721,504,41,2),(762,545,41,2),(16,10,42,3),(24,15,43,3),(678,461,43,2),(368,243,44,3),(773,556,44,2),(38,23,45,3),(88,55,45,3),(305,202,45,3),(66,41,46,3),(151,99,46,3),(165,108,46,3),(167,109,46,3),(477,317,47,3),(635,429,47,3),(101,64,48,3),(359,238,48,3),(557,376,48,3),(5,3,49,3),(42,25,49,3),(213,136,49,3),(298,198,49,3),(553,373,49,3),(605,408,49,3),(778,561,49,2),(58,37,51,3),(428,283,51,3),(231,151,52,3),(459,304,52,3),(207,133,54,3),(282,187,54,3),(321,213,54,3),(589,397,54,3),(595,401,54,3),(627,423,54,3),(763,546,54,2),(266,176,55,3),(280,186,55,3),(92,57,56,3),(199,129,56,3),(422,279,56,3),(749,532,56,2),(136,90,57,3),(455,301,57,3),(551,372,57,3),(754,537,57,2),(60,38,58,3),(564,380,59,3),(250,165,60,3),(285,189,60,3),(332,220,60,3),(504,337,60,3),(775,558,60,2),(291,193,61,3),(466,309,61,3),(172,112,63,3),(351,233,63,3),(397,261,63,3),(690,473,63,2),(716,499,63,2),(355,235,64,3),(426,282,65,3),(659,445,65,3),(211,135,66,3),(378,249,66,3),(560,378,66,3),(203,131,67,3),(255,168,67,3),(346,230,67,3),(694,477,67,2),(731,514,67,2),(8,5,68,3),(750,533,68,2),(502,336,69,3),(603,407,69,3),(70,44,70,3),(201,130,70,3),(371,245,70,3),(662,447,70,3),(787,570,70,2),(533,357,71,3),(618,417,71,3),(677,460,71,2),(107,68,72,3),(746,529,73,2),(308,204,74,3),(430,284,74,3),(516,345,74,3),(706,489,74,2),(736,519,74,2),(233,152,75,3),(99,63,76,3),(113,72,76,3),(654,442,77,3),(45,27,78,3),(139,92,78,3),(153,100,78,3),(616,416,78,3),(623,420,78,3),(709,492,78,2),(725,508,78,2),(253,167,79,3),(523,349,80,3),(645,436,80,3),(695,478,80,2),(718,501,80,2),(395,260,81,3),(587,396,81,3),(182,119,82,3),(631,426,82,3),(674,457,82,2),(27,17,83,3),(187,122,83,3),(362,240,83,3),(593,400,84,3),(598,403,84,3),(494,330,85,3),(647,437,85,3),(184,120,86,3),(194,126,86,3),(339,225,86,3),(353,234,86,3),(537,360,86,3),(582,393,86,3),(29,18,87,3),(608,410,87,3),(438,290,88,3),(578,390,88,3),(310,205,89,3),(411,270,89,3),(191,124,90,3),(785,568,90,2),(376,248,91,3),(393,259,91,3),(162,106,92,3),(287,190,92,3),(349,232,92,3),(675,458,92,2),(141,93,93,3),(479,318,93,3),(573,386,93,3),(761,544,94,2),(700,483,95,2),(734,517,95,2),(744,527,95,2),(145,95,96,3),(276,183,96,3),(73,46,97,3),(170,111,98,3),(483,320,98,3),(642,434,98,3),(786,569,98,2),(269,178,99,3),(295,196,99,3),(366,242,99,3),(702,485,99,2),(740,523,99,2),(782,565,99,2),(14,9,100,3),(75,47,100,3),(764,547,102,2),(681,464,103,2),(711,494,103,2),(745,528,103,2),(789,572,105,2),(791,574,106,2),(686,469,108,2),(728,511,108,2),(757,540,109,2),(790,573,110,2),(755,538,111,2),(771,554,114,2),(777,560,120,2),(689,472,127,2),(715,498,127,2),(774,557,129,2),(784,567,130,2),(697,480,131,2),(719,502,131,2),(682,465,132,2),(726,509,132,2),(752,535,133,2),(704,487,134,2),(735,518,134,2),(742,525,140,2),(691,474,145,2),(739,522,145,2),(747,530,155,2),(710,493,156,2),(738,521,156,2),(692,475,159,2),(730,513,159,2),(699,482,161,2),(720,503,161,2),(759,542,162,2),(707,490,164,2),(724,507,164,2),(776,559,165,2),(743,526,167,2),(748,531,170,2),(751,534,172,2),(687,470,173,2),(714,497,173,2),(769,552,175,2),(683,466,179,2),(712,495,179,2),(766,549,180,2),(693,476,188,2),(717,500,188,2),(454,301,193,2),(456,302,193,2),(457,303,193,2),(458,304,193,2),(460,305,193,2),(461,306,193,2),(462,307,193,2),(464,308,193,2),(465,309,193,2),(467,310,193,2),(468,311,193,2),(469,312,193,2),(471,313,193,2),(472,314,193,2),(474,315,193,2),(475,316,193,2),(476,317,193,2),(478,318,193,2),(480,319,193,2),(482,320,193,2),(484,321,193,2),(485,322,193,2),(486,323,193,2),(487,324,193,2),(488,325,193,2),(489,326,193,2),(490,327,193,2),(491,328,193,2),(492,329,193,2),(493,330,193,2),(495,331,193,2),(497,332,193,2),(498,333,193,2),(499,334,193,2),(500,335,193,2),(501,336,193,2),(503,337,193,2),(505,338,193,2),(506,339,193,2),(507,340,193,2),(508,341,193,2),(510,342,193,2),(511,343,193,2),(513,344,193,2),(515,345,193,2),(517,346,193,2),(519,347,193,2),(520,348,193,2),(522,349,193,2),(524,350,193,2),(525,351,193,2),(526,352,193,2),(527,353,193,2),(528,354,193,2),(529,355,193,2),(530,356,193,2),(532,357,193,2),(534,358,193,2),(535,359,193,2),(536,360,193,2),(538,361,193,2),(539,362,193,2),(540,363,193,2),(541,364,193,2),(542,365,193,2),(543,366,193,2),(545,367,193,2),(546,368,193,2),(547,369,193,2),(548,370,193,2),(549,371,193,2),(550,372,193,2),(552,373,193,2),(554,374,193,2),(555,375,193,2),(556,376,193,2),(558,377,193,2),(559,378,193,2),(561,379,193,2),(563,380,193,2),(565,381,193,2),(567,382,193,2),(569,383,193,2),(570,384,193,2),(571,385,193,2),(572,386,193,2),(574,387,193,2),(575,388,193,2),(576,389,193,2),(577,390,193,2),(579,391,193,2),(580,392,193,2),(581,393,193,2),(583,394,193,2),(584,395,193,2),(586,396,193,2),(588,397,193,2),(590,398,193,2),(591,399,193,2),(592,400,193,2),(594,401,193,2),(596,402,193,2),(597,403,193,2),(599,404,193,2),(600,405,193,2),(601,406,193,2),(602,407,193,2),(604,408,193,2),(606,409,193,2),(607,410,193,2),(609,411,193,2),(610,412,193,2),(612,413,193,2),(613,414,193,2),(614,415,193,2),(615,416,193,2),(617,417,193,2),(619,418,193,2),(620,419,193,2),(622,420,193,2),(624,421,193,2),(625,422,193,2),(626,423,193,2),(628,424,193,2),(629,425,193,2),(630,426,193,2),(632,427,193,2),(633,428,193,2),(634,429,193,2),(636,430,193,2),(637,431,193,2),(638,432,193,2),(639,433,193,2),(641,434,193,2),(643,435,193,2),(644,436,193,2),(646,437,193,2),(648,438,193,2),(649,439,193,2),(651,440,193,2),(652,441,193,2),(653,442,193,2),(655,443,193,2),(657,444,193,2),(658,445,193,2),(660,446,193,2),(661,447,193,2),(663,448,193,2),(665,449,193,2),(666,450,193,2),(788,571,194,2),(705,488,195,2),(723,506,195,2),(758,541,195,2),(783,566,196,2),(781,564,200,2);
+INSERT INTO `civicrm_activity_contact` (`id`, `activity_id`, `contact_id`, `record_type_id`) VALUES (108,68,1,3),(293,183,1,3),(187,114,2,3),(667,435,2,3),(688,451,2,2),(111,70,3,3),(409,263,3,3),(674,440,3,3),(726,489,3,2),(731,519,3,2),(52,34,4,3),(140,87,4,3),(271,168,4,3),(339,214,4,3),(689,452,4,2),(81,51,5,3),(236,146,5,3),(527,339,5,3),(640,417,5,3),(323,203,6,3),(357,225,6,3),(690,453,6,2),(153,95,7,3),(305,191,7,3),(798,561,7,2),(221,136,8,3),(691,454,8,2),(804,567,8,2),(172,106,9,3),(211,130,9,3),(101,64,10,3),(238,147,10,3),(128,80,11,3),(663,432,11,3),(786,549,11,2),(265,164,12,3),(517,333,12,3),(170,105,13,3),(719,482,13,2),(732,512,13,2),(809,572,13,2),(21,12,14,3),(130,81,14,3),(334,211,15,3),(369,233,15,3),(149,93,16,3),(492,318,16,3),(692,455,16,2),(729,492,16,2),(733,522,16,2),(168,104,17,3),(226,139,17,3),(349,219,17,3),(454,294,17,3),(638,416,18,3),(120,75,19,3),(645,421,19,3),(693,456,19,2),(391,251,20,3),(479,309,20,3),(355,224,21,3),(566,366,21,3),(609,396,21,3),(792,555,21,2),(12,6,22,3),(89,56,22,3),(604,393,22,3),(59,39,23,3),(132,82,23,3),(204,125,23,3),(366,231,23,3),(419,269,23,3),(174,107,24,3),(281,174,24,3),(67,43,25,3),(99,63,25,3),(647,422,25,3),(764,527,26,2),(550,355,27,3),(606,394,27,3),(802,565,27,2),(106,67,28,3),(661,431,28,3),(464,299,29,3),(35,21,30,3),(94,59,30,3),(199,122,30,3),(470,302,31,3),(6,3,32,3),(506,326,32,3),(508,327,32,3),(653,426,32,3),(699,462,32,2),(700,463,32,2),(2,1,33,3),(69,44,33,3),(337,213,33,3),(708,471,33,2),(734,501,33,2),(245,151,34,2),(246,152,34,2),(248,153,34,2),(249,154,34,2),(250,155,34,2),(252,156,34,2),(253,157,34,2),(254,158,34,2),(256,159,34,2),(258,160,34,2),(259,161,34,2),(261,162,34,2),(262,163,34,2),(264,164,34,2),(266,165,34,2),(267,166,34,2),(269,167,34,2),(270,168,34,2),(272,169,34,2),(274,170,34,2),(275,171,34,2),(277,172,34,2),(279,173,34,2),(280,174,34,2),(282,175,34,2),(283,176,34,2),(285,177,34,2),(286,178,34,2),(287,179,34,2),(288,180,34,2),(290,181,34,2),(291,182,34,2),(292,183,34,2),(294,184,34,2),(296,185,34,2),(298,186,34,2),(299,187,34,2),(300,188,34,2),(301,189,34,2),(303,190,34,2),(304,191,34,2),(306,192,34,2),(308,193,34,2),(309,194,34,2),(311,195,34,2),(313,196,34,2),(314,197,34,2),(315,198,34,2),(316,199,34,2),(318,200,34,2),(319,201,34,2),(321,202,34,2),(322,203,34,2),(324,204,34,2),(325,205,34,2),(326,206,34,2),(327,207,34,2),(328,208,34,2),(329,209,34,2),(331,210,34,2),(333,211,34,2),(335,212,34,2),(336,213,34,2),(338,214,34,2),(340,215,34,2),(342,216,34,2),(344,217,34,2),(346,218,34,2),(348,219,34,2),(350,220,34,2),(351,221,34,2),(352,222,34,2),(353,223,34,2),(354,224,34,2),(356,225,34,2),(358,226,34,2),(359,227,34,2),(361,228,34,2),(362,229,34,2),(363,230,34,2),(365,231,34,2),(367,232,34,2),(368,233,34,2),(370,234,34,2),(371,235,34,2),(372,236,34,2),(373,237,34,2),(374,238,34,2),(375,239,34,2),(376,240,34,2),(378,241,34,2),(379,242,34,2),(380,243,34,2),(381,244,34,2),(382,245,34,2),(383,246,34,2),(384,247,34,2),(385,248,34,2),(387,249,34,2),(389,250,34,2),(390,251,34,2),(392,252,34,2),(394,253,34,2),(395,254,34,2),(397,255,34,2),(398,256,34,2),(400,257,34,2),(401,258,34,2),(402,259,34,2),(403,260,34,2),(405,261,34,2),(407,262,34,2),(408,263,34,2),(410,264,34,2),(411,265,34,2),(412,266,34,2),(414,267,34,2),(416,268,34,2),(418,269,34,2),(420,270,34,2),(422,271,34,2),(424,272,34,2),(426,273,34,2),(427,274,34,2),(428,275,34,2),(430,276,34,2),(431,277,34,2),(432,278,34,2),(433,279,34,2),(434,280,34,2),(435,281,34,2),(437,282,34,2),(438,283,34,2),(440,284,34,2),(442,285,34,2),(443,286,34,2),(444,287,34,2),(446,288,34,2),(447,289,34,2),(448,290,34,2),(449,291,34,2),(450,292,34,2),(451,293,34,2),(453,294,34,2),(455,295,34,2),(457,296,34,2),(459,297,34,2),(461,298,34,2),(463,299,34,2),(465,300,34,2),(541,348,34,3),(669,436,34,3),(696,459,34,2),(193,118,35,3),(263,163,35,3),(345,217,35,3),(25,14,36,3),(614,400,36,3),(217,134,37,3),(557,360,37,3),(581,378,37,3),(332,210,39,3),(706,469,40,2),(735,499,40,2),(406,261,41,3),(553,357,41,3),(158,98,42,3),(330,209,42,3),(429,275,42,3),(77,49,43,3),(202,124,43,3),(268,166,43,3),(386,248,43,3),(687,450,43,3),(698,461,43,2),(176,108,45,3),(524,337,45,3),(166,103,46,3),(807,570,46,2),(18,10,47,3),(436,281,47,3),(592,386,47,3),(520,335,48,3),(522,336,48,3),(703,466,48,2),(736,496,48,2),(789,552,48,2),(240,148,49,3),(393,252,49,3),(771,534,50,2),(197,121,51,3),(704,467,51,2),(737,497,51,2),(539,347,52,3),(797,560,52,2),(811,574,53,2),(257,159,54,3),(421,270,54,3),(181,111,55,3),(347,218,55,3),(483,311,55,3),(32,19,56,3),(576,374,56,3),(712,475,56,2),(738,505,56,2),(47,30,57,3),(445,287,57,3),(503,324,57,3),(564,365,57,3),(134,83,58,3),(207,127,58,3),(284,176,59,3),(295,184,59,3),(118,74,60,3),(178,109,60,3),(215,133,60,3),(399,256,60,3),(497,321,60,3),(598,390,60,3),(763,526,60,2),(28,16,61,3),(273,169,61,3),(468,301,62,3),(481,310,62,3),(621,404,62,3),(38,23,63,3),(260,161,63,3),(307,192,63,3),(499,322,63,3),(144,90,64,3),(244,150,64,3),(255,158,64,3),(404,260,64,3),(628,409,64,3),(720,483,64,2),(739,513,64,2),(75,48,66,3),(616,401,66,3),(15,8,67,3),(230,142,67,3),(801,564,67,2),(501,323,68,3),(730,493,68,2),(740,523,68,2),(251,155,69,3),(589,384,69,3),(276,171,70,3),(467,301,70,2),(469,302,70,2),(471,303,70,2),(473,304,70,2),(474,305,70,2),(475,306,70,2),(476,307,70,2),(477,308,70,2),(478,309,70,2),(480,310,70,2),(482,311,70,2),(484,312,70,2),(485,313,70,2),(486,314,70,2),(488,315,70,2),(489,316,70,2),(490,317,70,2),(491,318,70,2),(493,319,70,2),(495,320,70,2),(496,321,70,2),(498,322,70,2),(500,323,70,2),(502,324,70,2),(504,325,70,2),(505,326,70,2),(507,327,70,2),(509,328,70,2),(510,329,70,2),(511,330,70,2),(512,330,70,3),(513,331,70,2),(515,332,70,2),(516,333,70,2),(518,334,70,2),(519,335,70,2),(521,336,70,2),(523,337,70,2),(525,338,70,2),(526,339,70,2),(528,340,70,2),(530,341,70,2),(531,342,70,2),(532,343,70,2),(534,344,70,2),(535,345,70,2),(536,346,70,2),(538,347,70,2),(540,348,70,2),(542,349,70,2),(543,350,70,2),(544,351,70,2),(546,352,70,2),(547,353,70,2),(548,354,70,2),(549,355,70,2),(551,356,70,2),(552,357,70,2),(554,358,70,2),(555,359,70,2),(556,360,70,2),(558,361,70,2),(559,362,70,2),(560,363,70,2),(562,364,70,2),(563,365,70,2),(565,366,70,2),(567,367,70,2),(568,368,70,2),(569,369,70,2),(570,370,70,2),(571,371,70,2),(572,372,70,2),(574,373,70,2),(575,374,70,2),(577,375,70,2),(578,376,70,2),(579,377,70,2),(580,378,70,2),(582,379,70,2),(583,380,70,2),(584,381,70,2),(585,382,70,2),(586,383,70,2),(588,384,70,2),(590,385,70,2),(591,386,70,2),(593,387,70,2),(594,388,70,2),(595,389,70,2),(597,390,70,2),(599,391,70,2),(601,392,70,2),(603,393,70,2),(605,394,70,2),(607,395,70,2),(608,396,70,2),(610,397,70,2),(611,398,70,2),(612,399,70,2),(613,400,70,2),(615,401,70,2),(617,402,70,2),(618,403,70,2),(620,404,70,2),(622,405,70,2),(623,406,70,2),(624,407,70,2),(626,408,70,2),(627,409,70,2),(629,410,70,2),(630,411,70,2),(631,412,70,2),(632,413,70,2),(634,414,70,2),(635,415,70,2),(637,416,70,2),(639,417,70,2),(641,418,70,2),(642,419,70,2),(643,420,70,2),(644,421,70,2),(646,422,70,2),(648,423,70,2),(649,424,70,2),(650,425,70,2),(652,426,70,2),(654,427,70,2),(655,428,70,2),(657,429,70,2),(658,430,70,2),(660,431,70,2),(662,432,70,2),(664,433,70,2),(665,434,70,2),(666,435,70,2),(668,436,70,2),(670,437,70,2),(671,438,70,2),(672,439,70,2),(673,440,70,2),(675,441,70,2),(676,442,70,2),(678,443,70,2),(679,444,70,2),(680,444,70,3),(681,445,70,2),(682,446,70,2),(683,447,70,2),(684,448,70,2),(685,449,70,2),(686,450,70,2),(23,13,71,3),(160,99,71,3),(533,343,71,3),(697,460,71,2),(61,40,73,3),(242,149,73,3),(701,464,73,2),(741,494,73,2),(56,37,74,3),(439,283,74,3),(472,303,74,3),(494,319,74,3),(545,351,74,3),(561,363,74,3),(458,296,75,3),(310,194,76,3),(625,407,76,3),(777,540,76,2),(73,47,77,3),(91,57,77,3),(219,135,77,3),(312,195,77,3),(364,230,77,3),(466,300,77,3),(573,372,77,3),(787,550,77,2),(185,113,78,3),(247,152,78,3),(289,180,78,3),(302,189,78,3),(317,199,78,3),(343,216,78,3),(423,271,78,3),(651,425,78,3),(784,547,78,2),(115,72,79,3),(800,563,79,2),(4,2,80,3),(63,41,80,3),(659,430,80,3),(790,553,80,2),(487,314,81,3),(694,457,82,2),(768,531,82,2),(79,50,83,3),(65,42,84,3),(596,389,84,3),(781,544,84,2),(460,297,85,3),(806,569,85,2),(1,1,86,2),(3,2,86,2),(5,3,86,2),(7,4,86,2),(9,5,86,2),(11,6,86,2),(13,7,86,2),(14,8,86,2),(16,9,86,2),(17,10,86,2),(19,11,86,2),(20,12,86,2),(22,13,86,2),(24,14,86,2),(26,15,86,2),(27,16,86,2),(29,17,86,2),(30,18,86,2),(31,19,86,2),(33,20,86,2),(34,21,86,2),(36,22,86,2),(37,23,86,2),(39,24,86,2),(41,25,86,2),(42,26,86,2),(43,27,86,2),(44,28,86,2),(45,29,86,2),(46,30,86,2),(48,31,86,2),(49,32,86,2),(50,33,86,2),(51,34,86,2),(53,35,86,2),(54,36,86,2),(55,37,86,2),(57,38,86,2),(58,39,86,2),(60,40,86,2),(62,41,86,2),(64,42,86,2),(66,43,86,2),(68,44,86,2),(70,45,86,2),(71,46,86,2),(72,47,86,2),(74,48,86,2),(76,49,86,2),(78,50,86,2),(80,51,86,2),(82,52,86,2),(84,53,86,2),(86,54,86,2),(87,55,86,2),(88,56,86,2),(90,57,86,2),(92,58,86,2),(93,59,86,2),(95,60,86,2),(96,61,86,2),(97,62,86,2),(98,63,86,2),(100,64,86,2),(102,65,86,2),(104,66,86,2),(105,67,86,2),(107,68,86,2),(109,69,86,2),(110,70,86,2),(112,71,86,2),(114,72,86,2),(116,73,86,2),(117,74,86,2),(119,75,86,2),(121,76,86,2),(122,77,86,2),(123,78,86,2),(125,79,86,2),(127,80,86,2),(129,81,86,2),(131,82,86,2),(133,83,86,2),(135,84,86,2),(136,85,86,2),(137,86,86,2),(139,87,86,2),(141,88,86,2),(142,89,86,2),(143,90,86,2),(145,91,86,2),(147,92,86,2),(148,93,86,2),(150,94,86,2),(152,95,86,2),(154,96,86,2),(155,97,86,2),(157,98,86,2),(159,99,86,2),(161,100,86,2),(162,101,86,2),(163,102,86,2),(165,103,86,2),(167,104,86,2),(169,105,86,2),(171,106,86,2),(173,107,86,2),(175,108,86,2),(177,109,86,2),(179,110,86,2),(180,111,86,2),(182,112,86,2),(184,113,86,2),(186,114,86,2),(188,115,86,2),(189,116,86,2),(191,117,86,2),(192,118,86,2),(194,119,86,2),(195,120,86,2),(196,121,86,2),(198,122,86,2),(200,123,86,2),(201,124,86,2),(203,125,86,2),(205,126,86,2),(206,127,86,2),(208,128,86,2),(209,129,86,2),(210,130,86,2),(212,131,86,2),(213,132,86,2),(214,133,86,2),(216,134,86,2),(218,135,86,2),(220,136,86,2),(222,137,86,2),(224,138,86,2),(225,139,86,2),(227,140,86,2),(228,141,86,2),(229,142,86,2),(231,143,86,2),(232,144,86,2),(233,145,86,2),(235,146,86,2),(237,147,86,2),(239,148,86,2),(241,149,86,2),(243,150,86,2),(727,490,86,2),(742,520,86,2),(600,391,87,3),(138,86,88,3),(278,172,88,3),(587,383,88,3),(164,102,89,3),(413,266,90,3),(156,97,91,3),(190,116,91,3),(417,268,91,3),(320,201,92,3),(360,227,92,3),(388,249,92,3),(514,331,92,3),(537,346,92,3),(695,458,92,2),(702,465,92,2),(743,495,92,2),(146,91,93,3),(415,267,93,3),(83,52,94,3),(234,145,94,3),(456,295,94,3),(602,392,94,3),(774,537,94,2),(126,79,95,3),(297,185,95,3),(778,541,95,2),(10,5,96,3),(40,24,96,3),(103,65,96,3),(113,71,96,3),(396,254,96,3),(425,272,96,3),(633,413,96,3),(151,94,97,3),(441,284,97,3),(656,428,97,3),(85,53,98,3),(529,340,98,3),(8,4,99,3),(462,298,99,3),(124,78,100,3),(183,112,100,3),(677,442,100,3),(223,137,101,3),(341,215,101,3),(377,240,101,3),(452,293,101,3),(619,403,101,3),(636,415,101,3),(782,545,101,2),(710,473,103,2),(744,503,103,2),(769,532,103,2),(714,477,105,2),(745,507,105,2),(718,481,106,2),(746,511,106,2),(723,486,111,2),(747,516,111,2),(779,542,111,2),(796,559,114,2),(766,529,115,2),(713,476,120,2),(748,506,120,2),(788,551,128,2),(770,533,129,2),(724,487,132,2),(749,517,132,2),(799,562,135,2),(783,546,137,2),(791,554,140,2),(725,488,141,2),(750,518,141,2),(722,485,142,2),(751,515,142,2),(803,566,146,2),(810,573,147,2),(717,480,153,2),(752,510,153,2),(775,538,153,2),(776,539,155,2),(762,525,157,2),(794,557,160,2),(805,568,161,2),(705,468,163,2),(753,498,163,2),(785,548,167,2),(728,491,168,2),(754,521,168,2),(773,536,169,2),(767,530,172,2),(709,472,175,2),(755,502,175,2),(716,479,177,2),(756,509,177,2),(808,571,181,2),(715,478,184,2),(757,508,184,2),(780,543,187,2),(795,558,188,2),(707,470,190,2),(758,500,190,2),(793,556,191,2),(765,528,193,2),(711,474,194,2),(759,504,194,2),(772,535,196,2),(721,484,200,2),(760,514,200,2);
 /*!40000 ALTER TABLE `civicrm_activity_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -107,7 +107,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_address` WRITE;
 /*!40000 ALTER TABLE `civicrm_address` DISABLE KEYS */;
-INSERT INTO `civicrm_address` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `street_address`, `street_number`, `street_number_suffix`, `street_number_predirectional`, `street_name`, `street_type`, `street_number_postdirectional`, `street_unit`, `supplemental_address_1`, `supplemental_address_2`, `supplemental_address_3`, `city`, `county_id`, `state_province_id`, `postal_code_suffix`, `postal_code`, `usps_adc`, `country_id`, `geo_code_1`, `geo_code_2`, `manual_geo_code`, `timezone`, `name`, `master_id`) VALUES (1,24,1,1,0,'684Y Woodbridge Blvd NE',684,'Y',NULL,'Woodbridge','Blvd','NE',NULL,NULL,NULL,NULL,'Lawrence',1,1020,NULL,'01840',NULL,1228,42.706941,-71.16181,0,NULL,NULL,NULL),(2,124,1,1,0,'842S Main Ave N',842,'S',NULL,'Main','Ave','N',NULL,NULL,NULL,NULL,'Swengel',1,1037,NULL,'17880',NULL,1228,40.978059,-77.08184,0,NULL,NULL,NULL),(3,57,1,1,0,'438V Main Path W',438,'V',NULL,'Main','Path','W',NULL,NULL,NULL,NULL,'Sun Valley',1,1011,NULL,'83353',NULL,1228,43.661373,-114.18191,0,NULL,NULL,NULL),(4,17,1,1,0,'49W Jackson Blvd SE',49,'W',NULL,'Jackson','Blvd','SE',NULL,NULL,NULL,NULL,'Parkman',1,1034,NULL,'44080',NULL,1228,41.372452,-81.06617,0,NULL,NULL,NULL),(5,182,1,1,0,'392O Green Path W',392,'O',NULL,'Green','Path','W',NULL,NULL,NULL,NULL,'Stapleton',1,1000,NULL,'36578',NULL,1228,30.744745,-87.81486,0,NULL,NULL,NULL),(6,99,1,1,0,'665Z Maple Dr E',665,'Z',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Greenmountain',1,1032,NULL,'28740',NULL,1228,36.023817,-82.29237,0,NULL,NULL,NULL),(7,33,1,1,0,'866D Main Pl N',866,'D',NULL,'Main','Pl','N',NULL,NULL,NULL,NULL,'Ladson',1,1039,NULL,'29456',NULL,1228,32.993571,-80.12165,0,NULL,NULL,NULL),(8,179,1,1,0,'501L Martin Luther King Path SW',501,'L',NULL,'Martin Luther King','Path','SW',NULL,NULL,NULL,NULL,'Kiamesha Lake',1,1031,NULL,'12751',NULL,1228,41.679152,-74.657,0,NULL,NULL,NULL),(9,164,1,1,0,'220E Beech Dr N',220,'E',NULL,'Beech','Dr','N',NULL,NULL,NULL,NULL,'North Sandwich',1,1028,NULL,'03259',NULL,1228,43.880005,-71.39475,0,NULL,NULL,NULL),(10,193,1,1,0,'441B Martin Luther King Blvd N',441,'B',NULL,'Martin Luther King','Blvd','N',NULL,NULL,NULL,NULL,'Louisburg',1,1032,NULL,'27549',NULL,1228,36.062239,-78.24953,0,NULL,NULL,NULL),(11,76,1,1,0,'407F Van Ness St W',407,'F',NULL,'Van Ness','St','W',NULL,NULL,NULL,NULL,'Swan Lake',1,1031,NULL,'12783',NULL,1228,41.736523,-74.82634,0,NULL,NULL,NULL),(12,162,1,1,0,'99A Main Pl SE',99,'A',NULL,'Main','Pl','SE',NULL,NULL,NULL,NULL,'Pago Pago',1,1052,NULL,'96799',NULL,1228,-7.209975,-170.7716,0,NULL,NULL,NULL),(13,66,1,1,0,'215Q Beech Ave SE',215,'Q',NULL,'Beech','Ave','SE',NULL,NULL,NULL,NULL,'Gun Barrel City',1,1042,NULL,'75156',NULL,1228,32.290819,-96.114108,0,NULL,NULL,NULL),(14,92,1,1,0,'969U El Camino Blvd E',969,'U',NULL,'El Camino','Blvd','E',NULL,NULL,NULL,NULL,'Decatur',1,1014,NULL,'50067',NULL,1228,40.734072,-93.85169,0,NULL,NULL,NULL),(15,167,1,1,0,'385V College Rd NW',385,'V',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'El Paso',1,1042,NULL,'88558',NULL,1228,31.694842,-106.299987,0,NULL,NULL,NULL),(16,183,1,1,0,'76C Dowlen Path E',76,'C',NULL,'Dowlen','Path','E',NULL,NULL,NULL,NULL,'Monson',1,1018,NULL,'04464',NULL,1228,45.303916,-69.51368,0,NULL,NULL,NULL),(17,175,1,1,0,'963L Second Pl SE',963,'L',NULL,'Second','Pl','SE',NULL,NULL,NULL,NULL,'Lake Havasu City',1,1002,NULL,'86403',NULL,1228,34.483582,-114.33694,0,NULL,NULL,NULL),(18,129,1,1,0,'429H Martin Luther King Dr SW',429,'H',NULL,'Martin Luther King','Dr','SW',NULL,NULL,NULL,NULL,'Sarasota',1,1008,NULL,'34234',NULL,1228,27.365622,-82.53556,0,NULL,NULL,NULL),(19,197,1,1,0,'41J Dowlen Dr NW',41,'J',NULL,'Dowlen','Dr','NW',NULL,NULL,NULL,NULL,'Findlay',1,1034,NULL,'45840',NULL,1228,41.037325,-83.64576,0,NULL,NULL,NULL),(20,7,1,1,0,'439C Green St SW',439,'C',NULL,'Green','St','SW',NULL,NULL,NULL,NULL,'Buffalo',1,1014,NULL,'52728',NULL,1228,41.456515,-90.73252,0,NULL,NULL,NULL),(21,154,1,1,0,'475T El Camino Ln W',475,'T',NULL,'El Camino','Ln','W',NULL,NULL,NULL,NULL,'Huxley',1,1014,NULL,'50124',NULL,1228,41.893335,-93.59844,0,NULL,NULL,NULL),(22,51,1,1,0,'877S Cadell Way SW',877,'S',NULL,'Cadell','Way','SW',NULL,NULL,NULL,NULL,'Mount Pleasant',1,1008,NULL,'32352',NULL,1228,30.665715,-84.75363,0,NULL,NULL,NULL),(23,143,1,1,0,'544N Jackson Dr SW',544,'N',NULL,'Jackson','Dr','SW',NULL,NULL,NULL,NULL,'Dahlen',1,1033,NULL,'58224',NULL,1228,48.173113,-97.95766,0,NULL,NULL,NULL),(24,77,1,1,0,'577N Maple Blvd SW',577,'N',NULL,'Maple','Blvd','SW',NULL,NULL,NULL,NULL,'Spokane',1,1046,NULL,'99210',NULL,1228,47.653568,-117.431742,0,NULL,NULL,NULL),(25,84,1,1,0,'428M Green Ln S',428,'M',NULL,'Green','Ln','S',NULL,NULL,NULL,NULL,'Ponca City',1,1035,NULL,'74603',NULL,1228,36.796349,-97.106166,0,NULL,NULL,NULL),(26,88,1,1,0,'723Z Beech Path W',723,'Z',NULL,'Beech','Path','W',NULL,NULL,NULL,NULL,'Anaheim',1,1004,NULL,'92899',NULL,1228,33.640302,-117.769442,0,NULL,NULL,NULL),(27,30,1,1,0,'703U Bay Pl W',703,'U',NULL,'Bay','Pl','W',NULL,NULL,NULL,NULL,'Mollusk',1,1045,NULL,'22517',NULL,1228,37.75028,-76.578109,0,NULL,NULL,NULL),(28,2,1,1,0,'543B Maple Rd SE',543,'B',NULL,'Maple','Rd','SE',NULL,NULL,NULL,NULL,'Sunspot',1,1030,NULL,'88349',NULL,1228,32.8672,-105.781129,0,NULL,NULL,NULL),(29,156,1,1,0,'269A Lincoln Pl SW',269,'A',NULL,'Lincoln','Pl','SW',NULL,NULL,NULL,NULL,'Urbana',1,1013,NULL,'46990',NULL,1228,40.898561,-85.7457,0,NULL,NULL,NULL),(30,118,1,1,0,'663O Second Rd W',663,'O',NULL,'Second','Rd','W',NULL,NULL,NULL,NULL,'Foxhome',1,1022,NULL,'56543',NULL,1228,46.290371,-96.33238,0,NULL,NULL,NULL),(31,87,1,1,0,'426A Caulder St E',426,'A',NULL,'Caulder','St','E',NULL,NULL,NULL,NULL,'Turner',1,1036,NULL,'97392',NULL,1228,44.807739,-122.9485,0,NULL,NULL,NULL),(32,23,1,1,0,'171T Lincoln St NE',171,'T',NULL,'Lincoln','St','NE',NULL,NULL,NULL,NULL,'West Lebanon',1,1037,NULL,'15783',NULL,1228,40.601789,-79.35524,0,NULL,NULL,NULL),(33,5,1,1,0,'127G Pine Way S',127,'G',NULL,'Pine','Way','S',NULL,NULL,NULL,NULL,'Collierville',1,1041,NULL,'38027',NULL,1228,35.201738,-89.971538,0,NULL,NULL,NULL),(34,199,1,1,0,'284M Dowlen St N',284,'M',NULL,'Dowlen','St','N',NULL,NULL,NULL,NULL,'Saint Jo',1,1042,NULL,'76265',NULL,1228,33.701692,-97.53029,0,NULL,NULL,NULL),(35,176,1,1,0,'86O States Path SE',86,'O',NULL,'States','Path','SE',NULL,NULL,NULL,NULL,'Cape Coral',1,1008,NULL,'33914',NULL,1228,26.579862,-82.00227,0,NULL,NULL,NULL),(36,132,1,1,0,'561V Dowlen Blvd SE',561,'V',NULL,'Dowlen','Blvd','SE',NULL,NULL,NULL,NULL,'Colts Neck',1,1029,NULL,'07722',NULL,1228,40.300226,-74.18306,0,NULL,NULL,NULL),(37,80,1,1,0,'307B Maple Way S',307,'B',NULL,'Maple','Way','S',NULL,NULL,NULL,NULL,'Savannah',1,1009,NULL,'31411',NULL,1228,31.927434,-81.0425,0,NULL,NULL,NULL),(38,44,1,1,0,'3C Dowlen Pl SW',3,'C',NULL,'Dowlen','Pl','SW',NULL,NULL,NULL,NULL,'Sea Island',1,1009,NULL,'31561',NULL,1228,31.198914,-81.332211,0,NULL,NULL,NULL),(39,96,1,1,0,'329R Northpoint Ave N',329,'R',NULL,'Northpoint','Ave','N',NULL,NULL,NULL,NULL,'Jacksonville',1,1008,NULL,'32206',NULL,1228,30.351006,-81.64664,0,NULL,NULL,NULL),(40,166,1,1,0,'583Q Dowlen Pl W',583,'Q',NULL,'Dowlen','Pl','W',NULL,NULL,NULL,NULL,'Cascade',1,1005,NULL,'80809',NULL,1228,38.911701,-104.98731,0,NULL,NULL,NULL),(41,52,1,1,0,'780Z Northpoint Blvd SE',780,'Z',NULL,'Northpoint','Blvd','SE',NULL,NULL,NULL,NULL,'Morehead City',1,1032,NULL,'28557',NULL,1228,34.729839,-76.75219,0,NULL,NULL,NULL),(42,16,1,1,0,'706L Main Path E',706,'L',NULL,'Main','Path','E',NULL,NULL,NULL,NULL,'Usk',1,1046,NULL,'99180',NULL,1228,48.295497,-117.29236,0,NULL,NULL,NULL),(43,139,1,1,0,'779I Woodbridge Path SW',779,'I',NULL,'Woodbridge','Path','SW',NULL,NULL,NULL,NULL,'Columbus',1,1034,NULL,'43219',NULL,1228,40.002514,-82.92589,0,NULL,NULL,NULL),(44,127,1,1,0,'11Q Dowlen Blvd SE',11,'Q',NULL,'Dowlen','Blvd','SE',NULL,NULL,NULL,NULL,'Santa Clara',1,1004,NULL,'95051',NULL,1228,37.346241,-121.9846,0,NULL,NULL,NULL),(45,172,1,1,0,'375K Van Ness Ave NE',375,'K',NULL,'Van Ness','Ave','NE',NULL,NULL,NULL,NULL,'Ferguson',1,1032,NULL,'28624',NULL,1228,36.110425,-81.42262,0,NULL,NULL,NULL),(46,11,1,1,0,'321Z Green Path W',321,'Z',NULL,'Green','Path','W',NULL,NULL,NULL,NULL,'Florence',1,1039,NULL,'29503',NULL,1228,34.062999,-79.650627,0,NULL,NULL,NULL),(47,128,1,1,0,'480E Jackson Blvd E',480,'E',NULL,'Jackson','Blvd','E',NULL,NULL,NULL,NULL,'Wascott',1,1048,NULL,'54383',NULL,1228,46.18508,-91.959307,0,NULL,NULL,NULL),(48,38,1,1,0,'5C Main Dr W',5,'C',NULL,'Main','Dr','W',NULL,NULL,NULL,NULL,'Cuthbert',1,1009,NULL,'31740',NULL,1228,31.781815,-84.76444,0,NULL,NULL,NULL),(49,136,1,1,0,'579N Main Rd SE',579,'N',NULL,'Main','Rd','SE',NULL,NULL,NULL,NULL,'Kendall',1,1048,NULL,'54638',NULL,1228,43.795422,-90.37609,0,NULL,NULL,NULL),(50,32,1,1,0,'275C Jackson Ave N',275,'C',NULL,'Jackson','Ave','N',NULL,NULL,NULL,NULL,'Denver',1,1037,NULL,'17517',NULL,1228,40.234392,-76.12655,0,NULL,NULL,NULL),(51,27,1,1,0,'228Q Main Rd NW',228,'Q',NULL,'Main','Rd','NW',NULL,NULL,NULL,NULL,'Mount Pleasant',1,1034,NULL,'43939',NULL,1228,40.176109,-80.79979,0,NULL,NULL,NULL),(52,116,1,1,0,'797G Main Ln S',797,'G',NULL,'Main','Ln','S',NULL,NULL,NULL,NULL,'Louisville',1,1016,NULL,'40291',NULL,1228,38.147232,-85.59169,0,NULL,NULL,NULL),(53,106,1,1,0,'747A El Camino Way NW',747,'A',NULL,'El Camino','Way','NW',NULL,NULL,NULL,NULL,'Harmony',1,1038,NULL,'02829',NULL,1228,41.879298,-71.589357,0,NULL,NULL,NULL),(54,22,1,1,0,'680G Caulder Blvd E',680,'G',NULL,'Caulder','Blvd','E',NULL,NULL,NULL,NULL,'Yoncalla',1,1036,NULL,'97499',NULL,1228,43.593788,-123.26602,0,NULL,NULL,NULL),(55,115,1,1,0,'485N States Dr SW',485,'N',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Ardmore',1,1035,NULL,'73403',NULL,1228,34.288884,-97.248074,0,NULL,NULL,NULL),(56,35,1,1,0,'218T Lincoln Ave SW',218,'T',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Parchman',1,1023,NULL,'38738',NULL,1228,33.922146,-90.54366,0,NULL,NULL,NULL),(57,177,1,1,0,'994U Martin Luther King Pl NE',994,'U',NULL,'Martin Luther King','Pl','NE',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75250',NULL,1228,32.767268,-96.777626,0,NULL,NULL,NULL),(58,150,1,1,0,'352X Second Way N',352,'X',NULL,'Second','Way','N',NULL,NULL,NULL,NULL,'Trout Dale',1,1045,NULL,'24378',NULL,1228,36.684567,-81.43411,0,NULL,NULL,NULL),(59,72,1,1,0,'644M Main Dr N',644,'M',NULL,'Main','Dr','N',NULL,NULL,NULL,NULL,'Wilmington',1,1007,NULL,'19893',NULL,1228,39.564499,-75.597047,0,NULL,NULL,NULL),(60,21,1,1,0,'935N Second Pl S',935,'N',NULL,'Second','Pl','S',NULL,NULL,NULL,NULL,'Union City',1,1034,NULL,'45390',NULL,1228,40.20451,-84.78292,0,NULL,NULL,NULL),(61,19,1,1,0,'555F Green Dr S',555,'F',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Pleasant Grove',1,1004,NULL,'95668',NULL,1228,38.8323,-121.51661,0,NULL,NULL,NULL),(62,168,1,1,0,'169U Green St NW',169,'U',NULL,'Green','St','NW',NULL,NULL,NULL,NULL,'Eastwood',1,1016,NULL,'40018',NULL,1228,38.22977,-85.66304,0,NULL,NULL,NULL),(63,101,1,1,0,'967B Dowlen Pl S',967,'B',NULL,'Dowlen','Pl','S',NULL,NULL,NULL,NULL,'Strawberry Plains',1,1041,NULL,'37871',NULL,1228,36.04051,-83.67934,0,NULL,NULL,NULL),(64,98,1,1,0,'706B Cadell Ln SW',706,'B',NULL,'Cadell','Ln','SW',NULL,NULL,NULL,NULL,'Augusta',1,1009,NULL,'30917',NULL,1228,33.527678,-82.235542,0,NULL,NULL,NULL),(65,163,1,1,0,'296I States Path E',296,'I',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Heber',1,1002,NULL,'85928',NULL,1228,34.563994,-110.55929,0,NULL,NULL,NULL),(66,142,3,1,0,'787I Bay Pl W',787,'I',NULL,'Bay','Pl','W',NULL,'Subscriptions Dept',NULL,NULL,'Mccleary',1,1046,NULL,'98557',NULL,1228,47.054419,-123.2739,0,NULL,NULL,NULL),(67,170,2,1,0,'787I Bay Pl W',787,'I',NULL,'Bay','Pl','W',NULL,'Subscriptions Dept',NULL,NULL,'Mccleary',1,1046,NULL,'98557',NULL,1228,47.054419,-123.2739,0,NULL,NULL,66),(68,174,3,1,0,'698Y Northpoint Blvd NW',698,'Y',NULL,'Northpoint','Blvd','NW',NULL,'Donor Relations',NULL,NULL,'West Greene',1,1000,NULL,'35491',NULL,1228,32.835692,-87.956884,0,NULL,NULL,NULL),(69,185,2,1,0,'698Y Northpoint Blvd NW',698,'Y',NULL,'Northpoint','Blvd','NW',NULL,'Donor Relations',NULL,NULL,'West Greene',1,1000,NULL,'35491',NULL,1228,32.835692,-87.956884,0,NULL,NULL,68),(70,105,3,1,0,'35Y Maple Ln N',35,'Y',NULL,'Maple','Ln','N',NULL,'Disbursements',NULL,NULL,'Gateway',1,1003,NULL,'72733',NULL,1228,36.486424,-93.927748,0,NULL,NULL,NULL),(71,151,2,1,0,'35Y Maple Ln N',35,'Y',NULL,'Maple','Ln','N',NULL,'Disbursements',NULL,NULL,'Gateway',1,1003,NULL,'72733',NULL,1228,36.486424,-93.927748,0,NULL,NULL,70),(72,144,3,1,0,'900W Van Ness Dr SE',900,'W',NULL,'Van Ness','Dr','SE',NULL,'c/o OPDC',NULL,NULL,'Perris',1,1004,NULL,'92572',NULL,1228,33.752886,-116.055617,0,NULL,NULL,NULL),(73,18,2,1,0,'900W Van Ness Dr SE',900,'W',NULL,'Van Ness','Dr','SE',NULL,'c/o OPDC',NULL,NULL,'Perris',1,1004,NULL,'92572',NULL,1228,33.752886,-116.055617,0,NULL,NULL,72),(74,148,3,1,0,'241O Van Ness Way NE',241,'O',NULL,'Van Ness','Way','NE',NULL,'c/o PO Plus',NULL,NULL,'Dallas',1,1042,NULL,'75243',NULL,1228,32.912225,-96.73688,0,NULL,NULL,NULL),(75,104,2,1,0,'241O Van Ness Way NE',241,'O',NULL,'Van Ness','Way','NE',NULL,'c/o PO Plus',NULL,NULL,'Dallas',1,1042,NULL,'75243',NULL,1228,32.912225,-96.73688,0,NULL,NULL,74),(76,90,3,1,0,'99D Beech Ave SW',99,'D',NULL,'Beech','Ave','SW',NULL,'Mailstop 101',NULL,NULL,'Rebecca',1,1009,NULL,'31783',NULL,1228,31.767986,-83.47325,0,NULL,NULL,NULL),(77,86,3,1,0,'188H Beech Way W',188,'H',NULL,'Beech','Way','W',NULL,'Cuffe Parade',NULL,NULL,'Silver Spring',1,1019,NULL,'20997',NULL,1228,39.143979,-77.207617,0,NULL,NULL,NULL),(78,197,2,0,0,'188H Beech Way W',188,'H',NULL,'Beech','Way','W',NULL,'Cuffe Parade',NULL,NULL,'Silver Spring',1,1019,NULL,'20997',NULL,1228,39.143979,-77.207617,0,NULL,NULL,77),(79,56,3,1,0,'427Z Beech Ln N',427,'Z',NULL,'Beech','Ln','N',NULL,'Attn: Accounting',NULL,NULL,'Kings Mountain',1,1016,NULL,'40442',NULL,1228,37.351449,-84.7219,0,NULL,NULL,NULL),(80,62,3,1,0,'132F Jackson St NE',132,'F',NULL,'Jackson','St','NE',NULL,'Subscriptions Dept',NULL,NULL,'Collins',1,1014,NULL,'50055',NULL,1228,41.880967,-93.29691,0,NULL,NULL,NULL),(81,137,3,1,0,'924Z States Rd E',924,'Z',NULL,'States','Rd','E',NULL,'Attn: Development',NULL,NULL,'Aptos',1,1004,NULL,'95001',NULL,1228,37.05297,-121.949418,0,NULL,NULL,NULL),(82,34,2,1,0,'924Z States Rd E',924,'Z',NULL,'States','Rd','E',NULL,'Attn: Development',NULL,NULL,'Aptos',1,1004,NULL,'95001',NULL,1228,37.05297,-121.949418,0,NULL,NULL,81),(83,14,3,1,0,'385N States Way SW',385,'N',NULL,'States','Way','SW',NULL,'Disbursements',NULL,NULL,'Ballston Lake',1,1031,NULL,'12019',NULL,1228,42.916343,-73.86657,0,NULL,NULL,NULL),(84,178,3,1,0,'657X Dowlen Ave NW',657,'X',NULL,'Dowlen','Ave','NW',NULL,'c/o PO Plus',NULL,NULL,'Lake Como',1,1008,NULL,'32157',NULL,1228,29.467357,-81.57164,0,NULL,NULL,NULL),(85,117,3,1,0,'801K Main St W',801,'K',NULL,'Main','St','W',NULL,'Community Relations',NULL,NULL,'Willow City',1,1033,NULL,'58384',NULL,1228,48.609924,-100.26587,0,NULL,NULL,NULL),(86,85,2,1,0,'801K Main St W',801,'K',NULL,'Main','St','W',NULL,'Community Relations',NULL,NULL,'Willow City',1,1033,NULL,'58384',NULL,1228,48.609924,-100.26587,0,NULL,NULL,85),(87,157,3,1,0,'787X Lincoln Dr E',787,'X',NULL,'Lincoln','Dr','E',NULL,'Urgent',NULL,NULL,'Moxahala',1,1034,NULL,'43761',NULL,1228,39.740299,-82.248369,0,NULL,NULL,NULL),(88,57,2,0,0,'787X Lincoln Dr E',787,'X',NULL,'Lincoln','Dr','E',NULL,'Urgent',NULL,NULL,'Moxahala',1,1034,NULL,'43761',NULL,1228,39.740299,-82.248369,0,NULL,NULL,87),(89,91,3,1,0,'854O Green Rd NE',854,'O',NULL,'Green','Rd','NE',NULL,'Subscriptions Dept',NULL,NULL,'Allakaket',1,1001,NULL,'99720',NULL,1228,66.557586,-152.6559,0,NULL,NULL,NULL),(90,120,2,1,0,'854O Green Rd NE',854,'O',NULL,'Green','Rd','NE',NULL,'Subscriptions Dept',NULL,NULL,'Allakaket',1,1001,NULL,'99720',NULL,1228,66.557586,-152.6559,0,NULL,NULL,89),(91,73,3,1,0,'251Y Van Ness St NW',251,'Y',NULL,'Van Ness','St','NW',NULL,'c/o OPDC',NULL,NULL,'Yakima',1,1046,NULL,'98907',NULL,1228,46.628757,-120.573967,0,NULL,NULL,NULL),(92,75,2,1,0,'251Y Van Ness St NW',251,'Y',NULL,'Van Ness','St','NW',NULL,'c/o OPDC',NULL,NULL,'Yakima',1,1046,NULL,'98907',NULL,1228,46.628757,-120.573967,0,NULL,NULL,91),(93,79,3,1,0,'753P Main Pl NW',753,'P',NULL,'Main','Pl','NW',NULL,'Payables Dept.',NULL,NULL,'Ogdensburg',1,1048,NULL,'54962',NULL,1228,44.481372,-89.03101,0,NULL,NULL,NULL),(94,37,3,1,0,'879J Jackson Ave S',879,'J',NULL,'Jackson','Ave','S',NULL,'Receiving',NULL,NULL,'Copeland',1,1015,NULL,'67837',NULL,1228,37.554849,-100.67514,0,NULL,NULL,NULL),(95,36,2,1,0,'879J Jackson Ave S',879,'J',NULL,'Jackson','Ave','S',NULL,'Receiving',NULL,NULL,'Copeland',1,1015,NULL,'67837',NULL,1228,37.554849,-100.67514,0,NULL,NULL,94),(96,46,3,1,0,'374P Green Ave S',374,'P',NULL,'Green','Ave','S',NULL,'Subscriptions Dept',NULL,NULL,'Tampa',1,1008,NULL,'33697',NULL,1228,27.871964,-82.438841,0,NULL,NULL,NULL),(97,20,2,1,0,'374P Green Ave S',374,'P',NULL,'Green','Ave','S',NULL,'Subscriptions Dept',NULL,NULL,'Tampa',1,1008,NULL,'33697',NULL,1228,27.871964,-82.438841,0,NULL,NULL,96),(98,50,3,1,0,'632O College Ave NW',632,'O',NULL,'College','Ave','NW',NULL,'Editorial Dept',NULL,NULL,'Lakewood',1,1029,NULL,'08701',NULL,1228,40.082782,-74.2094,0,NULL,NULL,NULL),(99,89,2,1,0,'632O College Ave NW',632,'O',NULL,'College','Ave','NW',NULL,'Editorial Dept',NULL,NULL,'Lakewood',1,1029,NULL,'08701',NULL,1228,40.082782,-74.2094,0,NULL,NULL,98),(100,125,1,1,0,'321Z Green Path W',321,'Z',NULL,'Green','Path','W',NULL,NULL,NULL,NULL,'Florence',1,1039,NULL,'29503',NULL,1228,34.062999,-79.650627,0,NULL,NULL,46),(101,74,1,1,0,'321Z Green Path W',321,'Z',NULL,'Green','Path','W',NULL,NULL,NULL,NULL,'Florence',1,1039,NULL,'29503',NULL,1228,34.062999,-79.650627,0,NULL,NULL,46),(102,47,1,1,0,'321Z Green Path W',321,'Z',NULL,'Green','Path','W',NULL,NULL,NULL,NULL,'Florence',1,1039,NULL,'29503',NULL,1228,34.062999,-79.650627,0,NULL,NULL,46),(103,172,1,0,0,'967Z College Path E',967,'Z',NULL,'College','Path','E',NULL,NULL,NULL,NULL,'Michigan City',1,1023,NULL,'38647',NULL,1228,34.975571,-89.25982,0,NULL,NULL,NULL),(104,102,1,1,0,'480E Jackson Blvd E',480,'E',NULL,'Jackson','Blvd','E',NULL,NULL,NULL,NULL,'Wascott',1,1048,NULL,'54383',NULL,1228,46.18508,-91.959307,0,NULL,NULL,47),(105,126,1,1,0,'480E Jackson Blvd E',480,'E',NULL,'Jackson','Blvd','E',NULL,NULL,NULL,NULL,'Wascott',1,1048,NULL,'54383',NULL,1228,46.18508,-91.959307,0,NULL,NULL,47),(106,9,1,1,0,'480E Jackson Blvd E',480,'E',NULL,'Jackson','Blvd','E',NULL,NULL,NULL,NULL,'Wascott',1,1048,NULL,'54383',NULL,1228,46.18508,-91.959307,0,NULL,NULL,47),(107,159,1,1,0,'434Z Beech Blvd NW',434,'Z',NULL,'Beech','Blvd','NW',NULL,NULL,NULL,NULL,'Carteret',1,1029,NULL,'07008',NULL,1228,40.582504,-74.22997,0,NULL,NULL,NULL),(108,149,1,1,0,'5C Main Dr W',5,'C',NULL,'Main','Dr','W',NULL,NULL,NULL,NULL,'Cuthbert',1,1009,NULL,'31740',NULL,1228,31.781815,-84.76444,0,NULL,NULL,48),(109,40,1,1,0,'5C Main Dr W',5,'C',NULL,'Main','Dr','W',NULL,NULL,NULL,NULL,'Cuthbert',1,1009,NULL,'31740',NULL,1228,31.781815,-84.76444,0,NULL,NULL,48),(110,85,1,0,0,'5C Main Dr W',5,'C',NULL,'Main','Dr','W',NULL,NULL,NULL,NULL,'Cuthbert',1,1009,NULL,'31740',NULL,1228,31.781815,-84.76444,0,NULL,NULL,48),(111,198,1,1,0,'5C Main Dr W',5,'C',NULL,'Main','Dr','W',NULL,NULL,NULL,NULL,'Cuthbert',1,1009,NULL,'31740',NULL,1228,31.781815,-84.76444,0,NULL,NULL,48),(112,170,1,0,0,'579N Main Rd SE',579,'N',NULL,'Main','Rd','SE',NULL,NULL,NULL,NULL,'Kendall',1,1048,NULL,'54638',NULL,1228,43.795422,-90.37609,0,NULL,NULL,49),(113,134,1,1,0,'579N Main Rd SE',579,'N',NULL,'Main','Rd','SE',NULL,NULL,NULL,NULL,'Kendall',1,1048,NULL,'54638',NULL,1228,43.795422,-90.37609,0,NULL,NULL,49),(114,100,1,1,0,'579N Main Rd SE',579,'N',NULL,'Main','Rd','SE',NULL,NULL,NULL,NULL,'Kendall',1,1048,NULL,'54638',NULL,1228,43.795422,-90.37609,0,NULL,NULL,49),(115,192,1,1,0,'506M States St E',506,'M',NULL,'States','St','E',NULL,NULL,NULL,NULL,'East Windsor',1,1006,NULL,'06088',NULL,1228,41.908464,-72.60547,0,NULL,NULL,NULL),(116,113,1,1,0,'275C Jackson Ave N',275,'C',NULL,'Jackson','Ave','N',NULL,NULL,NULL,NULL,'Denver',1,1037,NULL,'17517',NULL,1228,40.234392,-76.12655,0,NULL,NULL,50),(117,59,1,1,0,'275C Jackson Ave N',275,'C',NULL,'Jackson','Ave','N',NULL,NULL,NULL,NULL,'Denver',1,1037,NULL,'17517',NULL,1228,40.234392,-76.12655,0,NULL,NULL,50),(118,110,1,1,0,'275C Jackson Ave N',275,'C',NULL,'Jackson','Ave','N',NULL,NULL,NULL,NULL,'Denver',1,1037,NULL,'17517',NULL,1228,40.234392,-76.12655,0,NULL,NULL,50),(119,34,1,0,0,'275C Jackson Ave N',275,'C',NULL,'Jackson','Ave','N',NULL,NULL,NULL,NULL,'Denver',1,1037,NULL,'17517',NULL,1228,40.234392,-76.12655,0,NULL,NULL,50),(120,160,1,1,0,'228Q Main Rd NW',228,'Q',NULL,'Main','Rd','NW',NULL,NULL,NULL,NULL,'Mount Pleasant',1,1034,NULL,'43939',NULL,1228,40.176109,-80.79979,0,NULL,NULL,51),(121,147,1,1,0,'228Q Main Rd NW',228,'Q',NULL,'Main','Rd','NW',NULL,NULL,NULL,NULL,'Mount Pleasant',1,1034,NULL,'43939',NULL,1228,40.176109,-80.79979,0,NULL,NULL,51),(122,151,1,0,0,'228Q Main Rd NW',228,'Q',NULL,'Main','Rd','NW',NULL,NULL,NULL,NULL,'Mount Pleasant',1,1034,NULL,'43939',NULL,1228,40.176109,-80.79979,0,NULL,NULL,51),(123,191,1,1,0,'228Q Main Rd NW',228,'Q',NULL,'Main','Rd','NW',NULL,NULL,NULL,NULL,'Mount Pleasant',1,1034,NULL,'43939',NULL,1228,40.176109,-80.79979,0,NULL,NULL,51),(124,196,1,1,0,'797G Main Ln S',797,'G',NULL,'Main','Ln','S',NULL,NULL,NULL,NULL,'Louisville',1,1016,NULL,'40291',NULL,1228,38.147232,-85.59169,0,NULL,NULL,52),(125,94,1,1,0,'797G Main Ln S',797,'G',NULL,'Main','Ln','S',NULL,NULL,NULL,NULL,'Louisville',1,1016,NULL,'40291',NULL,1228,38.147232,-85.59169,0,NULL,NULL,52),(126,188,1,1,0,'797G Main Ln S',797,'G',NULL,'Main','Ln','S',NULL,NULL,NULL,NULL,'Louisville',1,1016,NULL,'40291',NULL,1228,38.147232,-85.59169,0,NULL,NULL,52),(127,82,1,1,0,'312Q Second Blvd NE',312,'Q',NULL,'Second','Blvd','NE',NULL,NULL,NULL,NULL,'Round Rock',1,1042,NULL,'78681',NULL,1228,30.518975,-97.71439,0,NULL,NULL,NULL),(128,173,1,1,0,'747A El Camino Way NW',747,'A',NULL,'El Camino','Way','NW',NULL,NULL,NULL,NULL,'Harmony',1,1038,NULL,'02829',NULL,1228,41.879298,-71.589357,0,NULL,NULL,53),(129,28,1,1,0,'747A El Camino Way NW',747,'A',NULL,'El Camino','Way','NW',NULL,NULL,NULL,NULL,'Harmony',1,1038,NULL,'02829',NULL,1228,41.879298,-71.589357,0,NULL,NULL,53),(130,133,1,1,0,'747A El Camino Way NW',747,'A',NULL,'El Camino','Way','NW',NULL,NULL,NULL,NULL,'Harmony',1,1038,NULL,'02829',NULL,1228,41.879298,-71.589357,0,NULL,NULL,53),(131,195,1,1,0,'216S Northpoint Ave NW',216,'S',NULL,'Northpoint','Ave','NW',NULL,NULL,NULL,NULL,'Kearneysville',1,1047,NULL,'25429',NULL,1228,39.349586,-77.878957,0,NULL,NULL,NULL),(132,112,1,1,0,'680G Caulder Blvd E',680,'G',NULL,'Caulder','Blvd','E',NULL,NULL,NULL,NULL,'Yoncalla',1,1036,NULL,'97499',NULL,1228,43.593788,-123.26602,0,NULL,NULL,54),(133,152,1,1,0,'680G Caulder Blvd E',680,'G',NULL,'Caulder','Blvd','E',NULL,NULL,NULL,NULL,'Yoncalla',1,1036,NULL,'97499',NULL,1228,43.593788,-123.26602,0,NULL,NULL,54),(134,61,1,1,0,'680G Caulder Blvd E',680,'G',NULL,'Caulder','Blvd','E',NULL,NULL,NULL,NULL,'Yoncalla',1,1036,NULL,'97499',NULL,1228,43.593788,-123.26602,0,NULL,NULL,54),(135,141,1,1,0,'680G Caulder Blvd E',680,'G',NULL,'Caulder','Blvd','E',NULL,NULL,NULL,NULL,'Yoncalla',1,1036,NULL,'97499',NULL,1228,43.593788,-123.26602,0,NULL,NULL,54),(136,54,1,1,0,'485N States Dr SW',485,'N',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Ardmore',1,1035,NULL,'73403',NULL,1228,34.288884,-97.248074,0,NULL,NULL,55),(137,155,1,1,0,'485N States Dr SW',485,'N',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Ardmore',1,1035,NULL,'73403',NULL,1228,34.288884,-97.248074,0,NULL,NULL,55),(138,29,1,1,0,'485N States Dr SW',485,'N',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Ardmore',1,1035,NULL,'73403',NULL,1228,34.288884,-97.248074,0,NULL,NULL,55),(139,108,1,1,0,'485N States Dr SW',485,'N',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Ardmore',1,1035,NULL,'73403',NULL,1228,34.288884,-97.248074,0,NULL,NULL,55),(140,201,1,1,0,'218T Lincoln Ave SW',218,'T',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Parchman',1,1023,NULL,'38738',NULL,1228,33.922146,-90.54366,0,NULL,NULL,56),(141,63,1,1,0,'218T Lincoln Ave SW',218,'T',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Parchman',1,1023,NULL,'38738',NULL,1228,33.922146,-90.54366,0,NULL,NULL,56),(142,95,1,1,0,'218T Lincoln Ave SW',218,'T',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Parchman',1,1023,NULL,'38738',NULL,1228,33.922146,-90.54366,0,NULL,NULL,56),(143,103,1,1,0,'218T Lincoln Ave SW',218,'T',NULL,'Lincoln','Ave','SW',NULL,NULL,NULL,NULL,'Parchman',1,1023,NULL,'38738',NULL,1228,33.922146,-90.54366,0,NULL,NULL,56),(144,68,1,1,0,'994U Martin Luther King Pl NE',994,'U',NULL,'Martin Luther King','Pl','NE',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75250',NULL,1228,32.767268,-96.777626,0,NULL,NULL,57),(145,114,1,1,0,'994U Martin Luther King Pl NE',994,'U',NULL,'Martin Luther King','Pl','NE',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75250',NULL,1228,32.767268,-96.777626,0,NULL,NULL,57),(146,70,1,1,0,'994U Martin Luther King Pl NE',994,'U',NULL,'Martin Luther King','Pl','NE',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75250',NULL,1228,32.767268,-96.777626,0,NULL,NULL,57),(147,107,1,1,0,'994U Martin Luther King Pl NE',994,'U',NULL,'Martin Luther King','Pl','NE',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75250',NULL,1228,32.767268,-96.777626,0,NULL,NULL,57),(148,130,1,1,0,'352X Second Way N',352,'X',NULL,'Second','Way','N',NULL,NULL,NULL,NULL,'Trout Dale',1,1045,NULL,'24378',NULL,1228,36.684567,-81.43411,0,NULL,NULL,58),(149,140,1,1,0,'352X Second Way N',352,'X',NULL,'Second','Way','N',NULL,NULL,NULL,NULL,'Trout Dale',1,1045,NULL,'24378',NULL,1228,36.684567,-81.43411,0,NULL,NULL,58),(150,58,1,1,0,'352X Second Way N',352,'X',NULL,'Second','Way','N',NULL,NULL,NULL,NULL,'Trout Dale',1,1045,NULL,'24378',NULL,1228,36.684567,-81.43411,0,NULL,NULL,58),(151,10,1,1,0,'352X Second Way N',352,'X',NULL,'Second','Way','N',NULL,NULL,NULL,NULL,'Trout Dale',1,1045,NULL,'24378',NULL,1228,36.684567,-81.43411,0,NULL,NULL,58),(152,48,1,1,0,'644M Main Dr N',644,'M',NULL,'Main','Dr','N',NULL,NULL,NULL,NULL,'Wilmington',1,1007,NULL,'19893',NULL,1228,39.564499,-75.597047,0,NULL,NULL,59),(153,78,1,1,0,'644M Main Dr N',644,'M',NULL,'Main','Dr','N',NULL,NULL,NULL,NULL,'Wilmington',1,1007,NULL,'19893',NULL,1228,39.564499,-75.597047,0,NULL,NULL,59),(154,181,1,1,0,'644M Main Dr N',644,'M',NULL,'Main','Dr','N',NULL,NULL,NULL,NULL,'Wilmington',1,1007,NULL,'19893',NULL,1228,39.564499,-75.597047,0,NULL,NULL,59),(155,187,1,1,0,'765E States Rd NE',765,'E',NULL,'States','Rd','NE',NULL,NULL,NULL,NULL,'Sebring',1,1008,NULL,'33870',NULL,1228,27.483817,-81.42131,0,NULL,NULL,NULL),(156,43,1,1,0,'935N Second Pl S',935,'N',NULL,'Second','Pl','S',NULL,NULL,NULL,NULL,'Union City',1,1034,NULL,'45390',NULL,1228,40.20451,-84.78292,0,NULL,NULL,60),(157,20,1,0,0,'935N Second Pl S',935,'N',NULL,'Second','Pl','S',NULL,NULL,NULL,NULL,'Union City',1,1034,NULL,'45390',NULL,1228,40.20451,-84.78292,0,NULL,NULL,60),(158,13,1,1,0,'935N Second Pl S',935,'N',NULL,'Second','Pl','S',NULL,NULL,NULL,NULL,'Union City',1,1034,NULL,'45390',NULL,1228,40.20451,-84.78292,0,NULL,NULL,60),(159,135,1,1,0,'759K Lincoln St SW',759,'K',NULL,'Lincoln','St','SW',NULL,NULL,NULL,NULL,'Dutchtown',1,1024,NULL,'63745',NULL,1228,37.24237,-89.69768,0,NULL,NULL,NULL),(160,131,1,1,0,'555F Green Dr S',555,'F',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Pleasant Grove',1,1004,NULL,'95668',NULL,1228,38.8323,-121.51661,0,NULL,NULL,61),(161,89,1,0,0,'555F Green Dr S',555,'F',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Pleasant Grove',1,1004,NULL,'95668',NULL,1228,38.8323,-121.51661,0,NULL,NULL,61),(162,75,1,0,0,'555F Green Dr S',555,'F',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Pleasant Grove',1,1004,NULL,'95668',NULL,1228,38.8323,-121.51661,0,NULL,NULL,61),(163,194,1,1,0,'78O Maple Rd E',78,'O',NULL,'Maple','Rd','E',NULL,NULL,NULL,NULL,'Meservey',1,1014,NULL,'50457',NULL,1228,42.916174,-93.48318,0,NULL,NULL,NULL),(164,153,1,1,0,'169U Green St NW',169,'U',NULL,'Green','St','NW',NULL,NULL,NULL,NULL,'Eastwood',1,1016,NULL,'40018',NULL,1228,38.22977,-85.66304,0,NULL,NULL,62),(165,121,1,1,0,'169U Green St NW',169,'U',NULL,'Green','St','NW',NULL,NULL,NULL,NULL,'Eastwood',1,1016,NULL,'40018',NULL,1228,38.22977,-85.66304,0,NULL,NULL,62),(166,39,1,1,0,'169U Green St NW',169,'U',NULL,'Green','St','NW',NULL,NULL,NULL,NULL,'Eastwood',1,1016,NULL,'40018',NULL,1228,38.22977,-85.66304,0,NULL,NULL,62),(167,104,1,0,0,'169U Green St NW',169,'U',NULL,'Green','St','NW',NULL,NULL,NULL,NULL,'Eastwood',1,1016,NULL,'40018',NULL,1228,38.22977,-85.66304,0,NULL,NULL,62),(168,189,1,1,0,'967B Dowlen Pl S',967,'B',NULL,'Dowlen','Pl','S',NULL,NULL,NULL,NULL,'Strawberry Plains',1,1041,NULL,'37871',NULL,1228,36.04051,-83.67934,0,NULL,NULL,63),(169,36,1,0,0,'967B Dowlen Pl S',967,'B',NULL,'Dowlen','Pl','S',NULL,NULL,NULL,NULL,'Strawberry Plains',1,1041,NULL,'37871',NULL,1228,36.04051,-83.67934,0,NULL,NULL,63),(170,26,1,1,0,'967B Dowlen Pl S',967,'B',NULL,'Dowlen','Pl','S',NULL,NULL,NULL,NULL,'Strawberry Plains',1,1041,NULL,'37871',NULL,1228,36.04051,-83.67934,0,NULL,NULL,63),(171,42,1,1,0,'967B Dowlen Pl S',967,'B',NULL,'Dowlen','Pl','S',NULL,NULL,NULL,NULL,'Strawberry Plains',1,1041,NULL,'37871',NULL,1228,36.04051,-83.67934,0,NULL,NULL,63),(172,200,1,1,0,'706B Cadell Ln SW',706,'B',NULL,'Cadell','Ln','SW',NULL,NULL,NULL,NULL,'Augusta',1,1009,NULL,'30917',NULL,1228,33.527678,-82.235542,0,NULL,NULL,64),(173,69,1,1,0,'706B Cadell Ln SW',706,'B',NULL,'Cadell','Ln','SW',NULL,NULL,NULL,NULL,'Augusta',1,1009,NULL,'30917',NULL,1228,33.527678,-82.235542,0,NULL,NULL,64),(174,109,1,1,0,'706B Cadell Ln SW',706,'B',NULL,'Cadell','Ln','SW',NULL,NULL,NULL,NULL,'Augusta',1,1009,NULL,'30917',NULL,1228,33.527678,-82.235542,0,NULL,NULL,64),(175,171,1,1,0,'706B Cadell Ln SW',706,'B',NULL,'Cadell','Ln','SW',NULL,NULL,NULL,NULL,'Augusta',1,1009,NULL,'30917',NULL,1228,33.527678,-82.235542,0,NULL,NULL,64),(176,180,1,1,0,'296I States Path E',296,'I',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Heber',1,1002,NULL,'85928',NULL,1228,34.563994,-110.55929,0,NULL,NULL,65),(177,158,1,1,0,'296I States Path E',296,'I',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Heber',1,1002,NULL,'85928',NULL,1228,34.563994,-110.55929,0,NULL,NULL,65),(178,4,1,1,0,'296I States Path E',296,'I',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Heber',1,1002,NULL,'85928',NULL,1228,34.563994,-110.55929,0,NULL,NULL,65),(179,25,1,1,0,'912H El Camino Way SE',912,'H',NULL,'El Camino','Way','SE',NULL,NULL,NULL,NULL,'Conetoe',1,1032,NULL,'27819',NULL,1228,35.818414,-77.45335,0,NULL,NULL,NULL),(180,NULL,1,1,1,'14S El Camino Way E',14,'S',NULL,'El Camino','Way',NULL,NULL,NULL,NULL,NULL,'Collinsville',NULL,1006,NULL,'6022',NULL,1228,41.8328,-72.9253,0,NULL,NULL,NULL),(181,NULL,1,1,1,'11B Woodbridge Path SW',11,'B',NULL,'Woodbridge','Path',NULL,NULL,NULL,NULL,NULL,'Dayton',NULL,1034,NULL,'45417',NULL,1228,39.7531,-84.2471,0,NULL,NULL,NULL),(182,NULL,1,1,1,'581O Lincoln Dr SW',581,'O',NULL,'Lincoln','Dr',NULL,NULL,NULL,NULL,NULL,'Santa Fe',NULL,1030,NULL,'87594',NULL,1228,35.5212,-105.982,0,NULL,NULL,NULL);
+INSERT INTO `civicrm_address` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `street_address`, `street_number`, `street_number_suffix`, `street_number_predirectional`, `street_name`, `street_type`, `street_number_postdirectional`, `street_unit`, `supplemental_address_1`, `supplemental_address_2`, `supplemental_address_3`, `city`, `county_id`, `state_province_id`, `postal_code_suffix`, `postal_code`, `usps_adc`, `country_id`, `geo_code_1`, `geo_code_2`, `manual_geo_code`, `timezone`, `name`, `master_id`) VALUES (1,105,1,1,0,'39F Caulder Path N',39,'F',NULL,'Caulder','Path','N',NULL,NULL,NULL,NULL,'Wausau',1,1048,NULL,'54401',NULL,1228,44.958382,-89.6693,0,NULL,NULL,NULL),(2,25,1,1,0,'291L Bay Ln SW',291,'L',NULL,'Bay','Ln','SW',NULL,NULL,NULL,NULL,'Saxonburg',1,1037,NULL,'16056',NULL,1228,40.732393,-79.83422,0,NULL,NULL,NULL),(3,117,1,1,0,'576R Martin Luther King Rd N',576,'R',NULL,'Martin Luther King','Rd','N',NULL,NULL,NULL,NULL,'Mishawaka',1,1013,NULL,'46546',NULL,1228,41.688432,-86.196485,0,NULL,NULL,NULL),(4,99,1,1,0,'140P Pine Pl SE',140,'P',NULL,'Pine','Pl','SE',NULL,NULL,NULL,NULL,'Tornillo',1,1042,NULL,'79853',NULL,1228,31.447738,-106.09049,0,NULL,NULL,NULL),(5,145,1,1,0,'201L Cadell Ln N',201,'L',NULL,'Cadell','Ln','N',NULL,NULL,NULL,NULL,'Beaver',1,1034,NULL,'45613',NULL,1228,39.015223,-82.84927,0,NULL,NULL,NULL),(6,30,1,1,0,'787F Beech Path E',787,'F',NULL,'Beech','Path','E',NULL,NULL,NULL,NULL,'Sagamore',1,1020,NULL,'02567',NULL,1228,41.79197,-70.530852,0,NULL,NULL,NULL),(7,103,1,1,0,'641B Main St N',641,'B',NULL,'Main','St','N',NULL,NULL,NULL,NULL,'East Hampton',1,1006,NULL,'06424',NULL,1228,41.573008,-72.5078,0,NULL,NULL,NULL),(8,130,1,1,0,'618W States Dr SW',618,'W',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Red Bank',1,1029,NULL,'07701',NULL,1228,40.352953,-74.07703,0,NULL,NULL,NULL),(9,152,1,1,0,'990K Dowlen Pl E',990,'K',NULL,'Dowlen','Pl','E',NULL,NULL,NULL,NULL,'Galva',1,1012,NULL,'61434',NULL,1228,41.172197,-90.03901,0,NULL,NULL,NULL),(10,122,1,1,0,'833J Martin Luther King Blvd W',833,'J',NULL,'Martin Luther King','Blvd','W',NULL,NULL,NULL,NULL,'West New York',1,1029,NULL,'07093',NULL,1228,40.7895,-74.01223,0,NULL,NULL,NULL),(11,65,1,1,0,'848H Van Ness Pl SE',848,'H',NULL,'Van Ness','Pl','SE',NULL,NULL,NULL,NULL,'Frankfort',1,1040,NULL,'57440',NULL,1228,44.857069,-98.27191,0,NULL,NULL,NULL),(12,201,1,1,0,'375O Martin Luther King Blvd NW',375,'O',NULL,'Martin Luther King','Blvd','NW',NULL,NULL,NULL,NULL,'Cresco',1,1014,NULL,'52136',NULL,1228,43.382021,-92.10263,0,NULL,NULL,NULL),(13,86,1,1,0,'409F Cadell St SW',409,'F',NULL,'Cadell','St','SW',NULL,NULL,NULL,NULL,'Charlton',1,1020,NULL,'01507',NULL,1228,42.135142,-71.96961,0,NULL,NULL,NULL),(14,142,1,1,0,'993V Pine Rd SE',993,'V',NULL,'Pine','Rd','SE',NULL,NULL,NULL,NULL,'Bell',1,1004,NULL,'90201',NULL,1228,33.972814,-118.17385,0,NULL,NULL,NULL),(15,141,1,1,0,'60W Northpoint Rd SE',60,'W',NULL,'Northpoint','Rd','SE',NULL,NULL,NULL,NULL,'Villalba',1,1056,NULL,'00766',NULL,1228,18.126023,-66.48208,0,NULL,NULL,NULL),(16,39,1,1,0,'175J Bay St N',175,'J',NULL,'Bay','St','N',NULL,NULL,NULL,NULL,'Bridgewater',1,1031,NULL,'13313',NULL,1228,42.87896,-75.25569,0,NULL,NULL,NULL),(17,170,1,1,0,'324A Northpoint Rd N',324,'A',NULL,'Northpoint','Rd','N',NULL,NULL,NULL,NULL,'Doctors Inlet',1,1008,NULL,'32030',NULL,1228,30.105553,-81.768964,0,NULL,NULL,NULL),(18,169,1,1,0,'411P Van Ness Ave S',411,'P',NULL,'Van Ness','Ave','S',NULL,NULL,NULL,NULL,'Yorba Linda',1,1004,NULL,'92887',NULL,1228,33.883223,-117.73856,0,NULL,NULL,NULL),(19,23,1,1,0,'337H College Rd NW',337,'H',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Esmont',1,1045,NULL,'22937',NULL,1228,37.79922,-78.61263,0,NULL,NULL,NULL),(20,92,1,1,0,'596V Northpoint St N',596,'V',NULL,'Northpoint','St','N',NULL,NULL,NULL,NULL,'Paradise',1,1021,NULL,'49647',NULL,1228,44.515487,-85.527652,0,NULL,NULL,NULL),(21,150,1,1,0,'25J States Pl NW',25,'J',NULL,'States','Pl','NW',NULL,NULL,NULL,NULL,'Troy',1,1045,NULL,'22974',NULL,1228,37.959376,-78.26353,0,NULL,NULL,NULL),(22,104,1,1,0,'243Z Jackson Blvd SE',243,'Z',NULL,'Jackson','Blvd','SE',NULL,NULL,NULL,NULL,'Charleston',1,1047,NULL,'25311',NULL,1228,38.351204,-81.58198,0,NULL,NULL,NULL),(23,43,1,1,0,'294H Second Way E',294,'H',NULL,'Second','Way','E',NULL,NULL,NULL,NULL,'Boston',1,1020,NULL,'02208',NULL,1228,42.338947,-70.919635,0,NULL,NULL,NULL),(24,17,1,1,0,'359K Caulder Rd N',359,'K',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Sumner',1,1014,NULL,'50674',NULL,1228,42.846877,-92.11188,0,NULL,NULL,NULL),(25,127,1,1,0,'150P El Camino Ave NE',150,'P',NULL,'El Camino','Ave','NE',NULL,NULL,NULL,NULL,'Seaside',1,1004,NULL,'93955',NULL,1228,36.615813,-121.83461,0,NULL,NULL,NULL),(26,59,1,1,0,'710K Bay Pl N',710,'K',NULL,'Bay','Pl','N',NULL,NULL,NULL,NULL,'Mobile',1,1000,NULL,'36609',NULL,1228,30.662735,-88.16255,0,NULL,NULL,NULL),(27,118,1,1,0,'60Q Pine Dr W',60,'Q',NULL,'Pine','Dr','W',NULL,NULL,NULL,NULL,'Grapeland',1,1042,NULL,'75844',NULL,1228,31.505916,-95.46315,0,NULL,NULL,NULL),(28,156,1,1,0,'423C Green Way N',423,'C',NULL,'Green','Way','N',NULL,NULL,NULL,NULL,'Conway',1,1039,NULL,'29526',NULL,1228,33.850218,-79.01692,0,NULL,NULL,NULL),(29,111,1,1,0,'656S Woodbridge Path NE',656,'S',NULL,'Woodbridge','Path','NE',NULL,NULL,NULL,NULL,'Monroe',1,1017,NULL,'71210',NULL,1228,32.490777,-92.159354,0,NULL,NULL,NULL),(30,19,1,1,0,'496A Main Way S',496,'A',NULL,'Main','Way','S',NULL,NULL,NULL,NULL,'Harbeson',1,1007,NULL,'19951',NULL,1228,38.682345,-75.23286,0,NULL,NULL,NULL),(31,12,1,1,0,'445V Green Rd W',445,'V',NULL,'Green','Rd','W',NULL,NULL,NULL,NULL,'Lexington',1,1013,NULL,'47138',NULL,1228,38.678365,-85.6097,0,NULL,NULL,NULL),(32,3,1,1,0,'460C Lincoln Ave NE',460,'C',NULL,'Lincoln','Ave','NE',NULL,NULL,NULL,NULL,'Sandy Creek',1,1031,NULL,'13145',NULL,1228,43.653475,-76.13214,0,NULL,NULL,NULL),(33,132,1,1,0,'631B Caulder Way W',631,'B',NULL,'Caulder','Way','W',NULL,NULL,NULL,NULL,'Paradise',1,1043,NULL,'84328',NULL,1228,41.508503,-111.79102,0,NULL,NULL,NULL),(34,57,1,1,0,'188I Maple St NW',188,'I',NULL,'Maple','St','NW',NULL,NULL,NULL,NULL,'Oakland',1,1004,NULL,'94601',NULL,1228,37.776835,-122.21792,0,NULL,NULL,NULL),(35,144,1,1,0,'919I Bay Ave S',919,'I',NULL,'Bay','Ave','S',NULL,NULL,NULL,NULL,'Zanoni',1,1045,NULL,'23191',NULL,1228,37.418242,-76.508402,0,NULL,NULL,NULL),(36,191,1,1,0,'433M Dowlen Way N',433,'M',NULL,'Dowlen','Way','N',NULL,NULL,NULL,NULL,'Arcadia',1,1017,NULL,'71001',NULL,1228,32.57761,-92.9062,0,NULL,NULL,NULL),(37,46,1,1,0,'251D Van Ness Rd S',251,'D',NULL,'Van Ness','Rd','S',NULL,NULL,NULL,NULL,'Mountain Iron',1,1022,NULL,'55768',NULL,1228,47.502878,-92.66548,0,NULL,NULL,NULL),(38,81,1,1,0,'107J Dowlen Ln NW',107,'J',NULL,'Dowlen','Ln','NW',NULL,NULL,NULL,NULL,'Stites',1,1011,NULL,'83552',NULL,1228,46.093893,-115.9769,0,NULL,NULL,NULL),(39,129,1,1,0,'76N College Ln NW',76,'N',NULL,'College','Ln','NW',NULL,NULL,NULL,NULL,'Chesterfield',1,1039,NULL,'29709',NULL,1228,34.720306,-80.09371,0,NULL,NULL,NULL),(40,109,1,1,0,'74G Van Ness Ln W',74,'G',NULL,'Van Ness','Ln','W',NULL,NULL,NULL,NULL,'Chicago',1,1012,NULL,'60660',NULL,1228,41.990631,-87.6667,0,NULL,NULL,NULL),(41,52,1,1,0,'442G Cadell Ln NE',442,'G',NULL,'Cadell','Ln','NE',NULL,NULL,NULL,NULL,'Carrizozo',1,1030,NULL,'88301',NULL,1228,33.710312,-105.88218,0,NULL,NULL,NULL),(42,107,1,1,0,'495J Beech Ave SW',495,'J',NULL,'Beech','Ave','SW',NULL,NULL,NULL,NULL,'Saint Charles',1,1011,NULL,'83272',NULL,1228,42.127915,-111.3922,0,NULL,NULL,NULL),(43,47,1,1,0,'66R El Camino Way S',66,'R',NULL,'El Camino','Way','S',NULL,NULL,NULL,NULL,'Flatwoods',1,1017,NULL,'71427',NULL,1228,31.378139,-92.88735,0,NULL,NULL,NULL),(44,158,1,1,0,'645Q Cadell Path NW',645,'Q',NULL,'Cadell','Path','NW',NULL,NULL,NULL,NULL,'Walthourville',1,1009,NULL,'31333',NULL,1228,31.77789,-81.64534,0,NULL,NULL,NULL),(45,167,1,1,0,'792O Northpoint Dr S',792,'O',NULL,'Northpoint','Dr','S',NULL,NULL,NULL,NULL,'Borup',1,1022,NULL,'56519',NULL,1228,47.158015,-96.51487,0,NULL,NULL,NULL),(46,106,1,1,0,'376F Beech Path N',376,'F',NULL,'Beech','Path','N',NULL,NULL,NULL,NULL,'Alpha',1,1016,NULL,'42603',NULL,1228,36.7703,-85.01043,0,NULL,NULL,NULL),(47,199,1,1,0,'618X Second Ave W',618,'X',NULL,'Second','Ave','W',NULL,NULL,NULL,NULL,'Creedmoor',1,1032,NULL,'27522',NULL,1228,36.111937,-78.69122,0,NULL,NULL,NULL),(48,136,1,1,0,'398F Pine St E',398,'F',NULL,'Pine','St','E',NULL,NULL,NULL,NULL,'Ely',1,1014,NULL,'52227',NULL,1228,41.89239,-91.5666,0,NULL,NULL,NULL),(49,41,1,1,0,'137C Lincoln Blvd N',137,'C',NULL,'Lincoln','Blvd','N',NULL,NULL,NULL,NULL,'Warm Springs',1,1036,NULL,'97761',NULL,1228,44.814466,-121.32302,0,NULL,NULL,NULL),(50,72,1,1,0,'522R Bay Pl N',522,'R',NULL,'Bay','Pl','N',NULL,NULL,NULL,NULL,'Euclid',1,1022,NULL,'56722',NULL,1228,47.970507,-96.66654,0,NULL,NULL,NULL),(51,89,1,1,0,'140Z Maple Ln W',140,'Z',NULL,'Maple','Ln','W',NULL,NULL,NULL,NULL,'Fitchburg',1,1020,NULL,'01420',NULL,1228,42.578689,-71.80338,0,NULL,NULL,NULL),(52,182,1,1,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,NULL),(53,178,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,NULL),(54,171,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,NULL),(55,160,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,NULL),(56,6,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,NULL),(57,123,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,NULL),(58,45,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,NULL),(59,140,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,NULL),(60,78,1,1,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,NULL),(61,133,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,NULL),(62,119,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,NULL),(63,148,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,NULL),(64,137,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,NULL),(65,186,1,1,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,NULL),(66,38,1,1,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,NULL),(67,75,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,NULL),(68,7,1,1,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,NULL),(69,32,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,NULL),(70,154,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,NULL),(71,187,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,NULL),(72,37,3,1,0,'45F Main Ave S',45,'F',NULL,'Main','Ave','S',NULL,'Attn: Development',NULL,NULL,'Erie',1,1037,NULL,'16533',NULL,1228,42.182748,-80.064915,0,NULL,NULL,NULL),(73,69,3,1,0,'870A Caulder Ave SE',870,'A',NULL,'Caulder','Ave','SE',NULL,'c/o OPDC',NULL,NULL,'Starkville',1,1023,NULL,'39760',NULL,1228,33.459924,-88.832163,0,NULL,NULL,NULL),(74,66,3,1,0,'818O Jackson Ave N',818,'O',NULL,'Jackson','Ave','N',NULL,'Payables Dept.',NULL,NULL,'Tamarack',1,1022,NULL,'55787',NULL,1228,46.679313,-93.13241,0,NULL,NULL,NULL),(75,84,3,1,0,'413N Cadell Way E',413,'N',NULL,'Cadell','Way','E',NULL,'Churchgate',NULL,NULL,'Peoria',1,1002,NULL,'85382',NULL,1228,33.689869,-112.24838,0,NULL,NULL,NULL),(76,174,2,1,0,'413N Cadell Way E',413,'N',NULL,'Cadell','Way','E',NULL,'Churchgate',NULL,NULL,'Peoria',1,1002,NULL,'85382',NULL,1228,33.689869,-112.24838,0,NULL,NULL,75),(77,121,3,1,0,'935Q Martin Luther King Path SE',935,'Q',NULL,'Martin Luther King','Path','SE',NULL,'Attn: Accounting',NULL,NULL,'Hadley',1,1016,NULL,'42235',NULL,1228,36.983441,-86.394012,0,NULL,NULL,NULL),(78,198,2,1,0,'935Q Martin Luther King Path SE',935,'Q',NULL,'Martin Luther King','Path','SE',NULL,'Attn: Accounting',NULL,NULL,'Hadley',1,1016,NULL,'42235',NULL,1228,36.983441,-86.394012,0,NULL,NULL,77),(79,9,3,1,0,'604U Second Path NE',604,'U',NULL,'Second','Path','NE',NULL,'Editorial Dept',NULL,NULL,'Falls Church',1,1045,NULL,'22043',NULL,1228,38.901311,-77.19777,0,NULL,NULL,NULL),(80,58,2,1,0,'604U Second Path NE',604,'U',NULL,'Second','Path','NE',NULL,'Editorial Dept',NULL,NULL,'Falls Church',1,1045,NULL,'22043',NULL,1228,38.901311,-77.19777,0,NULL,NULL,79),(81,76,3,1,0,'919V Lincoln Ln N',919,'V',NULL,'Lincoln','Ln','N',NULL,'Mailstop 101',NULL,NULL,'Montpelier',1,1011,NULL,'83254',NULL,1228,42.327996,-111.32637,0,NULL,NULL,NULL),(82,8,3,1,0,'343X Northpoint Rd NW',343,'X',NULL,'Northpoint','Rd','NW',NULL,'Attn: Development',NULL,NULL,'Tombstone',1,1002,NULL,'85638',NULL,1228,31.714525,-110.06684,0,NULL,NULL,NULL),(83,42,2,1,0,'343X Northpoint Rd NW',343,'X',NULL,'Northpoint','Rd','NW',NULL,'Attn: Development',NULL,NULL,'Tombstone',1,1002,NULL,'85638',NULL,1228,31.714525,-110.06684,0,NULL,NULL,82),(84,155,3,1,0,'596G Main Ave S',596,'G',NULL,'Main','Ave','S',NULL,'Urgent',NULL,NULL,'Elmore City',1,1035,NULL,'73433',NULL,1228,34.625144,-97.39901,0,NULL,NULL,NULL),(85,129,2,0,0,'596G Main Ave S',596,'G',NULL,'Main','Ave','S',NULL,'Urgent',NULL,NULL,'Elmore City',1,1035,NULL,'73433',NULL,1228,34.625144,-97.39901,0,NULL,NULL,84),(86,101,3,1,0,'572J Cadell Blvd W',572,'J',NULL,'Cadell','Blvd','W',NULL,'Donor Relations',NULL,NULL,'Leesville',1,1017,NULL,'71459',NULL,1228,31.072209,-93.21762,0,NULL,NULL,NULL),(87,20,3,1,0,'860J Pine Path NE',860,'J',NULL,'Pine','Path','NE',NULL,'Attn: Accounting',NULL,NULL,'McIntyre',1,1037,NULL,'15756',NULL,1228,40.570149,-79.29689,0,NULL,NULL,NULL),(88,73,2,1,0,'860J Pine Path NE',860,'J',NULL,'Pine','Path','NE',NULL,'Attn: Accounting',NULL,NULL,'McIntyre',1,1037,NULL,'15756',NULL,1228,40.570149,-79.29689,0,NULL,NULL,87),(89,114,3,1,0,'321R Bay Pl NW',321,'R',NULL,'Bay','Pl','NW',NULL,'Editorial Dept',NULL,NULL,'Pierceville',1,1015,NULL,'67868',NULL,1228,37.881899,-100.67849,0,NULL,NULL,NULL),(90,60,2,1,0,'321R Bay Pl NW',321,'R',NULL,'Bay','Pl','NW',NULL,'Editorial Dept',NULL,NULL,'Pierceville',1,1015,NULL,'67868',NULL,1228,37.881899,-100.67849,0,NULL,NULL,89),(91,62,3,1,0,'232O Northpoint Path W',232,'O',NULL,'Northpoint','Path','W',NULL,'Community Relations',NULL,NULL,'Battery Park',1,1045,NULL,'23304',NULL,1228,36.99497,-76.56901,0,NULL,NULL,NULL),(92,143,2,1,0,'232O Northpoint Path W',232,'O',NULL,'Northpoint','Path','W',NULL,'Community Relations',NULL,NULL,'Battery Park',1,1045,NULL,'23304',NULL,1228,36.99497,-76.56901,0,NULL,NULL,91),(93,115,3,1,0,'14N Dowlen Blvd E',14,'N',NULL,'Dowlen','Blvd','E',NULL,'Disbursements',NULL,NULL,'Seaboard',1,1032,NULL,'27876',NULL,1228,36.487125,-77.43618,0,NULL,NULL,NULL),(94,134,3,1,0,'303F Cadell Path SE',303,'F',NULL,'Cadell','Path','SE',NULL,'Urgent',NULL,NULL,'Turton',1,1040,NULL,'57477',NULL,1228,45.032244,-98.14355,0,NULL,NULL,NULL),(95,100,2,1,0,'303F Cadell Path SE',303,'F',NULL,'Cadell','Path','SE',NULL,'Urgent',NULL,NULL,'Turton',1,1040,NULL,'57477',NULL,1228,45.032244,-98.14355,0,NULL,NULL,94),(96,10,3,1,0,'291J States Ave SW',291,'J',NULL,'States','Ave','SW',NULL,'Attn: Accounting',NULL,NULL,'Bryans Road',1,1019,NULL,'20616',NULL,1228,38.639117,-77.08301,0,NULL,NULL,NULL),(97,125,2,1,0,'291J States Ave SW',291,'J',NULL,'States','Ave','SW',NULL,'Attn: Accounting',NULL,NULL,'Bryans Road',1,1019,NULL,'20616',NULL,1228,38.639117,-77.08301,0,NULL,NULL,96),(98,98,3,1,0,'141K Cadell Blvd N',141,'K',NULL,'Cadell','Blvd','N',NULL,'Editorial Dept',NULL,NULL,'Dime Box',1,1042,NULL,'77853',NULL,1228,30.3555,-96.85437,0,NULL,NULL,NULL),(99,22,2,1,0,'141K Cadell Blvd N',141,'K',NULL,'Cadell','Blvd','N',NULL,'Editorial Dept',NULL,NULL,'Dime Box',1,1042,NULL,'77853',NULL,1228,30.3555,-96.85437,0,NULL,NULL,98),(100,55,3,1,0,'316I College Rd S',316,'I',NULL,'College','Rd','S',NULL,'Community Relations',NULL,NULL,'Sierra Vista',1,1002,NULL,'85671',NULL,1228,31.880077,-109.754263,0,NULL,NULL,NULL),(101,77,2,1,0,'316I College Rd S',316,'I',NULL,'College','Rd','S',NULL,'Community Relations',NULL,NULL,'Sierra Vista',1,1002,NULL,'85671',NULL,1228,31.880077,-109.754263,0,NULL,NULL,100),(102,149,3,1,0,'908K Main Path S',908,'K',NULL,'Main','Path','S',NULL,'Community Relations',NULL,NULL,'Davis',1,1047,NULL,'26260',NULL,1228,39.101535,-79.43805,0,NULL,NULL,NULL),(103,29,2,1,0,'908K Main Path S',908,'K',NULL,'Main','Path','S',NULL,'Community Relations',NULL,NULL,'Davis',1,1047,NULL,'26260',NULL,1228,39.101535,-79.43805,0,NULL,NULL,102),(104,128,3,1,0,'547V Martin Luther King Blvd SE',547,'V',NULL,'Martin Luther King','Blvd','SE',NULL,'Mailstop 101',NULL,NULL,'San Diego',1,1004,NULL,'92149',NULL,1228,33.016928,-116.846046,0,NULL,NULL,NULL),(105,170,2,0,0,'547V Martin Luther King Blvd SE',547,'V',NULL,'Martin Luther King','Blvd','SE',NULL,'Mailstop 101',NULL,NULL,'San Diego',1,1004,NULL,'92149',NULL,1228,33.016928,-116.846046,0,NULL,NULL,104),(106,153,1,1,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,52),(107,67,1,1,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,52),(108,125,1,0,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,52),(109,22,1,0,0,'762T Van Ness Ave NE',762,'T',NULL,'Van Ness','Ave','NE',NULL,NULL,NULL,NULL,'Washington',1,1050,NULL,'20045',NULL,1228,38.896599,-77.0319,0,NULL,NULL,NULL),(110,13,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(111,184,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(112,56,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(113,162,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(114,33,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(115,196,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(116,24,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(117,61,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(118,93,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(119,77,1,0,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(120,161,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(121,188,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(122,131,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(123,74,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(124,164,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(125,60,1,0,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(126,173,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(127,16,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(128,29,1,0,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(129,147,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(130,190,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,58),(131,113,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,58),(132,163,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,58),(133,50,1,1,0,'667W Caulder Way NE',667,'W',NULL,'Caulder','Way','NE',NULL,NULL,NULL,NULL,'Charleston',1,1047,NULL,'25331',NULL,1228,38.296818,-81.554655,0,NULL,NULL,NULL),(134,151,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,59),(135,183,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,59),(136,189,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,59),(137,181,1,1,0,'816X El Camino Dr S',816,'X',NULL,'El Camino','Dr','S',NULL,NULL,NULL,NULL,'Winchester',1,1013,NULL,'47394',NULL,1228,40.173141,-84.97922,0,NULL,NULL,NULL),(138,174,1,0,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,60),(139,79,1,1,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,60),(140,82,1,1,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,60),(141,5,1,1,0,'492H Main Way SW',492,'H',NULL,'Main','Way','SW',NULL,NULL,NULL,NULL,'Lucerne',1,1005,NULL,'80646',NULL,1228,40.48243,-104.70542,0,NULL,NULL,NULL),(142,15,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,61),(143,11,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,61),(144,108,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,61),(145,87,1,1,0,'460Q Dowlen Pl N',460,'Q',NULL,'Dowlen','Pl','N',NULL,NULL,NULL,NULL,'Omaha',1,1009,NULL,'31821',NULL,1228,32.1342,-84.98499,0,NULL,NULL,NULL),(146,40,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(147,96,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(148,36,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(149,100,1,0,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(150,64,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(151,135,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(152,48,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(153,138,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(154,195,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(155,80,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(156,4,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(157,168,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(158,42,1,0,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,65),(159,63,1,1,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,65),(160,2,1,1,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,65),(161,83,1,1,0,'19U Northpoint St NW',19,'U',NULL,'Northpoint','St','NW',NULL,NULL,NULL,NULL,'Nara Visa',1,1030,NULL,'88430',NULL,1228,35.644244,-103.21973,0,NULL,NULL,NULL),(162,143,1,0,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(163,18,1,1,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(164,165,1,1,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(165,73,1,0,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(166,192,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,67),(167,175,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,67),(168,14,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,67),(169,139,1,1,0,'597D Caulder Blvd W',597,'D',NULL,'Caulder','Blvd','W',NULL,NULL,NULL,NULL,'Providence',1,1038,NULL,'02912',NULL,1228,41.826737,-71.397699,0,NULL,NULL,NULL),(170,58,1,0,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,68),(171,68,1,1,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,68),(172,53,1,1,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,68),(173,97,1,1,0,'288P Bay St S',288,'P',NULL,'Bay','St','S',NULL,NULL,NULL,NULL,'Bartley',1,1026,NULL,'69020',NULL,1228,40.241652,-100.3015,0,NULL,NULL,NULL),(174,71,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(175,120,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(176,124,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(177,172,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(178,26,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,70),(179,95,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,70),(180,112,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,70),(181,44,1,1,0,'163A Northpoint Way E',163,'A',NULL,'Northpoint','Way','E',NULL,NULL,NULL,NULL,'Fremont Center',1,1031,NULL,'12736',NULL,1228,41.848244,-75.03878,0,NULL,NULL,NULL),(182,34,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(183,35,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(184,159,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(185,31,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(186,NULL,1,1,1,'14S El Camino Way E',14,'S',NULL,'El Camino','Way',NULL,NULL,NULL,NULL,NULL,'Collinsville',NULL,1006,NULL,'6022',NULL,1228,41.8328,-72.9253,0,NULL,NULL,NULL),(187,NULL,1,1,1,'11B Woodbridge Path SW',11,'B',NULL,'Woodbridge','Path',NULL,NULL,NULL,NULL,NULL,'Dayton',NULL,1034,NULL,'45417',NULL,1228,39.7531,-84.2471,0,NULL,NULL,NULL),(188,NULL,1,1,1,'581O Lincoln Dr SW',581,'O',NULL,'Lincoln','Dr',NULL,NULL,NULL,NULL,NULL,'Santa Fe',NULL,1030,NULL,'87594',NULL,1228,35.5212,-105.982,0,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_address` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -208,7 +208,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_contact` DISABLE KEYS */;
-INSERT INTO `civicrm_contact` (`id`, `contact_type`, `contact_sub_type`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `external_identifier`, `sort_name`, `display_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `preferred_mail_format`, `hash`, `api_key`, `source`, `first_name`, `middle_name`, `last_name`, `prefix_id`, `suffix_id`, `formal_title`, `communication_style_id`, `email_greeting_id`, `email_greeting_custom`, `email_greeting_display`, `postal_greeting_id`, `postal_greeting_custom`, `postal_greeting_display`, `addressee_id`, `addressee_custom`, `addressee_display`, `job_title`, `gender_id`, `birth_date`, `is_deceased`, `deceased_date`, `household_name`, `primary_contact_id`, `organization_name`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`) VALUES (1,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Default Organization','Default Organization',NULL,'Default Organization',NULL,NULL,NULL,'Both',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,'Default Organization',NULL,NULL,NULL,0,NULL,'2020-07-24 05:33:57'),(2,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Olsen, Iris','Iris Olsen',NULL,NULL,NULL,'
5
',NULL,'Both','313880548',NULL,'Sample Data','Iris','L','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Iris',1,NULL,'Dear Iris',1,NULL,'Iris Olsen',NULL,1,'1959-02-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(3,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terrell, Roland','Dr. Roland Terrell Jr.',NULL,NULL,NULL,NULL,NULL,'Both','731518019',NULL,'Sample Data','Roland','I','Terrell',4,1,NULL,NULL,1,NULL,'Dear Roland',1,NULL,'Dear Roland',1,NULL,'Dr. Roland Terrell Jr.',NULL,2,'1936-05-11',1,'2019-07-28',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(4,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest-Cooper, Teddy','Teddy Deforest-Cooper',NULL,NULL,NULL,'
4
',NULL,'Both','641137824',NULL,'Sample Data','Teddy','','Deforest-Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Teddy Deforest-Cooper',NULL,NULL,'1984-01-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(5,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'wilson.troy87@example.net','wilson.troy87@example.net',NULL,NULL,NULL,'
2
',NULL,'Both','2903429136',NULL,'Sample Data',NULL,NULL,NULL,3,NULL,NULL,NULL,1,NULL,'Dear wilson.troy87@example.net',1,NULL,'Dear wilson.troy87@example.net',1,NULL,'wilson.troy87@example.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(6,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Beula','Mrs. Beula Bachman',NULL,NULL,NULL,NULL,NULL,'Both','1024437619',NULL,'Sample Data','Beula','P','Bachman',1,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Mrs. Beula Bachman',NULL,1,'1996-10-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(7,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel, Erik','Erik Patel Jr.',NULL,NULL,NULL,'
1
',NULL,'Both','1879150423',NULL,'Sample Data','Erik','','Patel',NULL,1,NULL,NULL,1,NULL,'Dear Erik',1,NULL,'Dear Erik',1,NULL,'Erik Patel Jr.',NULL,2,'1972-03-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(8,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Reynolds, Ashley','Ashley Reynolds II',NULL,NULL,NULL,'
3
',NULL,'Both','3873693132',NULL,'Sample Data','Ashley','','Reynolds',NULL,3,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Reynolds II',NULL,2,'1962-07-08',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(9,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Tanya','Tanya Müller',NULL,NULL,NULL,'
2
',NULL,'Both','1478253205',NULL,'Sample Data','Tanya','C','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya Müller',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(10,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Müller, Rolando','Rolando Müller II',NULL,NULL,NULL,NULL,NULL,'Both','2804310363',NULL,'Sample Data','Rolando','B','Müller',NULL,3,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Müller II',NULL,NULL,'1959-07-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(11,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Nielsen family','Nielsen family',NULL,NULL,NULL,NULL,NULL,'Both','766698874',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Nielsen family',5,NULL,'Dear Nielsen family',2,NULL,'Nielsen family',NULL,NULL,NULL,0,NULL,'Nielsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(12,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'McReynolds, Damaris','Damaris McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','2561970052',NULL,'Sample Data','Damaris','G','McReynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Damaris McReynolds',NULL,1,'1949-09-14',1,'2020-05-20',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(13,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'russellr2@airmail.co.nz','russellr2@airmail.co.nz',NULL,NULL,NULL,'
1
',NULL,'Both','3934547049',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear russellr2@airmail.co.nz',1,NULL,'Dear russellr2@airmail.co.nz',1,NULL,'russellr2@airmail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(14,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Ballston Lake Technology Fund','Ballston Lake Technology Fund',NULL,NULL,NULL,'
5
',NULL,'Both','2168563222',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Ballston Lake Technology Fund',NULL,NULL,NULL,0,NULL,NULL,26,'Ballston Lake Technology Fund',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(15,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Adams, Merrie','Mrs. Merrie Adams',NULL,NULL,NULL,'
5
',NULL,'Both','2760007401',NULL,'Sample Data','Merrie','','Adams',1,NULL,NULL,NULL,1,NULL,'Dear Merrie',1,NULL,'Dear Merrie',1,NULL,'Mrs. Merrie Adams',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(16,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Yadav, Elbert','Elbert Yadav',NULL,NULL,NULL,'
1
',NULL,'Both','2557263059',NULL,'Sample Data','Elbert','S','Yadav',NULL,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Yadav',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(17,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Samson, Bernadette','Bernadette Samson',NULL,NULL,NULL,'
1
',NULL,'Both','1089960007',NULL,'Sample Data','Bernadette','B','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Samson',NULL,1,'1978-06-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(18,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Cruz, Russell','Russell Cruz Sr.',NULL,NULL,NULL,'
3
',NULL,'Both','3756174623',NULL,'Sample Data','Russell','','Cruz',NULL,2,NULL,NULL,1,NULL,'Dear Russell',1,NULL,'Dear Russell',1,NULL,'Russell Cruz Sr.',NULL,NULL,'1989-05-15',0,NULL,NULL,NULL,'Global Empowerment Alliance',NULL,NULL,144,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(19,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Terrell-Dimitrov family','Terrell-Dimitrov family',NULL,NULL,NULL,'
2
',NULL,'Both','4038472664',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Terrell-Dimitrov family',5,NULL,'Dear Terrell-Dimitrov family',2,NULL,'Terrell-Dimitrov family',NULL,NULL,NULL,0,NULL,'Terrell-Dimitrov family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(20,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'iveyr@infomail.co.uk','iveyr@infomail.co.uk',NULL,NULL,NULL,NULL,NULL,'Both','2912254191',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear iveyr@infomail.co.uk',1,NULL,'Dear iveyr@infomail.co.uk',1,NULL,'iveyr@infomail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,'Green Peace Initiative',NULL,NULL,46,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(21,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Reynolds family','Reynolds family',NULL,NULL,NULL,'
4
',NULL,'Both','4119726021',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Reynolds family',5,NULL,'Dear Reynolds family',2,NULL,'Reynolds family',NULL,NULL,NULL,0,NULL,'Reynolds family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(22,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Samuels family','Samuels family',NULL,NULL,NULL,NULL,NULL,'Both','350459294',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Samuels family',5,NULL,'Dear Samuels family',2,NULL,'Samuels family',NULL,NULL,NULL,0,NULL,'Samuels family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(23,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wattson, Rosario','Dr. Rosario Wattson',NULL,NULL,NULL,NULL,NULL,'Both','661817002',NULL,'Sample Data','Rosario','P','Wattson',4,NULL,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Dr. Rosario Wattson',NULL,2,'1943-12-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(24,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Terry, Jacob','Jacob Terry Jr.',NULL,NULL,NULL,'
2
',NULL,'Both','1878863134',NULL,'Sample Data','Jacob','I','Terry',NULL,1,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Jacob Terry Jr.',NULL,2,'1939-02-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(25,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cooper, Irvin','Irvin Cooper',NULL,NULL,NULL,NULL,NULL,'Both','1295806812',NULL,'Sample Data','Irvin','J','Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Irvin Cooper',NULL,2,'1989-11-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(26,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'et.jameson52@sample.co.in','et.jameson52@sample.co.in',NULL,NULL,NULL,NULL,NULL,'Both','459222156',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear et.jameson52@sample.co.in',1,NULL,'Dear et.jameson52@sample.co.in',1,NULL,'et.jameson52@sample.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,'Ballston Lake Technology Fund',NULL,NULL,14,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(27,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice family','Prentice family',NULL,NULL,NULL,'
1
',NULL,'Both','3313623671',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Prentice family',5,NULL,'Dear Prentice family',2,NULL,'Prentice family',NULL,NULL,NULL,0,NULL,'Prentice family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(28,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Angelika','Angelika Jameson',NULL,NULL,NULL,NULL,NULL,'Both','4294957055',NULL,'Sample Data','Angelika','','Jameson',NULL,NULL,NULL,NULL,1,NULL,'Dear Angelika',1,NULL,'Dear Angelika',1,NULL,'Angelika Jameson',NULL,1,'2002-07-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(29,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Dimitrov, Miguel','Dr. Miguel Dimitrov',NULL,NULL,NULL,'
4
',NULL,'Both','1550560736',NULL,'Sample Data','Miguel','O','Dimitrov',4,NULL,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Dr. Miguel Dimitrov',NULL,2,NULL,0,NULL,NULL,NULL,'Collins Peace Fund',NULL,NULL,62,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(30,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'McReynolds, Claudio','Claudio McReynolds II',NULL,NULL,NULL,NULL,NULL,'Both','4155247760',NULL,'Sample Data','Claudio','','McReynolds',NULL,3,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Claudio McReynolds II',NULL,2,'1983-02-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(31,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Smith, Andrew','Dr. Andrew Smith Sr.',NULL,NULL,NULL,'
1
',NULL,'Both','2297505615',NULL,'Sample Data','Andrew','Q','Smith',4,2,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Dr. Andrew Smith Sr.',NULL,2,'1961-01-04',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(32,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds-Parker family','McReynolds-Parker family',NULL,NULL,NULL,'
2
',NULL,'Both','3292490842',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear McReynolds-Parker family',5,NULL,'Dear McReynolds-Parker family',2,NULL,'McReynolds-Parker family',NULL,NULL,NULL,0,NULL,'McReynolds-Parker family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(33,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Jina','Mrs. Jina Adams',NULL,NULL,NULL,NULL,NULL,'Both','3136326826',NULL,'Sample Data','Jina','','Adams',1,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Mrs. Jina Adams',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(34,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'McReynolds, Carlos','Mr. Carlos McReynolds III',NULL,NULL,NULL,'
1
',NULL,'Both','1986804051',NULL,'Sample Data','Carlos','N','McReynolds',3,4,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Mr. Carlos McReynolds III',NULL,NULL,'1956-07-21',0,NULL,NULL,NULL,'Aptos Sustainability Center',NULL,NULL,137,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(35,'Household',NULL,1,0,0,0,1,0,NULL,NULL,'Jones family','Jones family',NULL,NULL,NULL,NULL,NULL,'Both','1110516799',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jones family',5,NULL,'Dear Jones family',2,NULL,'Jones family',NULL,NULL,NULL,0,NULL,'Jones family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(36,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'meijameson@infomail.org','meijameson@infomail.org',NULL,NULL,NULL,NULL,NULL,'Both','1125318142',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear meijameson@infomail.org',1,NULL,'Dear meijameson@infomail.org',1,NULL,'meijameson@infomail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,'Urban Action School',NULL,NULL,37,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(37,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Urban Action School','Urban Action School',NULL,NULL,NULL,'
5
',NULL,'Both','3196441086',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Urban Action School',NULL,NULL,NULL,0,NULL,NULL,36,'Urban Action School',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(38,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Parker-Grant family','Parker-Grant family',NULL,NULL,NULL,NULL,NULL,'Both','1787926850',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker-Grant family',5,NULL,'Dear Parker-Grant family',2,NULL,'Parker-Grant family',NULL,NULL,NULL,0,NULL,'Parker-Grant family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(39,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Merrie','Mrs. Merrie Blackwell',NULL,NULL,NULL,'
1
',NULL,'Both','2696737168',NULL,'Sample Data','Merrie','','Blackwell',1,NULL,NULL,NULL,1,NULL,'Dear Merrie',1,NULL,'Dear Merrie',1,NULL,'Mrs. Merrie Blackwell',NULL,1,'1993-07-08',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(40,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'parker-grant.barry@spamalot.biz','parker-grant.barry@spamalot.biz',NULL,NULL,NULL,NULL,NULL,'Both','2161362069',NULL,'Sample Data',NULL,NULL,NULL,3,NULL,NULL,NULL,1,NULL,'Dear parker-grant.barry@spamalot.biz',1,NULL,'Dear parker-grant.barry@spamalot.biz',1,NULL,'parker-grant.barry@spamalot.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(41,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'barkley.brittney@testmail.info','barkley.brittney@testmail.info',NULL,NULL,NULL,NULL,NULL,'Both','1727360930',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear barkley.brittney@testmail.info',1,NULL,'Dear barkley.brittney@testmail.info',1,NULL,'barkley.brittney@testmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(42,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Clint','Dr. Clint Jameson',NULL,NULL,NULL,NULL,NULL,'Both','3622436306',NULL,'Sample Data','Clint','F','Jameson',4,NULL,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Dr. Clint Jameson',NULL,2,'1964-11-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(43,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Reynolds, Beula','Mrs. Beula Reynolds',NULL,NULL,NULL,NULL,NULL,'Both','2930391993',NULL,'Sample Data','Beula','','Reynolds',1,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Mrs. Beula Reynolds',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(44,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Cooper, Errol','Dr. Errol Cooper',NULL,NULL,NULL,'
1
',NULL,'Both','932311595',NULL,'Sample Data','Errol','F','Cooper',4,NULL,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Dr. Errol Cooper',NULL,NULL,'1976-11-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(45,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Teresa','Teresa Wilson',NULL,NULL,NULL,'
5
',NULL,'Both','4075437794',NULL,'Sample Data','Teresa','B','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Wilson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(46,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Green Peace Initiative','Green Peace Initiative',NULL,NULL,NULL,'
2
',NULL,'Both','719241772',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Green Peace Initiative',NULL,NULL,NULL,0,NULL,NULL,20,'Green Peace Initiative',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(47,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Irvin','Irvin Nielsen II',NULL,NULL,NULL,'
4
',NULL,'Both','587649212',NULL,'Sample Data','Irvin','','Nielsen',NULL,3,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Irvin Nielsen II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(48,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Parker, Betty','Ms. Betty Parker',NULL,NULL,NULL,NULL,NULL,'Both','3536451591',NULL,'Sample Data','Betty','','Parker',2,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Ms. Betty Parker',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(49,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jones, Felisha','Mrs. Felisha Jones',NULL,NULL,NULL,NULL,NULL,'Both','2947770839',NULL,'Sample Data','Felisha','','Jones',1,NULL,NULL,NULL,1,NULL,'Dear Felisha',1,NULL,'Dear Felisha',1,NULL,'Mrs. Felisha Jones',NULL,NULL,'1996-12-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(50,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'College Health Association','College Health Association',NULL,NULL,NULL,'
2
',NULL,'Both','545736158',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'College Health Association',NULL,NULL,NULL,0,NULL,NULL,89,'College Health Association',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(51,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Patel, Scarlet','Dr. Scarlet Patel',NULL,NULL,NULL,'
3
',NULL,'Both','2187618008',NULL,'Sample Data','Scarlet','','Patel',4,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Dr. Scarlet Patel',NULL,NULL,'1994-12-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(52,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith, Brigette','Ms. Brigette Smith',NULL,NULL,NULL,NULL,NULL,'Both','3717206438',NULL,'Sample Data','Brigette','N','Smith',2,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Ms. Brigette Smith',NULL,1,'1971-01-17',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(53,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Tanya','Dr. Tanya Wattson',NULL,NULL,NULL,'
1
',NULL,'Both','3050543156',NULL,'Sample Data','Tanya','','Wattson',4,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Dr. Tanya Wattson',NULL,NULL,'1998-02-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(54,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Blackwell-Dimitrov, Carylon','Dr. Carylon Blackwell-Dimitrov',NULL,NULL,NULL,'
1
',NULL,'Both','3691303768',NULL,'Sample Data','Carylon','O','Blackwell-Dimitrov',4,NULL,NULL,NULL,1,NULL,'Dear Carylon',1,NULL,'Dear Carylon',1,NULL,'Dr. Carylon Blackwell-Dimitrov',NULL,1,'1981-08-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(55,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Lee, Clint','Clint Lee III',NULL,NULL,NULL,NULL,NULL,'Both','1676794419',NULL,'Sample Data','Clint','','Lee',NULL,4,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Clint Lee III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(56,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Kentucky Software Initiative','Kentucky Software Initiative',NULL,NULL,NULL,'
3
',NULL,'Both','276138517',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Kentucky Software Initiative',NULL,NULL,NULL,0,NULL,NULL,189,'Kentucky Software Initiative',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(57,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Rolando','Rolando Nielsen II',NULL,NULL,NULL,'
2
',NULL,'Both','1720954446',NULL,'Sample Data','Rolando','O','Nielsen',NULL,3,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Nielsen II',NULL,NULL,'1954-02-20',0,NULL,NULL,NULL,'Moxahala Development Alliance',NULL,NULL,157,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(58,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Müller, Rebekah','Ms. Rebekah Müller',NULL,NULL,NULL,'
2
',NULL,'Both','3543648262',NULL,'Sample Data','Rebekah','L','Müller',2,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Ms. Rebekah Müller',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(59,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'McReynolds-Parker, Winford','Mr. Winford McReynolds-Parker Jr.',NULL,NULL,NULL,NULL,NULL,'Both','2391669230',NULL,'Sample Data','Winford','','McReynolds-Parker',3,1,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Mr. Winford McReynolds-Parker Jr.',NULL,2,'1985-01-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(60,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Maxwell','Maxwell Wilson III',NULL,NULL,NULL,'
3
',NULL,'Both','2894206629',NULL,'Sample Data','Maxwell','','Wilson',NULL,4,NULL,NULL,1,NULL,'Dear Maxwell',1,NULL,'Dear Maxwell',1,NULL,'Maxwell Wilson III',NULL,2,'1997-10-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(61,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Samuels, Mei','Mei Samuels',NULL,NULL,NULL,'
5
',NULL,'Both','2521418918',NULL,'Sample Data','Mei','X','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Mei',1,NULL,'Dear Mei',1,NULL,'Mei Samuels',NULL,NULL,'2010-05-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(62,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Collins Peace Fund','Collins Peace Fund',NULL,NULL,NULL,NULL,NULL,'Both','3588916649',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Collins Peace Fund',NULL,NULL,NULL,0,NULL,NULL,29,'Collins Peace Fund',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(63,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'estajones@spamalot.co.uk','estajones@spamalot.co.uk',NULL,NULL,NULL,'
4
',NULL,'Both','377997108',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear estajones@spamalot.co.uk',1,NULL,'Dear estajones@spamalot.co.uk',1,NULL,'estajones@spamalot.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(64,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Patel, Kathleen','Kathleen Patel',NULL,NULL,NULL,NULL,NULL,'Both','3805387262',NULL,'Sample Data','Kathleen','Q','Patel',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Kathleen Patel',NULL,NULL,'1990-09-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(65,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker, Jed','Jed Parker',NULL,NULL,NULL,'
4
',NULL,'Both','1794622526',NULL,'Sample Data','Jed','','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Jed Parker',NULL,2,'1964-08-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(66,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Cooper, Magan','Dr. Magan Cooper',NULL,NULL,NULL,NULL,NULL,'Both','791506082',NULL,'Sample Data','Magan','','Cooper',4,NULL,NULL,NULL,1,NULL,'Dear Magan',1,NULL,'Dear Magan',1,NULL,'Dr. Magan Cooper',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(67,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Łąchowski, Juliann','Dr. Juliann Łąchowski',NULL,NULL,NULL,'
1
',NULL,'Both','3477087731',NULL,'Sample Data','Juliann','','Łąchowski',4,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Dr. Juliann Łąchowski',NULL,1,'1979-01-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(68,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Delana','Delana Samson',NULL,NULL,NULL,'
3
',NULL,'Both','1637206028',NULL,'Sample Data','Delana','','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Samson',NULL,NULL,'1971-11-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(69,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'González, Allen','Allen González',NULL,NULL,NULL,'
4
',NULL,'Both','4052635631',NULL,'Sample Data','Allen','R','González',NULL,NULL,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen González',NULL,NULL,'2002-12-04',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(70,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'lsamson18@airmail.org','lsamson18@airmail.org',NULL,NULL,NULL,'
2
',NULL,'Both','320447877',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear lsamson18@airmail.org',1,NULL,'Dear lsamson18@airmail.org',1,NULL,'lsamson18@airmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(71,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Dimitrov, Megan','Mrs. Megan Dimitrov',NULL,NULL,NULL,'
3
',NULL,'Both','604448148',NULL,'Sample Data','Megan','B','Dimitrov',1,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Mrs. Megan Dimitrov',NULL,NULL,'1985-05-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(72,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Prentice-Parker family','Prentice-Parker family',NULL,NULL,NULL,'
2
',NULL,'Both','569884084',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Prentice-Parker family',5,NULL,'Dear Prentice-Parker family',2,NULL,'Prentice-Parker family',NULL,NULL,NULL,0,NULL,'Prentice-Parker family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(73,'Organization',NULL,0,1,0,0,1,0,NULL,NULL,'Van Ness Technology Services','Van Ness Technology Services',NULL,NULL,NULL,NULL,NULL,'Both','720387242',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Van Ness Technology Services',NULL,NULL,NULL,0,NULL,NULL,75,'Van Ness Technology Services',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(74,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Nielsen, Heidi','Heidi Nielsen',NULL,NULL,NULL,'
1
',NULL,'Both','4011366793',NULL,'Sample Data','Heidi','','Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Heidi',1,NULL,'Dear Heidi',1,NULL,'Heidi Nielsen',NULL,NULL,'1997-11-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(75,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Terrell-Dimitrov, Lashawnda','Lashawnda Terrell-Dimitrov',NULL,NULL,NULL,NULL,NULL,'Both','3509495725',NULL,'Sample Data','Lashawnda','E','Terrell-Dimitrov',NULL,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Lashawnda Terrell-Dimitrov',NULL,1,'1988-05-30',0,NULL,NULL,NULL,'Van Ness Technology Services',NULL,NULL,73,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(76,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Shad','Shad Olsen',NULL,NULL,NULL,'
1
',NULL,'Both','2007691638',NULL,'Sample Data','Shad','H','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Olsen',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(77,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jameson, Elbert','Elbert Jameson III',NULL,NULL,NULL,NULL,NULL,'Both','3057069270',NULL,'Sample Data','Elbert','','Jameson',NULL,4,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Jameson III',NULL,2,'1976-09-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(78,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'prentice-parker.j.ashley@mymail.co.in','prentice-parker.j.ashley@mymail.co.in',NULL,NULL,NULL,'
4
',NULL,'Both','730991373',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear prentice-parker.j.ashley@mymail.co.in',1,NULL,'Dear prentice-parker.j.ashley@mymail.co.in',1,NULL,'prentice-parker.j.ashley@mymail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(79,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Ogdensburg Poetry Partners','Ogdensburg Poetry Partners',NULL,NULL,NULL,'
4
',NULL,'Both','3260380550',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Ogdensburg Poetry Partners',NULL,NULL,NULL,0,NULL,NULL,NULL,'Ogdensburg Poetry Partners',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(80,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Reynolds, Betty','Mrs. Betty Reynolds',NULL,NULL,NULL,NULL,NULL,'Both','1042239873',NULL,'Sample Data','Betty','Z','Reynolds',1,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Mrs. Betty Reynolds',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(81,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Maria','Maria Ivanov',NULL,NULL,NULL,'
4
',NULL,'Both','3158128082',NULL,'Sample Data','Maria','L','Ivanov',NULL,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Maria Ivanov',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(82,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Wagner, Truman','Truman Wagner',NULL,NULL,NULL,NULL,NULL,'Both','1216392752',NULL,'Sample Data','Truman','','Wagner',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Wagner',NULL,2,'1989-08-08',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(83,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Cooper, Norris','Norris Cooper Jr.',NULL,NULL,NULL,'
2
',NULL,'Both','750501935',NULL,'Sample Data','Norris','U','Cooper',NULL,1,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Cooper Jr.',NULL,2,'2005-06-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(84,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'bachmanl95@mymail.net','bachmanl95@mymail.net',NULL,NULL,NULL,NULL,NULL,'Both','2981810594',NULL,'Sample Data',NULL,NULL,NULL,3,1,NULL,NULL,1,NULL,'Dear bachmanl95@mymail.net',1,NULL,'Dear bachmanl95@mymail.net',1,NULL,'bachmanl95@mymail.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(85,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker-Grant, Felisha','Felisha Parker-Grant',NULL,NULL,NULL,NULL,NULL,'Both','2163378685',NULL,'Sample Data','Felisha','U','Parker-Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Felisha',1,NULL,'Dear Felisha',1,NULL,'Felisha Parker-Grant',NULL,1,'2007-01-09',0,NULL,NULL,NULL,'Main Health Collective',NULL,NULL,117,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(86,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Beech Development Trust','Beech Development Trust',NULL,NULL,NULL,'
3
',NULL,'Both','1453966991',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Beech Development Trust',NULL,NULL,NULL,0,NULL,NULL,197,'Beech Development Trust',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(87,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Wattson, Elina','Dr. Elina Wattson',NULL,NULL,NULL,NULL,NULL,'Both','452291784',NULL,'Sample Data','Elina','','Wattson',4,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Dr. Elina Wattson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(88,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Elizabeth','Elizabeth Samson',NULL,NULL,NULL,'
5
',NULL,'Both','2428742753',NULL,'Sample Data','Elizabeth','K','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Elizabeth',1,NULL,'Dear Elizabeth',1,NULL,'Elizabeth Samson',NULL,NULL,'1981-02-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(89,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terrell-Dimitrov, Miguel','Miguel Terrell-Dimitrov II',NULL,NULL,NULL,'
1
',NULL,'Both','4265323067',NULL,'Sample Data','Miguel','','Terrell-Dimitrov',NULL,3,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Miguel Terrell-Dimitrov II',NULL,2,'2011-03-11',0,NULL,NULL,NULL,'College Health Association',NULL,NULL,50,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(90,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Rebecca Culture Fellowship','Rebecca Culture Fellowship',NULL,NULL,NULL,'
5
',NULL,'Both','1680760940',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Rebecca Culture Fellowship',NULL,NULL,NULL,0,NULL,NULL,NULL,'Rebecca Culture Fellowship',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(91,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Green Poetry Partnership','Green Poetry Partnership',NULL,NULL,NULL,NULL,NULL,'Both','63354461',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Green Poetry Partnership',NULL,NULL,NULL,0,NULL,NULL,120,'Green Poetry Partnership',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(92,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Allen','Dr. Allen Müller',NULL,NULL,NULL,NULL,NULL,'Both','2000293400',NULL,'Sample Data','Allen','T','Müller',4,NULL,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Dr. Allen Müller',NULL,2,'1958-06-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(93,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz, Daren','Daren Cruz III',NULL,NULL,NULL,NULL,NULL,'Both','2509817815',NULL,'Sample Data','Daren','I','Cruz',NULL,4,NULL,NULL,1,NULL,'Dear Daren',1,NULL,'Dear Daren',1,NULL,'Daren Cruz III',NULL,2,'2003-04-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(94,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'angelikaw@testmail.co.uk','angelikaw@testmail.co.uk',NULL,NULL,NULL,NULL,NULL,'Both','3179233862',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear angelikaw@testmail.co.uk',1,NULL,'Dear angelikaw@testmail.co.uk',1,NULL,'angelikaw@testmail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(95,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'jones.kathlyn3@mymail.co.uk','jones.kathlyn3@mymail.co.uk',NULL,NULL,NULL,NULL,NULL,'Both','1082573825',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear jones.kathlyn3@mymail.co.uk',1,NULL,'Dear jones.kathlyn3@mymail.co.uk',1,NULL,'jones.kathlyn3@mymail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(96,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Terry, Elbert','Elbert Terry',NULL,NULL,NULL,NULL,NULL,'Both','2300910688',NULL,'Sample Data','Elbert','','Terry',NULL,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Terry',NULL,2,'2007-11-08',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(97,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Patel, Allen','Allen Patel Sr.',NULL,NULL,NULL,'
1
',NULL,'Both','1350110979',NULL,'Sample Data','Allen','W','Patel',NULL,2,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen Patel Sr.',NULL,NULL,'1988-01-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(98,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'González family','González family',NULL,NULL,NULL,'
2
',NULL,'Both','3263723758',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear González family',5,NULL,'Dear González family',2,NULL,'González family',NULL,NULL,NULL,0,NULL,'González family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(99,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Terry, Esta','Esta Terry',NULL,NULL,NULL,'
4
',NULL,'Both','3888791883',NULL,'Sample Data','Esta','I','Terry',NULL,NULL,NULL,NULL,1,NULL,'Dear Esta',1,NULL,'Dear Esta',1,NULL,'Esta Terry',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(100,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Lawerence','Lawerence Barkley III',NULL,NULL,NULL,'
2
',NULL,'Both','3430625301',NULL,'Sample Data','Lawerence','','Barkley',NULL,4,NULL,NULL,1,NULL,'Dear Lawerence',1,NULL,'Dear Lawerence',1,NULL,'Lawerence Barkley III',NULL,2,'2009-06-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(101,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson family','Jameson family',NULL,NULL,NULL,'
1
',NULL,'Both','2255649769',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jameson family',5,NULL,'Dear Jameson family',2,NULL,'Jameson family',NULL,NULL,NULL,0,NULL,'Jameson family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(102,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'rbachman-mller15@airmail.co.in','rbachman-mller15@airmail.co.in',NULL,NULL,NULL,'
2
',NULL,'Both','2698008935',NULL,'Sample Data',NULL,NULL,NULL,2,NULL,NULL,NULL,1,NULL,'Dear rbachman-mller15@airmail.co.in',1,NULL,'Dear rbachman-mller15@airmail.co.in',1,NULL,'rbachman-mller15@airmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(103,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jones, Winford','Mr. Winford Jones',NULL,NULL,NULL,NULL,NULL,'Both','3992988064',NULL,'Sample Data','Winford','Y','Jones',3,NULL,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Mr. Winford Jones',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(104,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Blackwell, Scott','Dr. Scott Blackwell III',NULL,NULL,NULL,NULL,NULL,'Both','1650464224',NULL,'Sample Data','Scott','','Blackwell',4,4,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Dr. Scott Blackwell III',NULL,NULL,'1973-04-27',0,NULL,NULL,NULL,'Dallas Peace Partnership',NULL,NULL,148,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(105,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Urban Culture Services','Urban Culture Services',NULL,NULL,NULL,NULL,NULL,'Both','1795621606',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Urban Culture Services',NULL,NULL,NULL,0,NULL,NULL,151,'Urban Culture Services',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(106,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Jameson family','Jameson family',NULL,NULL,NULL,NULL,NULL,'Both','2255649769',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jameson family',5,NULL,'Dear Jameson family',2,NULL,'Jameson family',NULL,NULL,NULL,0,NULL,'Jameson family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(107,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Samson, Truman','Truman Samson II',NULL,NULL,NULL,'
3
',NULL,'Both','2209308970',NULL,'Sample Data','Truman','','Samson',NULL,3,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Samson II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(108,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Dimitrov, Clint','Mr. Clint Dimitrov III',NULL,NULL,NULL,NULL,NULL,'Both','2522553536',NULL,'Sample Data','Clint','','Dimitrov',3,4,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Mr. Clint Dimitrov III',NULL,NULL,'1965-09-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(109,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'González, Carylon','Ms. Carylon González',NULL,NULL,NULL,'
2
',NULL,'Both','3685317689',NULL,'Sample Data','Carylon','Q','González',2,NULL,NULL,NULL,1,NULL,'Dear Carylon',1,NULL,'Dear Carylon',1,NULL,'Ms. Carylon González',NULL,1,'1988-07-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(110,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds-Parker, Norris','Norris McReynolds-Parker',NULL,NULL,NULL,'
2
',NULL,'Both','3076044215',NULL,'Sample Data','Norris','','McReynolds-Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris McReynolds-Parker',NULL,2,'2006-09-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(111,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Robertson, Elizabeth','Elizabeth Robertson',NULL,NULL,NULL,NULL,NULL,'Both','3762031116',NULL,'Sample Data','Elizabeth','','Robertson',NULL,NULL,NULL,NULL,1,NULL,'Dear Elizabeth',1,NULL,'Dear Elizabeth',1,NULL,'Elizabeth Robertson',NULL,NULL,'1988-06-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(112,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'samuels.i.nicole4@airmail.info','samuels.i.nicole4@airmail.info',NULL,NULL,NULL,'
5
',NULL,'Both','120602388',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear samuels.i.nicole4@airmail.info',1,NULL,'Dear samuels.i.nicole4@airmail.info',1,NULL,'samuels.i.nicole4@airmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(113,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Parker, Teresa','Teresa Parker',NULL,NULL,NULL,'
4
',NULL,'Both','1643019663',NULL,'Sample Data','Teresa','W','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Parker',NULL,1,'1957-07-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(114,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Samson, Lincoln','Lincoln Samson',NULL,NULL,NULL,NULL,NULL,'Both','1364687804',NULL,'Sample Data','Lincoln','G','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Lincoln',1,NULL,'Dear Lincoln',1,NULL,'Lincoln Samson',NULL,2,'1985-04-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(115,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Dimitrov family','Dimitrov family',NULL,NULL,NULL,'
4
',NULL,'Both','3351288571',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Dimitrov family',5,NULL,'Dear Dimitrov family',2,NULL,'Dimitrov family',NULL,NULL,NULL,0,NULL,'Dimitrov family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(116,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Wagner family','Wagner family',NULL,NULL,NULL,NULL,NULL,'Both','1570966486',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wagner family',5,NULL,'Dear Wagner family',2,NULL,'Wagner family',NULL,NULL,NULL,0,NULL,'Wagner family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(117,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'Main Health Collective','Main Health Collective',NULL,NULL,NULL,'
1
',NULL,'Both','842368736',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Main Health Collective',NULL,NULL,NULL,0,NULL,NULL,85,'Main Health Collective',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(118,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Maria','Mr. Maria Prentice Sr.',NULL,NULL,NULL,NULL,NULL,'Both','3954129997',NULL,'Sample Data','Maria','P','Prentice',3,2,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Mr. Maria Prentice Sr.',NULL,NULL,'1935-01-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(119,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Terrell, Santina','Santina Terrell',NULL,NULL,NULL,NULL,NULL,'Both','2039698555',NULL,'Sample Data','Santina','','Terrell',NULL,NULL,NULL,NULL,1,NULL,'Dear Santina',1,NULL,'Dear Santina',1,NULL,'Santina Terrell',NULL,1,'1967-07-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(120,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel, Megan','Megan Patel',NULL,NULL,NULL,NULL,NULL,'Both','2159576941',NULL,'Sample Data','Megan','L','Patel',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan Patel',NULL,1,'2009-05-20',0,NULL,NULL,NULL,'Green Poetry Partnership',NULL,NULL,91,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(121,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Blackwell, Brent','Mr. Brent Blackwell',NULL,NULL,NULL,'
2
',NULL,'Both','1795154981',NULL,'Sample Data','Brent','V','Blackwell',3,NULL,NULL,NULL,1,NULL,'Dear Brent',1,NULL,'Dear Brent',1,NULL,'Mr. Brent Blackwell',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(122,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Olsen, Rebekah','Rebekah Olsen',NULL,NULL,NULL,'
3
',NULL,'Both','174179615',NULL,'Sample Data','Rebekah','U','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Rebekah Olsen',NULL,1,'1969-05-17',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(123,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Lee, Jed','Dr. Jed Lee',NULL,NULL,NULL,'
2
',NULL,'Both','301771502',NULL,'Sample Data','Jed','','Lee',4,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Dr. Jed Lee',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(124,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'allenlee@airmail.biz','allenlee@airmail.biz',NULL,NULL,NULL,NULL,NULL,'Both','4294528252',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear allenlee@airmail.biz',1,NULL,'Dear allenlee@airmail.biz',1,NULL,'allenlee@airmail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(125,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Ashlie','Ms. Ashlie Nielsen',NULL,NULL,NULL,'
3
',NULL,'Both','89218160',NULL,'Sample Data','Ashlie','','Nielsen',2,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Ms. Ashlie Nielsen',NULL,1,'1975-06-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(126,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'shadmller@testing.co.nz','shadmller@testing.co.nz',NULL,NULL,NULL,'
2
',NULL,'Both','1507946841',NULL,'Sample Data',NULL,NULL,NULL,NULL,3,NULL,NULL,1,NULL,'Dear shadmller@testing.co.nz',1,NULL,'Dear shadmller@testing.co.nz',1,NULL,'shadmller@testing.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(127,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Jacobs, Scott','Dr. Scott Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','2229288735',NULL,'Sample Data','Scott','F','Jacobs',4,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Dr. Scott Jacobs',NULL,2,'1972-11-24',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(128,'Household',NULL,1,0,0,0,1,0,NULL,NULL,'Müller family','Müller family',NULL,NULL,NULL,'
2
',NULL,'Both','1144797465',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Müller family',5,NULL,'Dear Müller family',2,NULL,'Müller family',NULL,NULL,NULL,0,NULL,'Müller family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(129,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Prentice, Valene','Dr. Valene Prentice',NULL,NULL,NULL,NULL,NULL,'Both','2953436948',NULL,'Sample Data','Valene','','Prentice',4,NULL,NULL,NULL,1,NULL,'Dear Valene',1,NULL,'Dear Valene',1,NULL,'Dr. Valene Prentice',NULL,1,'1977-03-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(130,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'justinamller@mymail.co.in','justinamller@mymail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','1563618154',NULL,'Sample Data',NULL,NULL,NULL,2,NULL,NULL,NULL,1,NULL,'Dear justinamller@mymail.co.in',1,NULL,'Dear justinamller@mymail.co.in',1,NULL,'justinamller@mymail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(131,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'dimitrov.bernadette@fakemail.org','dimitrov.bernadette@fakemail.org',NULL,NULL,NULL,'
1
',NULL,'Both','3271603303',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear dimitrov.bernadette@fakemail.org',1,NULL,'Dear dimitrov.bernadette@fakemail.org',1,NULL,'dimitrov.bernadette@fakemail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(132,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker, Shad','Shad Parker',NULL,NULL,NULL,'
2
',NULL,'Both','23650208',NULL,'Sample Data','Shad','','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Parker',NULL,2,'2004-01-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(133,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Jackson','Jackson Jameson',NULL,NULL,NULL,'
4
',NULL,'Both','680754950',NULL,'Sample Data','Jackson','F','Jameson',NULL,NULL,NULL,NULL,1,NULL,'Dear Jackson',1,NULL,'Dear Jackson',1,NULL,'Jackson Jameson',NULL,2,'2008-11-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(134,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Barkley, Kenny','Dr. Kenny Barkley',NULL,NULL,NULL,'
4
',NULL,'Both','3409558741',NULL,'Sample Data','Kenny','X','Barkley',4,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Dr. Kenny Barkley',NULL,NULL,'1991-08-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(135,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Reynolds, Claudio','Mr. Claudio Reynolds Jr.',NULL,NULL,NULL,'
5
',NULL,'Both','2468699495',NULL,'Sample Data','Claudio','','Reynolds',3,1,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Mr. Claudio Reynolds Jr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(136,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Barkley family','Barkley family',NULL,NULL,NULL,'
1
',NULL,'Both','2888062109',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Barkley family',5,NULL,'Dear Barkley family',2,NULL,'Barkley family',NULL,NULL,NULL,0,NULL,'Barkley family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(137,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Aptos Sustainability Center','Aptos Sustainability Center',NULL,NULL,NULL,'
4
',NULL,'Both','1081050098',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Aptos Sustainability Center',NULL,NULL,NULL,0,NULL,NULL,34,'Aptos Sustainability Center',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(138,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Heidi','Mrs. Heidi Parker',NULL,NULL,NULL,'
3
',NULL,'Both','3690123952',NULL,'Sample Data','Heidi','','Parker',1,NULL,NULL,NULL,1,NULL,'Dear Heidi',1,NULL,'Dear Heidi',1,NULL,'Mrs. Heidi Parker',NULL,1,'1978-04-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(139,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Kathleen','Kathleen Parker',NULL,NULL,NULL,NULL,NULL,'Both','295233156',NULL,'Sample Data','Kathleen','Q','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Kathleen Parker',NULL,1,'1972-04-04',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(140,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Ashlie','Ashlie Müller',NULL,NULL,NULL,'
2
',NULL,'Both','3515081294',NULL,'Sample Data','Ashlie','','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Ashlie Müller',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(141,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Brent','Brent Samuels',NULL,NULL,NULL,NULL,NULL,'Both','3250906077',NULL,'Sample Data','Brent','','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Brent',1,NULL,'Dear Brent',1,NULL,'Brent Samuels',NULL,2,'1959-05-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(142,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Global Technology Collective','Global Technology Collective',NULL,NULL,NULL,NULL,NULL,'Both','102297836',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Global Technology Collective',NULL,NULL,NULL,0,NULL,NULL,170,'Global Technology Collective',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(143,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Bernadette','Bernadette Wattson',NULL,NULL,NULL,'
1
',NULL,'Both','1191372822',NULL,'Sample Data','Bernadette','','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Wattson',NULL,1,'1973-05-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(144,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Global Empowerment Alliance','Global Empowerment Alliance',NULL,NULL,NULL,'
3
',NULL,'Both','180120760',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Global Empowerment Alliance',NULL,NULL,NULL,0,NULL,NULL,18,'Global Empowerment Alliance',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(145,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Clint','Clint Nielsen',NULL,NULL,NULL,'
2
',NULL,'Both','2083087169',NULL,'Sample Data','Clint','','Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Clint Nielsen',NULL,NULL,'1936-05-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(146,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jacobs, Jay','Jay Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','281953359',NULL,'Sample Data','Jay','F','Jacobs',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay Jacobs',NULL,2,'1937-11-24',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(147,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Herminia','Dr. Herminia Prentice',NULL,NULL,NULL,NULL,NULL,'Both','4072784830',NULL,'Sample Data','Herminia','','Prentice',4,NULL,NULL,NULL,1,NULL,'Dear Herminia',1,NULL,'Dear Herminia',1,NULL,'Dr. Herminia Prentice',NULL,1,'1973-07-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(148,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Dallas Peace Partnership','Dallas Peace Partnership',NULL,NULL,NULL,'
3
',NULL,'Both','762488419',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Dallas Peace Partnership',NULL,NULL,NULL,0,NULL,NULL,104,'Dallas Peace Partnership',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(149,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Delana','Delana Grant',NULL,NULL,NULL,'
3
',NULL,'Both','2844860785',NULL,'Sample Data','Delana','','Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Grant',NULL,1,'1981-08-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(150,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Müller family','Müller family',NULL,NULL,NULL,'
3
',NULL,'Both','1144797465',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Müller family',5,NULL,'Dear Müller family',2,NULL,'Müller family',NULL,NULL,NULL,0,NULL,'Müller family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(151,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Billy','Dr. Billy Prentice',NULL,NULL,NULL,'
3
',NULL,'Both','3571999002',NULL,'Sample Data','Billy','F','Prentice',4,NULL,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Dr. Billy Prentice',NULL,2,'1977-04-09',0,NULL,NULL,NULL,'Urban Culture Services',NULL,NULL,105,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(152,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'samuels.ray@fakemail.co.pl','samuels.ray@fakemail.co.pl',NULL,NULL,NULL,NULL,NULL,'Both','4175065650',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear samuels.ray@fakemail.co.pl',1,NULL,'Dear samuels.ray@fakemail.co.pl',1,NULL,'samuels.ray@fakemail.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(153,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Kacey','Kacey Blackwell',NULL,NULL,NULL,'
5
',NULL,'Both','3163269089',NULL,'Sample Data','Kacey','F','Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Kacey Blackwell',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(154,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel, Irvin','Irvin Patel Jr.',NULL,NULL,NULL,'
5
',NULL,'Both','1842023876',NULL,'Sample Data','Irvin','K','Patel',NULL,1,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Irvin Patel Jr.',NULL,2,'1976-10-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(155,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'rodrigod11@sample.org','rodrigod11@sample.org',NULL,NULL,NULL,'
4
',NULL,'Both','1416913895',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear rodrigod11@sample.org',1,NULL,'Dear rodrigod11@sample.org',1,NULL,'rodrigod11@sample.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(156,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Damaris','Mrs. Damaris Samuels',NULL,NULL,NULL,NULL,NULL,'Both','3144894953',NULL,'Sample Data','Damaris','H','Samuels',1,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Mrs. Damaris Samuels',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(157,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'Moxahala Development Alliance','Moxahala Development Alliance',NULL,NULL,NULL,NULL,NULL,'Both','1518555478',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Moxahala Development Alliance',NULL,NULL,NULL,0,NULL,NULL,57,'Moxahala Development Alliance',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(158,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest-Cooper, Lashawnda','Lashawnda Deforest-Cooper',NULL,NULL,NULL,'
3
',NULL,'Both','303860140',NULL,'Sample Data','Lashawnda','N','Deforest-Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Lashawnda Deforest-Cooper',NULL,1,'1996-07-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(159,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'mller.billy29@testmail.info','mller.billy29@testmail.info',NULL,NULL,NULL,NULL,NULL,'Both','131366858',NULL,'Sample Data',NULL,NULL,NULL,3,4,NULL,NULL,1,NULL,'Dear mller.billy29@testmail.info',1,NULL,'Dear mller.billy29@testmail.info',1,NULL,'mller.billy29@testmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(160,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Prentice, Scarlet','Scarlet Prentice',NULL,NULL,NULL,NULL,NULL,'Both','3056236127',NULL,'Sample Data','Scarlet','A','Prentice',NULL,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Scarlet Prentice',NULL,NULL,'1977-08-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(161,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jensen, Shauna','Shauna Jensen',NULL,NULL,NULL,NULL,NULL,'Both','108136044',NULL,'Sample Data','Shauna','X','Jensen',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Jensen',NULL,1,'1949-03-08',1,'2019-11-19',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(162,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Bernadette','Bernadette Blackwell',NULL,NULL,NULL,NULL,NULL,'Both','527011185',NULL,'Sample Data','Bernadette','X','Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Blackwell',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(163,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest-Cooper family','Deforest-Cooper family',NULL,NULL,NULL,'
1
',NULL,'Both','1424194023',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest-Cooper family',5,NULL,'Dear Deforest-Cooper family',2,NULL,'Deforest-Cooper family',NULL,NULL,NULL,0,NULL,'Deforest-Cooper family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(164,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Samuels, Brittney','Brittney Samuels',NULL,NULL,NULL,NULL,NULL,'Both','3183617598',NULL,'Sample Data','Brittney','A','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Brittney Samuels',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(165,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Wagner, Brigette','Brigette Wagner',NULL,NULL,NULL,'
2
',NULL,'Both','3285817434',NULL,'Sample Data','Brigette','','Wagner',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Wagner',NULL,NULL,'1950-02-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(166,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Zope, Jina','Jina Zope',NULL,NULL,NULL,NULL,NULL,'Both','2020833032',NULL,'Sample Data','Jina','K','Zope',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Zope',NULL,1,'2009-09-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(167,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith, Jay','Mr. Jay Smith',NULL,NULL,NULL,'
2
',NULL,'Both','2744125186',NULL,'Sample Data','Jay','G','Smith',3,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Mr. Jay Smith',NULL,2,NULL,1,'2020-03-27',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(168,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Blackwell family','Blackwell family',NULL,NULL,NULL,NULL,NULL,'Both','3218641510',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Blackwell family',5,NULL,'Dear Blackwell family',2,NULL,'Blackwell family',NULL,NULL,NULL,0,NULL,'Blackwell family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(169,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest, Tanya','Tanya Deforest',NULL,NULL,NULL,'
2
',NULL,'Both','3707213011',NULL,'Sample Data','Tanya','','Deforest',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya Deforest',NULL,1,'1981-05-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(170,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Barkley, Bernadette','Bernadette Barkley',NULL,NULL,NULL,NULL,NULL,'Both','2929366721',NULL,'Sample Data','Bernadette','','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Barkley',NULL,1,NULL,0,NULL,NULL,NULL,'Global Technology Collective',NULL,NULL,142,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(171,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'González, Toby','Mr. Toby González III',NULL,NULL,NULL,'
4
',NULL,'Both','3133453740',NULL,'Sample Data','Toby','','González',3,4,NULL,NULL,1,NULL,'Dear Toby',1,NULL,'Dear Toby',1,NULL,'Mr. Toby González III',NULL,2,'1972-09-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(172,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Cooper, Betty','Betty Cooper',NULL,NULL,NULL,NULL,NULL,'Both','2283344606',NULL,'Sample Data','Betty','I','Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Betty Cooper',NULL,NULL,'1976-03-24',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(173,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'bjameson@spamalot.co.nz','bjameson@spamalot.co.nz',NULL,NULL,NULL,'
5
',NULL,'Both','1343613532',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear bjameson@spamalot.co.nz',1,NULL,'Dear bjameson@spamalot.co.nz',1,NULL,'bjameson@spamalot.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(174,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Northpoint Development School','Northpoint Development School',NULL,NULL,NULL,'
3
',NULL,'Both','3168400042',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Northpoint Development School',NULL,NULL,NULL,0,NULL,NULL,185,'Northpoint Development School',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(175,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Dimitrov, Kenny','Kenny Dimitrov Sr.',NULL,NULL,NULL,'
3
',NULL,'Both','2698867379',NULL,'Sample Data','Kenny','X','Dimitrov',NULL,2,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny Dimitrov Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(176,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Dimitrov, Sherman','Mr. Sherman Dimitrov Sr.',NULL,NULL,NULL,NULL,NULL,'Both','2018073117',NULL,'Sample Data','Sherman','','Dimitrov',3,2,NULL,NULL,1,NULL,'Dear Sherman',1,NULL,'Dear Sherman',1,NULL,'Mr. Sherman Dimitrov Sr.',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(177,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Samson family','Samson family',NULL,NULL,NULL,NULL,NULL,'Both','333421926',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Samson family',5,NULL,'Dear Samson family',2,NULL,'Samson family',NULL,NULL,NULL,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(178,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Sierra Software Solutions','Sierra Software Solutions',NULL,NULL,NULL,NULL,NULL,'Both','4103954497',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Sierra Software Solutions',NULL,NULL,NULL,0,NULL,NULL,186,'Sierra Software Solutions',NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(179,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Carylon','Carylon Samuels',NULL,NULL,NULL,'
2
',NULL,'Both','707612001',NULL,'Sample Data','Carylon','C','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Carylon',1,NULL,'Dear Carylon',1,NULL,'Carylon Samuels',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(180,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest-Cooper, Eleonor','Dr. Eleonor Deforest-Cooper',NULL,NULL,NULL,NULL,NULL,'Both','303402137',NULL,'Sample Data','Eleonor','E','Deforest-Cooper',4,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Dr. Eleonor Deforest-Cooper',NULL,NULL,'1970-01-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(181,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Prentice-Parker, Maria','Maria Prentice-Parker',NULL,NULL,NULL,NULL,NULL,'Both','265905038',NULL,'Sample Data','Maria','G','Prentice-Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Maria Prentice-Parker',NULL,2,'2008-02-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(182,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Juliann','Juliann Müller',NULL,NULL,NULL,NULL,NULL,'Both','307897793',NULL,'Sample Data','Juliann','S','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Juliann Müller',NULL,NULL,'1954-04-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:00'),(183,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Sharyn','Mrs. Sharyn McReynolds',NULL,NULL,NULL,'
1
',NULL,'Both','1394669244',NULL,'Sample Data','Sharyn','','McReynolds',1,NULL,NULL,NULL,1,NULL,'Dear Sharyn',1,NULL,'Dear Sharyn',1,NULL,'Mrs. Sharyn McReynolds',NULL,1,'1983-06-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(184,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Ivanov, Kiara','Kiara Ivanov',NULL,NULL,NULL,NULL,NULL,'Both','1100955182',NULL,'Sample Data','Kiara','M','Ivanov',NULL,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Kiara Ivanov',NULL,1,'1955-10-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(185,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'mller.scott40@airmail.info','mller.scott40@airmail.info',NULL,NULL,NULL,'
4
',NULL,'Both','91445264',NULL,'Sample Data',NULL,NULL,NULL,NULL,2,NULL,NULL,1,NULL,'Dear mller.scott40@airmail.info',1,NULL,'Dear mller.scott40@airmail.info',1,NULL,'mller.scott40@airmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,'Northpoint Development School',NULL,NULL,174,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(186,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Roberts, Jina','Jina Roberts',NULL,NULL,NULL,'
5
',NULL,'Both','3944144091',NULL,'Sample Data','Jina','P','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Roberts',NULL,1,'1986-12-20',0,NULL,NULL,NULL,'Sierra Software Solutions',NULL,NULL,178,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(187,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Troy','Troy Prentice',NULL,NULL,NULL,'
1
',NULL,'Both','2143976390',NULL,'Sample Data','Troy','W','Prentice',NULL,NULL,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Troy Prentice',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(188,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wagner, Felisha','Mrs. Felisha Wagner',NULL,NULL,NULL,NULL,NULL,'Both','2346582969',NULL,'Sample Data','Felisha','T','Wagner',1,NULL,NULL,NULL,1,NULL,'Dear Felisha',1,NULL,'Dear Felisha',1,NULL,'Mrs. Felisha Wagner',NULL,1,'1986-11-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(189,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Margaret','Ms. Margaret Jameson',NULL,NULL,NULL,NULL,NULL,'Both','1719938872',NULL,'Sample Data','Margaret','S','Jameson',2,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Ms. Margaret Jameson',NULL,1,'1970-11-21',0,NULL,NULL,NULL,'Kentucky Software Initiative',NULL,NULL,56,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(190,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Carylon','Carylon Barkley',NULL,NULL,NULL,NULL,NULL,'Both','3982709827',NULL,'Sample Data','Carylon','L','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Carylon',1,NULL,'Dear Carylon',1,NULL,'Carylon Barkley',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(191,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Toby','Dr. Toby Prentice',NULL,NULL,NULL,'
5
',NULL,'Both','3734648232',NULL,'Sample Data','Toby','E','Prentice',4,NULL,NULL,NULL,1,NULL,'Dear Toby',1,NULL,'Dear Toby',1,NULL,'Dr. Toby Prentice',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(192,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'lbarkley69@sample.net','lbarkley69@sample.net',NULL,NULL,NULL,'
3
',NULL,'Both','2275713838',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,NULL,1,NULL,'Dear lbarkley69@sample.net',1,NULL,'Dear lbarkley69@sample.net',1,NULL,'lbarkley69@sample.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(193,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'allanjameson35@infomail.net','allanjameson35@infomail.net',NULL,NULL,NULL,'
1
',NULL,'Both','2766671914',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear allanjameson35@infomail.net',1,NULL,'Dear allanjameson35@infomail.net',1,NULL,'allanjameson35@infomail.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(194,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Terrell, Landon','Landon Terrell',NULL,NULL,NULL,NULL,NULL,'Both','4168752118',NULL,'Sample Data','Landon','H','Terrell',NULL,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Terrell',NULL,2,'1962-03-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(195,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Kenny','Kenny Jameson Jr.',NULL,NULL,NULL,NULL,NULL,'Both','3782185889',NULL,'Sample Data','Kenny','P','Jameson',NULL,1,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny Jameson Jr.',NULL,NULL,'1990-03-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(196,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wagner, Kandace','Ms. Kandace Wagner',NULL,NULL,NULL,'
2
',NULL,'Both','34193694',NULL,'Sample Data','Kandace','Z','Wagner',2,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Ms. Kandace Wagner',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(197,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Yadav, Elina','Ms. Elina Yadav',NULL,NULL,NULL,'
2
',NULL,'Both','3672729828',NULL,'Sample Data','Elina','','Yadav',2,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Ms. Elina Yadav',NULL,1,'1995-04-06',0,NULL,NULL,NULL,'Beech Development Trust',NULL,NULL,86,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(198,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'parker.rolando@lol.org','parker.rolando@lol.org',NULL,NULL,NULL,'
1
',NULL,'Both','4169452322',NULL,'Sample Data',NULL,NULL,NULL,NULL,4,NULL,NULL,1,NULL,'Dear parker.rolando@lol.org',1,NULL,'Dear parker.rolando@lol.org',1,NULL,'parker.rolando@lol.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:02'),(199,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Jed','Dr. Jed Wilson',NULL,NULL,NULL,'
2
',NULL,'Both','1260634010',NULL,'Sample Data','Jed','','Wilson',4,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Dr. Jed Wilson',NULL,NULL,'1966-05-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:01'),(200,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Blackwell-González, Felisha','Felisha Blackwell-González',NULL,NULL,NULL,'
1
',NULL,'Both','1633535452',NULL,'Sample Data','Felisha','Y','Blackwell-González',NULL,NULL,NULL,NULL,1,NULL,'Dear Felisha',1,NULL,'Dear Felisha',1,NULL,'Felisha Blackwell-González',NULL,NULL,'1970-05-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03'),(201,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker-Jones, Iris','Iris Parker-Jones',NULL,NULL,NULL,NULL,NULL,'Both','803629539',NULL,'Sample Data','Iris','','Parker-Jones',NULL,NULL,NULL,NULL,1,NULL,'Dear Iris',1,NULL,'Dear Iris',1,NULL,'Iris Parker-Jones',NULL,NULL,'1965-05-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-07-24 05:34:00','2020-07-24 05:34:03');
+INSERT INTO `civicrm_contact` (`id`, `contact_type`, `contact_sub_type`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `external_identifier`, `sort_name`, `display_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `preferred_mail_format`, `hash`, `api_key`, `source`, `first_name`, `middle_name`, `last_name`, `prefix_id`, `suffix_id`, `formal_title`, `communication_style_id`, `email_greeting_id`, `email_greeting_custom`, `email_greeting_display`, `postal_greeting_id`, `postal_greeting_custom`, `postal_greeting_display`, `addressee_id`, `addressee_custom`, `addressee_display`, `job_title`, `gender_id`, `birth_date`, `is_deceased`, `deceased_date`, `household_name`, `primary_contact_id`, `organization_name`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`) VALUES (1,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Default Organization','Default Organization',NULL,'Default Organization',NULL,NULL,NULL,'Both',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,'Default Organization',NULL,NULL,NULL,0,NULL,'2020-09-16 01:29:14'),(2,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Norris','Norris Müller',NULL,NULL,NULL,NULL,NULL,'Both','1477289672',NULL,'Sample Data','Norris','V','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Müller',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(3,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Wilson, Alida','Ms. Alida Wilson',NULL,NULL,NULL,NULL,NULL,'Both','2827847668',NULL,'Sample Data','Alida','O','Wilson',2,NULL,NULL,NULL,1,NULL,'Dear Alida',1,NULL,'Dear Alida',1,NULL,'Ms. Alida Wilson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(4,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'cruz.esta22@notmail.co.in','cruz.esta22@notmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','377658032',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear cruz.esta22@notmail.co.in',1,NULL,'Dear cruz.esta22@notmail.co.in',1,NULL,'cruz.esta22@notmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(5,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Lee, Billy','Billy Lee Sr.',NULL,NULL,NULL,'
1
',NULL,'Both','587456357',NULL,'Sample Data','Billy','','Lee',NULL,2,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Billy Lee Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(6,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Łąchowski family','Łąchowski family',NULL,NULL,NULL,'
5
',NULL,'Both','2407077255',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Łąchowski family',5,NULL,'Dear Łąchowski family',2,NULL,'Łąchowski family',NULL,NULL,NULL,0,NULL,'Łąchowski family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(7,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Bachman family','Bachman family',NULL,NULL,NULL,'
5
',NULL,'Both','1714131215',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Bachman family',5,NULL,'Dear Bachman family',2,NULL,'Bachman family',NULL,NULL,NULL,0,NULL,'Bachman family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(8,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Northpoint Arts Initiative','Northpoint Arts Initiative',NULL,NULL,NULL,NULL,NULL,'Both','3244989516',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Northpoint Arts Initiative',NULL,NULL,NULL,0,NULL,NULL,42,'Northpoint Arts Initiative',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(9,'Organization',NULL,1,1,0,0,0,0,NULL,NULL,'Virginia Legal Center','Virginia Legal Center',NULL,NULL,NULL,'
1
',NULL,'Both','2596647343',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Virginia Legal Center',NULL,NULL,NULL,0,NULL,NULL,58,'Virginia Legal Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(10,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Rural Software Partnership','Rural Software Partnership',NULL,NULL,NULL,'
2
',NULL,'Both','365602600',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Rural Software Partnership',NULL,NULL,NULL,0,NULL,NULL,125,'Rural Software Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(11,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Brigette','Brigette Olsen',NULL,NULL,NULL,'
2
',NULL,'Both','2958585175',NULL,'Sample Data','Brigette','','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Olsen',NULL,1,'2017-06-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(12,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Teresa','Teresa Łąchowski',NULL,NULL,NULL,'
2
',NULL,'Both','4252064413',NULL,'Sample Data','Teresa','','Łąchowski',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Łąchowski',NULL,NULL,'1976-04-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(13,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Nielsen, Magan','Ms. Magan Nielsen',NULL,NULL,NULL,'
1
',NULL,'Both','1092078914',NULL,'Sample Data','Magan','','Nielsen',2,NULL,NULL,NULL,1,NULL,'Dear Magan',1,NULL,'Dear Magan',1,NULL,'Ms. Magan Nielsen',NULL,NULL,'1990-04-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(14,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Truman','Truman Wilson',NULL,NULL,NULL,'
5
',NULL,'Both','1537569075',NULL,'Sample Data','Truman','U','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Wilson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(15,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Smith-Olsen, Margaret','Margaret Smith-Olsen',NULL,NULL,NULL,NULL,NULL,'Both','3553586126',NULL,'Sample Data','Margaret','','Smith-Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Margaret Smith-Olsen',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(16,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker-Cruz, Kiara','Kiara Parker-Cruz',NULL,NULL,NULL,NULL,NULL,'Both','2778052009',NULL,'Sample Data','Kiara','','Parker-Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Kiara Parker-Cruz',NULL,1,'2001-05-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(17,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Shauna','Dr. Shauna Blackwell',NULL,NULL,NULL,NULL,NULL,'Both','1849682656',NULL,'Sample Data','Shauna','D','Blackwell',4,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Dr. Shauna Blackwell',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(18,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Megan','Megan Samson',NULL,NULL,NULL,NULL,NULL,'Both','4028113417',NULL,'Sample Data','Megan','','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,'Starkville Poetry Network',NULL,NULL,69,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(19,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jacobs, Jed','Dr. Jed Jacobs Sr.',NULL,NULL,NULL,'
2
',NULL,'Both','396684690',NULL,'Sample Data','Jed','','Jacobs',4,2,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Dr. Jed Jacobs Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(20,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'McIntyre Action School','McIntyre Action School',NULL,NULL,NULL,'
3
',NULL,'Both','64894748',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'McIntyre Action School',NULL,NULL,NULL,0,NULL,NULL,73,'McIntyre Action School',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(21,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Norris','Mr. Norris Samson',NULL,NULL,NULL,'
2
',NULL,'Both','2564827585',NULL,'Sample Data','Norris','','Samson',3,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Samson',NULL,NULL,'1971-09-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(22,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Craig','Craig Terry',NULL,NULL,NULL,NULL,NULL,'Both','99954809',NULL,'Sample Data','Craig','','Terry',NULL,NULL,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Craig Terry',NULL,2,NULL,0,NULL,NULL,NULL,'Cadell Technology Center',NULL,NULL,98,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(23,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Zope, Maria','Maria Zope',NULL,NULL,NULL,'
3
',NULL,'Both','1281712613',NULL,'Sample Data','Maria','','Zope',NULL,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Maria Zope',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(24,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Jacobs-Jameson, Nicole','Nicole Jacobs-Jameson',NULL,NULL,NULL,NULL,NULL,'Both','2724496681',NULL,'Sample Data','Nicole','','Jacobs-Jameson',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Jacobs-Jameson',NULL,1,'1988-09-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(25,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Lee, Jed','Jed Lee',NULL,NULL,NULL,'
4
',NULL,'Both','301771502',NULL,'Sample Data','Jed','','Lee',NULL,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Jed Lee',NULL,2,'1968-07-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(26,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Kathleen','Kathleen Wilson',NULL,NULL,NULL,NULL,NULL,'Both','773746752',NULL,'Sample Data','Kathleen','I','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Kathleen Wilson',NULL,NULL,'1973-07-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(27,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Elina','Dr. Elina McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','130391420',NULL,'Sample Data','Elina','','McReynolds',4,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Dr. Elina McReynolds',NULL,1,'1961-10-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(28,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'wattsonb62@example.com','wattsonb62@example.com',NULL,NULL,NULL,'
5
',NULL,'Both','1987133067',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear wattsonb62@example.com',1,NULL,'Dear wattsonb62@example.com',1,NULL,'wattsonb62@example.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(29,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker-Cruz, Teresa','Teresa Parker-Cruz',NULL,NULL,NULL,NULL,NULL,'Both','1398362274',NULL,'Sample Data','Teresa','B','Parker-Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Parker-Cruz',NULL,NULL,'2003-09-10',0,NULL,NULL,NULL,'Main Education Center',NULL,NULL,149,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(30,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Norris','Mr. Norris Jameson Sr.',NULL,NULL,NULL,'
4
',NULL,'Both','3849460374',NULL,'Sample Data','Norris','K','Jameson',3,2,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Jameson Sr.',NULL,2,'1934-11-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(31,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith, Brzęczysław','Mr. Brzęczysław Smith III',NULL,NULL,NULL,NULL,NULL,'Both','3764320726',NULL,'Sample Data','Brzęczysław','','Smith',3,4,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Mr. Brzęczysław Smith III',NULL,2,'1994-10-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(32,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Grant family','Müller-Grant family',NULL,NULL,NULL,NULL,NULL,'Both','1954714724',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Müller-Grant family',5,NULL,'Dear Müller-Grant family',2,NULL,'Müller-Grant family',NULL,NULL,NULL,0,NULL,'Müller-Grant family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(33,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Alexia','Dr. Alexia Jameson',NULL,NULL,NULL,NULL,NULL,'Both','1617185067',NULL,'Sample Data','Alexia','','Jameson',4,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Dr. Alexia Jameson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(34,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Damaris','Mrs. Damaris Adams',NULL,NULL,NULL,'
5
',NULL,'Both','3501190131',NULL,'Sample Data','Damaris','X','Adams',1,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Mrs. Damaris Adams',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(35,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Smith-Adams, Carlos','Dr. Carlos Smith-Adams II',NULL,NULL,NULL,'
1
',NULL,'Both','219378051',NULL,'Sample Data','Carlos','W','Smith-Adams',4,3,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Dr. Carlos Smith-Adams II',NULL,2,'1978-11-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(36,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wattson, Bryon','Dr. Bryon Wattson',NULL,NULL,NULL,'
3
',NULL,'Both','2375098324',NULL,'Sample Data','Bryon','','Wattson',4,NULL,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Dr. Bryon Wattson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(37,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Friends Wellness Partnership','Friends Wellness Partnership',NULL,NULL,NULL,'
1
',NULL,'Both','3616449023',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Friends Wellness Partnership',NULL,NULL,NULL,0,NULL,NULL,172,'Friends Wellness Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(38,'Household',NULL,1,1,0,0,0,0,NULL,NULL,'Samson family','Samson family',NULL,NULL,NULL,'
3
',NULL,'Both','333421926',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Samson family',5,NULL,'Dear Samson family',2,NULL,'Samson family',NULL,NULL,NULL,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(39,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'margaretdaz51@sample.biz','margaretdaz51@sample.biz',NULL,NULL,NULL,NULL,NULL,'Both','4257184693',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear margaretdaz51@sample.biz',1,NULL,'Dear margaretdaz51@sample.biz',1,NULL,'margaretdaz51@sample.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(40,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wattson, Esta','Esta Wattson',NULL,NULL,NULL,NULL,NULL,'Both','1484476563',NULL,'Sample Data','Esta','O','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Esta',1,NULL,'Dear Esta',1,NULL,'Esta Wattson',NULL,1,NULL,0,NULL,NULL,NULL,'North Carolina Wellness Association',NULL,NULL,115,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(41,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Zope, Jay','Dr. Jay Zope',NULL,NULL,NULL,'
1
',NULL,'Both','819910080',NULL,'Sample Data','Jay','','Zope',4,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Dr. Jay Zope',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(42,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Shauna','Shauna Müller',NULL,NULL,NULL,'
2
',NULL,'Both','2927518438',NULL,'Sample Data','Shauna','I','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Müller',NULL,1,'1959-05-22',0,NULL,NULL,NULL,'Northpoint Arts Initiative',NULL,NULL,8,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(43,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Damaris','Ms. Damaris McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','2561970052',NULL,'Sample Data','Damaris','','McReynolds',2,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Ms. Damaris McReynolds',NULL,1,'1997-10-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(44,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Errol','Mr. Errol Wilson Sr.',NULL,NULL,NULL,NULL,NULL,'Both','1627252863',NULL,'Sample Data','Errol','','Wilson',3,2,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Mr. Errol Wilson Sr.',NULL,2,'1958-05-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(45,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Ivanov family','Ivanov family',NULL,NULL,NULL,NULL,NULL,'Both','2450779112',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Ivanov family',5,NULL,'Dear Ivanov family',2,NULL,'Ivanov family',NULL,NULL,NULL,0,NULL,'Ivanov family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(46,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Ivey','Ivey Bachman',NULL,NULL,NULL,'
5
',NULL,'Both','908900528',NULL,'Sample Data','Ivey','X','Bachman',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Bachman',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(47,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Brittney','Mrs. Brittney Łąchowski',NULL,NULL,NULL,NULL,NULL,'Both','2238471243',NULL,'Sample Data','Brittney','','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Mrs. Brittney Łąchowski',NULL,1,'1942-02-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(48,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Samson, Josefa','Dr. Josefa Samson',NULL,NULL,NULL,NULL,NULL,'Both','3599094976',NULL,'Sample Data','Josefa','','Samson',4,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Dr. Josefa Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(49,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Reynolds, Elizabeth','Elizabeth Reynolds',NULL,NULL,NULL,NULL,NULL,'Both','3578793204',NULL,'Sample Data','Elizabeth','C','Reynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Elizabeth',1,NULL,'Dear Elizabeth',1,NULL,'Elizabeth Reynolds',NULL,1,'2008-10-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(50,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'ivanov.elbert@fishmail.net','ivanov.elbert@fishmail.net',NULL,NULL,NULL,NULL,NULL,'Both','2060868970',NULL,'Sample Data',NULL,NULL,NULL,NULL,3,NULL,NULL,1,NULL,'Dear ivanov.elbert@fishmail.net',1,NULL,'Dear ivanov.elbert@fishmail.net',1,NULL,'ivanov.elbert@fishmail.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(51,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Elina','Ms. Elina Parker',NULL,NULL,NULL,'
1
',NULL,'Both','2858301747',NULL,'Sample Data','Elina','T','Parker',2,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Ms. Elina Parker',NULL,NULL,'1945-05-27',1,'2019-10-25',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(52,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Ivanov, Ashley','Ashley Ivanov Jr.',NULL,NULL,NULL,'
1
',NULL,'Both','2740657237',NULL,'Sample Data','Ashley','','Ivanov',NULL,1,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Ivanov Jr.',NULL,2,'1956-09-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(53,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Laree','Ms. Laree Bachman',NULL,NULL,NULL,NULL,NULL,'Both','3736989072',NULL,'Sample Data','Laree','K','Bachman',2,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Ms. Laree Bachman',NULL,1,'1991-07-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(54,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Juliann','Juliann Nielsen',NULL,NULL,NULL,NULL,NULL,'Both','3555715796',NULL,'Sample Data','Juliann','L','Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Juliann Nielsen',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(55,'Organization',NULL,1,0,0,0,1,0,NULL,NULL,'Sierra Vista Advocacy Alliance','Sierra Vista Advocacy Alliance',NULL,NULL,NULL,'
4
',NULL,'Both','1779900177',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Sierra Vista Advocacy Alliance',NULL,NULL,NULL,0,NULL,NULL,77,'Sierra Vista Advocacy Alliance',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(56,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest-Nielsen, Teresa','Dr. Teresa Deforest-Nielsen',NULL,NULL,NULL,'
5
',NULL,'Both','4230365965',NULL,'Sample Data','Teresa','','Deforest-Nielsen',4,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Dr. Teresa Deforest-Nielsen',NULL,1,'1980-12-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(57,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Megan','Megan McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','1459926371',NULL,'Sample Data','Megan','','McReynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan McReynolds',NULL,1,'1943-07-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(58,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Rebekah','Mrs. Rebekah Bachman',NULL,NULL,NULL,'
3
',NULL,'Both','396522524',NULL,'Sample Data','Rebekah','G','Bachman',1,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Mrs. Rebekah Bachman',NULL,1,'1985-12-04',0,NULL,NULL,NULL,'Virginia Legal Center',NULL,NULL,9,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(59,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Robertson, Rebekah','Dr. Rebekah Robertson',NULL,NULL,NULL,NULL,NULL,'Both','1199774437',NULL,'Sample Data','Rebekah','D','Robertson',4,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Dr. Rebekah Robertson',NULL,NULL,'1972-09-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(60,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'andrewchowski96@lol.co.uk','andrewchowski96@lol.co.uk',NULL,NULL,NULL,'
1
',NULL,'Both','520849502',NULL,'Sample Data',NULL,NULL,NULL,NULL,3,NULL,NULL,1,NULL,'Dear andrewchowski96@lol.co.uk',1,NULL,'Dear andrewchowski96@lol.co.uk',1,NULL,'andrewchowski96@lol.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,'Community Health Systems',NULL,NULL,114,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(61,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jacobs, Kenny','Mr. Kenny Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','1044730065',NULL,'Sample Data','Kenny','','Jacobs',3,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Mr. Kenny Jacobs',NULL,NULL,'1985-01-27',0,NULL,NULL,NULL,'Community Food Solutions',NULL,NULL,76,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(62,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Northpoint Sports Fellowship','Northpoint Sports Fellowship',NULL,NULL,NULL,'
3
',NULL,'Both','1439445317',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Northpoint Sports Fellowship',NULL,NULL,NULL,0,NULL,NULL,143,'Northpoint Sports Fellowship',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(63,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'mller.elizabeth@example.info','mller.elizabeth@example.info',NULL,NULL,NULL,NULL,NULL,'Both','982384173',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear mller.elizabeth@example.info',1,NULL,'Dear mller.elizabeth@example.info',1,NULL,'mller.elizabeth@example.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(64,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Damaris','Damaris Samson',NULL,NULL,NULL,NULL,NULL,'Both','1775086930',NULL,'Sample Data','Damaris','J','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Damaris Samson',NULL,1,'1961-05-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(65,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'jacobs.sonny@airmail.info','jacobs.sonny@airmail.info',NULL,NULL,NULL,'
3
',NULL,'Both','1247338792',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear jacobs.sonny@airmail.info',1,NULL,'Dear jacobs.sonny@airmail.info',1,NULL,'jacobs.sonny@airmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(66,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Minnesota Culture Partnership','Minnesota Culture Partnership',NULL,NULL,NULL,NULL,NULL,'Both','190706445',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Minnesota Culture Partnership',NULL,NULL,NULL,0,NULL,NULL,156,'Minnesota Culture Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(67,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Ashley','Ashley Parker',NULL,NULL,NULL,NULL,NULL,'Both','3805556080',NULL,'Sample Data','Ashley','C','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Parker',NULL,2,'1993-01-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(68,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Bachman, Kenny','Kenny Bachman Jr.',NULL,NULL,NULL,'
5
',NULL,'Both','20347207',NULL,'Sample Data','Kenny','','Bachman',NULL,1,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny Bachman Jr.',NULL,NULL,'1995-08-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(69,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Starkville Poetry Network','Starkville Poetry Network',NULL,NULL,NULL,'
3
',NULL,'Both','682701657',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Starkville Poetry Network',NULL,NULL,NULL,0,NULL,NULL,18,'Starkville Poetry Network',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(70,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Ivey','Ivey Adams',NULL,NULL,NULL,'
2
',NULL,'Both','1336379028',NULL,'Sample Data','Ivey','T','Adams',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Adams',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(71,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Brigette','Dr. Brigette Grant',NULL,NULL,NULL,NULL,NULL,'Both','996729836',NULL,'Sample Data','Brigette','U','Grant',4,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Dr. Brigette Grant',NULL,NULL,'1982-12-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(72,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts, Bryon','Bryon Roberts',NULL,NULL,NULL,'
1
',NULL,'Both','1499512182',NULL,'Sample Data','Bryon','','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Bryon Roberts',NULL,2,'1943-05-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(73,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Samson, Brzęczysław','Brzęczysław Samson Jr.',NULL,NULL,NULL,NULL,NULL,'Both','2534181528',NULL,'Sample Data','Brzęczysław','I','Samson',NULL,1,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Brzęczysław Samson Jr.',NULL,2,NULL,0,NULL,NULL,NULL,'McIntyre Action School',NULL,NULL,20,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(74,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Łąchowski, Beula','Mrs. Beula Łąchowski',NULL,NULL,NULL,'
2
',NULL,'Both','3562875387',NULL,'Sample Data','Beula','A','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Mrs. Beula Łąchowski',NULL,NULL,'1989-01-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(75,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson family','Wilson family',NULL,NULL,NULL,'
4
',NULL,'Both','350510798',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wilson family',5,NULL,'Dear Wilson family',2,NULL,'Wilson family',NULL,NULL,NULL,0,NULL,'Wilson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(76,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Community Food Solutions','Community Food Solutions',NULL,NULL,NULL,NULL,NULL,'Both','1172089786',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Food Solutions',NULL,NULL,NULL,0,NULL,NULL,61,'Community Food Solutions',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(77,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Grant, Bernadette','Bernadette Grant',NULL,NULL,NULL,NULL,NULL,'Both','2386715823',NULL,'Sample Data','Bernadette','','Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Grant',NULL,1,'2014-12-31',0,NULL,NULL,NULL,'Sierra Vista Advocacy Alliance',NULL,NULL,55,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(78,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Lee-Barkley family','Lee-Barkley family',NULL,NULL,NULL,'
4
',NULL,'Both','208162044',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Lee-Barkley family',5,NULL,'Dear Lee-Barkley family',2,NULL,'Lee-Barkley family',NULL,NULL,NULL,0,NULL,'Lee-Barkley family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(79,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Lee-Barkley, Delana','Delana Lee-Barkley',NULL,NULL,NULL,'
4
',NULL,'Both','1901069703',NULL,'Sample Data','Delana','N','Lee-Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Lee-Barkley',NULL,1,'1991-09-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(80,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Cruz, Margaret','Dr. Margaret Cruz',NULL,NULL,NULL,'
5
',NULL,'Both','680750633',NULL,'Sample Data','Margaret','','Cruz',4,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Dr. Margaret Cruz',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(81,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Nielsen, Claudio','Mr. Claudio Nielsen Jr.',NULL,NULL,NULL,NULL,NULL,'Both','3195843704',NULL,'Sample Data','Claudio','','Nielsen',3,1,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Mr. Claudio Nielsen Jr.',NULL,2,'1944-11-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(82,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Lee-Barkley, Sonny','Dr. Sonny Lee-Barkley Jr.',NULL,NULL,NULL,NULL,NULL,'Both','1415092371',NULL,'Sample Data','Sonny','','Lee-Barkley',4,1,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Dr. Sonny Lee-Barkley Jr.',NULL,NULL,'1990-01-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(83,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Allan','Mr. Allan Müller',NULL,NULL,NULL,NULL,NULL,'Both','324455196',NULL,'Sample Data','Allan','','Müller',3,NULL,NULL,NULL,1,NULL,'Dear Allan',1,NULL,'Dear Allan',1,NULL,'Mr. Allan Müller',NULL,2,'1962-09-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(84,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Arizona Arts Trust','Arizona Arts Trust',NULL,NULL,NULL,'
4
',NULL,'Both','1290588810',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Arizona Arts Trust',NULL,NULL,NULL,0,NULL,NULL,174,'Arizona Arts Trust',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(85,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Roberts, Daren','Daren Roberts',NULL,NULL,NULL,NULL,NULL,'Both','1647753164',NULL,'Sample Data','Daren','Q','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Daren',1,NULL,'Dear Daren',1,NULL,'Daren Roberts',NULL,2,'1982-09-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(86,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Adams, Craig','Mr. Craig Adams Jr.',NULL,NULL,NULL,NULL,NULL,'Both','2128666326',NULL,'Sample Data','Craig','','Adams',3,1,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Mr. Craig Adams Jr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(87,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Rolando','Rolando Olsen',NULL,NULL,NULL,'
5
',NULL,'Both','2121296962',NULL,'Sample Data','Rolando','','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Olsen',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(88,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Scott','Scott Adams',NULL,NULL,NULL,NULL,NULL,'Both','2280225126',NULL,'Sample Data','Scott','','Adams',NULL,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Scott Adams',NULL,2,'1952-07-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(89,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Eleonor','Mrs. Eleonor Müller',NULL,NULL,NULL,NULL,NULL,'Both','4009103845',NULL,'Sample Data','Eleonor','','Müller',1,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Mrs. Eleonor Müller',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(90,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Samuels, Kandace','Kandace Samuels',NULL,NULL,NULL,'
1
',NULL,'Both','757003024',NULL,'Sample Data','Kandace','','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Kandace Samuels',NULL,1,'1971-11-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(91,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts, Landon','Landon Roberts Jr.',NULL,NULL,NULL,NULL,NULL,'Both','83700418',NULL,'Sample Data','Landon','','Roberts',NULL,1,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Roberts Jr.',NULL,NULL,'2009-12-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(92,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Cruz, Betty','Betty Cruz',NULL,NULL,NULL,'
4
',NULL,'Both','1094549317',NULL,'Sample Data','Betty','O','Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Betty Cruz',NULL,1,'1975-11-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(93,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'julianngrant@testing.org','julianngrant@testing.org',NULL,NULL,NULL,'
1
',NULL,'Both','2007973006',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear julianngrant@testing.org',1,NULL,'Dear julianngrant@testing.org',1,NULL,'julianngrant@testing.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(94,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Smith, Kiara','Dr. Kiara Smith',NULL,NULL,NULL,'
4
',NULL,'Both','550960995',NULL,'Sample Data','Kiara','T','Smith',4,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Dr. Kiara Smith',NULL,1,'1977-01-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(95,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Wilson, Lou','Lou Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3757116240',NULL,'Sample Data','Lou','J','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Lou Wilson',NULL,2,'1977-09-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(96,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'wattsone@mymail.biz','wattsone@mymail.biz',NULL,NULL,NULL,'
3
',NULL,'Both','3239090102',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear wattsone@mymail.biz',1,NULL,'Dear wattsone@mymail.biz',1,NULL,'wattsone@mymail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(97,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Erik','Dr. Erik Bachman II',NULL,NULL,NULL,NULL,NULL,'Both','620728720',NULL,'Sample Data','Erik','Y','Bachman',4,3,NULL,NULL,1,NULL,'Dear Erik',1,NULL,'Dear Erik',1,NULL,'Dr. Erik Bachman II',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(98,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Cadell Technology Center','Cadell Technology Center',NULL,NULL,NULL,NULL,NULL,'Both','1796935528',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Cadell Technology Center',NULL,NULL,NULL,0,NULL,NULL,22,'Cadell Technology Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(99,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Roberts, Elbert','Elbert Roberts',NULL,NULL,NULL,'
4
',NULL,'Both','2457403218',NULL,'Sample Data','Elbert','P','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Roberts',NULL,2,NULL,1,'2020-03-24',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(100,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Bob','Bob Wattson',NULL,NULL,NULL,NULL,NULL,'Both','194645235',NULL,'Sample Data','Bob','','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Wattson',NULL,NULL,'1961-07-09',0,NULL,NULL,NULL,'South Dakota Environmental Partnership',NULL,NULL,134,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(101,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Louisiana Health Fellowship','Louisiana Health Fellowship',NULL,NULL,NULL,'
1
',NULL,'Both','3167811531',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Louisiana Health Fellowship',NULL,NULL,NULL,0,NULL,NULL,NULL,'Louisiana Health Fellowship',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(102,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'teddyr@lol.info','teddyr@lol.info',NULL,NULL,NULL,'
4
',NULL,'Both','241351152',NULL,'Sample Data',NULL,NULL,NULL,3,4,NULL,NULL,1,NULL,'Dear teddyr@lol.info',1,NULL,'Dear teddyr@lol.info',1,NULL,'teddyr@lol.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(103,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Angelika','Angelika McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','3667136043',NULL,'Sample Data','Angelika','A','McReynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Angelika',1,NULL,'Dear Angelika',1,NULL,'Angelika McReynolds',NULL,1,'1950-05-17',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(104,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Errol','Mr. Errol Samuels',NULL,NULL,NULL,NULL,NULL,'Both','1627005743',NULL,'Sample Data','Errol','','Samuels',3,NULL,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Mr. Errol Samuels',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(105,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Lee, Bob','Bob Lee',NULL,NULL,NULL,'
1
',NULL,'Both','207861481',NULL,'Sample Data','Bob','','Lee',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Lee',NULL,2,'1946-04-23',1,'2020-04-23',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(106,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'parkerk31@notmail.co.nz','parkerk31@notmail.co.nz',NULL,NULL,NULL,'
3
',NULL,'Both','3054247318',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear parkerk31@notmail.co.nz',1,NULL,'Dear parkerk31@notmail.co.nz',1,NULL,'parkerk31@notmail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(107,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Heidi','Heidi Wattson',NULL,NULL,NULL,'
1
',NULL,'Both','1801029451',NULL,'Sample Data','Heidi','S','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Heidi',1,NULL,'Dear Heidi',1,NULL,'Heidi Wattson',NULL,1,'1934-09-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(108,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Olsen, Kathlyn','Ms. Kathlyn Olsen',NULL,NULL,NULL,'
2
',NULL,'Both','273403650',NULL,'Sample Data','Kathlyn','','Olsen',2,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Ms. Kathlyn Olsen',NULL,1,'1977-01-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(109,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Bachman, Ashlie','Ashlie Bachman',NULL,NULL,NULL,'
5
',NULL,'Both','628441271',NULL,'Sample Data','Ashlie','','Bachman',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Ashlie Bachman',NULL,1,'2009-11-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(110,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Blackwell, Rosario','Rosario Blackwell',NULL,NULL,NULL,'
3
',NULL,'Both','212312556',NULL,'Sample Data','Rosario','','Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Rosario Blackwell',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(111,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'lee.valene@sample.co.nz','lee.valene@sample.co.nz',NULL,NULL,NULL,NULL,NULL,'Both','1914588398',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear lee.valene@sample.co.nz',1,NULL,'Dear lee.valene@sample.co.nz',1,NULL,'lee.valene@sample.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(112,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Shauna','Shauna Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3063545334',NULL,'Sample Data','Shauna','P','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Wilson',NULL,NULL,'2010-09-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(113,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Kacey','Dr. Kacey Ivanov',NULL,NULL,NULL,'
3
',NULL,'Both','2436947567',NULL,'Sample Data','Kacey','O','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Dr. Kacey Ivanov',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(114,'Organization',NULL,0,1,0,0,1,0,NULL,NULL,'Community Health Systems','Community Health Systems',NULL,NULL,NULL,'
2
',NULL,'Both','348951228',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Health Systems',NULL,NULL,NULL,0,NULL,NULL,60,'Community Health Systems',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(115,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'North Carolina Wellness Association','North Carolina Wellness Association',NULL,NULL,NULL,NULL,NULL,'Both','2792948089',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'North Carolina Wellness Association',NULL,NULL,NULL,0,NULL,NULL,40,'North Carolina Wellness Association',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(116,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'billyb@testmail.co.in','billyb@testmail.co.in',NULL,NULL,NULL,'
1
',NULL,'Both','2905262741',NULL,'Sample Data',NULL,NULL,NULL,4,1,NULL,NULL,1,NULL,'Dear billyb@testmail.co.in',1,NULL,'Dear billyb@testmail.co.in',1,NULL,'billyb@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(117,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen, Winford','Mr. Winford Jensen',NULL,NULL,NULL,NULL,NULL,'Both','1126016522',NULL,'Sample Data','Winford','','Jensen',3,NULL,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Mr. Winford Jensen',NULL,2,'1940-11-07',1,'2019-11-21',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(118,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Princess','Princess Barkley',NULL,NULL,NULL,NULL,NULL,'Both','1098730680',NULL,'Sample Data','Princess','','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Princess Barkley',NULL,1,'1978-07-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(119,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Wattson family','Wattson family',NULL,NULL,NULL,'
1
',NULL,'Both','2851339192',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wattson family',5,NULL,'Dear Wattson family',2,NULL,'Wattson family',NULL,NULL,NULL,0,NULL,'Wattson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(120,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Grant, Iris','Iris Müller-Grant',NULL,NULL,NULL,'
3
',NULL,'Both','1672056103',NULL,'Sample Data','Iris','T','Müller-Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Iris',1,NULL,'Dear Iris',1,NULL,'Iris Müller-Grant',NULL,1,'1986-05-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(121,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Hadley Empowerment Center','Hadley Empowerment Center',NULL,NULL,NULL,NULL,NULL,'Both','4086554855',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Hadley Empowerment Center',NULL,NULL,NULL,0,NULL,NULL,198,'Hadley Empowerment Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(122,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Deforest, Miguel','Mr. Miguel Deforest',NULL,NULL,NULL,'
1
',NULL,'Both','2379734396',NULL,'Sample Data','Miguel','S','Deforest',3,NULL,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Mr. Miguel Deforest',NULL,2,'1962-09-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(123,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Parker-Cruz family','Parker-Cruz family',NULL,NULL,NULL,NULL,NULL,'Both','1981374575',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker-Cruz family',5,NULL,'Dear Parker-Cruz family',2,NULL,'Parker-Cruz family',NULL,NULL,NULL,0,NULL,'Parker-Cruz family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(124,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Grant, Teddy','Teddy Müller-Grant',NULL,NULL,NULL,NULL,NULL,'Both','106369315',NULL,'Sample Data','Teddy','','Müller-Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Teddy Müller-Grant',NULL,NULL,'1996-03-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(125,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Truman','Truman Parker',NULL,NULL,NULL,NULL,NULL,'Both','3366007390',NULL,'Sample Data','Truman','','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Parker',NULL,NULL,NULL,0,NULL,NULL,NULL,'Rural Software Partnership',NULL,NULL,10,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(126,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jones, Lashawnda','Mrs. Lashawnda Jones',NULL,NULL,NULL,'
5
',NULL,'Both','3527587829',NULL,'Sample Data','Lashawnda','W','Jones',1,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Mrs. Lashawnda Jones',NULL,1,'1947-01-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(127,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Brigette','Brigette Barkley',NULL,NULL,NULL,'
2
',NULL,'Both','4058623378',NULL,'Sample Data','Brigette','T','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Barkley',NULL,1,'1985-08-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(128,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Martin Luther King Advocacy Fellowship','Martin Luther King Advocacy Fellowship',NULL,NULL,NULL,'
5
',NULL,'Both','3147635468',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Martin Luther King Advocacy Fellowship',NULL,NULL,NULL,0,NULL,NULL,170,'Martin Luther King Advocacy Fellowship',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(129,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cooper, Kandace','Kandace Cooper',NULL,NULL,NULL,'
4
',NULL,'Both','3097920317',NULL,'Sample Data','Kandace','','Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Kandace Cooper',NULL,NULL,'1933-04-19',0,NULL,NULL,NULL,'Oklahoma Environmental Alliance',NULL,NULL,155,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(130,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'andrewrobertson@mymail.com','andrewrobertson@mymail.com',NULL,NULL,NULL,NULL,NULL,'Both','3750142267',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear andrewrobertson@mymail.com',1,NULL,'Dear andrewrobertson@mymail.com',1,NULL,'andrewrobertson@mymail.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(131,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Brittney','Mrs. Brittney Łąchowski',NULL,NULL,NULL,'
3
',NULL,'Both','2238471243',NULL,'Sample Data','Brittney','','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Mrs. Brittney Łąchowski',NULL,NULL,'1966-08-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(132,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'olsenb@lol.co.uk','olsenb@lol.co.uk',NULL,NULL,NULL,NULL,NULL,'Both','1265111874',NULL,'Sample Data',NULL,NULL,NULL,4,3,NULL,NULL,1,NULL,'Dear olsenb@lol.co.uk',1,NULL,'Dear olsenb@lol.co.uk',1,NULL,'olsenb@lol.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(133,'Household',NULL,0,1,0,0,1,0,NULL,NULL,'Olsen family','Olsen family',NULL,NULL,NULL,'
4
',NULL,'Both','1990073228',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Olsen family',5,NULL,'Dear Olsen family',2,NULL,'Olsen family',NULL,NULL,NULL,0,NULL,'Olsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(134,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'South Dakota Environmental Partnership','South Dakota Environmental Partnership',NULL,NULL,NULL,NULL,NULL,'Both','1043592653',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'South Dakota Environmental Partnership',NULL,NULL,NULL,0,NULL,NULL,100,'South Dakota Environmental Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(135,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Samson, Allen','Allen Samson II',NULL,NULL,NULL,'
3
',NULL,'Both','551135847',NULL,'Sample Data','Allen','B','Samson',NULL,3,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen Samson II',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(136,'Individual',NULL,1,1,0,0,1,0,NULL,NULL,'Roberts, Irvin','Mr. Irvin Roberts III',NULL,NULL,NULL,'
4
',NULL,'Both','1941335260',NULL,'Sample Data','Irvin','I','Roberts',3,4,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Mr. Irvin Roberts III',NULL,NULL,'1945-05-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(137,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz family','Cruz family',NULL,NULL,NULL,NULL,NULL,'Both','2326538497',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Cruz family',5,NULL,'Dear Cruz family',2,NULL,'Cruz family',NULL,NULL,NULL,0,NULL,'Cruz family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(138,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Samson, Kenny','Mr. Kenny Samson',NULL,NULL,NULL,NULL,NULL,'Both','1958901038',NULL,'Sample Data','Kenny','','Samson',3,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Mr. Kenny Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(139,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Wilson, Landon','Landon Wilson',NULL,NULL,NULL,'
4
',NULL,'Both','2234178056',NULL,'Sample Data','Landon','','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Wilson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(140,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Jones family','Jones family',NULL,NULL,NULL,'
3
',NULL,'Both','1110516799',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jones family',5,NULL,'Dear Jones family',2,NULL,'Jones family',NULL,NULL,NULL,0,NULL,'Jones family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(141,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'lg.blackwell66@example.org','lg.blackwell66@example.org',NULL,NULL,NULL,NULL,NULL,'Both','198467643',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear lg.blackwell66@example.org',1,NULL,'Dear lg.blackwell66@example.org',1,NULL,'lg.blackwell66@example.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(142,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'eo.daz@fakemail.org','eo.daz@fakemail.org',NULL,NULL,NULL,'
2
',NULL,'Both','3543460293',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear eo.daz@fakemail.org',1,NULL,'Dear eo.daz@fakemail.org',1,NULL,'eo.daz@fakemail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(143,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Nicole','Nicole Samson',NULL,NULL,NULL,NULL,NULL,'Both','1649974700',NULL,'Sample Data','Nicole','S','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Samson',NULL,NULL,'1969-11-05',0,NULL,NULL,NULL,'Northpoint Sports Fellowship',NULL,NULL,62,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(144,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cooper, Ivey','Ivey Cooper',NULL,NULL,NULL,'
1
',NULL,'Both','4197158146',NULL,'Sample Data','Ivey','','Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Cooper',NULL,NULL,'2007-10-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(145,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Díaz, Lawerence','Mr. Lawerence Díaz III',NULL,NULL,NULL,NULL,NULL,'Both','1331780613',NULL,'Sample Data','Lawerence','','Díaz',3,4,NULL,NULL,1,NULL,'Dear Lawerence',1,NULL,'Dear Lawerence',1,NULL,'Mr. Lawerence Díaz III',NULL,NULL,'1996-11-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(146,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Delana','Ms. Delana Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3114260501',NULL,'Sample Data','Delana','','Wilson',2,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Ms. Delana Wilson',NULL,1,'1961-08-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(147,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker, Troy','Troy Parker',NULL,NULL,NULL,NULL,NULL,'Both','1888190696',NULL,'Sample Data','Troy','A','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Troy Parker',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(148,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Samson family','Samson family',NULL,NULL,NULL,'
2
',NULL,'Both','333421926',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Samson family',5,NULL,'Dear Samson family',2,NULL,'Samson family',NULL,NULL,NULL,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(149,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Main Education Center','Main Education Center',NULL,NULL,NULL,'
3
',NULL,'Both','3693864473',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Main Education Center',NULL,NULL,NULL,0,NULL,NULL,29,'Main Education Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(150,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'kiaram30@testmail.co.in','kiaram30@testmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','1376220391',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear kiaram30@testmail.co.in',1,NULL,'Dear kiaram30@testmail.co.in',1,NULL,'kiaram30@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(151,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jones, Kathlyn','Ms. Kathlyn Jones',NULL,NULL,NULL,'
3
',NULL,'Both','1774529515',NULL,'Sample Data','Kathlyn','','Jones',2,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Ms. Kathlyn Jones',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(152,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen, Troy','Dr. Troy Jensen III',NULL,NULL,NULL,'
4
',NULL,'Both','2894692674',NULL,'Sample Data','Troy','W','Jensen',4,4,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Dr. Troy Jensen III',NULL,NULL,'1975-06-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(153,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Josefa','Dr. Josefa Parker',NULL,NULL,NULL,NULL,NULL,'Both','2643167156',NULL,'Sample Data','Josefa','N','Parker',4,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Dr. Josefa Parker',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(154,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson family','Wilson family',NULL,NULL,NULL,'
2
',NULL,'Both','350510798',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wilson family',5,NULL,'Dear Wilson family',2,NULL,'Wilson family',NULL,NULL,NULL,0,NULL,'Wilson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(155,'Organization',NULL,1,1,0,0,0,0,NULL,NULL,'Oklahoma Environmental Alliance','Oklahoma Environmental Alliance',NULL,NULL,NULL,'
4
',NULL,'Both','1703336804',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Oklahoma Environmental Alliance',NULL,NULL,NULL,0,NULL,NULL,129,'Oklahoma Environmental Alliance',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(156,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz, Jina','Jina Cruz',NULL,NULL,NULL,'
4
',NULL,'Both','657562191',NULL,'Sample Data','Jina','','Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Cruz',NULL,1,'1984-06-26',0,NULL,NULL,NULL,'Minnesota Culture Partnership',NULL,NULL,66,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(157,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Łąchowski, Russell','Dr. Russell Łąchowski',NULL,NULL,NULL,NULL,NULL,'Both','2639588224',NULL,'Sample Data','Russell','','Łąchowski',4,NULL,NULL,NULL,1,NULL,'Dear Russell',1,NULL,'Dear Russell',1,NULL,'Dr. Russell Łąchowski',NULL,2,'1955-01-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(158,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Brigette','Brigette Samuels',NULL,NULL,NULL,NULL,NULL,'Both','609133167',NULL,'Sample Data','Brigette','','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Samuels',NULL,1,'1983-03-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(159,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith-Adams, Delana','Delana Smith-Adams',NULL,NULL,NULL,NULL,NULL,'Both','3072988173',NULL,'Sample Data','Delana','','Smith-Adams',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Smith-Adams',NULL,1,'1987-04-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(160,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Grant family','Grant family',NULL,NULL,NULL,'
3
',NULL,'Both','3228000340',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Grant family',5,NULL,'Dear Grant family',2,NULL,'Grant family',NULL,NULL,NULL,0,NULL,'Grant family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(161,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Norris','Norris Grant III',NULL,NULL,NULL,'
3
',NULL,'Both','1357168828',NULL,'Sample Data','Norris','','Grant',NULL,4,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Grant III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(162,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest, Omar','Mr. Omar Deforest Sr.',NULL,NULL,NULL,NULL,NULL,'Both','2965078228',NULL,'Sample Data','Omar','D','Deforest',3,2,NULL,NULL,1,NULL,'Dear Omar',1,NULL,'Dear Omar',1,NULL,'Mr. Omar Deforest Sr.',NULL,NULL,'1995-08-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(163,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Scott','Dr. Scott Ivanov',NULL,NULL,NULL,NULL,NULL,'Both','1336634478',NULL,'Sample Data','Scott','N','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Dr. Scott Ivanov',NULL,2,'1981-05-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(164,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Łąchowski, Juliann','Juliann Łąchowski',NULL,NULL,NULL,'
5
',NULL,'Both','3477087731',NULL,'Sample Data','Juliann','','Łąchowski',NULL,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Juliann Łąchowski',NULL,1,'1978-04-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(165,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Josefa','Josefa Samson',NULL,NULL,NULL,'
1
',NULL,'Both','3599094976',NULL,'Sample Data','Josefa','F','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Josefa Samson',NULL,1,'1987-09-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(166,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Ivey','Ivey Wattson',NULL,NULL,NULL,'
1
',NULL,'Both','1423152774',NULL,'Sample Data','Ivey','','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Wattson',NULL,NULL,'1963-10-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(167,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Zope, Clint','Mr. Clint Zope',NULL,NULL,NULL,'
1
',NULL,'Both','869284324',NULL,'Sample Data','Clint','B','Zope',3,NULL,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Mr. Clint Zope',NULL,2,'1948-03-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(168,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'ks.cruz@testmail.co.in','ks.cruz@testmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','4065460882',NULL,'Sample Data',NULL,NULL,NULL,4,3,NULL,NULL,1,NULL,'Dear ks.cruz@testmail.co.in',1,NULL,'Dear ks.cruz@testmail.co.in',1,NULL,'ks.cruz@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(169,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'daz.betty57@lol.org','daz.betty57@lol.org',NULL,NULL,NULL,NULL,NULL,'Both','3256939874',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear daz.betty57@lol.org',1,NULL,'Dear daz.betty57@lol.org',1,NULL,'daz.betty57@lol.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(170,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'jensen.kiara@testmail.org','jensen.kiara@testmail.org',NULL,NULL,NULL,NULL,NULL,'Both','3476526601',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear jensen.kiara@testmail.org',1,NULL,'Dear jensen.kiara@testmail.org',1,NULL,'jensen.kiara@testmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,'Martin Luther King Advocacy Fellowship',NULL,NULL,128,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(171,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Jacobs-Jameson family','Jacobs-Jameson family',NULL,NULL,NULL,NULL,NULL,'Both','2511058201',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jacobs-Jameson family',5,NULL,'Dear Jacobs-Jameson family',2,NULL,'Jacobs-Jameson family',NULL,NULL,NULL,0,NULL,'Jacobs-Jameson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(172,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Müller, Andrew','Andrew Müller',NULL,NULL,NULL,'
4
',NULL,'Both','1251065595',NULL,'Sample Data','Andrew','','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Andrew Müller',NULL,NULL,NULL,0,NULL,NULL,NULL,'Friends Wellness Partnership',NULL,NULL,37,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(173,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'cruz.ashlie@fishmail.org','cruz.ashlie@fishmail.org',NULL,NULL,NULL,NULL,NULL,'Both','1501266967',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear cruz.ashlie@fishmail.org',1,NULL,'Dear cruz.ashlie@fishmail.org',1,NULL,'cruz.ashlie@fishmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(174,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Princess','Mrs. Princess Barkley',NULL,NULL,NULL,'
2
',NULL,'Both','1098730680',NULL,'Sample Data','Princess','','Barkley',1,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Mrs. Princess Barkley',NULL,1,'1981-07-24',0,NULL,NULL,NULL,'Arizona Arts Trust',NULL,NULL,84,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(175,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'rodrigow16@airmail.biz','rodrigow16@airmail.biz',NULL,NULL,NULL,'
5
',NULL,'Both','2418346217',NULL,'Sample Data',NULL,NULL,NULL,3,NULL,NULL,NULL,1,NULL,'Dear rodrigow16@airmail.biz',1,NULL,'Dear rodrigow16@airmail.biz',1,NULL,'rodrigow16@airmail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(176,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Elina','Ms. Elina Terry',NULL,NULL,NULL,'
4
',NULL,'Both','2453833535',NULL,'Sample Data','Elina','','Terry',2,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Ms. Elina Terry',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(177,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Eleonor','Ms. Eleonor Bachman',NULL,NULL,NULL,NULL,NULL,'Both','711175679',NULL,'Sample Data','Eleonor','','Bachman',2,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Ms. Eleonor Bachman',NULL,NULL,'1954-11-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(178,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Deforest-Nielsen family','Deforest-Nielsen family',NULL,NULL,NULL,NULL,NULL,'Both','51479494',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest-Nielsen family',5,NULL,'Dear Deforest-Nielsen family',2,NULL,'Deforest-Nielsen family',NULL,NULL,NULL,0,NULL,'Deforest-Nielsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(179,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz, Norris','Mr. Norris Cruz II',NULL,NULL,NULL,'
3
',NULL,'Both','1269804686',NULL,'Sample Data','Norris','W','Cruz',3,3,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Cruz II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(180,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jacobs, Kathlyn','Dr. Kathlyn Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','1747055746',NULL,'Sample Data','Kathlyn','L','Jacobs',4,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Dr. Kathlyn Jacobs',NULL,1,'1967-03-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(181,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jones, Jacob','Mr. Jacob Jones Sr.',NULL,NULL,NULL,'
4
',NULL,'Both','210245998',NULL,'Sample Data','Jacob','','Jones',3,2,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Mr. Jacob Jones Sr.',NULL,2,'1985-04-12',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(182,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Parker family','Parker family',NULL,NULL,NULL,'
1
',NULL,'Both','425242179',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker family',5,NULL,'Dear Parker family',2,NULL,'Parker family',NULL,NULL,NULL,0,NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(183,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jones, Jina','Ms. Jina Jones',NULL,NULL,NULL,NULL,NULL,'Both','1835869309',NULL,'Sample Data','Jina','','Jones',2,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Ms. Jina Jones',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(184,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Deforest-Nielsen, Justina','Justina Deforest-Nielsen',NULL,NULL,NULL,NULL,NULL,'Both','3777045142',NULL,'Sample Data','Justina','','Deforest-Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Justina Deforest-Nielsen',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(185,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wagner, Billy','Mr. Billy Wagner III',NULL,NULL,NULL,NULL,NULL,'Both','1288341691',NULL,'Sample Data','Billy','','Wagner',3,4,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Mr. Billy Wagner III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(186,'Household',NULL,1,1,0,0,0,0,NULL,NULL,'Müller family','Müller family',NULL,NULL,NULL,NULL,NULL,'Both','1144797465',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Müller family',5,NULL,'Dear Müller family',2,NULL,'Müller family',NULL,NULL,NULL,0,NULL,'Müller family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(187,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Smith-Adams family','Smith-Adams family',NULL,NULL,NULL,NULL,NULL,'Both','2057336006',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Smith-Adams family',5,NULL,'Dear Smith-Adams family',2,NULL,'Smith-Adams family',NULL,NULL,NULL,0,NULL,'Smith-Adams family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(188,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Ray','Dr. Ray Grant II',NULL,NULL,NULL,NULL,NULL,'Both','2294694701',NULL,'Sample Data','Ray','G','Grant',4,3,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Dr. Ray Grant II',NULL,NULL,'1958-07-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(189,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jones, Brigette','Dr. Brigette Jones',NULL,NULL,NULL,NULL,NULL,'Both','1777842543',NULL,'Sample Data','Brigette','','Jones',4,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Dr. Brigette Jones',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(190,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Princess','Dr. Princess Ivanov',NULL,NULL,NULL,'
4
',NULL,'Both','3366449477',NULL,'Sample Data','Princess','','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Dr. Princess Ivanov',NULL,1,'1984-11-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(191,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'blackwell.elbert@sample.com','blackwell.elbert@sample.com',NULL,NULL,NULL,NULL,NULL,'Both','901779860',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear blackwell.elbert@sample.com',1,NULL,'Dear blackwell.elbert@sample.com',1,NULL,'blackwell.elbert@sample.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(192,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Brittney','Brittney Wilson',NULL,NULL,NULL,'
2
',NULL,'Both','1729401768',NULL,'Sample Data','Brittney','','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Brittney Wilson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(193,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Zope, Betty','Mrs. Betty Zope',NULL,NULL,NULL,NULL,NULL,'Both','2849696155',NULL,'Sample Data','Betty','H','Zope',1,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Mrs. Betty Zope',NULL,1,'1966-11-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(194,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Jones, Delana','Delana Jones',NULL,NULL,NULL,'
1
',NULL,'Both','1936969701',NULL,'Sample Data','Delana','F','Jones',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Jones',NULL,1,'1940-04-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(195,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts-Cruz, Kacey','Dr. Kacey Roberts-Cruz',NULL,NULL,NULL,'
1
',NULL,'Both','994235273',NULL,'Sample Data','Kacey','','Roberts-Cruz',4,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Dr. Kacey Roberts-Cruz',NULL,1,'1978-09-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(196,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'kq.jacobs-jameson@testmail.co.uk','kq.jacobs-jameson@testmail.co.uk',NULL,NULL,NULL,'
1
',NULL,'Both','1263031073',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear kq.jacobs-jameson@testmail.co.uk',1,NULL,'Dear kq.jacobs-jameson@testmail.co.uk',1,NULL,'kq.jacobs-jameson@testmail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(197,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Lee, Andrew','Andrew Lee II',NULL,NULL,NULL,NULL,NULL,'Both','542623852',NULL,'Sample Data','Andrew','','Lee',NULL,3,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Andrew Lee II',NULL,NULL,'1987-07-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(198,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Rosario','Mr. Rosario Samuels',NULL,NULL,NULL,NULL,NULL,'Both','1319564481',NULL,'Sample Data','Rosario','V','Samuels',3,NULL,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Mr. Rosario Samuels',NULL,2,'1945-01-11',0,NULL,NULL,NULL,'Hadley Empowerment Center',NULL,NULL,121,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(199,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Claudio','Claudio Müller Jr.',NULL,NULL,NULL,'
4
',NULL,'Both','2143910765',NULL,'Sample Data','Claudio','C','Müller',NULL,1,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Claudio Müller Jr.',NULL,NULL,'1942-01-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(200,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Lincoln','Mr. Lincoln Müller Jr.',NULL,NULL,NULL,NULL,NULL,'Both','676015767',NULL,'Sample Data','Lincoln','','Müller',3,1,NULL,NULL,1,NULL,'Dear Lincoln',1,NULL,'Dear Lincoln',1,NULL,'Mr. Lincoln Müller Jr.',NULL,2,'1961-05-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(201,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Cruz, Tanya','Mrs. Tanya Cruz',NULL,NULL,NULL,NULL,NULL,'Both','2525776525',NULL,'Sample Data','Tanya','J','Cruz',1,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Mrs. Tanya Cruz',NULL,1,'1955-02-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31');
 /*!40000 ALTER TABLE `civicrm_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -228,7 +228,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_contribution` WRITE;
 /*!40000 ALTER TABLE `civicrm_contribution` DISABLE KEYS */;
-INSERT INTO `civicrm_contribution` (`id`, `contact_id`, `financial_type_id`, `contribution_page_id`, `payment_instrument_id`, `receive_date`, `non_deductible_amount`, `total_amount`, `fee_amount`, `net_amount`, `trxn_id`, `invoice_id`, `invoice_number`, `currency`, `cancel_date`, `cancel_reason`, `receipt_date`, `thankyou_date`, `source`, `amount_level`, `contribution_recur_id`, `is_test`, `is_pay_later`, `contribution_status_id`, `address_id`, `check_number`, `campaign_id`, `creditnote_id`, `tax_amount`, `revenue_recognition_date`, `is_template`) VALUES (1,2,1,NULL,4,'2010-04-11 00:00:00',0.00,125.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'1041',NULL,NULL,NULL,NULL,0),(2,4,1,NULL,1,'2010-03-21 00:00:00',0.00,50.00,NULL,NULL,'P20901X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,6,1,NULL,4,'2010-04-29 00:00:00',0.00,25.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'2095',NULL,NULL,NULL,NULL,0),(4,8,1,NULL,4,'2010-04-11 00:00:00',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'10552',NULL,NULL,NULL,NULL,0),(5,16,1,NULL,4,'2010-04-15 00:00:00',0.00,500.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'509',NULL,NULL,NULL,NULL,0),(6,19,1,NULL,4,'2010-04-11 00:00:00',0.00,175.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'102',NULL,NULL,NULL,NULL,0),(7,82,1,NULL,1,'2010-03-27 00:00:00',0.00,50.00,NULL,NULL,'P20193L2',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(8,92,1,NULL,1,'2010-03-08 00:00:00',0.00,10.00,NULL,NULL,'P40232Y3',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(9,34,1,NULL,1,'2010-04-22 00:00:00',0.00,250.00,NULL,NULL,'P20193L6',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(10,71,1,NULL,1,'2009-07-01 11:53:50',0.00,500.00,NULL,NULL,'PL71',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(11,43,1,NULL,1,'2009-07-01 12:55:41',0.00,200.00,NULL,NULL,'PL43II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(12,32,1,NULL,1,'2009-10-01 11:53:50',0.00,200.00,NULL,NULL,'PL32I',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(13,32,1,NULL,1,'2009-12-01 12:55:41',0.00,200.00,NULL,NULL,'PL32II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(14,103,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(15,179,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(16,12,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(17,173,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(18,127,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(19,63,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(20,188,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(21,80,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(22,131,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(23,161,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(24,41,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(25,20,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(26,195,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(27,164,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(28,78,2,NULL,1,'2020-07-24 15:34:04',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(29,132,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(30,5,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(31,108,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(32,39,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(33,159,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(34,67,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(35,17,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(36,7,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(37,95,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(38,134,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(39,74,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(40,13,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(41,156,2,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(42,145,2,NULL,1,'2020-07-24 15:34:04',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(43,99,2,NULL,1,'2020-07-24 15:34:04',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(45,5,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(46,6,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(47,8,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(48,18,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(49,19,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(50,21,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(51,23,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(52,24,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(53,30,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(54,31,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(55,41,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(56,44,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(57,49,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(58,54,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(59,56,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(60,57,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(61,60,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(62,68,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(63,70,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(64,73,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(65,90,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(66,94,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(67,95,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(68,98,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(69,99,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(70,102,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(71,103,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(72,105,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(73,106,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(74,109,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(75,110,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(76,111,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(77,114,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(78,120,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(79,129,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(80,130,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(81,133,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(82,140,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(83,155,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(84,162,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(85,165,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(86,167,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(87,170,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(88,172,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(89,175,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(90,180,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(91,194,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(92,195,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(93,196,4,NULL,1,'2020-07-24 15:34:04',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(94,200,4,NULL,1,'2020-07-24 15:34:04',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-07-24 15:34:04',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0);
+INSERT INTO `civicrm_contribution` (`id`, `contact_id`, `financial_type_id`, `contribution_page_id`, `payment_instrument_id`, `receive_date`, `non_deductible_amount`, `total_amount`, `fee_amount`, `net_amount`, `trxn_id`, `invoice_id`, `invoice_number`, `currency`, `cancel_date`, `cancel_reason`, `receipt_date`, `thankyou_date`, `source`, `amount_level`, `contribution_recur_id`, `is_test`, `is_pay_later`, `contribution_status_id`, `address_id`, `check_number`, `campaign_id`, `creditnote_id`, `tax_amount`, `revenue_recognition_date`, `is_template`) VALUES (1,2,1,NULL,4,'2010-04-11 00:00:00',0.00,125.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'1041',NULL,NULL,NULL,NULL,0),(2,4,1,NULL,1,'2010-03-21 00:00:00',0.00,50.00,NULL,NULL,'P20901X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,6,1,NULL,4,'2010-04-29 00:00:00',0.00,25.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'2095',NULL,NULL,NULL,NULL,0),(4,8,1,NULL,4,'2010-04-11 00:00:00',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'10552',NULL,NULL,NULL,NULL,0),(5,16,1,NULL,4,'2010-04-15 00:00:00',0.00,500.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'509',NULL,NULL,NULL,NULL,0),(6,19,1,NULL,4,'2010-04-11 00:00:00',0.00,175.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'102',NULL,NULL,NULL,NULL,0),(7,82,1,NULL,1,'2010-03-27 00:00:00',0.00,50.00,NULL,NULL,'P20193L2',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(8,92,1,NULL,1,'2010-03-08 00:00:00',0.00,10.00,NULL,NULL,'P40232Y3',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(9,34,1,NULL,1,'2010-04-22 00:00:00',0.00,250.00,NULL,NULL,'P20193L6',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(10,71,1,NULL,1,'2009-07-01 11:53:50',0.00,500.00,NULL,NULL,'PL71',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(11,43,1,NULL,1,'2009-07-01 12:55:41',0.00,200.00,NULL,NULL,'PL43II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(12,32,1,NULL,1,'2009-10-01 11:53:50',0.00,200.00,NULL,NULL,'PL32I',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(13,32,1,NULL,1,'2009-12-01 12:55:41',0.00,200.00,NULL,NULL,'PL32II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(14,73,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(15,92,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(16,48,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(17,51,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(18,163,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(19,40,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(20,190,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(21,33,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(22,175,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(23,103,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(24,194,2,NULL,1,'2020-09-16 13:29:32',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(25,56,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(26,120,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(27,105,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(28,184,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(29,177,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(30,153,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(31,106,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(32,13,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(33,64,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(34,200,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(35,142,2,NULL,1,'2020-09-16 13:29:32',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(36,111,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(37,132,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(38,141,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(39,3,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(40,86,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(41,168,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(42,16,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(43,68,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(45,7,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(46,8,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(47,11,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(48,13,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(49,21,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(50,26,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(51,27,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(52,46,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(53,48,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(54,50,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(55,52,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(56,53,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(57,60,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(58,67,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(59,76,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(60,77,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(61,78,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(62,79,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(63,80,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(64,82,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(65,84,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(66,85,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(67,94,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(68,95,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(69,101,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(70,103,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(71,111,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(72,114,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(73,115,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(74,128,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(75,129,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(76,135,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(77,137,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(78,140,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(79,146,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(80,147,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(81,153,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(82,155,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(83,157,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(84,160,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(85,161,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(86,167,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(87,169,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(88,172,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(89,181,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(90,187,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(91,188,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(92,191,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(93,193,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(94,196,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0);
 /*!40000 ALTER TABLE `civicrm_contribution` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -266,7 +266,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_contribution_soft` WRITE;
 /*!40000 ALTER TABLE `civicrm_contribution_soft` DISABLE KEYS */;
-INSERT INTO `civicrm_contribution_soft` (`id`, `contribution_id`, `contact_id`, `amount`, `currency`, `pcp_id`, `pcp_display_in_roll`, `pcp_roll_nickname`, `pcp_personal_note`, `soft_credit_type_id`) VALUES (1,8,57,10.00,'USD',1,1,'Jones Family','Helping Hands',10),(2,9,57,250.00,'USD',1,1,'Annie and the kids','Annie Helps',10);
+INSERT INTO `civicrm_contribution_soft` (`id`, `contribution_id`, `contact_id`, `amount`, `currency`, `pcp_id`, `pcp_display_in_roll`, `pcp_roll_nickname`, `pcp_personal_note`, `soft_credit_type_id`) VALUES (1,8,117,10.00,'USD',1,1,'Jones Family','Helping Hands',10),(2,9,117,250.00,'USD',1,1,'Annie and the kids','Annie Helps',10);
 /*!40000 ALTER TABLE `civicrm_contribution_soft` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -409,7 +409,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_email` WRITE;
 /*!40000 ALTER TABLE `civicrm_email` DISABLE KEYS */;
-INSERT INTO `civicrm_email` (`id`, `contact_id`, `location_type_id`, `email`, `is_primary`, `is_billing`, `on_hold`, `is_bulkmail`, `hold_date`, `reset_date`, `signature_text`, `signature_html`) VALUES (1,1,1,'fixme.domainemail@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(2,24,1,'jacobt@fakemail.info',1,0,0,0,NULL,NULL,NULL,NULL),(3,124,1,'allenlee47@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),(4,124,1,'allenlee@airmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),(5,17,1,'bb.samson59@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(6,182,1,'mllerj@sample.com',1,0,0,0,NULL,NULL,NULL,NULL),(7,182,1,'js.mller@spamalot.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(8,99,1,'terrye@infomail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(9,81,1,'ivanov.maria@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(10,81,1,'mariai@testing.com',0,0,0,0,NULL,NULL,NULL,NULL),(11,53,1,'wattsont@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),(12,53,1,'twattson@fakemail.com',0,0,0,0,NULL,NULL,NULL,NULL),(13,15,1,'adams.merrie@notmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(14,179,1,'samuels.c.carylon19@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),(15,83,1,'coopern43@sample.info',1,0,0,0,NULL,NULL,NULL,NULL),(16,83,1,'norrisc@example.info',0,0,0,0,NULL,NULL,NULL,NULL),(17,164,1,'samuels.a.brittney@sample.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(18,146,1,'jacobs.f.jay51@notmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(19,120,1,'patelm@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(20,193,1,'allanjameson35@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(21,76,1,'shado27@testmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(22,162,1,'bernadetteb@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(23,162,1,'bernadetteblackwell98@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(24,92,1,'allenm@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(25,65,1,'jedparker85@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),(26,190,1,'barkley.carylon21@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),(27,184,1,'ivanov.kiara71@testmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(28,67,1,'chowski.juliann@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),(29,67,1,'juliann@testing.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(30,185,1,'mller.scott40@airmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(31,175,1,'kx.dimitrov1@mymail.org',1,0,0,0,NULL,NULL,NULL,NULL),(32,129,1,'vprentice@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(33,129,1,'vprentice@example.info',0,0,0,0,NULL,NULL,NULL,NULL),(34,197,1,'yadav.elina7@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(35,197,1,'elinay@testing.net',0,0,0,0,NULL,NULL,NULL,NULL),(36,122,1,'rebekaho@spamalot.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(37,7,1,'patel.erik@testing.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(38,154,1,'patel.k.irvin@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(39,154,1,'irvinpatel59@airmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(40,51,1,'spatel67@lol.net',1,0,0,0,NULL,NULL,NULL,NULL),(41,111,1,'robertson.elizabeth@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(42,111,1,'erobertson47@testmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(43,143,1,'bernadettewattson@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(44,143,1,'wattson.bernadette@fishmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(45,77,1,'jameson.elbert@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(46,77,1,'elbertjameson47@lol.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(47,8,1,'ashleyreynolds99@sample.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(48,8,1,'ashleyr@fishmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(49,84,1,'bachmanl95@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),(50,123,1,'lee.jed@lol.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(51,119,1,'terrell.santina@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),(52,119,1,'santinaterrell@example.com',0,0,0,0,NULL,NULL,NULL,NULL),(53,60,1,'wilson.maxwell@lol.info',1,0,0,0,NULL,NULL,NULL,NULL),(54,88,1,'elizabeths@testmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(55,41,1,'barkley.brittney@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(56,156,1,'damariss@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(57,118,1,'mp.prentice@airmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(58,118,1,'prentice.maria86@spamalot.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(59,49,1,'fjones12@testing.com',1,0,0,0,NULL,NULL,NULL,NULL),(60,23,1,'rp.wattson@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(61,5,1,'wilson.troy87@example.net',1,0,0,0,NULL,NULL,NULL,NULL),(62,93,1,'darenc@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),(63,93,1,'cruz.daren@testing.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(64,18,1,'cruz.russell41@fishmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(65,176,1,'shermand10@notmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(66,132,1,'parker.shad@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(67,132,1,'shadp57@testing.com',0,0,0,0,NULL,NULL,NULL,NULL),(68,45,1,'teresawilson92@example.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(69,44,1,'ef.cooper@notmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(70,96,1,'elbertt@testing.com',1,0,0,0,NULL,NULL,NULL,NULL),(71,96,1,'elbertt@sample.info',0,0,0,0,NULL,NULL,NULL,NULL),(72,166,1,'jinazope@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(73,166,1,'jk.zope21@sample.info',0,0,0,0,NULL,NULL,NULL,NULL),(74,16,1,'yadav.s.elbert@airmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(75,139,1,'parkerk91@fakemail.info',1,0,0,0,NULL,NULL,NULL,NULL),(76,125,1,'nielsen.ashlie@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(77,159,1,'mller.billy29@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(78,102,1,'rbachman-mller15@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(79,126,1,'shadm98@testing.net',1,0,0,0,NULL,NULL,NULL,NULL),(80,126,1,'shadmller@testing.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(81,9,1,'tanyamller@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(82,198,1,'parker.rolando@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(83,149,1,'dgrant@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(84,40,1,'parker-grant.barry@spamalot.biz',1,0,0,0,NULL,NULL,NULL,NULL),(85,85,1,'fu.parker-grant@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(86,192,1,'lawerenceb@testmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(87,192,1,'lbarkley69@sample.net',0,0,0,0,NULL,NULL,NULL,NULL),(88,134,1,'barkley.kenny92@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(89,134,1,'barkley.kenny@testing.biz',0,0,0,0,NULL,NULL,NULL,NULL),(90,113,1,'tw.parker@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(91,59,1,'mcreynolds-parkerw84@example.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(92,110,1,'mcreynolds-parker.norris@spamalot.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(93,147,1,'prentice.herminia@example.net',1,0,0,0,NULL,NULL,NULL,NULL),(94,82,1,'wagnert@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(95,82,1,'trumanwagner@testmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(96,196,1,'kandacewagner62@fakemail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(97,196,1,'kz.wagner@airmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(98,94,1,'angelikaw@testmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(99,195,1,'jameson.p.kenny@infomail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(100,195,1,'kennyjameson3@fishmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(101,173,1,'bjameson@spamalot.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(102,133,1,'jamesonj8@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(103,133,1,'jamesonj@infomail.info',0,0,0,0,NULL,NULL,NULL,NULL),(104,112,1,'samuels.i.nicole4@airmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(105,152,1,'rays@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(106,152,1,'samuels.ray@fakemail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(107,61,1,'meis62@fakemail.info',1,0,0,0,NULL,NULL,NULL,NULL),(108,54,1,'carylonblackwell-dimitrov@testing.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(109,54,1,'carylonblackwell-dimitrov@mymail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(110,155,1,'dimitrovr@spamalot.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(111,155,1,'rodrigod11@sample.org',0,0,0,0,NULL,NULL,NULL,NULL),(112,29,1,'dimitrov.o.miguel@fishmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(113,29,1,'migueldimitrov35@airmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(114,103,1,'winfordj26@notmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(115,103,1,'wy.jones@testing.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(116,201,1,'parker-jones.iris54@example.info',1,0,0,0,NULL,NULL,NULL,NULL),(117,201,1,'irisp@notmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(118,63,1,'estajones@spamalot.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(119,95,1,'kathlynjones@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(120,95,1,'jones.kathlyn3@mymail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(121,107,1,'samson.truman@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),(122,107,1,'samson.truman@testmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(123,68,1,'samson.delana@fishmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(124,114,1,'lincolns72@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(125,70,1,'samson.lincoln@spamalot.org',1,0,0,0,NULL,NULL,NULL,NULL),(126,70,1,'lsamson18@airmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(127,130,1,'justinamller@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(128,140,1,'ashliemller@airmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(129,48,1,'parker.betty35@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),(130,78,1,'aj.prentice-parker@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),(131,78,1,'prentice-parker.j.ashley@mymail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(132,20,1,'reynoldsi@airmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(133,20,1,'iveyr@infomail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(134,13,1,'russellreynolds35@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(135,13,1,'russellr2@airmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(136,194,1,'landonterrell60@mymail.com',1,0,0,0,NULL,NULL,NULL,NULL),(137,194,1,'terrelll23@airmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(138,131,1,'dimitrov.bernadette@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),(139,89,1,'terrell-dimitrov.miguel@notmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(140,75,1,'lashawndat70@lol.com',1,0,0,0,NULL,NULL,NULL,NULL),(141,75,1,'terrell-dimitrovl@lol.com',0,0,0,0,NULL,NULL,NULL,NULL),(142,121,1,'blackwell.brent@spamalot.biz',1,0,0,0,NULL,NULL,NULL,NULL),(143,189,1,'margaretjameson65@spamalot.org',1,0,0,0,NULL,NULL,NULL,NULL),(144,189,1,'jameson.margaret@infomail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(145,36,1,'meijameson@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),(146,26,1,'eleonorjameson@mymail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(147,26,1,'et.jameson52@sample.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(148,171,1,'tobyg37@airmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(149,171,1,'gonzlez.toby35@sample.net',0,0,0,0,NULL,NULL,NULL,NULL),(150,200,1,'blackwell-gonzlez.felisha@fakemail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(151,200,1,'felishab98@spamalot.com',0,0,0,0,NULL,NULL,NULL,NULL),(152,69,1,'allengonzlez70@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(153,69,1,'gonzlez.allen60@testing.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(154,180,1,'deforest-coopere@infomail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(155,180,1,'ee.deforest-cooper@fakemail.info',0,0,0,0,NULL,NULL,NULL,NULL),(156,4,1,'teddydeforest-cooper@airmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(157,174,3,'info@northpointdevelopmentschool.org',1,0,0,0,NULL,NULL,NULL,NULL),(158,185,2,'@northpointdevelopmentschool.org',0,0,0,0,NULL,NULL,NULL,NULL),(159,105,3,'info@urbanculture.org',1,0,0,0,NULL,NULL,NULL,NULL),(160,151,2,'billyp74@urbanculture.org',1,0,0,0,NULL,NULL,NULL,NULL),(161,144,3,'service@globalempowerment.org',1,0,0,0,NULL,NULL,NULL,NULL),(162,18,2,'russellcruz@globalempowerment.org',0,0,0,0,NULL,NULL,NULL,NULL),(163,148,3,'info@dallaspartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(164,104,2,'blackwell.scott15@dallaspartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(165,90,3,'service@rebeccafellowship.org',1,0,0,0,NULL,NULL,NULL,NULL),(166,86,3,'sales@beechdevelopmenttrust.org',1,0,0,0,NULL,NULL,NULL,NULL),(167,197,2,'eyadav83@beechdevelopmenttrust.org',0,0,0,0,NULL,NULL,NULL,NULL),(168,56,3,'service@kentuckyinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(169,189,2,'jamesonm@kentuckyinitiative.org',0,0,0,0,NULL,NULL,NULL,NULL),(170,137,3,'info@aptossustainability.org',1,0,0,0,NULL,NULL,NULL,NULL),(171,34,2,'carlosm4@aptossustainability.org',1,0,0,0,NULL,NULL,NULL,NULL),(172,14,3,'feedback@bltechnologyfund.org',1,0,0,0,NULL,NULL,NULL,NULL),(173,26,2,'81@bltechnologyfund.org',0,0,0,0,NULL,NULL,NULL,NULL),(174,178,3,'sales@sierrasoftwaresolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),(175,186,2,'robertsj87@sierrasoftwaresolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),(176,117,3,'feedback@maincollective.org',1,0,0,0,NULL,NULL,NULL,NULL),(177,85,2,'fu.parker-grant@maincollective.org',0,0,0,0,NULL,NULL,NULL,NULL),(178,157,3,'contact@moxahaladevelopmentalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),(179,57,2,'rolandonielsen@moxahaladevelopmentalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),(180,91,3,'contact@greenpoetry.org',1,0,0,0,NULL,NULL,NULL,NULL),(181,120,2,'meganpatel@greenpoetry.org',0,0,0,0,NULL,NULL,NULL,NULL),(182,79,3,'sales@ogdensburgpoetry.org',1,0,0,0,NULL,NULL,NULL,NULL),(183,37,3,'contact@urbanactionschool.org',1,0,0,0,NULL,NULL,NULL,NULL),(184,36,2,'.28@urbanactionschool.org',0,0,0,0,NULL,NULL,NULL,NULL),(185,46,3,'sales@greeninitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(186,20,2,'11@greeninitiative.org',0,0,0,0,NULL,NULL,NULL,NULL),(187,50,3,'contact@collegehealthassociation.org',1,0,0,0,NULL,NULL,NULL,NULL),(188,89,2,'miguelterrell-dimitrov@collegehealthassociation.org',0,0,0,0,NULL,NULL,NULL,NULL),(189,NULL,1,'development@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(190,NULL,1,'tournaments@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(191,NULL,1,'celebration@example.org',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_email` (`id`, `contact_id`, `location_type_id`, `email`, `is_primary`, `is_billing`, `on_hold`, `is_bulkmail`, `hold_date`, `reset_date`, `signature_text`, `signature_html`) VALUES (1,1,1,'fixme.domainemail@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(2,94,1,'kiaras@sample.net',1,0,0,0,NULL,NULL,NULL,NULL),(3,145,1,'lawerenced@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),(4,145,1,'lawerenced60@fishmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(5,194,1,'jones.delana30@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),(6,103,1,'mcreynolds.angelika55@fakemail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(7,54,1,'nielsenj25@notmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(8,185,1,'bwagner51@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(9,130,1,'andrewrobertson@mymail.com',1,0,0,0,NULL,NULL,NULL,NULL),(10,102,1,'teddyrobertson@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(11,102,1,'teddyr@lol.info',0,0,0,0,NULL,NULL,NULL,NULL),(12,122,1,'migueld@notmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(13,65,1,'jacobs.o.sonny27@infomail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(14,65,1,'jacobs.sonny@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(15,86,1,'craigadams41@airmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(16,142,1,'eo.daz34@sample.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(17,142,1,'eo.daz@fakemail.org',0,0,0,0,NULL,NULL,NULL,NULL),(18,70,1,'iveyadams@notmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(19,70,1,'adams.ivey22@fishmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(20,141,1,'lg.blackwell66@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(21,126,1,'lw.jones@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),(22,126,1,'jones.w.lashawnda@fakemail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(23,39,1,'daz.z.margaret@notmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(24,39,1,'margaretdaz51@sample.biz',0,0,0,0,NULL,NULL,NULL,NULL),(25,110,1,'blackwell.rosario@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(26,170,1,'kiarajensen@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(27,170,1,'jensen.kiara@testmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(28,169,1,'daz.betty57@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(29,200,1,'lincolnm@spamalot.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(30,23,1,'mariazope1@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(31,91,1,'landonr@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(32,91,1,'landonroberts@airmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(33,92,1,'cruzb26@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(34,150,1,'kj.mller60@infomail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(35,150,1,'kiaram30@testmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(36,43,1,'mcreynolds.damaris@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(37,198,1,'samuelsr@fishmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(38,17,1,'shaunablackwell22@fishmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(39,179,1,'cruz.norris88@airmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(40,197,1,'alee53@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),(41,88,1,'sadams17@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(42,88,1,'scotta@example.com',0,0,0,0,NULL,NULL,NULL,NULL),(43,21,1,'norrissamson@sample.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(44,59,1,'rebekahr@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(45,118,1,'barkley.princess31@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(46,111,1,'valenel@fakemail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(47,111,1,'lee.valene@sample.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(48,19,1,'jacobsj@example.info',1,0,0,0,NULL,NULL,NULL,NULL),(49,180,1,'jacobs.kathlyn11@example.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(50,132,1,'olsenb@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(51,191,1,'blackwell.elbert9@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(52,191,1,'blackwell.elbert@sample.com',0,0,0,0,NULL,NULL,NULL,NULL),(53,157,1,'chowski.russell98@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(54,157,1,'russellchowski17@example.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(55,46,1,'iveybachman11@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(56,81,1,'cnielsen81@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(57,129,1,'cooper.kandace@example.net',1,0,0,0,NULL,NULL,NULL,NULL),(58,129,1,'cooper.kandace@fishmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(59,109,1,'bachmana6@fishmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(60,52,1,'ashleyi21@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(61,52,1,'aivanov@lol.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(62,28,1,'wattsonb62@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(63,146,1,'wilsond@fishmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(64,107,1,'wattson.heidi@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(65,27,1,'mcreynolds.elina36@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),(66,47,1,'chowskib@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(67,47,1,'chowski.brittney@notmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(68,167,1,'zope.clint37@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),(69,167,1,'cb.zope@mymail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(70,106,1,'parkerk31@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(71,136,1,'irvinroberts19@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),(72,116,1,'billyb@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(73,116,1,'billyb@testmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(74,90,1,'samuels.kandace64@lol.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(75,90,1,'kandacesamuels40@airmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(76,72,1,'robertsb@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),(77,72,1,'bryonr@fishmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(78,89,1,'mller.eleonor99@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(79,22,1,'craigt@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(80,22,1,'craigterry@mymail.org',0,0,0,0,NULL,NULL,NULL,NULL),(81,67,1,'ashleyp@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(82,67,1,'ashleyp34@example.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(83,125,1,'parkert@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(84,125,1,'tparker23@lol.biz',0,0,0,0,NULL,NULL,NULL,NULL),(85,162,1,'omard36@mymail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(86,13,1,'nielsen.magan37@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(87,13,1,'mnielsen94@testmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(88,184,1,'jdeforest-nielsen62@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(89,196,1,'kq.jacobs-jameson@notmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(90,196,1,'kq.jacobs-jameson@testmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(91,24,1,'njacobs-jameson@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(92,93,1,'jgrant@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(93,93,1,'julianngrant@testing.org',0,0,0,0,NULL,NULL,NULL,NULL),(94,77,1,'grant.bernadette@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(95,77,1,'bgrant@sample.biz',0,0,0,0,NULL,NULL,NULL,NULL),(96,161,1,'grantn@fishmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(97,60,1,'ak.chowski@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(98,60,1,'andrewchowski96@lol.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(99,131,1,'bchowski80@example.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(100,74,1,'chowskib51@testing.com',1,0,0,0,NULL,NULL,NULL,NULL),(101,74,1,'chowski.a.beula@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(102,164,1,'juliannchowski@spamalot.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(103,147,1,'parker.a.troy@lol.info',1,0,0,0,NULL,NULL,NULL,NULL),(104,147,1,'parker.troy@testmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(105,173,1,'ashliecruz@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(106,173,1,'cruz.ashlie@fishmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(107,16,1,'parker-cruz.kiara34@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(108,29,1,'parker-cruzt@airmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(109,29,1,'parker-cruzt@spamalot.com',0,0,0,0,NULL,NULL,NULL,NULL),(110,50,1,'ivanove@fakemail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(111,50,1,'ivanov.elbert@fishmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(112,190,1,'ivanovp@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(113,113,1,'ko.ivanov5@testmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(114,113,1,'kaceyivanov@example.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(115,189,1,'brigettej96@fakemail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(116,174,1,'princessb@example.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(117,174,1,'barkley.princess@mymail.net',0,0,0,0,NULL,NULL,NULL,NULL),(118,82,1,'sonnylee-barkley@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),(119,82,1,'sonnyl@lol.net',0,0,0,0,NULL,NULL,NULL,NULL),(120,11,1,'olsen.brigette@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(121,11,1,'olsen.brigette@airmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(122,108,1,'kolsen73@spamalot.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(123,108,1,'kathlyno@sample.org',0,0,0,0,NULL,NULL,NULL,NULL),(124,96,1,'wattsone@mymail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(125,36,1,'wattson.bryon@notmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(126,36,1,'wattson.bryon@lol.com',0,0,0,0,NULL,NULL,NULL,NULL),(127,48,1,'josefasamson40@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),(128,168,1,'ks.cruz@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(129,4,1,'cruz.esta@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(130,4,1,'cruz.esta22@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(131,83,1,'mller.allan@infomail.com',1,0,0,0,NULL,NULL,NULL,NULL),(132,42,1,'shaunam24@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(133,63,1,'mller.elizabeth@fakemail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(134,63,1,'mller.elizabeth@example.info',0,0,0,0,NULL,NULL,NULL,NULL),(135,2,1,'mller.v.norris82@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(136,2,1,'norrismller@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(137,73,1,'brzczysaws@infomail.info',1,0,0,0,NULL,NULL,NULL,NULL),(138,165,1,'josefas83@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(139,139,1,'landonwilson@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(140,192,1,'bwilson47@example.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(141,175,1,'wilsonr@fishmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(142,175,1,'rodrigow16@airmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),(143,58,1,'rebekahb26@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(144,53,1,'bachman.laree9@notmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(145,53,1,'bachman.k.laree5@testmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(146,172,1,'mller.andrew54@sample.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(147,120,1,'irismller-grant@spamalot.org',1,0,0,0,NULL,NULL,NULL,NULL),(148,120,1,'irismller-grant66@testmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(149,124,1,'teddymller-grant@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(150,44,1,'wilsone@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(151,44,1,'wilsone@fakemail.org',0,0,0,0,NULL,NULL,NULL,NULL),(152,112,1,'shaunawilson25@infomail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(153,112,1,'shaunawilson87@testing.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(154,31,1,'brzczysaws@sample.info',1,0,0,0,NULL,NULL,NULL,NULL),(155,35,1,'cw.smith-adams57@fishmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(156,35,1,'smith-adams.w.carlos@notmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(157,69,3,'sales@starkvillepoetrynetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),(158,18,2,'samson.megan28@starkvillepoetrynetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),(159,66,3,'service@minnesotaculturepartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(160,156,2,'jinacruz56@minnesotaculturepartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(161,84,3,'service@arizonatrust.org',1,0,0,0,NULL,NULL,NULL,NULL),(162,174,2,'princessb@arizonatrust.org',0,0,0,0,NULL,NULL,NULL,NULL),(163,121,3,'contact@hadleyempowermentcenter.org',1,0,0,0,NULL,NULL,NULL,NULL),(164,198,2,'samuels.v.rosario@hadleyempowermentcenter.org',0,0,0,0,NULL,NULL,NULL,NULL),(165,9,3,'info@virginiacenter.org',1,0,0,0,NULL,NULL,NULL,NULL),(166,58,2,'rebekahb@virginiacenter.org',0,0,0,0,NULL,NULL,NULL,NULL),(167,8,3,'feedback@northpointartsinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(168,42,2,'mllers98@northpointartsinitiative.org',0,0,0,0,NULL,NULL,NULL,NULL),(169,155,3,'sales@oklahomaenvironmental.org',1,0,0,0,NULL,NULL,NULL,NULL),(170,129,2,'cooper.kandace22@oklahomaenvironmental.org',0,0,0,0,NULL,NULL,NULL,NULL),(171,101,3,'contact@louisianahealthfellowship.org',1,0,0,0,NULL,NULL,NULL,NULL),(172,20,3,'info@mcintyreschool.org',1,0,0,0,NULL,NULL,NULL,NULL),(173,73,2,'samsonb61@mcintyreschool.org',0,0,0,0,NULL,NULL,NULL,NULL),(174,114,3,'sales@communityhealth.org',1,0,0,0,NULL,NULL,NULL,NULL),(175,60,2,'.9@communityhealth.org',0,0,0,0,NULL,NULL,NULL,NULL),(176,134,3,'info@sdenvironmentalpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(177,100,2,'bobw@sdenvironmentalpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(178,10,3,'feedback@ruralpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(179,125,2,'parkert@ruralpartnership.org',0,0,0,0,NULL,NULL,NULL,NULL),(180,55,3,'service@svadvocacyalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),(181,77,2,'grant.bernadette41@svadvocacyalliance.org',0,0,0,0,NULL,NULL,NULL,NULL),(182,149,3,'service@maineducation.org',1,0,0,0,NULL,NULL,NULL,NULL),(183,29,2,'parker-cruzt@maineducation.org',0,0,0,0,NULL,NULL,NULL,NULL),(184,128,3,'service@mlkingadvocacy.org',1,0,0,0,NULL,NULL,NULL,NULL),(185,170,2,'.49@mlkingadvocacy.org',0,0,0,0,NULL,NULL,NULL,NULL),(186,NULL,1,'development@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(187,NULL,1,'tournaments@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(188,NULL,1,'celebration@example.org',0,0,0,0,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_email` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -447,7 +447,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_entity_financial_trxn` WRITE;
 /*!40000 ALTER TABLE `civicrm_entity_financial_trxn` DISABLE KEYS */;
-INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`, `financial_trxn_id`, `amount`) VALUES (1,'civicrm_contribution',1,1,125.00),(2,'civicrm_financial_item',1,1,125.00),(3,'civicrm_contribution',2,2,50.00),(4,'civicrm_financial_item',2,2,50.00),(5,'civicrm_contribution',3,3,25.00),(6,'civicrm_financial_item',3,3,25.00),(7,'civicrm_contribution',4,4,50.00),(8,'civicrm_financial_item',4,4,50.00),(9,'civicrm_contribution',5,5,500.00),(10,'civicrm_financial_item',5,5,500.00),(11,'civicrm_contribution',6,6,175.00),(12,'civicrm_financial_item',6,6,175.00),(13,'civicrm_contribution',7,7,50.00),(14,'civicrm_financial_item',7,7,50.00),(15,'civicrm_contribution',8,8,10.00),(16,'civicrm_financial_item',8,8,10.00),(17,'civicrm_contribution',9,9,250.00),(18,'civicrm_financial_item',9,9,250.00),(19,'civicrm_contribution',10,10,500.00),(20,'civicrm_financial_item',10,10,500.00),(21,'civicrm_contribution',11,11,200.00),(22,'civicrm_financial_item',11,11,200.00),(23,'civicrm_contribution',12,12,200.00),(24,'civicrm_financial_item',12,12,200.00),(25,'civicrm_contribution',13,13,200.00),(26,'civicrm_financial_item',13,13,200.00),(27,'civicrm_contribution',14,14,100.00),(28,'civicrm_financial_item',14,14,100.00),(29,'civicrm_contribution',15,15,100.00),(30,'civicrm_financial_item',15,15,100.00),(31,'civicrm_contribution',16,16,100.00),(32,'civicrm_financial_item',16,16,100.00),(33,'civicrm_contribution',17,17,100.00),(34,'civicrm_financial_item',17,17,100.00),(35,'civicrm_contribution',18,18,100.00),(36,'civicrm_financial_item',18,18,100.00),(37,'civicrm_contribution',19,19,100.00),(38,'civicrm_financial_item',19,19,100.00),(39,'civicrm_contribution',20,20,100.00),(40,'civicrm_financial_item',20,20,100.00),(41,'civicrm_contribution',21,21,100.00),(42,'civicrm_financial_item',21,21,100.00),(43,'civicrm_contribution',22,22,100.00),(44,'civicrm_financial_item',22,22,100.00),(45,'civicrm_contribution',23,23,100.00),(46,'civicrm_financial_item',23,23,100.00),(47,'civicrm_contribution',24,24,100.00),(48,'civicrm_financial_item',24,24,100.00),(49,'civicrm_contribution',25,25,100.00),(50,'civicrm_financial_item',25,25,100.00),(51,'civicrm_contribution',26,26,100.00),(52,'civicrm_financial_item',26,26,100.00),(53,'civicrm_contribution',27,27,100.00),(54,'civicrm_financial_item',27,27,100.00),(55,'civicrm_contribution',28,28,100.00),(56,'civicrm_financial_item',28,28,100.00),(57,'civicrm_contribution',29,29,50.00),(58,'civicrm_financial_item',29,29,50.00),(59,'civicrm_contribution',30,30,50.00),(60,'civicrm_financial_item',30,30,50.00),(61,'civicrm_contribution',31,31,50.00),(62,'civicrm_financial_item',31,31,50.00),(63,'civicrm_contribution',32,32,50.00),(64,'civicrm_financial_item',32,32,50.00),(65,'civicrm_contribution',33,33,50.00),(66,'civicrm_financial_item',33,33,50.00),(67,'civicrm_contribution',34,34,50.00),(68,'civicrm_financial_item',34,34,50.00),(69,'civicrm_contribution',35,35,50.00),(70,'civicrm_financial_item',35,35,50.00),(71,'civicrm_contribution',36,36,50.00),(72,'civicrm_financial_item',36,36,50.00),(73,'civicrm_contribution',37,37,50.00),(74,'civicrm_financial_item',37,37,50.00),(75,'civicrm_contribution',38,38,50.00),(76,'civicrm_financial_item',38,38,50.00),(77,'civicrm_contribution',39,39,50.00),(78,'civicrm_financial_item',39,39,50.00),(79,'civicrm_contribution',40,40,50.00),(80,'civicrm_financial_item',40,40,50.00),(81,'civicrm_contribution',41,41,50.00),(82,'civicrm_financial_item',41,41,50.00),(83,'civicrm_contribution',42,42,1200.00),(84,'civicrm_financial_item',42,42,1200.00),(85,'civicrm_contribution',43,43,1200.00),(86,'civicrm_financial_item',43,43,1200.00),(87,'civicrm_contribution',86,44,50.00),(88,'civicrm_financial_item',44,44,50.00),(89,'civicrm_contribution',64,45,50.00),(90,'civicrm_financial_item',45,45,50.00),(91,'civicrm_contribution',59,46,50.00),(92,'civicrm_financial_item',46,46,50.00),(93,'civicrm_contribution',81,47,50.00),(94,'civicrm_financial_item',47,47,50.00),(95,'civicrm_contribution',76,48,50.00),(96,'civicrm_financial_item',48,48,50.00),(97,'civicrm_contribution',92,49,50.00),(98,'civicrm_financial_item',49,49,50.00),(99,'civicrm_contribution',66,50,50.00),(100,'civicrm_financial_item',50,50,50.00),(101,'civicrm_contribution',70,51,50.00),(102,'civicrm_financial_item',51,51,50.00),(103,'civicrm_contribution',49,52,50.00),(104,'civicrm_financial_item',52,52,50.00),(105,'civicrm_contribution',77,53,50.00),(106,'civicrm_financial_item',53,53,50.00),(107,'civicrm_contribution',79,54,50.00),(108,'civicrm_financial_item',54,54,50.00),(109,'civicrm_contribution',78,55,50.00),(110,'civicrm_financial_item',55,55,50.00),(111,'civicrm_contribution',48,56,50.00),(112,'civicrm_financial_item',56,56,50.00),(113,'civicrm_contribution',93,57,50.00),(114,'civicrm_financial_item',57,57,50.00),(115,'civicrm_contribution',68,58,50.00),(116,'civicrm_financial_item',58,58,50.00),(117,'civicrm_contribution',72,59,50.00),(118,'civicrm_financial_item',59,59,50.00),(119,'civicrm_contribution',67,60,800.00),(120,'civicrm_financial_item',60,60,800.00),(121,'civicrm_contribution',83,61,800.00),(122,'civicrm_financial_item',61,61,800.00),(123,'civicrm_contribution',62,62,800.00),(124,'civicrm_financial_item',62,62,800.00),(125,'civicrm_contribution',54,63,800.00),(126,'civicrm_financial_item',63,63,800.00),(127,'civicrm_contribution',47,64,800.00),(128,'civicrm_financial_item',64,64,800.00),(129,'civicrm_contribution',84,65,800.00),(130,'civicrm_financial_item',65,65,800.00),(131,'civicrm_contribution',55,66,800.00),(132,'civicrm_financial_item',66,66,800.00),(133,'civicrm_contribution',52,67,800.00),(134,'civicrm_financial_item',67,67,800.00),(135,'civicrm_contribution',90,68,800.00),(136,'civicrm_financial_item',68,68,800.00),(137,'civicrm_contribution',89,69,800.00),(138,'civicrm_financial_item',69,69,800.00),(139,'civicrm_contribution',46,70,800.00),(140,'civicrm_financial_item',70,70,800.00),(141,'civicrm_contribution',61,71,800.00),(142,'civicrm_financial_item',71,71,800.00),(143,'civicrm_contribution',57,72,800.00),(144,'civicrm_financial_item',72,72,800.00),(145,'civicrm_contribution',94,73,800.00),(146,'civicrm_financial_item',73,73,800.00),(147,'civicrm_contribution',80,74,800.00),(148,'civicrm_financial_item',74,74,800.00),(149,'civicrm_contribution',63,75,800.00),(150,'civicrm_financial_item',75,75,800.00),(151,'civicrm_contribution',75,76,800.00),(152,'civicrm_financial_item',76,76,800.00),(153,'civicrm_contribution',73,77,800.00),(154,'civicrm_financial_item',77,77,800.00),(155,'civicrm_contribution',82,78,50.00),(156,'civicrm_financial_item',78,78,50.00),(157,'civicrm_contribution',71,79,50.00),(158,'civicrm_financial_item',79,79,50.00),(159,'civicrm_contribution',87,80,50.00),(160,'civicrm_financial_item',80,80,50.00),(161,'civicrm_contribution',88,81,50.00),(162,'civicrm_financial_item',81,81,50.00),(163,'civicrm_contribution',60,82,50.00),(164,'civicrm_financial_item',82,82,50.00),(165,'civicrm_contribution',74,83,50.00),(166,'civicrm_financial_item',83,83,50.00),(167,'civicrm_contribution',45,84,50.00),(168,'civicrm_financial_item',84,84,50.00),(169,'civicrm_contribution',58,85,50.00),(170,'civicrm_financial_item',85,85,50.00),(171,'civicrm_contribution',50,86,50.00),(172,'civicrm_financial_item',86,86,50.00),(173,'civicrm_contribution',53,87,50.00),(174,'civicrm_financial_item',87,87,50.00),(175,'civicrm_contribution',56,88,50.00),(176,'civicrm_financial_item',88,88,50.00),(177,'civicrm_contribution',85,89,50.00),(178,'civicrm_financial_item',89,89,50.00),(179,'civicrm_contribution',51,90,50.00),(180,'civicrm_financial_item',90,90,50.00),(181,'civicrm_contribution',69,91,50.00),(182,'civicrm_financial_item',91,91,50.00),(183,'civicrm_contribution',65,92,50.00),(184,'civicrm_financial_item',92,92,50.00),(185,'civicrm_contribution',91,93,50.00),(186,'civicrm_financial_item',93,93,50.00);
+INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`, `financial_trxn_id`, `amount`) VALUES (1,'civicrm_contribution',1,1,125.00),(2,'civicrm_financial_item',1,1,125.00),(3,'civicrm_contribution',2,2,50.00),(4,'civicrm_financial_item',2,2,50.00),(5,'civicrm_contribution',3,3,25.00),(6,'civicrm_financial_item',3,3,25.00),(7,'civicrm_contribution',4,4,50.00),(8,'civicrm_financial_item',4,4,50.00),(9,'civicrm_contribution',5,5,500.00),(10,'civicrm_financial_item',5,5,500.00),(11,'civicrm_contribution',6,6,175.00),(12,'civicrm_financial_item',6,6,175.00),(13,'civicrm_contribution',7,7,50.00),(14,'civicrm_financial_item',7,7,50.00),(15,'civicrm_contribution',8,8,10.00),(16,'civicrm_financial_item',8,8,10.00),(17,'civicrm_contribution',9,9,250.00),(18,'civicrm_financial_item',9,9,250.00),(19,'civicrm_contribution',10,10,500.00),(20,'civicrm_financial_item',10,10,500.00),(21,'civicrm_contribution',11,11,200.00),(22,'civicrm_financial_item',11,11,200.00),(23,'civicrm_contribution',12,12,200.00),(24,'civicrm_financial_item',12,12,200.00),(25,'civicrm_contribution',13,13,200.00),(26,'civicrm_financial_item',13,13,200.00),(27,'civicrm_contribution',14,14,100.00),(28,'civicrm_financial_item',14,14,100.00),(29,'civicrm_contribution',15,15,50.00),(30,'civicrm_financial_item',15,15,50.00),(31,'civicrm_contribution',16,16,100.00),(32,'civicrm_financial_item',16,16,100.00),(33,'civicrm_contribution',17,17,50.00),(34,'civicrm_financial_item',17,17,50.00),(35,'civicrm_contribution',18,18,50.00),(36,'civicrm_financial_item',18,18,50.00),(37,'civicrm_contribution',19,19,50.00),(38,'civicrm_financial_item',19,19,50.00),(39,'civicrm_contribution',20,20,100.00),(40,'civicrm_financial_item',20,20,100.00),(41,'civicrm_contribution',21,21,50.00),(42,'civicrm_financial_item',21,21,50.00),(43,'civicrm_contribution',22,22,100.00),(44,'civicrm_financial_item',22,22,100.00),(45,'civicrm_contribution',23,23,50.00),(46,'civicrm_financial_item',23,23,50.00),(47,'civicrm_contribution',24,24,1200.00),(48,'civicrm_financial_item',24,24,1200.00),(49,'civicrm_contribution',25,25,50.00),(50,'civicrm_financial_item',25,25,50.00),(51,'civicrm_contribution',26,26,100.00),(52,'civicrm_financial_item',26,26,100.00),(53,'civicrm_contribution',27,27,50.00),(54,'civicrm_financial_item',27,27,50.00),(55,'civicrm_contribution',28,28,50.00),(56,'civicrm_financial_item',28,28,50.00),(57,'civicrm_contribution',29,29,50.00),(58,'civicrm_financial_item',29,29,50.00),(59,'civicrm_contribution',30,30,100.00),(60,'civicrm_financial_item',30,30,100.00),(61,'civicrm_contribution',31,31,50.00),(62,'civicrm_financial_item',31,31,50.00),(63,'civicrm_contribution',32,32,100.00),(64,'civicrm_financial_item',32,32,100.00),(65,'civicrm_contribution',33,33,50.00),(66,'civicrm_financial_item',33,33,50.00),(67,'civicrm_contribution',34,34,100.00),(68,'civicrm_financial_item',34,34,100.00),(69,'civicrm_contribution',35,35,1200.00),(70,'civicrm_financial_item',35,35,1200.00),(71,'civicrm_contribution',36,36,100.00),(72,'civicrm_financial_item',36,36,100.00),(73,'civicrm_contribution',37,37,50.00),(74,'civicrm_financial_item',37,37,50.00),(75,'civicrm_contribution',38,38,100.00),(76,'civicrm_financial_item',38,38,100.00),(77,'civicrm_contribution',39,39,50.00),(78,'civicrm_financial_item',39,39,50.00),(79,'civicrm_contribution',40,40,100.00),(80,'civicrm_financial_item',40,40,100.00),(81,'civicrm_contribution',41,41,50.00),(82,'civicrm_financial_item',41,41,50.00),(83,'civicrm_contribution',42,42,100.00),(84,'civicrm_financial_item',42,42,100.00),(85,'civicrm_contribution',43,43,50.00),(86,'civicrm_financial_item',43,43,50.00),(87,'civicrm_contribution',83,44,50.00),(88,'civicrm_financial_item',44,44,50.00),(89,'civicrm_contribution',73,45,50.00),(90,'civicrm_financial_item',45,45,50.00),(91,'civicrm_contribution',75,46,800.00),(92,'civicrm_financial_item',46,46,800.00),(93,'civicrm_contribution',67,47,50.00),(94,'civicrm_financial_item',47,47,50.00),(95,'civicrm_contribution',69,48,800.00),(96,'civicrm_financial_item',48,48,800.00),(97,'civicrm_contribution',60,49,50.00),(98,'civicrm_financial_item',49,49,50.00),(99,'civicrm_contribution',78,50,50.00),(100,'civicrm_financial_item',50,50,50.00),(101,'civicrm_contribution',91,51,800.00),(102,'civicrm_financial_item',51,51,800.00),(103,'civicrm_contribution',76,52,50.00),(104,'civicrm_financial_item',52,52,50.00),(105,'civicrm_contribution',52,53,800.00),(106,'civicrm_financial_item',53,53,800.00),(107,'civicrm_contribution',57,54,50.00),(108,'civicrm_financial_item',54,54,50.00),(109,'civicrm_contribution',88,55,800.00),(110,'civicrm_financial_item',55,55,800.00),(111,'civicrm_contribution',54,56,50.00),(112,'civicrm_financial_item',56,56,50.00),(113,'civicrm_contribution',81,57,50.00),(114,'civicrm_financial_item',57,57,50.00),(115,'civicrm_contribution',68,58,50.00),(116,'civicrm_financial_item',58,58,50.00),(117,'civicrm_contribution',90,59,50.00),(118,'civicrm_financial_item',59,59,50.00),(119,'civicrm_contribution',77,60,50.00),(120,'civicrm_financial_item',60,60,50.00),(121,'civicrm_contribution',47,61,800.00),(122,'civicrm_financial_item',61,61,800.00),(123,'civicrm_contribution',74,62,50.00),(124,'civicrm_financial_item',62,62,50.00),(125,'civicrm_contribution',49,63,800.00),(126,'civicrm_financial_item',63,63,800.00),(127,'civicrm_contribution',72,64,50.00),(128,'civicrm_financial_item',64,64,50.00),(129,'civicrm_contribution',62,65,50.00),(130,'civicrm_financial_item',65,65,50.00),(131,'civicrm_contribution',79,66,50.00),(132,'civicrm_financial_item',66,66,50.00),(133,'civicrm_contribution',85,67,50.00),(134,'civicrm_financial_item',67,67,50.00),(135,'civicrm_contribution',89,68,50.00),(136,'civicrm_financial_item',68,68,50.00),(137,'civicrm_contribution',56,69,800.00),(138,'civicrm_financial_item',69,69,800.00),(139,'civicrm_contribution',50,70,800.00),(140,'civicrm_financial_item',70,70,800.00),(141,'civicrm_contribution',64,71,50.00),(142,'civicrm_financial_item',71,71,50.00),(143,'civicrm_contribution',94,72,50.00),(144,'civicrm_financial_item',72,72,50.00),(145,'civicrm_contribution',71,73,800.00),(146,'civicrm_financial_item',73,73,800.00),(147,'civicrm_contribution',86,74,800.00),(148,'civicrm_financial_item',74,74,800.00),(149,'civicrm_contribution',53,75,800.00),(150,'civicrm_financial_item',75,75,800.00),(151,'civicrm_contribution',92,76,50.00),(152,'civicrm_financial_item',76,76,50.00),(153,'civicrm_contribution',55,77,50.00),(154,'civicrm_financial_item',77,77,50.00),(155,'civicrm_contribution',46,78,800.00),(156,'civicrm_financial_item',78,78,800.00),(157,'civicrm_contribution',80,79,800.00),(158,'civicrm_financial_item',79,79,800.00),(159,'civicrm_contribution',93,80,50.00),(160,'civicrm_financial_item',80,80,50.00),(161,'civicrm_contribution',70,81,50.00),(162,'civicrm_financial_item',81,81,50.00),(163,'civicrm_contribution',87,82,800.00),(164,'civicrm_financial_item',82,82,800.00),(165,'civicrm_contribution',82,83,800.00),(166,'civicrm_financial_item',83,83,800.00),(167,'civicrm_contribution',59,84,50.00),(168,'civicrm_financial_item',84,84,50.00),(169,'civicrm_contribution',65,85,50.00),(170,'civicrm_financial_item',85,85,50.00),(171,'civicrm_contribution',61,86,50.00),(172,'civicrm_financial_item',86,86,50.00),(173,'civicrm_contribution',63,87,50.00),(174,'civicrm_financial_item',87,87,50.00),(175,'civicrm_contribution',84,88,50.00),(176,'civicrm_financial_item',88,88,50.00),(177,'civicrm_contribution',45,89,800.00),(178,'civicrm_financial_item',89,89,800.00),(179,'civicrm_contribution',58,90,800.00),(180,'civicrm_financial_item',90,90,800.00),(181,'civicrm_contribution',51,91,50.00),(182,'civicrm_financial_item',91,91,50.00),(183,'civicrm_contribution',66,92,50.00),(184,'civicrm_financial_item',92,92,50.00),(185,'civicrm_contribution',48,93,50.00),(186,'civicrm_financial_item',93,93,50.00);
 /*!40000 ALTER TABLE `civicrm_entity_financial_trxn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -457,7 +457,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_entity_tag` WRITE;
 /*!40000 ALTER TABLE `civicrm_entity_tag` DISABLE KEYS */;
-INSERT INTO `civicrm_entity_tag` (`id`, `entity_table`, `entity_id`, `tag_id`) VALUES (58,'civicrm_contact',6,4),(59,'civicrm_contact',6,5),(40,'civicrm_contact',8,5),(101,'civicrm_contact',10,5),(6,'civicrm_contact',14,3),(18,'civicrm_contact',15,4),(19,'civicrm_contact',15,5),(13,'civicrm_contact',17,5),(108,'civicrm_contact',20,4),(55,'civicrm_contact',23,5),(121,'civicrm_contact',25,5),(88,'civicrm_contact',28,4),(49,'civicrm_contact',30,4),(50,'civicrm_contact',30,5),(79,'civicrm_contact',34,4),(115,'civicrm_contact',36,4),(116,'civicrm_contact',36,5),(75,'civicrm_contact',40,4),(113,'civicrm_contact',42,4),(114,'civicrm_contact',42,5),(62,'civicrm_contact',44,4),(10,'civicrm_contact',46,1),(47,'civicrm_contact',55,4),(80,'civicrm_contact',59,4),(45,'civicrm_contact',60,4),(46,'civicrm_contact',60,5),(5,'civicrm_contact',62,3),(96,'civicrm_contact',63,4),(97,'civicrm_contact',63,5),(48,'civicrm_contact',64,4),(25,'civicrm_contact',66,4),(26,'civicrm_contact',66,5),(29,'civicrm_contact',67,5),(119,'civicrm_contact',69,4),(120,'civicrm_contact',69,5),(41,'civicrm_contact',71,5),(68,'civicrm_contact',74,5),(24,'civicrm_contact',76,4),(104,'civicrm_contact',78,4),(105,'civicrm_contact',78,5),(9,'civicrm_contact',79,3),(61,'civicrm_contact',80,5),(16,'civicrm_contact',81,4),(17,'civicrm_contact',81,5),(84,'civicrm_contact',82,5),(4,'civicrm_contact',86,1),(53,'civicrm_contact',87,4),(54,'civicrm_contact',87,5),(110,'civicrm_contact',89,5),(8,'civicrm_contact',91,1),(56,'civicrm_contact',93,4),(57,'civicrm_contact',93,5),(85,'civicrm_contact',94,4),(36,'civicrm_contact',97,4),(14,'civicrm_contact',99,4),(15,'civicrm_contact',99,5),(95,'civicrm_contact',103,5),(111,'civicrm_contact',104,4),(2,'civicrm_contact',105,1),(98,'civicrm_contact',107,5),(92,'civicrm_contact',108,4),(93,'civicrm_contact',108,5),(99,'civicrm_contact',114,4),(100,'civicrm_contact',114,5),(7,'civicrm_contact',117,1),(22,'civicrm_contact',120,4),(23,'civicrm_contact',120,5),(112,'civicrm_contact',121,4),(34,'civicrm_contact',122,5),(42,'civicrm_contact',123,4),(43,'civicrm_contact',123,5),(12,'civicrm_contact',124,5),(71,'civicrm_contact',126,4),(72,'civicrm_contact',126,5),(32,'civicrm_contact',129,4),(33,'civicrm_contact',129,5),(78,'civicrm_contact',134,5),(106,'civicrm_contact',135,4),(107,'civicrm_contact',135,5),(66,'civicrm_contact',139,5),(102,'civicrm_contact',140,5),(89,'civicrm_contact',141,4),(90,'civicrm_contact',141,5),(1,'civicrm_contact',142,3),(37,'civicrm_contact',143,5),(82,'civicrm_contact',147,4),(83,'civicrm_contact',147,5),(3,'civicrm_contact',148,3),(91,'civicrm_contact',152,5),(35,'civicrm_contact',154,4),(94,'civicrm_contact',155,5),(51,'civicrm_contact',156,4),(52,'civicrm_contact',156,5),(122,'civicrm_contact',158,4),(69,'civicrm_contact',159,4),(70,'civicrm_contact',159,5),(44,'civicrm_contact',161,5),(21,'civicrm_contact',164,4),(64,'civicrm_contact',165,4),(65,'civicrm_contact',165,5),(63,'civicrm_contact',166,5),(27,'civicrm_contact',167,4),(11,'civicrm_contact',169,5),(117,'civicrm_contact',171,4),(118,'civicrm_contact',171,5),(67,'civicrm_contact',172,5),(60,'civicrm_contact',176,4),(20,'civicrm_contact',179,5),(30,'civicrm_contact',183,4),(31,'civicrm_contact',183,5),(38,'civicrm_contact',186,4),(39,'civicrm_contact',186,5),(103,'civicrm_contact',187,4),(28,'civicrm_contact',190,5),(81,'civicrm_contact',191,5),(76,'civicrm_contact',192,4),(77,'civicrm_contact',192,5),(109,'civicrm_contact',194,4),(86,'civicrm_contact',195,4),(87,'civicrm_contact',195,5),(73,'civicrm_contact',198,4),(74,'civicrm_contact',198,5);
+INSERT INTO `civicrm_entity_tag` (`id`, `entity_table`, `entity_id`, `tag_id`) VALUES (83,'civicrm_contact',5,5),(87,'civicrm_contact',11,4),(77,'civicrm_contact',16,4),(102,'civicrm_contact',18,4),(103,'civicrm_contact',18,5),(42,'civicrm_contact',19,5),(6,'civicrm_contact',20,3),(63,'civicrm_contact',22,4),(12,'civicrm_contact',25,4),(54,'civicrm_contact',28,4),(15,'civicrm_contact',30,4),(16,'civicrm_contact',30,5),(113,'civicrm_contact',31,5),(114,'civicrm_contact',35,5),(1,'civicrm_contact',37,1),(27,'civicrm_contact',39,4),(28,'civicrm_contact',39,5),(59,'civicrm_contact',41,5),(111,'civicrm_contact',44,5),(56,'civicrm_contact',47,4),(78,'civicrm_contact',50,5),(72,'civicrm_contact',60,4),(73,'civicrm_contact',60,5),(68,'civicrm_contact',61,5),(7,'civicrm_contact',62,1),(99,'civicrm_contact',63,4),(100,'civicrm_contact',63,5),(2,'civicrm_contact',66,1),(64,'civicrm_contact',67,5),(107,'civicrm_contact',68,4),(101,'civicrm_contact',73,5),(74,'civicrm_contact',74,5),(4,'civicrm_contact',76,3),(71,'civicrm_contact',77,4),(84,'civicrm_contact',79,5),(97,'civicrm_contact',80,5),(51,'civicrm_contact',81,4),(52,'civicrm_contact',81,5),(98,'civicrm_contact',83,5),(18,'civicrm_contact',85,4),(85,'civicrm_contact',87,4),(86,'civicrm_contact',87,5),(37,'civicrm_contact',88,5),(62,'civicrm_contact',89,4),(60,'civicrm_contact',90,4),(61,'civicrm_contact',90,5),(31,'civicrm_contact',91,5),(32,'civicrm_contact',92,5),(11,'civicrm_contact',94,5),(112,'civicrm_contact',95,4),(89,'civicrm_contact',96,4),(90,'civicrm_contact',96,5),(106,'civicrm_contact',97,4),(9,'civicrm_contact',98,3),(13,'civicrm_contact',99,4),(14,'civicrm_contact',99,5),(88,'civicrm_contact',100,5),(17,'civicrm_contact',103,5),(33,'civicrm_contact',104,4),(55,'civicrm_contact',107,4),(53,'civicrm_contact',109,4),(79,'civicrm_contact',113,4),(109,'civicrm_contact',120,4),(110,'civicrm_contact',120,5),(3,'civicrm_contact',121,1),(21,'civicrm_contact',122,5),(38,'civicrm_contact',127,5),(46,'civicrm_contact',132,4),(47,'civicrm_contact',132,5),(8,'civicrm_contact',134,2),(93,'civicrm_contact',135,4),(94,'civicrm_contact',135,5),(91,'civicrm_contact',138,4),(92,'civicrm_contact',138,5),(104,'civicrm_contact',139,4),(25,'civicrm_contact',141,4),(26,'civicrm_contact',141,5),(24,'civicrm_contact',142,4),(48,'civicrm_contact',144,4),(49,'civicrm_contact',144,5),(75,'civicrm_contact',147,4),(76,'civicrm_contact',147,5),(10,'civicrm_contact',149,1),(20,'civicrm_contact',152,4),(5,'civicrm_contact',155,1),(40,'civicrm_contact',156,4),(41,'civicrm_contact',156,5),(50,'civicrm_contact',157,5),(65,'civicrm_contact',162,4),(66,'civicrm_contact',162,5),(57,'civicrm_contact',167,4),(95,'civicrm_contact',168,4),(96,'civicrm_contact',168,5),(29,'civicrm_contact',170,4),(108,'civicrm_contact',172,4),(105,'civicrm_contact',175,5),(39,'civicrm_contact',176,5),(36,'civicrm_contact',179,4),(43,'civicrm_contact',180,4),(44,'civicrm_contact',180,5),(80,'civicrm_contact',181,5),(81,'civicrm_contact',183,4),(82,'civicrm_contact',183,5),(67,'civicrm_contact',184,5),(19,'civicrm_contact',185,4),(70,'civicrm_contact',188,4),(45,'civicrm_contact',193,5),(69,'civicrm_contact',196,5),(34,'civicrm_contact',198,4),(35,'civicrm_contact',198,5),(58,'civicrm_contact',199,4),(30,'civicrm_contact',200,5),(22,'civicrm_contact',201,4),(23,'civicrm_contact',201,5);
 /*!40000 ALTER TABLE `civicrm_entity_tag` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -467,7 +467,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_event` WRITE;
 /*!40000 ALTER TABLE `civicrm_event` DISABLE KEYS */;
-INSERT INTO `civicrm_event` (`id`, `title`, `summary`, `description`, `event_type_id`, `participant_listing_id`, `is_public`, `start_date`, `end_date`, `is_online_registration`, `registration_link_text`, `registration_start_date`, `registration_end_date`, `max_participants`, `event_full_text`, `is_monetary`, `financial_type_id`, `payment_processor`, `is_map`, `is_active`, `fee_label`, `is_show_location`, `loc_block_id`, `default_role_id`, `intro_text`, `footer_text`, `confirm_title`, `confirm_text`, `confirm_footer_text`, `is_email_confirm`, `confirm_email_text`, `confirm_from_name`, `confirm_from_email`, `cc_confirm`, `bcc_confirm`, `default_fee_id`, `default_discount_fee_id`, `thankyou_title`, `thankyou_text`, `thankyou_footer_text`, `is_pay_later`, `pay_later_text`, `pay_later_receipt`, `is_partial_payment`, `initial_amount_label`, `initial_amount_help_text`, `min_initial_amount`, `is_multiple_registrations`, `max_additional_participants`, `allow_same_participant_emails`, `has_waitlist`, `requires_approval`, `expiration_time`, `allow_selfcancelxfer`, `selfcancelxfer_time`, `waitlist_text`, `approval_req_text`, `is_template`, `template_title`, `created_id`, `created_date`, `currency`, `campaign_id`, `is_share`, `is_confirm_enabled`, `parent_event_id`, `slot_label_id`, `dedupe_rule_group_id`, `is_billing_required`) VALUES (1,'Fall Fundraiser Dinner','Kick up your heels at our Fall Fundraiser Dinner/Dance at Glen Echo Park! Come by yourself or bring a partner, friend or the entire family!','This event benefits our teen programs. Admission includes a full 3 course meal and wine or soft drinks. Grab your dancing shoes, bring the kids and come join the party!',3,1,1,'2021-01-24 17:00:00','2021-01-26 17:00:00',1,'Register Now',NULL,NULL,100,'Sorry! The Fall Fundraiser Dinner is full. Please call Jane at 204 222-1000 ext 33 if you want to be added to the waiting list.',1,4,NULL,1,1,'Dinner Contribution',1,1,1,'Fill in the information below to join as at this wonderful dinner event.',NULL,'Confirm Your Registration Information','Review the information below carefully.',NULL,1,'Contact the Development Department if you need to make any changes to your registration.','Fundraising Dept.','development@example.org',NULL,NULL,NULL,NULL,'Thanks for Registering!','<p>Thank you for your support. Your contribution will help us build even better tools.</p><p>Please tell your friends and colleagues about this wonderful event.</p>','<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>',1,'I will send payment by check','Send a check payable to Our Organization within 3 business days to hold your reservation. Checks should be sent to: 100 Main St., Suite 3, San Francisco CA 94110',0,NULL,NULL,NULL,1,0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(2,'Summer Solstice Festival Day Concert','Festival Day is coming! Join us and help support your parks.','We will gather at noon, learn a song all together,  and then join in a joyous procession to the pavilion. We will be one of many groups performing at this wonderful concert which benefits our city parks.',5,1,1,'2020-07-23 12:00:00','2020-07-23 17:00:00',1,'Register Now',NULL,NULL,50,'We have all the singers we can handle. Come to the pavilion anyway and join in from the audience.',1,2,NULL,NULL,1,'Festival Fee',1,2,1,'Complete the form below and click Continue to register online for the festival. Or you can register by calling us at 204 222-1000 ext 22.','','Confirm Your Registration Information','','',1,'This email confirms your registration. If you have questions or need to change your registration - please do not hesitate to call us.','Event Dept.','events@example.org','',NULL,NULL,NULL,'Thanks for Your Joining In!','<p>Thank you for your support. Your participation will help build new parks.</p><p>Please tell your friends and colleagues about the concert.</p>','<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>',0,NULL,NULL,0,NULL,NULL,NULL,1,0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(3,'Rain-forest Cup Youth Soccer Tournament','Sign up your team to participate in this fun tournament which benefits several Rain-forest protection groups in the Amazon basin.','This is a FYSA Sanctioned Tournament, which is open to all USSF/FIFA affiliated organizations for boys and girls in age groups: U9-U10 (6v6), U11-U12 (8v8), and U13-U17 (Full Sided).',3,1,1,'2021-02-24 07:00:00','2021-02-27 17:00:00',1,'Register Now',NULL,NULL,500,'Sorry! All available team slots for this tournament have been filled. Contact Jill Futbol for information about the waiting list and next years event.',1,4,NULL,NULL,1,'Tournament Fees',1,3,1,'Complete the form below to register your team for this year\'s tournament.','<em>A Soccer Youth Event</em>','Review and Confirm Your Registration Information','','<em>A Soccer Youth Event</em>',1,'Contact our Tournament Director for eligibility details.','Tournament Director','tournament@example.org','',NULL,NULL,NULL,'Thanks for Your Support!','<p>Thank you for your support. Your participation will help save thousands of acres of rainforest.</p>','<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>',0,NULL,NULL,0,NULL,NULL,NULL,0,0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(4,NULL,NULL,NULL,4,1,1,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,1,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,0,0,NULL,NULL,1,'Free Meeting without Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(5,NULL,NULL,NULL,4,1,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,1,NULL,1,NULL,1,NULL,NULL,'Confirm Your Registration Information',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Thanks for Registering!',NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,1,0,1,NULL,NULL,NULL,0,0,NULL,NULL,1,'Free Meeting with Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(6,NULL,NULL,NULL,1,1,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,1,4,NULL,0,1,'Conference Fee',1,NULL,1,NULL,NULL,'Confirm Your Registration Information',NULL,NULL,1,NULL,'Event Template Dept.','event_templates@example.org',NULL,NULL,NULL,NULL,'Thanks for Registering!',NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,1,0,1,NULL,NULL,NULL,0,0,NULL,NULL,1,'Paid Conference with Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0);
+INSERT INTO `civicrm_event` (`id`, `title`, `summary`, `description`, `event_type_id`, `participant_listing_id`, `is_public`, `start_date`, `end_date`, `is_online_registration`, `registration_link_text`, `registration_start_date`, `registration_end_date`, `max_participants`, `event_full_text`, `is_monetary`, `financial_type_id`, `payment_processor`, `is_map`, `is_active`, `fee_label`, `is_show_location`, `loc_block_id`, `default_role_id`, `intro_text`, `footer_text`, `confirm_title`, `confirm_text`, `confirm_footer_text`, `is_email_confirm`, `confirm_email_text`, `confirm_from_name`, `confirm_from_email`, `cc_confirm`, `bcc_confirm`, `default_fee_id`, `default_discount_fee_id`, `thankyou_title`, `thankyou_text`, `thankyou_footer_text`, `is_pay_later`, `pay_later_text`, `pay_later_receipt`, `is_partial_payment`, `initial_amount_label`, `initial_amount_help_text`, `min_initial_amount`, `is_multiple_registrations`, `max_additional_participants`, `allow_same_participant_emails`, `has_waitlist`, `requires_approval`, `expiration_time`, `allow_selfcancelxfer`, `selfcancelxfer_time`, `waitlist_text`, `approval_req_text`, `is_template`, `template_title`, `created_id`, `created_date`, `currency`, `campaign_id`, `is_share`, `is_confirm_enabled`, `parent_event_id`, `slot_label_id`, `dedupe_rule_group_id`, `is_billing_required`) VALUES (1,'Fall Fundraiser Dinner','Kick up your heels at our Fall Fundraiser Dinner/Dance at Glen Echo Park! Come by yourself or bring a partner, friend or the entire family!','This event benefits our teen programs. Admission includes a full 3 course meal and wine or soft drinks. Grab your dancing shoes, bring the kids and come join the party!',3,1,1,'2021-03-16 17:00:00','2021-03-18 17:00:00',1,'Register Now',NULL,NULL,100,'Sorry! The Fall Fundraiser Dinner is full. Please call Jane at 204 222-1000 ext 33 if you want to be added to the waiting list.',1,4,NULL,1,1,'Dinner Contribution',1,1,1,'Fill in the information below to join as at this wonderful dinner event.',NULL,'Confirm Your Registration Information','Review the information below carefully.',NULL,1,'Contact the Development Department if you need to make any changes to your registration.','Fundraising Dept.','development@example.org',NULL,NULL,NULL,NULL,'Thanks for Registering!','<p>Thank you for your support. Your contribution will help us build even better tools.</p><p>Please tell your friends and colleagues about this wonderful event.</p>','<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>',1,'I will send payment by check','Send a check payable to Our Organization within 3 business days to hold your reservation. Checks should be sent to: 100 Main St., Suite 3, San Francisco CA 94110',0,NULL,NULL,NULL,1,0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(2,'Summer Solstice Festival Day Concert','Festival Day is coming! Join us and help support your parks.','We will gather at noon, learn a song all together,  and then join in a joyous procession to the pavilion. We will be one of many groups performing at this wonderful concert which benefits our city parks.',5,1,1,'2020-09-15 12:00:00','2020-09-15 17:00:00',1,'Register Now',NULL,NULL,50,'We have all the singers we can handle. Come to the pavilion anyway and join in from the audience.',1,2,NULL,NULL,1,'Festival Fee',1,2,1,'Complete the form below and click Continue to register online for the festival. Or you can register by calling us at 204 222-1000 ext 22.','','Confirm Your Registration Information','','',1,'This email confirms your registration. If you have questions or need to change your registration - please do not hesitate to call us.','Event Dept.','events@example.org','',NULL,NULL,NULL,'Thanks for Your Joining In!','<p>Thank you for your support. Your participation will help build new parks.</p><p>Please tell your friends and colleagues about the concert.</p>','<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>',0,NULL,NULL,0,NULL,NULL,NULL,1,0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(3,'Rain-forest Cup Youth Soccer Tournament','Sign up your team to participate in this fun tournament which benefits several Rain-forest protection groups in the Amazon basin.','This is a FYSA Sanctioned Tournament, which is open to all USSF/FIFA affiliated organizations for boys and girls in age groups: U9-U10 (6v6), U11-U12 (8v8), and U13-U17 (Full Sided).',3,1,1,'2021-04-16 07:00:00','2021-04-19 17:00:00',1,'Register Now',NULL,NULL,500,'Sorry! All available team slots for this tournament have been filled. Contact Jill Futbol for information about the waiting list and next years event.',1,4,NULL,NULL,1,'Tournament Fees',1,3,1,'Complete the form below to register your team for this year\'s tournament.','<em>A Soccer Youth Event</em>','Review and Confirm Your Registration Information','','<em>A Soccer Youth Event</em>',1,'Contact our Tournament Director for eligibility details.','Tournament Director','tournament@example.org','',NULL,NULL,NULL,'Thanks for Your Support!','<p>Thank you for your support. Your participation will help save thousands of acres of rainforest.</p>','<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>',0,NULL,NULL,0,NULL,NULL,NULL,0,0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,NULL,NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(4,NULL,NULL,NULL,4,1,1,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,1,NULL,1,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,0,0,NULL,NULL,1,'Free Meeting without Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(5,NULL,NULL,NULL,4,1,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,0,1,NULL,1,NULL,1,NULL,NULL,'Confirm Your Registration Information',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Thanks for Registering!',NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,1,0,1,NULL,NULL,NULL,0,0,NULL,NULL,1,'Free Meeting with Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0),(6,NULL,NULL,NULL,1,1,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,1,4,NULL,0,1,'Conference Fee',1,NULL,1,NULL,NULL,'Confirm Your Registration Information',NULL,NULL,1,NULL,'Event Template Dept.','event_templates@example.org',NULL,NULL,NULL,NULL,'Thanks for Registering!',NULL,NULL,0,NULL,NULL,0,NULL,NULL,NULL,1,0,1,NULL,NULL,NULL,0,0,NULL,NULL,1,'Paid Conference with Online Registration',NULL,NULL,'USD',NULL,1,1,NULL,NULL,NULL,0);
 /*!40000 ALTER TABLE `civicrm_event` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -524,7 +524,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_financial_item` WRITE;
 /*!40000 ALTER TABLE `civicrm_financial_item` DISABLE KEYS */;
-INSERT INTO `civicrm_financial_item` (`id`, `created_date`, `transaction_date`, `contact_id`, `description`, `amount`, `currency`, `financial_account_id`, `status_id`, `entity_table`, `entity_id`) VALUES (1,'2020-07-24 05:34:04','2010-04-11 00:00:00',2,'Contribution Amount',125.00,'USD',1,1,'civicrm_line_item',1),(2,'2020-07-24 05:34:04','2010-03-21 00:00:00',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',2),(3,'2020-07-24 05:34:04','2010-04-29 00:00:00',6,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',3),(4,'2020-07-24 05:34:04','2010-04-11 00:00:00',8,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',4),(5,'2020-07-24 05:34:04','2010-04-15 00:00:00',16,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',5),(6,'2020-07-24 05:34:04','2010-04-11 00:00:00',19,'Contribution Amount',175.00,'USD',1,1,'civicrm_line_item',6),(7,'2020-07-24 05:34:04','2010-03-27 00:00:00',82,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',7),(8,'2020-07-24 05:34:04','2010-03-08 00:00:00',92,'Contribution Amount',10.00,'USD',1,1,'civicrm_line_item',8),(9,'2020-07-24 05:34:04','2010-04-22 00:00:00',34,'Contribution Amount',250.00,'USD',1,1,'civicrm_line_item',9),(10,'2020-07-24 05:34:04','2009-07-01 11:53:50',71,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',10),(11,'2020-07-24 05:34:04','2009-07-01 12:55:41',43,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',11),(12,'2020-07-24 05:34:04','2009-10-01 11:53:50',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',12),(13,'2020-07-24 05:34:04','2009-12-01 12:55:41',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',13),(14,'2020-07-24 05:34:04','2020-07-24 15:34:04',103,'General',100.00,'USD',2,1,'civicrm_line_item',16),(15,'2020-07-24 05:34:04','2020-07-24 15:34:04',179,'General',100.00,'USD',2,1,'civicrm_line_item',17),(16,'2020-07-24 05:34:04','2020-07-24 15:34:04',12,'General',100.00,'USD',2,1,'civicrm_line_item',18),(17,'2020-07-24 05:34:04','2020-07-24 15:34:04',173,'General',100.00,'USD',2,1,'civicrm_line_item',19),(18,'2020-07-24 05:34:04','2020-07-24 15:34:04',127,'General',100.00,'USD',2,1,'civicrm_line_item',20),(19,'2020-07-24 05:34:04','2020-07-24 15:34:04',63,'General',100.00,'USD',2,1,'civicrm_line_item',21),(20,'2020-07-24 05:34:04','2020-07-24 15:34:04',188,'General',100.00,'USD',2,1,'civicrm_line_item',22),(21,'2020-07-24 05:34:04','2020-07-24 15:34:04',80,'General',100.00,'USD',2,1,'civicrm_line_item',23),(22,'2020-07-24 05:34:04','2020-07-24 15:34:04',131,'General',100.00,'USD',2,1,'civicrm_line_item',24),(23,'2020-07-24 05:34:04','2020-07-24 15:34:04',161,'General',100.00,'USD',2,1,'civicrm_line_item',25),(24,'2020-07-24 05:34:04','2020-07-24 15:34:04',41,'General',100.00,'USD',2,1,'civicrm_line_item',26),(25,'2020-07-24 05:34:04','2020-07-24 15:34:04',20,'General',100.00,'USD',2,1,'civicrm_line_item',27),(26,'2020-07-24 05:34:04','2020-07-24 15:34:04',195,'General',100.00,'USD',2,1,'civicrm_line_item',28),(27,'2020-07-24 05:34:04','2020-07-24 15:34:04',164,'General',100.00,'USD',2,1,'civicrm_line_item',29),(28,'2020-07-24 05:34:04','2020-07-24 15:34:04',78,'General',100.00,'USD',2,1,'civicrm_line_item',30),(29,'2020-07-24 05:34:04','2020-07-24 15:34:04',132,'Student',50.00,'USD',2,1,'civicrm_line_item',31),(30,'2020-07-24 05:34:04','2020-07-24 15:34:04',5,'Student',50.00,'USD',2,1,'civicrm_line_item',32),(31,'2020-07-24 05:34:04','2020-07-24 15:34:04',108,'Student',50.00,'USD',2,1,'civicrm_line_item',33),(32,'2020-07-24 05:34:04','2020-07-24 15:34:04',39,'Student',50.00,'USD',2,1,'civicrm_line_item',34),(33,'2020-07-24 05:34:04','2020-07-24 15:34:04',159,'Student',50.00,'USD',2,1,'civicrm_line_item',35),(34,'2020-07-24 05:34:04','2020-07-24 15:34:04',67,'Student',50.00,'USD',2,1,'civicrm_line_item',36),(35,'2020-07-24 05:34:04','2020-07-24 15:34:04',17,'Student',50.00,'USD',2,1,'civicrm_line_item',37),(36,'2020-07-24 05:34:04','2020-07-24 15:34:04',7,'Student',50.00,'USD',2,1,'civicrm_line_item',38),(37,'2020-07-24 05:34:05','2020-07-24 15:34:04',95,'Student',50.00,'USD',2,1,'civicrm_line_item',39),(38,'2020-07-24 05:34:05','2020-07-24 15:34:04',134,'Student',50.00,'USD',2,1,'civicrm_line_item',40),(39,'2020-07-24 05:34:05','2020-07-24 15:34:04',74,'Student',50.00,'USD',2,1,'civicrm_line_item',41),(40,'2020-07-24 05:34:05','2020-07-24 15:34:04',13,'Student',50.00,'USD',2,1,'civicrm_line_item',42),(41,'2020-07-24 05:34:05','2020-07-24 15:34:04',156,'Student',50.00,'USD',2,1,'civicrm_line_item',43),(42,'2020-07-24 05:34:05','2020-07-24 15:34:04',145,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',44),(43,'2020-07-24 05:34:05','2020-07-24 15:34:04',99,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',45),(44,'2020-07-24 05:34:05','2020-07-24 15:34:04',167,'Soprano',50.00,'USD',2,1,'civicrm_line_item',81),(45,'2020-07-24 05:34:05','2020-07-24 15:34:04',73,'Soprano',50.00,'USD',2,1,'civicrm_line_item',82),(46,'2020-07-24 05:34:05','2020-07-24 15:34:04',56,'Soprano',50.00,'USD',2,1,'civicrm_line_item',83),(47,'2020-07-24 05:34:05','2020-07-24 15:34:04',133,'Soprano',50.00,'USD',2,1,'civicrm_line_item',84),(48,'2020-07-24 05:34:05','2020-07-24 15:34:04',111,'Soprano',50.00,'USD',2,1,'civicrm_line_item',85),(49,'2020-07-24 05:34:05','2020-07-24 15:34:04',195,'Soprano',50.00,'USD',2,1,'civicrm_line_item',86),(50,'2020-07-24 05:34:05','2020-07-24 15:34:04',94,'Soprano',50.00,'USD',2,1,'civicrm_line_item',87),(51,'2020-07-24 05:34:05','2020-07-24 15:34:04',102,'Soprano',50.00,'USD',2,1,'civicrm_line_item',88),(52,'2020-07-24 05:34:05','2020-07-24 15:34:04',19,'Soprano',50.00,'USD',2,1,'civicrm_line_item',89),(53,'2020-07-24 05:34:05','2020-07-24 15:34:04',114,'Soprano',50.00,'USD',2,1,'civicrm_line_item',90),(54,'2020-07-24 05:34:05','2020-07-24 15:34:04',129,'Soprano',50.00,'USD',2,1,'civicrm_line_item',91),(55,'2020-07-24 05:34:05','2020-07-24 15:34:04',120,'Soprano',50.00,'USD',2,1,'civicrm_line_item',92),(56,'2020-07-24 05:34:05','2020-07-24 15:34:04',18,'Soprano',50.00,'USD',2,1,'civicrm_line_item',93),(57,'2020-07-24 05:34:05','2020-07-24 15:34:04',196,'Soprano',50.00,'USD',2,1,'civicrm_line_item',94),(58,'2020-07-24 05:34:05','2020-07-24 15:34:04',98,'Soprano',50.00,'USD',2,1,'civicrm_line_item',95),(59,'2020-07-24 05:34:05','2020-07-24 15:34:04',105,'Soprano',50.00,'USD',2,1,'civicrm_line_item',96),(60,'2020-07-24 05:34:05','2020-07-24 15:34:04',95,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',47),(61,'2020-07-24 05:34:05','2020-07-24 15:34:04',155,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',48),(62,'2020-07-24 05:34:05','2020-07-24 15:34:04',68,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',49),(63,'2020-07-24 05:34:05','2020-07-24 15:34:04',31,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',50),(64,'2020-07-24 05:34:05','2020-07-24 15:34:04',8,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',51),(65,'2020-07-24 05:34:05','2020-07-24 15:34:04',162,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',52),(66,'2020-07-24 05:34:05','2020-07-24 15:34:04',41,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',53),(67,'2020-07-24 05:34:05','2020-07-24 15:34:04',24,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',54),(68,'2020-07-24 05:34:05','2020-07-24 15:34:04',180,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',55),(69,'2020-07-24 05:34:05','2020-07-24 15:34:04',175,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',56),(70,'2020-07-24 05:34:05','2020-07-24 15:34:04',6,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',57),(71,'2020-07-24 05:34:05','2020-07-24 15:34:04',60,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',58),(72,'2020-07-24 05:34:05','2020-07-24 15:34:04',49,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',59),(73,'2020-07-24 05:34:05','2020-07-24 15:34:04',200,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',60),(74,'2020-07-24 05:34:05','2020-07-24 15:34:04',130,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',61),(75,'2020-07-24 05:34:05','2020-07-24 15:34:04',70,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',62),(76,'2020-07-24 05:34:05','2020-07-24 15:34:04',110,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',63),(77,'2020-07-24 05:34:05','2020-07-24 15:34:04',106,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',64),(78,'2020-07-24 05:34:05','2020-07-24 15:34:04',140,'Single',50.00,'USD',4,1,'civicrm_line_item',65),(79,'2020-07-24 05:34:05','2020-07-24 15:34:04',103,'Single',50.00,'USD',4,1,'civicrm_line_item',66),(80,'2020-07-24 05:34:05','2020-07-24 15:34:04',170,'Single',50.00,'USD',4,1,'civicrm_line_item',67),(81,'2020-07-24 05:34:05','2020-07-24 15:34:04',172,'Single',50.00,'USD',4,1,'civicrm_line_item',68),(82,'2020-07-24 05:34:05','2020-07-24 15:34:04',57,'Single',50.00,'USD',4,1,'civicrm_line_item',69),(83,'2020-07-24 05:34:05','2020-07-24 15:34:04',109,'Single',50.00,'USD',4,1,'civicrm_line_item',70),(84,'2020-07-24 05:34:05','2020-07-24 15:34:04',5,'Single',50.00,'USD',4,1,'civicrm_line_item',71),(85,'2020-07-24 05:34:05','2020-07-24 15:34:04',54,'Single',50.00,'USD',4,1,'civicrm_line_item',72),(86,'2020-07-24 05:34:05','2020-07-24 15:34:04',21,'Single',50.00,'USD',4,1,'civicrm_line_item',73),(87,'2020-07-24 05:34:05','2020-07-24 15:34:04',30,'Single',50.00,'USD',4,1,'civicrm_line_item',74),(88,'2020-07-24 05:34:05','2020-07-24 15:34:04',44,'Single',50.00,'USD',4,1,'civicrm_line_item',75),(89,'2020-07-24 05:34:05','2020-07-24 15:34:04',165,'Single',50.00,'USD',4,1,'civicrm_line_item',76),(90,'2020-07-24 05:34:05','2020-07-24 15:34:04',23,'Single',50.00,'USD',4,1,'civicrm_line_item',77),(91,'2020-07-24 05:34:05','2020-07-24 15:34:04',99,'Single',50.00,'USD',4,1,'civicrm_line_item',78),(92,'2020-07-24 05:34:05','2020-07-24 15:34:04',90,'Single',50.00,'USD',4,1,'civicrm_line_item',79),(93,'2020-07-24 05:34:05','2020-07-24 15:34:04',194,'Single',50.00,'USD',4,1,'civicrm_line_item',80);
+INSERT INTO `civicrm_financial_item` (`id`, `created_date`, `transaction_date`, `contact_id`, `description`, `amount`, `currency`, `financial_account_id`, `status_id`, `entity_table`, `entity_id`) VALUES (1,'2020-09-16 01:29:33','2010-04-11 00:00:00',2,'Contribution Amount',125.00,'USD',1,1,'civicrm_line_item',1),(2,'2020-09-16 01:29:33','2010-03-21 00:00:00',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',2),(3,'2020-09-16 01:29:33','2010-04-29 00:00:00',6,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',3),(4,'2020-09-16 01:29:33','2010-04-11 00:00:00',8,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',4),(5,'2020-09-16 01:29:33','2010-04-15 00:00:00',16,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',5),(6,'2020-09-16 01:29:33','2010-04-11 00:00:00',19,'Contribution Amount',175.00,'USD',1,1,'civicrm_line_item',6),(7,'2020-09-16 01:29:33','2010-03-27 00:00:00',82,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',7),(8,'2020-09-16 01:29:33','2010-03-08 00:00:00',92,'Contribution Amount',10.00,'USD',1,1,'civicrm_line_item',8),(9,'2020-09-16 01:29:33','2010-04-22 00:00:00',34,'Contribution Amount',250.00,'USD',1,1,'civicrm_line_item',9),(10,'2020-09-16 01:29:33','2009-07-01 11:53:50',71,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',10),(11,'2020-09-16 01:29:33','2009-07-01 12:55:41',43,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',11),(12,'2020-09-16 01:29:33','2009-10-01 11:53:50',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',12),(13,'2020-09-16 01:29:33','2009-12-01 12:55:41',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',13),(14,'2020-09-16 01:29:33','2020-09-16 13:29:32',73,'General',100.00,'USD',2,1,'civicrm_line_item',16),(15,'2020-09-16 01:29:33','2020-09-16 13:29:32',92,'Student',50.00,'USD',2,1,'civicrm_line_item',28),(16,'2020-09-16 01:29:33','2020-09-16 13:29:32',48,'General',100.00,'USD',2,1,'civicrm_line_item',17),(17,'2020-09-16 01:29:33','2020-09-16 13:29:32',51,'Student',50.00,'USD',2,1,'civicrm_line_item',29),(18,'2020-09-16 01:29:33','2020-09-16 13:29:32',163,'Student',50.00,'USD',2,1,'civicrm_line_item',30),(19,'2020-09-16 01:29:33','2020-09-16 13:29:32',40,'Student',50.00,'USD',2,1,'civicrm_line_item',31),(20,'2020-09-16 01:29:33','2020-09-16 13:29:32',190,'General',100.00,'USD',2,1,'civicrm_line_item',18),(21,'2020-09-16 01:29:33','2020-09-16 13:29:32',33,'Student',50.00,'USD',2,1,'civicrm_line_item',32),(22,'2020-09-16 01:29:33','2020-09-16 13:29:32',175,'General',100.00,'USD',2,1,'civicrm_line_item',19),(23,'2020-09-16 01:29:33','2020-09-16 13:29:32',103,'Student',50.00,'USD',2,1,'civicrm_line_item',33),(24,'2020-09-16 01:29:33','2020-09-16 13:29:32',194,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',44),(25,'2020-09-16 01:29:33','2020-09-16 13:29:32',56,'Student',50.00,'USD',2,1,'civicrm_line_item',34),(26,'2020-09-16 01:29:33','2020-09-16 13:29:32',120,'General',100.00,'USD',2,1,'civicrm_line_item',20),(27,'2020-09-16 01:29:33','2020-09-16 13:29:32',105,'Student',50.00,'USD',2,1,'civicrm_line_item',35),(28,'2020-09-16 01:29:33','2020-09-16 13:29:32',184,'Student',50.00,'USD',2,1,'civicrm_line_item',36),(29,'2020-09-16 01:29:33','2020-09-16 13:29:32',177,'Student',50.00,'USD',2,1,'civicrm_line_item',37),(30,'2020-09-16 01:29:33','2020-09-16 13:29:32',153,'General',100.00,'USD',2,1,'civicrm_line_item',21),(31,'2020-09-16 01:29:33','2020-09-16 13:29:32',106,'Student',50.00,'USD',2,1,'civicrm_line_item',38),(32,'2020-09-16 01:29:33','2020-09-16 13:29:32',13,'General',100.00,'USD',2,1,'civicrm_line_item',22),(33,'2020-09-16 01:29:33','2020-09-16 13:29:32',64,'Student',50.00,'USD',2,1,'civicrm_line_item',39),(34,'2020-09-16 01:29:33','2020-09-16 13:29:32',200,'General',100.00,'USD',2,1,'civicrm_line_item',23),(35,'2020-09-16 01:29:33','2020-09-16 13:29:32',142,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',45),(36,'2020-09-16 01:29:33','2020-09-16 13:29:32',111,'General',100.00,'USD',2,1,'civicrm_line_item',24),(37,'2020-09-16 01:29:33','2020-09-16 13:29:32',132,'Student',50.00,'USD',2,1,'civicrm_line_item',40),(38,'2020-09-16 01:29:33','2020-09-16 13:29:32',141,'General',100.00,'USD',2,1,'civicrm_line_item',25),(39,'2020-09-16 01:29:33','2020-09-16 13:29:32',3,'Student',50.00,'USD',2,1,'civicrm_line_item',41),(40,'2020-09-16 01:29:33','2020-09-16 13:29:32',86,'General',100.00,'USD',2,1,'civicrm_line_item',26),(41,'2020-09-16 01:29:33','2020-09-16 13:29:32',168,'Student',50.00,'USD',2,1,'civicrm_line_item',42),(42,'2020-09-16 01:29:33','2020-09-16 13:29:32',16,'General',100.00,'USD',2,1,'civicrm_line_item',27),(43,'2020-09-16 01:29:33','2020-09-16 13:29:32',68,'Student',50.00,'USD',2,1,'civicrm_line_item',43),(44,'2020-09-16 01:29:33','2020-09-16 13:29:32',157,'Single',50.00,'USD',4,1,'civicrm_line_item',65),(45,'2020-09-16 01:29:33','2020-09-16 13:29:32',115,'Soprano',50.00,'USD',2,1,'civicrm_line_item',82),(46,'2020-09-16 01:29:33','2020-09-16 13:29:32',129,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',49),(47,'2020-09-16 01:29:33','2020-09-16 13:29:32',94,'Single',50.00,'USD',4,1,'civicrm_line_item',69),(48,'2020-09-16 01:29:33','2020-09-16 13:29:32',101,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',53),(49,'2020-09-16 01:29:33','2020-09-16 13:29:32',77,'Single',50.00,'USD',4,1,'civicrm_line_item',73),(50,'2020-09-16 01:29:33','2020-09-16 13:29:32',140,'Soprano',50.00,'USD',2,1,'civicrm_line_item',90),(51,'2020-09-16 01:29:33','2020-09-16 13:29:32',188,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',58),(52,'2020-09-16 01:29:33','2020-09-16 13:29:32',135,'Single',50.00,'USD',4,1,'civicrm_line_item',77),(53,'2020-09-16 01:29:33','2020-09-16 13:29:32',46,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',62),(54,'2020-09-16 01:29:33','2020-09-16 13:29:32',60,'Soprano',50.00,'USD',2,1,'civicrm_line_item',81),(55,'2020-09-16 01:29:33','2020-09-16 13:29:32',172,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',48),(56,'2020-09-16 01:29:33','2020-09-16 13:29:32',50,'Single',50.00,'USD',4,1,'civicrm_line_item',68),(57,'2020-09-16 01:29:33','2020-09-16 13:29:32',153,'Soprano',50.00,'USD',2,1,'civicrm_line_item',85),(58,'2020-09-16 01:29:33','2020-09-16 13:29:32',95,'Soprano',50.00,'USD',2,1,'civicrm_line_item',86),(59,'2020-09-16 01:29:33','2020-09-16 13:29:32',187,'Single',50.00,'USD',4,1,'civicrm_line_item',71),(60,'2020-09-16 01:29:33','2020-09-16 13:29:32',137,'Single',50.00,'USD',4,1,'civicrm_line_item',72),(61,'2020-09-16 01:29:33','2020-09-16 13:29:32',11,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',55),(62,'2020-09-16 01:29:33','2020-09-16 13:29:32',128,'Soprano',50.00,'USD',2,1,'civicrm_line_item',89),(63,'2020-09-16 01:29:33','2020-09-16 13:29:32',21,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',57),(64,'2020-09-16 01:29:33','2020-09-16 13:29:32',114,'Single',50.00,'USD',4,1,'civicrm_line_item',76),(65,'2020-09-16 01:29:33','2020-09-16 13:29:32',79,'Soprano',50.00,'USD',2,1,'civicrm_line_item',93),(66,'2020-09-16 01:29:33','2020-09-16 13:29:32',146,'Soprano',50.00,'USD',2,1,'civicrm_line_item',94),(67,'2020-09-16 01:29:33','2020-09-16 13:29:32',161,'Single',50.00,'USD',4,1,'civicrm_line_item',79),(68,'2020-09-16 01:29:33','2020-09-16 13:29:32',181,'Single',50.00,'USD',4,1,'civicrm_line_item',80),(69,'2020-09-16 01:29:33','2020-09-16 13:29:32',53,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',64),(70,'2020-09-16 01:29:33','2020-09-16 13:29:32',26,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',47),(71,'2020-09-16 01:29:33','2020-09-16 13:29:32',82,'Single',50.00,'USD',4,1,'civicrm_line_item',67),(72,'2020-09-16 01:29:33','2020-09-16 13:29:32',196,'Soprano',50.00,'USD',2,1,'civicrm_line_item',84),(73,'2020-09-16 01:29:33','2020-09-16 13:29:32',111,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',52),(74,'2020-09-16 01:29:33','2020-09-16 13:29:32',167,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',54),(75,'2020-09-16 01:29:33','2020-09-16 13:29:32',48,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',56),(76,'2020-09-16 01:29:33','2020-09-16 13:29:32',191,'Single',50.00,'USD',4,1,'civicrm_line_item',75),(77,'2020-09-16 01:29:33','2020-09-16 13:29:32',52,'Soprano',50.00,'USD',2,1,'civicrm_line_item',92),(78,'2020-09-16 01:29:33','2020-09-16 13:29:32',8,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',61),(79,'2020-09-16 01:29:33','2020-09-16 13:29:32',147,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',63),(80,'2020-09-16 01:29:33','2020-09-16 13:29:32',193,'Single',50.00,'USD',4,1,'civicrm_line_item',66),(81,'2020-09-16 01:29:33','2020-09-16 13:29:32',103,'Soprano',50.00,'USD',2,1,'civicrm_line_item',83),(82,'2020-09-16 01:29:33','2020-09-16 13:29:32',169,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',50),(83,'2020-09-16 01:29:33','2020-09-16 13:29:32',155,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',51),(84,'2020-09-16 01:29:33','2020-09-16 13:29:32',76,'Single',50.00,'USD',4,1,'civicrm_line_item',70),(85,'2020-09-16 01:29:33','2020-09-16 13:29:32',84,'Soprano',50.00,'USD',2,1,'civicrm_line_item',87),(86,'2020-09-16 01:29:33','2020-09-16 13:29:32',78,'Soprano',50.00,'USD',2,1,'civicrm_line_item',88),(87,'2020-09-16 01:29:33','2020-09-16 13:29:32',80,'Single',50.00,'USD',4,1,'civicrm_line_item',74),(88,'2020-09-16 01:29:33','2020-09-16 13:29:32',160,'Soprano',50.00,'USD',2,1,'civicrm_line_item',91),(89,'2020-09-16 01:29:33','2020-09-16 13:29:32',7,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',59),(90,'2020-09-16 01:29:33','2020-09-16 13:29:32',67,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',60),(91,'2020-09-16 01:29:33','2020-09-16 13:29:32',27,'Single',50.00,'USD',4,1,'civicrm_line_item',78),(92,'2020-09-16 01:29:33','2020-09-16 13:29:32',85,'Soprano',50.00,'USD',2,1,'civicrm_line_item',95),(93,'2020-09-16 01:29:33','2020-09-16 13:29:32',13,'Soprano',50.00,'USD',2,1,'civicrm_line_item',96);
 /*!40000 ALTER TABLE `civicrm_financial_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -534,7 +534,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_financial_trxn` WRITE;
 /*!40000 ALTER TABLE `civicrm_financial_trxn` DISABLE KEYS */;
-INSERT INTO `civicrm_financial_trxn` (`id`, `from_financial_account_id`, `to_financial_account_id`, `trxn_date`, `total_amount`, `fee_amount`, `net_amount`, `currency`, `is_payment`, `trxn_id`, `trxn_result_code`, `status_id`, `payment_processor_id`, `payment_instrument_id`, `card_type_id`, `check_number`, `pan_truncation`, `order_reference`) VALUES (1,NULL,6,'2010-04-11 00:00:00',125.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'1041',NULL,NULL),(2,NULL,6,'2010-03-21 00:00:00',50.00,NULL,NULL,'USD',1,'P20901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(3,NULL,6,'2010-04-29 00:00:00',25.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'2095',NULL,NULL),(4,NULL,6,'2010-04-11 00:00:00',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'10552',NULL,NULL),(5,NULL,6,'2010-04-15 00:00:00',500.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'509',NULL,NULL),(6,NULL,6,'2010-04-11 00:00:00',175.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'102',NULL,NULL),(7,NULL,6,'2010-03-27 00:00:00',50.00,NULL,NULL,'USD',1,'P20193L2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(8,NULL,6,'2010-03-08 00:00:00',10.00,NULL,NULL,'USD',1,'P40232Y3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(9,NULL,6,'2010-04-22 00:00:00',250.00,NULL,NULL,'USD',1,'P20193L6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(10,NULL,6,'2009-07-01 11:53:50',500.00,NULL,NULL,'USD',1,'PL71',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(11,NULL,6,'2009-07-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL43II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(12,NULL,6,'2009-10-01 11:53:50',200.00,NULL,NULL,'USD',1,'PL32I',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(13,NULL,6,'2009-12-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL32II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(14,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(15,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(16,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(17,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(18,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(19,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(20,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(21,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(22,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(23,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(24,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(25,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(26,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(27,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(28,NULL,6,'2020-07-24 15:34:04',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(29,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(30,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(31,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(32,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(33,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(34,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(35,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(36,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(37,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(38,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(39,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(40,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(41,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(42,NULL,6,'2020-07-24 15:34:04',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(43,NULL,6,'2020-07-24 15:34:04',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(44,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(45,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(46,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(47,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(48,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(49,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(50,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(51,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(52,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(53,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(54,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(55,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(56,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(57,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(58,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(59,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(60,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(61,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(62,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(63,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(64,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(65,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(66,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(67,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(68,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(69,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(70,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(71,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(72,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(73,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(74,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(75,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(76,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(77,NULL,6,'2020-07-24 15:34:04',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(78,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(79,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(80,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(81,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(82,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(83,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(84,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(85,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(86,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(87,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(88,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(89,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(90,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(91,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(92,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(93,NULL,6,'2020-07-24 15:34:04',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_financial_trxn` (`id`, `from_financial_account_id`, `to_financial_account_id`, `trxn_date`, `total_amount`, `fee_amount`, `net_amount`, `currency`, `is_payment`, `trxn_id`, `trxn_result_code`, `status_id`, `payment_processor_id`, `payment_instrument_id`, `card_type_id`, `check_number`, `pan_truncation`, `order_reference`) VALUES (1,NULL,6,'2010-04-11 00:00:00',125.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'1041',NULL,NULL),(2,NULL,6,'2010-03-21 00:00:00',50.00,NULL,NULL,'USD',1,'P20901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(3,NULL,6,'2010-04-29 00:00:00',25.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'2095',NULL,NULL),(4,NULL,6,'2010-04-11 00:00:00',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'10552',NULL,NULL),(5,NULL,6,'2010-04-15 00:00:00',500.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'509',NULL,NULL),(6,NULL,6,'2010-04-11 00:00:00',175.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'102',NULL,NULL),(7,NULL,6,'2010-03-27 00:00:00',50.00,NULL,NULL,'USD',1,'P20193L2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(8,NULL,6,'2010-03-08 00:00:00',10.00,NULL,NULL,'USD',1,'P40232Y3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(9,NULL,6,'2010-04-22 00:00:00',250.00,NULL,NULL,'USD',1,'P20193L6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(10,NULL,6,'2009-07-01 11:53:50',500.00,NULL,NULL,'USD',1,'PL71',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(11,NULL,6,'2009-07-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL43II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(12,NULL,6,'2009-10-01 11:53:50',200.00,NULL,NULL,'USD',1,'PL32I',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(13,NULL,6,'2009-12-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL32II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(14,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(15,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(16,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(17,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(18,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(19,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(20,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(21,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(22,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(23,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(24,NULL,6,'2020-09-16 13:29:32',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(25,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(26,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(27,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(28,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(29,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(30,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(31,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(32,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(33,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(34,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(35,NULL,6,'2020-09-16 13:29:32',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(36,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(37,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(38,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(39,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(40,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(41,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(42,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(43,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(44,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(45,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(46,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(47,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(48,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(49,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(50,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(51,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(52,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(53,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(54,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(55,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(56,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(57,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(58,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(59,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(60,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(61,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(62,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(63,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(64,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(65,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(66,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(67,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(68,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(69,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(70,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(71,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(72,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(73,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(74,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(75,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(76,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(77,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(78,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(79,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(80,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(81,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(82,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(83,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(84,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(85,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(86,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(87,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(88,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(89,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(90,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(91,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(92,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(93,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_financial_trxn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -573,7 +573,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_group_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_group_contact` DISABLE KEYS */;
-INSERT INTO `civicrm_group_contact` (`id`, `group_id`, `contact_id`, `status`, `location_id`, `email_id`) VALUES (1,2,169,'Added',NULL,NULL),(2,2,24,'Added',NULL,NULL),(3,2,124,'Added',NULL,NULL),(4,2,57,'Added',NULL,NULL),(5,2,17,'Added',NULL,NULL),(6,2,182,'Added',NULL,NULL),(7,2,99,'Added',NULL,NULL),(8,2,138,'Added',NULL,NULL),(9,2,81,'Added',NULL,NULL),(10,2,53,'Added',NULL,NULL),(11,2,15,'Added',NULL,NULL),(12,2,33,'Added',NULL,NULL),(13,2,179,'Added',NULL,NULL),(14,2,83,'Added',NULL,NULL),(15,2,164,'Added',NULL,NULL),(16,2,146,'Added',NULL,NULL),(17,2,120,'Added',NULL,NULL),(18,2,193,'Added',NULL,NULL),(19,2,76,'Added',NULL,NULL),(20,2,162,'Added',NULL,NULL),(21,2,66,'Added',NULL,NULL),(22,2,92,'Added',NULL,NULL),(23,2,167,'Added',NULL,NULL),(24,2,65,'Added',NULL,NULL),(25,2,190,'Added',NULL,NULL),(26,2,184,'Added',NULL,NULL),(27,2,67,'Added',NULL,NULL),(28,2,185,'Added',NULL,NULL),(29,2,183,'Added',NULL,NULL),(30,2,175,'Added',NULL,NULL),(31,2,129,'Added',NULL,NULL),(32,2,197,'Added',NULL,NULL),(33,2,122,'Added',NULL,NULL),(34,2,7,'Added',NULL,NULL),(35,2,154,'Added',NULL,NULL),(36,2,51,'Added',NULL,NULL),(37,2,97,'Added',NULL,NULL),(38,2,111,'Added',NULL,NULL),(39,2,143,'Added',NULL,NULL),(40,2,77,'Added',NULL,NULL),(41,2,186,'Added',NULL,NULL),(42,2,12,'Added',NULL,NULL),(43,2,8,'Added',NULL,NULL),(44,2,84,'Added',NULL,NULL),(45,2,71,'Added',NULL,NULL),(46,2,3,'Added',NULL,NULL),(47,2,123,'Added',NULL,NULL),(48,2,119,'Added',NULL,NULL),(49,2,161,'Added',NULL,NULL),(50,2,145,'Added',NULL,NULL),(51,2,60,'Added',NULL,NULL),(52,2,31,'Added',NULL,NULL),(53,2,55,'Added',NULL,NULL),(54,2,88,'Added',NULL,NULL),(55,2,64,'Added',NULL,NULL),(56,2,41,'Added',NULL,NULL),(57,2,30,'Added',NULL,NULL),(58,2,2,'Added',NULL,NULL),(59,2,156,'Added',NULL,NULL),(60,2,118,'Added',NULL,NULL),(61,3,87,'Added',NULL,NULL),(62,3,49,'Added',NULL,NULL),(63,3,23,'Added',NULL,NULL),(64,3,5,'Added',NULL,NULL),(65,3,93,'Added',NULL,NULL),(66,3,18,'Added',NULL,NULL),(67,3,6,'Added',NULL,NULL),(68,3,199,'Added',NULL,NULL),(69,3,176,'Added',NULL,NULL),(70,3,132,'Added',NULL,NULL),(71,3,80,'Added',NULL,NULL),(72,3,45,'Added',NULL,NULL),(73,3,44,'Added',NULL,NULL),(74,3,96,'Added',NULL,NULL),(75,3,166,'Added',NULL,NULL),(76,4,169,'Added',NULL,NULL),(77,4,138,'Added',NULL,NULL),(78,4,164,'Added',NULL,NULL),(79,4,92,'Added',NULL,NULL),(80,4,183,'Added',NULL,NULL),(81,4,51,'Added',NULL,NULL),(82,4,8,'Added',NULL,NULL),(83,4,145,'Added',NULL,NULL);
+INSERT INTO `civicrm_group_contact` (`id`, `group_id`, `contact_id`, `status`, `location_id`, `email_id`) VALUES (1,2,94,'Added',NULL,NULL),(2,2,105,'Added',NULL,NULL),(3,2,25,'Added',NULL,NULL),(4,2,117,'Added',NULL,NULL),(5,2,99,'Added',NULL,NULL),(6,2,145,'Added',NULL,NULL),(7,2,30,'Added',NULL,NULL),(8,2,194,'Added',NULL,NULL),(9,2,103,'Added',NULL,NULL),(10,2,177,'Added',NULL,NULL),(11,2,85,'Added',NULL,NULL),(12,2,54,'Added',NULL,NULL),(13,2,185,'Added',NULL,NULL),(14,2,130,'Added',NULL,NULL),(15,2,152,'Added',NULL,NULL),(16,2,102,'Added',NULL,NULL),(17,2,122,'Added',NULL,NULL),(18,2,65,'Added',NULL,NULL),(19,2,201,'Added',NULL,NULL),(20,2,86,'Added',NULL,NULL),(21,2,142,'Added',NULL,NULL),(22,2,70,'Added',NULL,NULL),(23,2,141,'Added',NULL,NULL),(24,2,126,'Added',NULL,NULL),(25,2,39,'Added',NULL,NULL),(26,2,110,'Added',NULL,NULL),(27,2,170,'Added',NULL,NULL),(28,2,169,'Added',NULL,NULL),(29,2,200,'Added',NULL,NULL),(30,2,23,'Added',NULL,NULL),(31,2,91,'Added',NULL,NULL),(32,2,51,'Added',NULL,NULL),(33,2,92,'Added',NULL,NULL),(34,2,150,'Added',NULL,NULL),(35,2,104,'Added',NULL,NULL),(36,2,43,'Added',NULL,NULL),(37,2,198,'Added',NULL,NULL),(38,2,17,'Added',NULL,NULL),(39,2,179,'Added',NULL,NULL),(40,2,197,'Added',NULL,NULL),(41,2,88,'Added',NULL,NULL),(42,2,21,'Added',NULL,NULL),(43,2,127,'Added',NULL,NULL),(44,2,59,'Added',NULL,NULL),(45,2,176,'Added',NULL,NULL),(46,2,118,'Added',NULL,NULL),(47,2,156,'Added',NULL,NULL),(48,2,111,'Added',NULL,NULL),(49,2,19,'Added',NULL,NULL),(50,2,166,'Added',NULL,NULL),(51,2,180,'Added',NULL,NULL),(52,2,12,'Added',NULL,NULL),(53,2,193,'Added',NULL,NULL),(54,2,3,'Added',NULL,NULL),(55,2,132,'Added',NULL,NULL),(56,2,57,'Added',NULL,NULL),(57,2,144,'Added',NULL,NULL),(58,2,191,'Added',NULL,NULL),(59,2,157,'Added',NULL,NULL),(60,2,46,'Added',NULL,NULL),(61,3,81,'Added',NULL,NULL),(62,3,129,'Added',NULL,NULL),(63,3,109,'Added',NULL,NULL),(64,3,52,'Added',NULL,NULL),(65,3,28,'Added',NULL,NULL),(66,3,146,'Added',NULL,NULL),(67,3,107,'Added',NULL,NULL),(68,3,27,'Added',NULL,NULL),(69,3,47,'Added',NULL,NULL),(70,3,158,'Added',NULL,NULL),(71,3,167,'Added',NULL,NULL),(72,3,106,'Added',NULL,NULL),(73,3,199,'Added',NULL,NULL),(74,3,136,'Added',NULL,NULL),(75,3,41,'Added',NULL,NULL),(76,4,94,'Added',NULL,NULL),(77,4,194,'Added',NULL,NULL),(78,4,152,'Added',NULL,NULL),(79,4,70,'Added',NULL,NULL),(80,4,200,'Added',NULL,NULL),(81,4,43,'Added',NULL,NULL),(82,4,127,'Added',NULL,NULL),(83,4,166,'Added',NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_group_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -638,7 +638,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_line_item` WRITE;
 /*!40000 ALTER TABLE `civicrm_line_item` DISABLE KEYS */;
-INSERT INTO `civicrm_line_item` (`id`, `entity_table`, `entity_id`, `contribution_id`, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`, `non_deductible_amount`, `tax_amount`) VALUES (1,'civicrm_contribution',1,1,1,'Contribution Amount',1.00,125.00,125.00,0,1,1,0.00,NULL),(2,'civicrm_contribution',2,2,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(3,'civicrm_contribution',3,3,1,'Contribution Amount',1.00,25.00,25.00,0,1,1,0.00,NULL),(4,'civicrm_contribution',4,4,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(5,'civicrm_contribution',5,5,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(6,'civicrm_contribution',6,6,1,'Contribution Amount',1.00,175.00,175.00,0,1,1,0.00,NULL),(7,'civicrm_contribution',7,7,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(8,'civicrm_contribution',8,8,1,'Contribution Amount',1.00,10.00,10.00,0,1,1,0.00,NULL),(9,'civicrm_contribution',9,9,1,'Contribution Amount',1.00,250.00,250.00,0,1,1,0.00,NULL),(10,'civicrm_contribution',10,10,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(11,'civicrm_contribution',11,11,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(12,'civicrm_contribution',12,12,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(13,'civicrm_contribution',13,13,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(16,'civicrm_membership',1,14,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(17,'civicrm_membership',3,15,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(18,'civicrm_membership',5,16,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(19,'civicrm_membership',7,17,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(20,'civicrm_membership',9,18,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(21,'civicrm_membership',10,19,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(22,'civicrm_membership',13,20,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(23,'civicrm_membership',15,21,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(24,'civicrm_membership',17,22,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(25,'civicrm_membership',19,23,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(26,'civicrm_membership',21,24,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(27,'civicrm_membership',23,25,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(28,'civicrm_membership',25,26,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(29,'civicrm_membership',27,27,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(30,'civicrm_membership',29,28,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(31,'civicrm_membership',2,29,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(32,'civicrm_membership',4,30,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(33,'civicrm_membership',6,31,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(34,'civicrm_membership',8,32,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(35,'civicrm_membership',12,33,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(36,'civicrm_membership',14,34,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(37,'civicrm_membership',16,35,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(38,'civicrm_membership',18,36,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(39,'civicrm_membership',20,37,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(40,'civicrm_membership',24,38,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(41,'civicrm_membership',26,39,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(42,'civicrm_membership',28,40,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(43,'civicrm_membership',30,41,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(44,'civicrm_membership',11,42,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(45,'civicrm_membership',22,43,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(47,'civicrm_participant',3,67,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(48,'civicrm_participant',6,83,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(49,'civicrm_participant',9,62,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(50,'civicrm_participant',12,54,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(51,'civicrm_participant',15,47,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(52,'civicrm_participant',18,84,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(53,'civicrm_participant',21,55,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(54,'civicrm_participant',24,52,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(55,'civicrm_participant',25,90,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(56,'civicrm_participant',28,89,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(57,'civicrm_participant',31,46,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(58,'civicrm_participant',34,61,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(59,'civicrm_participant',37,57,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(60,'civicrm_participant',40,94,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(61,'civicrm_participant',43,80,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(62,'civicrm_participant',46,63,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(63,'civicrm_participant',49,75,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(64,'civicrm_participant',50,73,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(65,'civicrm_participant',1,82,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(66,'civicrm_participant',4,71,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(67,'civicrm_participant',7,87,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(68,'civicrm_participant',10,88,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(69,'civicrm_participant',13,60,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(70,'civicrm_participant',16,74,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(71,'civicrm_participant',19,45,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(72,'civicrm_participant',22,58,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(73,'civicrm_participant',26,50,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(74,'civicrm_participant',29,53,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(75,'civicrm_participant',32,56,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(76,'civicrm_participant',35,85,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(77,'civicrm_participant',38,51,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(78,'civicrm_participant',41,69,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(79,'civicrm_participant',44,65,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(80,'civicrm_participant',47,91,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(81,'civicrm_participant',2,86,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(82,'civicrm_participant',5,64,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(83,'civicrm_participant',8,59,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(84,'civicrm_participant',11,81,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(85,'civicrm_participant',14,76,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(86,'civicrm_participant',17,92,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(87,'civicrm_participant',20,66,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(88,'civicrm_participant',23,70,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(89,'civicrm_participant',27,49,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(90,'civicrm_participant',30,77,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(91,'civicrm_participant',33,79,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(92,'civicrm_participant',36,78,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(93,'civicrm_participant',39,48,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(94,'civicrm_participant',42,93,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(95,'civicrm_participant',45,68,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(96,'civicrm_participant',48,72,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL);
+INSERT INTO `civicrm_line_item` (`id`, `entity_table`, `entity_id`, `contribution_id`, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`, `non_deductible_amount`, `tax_amount`) VALUES (1,'civicrm_contribution',1,1,1,'Contribution Amount',1.00,125.00,125.00,0,1,1,0.00,NULL),(2,'civicrm_contribution',2,2,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(3,'civicrm_contribution',3,3,1,'Contribution Amount',1.00,25.00,25.00,0,1,1,0.00,NULL),(4,'civicrm_contribution',4,4,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(5,'civicrm_contribution',5,5,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(6,'civicrm_contribution',6,6,1,'Contribution Amount',1.00,175.00,175.00,0,1,1,0.00,NULL),(7,'civicrm_contribution',7,7,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(8,'civicrm_contribution',8,8,1,'Contribution Amount',1.00,10.00,10.00,0,1,1,0.00,NULL),(9,'civicrm_contribution',9,9,1,'Contribution Amount',1.00,250.00,250.00,0,1,1,0.00,NULL),(10,'civicrm_contribution',10,10,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(11,'civicrm_contribution',11,11,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(12,'civicrm_contribution',12,12,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(13,'civicrm_contribution',13,13,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(16,'civicrm_membership',1,14,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(17,'civicrm_membership',3,16,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(18,'civicrm_membership',7,20,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(19,'civicrm_membership',9,22,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(20,'civicrm_membership',13,26,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(21,'civicrm_membership',17,30,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(22,'civicrm_membership',19,32,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(23,'civicrm_membership',21,34,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(24,'civicrm_membership',23,36,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(25,'civicrm_membership',25,38,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(26,'civicrm_membership',27,40,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(27,'civicrm_membership',29,42,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(28,'civicrm_membership',2,15,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(29,'civicrm_membership',4,17,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(30,'civicrm_membership',5,18,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(31,'civicrm_membership',6,19,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(32,'civicrm_membership',8,21,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(33,'civicrm_membership',10,23,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(34,'civicrm_membership',12,25,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(35,'civicrm_membership',14,27,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(36,'civicrm_membership',15,28,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(37,'civicrm_membership',16,29,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(38,'civicrm_membership',18,31,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(39,'civicrm_membership',20,33,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(40,'civicrm_membership',24,37,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(41,'civicrm_membership',26,39,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(42,'civicrm_membership',28,41,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(43,'civicrm_membership',30,43,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(44,'civicrm_membership',11,24,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(45,'civicrm_membership',22,35,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(47,'civicrm_participant',3,50,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(48,'civicrm_participant',6,88,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(49,'civicrm_participant',9,75,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(50,'civicrm_participant',12,87,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(51,'civicrm_participant',15,82,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(52,'civicrm_participant',18,71,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(53,'civicrm_participant',21,69,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(54,'civicrm_participant',24,86,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(55,'civicrm_participant',25,47,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(56,'civicrm_participant',28,53,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(57,'civicrm_participant',31,49,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(58,'civicrm_participant',34,91,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(59,'civicrm_participant',37,45,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(60,'civicrm_participant',40,58,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(61,'civicrm_participant',43,46,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(62,'civicrm_participant',46,52,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(63,'civicrm_participant',49,80,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(64,'civicrm_participant',50,56,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(65,'civicrm_participant',1,83,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(66,'civicrm_participant',4,93,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(67,'civicrm_participant',7,64,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(68,'civicrm_participant',10,54,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(69,'civicrm_participant',13,67,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(70,'civicrm_participant',16,59,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(71,'civicrm_participant',19,90,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(72,'civicrm_participant',22,77,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(73,'civicrm_participant',26,60,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(74,'civicrm_participant',29,63,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(75,'civicrm_participant',32,92,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(76,'civicrm_participant',35,72,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(77,'civicrm_participant',38,76,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(78,'civicrm_participant',41,51,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(79,'civicrm_participant',44,85,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(80,'civicrm_participant',47,89,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(81,'civicrm_participant',2,57,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(82,'civicrm_participant',5,73,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(83,'civicrm_participant',8,70,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(84,'civicrm_participant',11,94,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(85,'civicrm_participant',14,81,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(86,'civicrm_participant',17,68,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(87,'civicrm_participant',20,65,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(88,'civicrm_participant',23,61,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(89,'civicrm_participant',27,74,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(90,'civicrm_participant',30,78,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(91,'civicrm_participant',33,84,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(92,'civicrm_participant',36,55,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(93,'civicrm_participant',39,62,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(94,'civicrm_participant',42,79,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(95,'civicrm_participant',45,66,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(96,'civicrm_participant',48,48,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL);
 /*!40000 ALTER TABLE `civicrm_line_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -648,7 +648,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_loc_block` WRITE;
 /*!40000 ALTER TABLE `civicrm_loc_block` DISABLE KEYS */;
-INSERT INTO `civicrm_loc_block` (`id`, `address_id`, `email_id`, `phone_id`, `im_id`, `address_2_id`, `email_2_id`, `phone_2_id`, `im_2_id`) VALUES (1,180,189,158,NULL,NULL,NULL,NULL,NULL),(2,181,190,159,NULL,NULL,NULL,NULL,NULL),(3,182,191,160,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_loc_block` (`id`, `address_id`, `email_id`, `phone_id`, `im_id`, `address_2_id`, `email_2_id`, `phone_2_id`, `im_2_id`) VALUES (1,186,186,150,NULL,NULL,NULL,NULL,NULL),(2,187,187,151,NULL,NULL,NULL,NULL,NULL),(3,188,188,152,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_loc_block` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -897,7 +897,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership` DISABLE KEYS */;
-INSERT INTO `civicrm_membership` (`id`, `contact_id`, `membership_type_id`, `join_date`, `start_date`, `end_date`, `source`, `status_id`, `is_override`, `status_override_end_date`, `owner_membership_id`, `max_related`, `is_test`, `is_pay_later`, `contribution_recur_id`, `campaign_id`) VALUES (1,103,1,'2020-07-24','2020-07-24','2022-07-23','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,132,2,'2020-07-23','2020-07-23','2021-07-22','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,179,1,'2020-07-22','2020-07-22','2022-07-21','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(4,5,2,'2020-07-21','2020-07-21','2021-07-20','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(5,12,1,'2018-06-22','2018-06-22','2020-06-21','Check',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,108,2,'2020-07-19','2020-07-19','2021-07-18','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,173,1,'2020-07-18','2020-07-18','2022-07-17','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(8,39,2,'2020-07-17','2020-07-17','2021-07-16','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,127,1,'2020-07-16','2020-07-16','2022-07-15','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(10,63,1,'2018-05-13','2018-05-13','2020-05-12','Check',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(11,145,3,'2020-07-14','2020-07-14',NULL,'Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(12,159,2,'2020-07-13','2020-07-13','2021-07-12','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(13,188,1,'2020-07-12','2020-07-12','2022-07-11','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(14,67,2,'2020-07-11','2020-07-11','2021-07-10','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(15,80,1,'2018-04-03','2018-04-03','2020-04-02','Donation',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(16,17,2,'2020-07-09','2020-07-09','2021-07-08','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(17,131,1,'2020-07-08','2020-07-08','2022-07-07','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(18,7,2,'2020-07-07','2020-07-07','2021-07-06','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(19,161,1,'2020-07-06','2020-07-06','2022-07-05','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(20,95,2,'2019-07-05','2019-07-05','2020-07-04','Check',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(21,41,1,'2020-07-04','2020-07-04','2022-07-03','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(22,99,3,'2020-07-03','2020-07-03',NULL,'Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(23,20,1,'2020-07-02','2020-07-02','2022-07-01','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(24,134,2,'2020-07-01','2020-07-01','2021-06-30','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(25,195,1,'2018-01-13','2018-01-13','2020-01-12','Check',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(26,74,2,'2020-06-29','2020-06-29','2021-06-28','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(27,164,1,'2020-06-28','2020-06-28','2022-06-27','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(28,13,2,'2020-06-27','2020-06-27','2021-06-26','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(29,78,1,'2020-06-26','2020-06-26','2022-06-25','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(30,156,2,'2019-06-25','2019-06-25','2020-06-24','Check',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL);
+INSERT INTO `civicrm_membership` (`id`, `contact_id`, `membership_type_id`, `join_date`, `start_date`, `end_date`, `source`, `status_id`, `is_override`, `status_override_end_date`, `owner_membership_id`, `max_related`, `is_test`, `is_pay_later`, `contribution_recur_id`, `campaign_id`) VALUES (1,73,1,'2020-09-16','2020-09-16','2022-09-15','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,92,2,'2020-09-15','2020-09-15','2021-09-14','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,48,1,'2020-09-14','2020-09-14','2022-09-13','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(4,51,2,'2020-09-13','2020-09-13','2021-09-12','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(5,163,2,'2019-09-12','2019-09-12','2020-09-11','Check',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,40,2,'2020-09-11','2020-09-11','2021-09-10','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,190,1,'2020-09-10','2020-09-10','2022-09-09','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(8,33,2,'2020-09-09','2020-09-09','2021-09-08','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,175,1,'2020-09-08','2020-09-08','2022-09-07','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(10,103,2,'2019-09-07','2019-09-07','2020-09-06','Donation',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(11,194,3,'2020-09-06','2020-09-06',NULL,'Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(12,56,2,'2020-09-05','2020-09-05','2021-09-04','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(13,120,1,'2020-09-04','2020-09-04','2022-09-03','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(14,105,2,'2020-09-03','2020-09-03','2021-09-02','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(15,184,2,'2019-09-02','2019-09-02','2020-09-01','Donation',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(16,177,2,'2020-09-01','2020-09-01','2021-08-31','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(17,153,1,'2020-08-31','2020-08-31','2022-08-30','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(18,106,2,'2020-08-30','2020-08-30','2021-08-29','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(19,13,1,'2020-08-29','2020-08-29','2022-08-28','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(20,64,2,'2019-08-28','2019-08-28','2020-08-27','Payment',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(21,200,1,'2020-08-27','2020-08-27','2022-08-26','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(22,142,3,'2020-08-26','2020-08-26',NULL,'Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(23,111,1,'2020-08-25','2020-08-25','2022-08-24','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(24,132,2,'2020-08-24','2020-08-24','2021-08-23','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(25,141,1,'2018-03-08','2018-03-08','2020-03-07','Payment',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(26,3,2,'2020-08-22','2020-08-22','2021-08-21','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(27,86,1,'2020-08-21','2020-08-21','2022-08-20','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(28,168,2,'2020-08-20','2020-08-20','2021-08-19','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(29,16,1,'2020-08-19','2020-08-19','2022-08-18','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(30,68,2,'2019-08-18','2019-08-18','2020-08-17','Payment',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_membership` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -917,7 +917,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership_log` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership_log` DISABLE KEYS */;
-INSERT INTO `civicrm_membership_log` (`id`, `membership_id`, `status_id`, `start_date`, `end_date`, `modified_id`, `modified_date`, `membership_type_id`, `max_related`) VALUES (1,4,1,'2020-07-21','2021-07-20',5,'2020-07-24',2,NULL),(2,18,1,'2020-07-07','2021-07-06',7,'2020-07-24',2,NULL),(3,5,3,'2018-06-22','2020-06-21',12,'2020-07-24',1,NULL),(4,28,1,'2020-06-27','2021-06-26',13,'2020-07-24',2,NULL),(5,16,1,'2020-07-09','2021-07-08',17,'2020-07-24',2,NULL),(6,23,1,'2020-07-02','2022-07-01',20,'2020-07-24',1,NULL),(7,8,1,'2020-07-17','2021-07-16',39,'2020-07-24',2,NULL),(8,21,1,'2020-07-04','2022-07-03',41,'2020-07-24',1,NULL),(9,10,3,'2018-05-13','2020-05-12',63,'2020-07-24',1,NULL),(10,14,1,'2020-07-11','2021-07-10',67,'2020-07-24',2,NULL),(11,26,1,'2020-06-29','2021-06-28',74,'2020-07-24',2,NULL),(12,29,1,'2020-06-26','2022-06-25',78,'2020-07-24',1,NULL),(13,15,3,'2018-04-03','2020-04-02',80,'2020-07-24',1,NULL),(14,20,4,'2019-07-05','2020-07-04',95,'2020-07-24',2,NULL),(15,22,1,'2020-07-03',NULL,99,'2020-07-24',3,NULL),(16,1,1,'2020-07-24','2022-07-23',103,'2020-07-24',1,NULL),(17,6,1,'2020-07-19','2021-07-18',108,'2020-07-24',2,NULL),(18,9,1,'2020-07-16','2022-07-15',127,'2020-07-24',1,NULL),(19,17,1,'2020-07-08','2022-07-07',131,'2020-07-24',1,NULL),(20,2,1,'2020-07-23','2021-07-22',132,'2020-07-24',2,NULL),(21,24,1,'2020-07-01','2021-06-30',134,'2020-07-24',2,NULL),(22,11,1,'2020-07-14',NULL,145,'2020-07-24',3,NULL),(23,30,4,'2019-06-25','2020-06-24',156,'2020-07-24',2,NULL),(24,12,1,'2020-07-13','2021-07-12',159,'2020-07-24',2,NULL),(25,19,1,'2020-07-06','2022-07-05',161,'2020-07-24',1,NULL),(26,27,1,'2020-06-28','2022-06-27',164,'2020-07-24',1,NULL),(27,7,1,'2020-07-18','2022-07-17',173,'2020-07-24',1,NULL),(28,3,1,'2020-07-22','2022-07-21',179,'2020-07-24',1,NULL),(29,13,1,'2020-07-12','2022-07-11',188,'2020-07-24',1,NULL),(30,25,3,'2018-01-13','2020-01-12',195,'2020-07-24',1,NULL);
+INSERT INTO `civicrm_membership_log` (`id`, `membership_id`, `status_id`, `start_date`, `end_date`, `modified_id`, `modified_date`, `membership_type_id`, `max_related`) VALUES (1,26,1,'2020-08-22','2021-08-21',3,'2020-09-16',2,NULL),(2,19,1,'2020-08-29','2022-08-28',13,'2020-09-16',1,NULL),(3,29,1,'2020-08-19','2022-08-18',16,'2020-09-16',1,NULL),(4,8,1,'2020-09-09','2021-09-08',33,'2020-09-16',2,NULL),(5,6,1,'2020-09-11','2021-09-10',40,'2020-09-16',2,NULL),(6,3,1,'2020-09-14','2022-09-13',48,'2020-09-16',1,NULL),(7,4,1,'2020-09-13','2021-09-12',51,'2020-09-16',2,NULL),(8,12,1,'2020-09-05','2021-09-04',56,'2020-09-16',2,NULL),(9,20,4,'2019-08-28','2020-08-27',64,'2020-09-16',2,NULL),(10,30,4,'2019-08-18','2020-08-17',68,'2020-09-16',2,NULL),(11,1,1,'2020-09-16','2022-09-15',73,'2020-09-16',1,NULL),(12,27,1,'2020-08-21','2022-08-20',86,'2020-09-16',1,NULL),(13,2,1,'2020-09-15','2021-09-14',92,'2020-09-16',2,NULL),(14,10,4,'2019-09-07','2020-09-06',103,'2020-09-16',2,NULL),(15,14,1,'2020-09-03','2021-09-02',105,'2020-09-16',2,NULL),(16,18,1,'2020-08-30','2021-08-29',106,'2020-09-16',2,NULL),(17,23,1,'2020-08-25','2022-08-24',111,'2020-09-16',1,NULL),(18,13,1,'2020-09-04','2022-09-03',120,'2020-09-16',1,NULL),(19,24,1,'2020-08-24','2021-08-23',132,'2020-09-16',2,NULL),(20,25,3,'2018-03-08','2020-03-07',141,'2020-09-16',1,NULL),(21,22,1,'2020-08-26',NULL,142,'2020-09-16',3,NULL),(22,17,1,'2020-08-31','2022-08-30',153,'2020-09-16',1,NULL),(23,5,4,'2019-09-12','2020-09-11',163,'2020-09-16',2,NULL),(24,28,1,'2020-08-20','2021-08-19',168,'2020-09-16',2,NULL),(25,9,1,'2020-09-08','2022-09-07',175,'2020-09-16',1,NULL),(26,16,1,'2020-09-01','2021-08-31',177,'2020-09-16',2,NULL),(27,15,4,'2019-09-02','2020-09-01',184,'2020-09-16',2,NULL),(28,7,1,'2020-09-10','2022-09-09',190,'2020-09-16',1,NULL),(29,11,1,'2020-09-06',NULL,194,'2020-09-16',3,NULL),(30,21,1,'2020-08-27','2022-08-26',200,'2020-09-16',1,NULL);
 /*!40000 ALTER TABLE `civicrm_membership_log` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -927,7 +927,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership_payment` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership_payment` DISABLE KEYS */;
-INSERT INTO `civicrm_membership_payment` (`id`, `membership_id`, `contribution_id`) VALUES (1,1,14),(2,3,15),(3,5,16),(4,7,17),(5,9,18),(6,10,19),(7,13,20),(8,15,21),(9,17,22),(10,19,23),(11,21,24),(12,23,25),(13,25,26),(14,27,27),(15,29,28),(16,2,29),(17,4,30),(18,6,31),(19,8,32),(20,12,33),(21,14,34),(22,16,35),(23,18,36),(24,20,37),(25,24,38),(26,26,39),(27,28,40),(28,30,41),(29,11,42),(30,22,43);
+INSERT INTO `civicrm_membership_payment` (`id`, `membership_id`, `contribution_id`) VALUES (1,1,14),(2,2,15),(3,3,16),(4,4,17),(5,5,18),(6,6,19),(7,7,20),(8,8,21),(9,9,22),(10,10,23),(11,11,24),(12,12,25),(13,13,26),(14,14,27),(15,15,28),(16,16,29),(17,17,30),(18,18,31),(19,19,32),(20,20,33),(21,21,34),(22,22,35),(23,23,36),(24,24,37),(25,25,38),(26,26,39),(27,27,40),(28,28,41),(29,29,42),(30,30,43);
 /*!40000 ALTER TABLE `civicrm_membership_payment` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -957,7 +957,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_menu` WRITE;
 /*!40000 ALTER TABLE `civicrm_menu` DISABLE KEYS */;
-INSERT INTO `civicrm_menu` (`id`, `domain_id`, `path`, `path_arguments`, `title`, `access_callback`, `access_arguments`, `page_callback`, `page_arguments`, `breadcrumb`, `return_url`, `return_url_args`, `component_id`, `is_active`, `is_public`, `is_exposed`, `is_ssl`, `weight`, `type`, `page_type`, `skipBreadcrumb`, `module_data`) VALUES (1,1,'civicrm/profile',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(2,1,'civicrm/profile/create',NULL,'CiviCRM Profile Create','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(3,1,'civicrm/profile/view',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Profile_Page_View\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(4,1,'civicrm/ajax/api4',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','s:18:\"CRM_Api4_Page_AJAX\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(5,1,'civicrm/api4',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Api4_Page_Api4Explorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(6,1,'civicrm/activity','action=add&context=standalone','New Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(7,1,'civicrm/activity/view',NULL,'View Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Form_ActivityView\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(8,1,'civicrm/ajax/activity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:15:\"getCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(9,1,'civicrm/ajax/globalrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseGlobalRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(10,1,'civicrm/ajax/clientrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseClientRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(11,1,'civicrm/ajax/caseroles',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:12:\"getCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(12,1,'civicrm/ajax/contactactivity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:18:\"getContactActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(13,1,'civicrm/ajax/activity/convert',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:21:\"convertToCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(14,1,'civicrm/activity/search',NULL,'Find Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Controller_Search\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(15,1,'civicrm/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(16,1,'civicrm/pcp/campaign',NULL,'Setup a Personal Campaign Page - Account Information','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(17,1,'civicrm/pcp/info',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_PCP_Page_PCPInfo\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(18,1,'civicrm/admin/pcp','context=contribute','Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Page_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,362,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(19,1,'civicrm/upgrade',NULL,'Upgrade CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Upgrade_Page_Upgrade\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(20,1,'civicrm/export',NULL,'Download Errors','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(21,1,'civicrm/export/contact',NULL,'Export Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(22,1,'civicrm/export/standalone',NULL,'Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Export_Controller_Standalone\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(23,1,'civicrm/admin/options/acl_role',NULL,'ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(24,1,'civicrm/acl',NULL,'Manage ACLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_ACL_Page_ACL\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(25,1,'civicrm/acl/entityrole',NULL,'Assign Users to ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_ACL_Page_EntityRole\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(26,1,'civicrm/acl/basic',NULL,'ACL','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_ACL_Page_ACLBasic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(27,1,'civicrm/file',NULL,'Browse Uploaded files','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_Page_File\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(28,1,'civicrm/file/delete',NULL,'Delete File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:17:\"CRM_Core_BAO_File\";i:1;s:16:\"deleteAttachment\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:21:\"Browse Uploaded files\";s:3:\"url\";s:21:\"/civicrm/file?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(29,1,'civicrm/friend',NULL,'Tell a Friend','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:15:\"CRM_Friend_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(30,1,'civicrm/logout',NULL,'Log out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:6:\"logout\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,9999,1,1,NULL,'a:0:{}'),(31,1,'civicrm/i18n',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"translate CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_I18n_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(32,1,'civicrm/ajax/attachment',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:29:\"CRM_Core_Page_AJAX_Attachment\";i:1;s:10:\"attachFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(33,1,'civicrm/api',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(34,1,'civicrm/api3',NULL,'CiviCRM API v3','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_APIExplorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(35,1,'civicrm/ajax/apiexample',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:14:\"getExampleFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(36,1,'civicrm/ajax/apidoc',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:6:\"getDoc\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(37,1,'civicrm/ajax/rest',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:4:\"ajax\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(38,1,'civicrm/api/json',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:8:\"ajaxJson\";}','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(39,1,'civicrm/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:12:\"loadTemplate\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(40,1,'civicrm/ajax/chart',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(41,1,'civicrm/asset/builder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"\\Civi\\Core\\AssetBuilder\";i:1;s:7:\"pageRun\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(42,1,'civicrm/contribute/ajax/tableview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(43,1,'civicrm/payment/ipn',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Core_Payment\";i:1;s:9:\"handleIPN\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(44,1,'civicrm/batch',NULL,'Batch Data Entry','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(45,1,'civicrm/batch/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Batch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(46,1,'civicrm/batch/entry',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Entry\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(47,1,'civicrm/ajax/batch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:9:\"batchSave\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(48,1,'civicrm/ajax/batchlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:12:\"getBatchList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(49,1,'civicrm/ajax/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Page_AJAX\";i:1;s:3:\"run\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(50,1,'civicrm/dev/qunit',NULL,'QUnit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:19:\"CRM_Core_Page_QUnit\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(51,1,'civicrm/profile-editor/schema',NULL,'ProfileEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:25:\"CRM_UF_Page_ProfileEditor\";i:1;s:13:\"getSchemaJSON\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(52,1,'civicrm/a',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"\\Civi\\Angular\\Page\\Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(53,1,'civicrm/ajax/angular-modules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"\\Civi\\Angular\\Page\\Modules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(54,1,'civicrm/ajax/recurringentity/update-mode',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:34:\"CRM_Core_Page_AJAX_RecurringEntity\";i:1;s:10:\"updateMode\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(55,1,'civicrm/recurringentity/preview',NULL,'Confirm dates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Core_Page_RecurringEntityPreview\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(56,1,'civicrm/ajax/l10n-js',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Resources\";i:1;s:20:\"outputLocalizationJS\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(57,1,'civicrm/shortcode',NULL,'Insert CiviCRM Content','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Core_Form_ShortCode\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(58,1,'civicrm/task/add-to-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Form_Task_AddToGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(59,1,'civicrm/task/remove-from-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contact_Form_Task_RemoveFromGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(60,1,'civicrm/task/add-to-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Contact_Form_Task_AddToTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(61,1,'civicrm/task/remove-from-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Form_Task_RemoveFromTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(62,1,'civicrm/task/send-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(63,1,'civicrm/task/make-mailing-label',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Label\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(64,1,'civicrm/task/pick-profile',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contact_Form_Task_PickProfile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(65,1,'civicrm/task/print-document',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(66,1,'civicrm/task/unhold-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Unhold\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(67,1,'civicrm/task/alter-contact-preference',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contact_Form_Task_AlterPreferences\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(68,1,'civicrm/task/delete-contact',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(69,1,'civicrm/payment/form',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:26:\"CRM_Financial_Form_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(70,1,'civicrm/payment/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:30:\"CRM_Financial_Form_PaymentEdit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(71,1,'civicrm/import',NULL,'Import','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,400,1,1,NULL,'a:0:{}'),(72,1,'civicrm/import/contact',NULL,'Import Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,410,1,1,NULL,'a:0:{}'),(73,1,'civicrm/import/activity',NULL,'Import Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(74,1,'civicrm/import/custom','id=%%id%%','Import Multi-value Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Custom_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(75,1,'civicrm/ajax/status',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Contact_Import_Page_AJAX\";i:1;s:6:\"status\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(76,1,'civicrm/custom/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Custom_Form_CustomData\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(77,1,'civicrm/ajax/optionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:13:\"getOptionList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(78,1,'civicrm/ajax/reorder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:11:\"fixOrdering\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(79,1,'civicrm/ajax/multirecordfieldlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:23:\"getMultiRecordFieldList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(80,1,'civicrm/admin/custom/group',NULL,'Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(81,1,'civicrm/admin/custom/group/field',NULL,'Custom Data Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,11,1,0,0,'a:0:{}'),(82,1,'civicrm/admin/custom/group/field/option',NULL,'Custom Field - Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Custom_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(83,1,'civicrm/admin/custom/group/field/add',NULL,'Custom Field - Add','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(84,1,'civicrm/admin/custom/group/field/update',NULL,'Custom Field - Edit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(85,1,'civicrm/admin/custom/group/field/move',NULL,'Custom Field - Move','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Custom_Form_MoveField\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(86,1,'civicrm/admin/custom/group/field/changetype',NULL,'Custom Field - Change Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Custom_Form_ChangeFieldType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(87,1,'civicrm/admin/uf/group',NULL,'Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(88,1,'civicrm/admin/uf/group/field',NULL,'CiviCRM Profile Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,21,1,0,0,'a:0:{}'),(89,1,'civicrm/admin/uf/group/field/add',NULL,'Add Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,22,1,0,NULL,'a:0:{}'),(90,1,'civicrm/admin/uf/group/field/update',NULL,'Edit Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,23,1,0,NULL,'a:0:{}'),(91,1,'civicrm/admin/uf/group/add',NULL,'New CiviCRM Profile','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,24,1,0,NULL,'a:0:{}'),(92,1,'civicrm/admin/uf/group/update',NULL,'Profile Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,25,1,0,NULL,'a:0:{}'),(93,1,'civicrm/admin/uf/group/setting',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_UF_Form_AdvanceSetting\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,0,NULL,'a:0:{}'),(94,1,'civicrm/admin/options/activity_type',NULL,'Activity Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(95,1,'civicrm/admin/reltype',NULL,'Relationship Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_RelationshipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,35,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(96,1,'civicrm/admin/options/subtype',NULL,'Contact Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_ContactType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(97,1,'civicrm/admin/options/gender',NULL,'Gender Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,45,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(98,1,'civicrm/admin/options/individual_prefix',NULL,'Individual Prefixes (Ms, Mr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(99,1,'civicrm/admin/options/individual_suffix',NULL,'Individual Suffixes (Jr, Sr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,55,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(100,1,'civicrm/admin/locationType',NULL,'Location Types (Home, Work...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LocationType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(101,1,'civicrm/admin/options/website_type',NULL,'Website Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,65,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(102,1,'civicrm/admin/options/instant_messenger_service',NULL,'Instant Messenger Services','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(103,1,'civicrm/admin/options/mobile_provider',NULL,'Mobile Phone Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(104,1,'civicrm/admin/options/phone_type',NULL,'Phone Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(105,1,'civicrm/admin/setting/preferences/display',NULL,'Display Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Display\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(106,1,'civicrm/admin/setting/search',NULL,'Search Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_Setting_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,95,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(107,1,'civicrm/admin/setting/preferences/date',NULL,'View Date Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Page_PreferencesDate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(108,1,'civicrm/admin/menu',NULL,'Navigation Menu','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Navigation\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(109,1,'civicrm/admin/options/wordreplacements',NULL,'Word Replacements','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Form_WordReplacements\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:18:\"Word Replacements.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(110,1,'civicrm/admin/options/custom_search',NULL,'Manage Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(111,1,'civicrm/admin/domain','action=update','Organization Address and Contact Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contact_Form_Domain\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(112,1,'civicrm/admin/options/from_email_address',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(113,1,'civicrm/admin/messageTemplates',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Page_MessageTemplates\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(114,1,'civicrm/admin/messageTemplates/add',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Form_MessageTemplates\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Message Templates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,262,1,0,NULL,'a:1:{s:4:\"desc\";s:26:\"Add/Edit Message Templates\";}'),(115,1,'civicrm/admin/scheduleReminders',NULL,'Schedule Reminders','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:15:\"edit all events\";}i:1;s:2:\"or\";}','s:32:\"CRM_Admin_Page_ScheduleReminders\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:19:\"Schedule Reminders.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(116,1,'civicrm/admin/weight',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_Weight\";i:1;s:8:\"fixOrder\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(117,1,'civicrm/admin/options/preferred_communication_method',NULL,'Preferred Communication Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(118,1,'civicrm/admin/labelFormats',NULL,'Label Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LabelFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(119,1,'civicrm/admin/pdfFormats',NULL,'Print Page (PDF) Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_PdfFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(120,1,'civicrm/admin/options/communication_style',NULL,'Communication Style Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(121,1,'civicrm/admin/options/email_greeting',NULL,'Email Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(122,1,'civicrm/admin/options/postal_greeting',NULL,'Postal Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:2:{s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(123,1,'civicrm/admin/options/addressee',NULL,'Addressee Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(124,1,'civicrm/admin/setting/localization',NULL,'Languages, Currency, Locations','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Form_Setting_Localization\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(125,1,'civicrm/admin/setting/preferences/address',NULL,'Address Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Address\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(126,1,'civicrm/admin/setting/date',NULL,'Date Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Date\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(127,1,'civicrm/admin/options/languages',NULL,'Preferred Languages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:30:\"Options for contact languages.\";s:10:\"adminGroup\";s:12:\"Localization\";}'),(128,1,'civicrm/admin/access',NULL,'Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_Access\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(129,1,'civicrm/admin/access/wp-permissions',NULL,'WordPress Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_ACL_Form_WordPress_Permissions\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Access Control\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:4:\"desc\";s:65:\"Grant access to CiviCRM components and other CiviCRM permissions.\";}'),(130,1,'civicrm/admin/synchUser',NULL,'Synchronize Users to Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_CMSUser\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(131,1,'civicrm/admin/configtask',NULL,'Configuration Checklist','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Page_ConfigTaskList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}','civicrm/admin/configtask',NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(132,1,'civicrm/admin/setting/component',NULL,'Enable CiviCRM Components','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(133,1,'civicrm/admin/extensions',NULL,'Manage Extensions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Extensions\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:2:{s:4:\"desc\";s:0:\"\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(134,1,'civicrm/admin/extensions/upgrade',NULL,'Database Upgrades','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Page_ExtensionsUpgrade\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Manage Extensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(135,1,'civicrm/admin/setting/smtp',NULL,'Outbound Email Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Smtp\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(136,1,'civicrm/admin/paymentProcessor',NULL,'Settings - Payment Processor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:29:\"administer payment processors\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_PaymentProcessor\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(137,1,'civicrm/admin/setting/mapping',NULL,'Mapping and Geocoding','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Form_Setting_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(138,1,'civicrm/admin/setting/misc',NULL,'Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Form_Setting_Miscellaneous\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(139,1,'civicrm/admin/setting/path',NULL,'Directories','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Path\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(140,1,'civicrm/admin/setting/url',NULL,'Resource URLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Form_Setting_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(141,1,'civicrm/admin/setting/updateConfigBackend',NULL,'Cleanup Caches and Update Paths','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Admin_Form_Setting_UpdateConfigBackend\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(142,1,'civicrm/admin/setting/uf',NULL,'CMS Database Integration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Form_Setting_UF\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(143,1,'civicrm/admin/options/safe_file_extension',NULL,'Safe File Extension Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(144,1,'civicrm/admin/options',NULL,'Option Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(145,1,'civicrm/admin/mapping',NULL,'Import/Export Mappings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(146,1,'civicrm/admin/setting/debug',NULL,'Debugging','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Debugging\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(147,1,'civicrm/admin/setting/preferences/multisite',NULL,'Multi Site Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,130,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(148,1,'civicrm/admin/setting/preferences/campaign',NULL,'CiviCampaign Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:3:{s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(149,1,'civicrm/admin/setting/preferences/event',NULL,'CiviEvent Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(150,1,'civicrm/admin/setting/preferences/mailing',NULL,'CiviMail Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Mailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:2:{s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(151,1,'civicrm/admin/setting/preferences/member',NULL,'CiviMember Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Admin_Form_Preferences_Member\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(152,1,'civicrm/admin/runjobs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:20:\"executeScheduledJobs\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:36:\"URL used for running scheduled jobs.\";}'),(153,1,'civicrm/admin/job',NULL,'Scheduled Jobs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Admin_Page_Job\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1370,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(154,1,'civicrm/admin/joblog',NULL,'Scheduled Jobs Log','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_JobLog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1380,1,0,NULL,'a:2:{s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(155,1,'civicrm/admin/options/grant_type',NULL,'Grant Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:10:\"adminGroup\";s:12:\"Option Lists\";}'),(156,1,'civicrm/admin/paymentProcessorType',NULL,'Payment Processor Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Page_PaymentProcessorType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:1:{s:4:\"desc\";s:34:\"Payment Processor type information\";}'),(157,1,'civicrm/admin',NULL,'Administer CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Admin_Page_Admin\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,9000,1,1,NULL,'a:0:{}'),(158,1,'civicrm/ajax/navmenu',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:7:\"navMenu\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(159,1,'civicrm/ajax/menutree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:8:\"menuTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(160,1,'civicrm/ajax/statusmsg',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:12:\"getStatusMsg\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(161,1,'civicrm/admin/price',NULL,'Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:10:\"adminGroup\";s:9:\"Customize\";}'),(162,1,'civicrm/admin/price/add','action=add','New Price Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";}'),(163,1,'civicrm/admin/price/field',NULL,'Price Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:20:\"CRM_Price_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,0,'a:0:{}'),(164,1,'civicrm/admin/price/field/option',NULL,'Price Field Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Price_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(165,1,'civicrm/ajax/mapping',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:11:\"mappingList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(166,1,'civicrm/ajax/recipientListing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:16:\"recipientListing\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(167,1,'civicrm/admin/sms/provider',NULL,'Sms Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Provider\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,500,1,0,NULL,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(168,1,'civicrm/sms/send',NULL,'New Mass SMS','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:23:\"CRM_SMS_Controller_Send\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(169,1,'civicrm/sms/callback',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Callback\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(170,1,'civicrm/admin/badgelayout','action=browse','Event Name Badge Layouts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Page_Layout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,399,1,0,NULL,'a:2:{s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(171,1,'civicrm/admin/badgelayout/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Form_Layout\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?reset=1&amp;action=browse\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(172,1,'civicrm/admin/ckeditor',NULL,'Configure CKEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Page_CKEditorConfig\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(173,1,'civicrm',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:0:{}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(174,1,'civicrm/dashboard',NULL,'CiviCRM Home','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,NULL,'a:0:{}'),(175,1,'civicrm/dashlet',NULL,'CiviCRM Dashlets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Page_Dashlet\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,1,NULL,'a:0:{}'),(176,1,'civicrm/contact/search',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,10,1,1,NULL,'a:0:{}'),(177,1,'civicrm/contact/image',NULL,'Process Uploaded Images','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"CRM_Contact_BAO_Contact\";i:1;s:12:\"processImage\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(178,1,'civicrm/contact/imagefile',NULL,'Get Image File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_ImageFile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(179,1,'civicrm/contact/search/basic',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(180,1,'civicrm/contact/search/advanced',NULL,'Advanced Search','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=512\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,12,1,1,NULL,'a:0:{}'),(181,1,'civicrm/contact/search/builder',NULL,'Search Builder','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:9:\"mode=8192\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,14,1,1,NULL,'a:0:{}'),(182,1,'civicrm/contact/search/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(183,1,'civicrm/contact/search/custom/list',NULL,'Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Page_CustomSearch\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,16,1,1,NULL,'a:0:{}'),(184,1,'civicrm/contact/add',NULL,'New Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(185,1,'civicrm/contact/add/individual','ct=Individual','New Individual','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(186,1,'civicrm/contact/add/household','ct=Household','New Household','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(187,1,'civicrm/contact/add/organization','ct=Organization','New Organization','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(188,1,'civicrm/contact/relatedcontact',NULL,'Edit Related Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_RelatedContact\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(189,1,'civicrm/contact/merge',NULL,'Merge Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:22:\"CRM_Contact_Form_Merge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(190,1,'civicrm/contact/email',NULL,'Email a Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(191,1,'civicrm/contact/map',NULL,'Map Location(s)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_Map\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(192,1,'civicrm/contact/map/event',NULL,'Map Event Location','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_Task_Map_Event\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Map Location(s)\";s:3:\"url\";s:28:\"/civicrm/contact/map?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(193,1,'civicrm/contact/view','cid=%%cid%%','Contact Summary','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Summary\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(194,1,'civicrm/contact/view/delete',NULL,'Delete Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(195,1,'civicrm/contact/view/activity','show=1,cid=%%cid%%','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:21:\"CRM_Activity_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(196,1,'civicrm/activity/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(197,1,'civicrm/activity/email/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(198,1,'civicrm/activity/pdf/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(199,1,'civicrm/contact/view/rel','cid=%%cid%%','Relationships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_Relationship\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(200,1,'civicrm/contact/view/group','cid=%%cid%%','Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_GroupContact\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(201,1,'civicrm/contact/view/smartgroup','cid=%%cid%%','Smart Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:39:\"CRM_Contact_Page_View_ContactSmartGroup\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(202,1,'civicrm/contact/view/note','cid=%%cid%%','Notes','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:26:\"CRM_Contact_Page_View_Note\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(203,1,'civicrm/contact/view/tag','cid=%%cid%%','Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Tag\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(204,1,'civicrm/contact/view/cd',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:32:\"CRM_Contact_Page_View_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(205,1,'civicrm/contact/view/cd/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Form_CustomData\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(206,1,'civicrm/contact/view/vcard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Vcard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(207,1,'civicrm/contact/view/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Print\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(208,1,'civicrm/contact/view/log',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Log\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(209,1,'civicrm/user',NULL,'Contact Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Page_View_UserDashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(210,1,'civicrm/dashlet/activity',NULL,'Activity Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(211,1,'civicrm/dashlet/blog',NULL,'CiviCRM Blog','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Dashlet_Page_Blog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(212,1,'civicrm/dashlet/getting-started',NULL,'CiviCRM Resources','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Dashlet_Page_GettingStarted\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(213,1,'civicrm/ajax/relation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"relationship\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(214,1,'civicrm/ajax/groupTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"groupTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(215,1,'civicrm/ajax/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:11:\"customField\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(216,1,'civicrm/ajax/customvalue',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:17:\"deleteCustomValue\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(217,1,'civicrm/ajax/cmsuser',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"checkUserName\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(218,1,'civicrm/ajax/checkemail',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactEmail\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(219,1,'civicrm/ajax/checkphone',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactPhone\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(220,1,'civicrm/ajax/subtype',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"buildSubTypes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(221,1,'civicrm/ajax/dashboard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"dashboard\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(222,1,'civicrm/ajax/signature',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"getSignature\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(223,1,'civicrm/ajax/pdfFormat',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"pdfFormat\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(224,1,'civicrm/ajax/paperSize',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"paperSize\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(225,1,'civicrm/ajax/contactref',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:31:\"access contact reference fields\";i:1;s:15:\" access CiviCRM\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"contactReference\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(226,1,'civicrm/dashlet/myCases',NULL,'Case Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Dashlet_Page_MyCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(227,1,'civicrm/dashlet/allCases',NULL,'All Cases Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_AllCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(228,1,'civicrm/dashlet/casedashboard',NULL,'Case Dashboard Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Dashlet_Page_CaseDashboard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(229,1,'civicrm/contact/deduperules',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer dedupe rules\";i:1;s:24:\"merge duplicate contacts\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Page_DedupeRules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,105,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(230,1,'civicrm/contact/dedupefind',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Page_DedupeFind\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(231,1,'civicrm/ajax/dedupefind',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:10:\"getDedupes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(232,1,'civicrm/contact/dedupemerge',NULL,'Batch Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Page_DedupeMerge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(233,1,'civicrm/dedupe/exception',NULL,'Dedupe Exceptions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Page_DedupeException\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,110,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:6:\"Manage\";}'),(234,1,'civicrm/ajax/dedupeRules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"buildDedupeRules\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(235,1,'civicrm/contact/view/useradd','cid=%%cid%%','Add User','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Useradd\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(236,1,'civicrm/ajax/markSelection',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:22:\"selectUnselectContacts\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(237,1,'civicrm/ajax/toggleDedupeSelect',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:18:\"toggleDedupeSelect\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(238,1,'civicrm/ajax/flipDupePairs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"flipDupePairs\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(239,1,'civicrm/activity/sms/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_SMS\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(240,1,'civicrm/ajax/contactrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"view my contact\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:23:\"getContactRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(241,1,'civicrm/ajax/jqState',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:7:\"jqState\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(242,1,'civicrm/ajax/jqCounty',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:8:\"jqCounty\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(243,1,'civicrm/group',NULL,'Manage Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Page_Group\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,30,1,1,NULL,'a:0:{}'),(244,1,'civicrm/group/search',NULL,'Group Members','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:7:\"comment\";s:164:\"Note: group search already respect ACL, so a strict permission at url level is not required. A simple/basic permission like \'access CiviCRM\' could be used. CRM-5417\";}'),(245,1,'civicrm/group/add',NULL,'New Group','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:11:\"edit groups\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(246,1,'civicrm/ajax/grouplist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Group_Page_AJAX\";i:1;s:12:\"getGroupList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(247,1,'civicrm/tag',NULL,'Tags (Categories)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:16:\"CRM_Tag_Page_Tag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,25,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(248,1,'civicrm/tag/edit','action=add','New Tag','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:17:\"CRM_Tag_Form_Edit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(249,1,'civicrm/tag/merge',NULL,'Merge Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:18:\"CRM_Tag_Form_Merge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(250,1,'civicrm/ajax/tagTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:10:\"getTagTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(251,1,'civicrm/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Custom_Form_CustomDataByType\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(252,1,'civicrm/event/manage/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_PCP_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,540,1,1,NULL,'a:0:{}'),(253,1,'civicrm/event/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(254,1,'civicrm/event/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(255,1,'civicrm/event',NULL,'CiviEvent Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,800,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(256,1,'civicrm/participant/add','action=add','Register New Participant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(257,1,'civicrm/event/info',NULL,'Event Information','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(258,1,'civicrm/event/register',NULL,'Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Controller_Registration\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(259,1,'civicrm/event/confirm',NULL,'Confirm Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:46:\"CRM_Event_Form_Registration_ParticipantConfirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(260,1,'civicrm/event/ical',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_ICalendar\";i:1;s:3:\"run\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(261,1,'civicrm/event/list',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','s:19:\"CRM_Event_Page_List\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(262,1,'civicrm/event/participant',NULL,'Event Participants List','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"view event participants\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Page_ParticipantListing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(263,1,'civicrm/admin/event',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(264,1,'civicrm/admin/eventTemplate',NULL,'Event Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Admin_Page_EventTemplate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,375,1,0,NULL,'a:2:{s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(265,1,'civicrm/admin/options/event_type',NULL,'Event Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(266,1,'civicrm/admin/participant_status',NULL,'Participant Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Page_ParticipantStatusType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(267,1,'civicrm/admin/options/participant_role',NULL,'Participant Role','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(268,1,'civicrm/admin/options/participant_listing',NULL,'Participant Listing Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,398,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(269,1,'civicrm/admin/options/conference_slot',NULL,'Conference Slot Labels','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(270,1,'civicrm/event/search',NULL,'Find Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,810,1,1,NULL,'a:0:{}'),(271,1,'civicrm/event/manage',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,820,1,1,NULL,'a:0:{}'),(272,1,'civicrm/event/badge',NULL,'Print Event Name Badge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:25:\"CRM_Event_Form_Task_Badge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(273,1,'civicrm/event/manage/settings',NULL,'Event Info and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,910,1,0,NULL,'a:0:{}'),(274,1,'civicrm/event/manage/location',NULL,'Event Location','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:35:\"CRM_Event_Form_ManageEvent_Location\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(275,1,'civicrm/event/manage/fee',NULL,'Event Fees','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_ManageEvent_Fee\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,920,1,0,NULL,'a:0:{}'),(276,1,'civicrm/event/manage/registration',NULL,'Event Online Registration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:39:\"CRM_Event_Form_ManageEvent_Registration\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(277,1,'civicrm/event/manage/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Friend_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,940,1,0,NULL,'a:0:{}'),(278,1,'civicrm/event/manage/reminder',NULL,'Schedule Reminders','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:44:\"CRM_Event_Form_ManageEvent_ScheduleReminders\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(279,1,'civicrm/event/manage/repeat',NULL,'Repeat Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Form_ManageEvent_Repeat\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,960,1,0,NULL,'a:0:{}'),(280,1,'civicrm/event/manage/conference',NULL,'Conference Slots','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:37:\"CRM_Event_Form_ManageEvent_Conference\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(281,1,'civicrm/event/add','action=add','New Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,830,1,0,NULL,'a:0:{}'),(282,1,'civicrm/event/import',NULL,'Import Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:23:\"edit event participants\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,840,1,1,NULL,'a:0:{}'),(283,1,'civicrm/event/price',NULL,'Manage Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,850,1,1,NULL,'a:0:{}'),(284,1,'civicrm/event/selfsvcupdate',NULL,'Self-service Registration Update','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Form_SelfSvcUpdate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,880,1,1,NULL,'a:0:{}'),(285,1,'civicrm/event/selfsvctransfer',NULL,'Self-service Registration Transfer','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_SelfSvcTransfer\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,890,1,1,NULL,'a:0:{}'),(286,1,'civicrm/contact/view/participant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,4,1,0,NULL,'a:0:{}'),(287,1,'civicrm/ajax/eventFee',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_Page_AJAX\";i:1;s:8:\"eventFee\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(288,1,'civicrm/ajax/locBlock',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:11:\"getLocBlock\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(289,1,'civicrm/event/participant/feeselection',NULL,'Change Registration Selections','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:38:\"CRM_Event_Form_ParticipantFeeSelection\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:23:\"Event Participants List\";s:3:\"url\";s:34:\"/civicrm/event/participant?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(290,1,'civicrm/admin/contribute/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_PCP_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,450,1,0,NULL,'a:0:{}'),(291,1,'civicrm/contribute/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(292,1,'civicrm/contribute',NULL,'CiviContribute Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,500,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(293,1,'civicrm/contribute/add','action=add','New Contribution','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(294,1,'civicrm/contribute/chart',NULL,'Contribution Summary - Chart View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(295,1,'civicrm/contribute/transact',NULL,'CiviContribute','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Controller_Contribution\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,1,0,1,0,NULL,'a:0:{}'),(296,1,'civicrm/admin/contribute',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,360,1,0,NULL,'a:2:{s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(297,1,'civicrm/admin/contribute/settings',NULL,'Title and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_Settings\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:0:{}'),(298,1,'civicrm/admin/contribute/amount',NULL,'Contribution Amounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Amount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:0:{}'),(299,1,'civicrm/admin/contribute/membership',NULL,'Membership Section','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Member_Form_MembershipBlock\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:0:{}'),(300,1,'civicrm/admin/contribute/custom',NULL,'Include Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Custom\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(301,1,'civicrm/admin/contribute/thankyou',NULL,'Thank-you and Receipting','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_ThankYou\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(302,1,'civicrm/admin/contribute/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Friend_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,440,1,0,NULL,'a:0:{}'),(303,1,'civicrm/admin/contribute/widget',NULL,'Configure Widget','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Widget\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,460,1,0,NULL,'a:0:{}'),(304,1,'civicrm/admin/contribute/premium',NULL,'Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:44:\"CRM_Contribute_Form_ContributionPage_Premium\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,470,1,0,NULL,'a:0:{}'),(305,1,'civicrm/admin/contribute/addProductToPage',NULL,'Add Products to This Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:47:\"CRM_Contribute_Form_ContributionPage_AddProduct\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,480,1,0,NULL,'a:0:{}'),(306,1,'civicrm/admin/contribute/add','action=add','New Contribution Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Contribute_Controller_ContributionPage\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(307,1,'civicrm/admin/contribute/managePremiums',NULL,'Manage Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Page_ManagePremiums\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,365,1,0,NULL,'a:2:{s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(308,1,'civicrm/admin/financial/financialType',NULL,'Financial Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Financial_Page_FinancialType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,580,1,0,NULL,'a:2:{s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(309,1,'civicrm/payment','action=add','New Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Form_AdditionalPayment\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(310,1,'civicrm/admin/financial/financialAccount',NULL,'Financial Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_FinancialAccount\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(311,1,'civicrm/admin/options/payment_instrument',NULL,'Payment Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(312,1,'civicrm/admin/options/accept_creditcard',NULL,'Accepted Credit Cards','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(313,1,'civicrm/admin/options/soft_credit_type',NULL,'Soft Credit Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(314,1,'civicrm/contact/view/contribution',NULL,'Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(315,1,'civicrm/contact/view/contributionrecur',NULL,'Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:37:\"CRM_Contribute_Page_ContributionRecur\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(316,1,'civicrm/contact/view/contribution/additionalinfo',NULL,'Additional Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:13:\"Contributions\";s:3:\"url\";s:42:\"/civicrm/contact/view/contribution?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(317,1,'civicrm/contribute/search',NULL,'Find Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,510,1,1,NULL,'a:0:{}'),(318,1,'civicrm/contribute/searchBatch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Controller_SearchBatch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,588,1,1,NULL,'a:0:{}'),(319,1,'civicrm/contribute/import',NULL,'Import Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"edit contributions\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,520,1,1,NULL,'a:0:{}'),(320,1,'civicrm/contribute/manage',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,530,1,1,NULL,'a:0:{}'),(321,1,'civicrm/contribute/additionalinfo',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(322,1,'civicrm/ajax/permlocation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:23:\"getPermissionedLocation\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(323,1,'civicrm/contribute/unsubscribe',NULL,'Cancel Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_CancelSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(324,1,'civicrm/contribute/onbehalf',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_Contribution_OnBehalfOf\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(325,1,'civicrm/contribute/updatebilling',NULL,'Update Billing Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contribute_Form_UpdateBilling\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(326,1,'civicrm/contribute/updaterecur',NULL,'Update Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_UpdateSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(327,1,'civicrm/contribute/subscriptionstatus',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Page_SubscriptionStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(328,1,'civicrm/admin/financial/financialType/accounts',NULL,'Financial Type Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:39:\"CRM_Financial_Page_FinancialTypeAccount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:15:\"Financial Types\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,581,1,0,NULL,'a:0:{}'),(329,1,'civicrm/financial/batch',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:33:\"CRM_Financial_Page_FinancialBatch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,585,1,0,NULL,'a:0:{}'),(330,1,'civicrm/financial/financialbatches',NULL,'Accounting Batches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Financial_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,586,1,0,NULL,'a:0:{}'),(331,1,'civicrm/batchtransaction',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_BatchTransaction\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,600,1,0,NULL,'a:0:{}'),(332,1,'civicrm/financial/batch/export',NULL,'Accounting Batch Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:25:\"CRM_Financial_Form_Export\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Accounting Batch\";s:3:\"url\";s:32:\"/civicrm/financial/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,0,NULL,'a:0:{}'),(333,1,'civicrm/payment/view','action=view','View Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contribute_Page_PaymentInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(334,1,'civicrm/admin/setting/preferences/contribute',NULL,'CiviContribute Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Admin_Form_Preferences_Contribute\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(335,1,'civicrm/contribute/invoice',NULL,'PDF Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Contribute_Form_Task_Invoice\";i:1;s:11:\"getPrintPDF\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,620,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(336,1,'civicrm/contribute/invoice/email',NULL,'Email Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Form_Task_Invoice\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"PDF Invoice\";s:3:\"url\";s:35:\"/civicrm/contribute/invoice?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,630,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(337,1,'civicrm/ajax/softcontributionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:24:\"CRM_Contribute_Page_AJAX\";i:1;s:23:\"getSoftContributionRows\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(338,1,'civicrm/contribute/contributionrecur-payments',NULL,'Recurring Contribution\'s Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Page_ContributionRecurPayments\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(339,1,'civicrm/membership/recurring-contributions',NULL,'Membership Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Member_Page_RecurringContributions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(340,1,'civicrm/member',NULL,'CiviMember Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:25:\"CRM_Member_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,700,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(341,1,'civicrm/member/add','action=add','New Membership','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(342,1,'civicrm/admin/member/membershipType',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Page_MembershipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(343,1,'civicrm/admin/member/membershipStatus',NULL,'Membership Status Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Member_Page_MembershipStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(344,1,'civicrm/contact/view/membership','force=1,cid=%%cid%%','Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,2,1,0,NULL,'a:0:{}'),(345,1,'civicrm/membership/view',NULL,'Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipView\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,390,1,0,NULL,'a:0:{}'),(346,1,'civicrm/member/search',NULL,'Find Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,710,1,1,NULL,'a:0:{}'),(347,1,'civicrm/member/import',NULL,'Import Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:16:\"edit memberships\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,720,1,1,NULL,'a:0:{}'),(348,1,'civicrm/ajax/memType',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Member_Page_AJAX\";i:1;s:21:\"getMemberTypeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(349,1,'civicrm/admin/member/membershipType/add',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:16:\"Membership Types\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(350,1,'civicrm/mailing',NULL,'CiviMail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,600,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviMail\";}'),(351,1,'civicrm/admin/mail',NULL,'Mailer Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Mail\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(352,1,'civicrm/admin/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(353,1,'civicrm/admin/options/from_email_address/civimail',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:4:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}i:3;a:2:{s:5:\"title\";s:20:\"From Email Addresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(354,1,'civicrm/admin/mailSettings',NULL,'Mail Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_MailSettings\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:32:\"Configure email account setting.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(355,1,'civicrm/mailing/send',NULL,'New Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:27:\"CRM_Mailing_Controller_Send\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(356,1,'civicrm/mailing/browse/scheduled','scheduled=true','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:5:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";i:4;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(357,1,'civicrm/mailing/browse/unscheduled','scheduled=false','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(358,1,'civicrm/mailing/browse/archived',NULL,'Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,625,1,1,NULL,'a:0:{}'),(359,1,'civicrm/mailing/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,630,1,1,NULL,'a:0:{}'),(360,1,'civicrm/mailing/unsubscribe',NULL,'Unsubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Form_Unsubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,640,1,0,NULL,'a:0:{}'),(361,1,'civicrm/mailing/resubscribe',NULL,'Resubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Page_Resubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,645,1,0,NULL,'a:0:{}'),(362,1,'civicrm/mailing/optout',NULL,'Opt-out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Form_Optout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,650,1,0,NULL,'a:0:{}'),(363,1,'civicrm/mailing/confirm',NULL,'Confirm','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:24:\"CRM_Mailing_Page_Confirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(364,1,'civicrm/mailing/subscribe',NULL,'Subscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Form_Subscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(365,1,'civicrm/mailing/preview',NULL,'Preview Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Page_Preview\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,670,1,0,NULL,'a:0:{}'),(366,1,'civicrm/mailing/report','mid=%%mid%%','Mailing Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,680,1,0,NULL,'a:0:{}'),(367,1,'civicrm/mailing/forward',NULL,'Forward Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:31:\"CRM_Mailing_Form_ForwardMailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,685,1,0,NULL,'a:0:{}'),(368,1,'civicrm/mailing/queue',NULL,'Sending Mail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,690,1,0,NULL,'a:0:{}'),(369,1,'civicrm/mailing/report/event',NULL,'Mailing Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:22:\"CRM_Mailing_Page_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Mailing Report\";s:3:\"url\";s:47:\"/civicrm/mailing/report?reset=1&amp;mid=%%mid%%\";}}',NULL,NULL,4,NULL,NULL,NULL,0,695,1,0,NULL,'a:0:{}'),(370,1,'civicrm/ajax/template',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:8:\"template\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(371,1,'civicrm/mailing/view',NULL,'View Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:28:\"view public CiviMail content\";i:1;s:15:\"access CiviMail\";i:2;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:21:\"CRM_Mailing_Page_View\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,800,1,0,NULL,'a:0:{}'),(372,1,'civicrm/mailing/approve',NULL,'Approve Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Form_Approve\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,850,1,0,NULL,'a:0:{}'),(373,1,'civicrm/contact/view/mailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:20:\"CRM_Mailing_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(374,1,'civicrm/ajax/contactmailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:18:\"getContactMailings\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(375,1,'civicrm/mailing/url',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:20:\"CRM_Mailing_Page_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(376,1,'civicrm/mailing/open',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:21:\"CRM_Mailing_Page_Open\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(377,1,'civicrm/grant',NULL,'CiviGrant Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1000,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(378,1,'civicrm/grant/info',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(379,1,'civicrm/grant/search',NULL,'Find Grants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:27:\"CRM_Grant_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1010,1,1,NULL,'a:0:{}'),(380,1,'civicrm/grant/add','action=add','New Grant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(381,1,'civicrm/contact/view/grant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(382,1,'civicrm/pledge',NULL,'CiviPledge Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:25:\"CRM_Pledge_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,550,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(383,1,'civicrm/pledge/search',NULL,'Find Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:28:\"CRM_Pledge_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,560,1,1,NULL,'a:0:{}'),(384,1,'civicrm/contact/view/pledge','force=1,cid=%%cid%%','Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,570,1,0,NULL,'a:0:{}'),(385,1,'civicrm/pledge/add','action=add','New Pledge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(386,1,'civicrm/pledge/payment',NULL,'Pledge Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:23:\"CRM_Pledge_Page_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,580,1,0,NULL,'a:0:{}'),(387,1,'civicrm/ajax/pledgeAmount',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviPledge\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Pledge_Page_AJAX\";i:1;s:17:\"getPledgeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(388,1,'civicrm/case',NULL,'CiviCase Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Case_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,900,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(389,1,'civicrm/case/add',NULL,'Open Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Case_Form_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(390,1,'civicrm/case/search',NULL,'Find Cases','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,910,1,1,NULL,'a:0:{}'),(391,1,'civicrm/case/activity',NULL,'Case Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Case_Form_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(392,1,'civicrm/case/report',NULL,'Case Activity Audit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:20:\"CRM_Case_Form_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(393,1,'civicrm/case/cd/edit',NULL,'Case Custom Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Case_Form_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(394,1,'civicrm/contact/view/case',NULL,'Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:17:\"CRM_Case_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(395,1,'civicrm/case/activity/view',NULL,'Activity View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Form_ActivityView\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Case Activity\";s:3:\"url\";s:30:\"/civicrm/case/activity?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(396,1,'civicrm/contact/view/case/editClient',NULL,'Assign to Another Client','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Case_Form_EditClient\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:4:\"Case\";s:3:\"url\";s:34:\"/civicrm/contact/view/case?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(397,1,'civicrm/case/addToCase',NULL,'File on Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Case_Form_ActivityToCase\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(398,1,'civicrm/case/details',NULL,'Case Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Case_Page_CaseDetails\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(399,1,'civicrm/admin/setting/case',NULL,'CiviCase Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(400,1,'civicrm/admin/options/case_type',NULL,'Case Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:24:\"url=civicrm/a/#/caseType\";','a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(401,1,'civicrm/admin/options/redaction_rule',NULL,'Redaction Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(402,1,'civicrm/admin/options/case_status',NULL,'Case Statuses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(403,1,'civicrm/admin/options/encounter_medium',NULL,'Encounter Mediums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:26:\"List of encounter mediums.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(404,1,'civicrm/case/report/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Case_XMLProcessor_Report\";i:1;s:15:\"printCaseReport\";}',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:19:\"Case Activity Audit\";s:3:\"url\";s:28:\"/civicrm/case/report?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(405,1,'civicrm/case/ajax/addclient',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:9:\"addClient\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(406,1,'civicrm/case/ajax/processtags',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"processCaseTags\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(407,1,'civicrm/case/ajax/details',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:11:\"CaseDetails\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(408,1,'civicrm/ajax/delcaserole',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"deleteCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(409,1,'civicrm/ajax/get-cases',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:8:\"getCases\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(410,1,'civicrm/report',NULL,'CiviReport','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:22:\"CRM_Report_Page_Report\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1200,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviReport\";}'),(411,1,'civicrm/report/list',NULL,'CiviCRM Reports','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(412,1,'civicrm/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1220,1,1,NULL,'a:0:{}'),(413,1,'civicrm/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1241,1,1,NULL,'a:0:{}'),(414,1,'civicrm/admin/report/register',NULL,'Register Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Form_Register\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:30:\"Register the Report templates.\";}'),(415,1,'civicrm/report/instance',NULL,'Report','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Page_Instance\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(416,1,'civicrm/admin/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(417,1,'civicrm/admin/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(418,1,'civicrm/admin/report/list',NULL,'Reports Listing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(419,1,'civicrm/campaign',NULL,'Campaign Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:27:\"CRM_Campaign_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(420,1,'civicrm/campaign/add',NULL,'New Campaign','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Campaign\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(421,1,'civicrm/survey/add',NULL,'New Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(422,1,'civicrm/campaign/vote',NULL,'Conduct Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"reserve campaign contacts\";i:3;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Page_Vote\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(423,1,'civicrm/admin/campaign/surveyType',NULL,'Survey Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"administer CiviCampaign\";}i:1;s:3:\"and\";}','s:28:\"CRM_Campaign_Page_SurveyType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(424,1,'civicrm/admin/options/campaign_type',NULL,'Campaign Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,2,1,0,NULL,'a:3:{s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(425,1,'civicrm/admin/options/campaign_status',NULL,'Campaign Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,3,1,0,NULL,'a:3:{s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(426,1,'civicrm/admin/options/engagement_index',NULL,'Engagement Index','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,4,1,0,NULL,'a:3:{s:4:\"desc\";s:18:\"Engagement levels.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(427,1,'civicrm/survey/search','op=interview','Record Respondents Interview','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:30:\"CRM_Campaign_Controller_Search\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(428,1,'civicrm/campaign/gotv',NULL,'GOTV (Track Voters)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"release campaign contacts\";i:3;s:22:\"gotv campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Form_Gotv\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(429,1,'civicrm/petition/add',NULL,'New Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(430,1,'civicrm/petition/sign',NULL,'Sign Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:36:\"CRM_Campaign_Form_Petition_Signature\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(431,1,'civicrm/petition/browse',NULL,'View Petition Signatures','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Campaign_Page_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(432,1,'civicrm/petition/confirm',NULL,'Email address verified','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:34:\"CRM_Campaign_Page_Petition_Confirm\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(433,1,'civicrm/petition/thankyou',NULL,'Thank You','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:35:\"CRM_Campaign_Page_Petition_ThankYou\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(434,1,'civicrm/campaign/registerInterview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','a:2:{i:0;s:22:\"CRM_Campaign_Page_AJAX\";i:1;s:17:\"registerInterview\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(435,1,'civicrm/survey/configure/main',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(436,1,'civicrm/survey/configure/questions',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:34:\"CRM_Campaign_Form_Survey_Questions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(437,1,'civicrm/survey/configure/results',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:32:\"CRM_Campaign_Form_Survey_Results\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(438,1,'civicrm/survey/delete',NULL,'Delete Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:31:\"CRM_Campaign_Form_Survey_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(439,1,'civicrm/ajax/event/add_participant_to_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:23:\"add_participant_to_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(440,1,'civicrm/ajax/event/remove_participant_from_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:28:\"remove_participant_from_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(441,1,'civicrm/event/add_to_cart',NULL,'Add Event To Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:29:\"CRM_Event_Cart_Page_AddToCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(442,1,'civicrm/event/cart_checkout',NULL,'Cart Checkout','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Controller_Checkout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(443,1,'civicrm/event/remove_from_cart',NULL,'Remove From Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Page_RemoveFromCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(444,1,'civicrm/event/view_cart',NULL,'View Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Cart_Page_ViewCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(445,1,'admin',NULL,NULL,NULL,NULL,NULL,NULL,'a:15:{s:14:\"CiviContribute\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:32:\"{weight}.Personal Campaign Pages\";a:6:{s:5:\"title\";s:23:\"Personal Campaign Pages\";s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:2:\"id\";s:21:\"PersonalCampaignPages\";s:3:\"url\";s:49:\"/civicrm/admin/pcp?context=contribute&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Manage Contribution Pages\";a:6:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:2:\"id\";s:23:\"ManageContributionPages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Manage Premiums\";a:6:{s:5:\"title\";s:15:\"Manage Premiums\";s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:2:\"id\";s:14:\"ManagePremiums\";s:3:\"url\";s:48:\"/civicrm/admin/contribute/managePremiums?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Financial Types\";a:6:{s:5:\"title\";s:15:\"Financial Types\";s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:2:\"id\";s:14:\"FinancialTypes\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Financial Accounts\";a:6:{s:5:\"title\";s:18:\"Financial Accounts\";s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:2:\"id\";s:17:\"FinancialAccounts\";s:3:\"url\";s:49:\"/civicrm/admin/financial/financialAccount?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Payment Methods\";a:6:{s:5:\"title\";s:15:\"Payment Methods\";s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:2:\"id\";s:14:\"PaymentMethods\";s:3:\"url\";s:49:\"/civicrm/admin/options/payment_instrument?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Accepted Credit Cards\";a:6:{s:5:\"title\";s:21:\"Accepted Credit Cards\";s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:2:\"id\";s:19:\"AcceptedCreditCards\";s:3:\"url\";s:48:\"/civicrm/admin/options/accept_creditcard?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Soft Credit Types\";a:6:{s:5:\"title\";s:17:\"Soft Credit Types\";s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:2:\"id\";s:15:\"SoftCreditTypes\";s:3:\"url\";s:47:\"/civicrm/admin/options/soft_credit_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:42:\"{weight}.CiviContribute Component Settings\";a:6:{s:5:\"title\";s:33:\"CiviContribute Component Settings\";s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:2:\"id\";s:31:\"CiviContributeComponentSettings\";s:3:\"url\";s:53:\"/civicrm/admin/setting/preferences/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:26:\"Customize Data and Screens\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:19:{s:20:\"{weight}.Custom Data\";a:6:{s:5:\"title\";s:11:\"Custom Data\";s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:2:\"id\";s:10:\"CustomData\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:17:\"{weight}.Profiles\";a:6:{s:5:\"title\";s:8:\"Profiles\";s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:2:\"id\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Activity Types\";a:6:{s:5:\"title\";s:14:\"Activity Types\";s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:2:\"id\";s:13:\"ActivityTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/activity_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Relationship Types\";a:6:{s:5:\"title\";s:18:\"Relationship Types\";s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:2:\"id\";s:17:\"RelationshipTypes\";s:3:\"url\";s:30:\"/civicrm/admin/reltype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Contact Types\";a:6:{s:5:\"title\";s:13:\"Contact Types\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ContactTypes\";s:3:\"url\";s:38:\"/civicrm/admin/options/subtype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Gender Options\";a:6:{s:5:\"title\";s:14:\"Gender Options\";s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:2:\"id\";s:13:\"GenderOptions\";s:3:\"url\";s:37:\"/civicrm/admin/options/gender?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Prefixes (Ms, Mr...)\";a:6:{s:5:\"title\";s:31:\"Individual Prefixes (Ms, Mr...)\";s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:2:\"id\";s:27:\"IndividualPrefixes_Ms_Mr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_prefix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Suffixes (Jr, Sr...)\";a:6:{s:5:\"title\";s:31:\"Individual Suffixes (Jr, Sr...)\";s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:2:\"id\";s:27:\"IndividualSuffixes_Jr_Sr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_suffix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:39:\"{weight}.Location Types (Home, Work...)\";a:6:{s:5:\"title\";s:30:\"Location Types (Home, Work...)\";s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:2:\"id\";s:26:\"LocationTypes_Home_Work...\";s:3:\"url\";s:35:\"/civicrm/admin/locationType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Website Types\";a:6:{s:5:\"title\";s:13:\"Website Types\";s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:2:\"id\";s:12:\"WebsiteTypes\";s:3:\"url\";s:43:\"/civicrm/admin/options/website_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:35:\"{weight}.Instant Messenger Services\";a:6:{s:5:\"title\";s:26:\"Instant Messenger Services\";s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:2:\"id\";s:24:\"InstantMessengerServices\";s:3:\"url\";s:56:\"/civicrm/admin/options/instant_messenger_service?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Mobile Phone Providers\";a:6:{s:5:\"title\";s:22:\"Mobile Phone Providers\";s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:2:\"id\";s:20:\"MobilePhoneProviders\";s:3:\"url\";s:46:\"/civicrm/admin/options/mobile_provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Phone Type\";a:6:{s:5:\"title\";s:10:\"Phone Type\";s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:2:\"id\";s:9:\"PhoneType\";s:3:\"url\";s:41:\"/civicrm/admin/options/phone_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Display Preferences\";a:6:{s:5:\"title\";s:19:\"Display Preferences\";s:4:\"desc\";N;s:2:\"id\";s:18:\"DisplayPreferences\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/display?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Search Preferences\";a:6:{s:5:\"title\";s:18:\"Search Preferences\";s:4:\"desc\";N;s:2:\"id\";s:17:\"SearchPreferences\";s:3:\"url\";s:37:\"/civicrm/admin/setting/search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Navigation Menu\";a:6:{s:5:\"title\";s:15:\"Navigation Menu\";s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:2:\"id\";s:14:\"NavigationMenu\";s:3:\"url\";s:27:\"/civicrm/admin/menu?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Word Replacements\";a:6:{s:5:\"title\";s:17:\"Word Replacements\";s:4:\"desc\";s:18:\"Word Replacements.\";s:2:\"id\";s:16:\"WordReplacements\";s:3:\"url\";s:47:\"/civicrm/admin/options/wordreplacements?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Manage Custom Searches\";a:6:{s:5:\"title\";s:22:\"Manage Custom Searches\";s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:2:\"id\";s:20:\"ManageCustomSearches\";s:3:\"url\";s:44:\"/civicrm/admin/options/custom_search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Tags (Categories)\";a:6:{s:5:\"title\";s:17:\"Tags (Categories)\";s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:2:\"id\";s:15:\"Tags_Categories\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"Communications\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:11:{s:46:\"{weight}.Organization Address and Contact Info\";a:6:{s:5:\"title\";s:37:\"Organization Address and Contact Info\";s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:2:\"id\";s:33:\"OrganizationAddressandContactInfo\";s:3:\"url\";s:47:\"/civicrm/admin/domain?action=update&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Message Templates\";a:6:{s:5:\"title\";s:17:\"Message Templates\";s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:2:\"id\";s:16:\"MessageTemplates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Schedule Reminders\";a:6:{s:5:\"title\";s:18:\"Schedule Reminders\";s:4:\"desc\";s:19:\"Schedule Reminders.\";s:2:\"id\";s:17:\"ScheduleReminders\";s:3:\"url\";s:40:\"/civicrm/admin/scheduleReminders?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Preferred Communication Methods\";a:6:{s:5:\"title\";s:31:\"Preferred Communication Methods\";s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:2:\"id\";s:29:\"PreferredCommunicationMethods\";s:3:\"url\";s:61:\"/civicrm/admin/options/preferred_communication_method?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Label Formats\";a:6:{s:5:\"title\";s:13:\"Label Formats\";s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:2:\"id\";s:12:\"LabelFormats\";s:3:\"url\";s:35:\"/civicrm/admin/labelFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Print Page (PDF) Formats\";a:6:{s:5:\"title\";s:24:\"Print Page (PDF) Formats\";s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:2:\"id\";s:20:\"PrintPage_PDFFormats\";s:3:\"url\";s:33:\"/civicrm/admin/pdfFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Communication Style Options\";a:6:{s:5:\"title\";s:27:\"Communication Style Options\";s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:2:\"id\";s:25:\"CommunicationStyleOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/communication_style?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Email Greeting Formats\";a:6:{s:5:\"title\";s:22:\"Email Greeting Formats\";s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:2:\"id\";s:20:\"EmailGreetingFormats\";s:3:\"url\";s:45:\"/civicrm/admin/options/email_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Postal Greeting Formats\";a:6:{s:5:\"title\";s:23:\"Postal Greeting Formats\";s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:2:\"id\";s:21:\"PostalGreetingFormats\";s:3:\"url\";s:46:\"/civicrm/admin/options/postal_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Addressee Formats\";a:6:{s:5:\"title\";s:17:\"Addressee Formats\";s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:2:\"id\";s:16:\"AddresseeFormats\";s:3:\"url\";s:40:\"/civicrm/admin/options/addressee?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Localization\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:4:{s:39:\"{weight}.Languages, Currency, Locations\";a:6:{s:5:\"title\";s:30:\"Languages, Currency, Locations\";s:4:\"desc\";N;s:2:\"id\";s:28:\"Languages_Currency_Locations\";s:3:\"url\";s:43:\"/civicrm/admin/setting/localization?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Address Settings\";a:6:{s:5:\"title\";s:16:\"Address Settings\";s:4:\"desc\";N;s:2:\"id\";s:15:\"AddressSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Date Formats\";a:6:{s:5:\"title\";s:12:\"Date Formats\";s:4:\"desc\";N;s:2:\"id\";s:11:\"DateFormats\";s:3:\"url\";s:35:\"/civicrm/admin/setting/date?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Preferred Languages\";a:6:{s:5:\"title\";s:19:\"Preferred Languages\";s:4:\"desc\";s:30:\"Options for contact languages.\";s:2:\"id\";s:18:\"PreferredLanguages\";s:3:\"url\";s:40:\"/civicrm/admin/options/languages?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:21:\"Users and Permissions\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:2:{s:23:\"{weight}.Access Control\";a:6:{s:5:\"title\";s:14:\"Access Control\";s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:2:\"id\";s:13:\"AccessControl\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Synchronize Users to Contacts\";a:6:{s:5:\"title\";s:29:\"Synchronize Users to Contacts\";s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:2:\"id\";s:26:\"SynchronizeUserstoContacts\";s:3:\"url\";s:32:\"/civicrm/admin/synchUser?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:15:\"System Settings\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:18:{s:32:\"{weight}.Configuration Checklist\";a:6:{s:5:\"title\";s:23:\"Configuration Checklist\";s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:2:\"id\";s:22:\"ConfigurationChecklist\";s:3:\"url\";s:33:\"/civicrm/admin/configtask?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Enable CiviCRM Components\";a:6:{s:5:\"title\";s:25:\"Enable CiviCRM Components\";s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:2:\"id\";s:23:\"EnableCiviCRMComponents\";s:3:\"url\";s:40:\"/civicrm/admin/setting/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Manage Extensions\";a:6:{s:5:\"title\";s:17:\"Manage Extensions\";s:4:\"desc\";s:0:\"\";s:2:\"id\";s:16:\"ManageExtensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Outbound Email Settings\";a:6:{s:5:\"title\";s:23:\"Outbound Email Settings\";s:4:\"desc\";N;s:2:\"id\";s:21:\"OutboundEmailSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/smtp?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:37:\"{weight}.Settings - Payment Processor\";a:6:{s:5:\"title\";s:28:\"Settings - Payment Processor\";s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:2:\"id\";s:25:\"Settings-PaymentProcessor\";s:3:\"url\";s:39:\"/civicrm/admin/paymentProcessor?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Mapping and Geocoding\";a:6:{s:5:\"title\";s:21:\"Mapping and Geocoding\";s:4:\"desc\";N;s:2:\"id\";s:19:\"MappingandGeocoding\";s:3:\"url\";s:38:\"/civicrm/admin/setting/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:62:\"{weight}.Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";a:6:{s:5:\"title\";s:53:\"Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:2:\"id\";s:46:\"Misc_Undelete_PDFs_Limits_Logging_Captcha_etc.\";s:3:\"url\";s:35:\"/civicrm/admin/setting/misc?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Directories\";a:6:{s:5:\"title\";s:11:\"Directories\";s:4:\"desc\";N;s:2:\"id\";s:11:\"Directories\";s:3:\"url\";s:35:\"/civicrm/admin/setting/path?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Resource URLs\";a:6:{s:5:\"title\";s:13:\"Resource URLs\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ResourceURLs\";s:3:\"url\";s:34:\"/civicrm/admin/setting/url?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Cleanup Caches and Update Paths\";a:6:{s:5:\"title\";s:31:\"Cleanup Caches and Update Paths\";s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:2:\"id\";s:27:\"CleanupCachesandUpdatePaths\";s:3:\"url\";s:50:\"/civicrm/admin/setting/updateConfigBackend?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.CMS Database Integration\";a:6:{s:5:\"title\";s:24:\"CMS Database Integration\";s:4:\"desc\";N;s:2:\"id\";s:22:\"CMSDatabaseIntegration\";s:3:\"url\";s:33:\"/civicrm/admin/setting/uf?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Safe File Extension Options\";a:6:{s:5:\"title\";s:27:\"Safe File Extension Options\";s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:2:\"id\";s:24:\"SafeFileExtensionOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/safe_file_extension?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Option Groups\";a:6:{s:5:\"title\";s:13:\"Option Groups\";s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:2:\"id\";s:12:\"OptionGroups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Import/Export Mappings\";a:6:{s:5:\"title\";s:22:\"Import/Export Mappings\";s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:2:\"id\";s:21:\"Import_ExportMappings\";s:3:\"url\";s:30:\"/civicrm/admin/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:18:\"{weight}.Debugging\";a:6:{s:5:\"title\";s:9:\"Debugging\";s:4:\"desc\";N;s:2:\"id\";s:9:\"Debugging\";s:3:\"url\";s:36:\"/civicrm/admin/setting/debug?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Multi Site Settings\";a:6:{s:5:\"title\";s:19:\"Multi Site Settings\";s:4:\"desc\";N;s:2:\"id\";s:17:\"MultiSiteSettings\";s:3:\"url\";s:52:\"/civicrm/admin/setting/preferences/multisite?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Scheduled Jobs\";a:6:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:2:\"id\";s:13:\"ScheduledJobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Sms Providers\";a:6:{s:5:\"title\";s:13:\"Sms Providers\";s:4:\"desc\";s:27:\"To configure a sms provider\";s:2:\"id\";s:12:\"SmsProviders\";s:3:\"url\";s:35:\"/civicrm/admin/sms/provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"CiviCampaign\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:40:\"{weight}.CiviCampaign Component Settings\";a:6:{s:5:\"title\";s:31:\"CiviCampaign Component Settings\";s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:2:\"id\";s:29:\"CiviCampaignComponentSettings\";s:3:\"url\";s:51:\"/civicrm/admin/setting/preferences/campaign?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Survey Types\";a:6:{s:5:\"title\";s:12:\"Survey Types\";s:4:\"desc\";N;s:2:\"id\";s:11:\"SurveyTypes\";s:3:\"url\";s:42:\"/civicrm/admin/campaign/surveyType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Campaign Types\";a:6:{s:5:\"title\";s:14:\"Campaign Types\";s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:2:\"id\";s:13:\"CampaignTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/campaign_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Campaign Status\";a:6:{s:5:\"title\";s:15:\"Campaign Status\";s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:2:\"id\";s:14:\"CampaignStatus\";s:3:\"url\";s:46:\"/civicrm/admin/options/campaign_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Engagement Index\";a:6:{s:5:\"title\";s:16:\"Engagement Index\";s:4:\"desc\";s:18:\"Engagement levels.\";s:2:\"id\";s:15:\"EngagementIndex\";s:3:\"url\";s:47:\"/civicrm/admin/options/engagement_index?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"CiviEvent\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:37:\"{weight}.CiviEvent Component Settings\";a:6:{s:5:\"title\";s:28:\"CiviEvent Component Settings\";s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:2:\"id\";s:26:\"CiviEventComponentSettings\";s:3:\"url\";s:48:\"/civicrm/admin/setting/preferences/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Event Name Badge Layouts\";a:6:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:2:\"id\";s:21:\"EventNameBadgeLayouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?action=browse&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Manage Events\";a:6:{s:5:\"title\";s:13:\"Manage Events\";s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:2:\"id\";s:12:\"ManageEvents\";s:3:\"url\";s:28:\"/civicrm/admin/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Event Templates\";a:6:{s:5:\"title\";s:15:\"Event Templates\";s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:2:\"id\";s:14:\"EventTemplates\";s:3:\"url\";s:36:\"/civicrm/admin/eventTemplate?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Event Types\";a:6:{s:5:\"title\";s:11:\"Event Types\";s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:2:\"id\";s:10:\"EventTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/event_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Participant Status\";a:6:{s:5:\"title\";s:18:\"Participant Status\";s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:2:\"id\";s:17:\"ParticipantStatus\";s:3:\"url\";s:41:\"/civicrm/admin/participant_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Participant Role\";a:6:{s:5:\"title\";s:16:\"Participant Role\";s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:2:\"id\";s:15:\"ParticipantRole\";s:3:\"url\";s:47:\"/civicrm/admin/options/participant_role?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Participant Listing Templates\";a:6:{s:5:\"title\";s:29:\"Participant Listing Templates\";s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:2:\"id\";s:27:\"ParticipantListingTemplates\";s:3:\"url\";s:50:\"/civicrm/admin/options/participant_listing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Conference Slot Labels\";a:6:{s:5:\"title\";s:22:\"Conference Slot Labels\";s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:2:\"id\";s:20:\"ConferenceSlotLabels\";s:3:\"url\";s:46:\"/civicrm/admin/options/conference_slot?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviMail\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:36:\"{weight}.CiviMail Component Settings\";a:6:{s:5:\"title\";s:27:\"CiviMail Component Settings\";s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:2:\"id\";s:25:\"CiviMailComponentSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/mailing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Mailer Settings\";a:6:{s:5:\"title\";s:15:\"Mailer Settings\";s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:2:\"id\";s:14:\"MailerSettings\";s:3:\"url\";s:27:\"/civicrm/admin/mail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:49:\"{weight}.Headers, Footers, and Automated Messages\";a:6:{s:5:\"title\";s:40:\"Headers, Footers, and Automated Messages\";s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:2:\"id\";s:36:\"Headers_Footers_andAutomatedMessages\";s:3:\"url\";s:32:\"/civicrm/admin/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:58:\"/civicrm/admin/options/from_email_address/civimail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Mail Accounts\";a:6:{s:5:\"title\";s:13:\"Mail Accounts\";s:4:\"desc\";s:32:\"Configure email account setting.\";s:2:\"id\";s:12:\"MailAccounts\";s:3:\"url\";s:35:\"/civicrm/admin/mailSettings?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviMember\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:38:\"{weight}.CiviMember Component Settings\";a:6:{s:5:\"title\";s:29:\"CiviMember Component Settings\";s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:2:\"id\";s:27:\"CiviMemberComponentSettings\";s:3:\"url\";s:49:\"/civicrm/admin/setting/preferences/member?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Membership Types\";a:6:{s:5:\"title\";s:16:\"Membership Types\";s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:2:\"id\";s:15:\"MembershipTypes\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Membership Status Rules\";a:6:{s:5:\"title\";s:23:\"Membership Status Rules\";s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:2:\"id\";s:21:\"MembershipStatusRules\";s:3:\"url\";s:46:\"/civicrm/admin/member/membershipStatus?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:6:\"Manage\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:27:\"{weight}.Scheduled Jobs Log\";a:6:{s:5:\"title\";s:18:\"Scheduled Jobs Log\";s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:2:\"id\";s:16:\"ScheduledJobsLog\";s:3:\"url\";s:29:\"/civicrm/admin/joblog?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:42:\"{weight}.Find and Merge Duplicate Contacts\";a:6:{s:5:\"title\";s:33:\"Find and Merge Duplicate Contacts\";s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:2:\"id\";s:29:\"FindandMergeDuplicateContacts\";s:3:\"url\";s:36:\"/civicrm/contact/deduperules?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Dedupe Exceptions\";a:6:{s:5:\"title\";s:17:\"Dedupe Exceptions\";s:4:\"desc\";N;s:2:\"id\";s:16:\"DedupeExceptions\";s:3:\"url\";s:33:\"/civicrm/dedupe/exception?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Option Lists\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:20:\"{weight}.Grant Types\";a:6:{s:5:\"title\";s:11:\"Grant Types\";s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:2:\"id\";s:10:\"GrantTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/grant_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"Customize\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:19:\"{weight}.Price Sets\";a:6:{s:5:\"title\";s:10:\"Price Sets\";s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:2:\"id\";s:9:\"PriceSets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviCase\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:26:\"{weight}.CiviCase Settings\";a:6:{s:5:\"title\";s:17:\"CiviCase Settings\";s:4:\"desc\";N;s:2:\"id\";s:16:\"CiviCaseSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/case?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Case Types\";a:6:{s:5:\"title\";s:10:\"Case Types\";s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:2:\"id\";s:9:\"CaseTypes\";s:3:\"url\";s:40:\"/civicrm/admin/options/case_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Redaction Rules\";a:6:{s:5:\"title\";s:15:\"Redaction Rules\";s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:2:\"id\";s:14:\"RedactionRules\";s:3:\"url\";s:45:\"/civicrm/admin/options/redaction_rule?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Case Statuses\";a:6:{s:5:\"title\";s:13:\"Case Statuses\";s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:2:\"id\";s:12:\"CaseStatuses\";s:3:\"url\";s:42:\"/civicrm/admin/options/case_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Encounter Mediums\";a:6:{s:5:\"title\";s:17:\"Encounter Mediums\";s:4:\"desc\";s:26:\"List of encounter mediums.\";s:2:\"id\";s:16:\"EncounterMediums\";s:3:\"url\";s:47:\"/civicrm/admin/options/encounter_medium?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviReport\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:40:\"{weight}.Create New Report from Template\";a:6:{s:5:\"title\";s:31:\"Create New Report from Template\";s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:2:\"id\";s:27:\"CreateNewReportfromTemplate\";s:3:\"url\";s:43:\"/civicrm/admin/report/template/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Manage Templates\";a:6:{s:5:\"title\";s:16:\"Manage Templates\";s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:2:\"id\";s:15:\"ManageTemplates\";s:3:\"url\";s:53:\"/civicrm/admin/report/options/report_template?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Reports Listing\";a:6:{s:5:\"title\";s:15:\"Reports Listing\";s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:2:\"id\";s:14:\"ReportsListing\";s:3:\"url\";s:34:\"/civicrm/admin/report/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,NULL,'a:0:{}');
+INSERT INTO `civicrm_menu` (`id`, `domain_id`, `path`, `path_arguments`, `title`, `access_callback`, `access_arguments`, `page_callback`, `page_arguments`, `breadcrumb`, `return_url`, `return_url_args`, `component_id`, `is_active`, `is_public`, `is_exposed`, `is_ssl`, `weight`, `type`, `page_type`, `skipBreadcrumb`, `module_data`) VALUES (1,1,'civicrm/ajax/api4',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','s:18:\"CRM_Api4_Page_AJAX\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(2,1,'civicrm/api4',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Api4_Page_Api4Explorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(3,1,'civicrm/import',NULL,'Import','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,400,1,1,NULL,'a:0:{}'),(4,1,'civicrm/import/contact',NULL,'Import Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,410,1,1,NULL,'a:0:{}'),(5,1,'civicrm/import/activity',NULL,'Import Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(6,1,'civicrm/import/custom','id=%%id%%','Import Multi-value Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Custom_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(7,1,'civicrm/ajax/status',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Contact_Import_Page_AJAX\";i:1;s:6:\"status\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(8,1,'civicrm/custom/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Custom_Form_CustomData\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(9,1,'civicrm/ajax/optionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:13:\"getOptionList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(10,1,'civicrm/ajax/reorder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:11:\"fixOrdering\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(11,1,'civicrm/ajax/multirecordfieldlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:23:\"getMultiRecordFieldList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(12,1,'civicrm/group',NULL,'Manage Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Page_Group\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,30,1,1,NULL,'a:0:{}'),(13,1,'civicrm/group/search',NULL,'Group Members','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:7:\"comment\";s:164:\"Note: group search already respect ACL, so a strict permission at url level is not required. A simple/basic permission like \'access CiviCRM\' could be used. CRM-5417\";}'),(14,1,'civicrm/group/add',NULL,'New Group','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:11:\"edit groups\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(15,1,'civicrm/ajax/grouplist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Group_Page_AJAX\";i:1;s:12:\"getGroupList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(16,1,'civicrm/tag',NULL,'Tags (Categories)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:16:\"CRM_Tag_Page_Tag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,25,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(17,1,'civicrm/tag/edit','action=add','New Tag','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:17:\"CRM_Tag_Form_Edit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(18,1,'civicrm/tag/merge',NULL,'Merge Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:18:\"CRM_Tag_Form_Merge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(19,1,'civicrm/ajax/tagTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:10:\"getTagTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(20,1,'civicrm/payment/form',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:26:\"CRM_Financial_Form_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(21,1,'civicrm/payment/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:30:\"CRM_Financial_Form_PaymentEdit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(22,1,'civicrm',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:0:{}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(23,1,'civicrm/dashboard',NULL,'CiviCRM Home','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,NULL,'a:0:{}'),(24,1,'civicrm/dashlet',NULL,'CiviCRM Dashlets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Page_Dashlet\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,1,NULL,'a:0:{}'),(25,1,'civicrm/contact/search',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,10,1,1,NULL,'a:0:{}'),(26,1,'civicrm/contact/image',NULL,'Process Uploaded Images','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"CRM_Contact_BAO_Contact\";i:1;s:12:\"processImage\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(27,1,'civicrm/contact/imagefile',NULL,'Get Image File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_ImageFile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(28,1,'civicrm/contact/search/basic',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(29,1,'civicrm/contact/search/advanced',NULL,'Advanced Search','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=512\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,12,1,1,NULL,'a:0:{}'),(30,1,'civicrm/contact/search/builder',NULL,'Search Builder','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:9:\"mode=8192\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,14,1,1,NULL,'a:0:{}'),(31,1,'civicrm/contact/search/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(32,1,'civicrm/contact/search/custom/list',NULL,'Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Page_CustomSearch\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,16,1,1,NULL,'a:0:{}'),(33,1,'civicrm/contact/add',NULL,'New Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(34,1,'civicrm/contact/add/individual','ct=Individual','New Individual','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(35,1,'civicrm/contact/add/household','ct=Household','New Household','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(36,1,'civicrm/contact/add/organization','ct=Organization','New Organization','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(37,1,'civicrm/contact/relatedcontact',NULL,'Edit Related Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_RelatedContact\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(38,1,'civicrm/contact/merge',NULL,'Merge Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:22:\"CRM_Contact_Form_Merge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(39,1,'civicrm/contact/email',NULL,'Email a Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(40,1,'civicrm/contact/map',NULL,'Map Location(s)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_Map\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(41,1,'civicrm/contact/map/event',NULL,'Map Event Location','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_Task_Map_Event\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Map Location(s)\";s:3:\"url\";s:28:\"/civicrm/contact/map?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(42,1,'civicrm/contact/view','cid=%%cid%%','Contact Summary','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Summary\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(43,1,'civicrm/contact/view/delete',NULL,'Delete Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(44,1,'civicrm/contact/view/activity','show=1,cid=%%cid%%','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:21:\"CRM_Activity_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(45,1,'civicrm/activity/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(46,1,'civicrm/activity/email/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(47,1,'civicrm/activity/pdf/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(48,1,'civicrm/contact/view/rel','cid=%%cid%%','Relationships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_Relationship\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(49,1,'civicrm/contact/view/group','cid=%%cid%%','Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_GroupContact\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(50,1,'civicrm/contact/view/smartgroup','cid=%%cid%%','Smart Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:39:\"CRM_Contact_Page_View_ContactSmartGroup\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(51,1,'civicrm/contact/view/note','cid=%%cid%%','Notes','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:26:\"CRM_Contact_Page_View_Note\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(52,1,'civicrm/contact/view/tag','cid=%%cid%%','Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Tag\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(53,1,'civicrm/contact/view/cd',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:32:\"CRM_Contact_Page_View_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(54,1,'civicrm/contact/view/cd/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Form_CustomData\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(55,1,'civicrm/contact/view/vcard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Vcard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(56,1,'civicrm/contact/view/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Print\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(57,1,'civicrm/contact/view/log',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Log\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(58,1,'civicrm/user',NULL,'Contact Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Page_View_UserDashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(59,1,'civicrm/dashlet/activity',NULL,'Activity Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(60,1,'civicrm/dashlet/blog',NULL,'CiviCRM Blog','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Dashlet_Page_Blog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(61,1,'civicrm/dashlet/getting-started',NULL,'CiviCRM Resources','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Dashlet_Page_GettingStarted\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(62,1,'civicrm/ajax/relation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"relationship\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(63,1,'civicrm/ajax/groupTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"groupTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(64,1,'civicrm/ajax/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:11:\"customField\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(65,1,'civicrm/ajax/customvalue',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:17:\"deleteCustomValue\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(66,1,'civicrm/ajax/cmsuser',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"checkUserName\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(67,1,'civicrm/ajax/checkemail',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactEmail\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(68,1,'civicrm/ajax/checkphone',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactPhone\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(69,1,'civicrm/ajax/subtype',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"buildSubTypes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(70,1,'civicrm/ajax/dashboard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"dashboard\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(71,1,'civicrm/ajax/signature',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"getSignature\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(72,1,'civicrm/ajax/pdfFormat',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"pdfFormat\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(73,1,'civicrm/ajax/paperSize',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"paperSize\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(74,1,'civicrm/ajax/contactref',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:31:\"access contact reference fields\";i:1;s:15:\" access CiviCRM\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"contactReference\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(75,1,'civicrm/dashlet/myCases',NULL,'Case Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Dashlet_Page_MyCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(76,1,'civicrm/dashlet/allCases',NULL,'All Cases Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_AllCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(77,1,'civicrm/dashlet/casedashboard',NULL,'Case Dashboard Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Dashlet_Page_CaseDashboard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(78,1,'civicrm/contact/deduperules',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer dedupe rules\";i:1;s:24:\"merge duplicate contacts\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Page_DedupeRules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,105,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(79,1,'civicrm/contact/dedupefind',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Page_DedupeFind\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(80,1,'civicrm/ajax/dedupefind',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:10:\"getDedupes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(81,1,'civicrm/contact/dedupemerge',NULL,'Batch Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Page_DedupeMerge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(82,1,'civicrm/dedupe/exception',NULL,'Dedupe Exceptions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Page_DedupeException\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,110,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:6:\"Manage\";}'),(83,1,'civicrm/ajax/dedupeRules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"buildDedupeRules\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(84,1,'civicrm/contact/view/useradd','cid=%%cid%%','Add User','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Useradd\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(85,1,'civicrm/ajax/markSelection',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:22:\"selectUnselectContacts\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(86,1,'civicrm/ajax/toggleDedupeSelect',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:18:\"toggleDedupeSelect\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(87,1,'civicrm/ajax/flipDupePairs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"flipDupePairs\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(88,1,'civicrm/activity/sms/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_SMS\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(89,1,'civicrm/ajax/contactrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"view my contact\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:23:\"getContactRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(90,1,'civicrm/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(91,1,'civicrm/pcp/campaign',NULL,'Setup a Personal Campaign Page - Account Information','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(92,1,'civicrm/pcp/info',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_PCP_Page_PCPInfo\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(93,1,'civicrm/admin/pcp','context=contribute','Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Page_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,362,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(94,1,'civicrm/activity','action=add&context=standalone','New Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(95,1,'civicrm/activity/view',NULL,'View Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Form_ActivityView\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(96,1,'civicrm/ajax/activity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:15:\"getCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(97,1,'civicrm/ajax/globalrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseGlobalRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(98,1,'civicrm/ajax/clientrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseClientRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(99,1,'civicrm/ajax/caseroles',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:12:\"getCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(100,1,'civicrm/ajax/contactactivity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:18:\"getContactActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(101,1,'civicrm/ajax/activity/convert',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:21:\"convertToCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(102,1,'civicrm/activity/search',NULL,'Find Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Controller_Search\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(103,1,'civicrm/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Custom_Form_CustomDataByType\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(104,1,'civicrm/profile',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(105,1,'civicrm/profile/create',NULL,'CiviCRM Profile Create','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(106,1,'civicrm/profile/view',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Profile_Page_View\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(107,1,'civicrm/ajax/jqState',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:7:\"jqState\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(108,1,'civicrm/ajax/jqCounty',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:8:\"jqCounty\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(109,1,'civicrm/admin/custom/group',NULL,'Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(110,1,'civicrm/admin/custom/group/field',NULL,'Custom Data Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,11,1,0,0,'a:0:{}'),(111,1,'civicrm/admin/custom/group/field/option',NULL,'Custom Field - Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Custom_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(112,1,'civicrm/admin/custom/group/field/add',NULL,'Custom Field - Add','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(113,1,'civicrm/admin/custom/group/field/update',NULL,'Custom Field - Edit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(114,1,'civicrm/admin/custom/group/field/move',NULL,'Custom Field - Move','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Custom_Form_MoveField\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(115,1,'civicrm/admin/uf/group',NULL,'Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(116,1,'civicrm/admin/uf/group/field',NULL,'CiviCRM Profile Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,21,1,0,0,'a:0:{}'),(117,1,'civicrm/admin/uf/group/field/add',NULL,'Add Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,22,1,0,NULL,'a:0:{}'),(118,1,'civicrm/admin/uf/group/field/update',NULL,'Edit Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,23,1,0,NULL,'a:0:{}'),(119,1,'civicrm/admin/uf/group/add',NULL,'New CiviCRM Profile','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,24,1,0,NULL,'a:0:{}'),(120,1,'civicrm/admin/uf/group/update',NULL,'Profile Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,25,1,0,NULL,'a:0:{}'),(121,1,'civicrm/admin/uf/group/setting',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_UF_Form_AdvanceSetting\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,0,NULL,'a:0:{}'),(122,1,'civicrm/admin/options/activity_type',NULL,'Activity Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(123,1,'civicrm/admin/reltype',NULL,'Relationship Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_RelationshipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,35,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(124,1,'civicrm/admin/options/subtype',NULL,'Contact Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_ContactType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(125,1,'civicrm/admin/options/gender',NULL,'Gender Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,45,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(126,1,'civicrm/admin/options/individual_prefix',NULL,'Individual Prefixes (Ms, Mr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(127,1,'civicrm/admin/options/individual_suffix',NULL,'Individual Suffixes (Jr, Sr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,55,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(128,1,'civicrm/admin/locationType',NULL,'Location Types (Home, Work...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LocationType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(129,1,'civicrm/admin/options/website_type',NULL,'Website Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,65,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(130,1,'civicrm/admin/options/instant_messenger_service',NULL,'Instant Messenger Services','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(131,1,'civicrm/admin/options/mobile_provider',NULL,'Mobile Phone Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(132,1,'civicrm/admin/options/phone_type',NULL,'Phone Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(133,1,'civicrm/admin/setting/preferences/display',NULL,'Display Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Display\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(134,1,'civicrm/admin/setting/search',NULL,'Search Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_Setting_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,95,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(135,1,'civicrm/admin/setting/preferences/date',NULL,'View Date Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Page_PreferencesDate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(136,1,'civicrm/admin/menu',NULL,'Navigation Menu','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Navigation\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(137,1,'civicrm/admin/options/wordreplacements',NULL,'Word Replacements','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Form_WordReplacements\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:18:\"Word Replacements.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(138,1,'civicrm/admin/options/custom_search',NULL,'Manage Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(139,1,'civicrm/admin/domain','action=update','Organization Address and Contact Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contact_Form_Domain\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(140,1,'civicrm/admin/options/from_email_address',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(141,1,'civicrm/admin/messageTemplates',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Page_MessageTemplates\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(142,1,'civicrm/admin/messageTemplates/add',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Form_MessageTemplates\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Message Templates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,262,1,0,NULL,'a:1:{s:4:\"desc\";s:26:\"Add/Edit Message Templates\";}'),(143,1,'civicrm/admin/scheduleReminders',NULL,'Schedule Reminders','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCRM data\";i:1;s:15:\"edit all events\";}i:1;s:2:\"or\";}','s:32:\"CRM_Admin_Page_ScheduleReminders\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:19:\"Schedule Reminders.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(144,1,'civicrm/admin/weight',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_Weight\";i:1;s:8:\"fixOrder\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(145,1,'civicrm/admin/options/preferred_communication_method',NULL,'Preferred Communication Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(146,1,'civicrm/admin/labelFormats',NULL,'Label Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LabelFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(147,1,'civicrm/admin/pdfFormats',NULL,'Print Page (PDF) Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_PdfFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(148,1,'civicrm/admin/options/communication_style',NULL,'Communication Style Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(149,1,'civicrm/admin/options/email_greeting',NULL,'Email Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(150,1,'civicrm/admin/options/postal_greeting',NULL,'Postal Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:2:{s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(151,1,'civicrm/admin/options/addressee',NULL,'Addressee Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(152,1,'civicrm/admin/setting/localization',NULL,'Languages, Currency, Locations','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Form_Setting_Localization\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(153,1,'civicrm/admin/setting/preferences/address',NULL,'Address Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Address\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(154,1,'civicrm/admin/setting/date',NULL,'Date Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Date\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(155,1,'civicrm/admin/options/languages',NULL,'Preferred Languages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:30:\"Options for contact languages.\";s:10:\"adminGroup\";s:12:\"Localization\";}'),(156,1,'civicrm/admin/access',NULL,'Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_Access\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(157,1,'civicrm/admin/access/wp-permissions',NULL,'WordPress Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_ACL_Form_WordPress_Permissions\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Access Control\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:4:\"desc\";s:65:\"Grant access to CiviCRM components and other CiviCRM permissions.\";}'),(158,1,'civicrm/admin/synchUser',NULL,'Synchronize Users to Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_CMSUser\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(159,1,'civicrm/admin/configtask',NULL,'Configuration Checklist','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Page_ConfigTaskList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}','civicrm/admin/configtask',NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(160,1,'civicrm/admin/setting/component',NULL,'Enable CiviCRM Components','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(161,1,'civicrm/admin/extensions',NULL,'Manage Extensions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Extensions\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:2:{s:4:\"desc\";s:0:\"\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(162,1,'civicrm/admin/extensions/upgrade',NULL,'Database Upgrades','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Page_ExtensionsUpgrade\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Manage Extensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(163,1,'civicrm/admin/setting/smtp',NULL,'Outbound Email Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Smtp\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(164,1,'civicrm/admin/paymentProcessor',NULL,'Settings - Payment Processor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:29:\"administer payment processors\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_PaymentProcessor\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(165,1,'civicrm/admin/setting/mapping',NULL,'Mapping and Geocoding','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Form_Setting_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(166,1,'civicrm/admin/setting/misc',NULL,'Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Form_Setting_Miscellaneous\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(167,1,'civicrm/admin/setting/path',NULL,'Directories','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Path\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(168,1,'civicrm/admin/setting/url',NULL,'Resource URLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Form_Setting_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(169,1,'civicrm/admin/setting/updateConfigBackend',NULL,'Cleanup Caches and Update Paths','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Admin_Form_Setting_UpdateConfigBackend\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(170,1,'civicrm/admin/setting/uf',NULL,'CMS Database Integration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Form_Setting_UF\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(171,1,'civicrm/admin/options/safe_file_extension',NULL,'Safe File Extension Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(172,1,'civicrm/admin/options',NULL,'Option Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(173,1,'civicrm/admin/mapping',NULL,'Import/Export Mappings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(174,1,'civicrm/admin/setting/debug',NULL,'Debugging','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Debugging\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(175,1,'civicrm/admin/setting/preferences/multisite',NULL,'Multi Site Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,130,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(176,1,'civicrm/admin/setting/preferences/campaign',NULL,'CiviCampaign Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:3:{s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(177,1,'civicrm/admin/setting/preferences/event',NULL,'CiviEvent Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(178,1,'civicrm/admin/setting/preferences/mailing',NULL,'CiviMail Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Mailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:2:{s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(179,1,'civicrm/admin/setting/preferences/member',NULL,'CiviMember Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Admin_Form_Preferences_Member\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(180,1,'civicrm/admin/runjobs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:20:\"executeScheduledJobs\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:36:\"URL used for running scheduled jobs.\";}'),(181,1,'civicrm/admin/job',NULL,'Scheduled Jobs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:18:\"CRM_Admin_Page_Job\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1370,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(182,1,'civicrm/admin/joblog',NULL,'Scheduled Jobs Log','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_JobLog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1380,1,0,NULL,'a:2:{s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(183,1,'civicrm/admin/options/grant_type',NULL,'Grant Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:10:\"adminGroup\";s:12:\"Option Lists\";}'),(184,1,'civicrm/admin/paymentProcessorType',NULL,'Payment Processor Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Page_PaymentProcessorType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:1:{s:4:\"desc\";s:34:\"Payment Processor type information\";}'),(185,1,'civicrm/admin',NULL,'Administer CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Admin_Page_Admin\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,9000,1,1,NULL,'a:0:{}'),(186,1,'civicrm/ajax/navmenu',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:7:\"navMenu\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(187,1,'civicrm/ajax/menutree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:8:\"menuTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(188,1,'civicrm/ajax/statusmsg',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:12:\"getStatusMsg\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(189,1,'civicrm/admin/price',NULL,'Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:10:\"adminGroup\";s:9:\"Customize\";}'),(190,1,'civicrm/admin/price/add','action=add','New Price Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";}'),(191,1,'civicrm/admin/price/field',NULL,'Price Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:20:\"CRM_Price_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,0,'a:0:{}'),(192,1,'civicrm/admin/price/field/option',NULL,'Price Field Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Price_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(193,1,'civicrm/ajax/mapping',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:11:\"mappingList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(194,1,'civicrm/ajax/recipientListing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:16:\"recipientListing\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(195,1,'civicrm/admin/sms/provider',NULL,'Sms Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Provider\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,500,1,0,NULL,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(196,1,'civicrm/sms/send',NULL,'New Mass SMS','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:23:\"CRM_SMS_Controller_Send\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(197,1,'civicrm/sms/callback',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Callback\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(198,1,'civicrm/admin/badgelayout','action=browse','Event Name Badge Layouts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Page_Layout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,399,1,0,NULL,'a:2:{s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(199,1,'civicrm/admin/badgelayout/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Form_Layout\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?reset=1&amp;action=browse\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(200,1,'civicrm/admin/ckeditor',NULL,'Configure CKEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_CKEditorConfig\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(201,1,'civicrm/upgrade',NULL,'Upgrade CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Upgrade_Page_Upgrade\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(202,1,'civicrm/export',NULL,'Download Errors','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(203,1,'civicrm/export/contact',NULL,'Export Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(204,1,'civicrm/export/standalone',NULL,'Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Export_Controller_Standalone\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(205,1,'civicrm/admin/options/acl_role',NULL,'ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(206,1,'civicrm/acl',NULL,'Manage ACLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_ACL_Page_ACL\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(207,1,'civicrm/acl/entityrole',NULL,'Assign Users to ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_ACL_Page_EntityRole\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(208,1,'civicrm/acl/basic',NULL,'ACL','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_ACL_Page_ACLBasic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(209,1,'civicrm/file',NULL,'Browse Uploaded files','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_Page_File\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(210,1,'civicrm/file/delete',NULL,'Delete File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:17:\"CRM_Core_BAO_File\";i:1;s:16:\"deleteAttachment\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:21:\"Browse Uploaded files\";s:3:\"url\";s:21:\"/civicrm/file?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(211,1,'civicrm/friend',NULL,'Tell a Friend','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:15:\"CRM_Friend_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(212,1,'civicrm/logout',NULL,'Log out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:6:\"logout\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,9999,1,1,NULL,'a:0:{}'),(213,1,'civicrm/i18n',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"translate CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_I18n_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(214,1,'civicrm/ajax/attachment',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:29:\"CRM_Core_Page_AJAX_Attachment\";i:1;s:10:\"attachFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(215,1,'civicrm/api',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(216,1,'civicrm/api3',NULL,'CiviCRM API v3','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_APIExplorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(217,1,'civicrm/ajax/apiexample',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:14:\"getExampleFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(218,1,'civicrm/ajax/apidoc',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:6:\"getDoc\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(219,1,'civicrm/ajax/rest',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:4:\"ajax\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(220,1,'civicrm/api/json',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:8:\"ajaxJson\";}','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(221,1,'civicrm/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:12:\"loadTemplate\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(222,1,'civicrm/ajax/chart',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(223,1,'civicrm/asset/builder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"\\Civi\\Core\\AssetBuilder\";i:1;s:7:\"pageRun\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(224,1,'civicrm/contribute/ajax/tableview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(225,1,'civicrm/payment/ipn',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Core_Payment\";i:1;s:9:\"handleIPN\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(226,1,'civicrm/batch',NULL,'Batch Data Entry','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(227,1,'civicrm/batch/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Batch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(228,1,'civicrm/batch/entry',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Entry\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(229,1,'civicrm/ajax/batch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:9:\"batchSave\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(230,1,'civicrm/ajax/batchlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:12:\"getBatchList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(231,1,'civicrm/ajax/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Page_AJAX\";i:1;s:3:\"run\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(232,1,'civicrm/dev/qunit',NULL,'QUnit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:19:\"CRM_Core_Page_QUnit\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(233,1,'civicrm/profile-editor/schema',NULL,'ProfileEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:25:\"CRM_UF_Page_ProfileEditor\";i:1;s:13:\"getSchemaJSON\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(234,1,'civicrm/a',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"\\Civi\\Angular\\Page\\Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(235,1,'civicrm/ajax/angular-modules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"\\Civi\\Angular\\Page\\Modules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(236,1,'civicrm/ajax/recurringentity/update-mode',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:34:\"CRM_Core_Page_AJAX_RecurringEntity\";i:1;s:10:\"updateMode\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(237,1,'civicrm/recurringentity/preview',NULL,'Confirm dates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Core_Page_RecurringEntityPreview\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(238,1,'civicrm/ajax/l10n-js',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Resources\";i:1;s:20:\"outputLocalizationJS\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(239,1,'civicrm/shortcode',NULL,'Insert CiviCRM Content','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Core_Form_ShortCode\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(240,1,'civicrm/task/add-to-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Form_Task_AddToGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(241,1,'civicrm/task/remove-from-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contact_Form_Task_RemoveFromGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(242,1,'civicrm/task/add-to-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Contact_Form_Task_AddToTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(243,1,'civicrm/task/remove-from-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Form_Task_RemoveFromTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(244,1,'civicrm/task/send-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(245,1,'civicrm/task/make-mailing-label',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Label\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(246,1,'civicrm/task/pick-profile',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contact_Form_Task_PickProfile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(247,1,'civicrm/task/print-document',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(248,1,'civicrm/task/unhold-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Unhold\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(249,1,'civicrm/task/alter-contact-preference',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contact_Form_Task_AlterPreferences\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(250,1,'civicrm/task/delete-contact',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(251,1,'civicrm/event',NULL,'CiviEvent Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,800,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(252,1,'civicrm/participant/add','action=add','Register New Participant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(253,1,'civicrm/event/info',NULL,'Event Information','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(254,1,'civicrm/event/register',NULL,'Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Controller_Registration\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(255,1,'civicrm/event/confirm',NULL,'Confirm Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:46:\"CRM_Event_Form_Registration_ParticipantConfirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(256,1,'civicrm/event/ical',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_ICalendar\";i:1;s:3:\"run\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(257,1,'civicrm/event/list',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','s:19:\"CRM_Event_Page_List\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(258,1,'civicrm/event/participant',NULL,'Event Participants List','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"view event participants\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Page_ParticipantListing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(259,1,'civicrm/admin/event',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(260,1,'civicrm/admin/eventTemplate',NULL,'Event Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Admin_Page_EventTemplate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,375,1,0,NULL,'a:2:{s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(261,1,'civicrm/admin/options/event_type',NULL,'Event Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(262,1,'civicrm/admin/participant_status',NULL,'Participant Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Page_ParticipantStatusType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(263,1,'civicrm/admin/options/participant_role',NULL,'Participant Role','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(264,1,'civicrm/admin/options/participant_listing',NULL,'Participant Listing Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,398,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(265,1,'civicrm/admin/options/conference_slot',NULL,'Conference Slot Labels','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(266,1,'civicrm/event/search',NULL,'Find Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,810,1,1,NULL,'a:0:{}'),(267,1,'civicrm/event/manage',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,820,1,1,NULL,'a:0:{}'),(268,1,'civicrm/event/badge',NULL,'Print Event Name Badge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:25:\"CRM_Event_Form_Task_Badge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(269,1,'civicrm/event/manage/settings',NULL,'Event Info and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,910,1,0,NULL,'a:0:{}'),(270,1,'civicrm/event/manage/location',NULL,'Event Location','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:35:\"CRM_Event_Form_ManageEvent_Location\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(271,1,'civicrm/event/manage/fee',NULL,'Event Fees','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_ManageEvent_Fee\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,920,1,0,NULL,'a:0:{}'),(272,1,'civicrm/event/manage/registration',NULL,'Event Online Registration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:39:\"CRM_Event_Form_ManageEvent_Registration\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(273,1,'civicrm/event/manage/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Friend_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,940,1,0,NULL,'a:0:{}'),(274,1,'civicrm/event/manage/reminder',NULL,'Schedule Reminders','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:44:\"CRM_Event_Form_ManageEvent_ScheduleReminders\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(275,1,'civicrm/event/manage/repeat',NULL,'Repeat Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Form_ManageEvent_Repeat\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,960,1,0,NULL,'a:0:{}'),(276,1,'civicrm/event/manage/conference',NULL,'Conference Slots','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:37:\"CRM_Event_Form_ManageEvent_Conference\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(277,1,'civicrm/event/add','action=add','New Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,830,1,0,NULL,'a:0:{}'),(278,1,'civicrm/event/import',NULL,'Import Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:23:\"edit event participants\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,840,1,1,NULL,'a:0:{}'),(279,1,'civicrm/event/price',NULL,'Manage Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,850,1,1,NULL,'a:0:{}'),(280,1,'civicrm/event/selfsvcupdate',NULL,'Self-service Registration Update','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Form_SelfSvcUpdate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,880,1,1,NULL,'a:0:{}'),(281,1,'civicrm/event/selfsvctransfer',NULL,'Self-service Registration Transfer','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_SelfSvcTransfer\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,890,1,1,NULL,'a:0:{}'),(282,1,'civicrm/contact/view/participant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,4,1,0,NULL,'a:0:{}'),(283,1,'civicrm/ajax/eventFee',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_Page_AJAX\";i:1;s:8:\"eventFee\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(284,1,'civicrm/ajax/locBlock',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:11:\"getLocBlock\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(285,1,'civicrm/event/participant/feeselection',NULL,'Change Registration Selections','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:38:\"CRM_Event_Form_ParticipantFeeSelection\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:23:\"Event Participants List\";s:3:\"url\";s:34:\"/civicrm/event/participant?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(286,1,'civicrm/event/manage/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_PCP_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,540,1,1,NULL,'a:0:{}'),(287,1,'civicrm/event/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(288,1,'civicrm/event/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(289,1,'civicrm/contribute',NULL,'CiviContribute Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,500,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(290,1,'civicrm/contribute/add','action=add','New Contribution','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(291,1,'civicrm/contribute/chart',NULL,'Contribution Summary - Chart View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(292,1,'civicrm/contribute/transact',NULL,'CiviContribute','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Controller_Contribution\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,1,0,1,0,NULL,'a:0:{}'),(293,1,'civicrm/admin/contribute',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,360,1,0,NULL,'a:2:{s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(294,1,'civicrm/admin/contribute/settings',NULL,'Title and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_Settings\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:0:{}'),(295,1,'civicrm/admin/contribute/amount',NULL,'Contribution Amounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Amount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:0:{}'),(296,1,'civicrm/admin/contribute/membership',NULL,'Membership Section','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Member_Form_MembershipBlock\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:0:{}'),(297,1,'civicrm/admin/contribute/custom',NULL,'Include Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Custom\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(298,1,'civicrm/admin/contribute/thankyou',NULL,'Thank-you and Receipting','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_ThankYou\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(299,1,'civicrm/admin/contribute/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Friend_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,440,1,0,NULL,'a:0:{}'),(300,1,'civicrm/admin/contribute/widget',NULL,'Configure Widget','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Widget\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,460,1,0,NULL,'a:0:{}'),(301,1,'civicrm/admin/contribute/premium',NULL,'Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:44:\"CRM_Contribute_Form_ContributionPage_Premium\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,470,1,0,NULL,'a:0:{}'),(302,1,'civicrm/admin/contribute/addProductToPage',NULL,'Add Products to This Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:47:\"CRM_Contribute_Form_ContributionPage_AddProduct\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,480,1,0,NULL,'a:0:{}'),(303,1,'civicrm/admin/contribute/add','action=add','New Contribution Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Contribute_Controller_ContributionPage\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(304,1,'civicrm/admin/contribute/managePremiums',NULL,'Manage Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Page_ManagePremiums\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,365,1,0,NULL,'a:2:{s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(305,1,'civicrm/admin/financial/financialType',NULL,'Financial Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Financial_Page_FinancialType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,580,1,0,NULL,'a:2:{s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(306,1,'civicrm/payment','action=add','New Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Form_AdditionalPayment\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(307,1,'civicrm/admin/financial/financialAccount',NULL,'Financial Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_FinancialAccount\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(308,1,'civicrm/admin/options/payment_instrument',NULL,'Payment Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(309,1,'civicrm/admin/options/accept_creditcard',NULL,'Accepted Credit Cards','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(310,1,'civicrm/admin/options/soft_credit_type',NULL,'Soft Credit Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(311,1,'civicrm/contact/view/contribution',NULL,'Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(312,1,'civicrm/contact/view/contributionrecur',NULL,'Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:37:\"CRM_Contribute_Page_ContributionRecur\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(313,1,'civicrm/contact/view/contribution/additionalinfo',NULL,'Additional Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:13:\"Contributions\";s:3:\"url\";s:42:\"/civicrm/contact/view/contribution?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(314,1,'civicrm/contribute/search',NULL,'Find Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,510,1,1,NULL,'a:0:{}'),(315,1,'civicrm/contribute/searchBatch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Controller_SearchBatch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,588,1,1,NULL,'a:0:{}'),(316,1,'civicrm/contribute/import',NULL,'Import Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"edit contributions\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,520,1,1,NULL,'a:0:{}'),(317,1,'civicrm/contribute/manage',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,530,1,1,NULL,'a:0:{}'),(318,1,'civicrm/contribute/additionalinfo',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(319,1,'civicrm/ajax/permlocation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:23:\"getPermissionedLocation\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(320,1,'civicrm/contribute/unsubscribe',NULL,'Cancel Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_CancelSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(321,1,'civicrm/contribute/onbehalf',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_Contribution_OnBehalfOf\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(322,1,'civicrm/contribute/updatebilling',NULL,'Update Billing Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contribute_Form_UpdateBilling\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(323,1,'civicrm/contribute/updaterecur',NULL,'Update Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_UpdateSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(324,1,'civicrm/contribute/subscriptionstatus',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Page_SubscriptionStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(325,1,'civicrm/admin/financial/financialType/accounts',NULL,'Financial Type Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:39:\"CRM_Financial_Page_FinancialTypeAccount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:15:\"Financial Types\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,581,1,0,NULL,'a:0:{}'),(326,1,'civicrm/financial/batch',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:33:\"CRM_Financial_Page_FinancialBatch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,585,1,0,NULL,'a:0:{}'),(327,1,'civicrm/financial/financialbatches',NULL,'Accounting Batches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Financial_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,586,1,0,NULL,'a:0:{}'),(328,1,'civicrm/batchtransaction',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_BatchTransaction\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,600,1,0,NULL,'a:0:{}'),(329,1,'civicrm/financial/batch/export',NULL,'Accounting Batch Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:25:\"CRM_Financial_Form_Export\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Accounting Batch\";s:3:\"url\";s:32:\"/civicrm/financial/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,0,NULL,'a:0:{}'),(330,1,'civicrm/payment/view','action=view','View Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contribute_Page_PaymentInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(331,1,'civicrm/admin/setting/preferences/contribute',NULL,'CiviContribute Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Admin_Form_Preferences_Contribute\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(332,1,'civicrm/contribute/invoice',NULL,'PDF Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Contribute_Form_Task_Invoice\";i:1;s:11:\"getPrintPDF\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,620,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(333,1,'civicrm/contribute/invoice/email',NULL,'Email Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Form_Task_Invoice\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"PDF Invoice\";s:3:\"url\";s:35:\"/civicrm/contribute/invoice?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,630,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(334,1,'civicrm/ajax/softcontributionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:24:\"CRM_Contribute_Page_AJAX\";i:1;s:23:\"getSoftContributionRows\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(335,1,'civicrm/contribute/contributionrecur-payments',NULL,'Recurring Contribution\'s Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Page_ContributionRecurPayments\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(336,1,'civicrm/membership/recurring-contributions',NULL,'Membership Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Member_Page_RecurringContributions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(337,1,'civicrm/admin/contribute/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_PCP_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,450,1,0,NULL,'a:0:{}'),(338,1,'civicrm/contribute/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(339,1,'civicrm/member',NULL,'CiviMember Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:25:\"CRM_Member_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,700,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(340,1,'civicrm/member/add','action=add','New Membership','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(341,1,'civicrm/admin/member/membershipType',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Page_MembershipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(342,1,'civicrm/admin/member/membershipStatus',NULL,'Membership Status Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Member_Page_MembershipStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(343,1,'civicrm/contact/view/membership','force=1,cid=%%cid%%','Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,2,1,0,NULL,'a:0:{}'),(344,1,'civicrm/membership/view',NULL,'Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipView\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,390,1,0,NULL,'a:0:{}'),(345,1,'civicrm/member/search',NULL,'Find Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,710,1,1,NULL,'a:0:{}'),(346,1,'civicrm/member/import',NULL,'Import Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:16:\"edit memberships\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,720,1,1,NULL,'a:0:{}'),(347,1,'civicrm/ajax/memType',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Member_Page_AJAX\";i:1;s:21:\"getMemberTypeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(348,1,'civicrm/admin/member/membershipType/add',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:16:\"Membership Types\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(349,1,'civicrm/mailing',NULL,'CiviMail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,600,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviMail\";}'),(350,1,'civicrm/admin/mail',NULL,'Mailer Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Mail\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(351,1,'civicrm/admin/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(352,1,'civicrm/admin/options/from_email_address/civimail',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:4:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}i:3;a:2:{s:5:\"title\";s:20:\"From Email Addresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(353,1,'civicrm/admin/mailSettings',NULL,'Mail Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_MailSettings\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:32:\"Configure email account setting.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(354,1,'civicrm/mailing/send',NULL,'New Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:27:\"CRM_Mailing_Controller_Send\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(355,1,'civicrm/mailing/browse/scheduled','scheduled=true','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:5:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";i:4;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(356,1,'civicrm/mailing/browse/unscheduled','scheduled=false','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(357,1,'civicrm/mailing/browse/archived',NULL,'Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,625,1,1,NULL,'a:0:{}'),(358,1,'civicrm/mailing/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,630,1,1,NULL,'a:0:{}'),(359,1,'civicrm/mailing/unsubscribe',NULL,'Unsubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Form_Unsubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,640,1,0,NULL,'a:0:{}'),(360,1,'civicrm/mailing/resubscribe',NULL,'Resubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Page_Resubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,645,1,0,NULL,'a:0:{}'),(361,1,'civicrm/mailing/optout',NULL,'Opt-out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Form_Optout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,650,1,0,NULL,'a:0:{}'),(362,1,'civicrm/mailing/confirm',NULL,'Confirm','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:24:\"CRM_Mailing_Page_Confirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(363,1,'civicrm/mailing/subscribe',NULL,'Subscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Form_Subscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(364,1,'civicrm/mailing/preview',NULL,'Preview Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Page_Preview\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,670,1,0,NULL,'a:0:{}'),(365,1,'civicrm/mailing/report','mid=%%mid%%','Mailing Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,680,1,0,NULL,'a:0:{}'),(366,1,'civicrm/mailing/forward',NULL,'Forward Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:31:\"CRM_Mailing_Form_ForwardMailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,685,1,0,NULL,'a:0:{}'),(367,1,'civicrm/mailing/queue',NULL,'Sending Mail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,690,1,0,NULL,'a:0:{}'),(368,1,'civicrm/mailing/report/event',NULL,'Mailing Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:22:\"CRM_Mailing_Page_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Mailing Report\";s:3:\"url\";s:47:\"/civicrm/mailing/report?reset=1&amp;mid=%%mid%%\";}}',NULL,NULL,4,NULL,NULL,NULL,0,695,1,0,NULL,'a:0:{}'),(369,1,'civicrm/ajax/template',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:8:\"template\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(370,1,'civicrm/mailing/view',NULL,'View Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:28:\"view public CiviMail content\";i:1;s:15:\"access CiviMail\";i:2;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:21:\"CRM_Mailing_Page_View\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,800,1,0,NULL,'a:0:{}'),(371,1,'civicrm/mailing/approve',NULL,'Approve Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Form_Approve\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,850,1,0,NULL,'a:0:{}'),(372,1,'civicrm/contact/view/mailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:20:\"CRM_Mailing_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(373,1,'civicrm/ajax/contactmailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:18:\"getContactMailings\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(374,1,'civicrm/mailing/url',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:20:\"CRM_Mailing_Page_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(375,1,'civicrm/mailing/open',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:21:\"CRM_Mailing_Page_Open\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(376,1,'civicrm/grant',NULL,'CiviGrant Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1000,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(377,1,'civicrm/grant/info',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(378,1,'civicrm/grant/search',NULL,'Find Grants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:27:\"CRM_Grant_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1010,1,1,NULL,'a:0:{}'),(379,1,'civicrm/grant/add','action=add','New Grant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(380,1,'civicrm/contact/view/grant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(381,1,'civicrm/pledge',NULL,'CiviPledge Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:25:\"CRM_Pledge_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,550,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(382,1,'civicrm/pledge/search',NULL,'Find Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:28:\"CRM_Pledge_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,560,1,1,NULL,'a:0:{}'),(383,1,'civicrm/contact/view/pledge','force=1,cid=%%cid%%','Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,570,1,0,NULL,'a:0:{}'),(384,1,'civicrm/pledge/add','action=add','New Pledge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(385,1,'civicrm/pledge/payment',NULL,'Pledge Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:23:\"CRM_Pledge_Page_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,580,1,0,NULL,'a:0:{}'),(386,1,'civicrm/ajax/pledgeAmount',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviPledge\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Pledge_Page_AJAX\";i:1;s:17:\"getPledgeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(387,1,'civicrm/case',NULL,'CiviCase Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Case_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,900,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(388,1,'civicrm/case/add',NULL,'Open Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Case_Form_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(389,1,'civicrm/case/search',NULL,'Find Cases','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,910,1,1,NULL,'a:0:{}'),(390,1,'civicrm/case/activity',NULL,'Case Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Case_Form_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(391,1,'civicrm/case/report',NULL,'Case Activity Audit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:20:\"CRM_Case_Form_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(392,1,'civicrm/case/cd/edit',NULL,'Case Custom Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Case_Form_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(393,1,'civicrm/contact/view/case',NULL,'Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:17:\"CRM_Case_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(394,1,'civicrm/case/activity/view',NULL,'Activity View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Form_ActivityView\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Case Activity\";s:3:\"url\";s:30:\"/civicrm/case/activity?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(395,1,'civicrm/contact/view/case/editClient',NULL,'Assign to Another Client','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Case_Form_EditClient\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:4:\"Case\";s:3:\"url\";s:34:\"/civicrm/contact/view/case?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(396,1,'civicrm/case/addToCase',NULL,'File on Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Case_Form_ActivityToCase\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(397,1,'civicrm/case/details',NULL,'Case Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Case_Page_CaseDetails\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(398,1,'civicrm/admin/setting/case',NULL,'CiviCase Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(399,1,'civicrm/admin/options/case_type',NULL,'Case Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:24:\"url=civicrm/a/#/caseType\";','a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(400,1,'civicrm/admin/options/redaction_rule',NULL,'Redaction Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(401,1,'civicrm/admin/options/case_status',NULL,'Case Statuses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(402,1,'civicrm/admin/options/encounter_medium',NULL,'Encounter Mediums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:26:\"List of encounter mediums.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(403,1,'civicrm/case/report/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Case_XMLProcessor_Report\";i:1;s:15:\"printCaseReport\";}',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:19:\"Case Activity Audit\";s:3:\"url\";s:28:\"/civicrm/case/report?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(404,1,'civicrm/case/ajax/addclient',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:9:\"addClient\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(405,1,'civicrm/case/ajax/processtags',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"processCaseTags\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(406,1,'civicrm/case/ajax/details',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:11:\"CaseDetails\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(407,1,'civicrm/ajax/delcaserole',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"deleteCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(408,1,'civicrm/ajax/get-cases',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:8:\"getCases\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(409,1,'civicrm/report',NULL,'CiviReport','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:22:\"CRM_Report_Page_Report\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1200,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviReport\";}'),(410,1,'civicrm/report/list',NULL,'CiviCRM Reports','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(411,1,'civicrm/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1220,1,1,NULL,'a:0:{}'),(412,1,'civicrm/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1241,1,1,NULL,'a:0:{}'),(413,1,'civicrm/admin/report/register',NULL,'Register Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Form_Register\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:30:\"Register the Report templates.\";}'),(414,1,'civicrm/report/instance',NULL,'Report','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Page_Instance\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(415,1,'civicrm/admin/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(416,1,'civicrm/admin/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(417,1,'civicrm/admin/report/list',NULL,'Reports Listing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(418,1,'civicrm/campaign',NULL,'Campaign Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:27:\"CRM_Campaign_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(419,1,'civicrm/campaign/add',NULL,'New Campaign','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Campaign\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(420,1,'civicrm/survey/add',NULL,'New Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(421,1,'civicrm/campaign/vote',NULL,'Conduct Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"reserve campaign contacts\";i:3;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Page_Vote\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(422,1,'civicrm/admin/campaign/surveyType',NULL,'Survey Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"administer CiviCampaign\";}i:1;s:3:\"and\";}','s:28:\"CRM_Campaign_Page_SurveyType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(423,1,'civicrm/admin/options/campaign_type',NULL,'Campaign Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,2,1,0,NULL,'a:3:{s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(424,1,'civicrm/admin/options/campaign_status',NULL,'Campaign Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,3,1,0,NULL,'a:3:{s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(425,1,'civicrm/admin/options/engagement_index',NULL,'Engagement Index','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,4,1,0,NULL,'a:3:{s:4:\"desc\";s:18:\"Engagement levels.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(426,1,'civicrm/survey/search','op=interview','Record Respondents Interview','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:30:\"CRM_Campaign_Controller_Search\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(427,1,'civicrm/campaign/gotv',NULL,'GOTV (Track Voters)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"release campaign contacts\";i:3;s:22:\"gotv campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Form_Gotv\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(428,1,'civicrm/petition/add',NULL,'New Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(429,1,'civicrm/petition/sign',NULL,'Sign Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:36:\"CRM_Campaign_Form_Petition_Signature\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(430,1,'civicrm/petition/browse',NULL,'View Petition Signatures','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Campaign_Page_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(431,1,'civicrm/petition/confirm',NULL,'Email address verified','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:34:\"CRM_Campaign_Page_Petition_Confirm\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(432,1,'civicrm/petition/thankyou',NULL,'Thank You','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:35:\"CRM_Campaign_Page_Petition_ThankYou\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(433,1,'civicrm/campaign/registerInterview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','a:2:{i:0;s:22:\"CRM_Campaign_Page_AJAX\";i:1;s:17:\"registerInterview\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(434,1,'civicrm/survey/configure/main',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(435,1,'civicrm/survey/configure/questions',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:34:\"CRM_Campaign_Form_Survey_Questions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(436,1,'civicrm/survey/configure/results',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:32:\"CRM_Campaign_Form_Survey_Results\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(437,1,'civicrm/survey/delete',NULL,'Delete Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:31:\"CRM_Campaign_Form_Survey_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(438,1,'civicrm/ajax/event/add_participant_to_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:23:\"add_participant_to_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(439,1,'civicrm/ajax/event/remove_participant_from_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:28:\"remove_participant_from_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(440,1,'civicrm/event/add_to_cart',NULL,'Add Event To Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:29:\"CRM_Event_Cart_Page_AddToCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(441,1,'civicrm/event/cart_checkout',NULL,'Cart Checkout','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Controller_Checkout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(442,1,'civicrm/event/remove_from_cart',NULL,'Remove From Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Page_RemoveFromCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(443,1,'civicrm/event/view_cart',NULL,'View Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Cart_Page_ViewCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(444,1,'admin',NULL,NULL,NULL,NULL,NULL,NULL,'a:15:{s:26:\"Customize Data and Screens\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:19:{s:26:\"{weight}.Tags (Categories)\";a:6:{s:5:\"title\";s:17:\"Tags (Categories)\";s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:2:\"id\";s:15:\"Tags_Categories\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Custom Data\";a:6:{s:5:\"title\";s:11:\"Custom Data\";s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:2:\"id\";s:10:\"CustomData\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:17:\"{weight}.Profiles\";a:6:{s:5:\"title\";s:8:\"Profiles\";s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:2:\"id\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Activity Types\";a:6:{s:5:\"title\";s:14:\"Activity Types\";s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:2:\"id\";s:13:\"ActivityTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/activity_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Relationship Types\";a:6:{s:5:\"title\";s:18:\"Relationship Types\";s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:2:\"id\";s:17:\"RelationshipTypes\";s:3:\"url\";s:30:\"/civicrm/admin/reltype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Contact Types\";a:6:{s:5:\"title\";s:13:\"Contact Types\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ContactTypes\";s:3:\"url\";s:38:\"/civicrm/admin/options/subtype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Gender Options\";a:6:{s:5:\"title\";s:14:\"Gender Options\";s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:2:\"id\";s:13:\"GenderOptions\";s:3:\"url\";s:37:\"/civicrm/admin/options/gender?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Prefixes (Ms, Mr...)\";a:6:{s:5:\"title\";s:31:\"Individual Prefixes (Ms, Mr...)\";s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:2:\"id\";s:27:\"IndividualPrefixes_Ms_Mr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_prefix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Suffixes (Jr, Sr...)\";a:6:{s:5:\"title\";s:31:\"Individual Suffixes (Jr, Sr...)\";s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:2:\"id\";s:27:\"IndividualSuffixes_Jr_Sr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_suffix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:39:\"{weight}.Location Types (Home, Work...)\";a:6:{s:5:\"title\";s:30:\"Location Types (Home, Work...)\";s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:2:\"id\";s:26:\"LocationTypes_Home_Work...\";s:3:\"url\";s:35:\"/civicrm/admin/locationType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Website Types\";a:6:{s:5:\"title\";s:13:\"Website Types\";s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:2:\"id\";s:12:\"WebsiteTypes\";s:3:\"url\";s:43:\"/civicrm/admin/options/website_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:35:\"{weight}.Instant Messenger Services\";a:6:{s:5:\"title\";s:26:\"Instant Messenger Services\";s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:2:\"id\";s:24:\"InstantMessengerServices\";s:3:\"url\";s:56:\"/civicrm/admin/options/instant_messenger_service?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Mobile Phone Providers\";a:6:{s:5:\"title\";s:22:\"Mobile Phone Providers\";s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:2:\"id\";s:20:\"MobilePhoneProviders\";s:3:\"url\";s:46:\"/civicrm/admin/options/mobile_provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Phone Type\";a:6:{s:5:\"title\";s:10:\"Phone Type\";s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:2:\"id\";s:9:\"PhoneType\";s:3:\"url\";s:41:\"/civicrm/admin/options/phone_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Display Preferences\";a:6:{s:5:\"title\";s:19:\"Display Preferences\";s:4:\"desc\";N;s:2:\"id\";s:18:\"DisplayPreferences\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/display?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Search Preferences\";a:6:{s:5:\"title\";s:18:\"Search Preferences\";s:4:\"desc\";N;s:2:\"id\";s:17:\"SearchPreferences\";s:3:\"url\";s:37:\"/civicrm/admin/setting/search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Navigation Menu\";a:6:{s:5:\"title\";s:15:\"Navigation Menu\";s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:2:\"id\";s:14:\"NavigationMenu\";s:3:\"url\";s:27:\"/civicrm/admin/menu?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Word Replacements\";a:6:{s:5:\"title\";s:17:\"Word Replacements\";s:4:\"desc\";s:18:\"Word Replacements.\";s:2:\"id\";s:16:\"WordReplacements\";s:3:\"url\";s:47:\"/civicrm/admin/options/wordreplacements?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Manage Custom Searches\";a:6:{s:5:\"title\";s:22:\"Manage Custom Searches\";s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:2:\"id\";s:20:\"ManageCustomSearches\";s:3:\"url\";s:44:\"/civicrm/admin/options/custom_search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:6:\"Manage\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:42:\"{weight}.Find and Merge Duplicate Contacts\";a:6:{s:5:\"title\";s:33:\"Find and Merge Duplicate Contacts\";s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:2:\"id\";s:29:\"FindandMergeDuplicateContacts\";s:3:\"url\";s:36:\"/civicrm/contact/deduperules?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Dedupe Exceptions\";a:6:{s:5:\"title\";s:17:\"Dedupe Exceptions\";s:4:\"desc\";N;s:2:\"id\";s:16:\"DedupeExceptions\";s:3:\"url\";s:33:\"/civicrm/dedupe/exception?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Scheduled Jobs Log\";a:6:{s:5:\"title\";s:18:\"Scheduled Jobs Log\";s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:2:\"id\";s:16:\"ScheduledJobsLog\";s:3:\"url\";s:29:\"/civicrm/admin/joblog?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"CiviContribute\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:32:\"{weight}.Personal Campaign Pages\";a:6:{s:5:\"title\";s:23:\"Personal Campaign Pages\";s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:2:\"id\";s:21:\"PersonalCampaignPages\";s:3:\"url\";s:49:\"/civicrm/admin/pcp?context=contribute&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Manage Contribution Pages\";a:6:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:2:\"id\";s:23:\"ManageContributionPages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Manage Premiums\";a:6:{s:5:\"title\";s:15:\"Manage Premiums\";s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:2:\"id\";s:14:\"ManagePremiums\";s:3:\"url\";s:48:\"/civicrm/admin/contribute/managePremiums?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Financial Types\";a:6:{s:5:\"title\";s:15:\"Financial Types\";s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:2:\"id\";s:14:\"FinancialTypes\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Financial Accounts\";a:6:{s:5:\"title\";s:18:\"Financial Accounts\";s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:2:\"id\";s:17:\"FinancialAccounts\";s:3:\"url\";s:49:\"/civicrm/admin/financial/financialAccount?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Payment Methods\";a:6:{s:5:\"title\";s:15:\"Payment Methods\";s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:2:\"id\";s:14:\"PaymentMethods\";s:3:\"url\";s:49:\"/civicrm/admin/options/payment_instrument?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Accepted Credit Cards\";a:6:{s:5:\"title\";s:21:\"Accepted Credit Cards\";s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:2:\"id\";s:19:\"AcceptedCreditCards\";s:3:\"url\";s:48:\"/civicrm/admin/options/accept_creditcard?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Soft Credit Types\";a:6:{s:5:\"title\";s:17:\"Soft Credit Types\";s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:2:\"id\";s:15:\"SoftCreditTypes\";s:3:\"url\";s:47:\"/civicrm/admin/options/soft_credit_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:42:\"{weight}.CiviContribute Component Settings\";a:6:{s:5:\"title\";s:33:\"CiviContribute Component Settings\";s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:2:\"id\";s:31:\"CiviContributeComponentSettings\";s:3:\"url\";s:53:\"/civicrm/admin/setting/preferences/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"Communications\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:11:{s:46:\"{weight}.Organization Address and Contact Info\";a:6:{s:5:\"title\";s:37:\"Organization Address and Contact Info\";s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:2:\"id\";s:33:\"OrganizationAddressandContactInfo\";s:3:\"url\";s:47:\"/civicrm/admin/domain?action=update&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Message Templates\";a:6:{s:5:\"title\";s:17:\"Message Templates\";s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:2:\"id\";s:16:\"MessageTemplates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Schedule Reminders\";a:6:{s:5:\"title\";s:18:\"Schedule Reminders\";s:4:\"desc\";s:19:\"Schedule Reminders.\";s:2:\"id\";s:17:\"ScheduleReminders\";s:3:\"url\";s:40:\"/civicrm/admin/scheduleReminders?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Preferred Communication Methods\";a:6:{s:5:\"title\";s:31:\"Preferred Communication Methods\";s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:2:\"id\";s:29:\"PreferredCommunicationMethods\";s:3:\"url\";s:61:\"/civicrm/admin/options/preferred_communication_method?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Label Formats\";a:6:{s:5:\"title\";s:13:\"Label Formats\";s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:2:\"id\";s:12:\"LabelFormats\";s:3:\"url\";s:35:\"/civicrm/admin/labelFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Print Page (PDF) Formats\";a:6:{s:5:\"title\";s:24:\"Print Page (PDF) Formats\";s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:2:\"id\";s:20:\"PrintPage_PDFFormats\";s:3:\"url\";s:33:\"/civicrm/admin/pdfFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Communication Style Options\";a:6:{s:5:\"title\";s:27:\"Communication Style Options\";s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:2:\"id\";s:25:\"CommunicationStyleOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/communication_style?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Email Greeting Formats\";a:6:{s:5:\"title\";s:22:\"Email Greeting Formats\";s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:2:\"id\";s:20:\"EmailGreetingFormats\";s:3:\"url\";s:45:\"/civicrm/admin/options/email_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Postal Greeting Formats\";a:6:{s:5:\"title\";s:23:\"Postal Greeting Formats\";s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:2:\"id\";s:21:\"PostalGreetingFormats\";s:3:\"url\";s:46:\"/civicrm/admin/options/postal_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Addressee Formats\";a:6:{s:5:\"title\";s:17:\"Addressee Formats\";s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:2:\"id\";s:16:\"AddresseeFormats\";s:3:\"url\";s:40:\"/civicrm/admin/options/addressee?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Localization\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:4:{s:39:\"{weight}.Languages, Currency, Locations\";a:6:{s:5:\"title\";s:30:\"Languages, Currency, Locations\";s:4:\"desc\";N;s:2:\"id\";s:28:\"Languages_Currency_Locations\";s:3:\"url\";s:43:\"/civicrm/admin/setting/localization?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Address Settings\";a:6:{s:5:\"title\";s:16:\"Address Settings\";s:4:\"desc\";N;s:2:\"id\";s:15:\"AddressSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Date Formats\";a:6:{s:5:\"title\";s:12:\"Date Formats\";s:4:\"desc\";N;s:2:\"id\";s:11:\"DateFormats\";s:3:\"url\";s:35:\"/civicrm/admin/setting/date?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Preferred Languages\";a:6:{s:5:\"title\";s:19:\"Preferred Languages\";s:4:\"desc\";s:30:\"Options for contact languages.\";s:2:\"id\";s:18:\"PreferredLanguages\";s:3:\"url\";s:40:\"/civicrm/admin/options/languages?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:21:\"Users and Permissions\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:2:{s:23:\"{weight}.Access Control\";a:6:{s:5:\"title\";s:14:\"Access Control\";s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:2:\"id\";s:13:\"AccessControl\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Synchronize Users to Contacts\";a:6:{s:5:\"title\";s:29:\"Synchronize Users to Contacts\";s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:2:\"id\";s:26:\"SynchronizeUserstoContacts\";s:3:\"url\";s:32:\"/civicrm/admin/synchUser?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:15:\"System Settings\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:18:{s:32:\"{weight}.Configuration Checklist\";a:6:{s:5:\"title\";s:23:\"Configuration Checklist\";s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:2:\"id\";s:22:\"ConfigurationChecklist\";s:3:\"url\";s:33:\"/civicrm/admin/configtask?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Enable CiviCRM Components\";a:6:{s:5:\"title\";s:25:\"Enable CiviCRM Components\";s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:2:\"id\";s:23:\"EnableCiviCRMComponents\";s:3:\"url\";s:40:\"/civicrm/admin/setting/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Manage Extensions\";a:6:{s:5:\"title\";s:17:\"Manage Extensions\";s:4:\"desc\";s:0:\"\";s:2:\"id\";s:16:\"ManageExtensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Outbound Email Settings\";a:6:{s:5:\"title\";s:23:\"Outbound Email Settings\";s:4:\"desc\";N;s:2:\"id\";s:21:\"OutboundEmailSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/smtp?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:37:\"{weight}.Settings - Payment Processor\";a:6:{s:5:\"title\";s:28:\"Settings - Payment Processor\";s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:2:\"id\";s:25:\"Settings-PaymentProcessor\";s:3:\"url\";s:39:\"/civicrm/admin/paymentProcessor?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Mapping and Geocoding\";a:6:{s:5:\"title\";s:21:\"Mapping and Geocoding\";s:4:\"desc\";N;s:2:\"id\";s:19:\"MappingandGeocoding\";s:3:\"url\";s:38:\"/civicrm/admin/setting/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:62:\"{weight}.Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";a:6:{s:5:\"title\";s:53:\"Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:2:\"id\";s:46:\"Misc_Undelete_PDFs_Limits_Logging_Captcha_etc.\";s:3:\"url\";s:35:\"/civicrm/admin/setting/misc?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Directories\";a:6:{s:5:\"title\";s:11:\"Directories\";s:4:\"desc\";N;s:2:\"id\";s:11:\"Directories\";s:3:\"url\";s:35:\"/civicrm/admin/setting/path?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Resource URLs\";a:6:{s:5:\"title\";s:13:\"Resource URLs\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ResourceURLs\";s:3:\"url\";s:34:\"/civicrm/admin/setting/url?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Cleanup Caches and Update Paths\";a:6:{s:5:\"title\";s:31:\"Cleanup Caches and Update Paths\";s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:2:\"id\";s:27:\"CleanupCachesandUpdatePaths\";s:3:\"url\";s:50:\"/civicrm/admin/setting/updateConfigBackend?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.CMS Database Integration\";a:6:{s:5:\"title\";s:24:\"CMS Database Integration\";s:4:\"desc\";N;s:2:\"id\";s:22:\"CMSDatabaseIntegration\";s:3:\"url\";s:33:\"/civicrm/admin/setting/uf?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Safe File Extension Options\";a:6:{s:5:\"title\";s:27:\"Safe File Extension Options\";s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:2:\"id\";s:24:\"SafeFileExtensionOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/safe_file_extension?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Option Groups\";a:6:{s:5:\"title\";s:13:\"Option Groups\";s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:2:\"id\";s:12:\"OptionGroups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Import/Export Mappings\";a:6:{s:5:\"title\";s:22:\"Import/Export Mappings\";s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:2:\"id\";s:21:\"Import_ExportMappings\";s:3:\"url\";s:30:\"/civicrm/admin/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:18:\"{weight}.Debugging\";a:6:{s:5:\"title\";s:9:\"Debugging\";s:4:\"desc\";N;s:2:\"id\";s:9:\"Debugging\";s:3:\"url\";s:36:\"/civicrm/admin/setting/debug?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Multi Site Settings\";a:6:{s:5:\"title\";s:19:\"Multi Site Settings\";s:4:\"desc\";N;s:2:\"id\";s:17:\"MultiSiteSettings\";s:3:\"url\";s:52:\"/civicrm/admin/setting/preferences/multisite?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Scheduled Jobs\";a:6:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:2:\"id\";s:13:\"ScheduledJobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Sms Providers\";a:6:{s:5:\"title\";s:13:\"Sms Providers\";s:4:\"desc\";s:27:\"To configure a sms provider\";s:2:\"id\";s:12:\"SmsProviders\";s:3:\"url\";s:35:\"/civicrm/admin/sms/provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"CiviCampaign\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:40:\"{weight}.CiviCampaign Component Settings\";a:6:{s:5:\"title\";s:31:\"CiviCampaign Component Settings\";s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:2:\"id\";s:29:\"CiviCampaignComponentSettings\";s:3:\"url\";s:51:\"/civicrm/admin/setting/preferences/campaign?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Survey Types\";a:6:{s:5:\"title\";s:12:\"Survey Types\";s:4:\"desc\";N;s:2:\"id\";s:11:\"SurveyTypes\";s:3:\"url\";s:42:\"/civicrm/admin/campaign/surveyType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Campaign Types\";a:6:{s:5:\"title\";s:14:\"Campaign Types\";s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:2:\"id\";s:13:\"CampaignTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/campaign_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Campaign Status\";a:6:{s:5:\"title\";s:15:\"Campaign Status\";s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:2:\"id\";s:14:\"CampaignStatus\";s:3:\"url\";s:46:\"/civicrm/admin/options/campaign_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Engagement Index\";a:6:{s:5:\"title\";s:16:\"Engagement Index\";s:4:\"desc\";s:18:\"Engagement levels.\";s:2:\"id\";s:15:\"EngagementIndex\";s:3:\"url\";s:47:\"/civicrm/admin/options/engagement_index?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"CiviEvent\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:37:\"{weight}.CiviEvent Component Settings\";a:6:{s:5:\"title\";s:28:\"CiviEvent Component Settings\";s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:2:\"id\";s:26:\"CiviEventComponentSettings\";s:3:\"url\";s:48:\"/civicrm/admin/setting/preferences/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Event Name Badge Layouts\";a:6:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:2:\"id\";s:21:\"EventNameBadgeLayouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?action=browse&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Manage Events\";a:6:{s:5:\"title\";s:13:\"Manage Events\";s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:2:\"id\";s:12:\"ManageEvents\";s:3:\"url\";s:28:\"/civicrm/admin/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Event Templates\";a:6:{s:5:\"title\";s:15:\"Event Templates\";s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:2:\"id\";s:14:\"EventTemplates\";s:3:\"url\";s:36:\"/civicrm/admin/eventTemplate?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Event Types\";a:6:{s:5:\"title\";s:11:\"Event Types\";s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:2:\"id\";s:10:\"EventTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/event_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Participant Status\";a:6:{s:5:\"title\";s:18:\"Participant Status\";s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:2:\"id\";s:17:\"ParticipantStatus\";s:3:\"url\";s:41:\"/civicrm/admin/participant_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Participant Role\";a:6:{s:5:\"title\";s:16:\"Participant Role\";s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:2:\"id\";s:15:\"ParticipantRole\";s:3:\"url\";s:47:\"/civicrm/admin/options/participant_role?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Participant Listing Templates\";a:6:{s:5:\"title\";s:29:\"Participant Listing Templates\";s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:2:\"id\";s:27:\"ParticipantListingTemplates\";s:3:\"url\";s:50:\"/civicrm/admin/options/participant_listing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Conference Slot Labels\";a:6:{s:5:\"title\";s:22:\"Conference Slot Labels\";s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:2:\"id\";s:20:\"ConferenceSlotLabels\";s:3:\"url\";s:46:\"/civicrm/admin/options/conference_slot?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviMail\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:36:\"{weight}.CiviMail Component Settings\";a:6:{s:5:\"title\";s:27:\"CiviMail Component Settings\";s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:2:\"id\";s:25:\"CiviMailComponentSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/mailing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Mailer Settings\";a:6:{s:5:\"title\";s:15:\"Mailer Settings\";s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:2:\"id\";s:14:\"MailerSettings\";s:3:\"url\";s:27:\"/civicrm/admin/mail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:49:\"{weight}.Headers, Footers, and Automated Messages\";a:6:{s:5:\"title\";s:40:\"Headers, Footers, and Automated Messages\";s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:2:\"id\";s:36:\"Headers_Footers_andAutomatedMessages\";s:3:\"url\";s:32:\"/civicrm/admin/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:58:\"/civicrm/admin/options/from_email_address/civimail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Mail Accounts\";a:6:{s:5:\"title\";s:13:\"Mail Accounts\";s:4:\"desc\";s:32:\"Configure email account setting.\";s:2:\"id\";s:12:\"MailAccounts\";s:3:\"url\";s:35:\"/civicrm/admin/mailSettings?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviMember\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:38:\"{weight}.CiviMember Component Settings\";a:6:{s:5:\"title\";s:29:\"CiviMember Component Settings\";s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:2:\"id\";s:27:\"CiviMemberComponentSettings\";s:3:\"url\";s:49:\"/civicrm/admin/setting/preferences/member?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Membership Types\";a:6:{s:5:\"title\";s:16:\"Membership Types\";s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:2:\"id\";s:15:\"MembershipTypes\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Membership Status Rules\";a:6:{s:5:\"title\";s:23:\"Membership Status Rules\";s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:2:\"id\";s:21:\"MembershipStatusRules\";s:3:\"url\";s:46:\"/civicrm/admin/member/membershipStatus?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Option Lists\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:20:\"{weight}.Grant Types\";a:6:{s:5:\"title\";s:11:\"Grant Types\";s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:2:\"id\";s:10:\"GrantTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/grant_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"Customize\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:19:\"{weight}.Price Sets\";a:6:{s:5:\"title\";s:10:\"Price Sets\";s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:2:\"id\";s:9:\"PriceSets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviCase\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:26:\"{weight}.CiviCase Settings\";a:6:{s:5:\"title\";s:17:\"CiviCase Settings\";s:4:\"desc\";N;s:2:\"id\";s:16:\"CiviCaseSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/case?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Case Types\";a:6:{s:5:\"title\";s:10:\"Case Types\";s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:2:\"id\";s:9:\"CaseTypes\";s:3:\"url\";s:40:\"/civicrm/admin/options/case_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Redaction Rules\";a:6:{s:5:\"title\";s:15:\"Redaction Rules\";s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:2:\"id\";s:14:\"RedactionRules\";s:3:\"url\";s:45:\"/civicrm/admin/options/redaction_rule?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Case Statuses\";a:6:{s:5:\"title\";s:13:\"Case Statuses\";s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:2:\"id\";s:12:\"CaseStatuses\";s:3:\"url\";s:42:\"/civicrm/admin/options/case_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Encounter Mediums\";a:6:{s:5:\"title\";s:17:\"Encounter Mediums\";s:4:\"desc\";s:26:\"List of encounter mediums.\";s:2:\"id\";s:16:\"EncounterMediums\";s:3:\"url\";s:47:\"/civicrm/admin/options/encounter_medium?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviReport\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:40:\"{weight}.Create New Report from Template\";a:6:{s:5:\"title\";s:31:\"Create New Report from Template\";s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:2:\"id\";s:27:\"CreateNewReportfromTemplate\";s:3:\"url\";s:43:\"/civicrm/admin/report/template/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Manage Templates\";a:6:{s:5:\"title\";s:16:\"Manage Templates\";s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:2:\"id\";s:15:\"ManageTemplates\";s:3:\"url\";s:53:\"/civicrm/admin/report/options/report_template?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Reports Listing\";a:6:{s:5:\"title\";s:15:\"Reports Listing\";s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:2:\"id\";s:14:\"ReportsListing\";s:3:\"url\";s:34:\"/civicrm/admin/report/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,NULL,'a:0:{}');
 /*!40000 ALTER TABLE `civicrm_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -967,7 +967,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_msg_template` WRITE;
 /*!40000 ALTER TABLE `civicrm_msg_template` DISABLE KEYS */;
-INSERT INTO `civicrm_msg_template` (`id`, `msg_title`, `msg_subject`, `msg_text`, `msg_html`, `is_active`, `workflow_id`, `workflow_name`, `is_default`, `is_reserved`, `is_sms`, `pdf_format_id`) VALUES (1,'Cases - Send Copy of an Activity','{if $idHash}[case #{$idHash}]{/if} {$activitySubject}\n','===========================================================\n{ts}Activity Summary{/ts} - {$activityTypeName}\n===========================================================\n{if $isCaseActivity}\n{ts}Your Case Role(s){/ts} : {$contact.role}\n{if $manageCaseURL}\n{ts}Manage Case{/ts} : {$manageCaseURL}\n{/if}\n{/if}\n\n{if $editActURL}\n{ts}Edit activity{/ts} : {$editActURL}\n{/if}\n{if $viewActURL}\n{ts}View activity{/ts} : {$viewActURL}\n{/if}\n\n{foreach from=$activity.fields item=field}\n{if $field.type eq \'Date\'}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value}\n{/if}\n{/foreach}\n\n{foreach from=$activity.customGroups key=customGroupName item=customGroup}\n==========================================================\n{$customGroupName}\n==========================================================\n{foreach from=$customGroup item=field}\n{if $field.type eq \'Date\'}\n{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label} : {$field.value}\n{/if}\n{/foreach}\n\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Activity Summary{/ts} - {$activityTypeName}\n      </th>\n     </tr>\n     {if $isCaseActivity}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Your Case Role(s){/ts}\n       </td>\n       <td {$valueStyle}>\n        {$contact.role}\n       </td>\n      </tr>\n      {if $manageCaseURL}\n       <tr>\n       <td colspan=\"2\" {$valueStyle}>\n     <a href=\"{$manageCaseURL}\" title=\"{ts}Manage Case{/ts}\">{ts}Manage Case{/ts}</a>\n       </td>\n       </tr>\n      {/if}\n     {/if}\n     {if $editActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$editActURL}\" title=\"{ts}Edit activity{/ts}\">{ts}Edit activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {if $viewActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$viewActURL}\" title=\"{ts}View activity{/ts}\">{ts}View activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {foreach from=$activity.fields item=field}\n      <tr>\n       <td {$labelStyle}>\n        {$field.label}{if $field.category}({$field.category}){/if}\n       </td>\n       <td {$valueStyle}>\n        {if $field.type eq \'Date\'}\n         {$field.value|crmDate:$config->dateformatDatetime}\n        {else}\n         {$field.value}\n        {/if}\n       </td>\n      </tr>\n     {/foreach}\n\n     {foreach from=$activity.customGroups key=customGroupName item=customGroup}\n      <tr>\n       <th {$headerStyle}>\n        {$customGroupName}\n       </th>\n      </tr>\n      {foreach from=$customGroup item=field}\n       <tr>\n        <td {$labelStyle}>\n         {$field.label}\n        </td>\n        <td {$valueStyle}>\n         {if $field.type eq \'Date\'}\n          {$field.value|crmDate:$config->dateformatDatetime}\n         {else}\n          {$field.value}\n         {/if}\n        </td>\n       </tr>\n      {/foreach}\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,820,'case_activity',1,0,0,NULL),(2,'Cases - Send Copy of an Activity','{if $idHash}[case #{$idHash}]{/if} {$activitySubject}\n','===========================================================\n{ts}Activity Summary{/ts} - {$activityTypeName}\n===========================================================\n{if $isCaseActivity}\n{ts}Your Case Role(s){/ts} : {$contact.role}\n{if $manageCaseURL}\n{ts}Manage Case{/ts} : {$manageCaseURL}\n{/if}\n{/if}\n\n{if $editActURL}\n{ts}Edit activity{/ts} : {$editActURL}\n{/if}\n{if $viewActURL}\n{ts}View activity{/ts} : {$viewActURL}\n{/if}\n\n{foreach from=$activity.fields item=field}\n{if $field.type eq \'Date\'}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value}\n{/if}\n{/foreach}\n\n{foreach from=$activity.customGroups key=customGroupName item=customGroup}\n==========================================================\n{$customGroupName}\n==========================================================\n{foreach from=$customGroup item=field}\n{if $field.type eq \'Date\'}\n{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label} : {$field.value}\n{/if}\n{/foreach}\n\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Activity Summary{/ts} - {$activityTypeName}\n      </th>\n     </tr>\n     {if $isCaseActivity}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Your Case Role(s){/ts}\n       </td>\n       <td {$valueStyle}>\n        {$contact.role}\n       </td>\n      </tr>\n      {if $manageCaseURL}\n       <tr>\n       <td colspan=\"2\" {$valueStyle}>\n     <a href=\"{$manageCaseURL}\" title=\"{ts}Manage Case{/ts}\">{ts}Manage Case{/ts}</a>\n       </td>\n       </tr>\n      {/if}\n     {/if}\n     {if $editActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$editActURL}\" title=\"{ts}Edit activity{/ts}\">{ts}Edit activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {if $viewActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$viewActURL}\" title=\"{ts}View activity{/ts}\">{ts}View activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {foreach from=$activity.fields item=field}\n      <tr>\n       <td {$labelStyle}>\n        {$field.label}{if $field.category}({$field.category}){/if}\n       </td>\n       <td {$valueStyle}>\n        {if $field.type eq \'Date\'}\n         {$field.value|crmDate:$config->dateformatDatetime}\n        {else}\n         {$field.value}\n        {/if}\n       </td>\n      </tr>\n     {/foreach}\n\n     {foreach from=$activity.customGroups key=customGroupName item=customGroup}\n      <tr>\n       <th {$headerStyle}>\n        {$customGroupName}\n       </th>\n      </tr>\n      {foreach from=$customGroup item=field}\n       <tr>\n        <td {$labelStyle}>\n         {$field.label}\n        </td>\n        <td {$valueStyle}>\n         {if $field.type eq \'Date\'}\n          {$field.value|crmDate:$config->dateformatDatetime}\n         {else}\n          {$field.value}\n         {/if}\n        </td>\n       </tr>\n      {/foreach}\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,820,'case_activity',0,1,0,NULL),(3,'Contributions - Duplicate Organization Alert','{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}\n','{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}\n{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}\n\n{ts}Organization Name{/ts}: {$onBehalfName}\n{ts}Organization Email{/ts}: {$onBehalfEmail}\n{ts}Organization Contact ID{/ts}: {$onBehalfID}\n\n{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}\n\n{if $receiptMessage}\n###########################################################\n{ts}Copy of Contribution Receipt{/ts}\n\n###########################################################\n{$receiptMessage}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}</p>\n    <p>{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Email{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfEmail}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Contact ID{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfID}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <p>{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}</p>\n   </td>\n  </tr>\n  {if $receiptMessage}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Copy of Contribution Receipt{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {* FIXME: the below is most probably not HTML-ised *}\n        {$receiptMessage}\n       </td>\n      </tr>\n     </table>\n    </td>\n   </tr>\n  {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,821,'contribution_dupalert',1,0,0,NULL),(4,'Contributions - Duplicate Organization Alert','{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}\n','{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}\n{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}\n\n{ts}Organization Name{/ts}: {$onBehalfName}\n{ts}Organization Email{/ts}: {$onBehalfEmail}\n{ts}Organization Contact ID{/ts}: {$onBehalfID}\n\n{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}\n\n{if $receiptMessage}\n###########################################################\n{ts}Copy of Contribution Receipt{/ts}\n\n###########################################################\n{$receiptMessage}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}</p>\n    <p>{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Email{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfEmail}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Contact ID{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfID}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <p>{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}</p>\n   </td>\n  </tr>\n  {if $receiptMessage}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Copy of Contribution Receipt{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {* FIXME: the below is most probably not HTML-ised *}\n        {$receiptMessage}\n       </td>\n      </tr>\n     </table>\n    </td>\n   </tr>\n  {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,821,'contribution_dupalert',0,1,0,NULL),(5,'Contributions - Receipt (off-line)','{ts}Contribution Receipt{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text}\n{$formValues.receipt_text}\n{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{ts}Contributor{/ts}: {contact.display_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $getTaxDetails}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $getTaxDetails} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $getTaxDetails}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"} {$line.tax_rate|string_format:\"%.2f\"} %   {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if} {/if}   {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $getTaxDetails && $dataArray}\n{ts}Amount before Tax{/ts} : {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset ||  $priceset == 0 || $value != \'\'}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}% : {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm} : {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n{ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $receipt_date}\n{ts}Receipt Date{/ts}: {$receipt_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy and !$formValues.hidden_CreditCard}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{if $formValues.trxn_id}\n{ts}Transaction ID{/ts}: {$formValues.trxn_id}\n{/if}\n\n{if $ccContribution}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $formValues.product_name}\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$formValues.product_name}\n{if $formValues.product_option}\n{ts}Option{/ts}: {$formValues.product_option}\n{/if}\n{if $formValues.product_sku}\n{ts}SKU{/ts}: {$formValues.product_sku}\n{/if}\n{if $fulfilled_date}\n{ts}Sent{/ts}: {$fulfilled_date|crmDate}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text}\n     <p>{$formValues.receipt_text|htmlize}</p>\n    {else}\n     <p>{ts}Below you will find a receipt for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Contribution Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contributor Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {contact.display_name}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Financial Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.contributionType_name}\n      </td>\n     </tr>\n\n     {if $lineItem and !$is_quick_config}\n      {foreach from=$lineItem item=value key=priceset}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $getTaxDetails}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n           {/if}\n           <th>{ts}Total{/ts}</th>\n          </tr>\n          {foreach from=$value item=line}\n           <tr>\n            <td>\n            {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:$currency}\n            </td>\n            {if $getTaxDetails}\n              <td>\n                {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                  {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                  {$line.tax_amount|crmMoney:$currency}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total+$line.tax_amount|crmMoney:$currency}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n      {/foreach}\n     {/if}\n     {if $getTaxDetails && $dataArray}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n       </tr>\n\n      {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset ||  $priceset == 0 || $value != \'\'}\n          <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {else}\n          <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.total_amount|crmMoney:$currency}\n      </td>\n     </tr>\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date Received{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n      {if $receipt_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receipt_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $formValues.paidBy and !$formValues.hidden_CreditCard}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.paidBy}\n       </td>\n      </tr>\n      {if $formValues.check_number}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $formValues.trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $ccContribution}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n       </td>\n      </tr>\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $formValues.product_name}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$formValues.product_name}\n       </td>\n      </tr>\n      {if $formValues.product_option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_option}\n        </td>\n       </tr>\n      {/if}\n      {if $formValues.product_sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_sku}\n        </td>\n       </tr>\n      {/if}\n      {if $fulfilled_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Sent{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$fulfilled_date|truncate:10:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,822,'contribution_offline_receipt',1,0,0,NULL),(6,'Contributions - Receipt (off-line)','{ts}Contribution Receipt{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text}\n{$formValues.receipt_text}\n{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{ts}Contributor{/ts}: {contact.display_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $getTaxDetails}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $getTaxDetails} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $getTaxDetails}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"} {$line.tax_rate|string_format:\"%.2f\"} %   {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if} {/if}   {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $getTaxDetails && $dataArray}\n{ts}Amount before Tax{/ts} : {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset ||  $priceset == 0 || $value != \'\'}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}% : {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm} : {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n{ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $receipt_date}\n{ts}Receipt Date{/ts}: {$receipt_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy and !$formValues.hidden_CreditCard}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{if $formValues.trxn_id}\n{ts}Transaction ID{/ts}: {$formValues.trxn_id}\n{/if}\n\n{if $ccContribution}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $formValues.product_name}\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$formValues.product_name}\n{if $formValues.product_option}\n{ts}Option{/ts}: {$formValues.product_option}\n{/if}\n{if $formValues.product_sku}\n{ts}SKU{/ts}: {$formValues.product_sku}\n{/if}\n{if $fulfilled_date}\n{ts}Sent{/ts}: {$fulfilled_date|crmDate}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text}\n     <p>{$formValues.receipt_text|htmlize}</p>\n    {else}\n     <p>{ts}Below you will find a receipt for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Contribution Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contributor Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {contact.display_name}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Financial Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.contributionType_name}\n      </td>\n     </tr>\n\n     {if $lineItem and !$is_quick_config}\n      {foreach from=$lineItem item=value key=priceset}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $getTaxDetails}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n           {/if}\n           <th>{ts}Total{/ts}</th>\n          </tr>\n          {foreach from=$value item=line}\n           <tr>\n            <td>\n            {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:$currency}\n            </td>\n            {if $getTaxDetails}\n              <td>\n                {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                  {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                  {$line.tax_amount|crmMoney:$currency}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total+$line.tax_amount|crmMoney:$currency}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n      {/foreach}\n     {/if}\n     {if $getTaxDetails && $dataArray}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n       </tr>\n\n      {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset ||  $priceset == 0 || $value != \'\'}\n          <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {else}\n          <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.total_amount|crmMoney:$currency}\n      </td>\n     </tr>\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date Received{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n      {if $receipt_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receipt_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $formValues.paidBy and !$formValues.hidden_CreditCard}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.paidBy}\n       </td>\n      </tr>\n      {if $formValues.check_number}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $formValues.trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $ccContribution}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n       </td>\n      </tr>\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $formValues.product_name}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$formValues.product_name}\n       </td>\n      </tr>\n      {if $formValues.product_option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_option}\n        </td>\n       </tr>\n      {/if}\n      {if $formValues.product_sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_sku}\n        </td>\n       </tr>\n      {/if}\n      {if $fulfilled_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Sent{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$fulfilled_date|truncate:10:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,822,'contribution_offline_receipt',0,1,0,NULL),(7,'Contributions - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $amount}\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{if $lineItem and $priceSetID and !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney:$currency}\n{else}\n{ts}Amount{/ts}: {$amount|crmMoney:$currency} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{/if}\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n\n{if $is_recur}\n{ts}This is a recurring contribution.{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts}You can cancel future contributions at:{/ts}\n\n{$cancelSubscriptionUrl}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts}You can update billing details for this recurring contribution at:{/ts}\n\n{$updateSubscriptionBillingUrl}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts}You can update recurring contribution amount or change the number of installments for this recurring contribution at:{/ts}\n\n{$updateSubscriptionUrl}\n\n{/if}\n{/if}\n\n{if $honor_block_is_active}\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n{elseif $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or Email*}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n       </th>\n      </tr>\n\n      {if $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            {if $dataArray}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n            {/if}\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney:$currency}\n             </td>\n             {if $getTaxDetails}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney:$currency}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n             {/if}\n             <td>\n              {$line.line_total+$line.tax_amount|crmMoney:$currency}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency}\n        </td>\n       </tr>\n\n      {else}\n\n      {if $totalTaxAmount}\n         <tr>\n           <td {$labelStyle}>\n             {ts}Total Tax Amount{/ts}\n           </td>\n           <td {$valueStyle}>\n             {$totalTaxAmount|crmMoney:$currency}\n           </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n     {/if}\n\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if $is_recur}\n      <tr>\n        <td  colspan=\"2\" {$labelStyle}>\n          {ts}This is a recurring contribution.{/ts}\n          {if $cancelSubscriptionUrl}\n            {ts 1=$cancelSubscriptionUrl}You can cancel future contributions by <a href=\"%1\">visiting this web page</a>.{/ts}\n          {/if}\n        </td>\n      </tr>\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n    {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n      {elseif $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShare}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contributionPageId`\" a=true fe=1 h=1}{/capture}\n            {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl}\n        </td>\n      </tr>\n     {/if}\n\n     {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n     {elseif $email}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Registered Email{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$email}\n        </td>\n       </tr>\n     {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,823,'contribution_online_receipt',1,0,0,NULL),(8,'Contributions - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $amount}\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{if $lineItem and $priceSetID and !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney:$currency}\n{else}\n{ts}Amount{/ts}: {$amount|crmMoney:$currency} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{/if}\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n\n{if $is_recur}\n{ts}This is a recurring contribution.{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts}You can cancel future contributions at:{/ts}\n\n{$cancelSubscriptionUrl}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts}You can update billing details for this recurring contribution at:{/ts}\n\n{$updateSubscriptionBillingUrl}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts}You can update recurring contribution amount or change the number of installments for this recurring contribution at:{/ts}\n\n{$updateSubscriptionUrl}\n\n{/if}\n{/if}\n\n{if $honor_block_is_active}\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n{elseif $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or Email*}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n       </th>\n      </tr>\n\n      {if $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            {if $dataArray}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n            {/if}\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney:$currency}\n             </td>\n             {if $getTaxDetails}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney:$currency}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n             {/if}\n             <td>\n              {$line.line_total+$line.tax_amount|crmMoney:$currency}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency}\n        </td>\n       </tr>\n\n      {else}\n\n      {if $totalTaxAmount}\n         <tr>\n           <td {$labelStyle}>\n             {ts}Total Tax Amount{/ts}\n           </td>\n           <td {$valueStyle}>\n             {$totalTaxAmount|crmMoney:$currency}\n           </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n     {/if}\n\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if $is_recur}\n      <tr>\n        <td  colspan=\"2\" {$labelStyle}>\n          {ts}This is a recurring contribution.{/ts}\n          {if $cancelSubscriptionUrl}\n            {ts 1=$cancelSubscriptionUrl}You can cancel future contributions by <a href=\"%1\">visiting this web page</a>.{/ts}\n          {/if}\n        </td>\n      </tr>\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n    {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n      {elseif $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShare}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contributionPageId`\" a=true fe=1 h=1}{/capture}\n            {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl}\n        </td>\n      </tr>\n     {/if}\n\n     {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n     {elseif $email}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Registered Email{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$email}\n        </td>\n       </tr>\n     {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,823,'contribution_online_receipt',0,1,0,NULL),(9,'Contributions - Invoice','{if $title}\n  {if $component}\n    {if $component == \'event\'}\n      {ts 1=$title}Event Registration Invoice: %1{/ts}\n    {else}\n      {ts 1=$title}Contribution Invoice: %1{/ts}\n    {/if}\n  {/if}\n{else}\n  {ts}Invoice{/ts}\n{/if}\n - {contact.display_name}\n','{ts}Contribution Invoice{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n      <title></title>\n  </head>\n  <body>\n  <div style=\"padding-top:100px;margin-right:50px;border-style: none;\">\n    {if $config->empoweredBy}\n      <table style=\"margin-top:5px;padding-bottom:50px;\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n        </tr>\n      </table>\n    {/if}\n      <table style=\"font-family: Arial, Verdana, sans-serif;\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td width=\"30%\"><b><font size=\"4\" align=\"center\">{ts}INVOICE{/ts}</font></b></td>\n          <td width=\"50%\" valign=\"bottom\"><b><font size=\"1\" align=\"center\">{ts}Invoice Date:{/ts}</font></b></td>\n          <td valign=\"bottom\" style=\"white-space: nowrap\"><b><font size=\"1\" align=\"right\">{$domain_organization}</font></b></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$street_address} {$supplemental_address_1}</font></td>\n          <td><b><font size=\"1\" align=\"right\">{ts}Invoice Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>\n          <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{if $domain_country}{$domain_country}{/if}</font></td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\"> {$country}</font></td>\n          <td><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{if $domain_email}{$domain_email}{/if}</font> </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td valign=\"top\"><font size=\"1\" align=\"right\">{if $domain_phone}{$domain_phone}{/if}</font> </td>\n        </tr>\n      </table>\n\n             <table style=\"padding-top:75px;font-family: Arial, Verdana, sans-serif;\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n              <tr>\n                <th style=\"text-align:left;font-weight:bold;width:100%\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=taxpricevalue}\n                {if $smarty.foreach.taxpricevalue.index eq 0}\n                {else}\n                {/if}\n                <tr>\n                  <td style=\"text-align:left;nowrap\"><font size=\"1\">\n                    {if $value.html_type eq \'Text\'}\n                      {$value.label}\n                    {else}\n                      {$value.field_title} - {$value.label}\n                    {/if}\n                    {if $value.description}\n                      <div>{$value.description|truncate:30:\"...\"}</div>\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}-{/ts}</font></td>\n                  {/if}\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                    {if $priceset}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                    {elseif $priceset == 0}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm}TOTAL %1{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n              {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;white-space: nowrap\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n             {if $amountDue != 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n                    {if $contribution_status_id == $refundedStatusId}\n                      {ts}Amount Credited{/ts}\n                    {else}\n                      {ts}Amount Paid{/ts}\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$amountPaid|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\" ><b><font size=\"1\">{ts}AMOUNT DUE:{/ts}</font></b></td>\n                  <td style=\"text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"5\"></td>\n              </tr>\n              {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n                <tr>\n                  <td colspan=\"3\"><b><font size=\"1\" align=\"center\">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>\n                  <td colspan=\"2\"></td>\n                </tr>\n              {/if}\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n        <table style=\"margin-top:5px;\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\"></td>\n          </tr>\n        </table>\n\n        <table style=\"margin-top:5px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\" id=\"desc\">\n          <tr>\n            <td width=\"60%\"><b><font size=\"4\" align=\"right\">{ts}PAYMENT ADVICE{/ts}</font></b><br/><br/><font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {$domain_organization}<br />\n              {$domain_street_address} {$domain_supplemental_address_1}<br />\n              {$domain_supplemental_address_2} {$domain_state}<br />\n              {$domain_city} {$domain_postal_code}<br />\n              {$domain_country}<br />\n              {$domain_email}</div>\n              {$domain_phone}<br />\n             </font><br/><br/><font size=\"1\" align=\"left\">{$notes}</font>\n            </td>\n            <td width=\"40%\">\n              <table cellpadding=\"5\" cellspacing=\"0\"  width=\"100%\" border=\"0\">\n                <tr>\n                  <td width=\"100%\"><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                  <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{$display_name}</font></td>\n                </tr>\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Invoice Number:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n                </tr>\n                <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td></tr>\n                {if $is_pay_later == 1}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n                  </tr>\n                {else}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amountDue|crmMoney:$currency}</font></td>\n                  </tr>\n                {/if}\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Due Date:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$dueDate}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td>\n                </tr>\n              </table>\n      {/if}\n\n      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}\n      {if $config->empoweredBy}\n        <table style=\"margin-top:2px;padding-left:7px;page-break-before: always;\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n          </tr>\n        </table>\n      {/if}\n\n    <center>\n      <table style=\"font-family: Arial, Verdana, sans-serif\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\">\n        <tr>\n          <td style=\"padding-left:15px;\"><b><font size=\"4\" align=\"center\">{ts}CREDIT NOTE{/ts}</font></b></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Date:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{$domain_organization}</font></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$street_address}   {$supplemental_address_1}</font></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Credit Note Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\" style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_country}{$domain_country}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_email}{$domain_email}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_phone}{$domain_phone}{/if}\n           </font>\n          </td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:75px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n              <tr>\n                <th style=\"padding-right:28px;text-align:left;font-weight:bold;width:200px;\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=pricevalue}\n                {if $smarty.foreach.pricevalue.index eq 0}\n                  <tr><td colspan=\"5\"><hr size=\"3\" style=\"color:#000;\"></hr></td></tr>\n                {else}\n                  <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n                {/if}\n                <tr>\n                  <td style =\"text-align:left;\"  >\n                    <font size=\"1\">\n                      {if $value.html_type eq \'Text\'}\n                        {$value.label}\n                      {else}\n                        {$value.field_title} - {$value.label}\n                      {/if}\n                      {if $value.description}\n                        <div>{$value.description|truncate:30:\"...\"}</div>\n                      {/if}\n                   </font>\n                  </td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{ts 1=$taxTerm}No %1{/ts}</font></td>\n                  {/if}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  {if $priceset}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                  {elseif $priceset == 0}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n                {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td colspan=\"2\"><hr></hr></td>\n              </tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n              {if $is_pay_later == 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}LESS Credit to invoice(s){/ts}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts}REMAINING CREDIT{/ts}</font></b></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                  <td style=\"padding-left:28px;\"><font size=\"1\" align=\"right\"></font></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"3\"></td>\n              </tr>\n              <tr>\n                <td></td>\n                <td colspan=\"3\"></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      <table width=\"100%\" style=\"margin-top:5px;padding-right:45px;\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\" width=\"100%\"></td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:6px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td width=\"60%\"><font size=\"4\" align=\"right\"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div style=\"font-size:10px;max-width:300px;\">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>\n          <td width=\"40%\">\n            <table align=\"right\">\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$display_name}</font></td>\n              </tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Note#:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n              </tr>\n              <tr><td colspan=\"5\"style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Amount:{/ts}</font></td>\n                <td width=\'50px\'><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n    {/if}\n    </center>\n\n  </div>\n  </body>\n</html>\n',1,824,'contribution_invoice_receipt',1,0,0,NULL),(10,'Contributions - Invoice','{if $title}\n  {if $component}\n    {if $component == \'event\'}\n      {ts 1=$title}Event Registration Invoice: %1{/ts}\n    {else}\n      {ts 1=$title}Contribution Invoice: %1{/ts}\n    {/if}\n  {/if}\n{else}\n  {ts}Invoice{/ts}\n{/if}\n - {contact.display_name}\n','{ts}Contribution Invoice{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n      <title></title>\n  </head>\n  <body>\n  <div style=\"padding-top:100px;margin-right:50px;border-style: none;\">\n    {if $config->empoweredBy}\n      <table style=\"margin-top:5px;padding-bottom:50px;\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n        </tr>\n      </table>\n    {/if}\n      <table style=\"font-family: Arial, Verdana, sans-serif;\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td width=\"30%\"><b><font size=\"4\" align=\"center\">{ts}INVOICE{/ts}</font></b></td>\n          <td width=\"50%\" valign=\"bottom\"><b><font size=\"1\" align=\"center\">{ts}Invoice Date:{/ts}</font></b></td>\n          <td valign=\"bottom\" style=\"white-space: nowrap\"><b><font size=\"1\" align=\"right\">{$domain_organization}</font></b></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$street_address} {$supplemental_address_1}</font></td>\n          <td><b><font size=\"1\" align=\"right\">{ts}Invoice Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>\n          <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{if $domain_country}{$domain_country}{/if}</font></td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\"> {$country}</font></td>\n          <td><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{if $domain_email}{$domain_email}{/if}</font> </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td valign=\"top\"><font size=\"1\" align=\"right\">{if $domain_phone}{$domain_phone}{/if}</font> </td>\n        </tr>\n      </table>\n\n             <table style=\"padding-top:75px;font-family: Arial, Verdana, sans-serif;\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n              <tr>\n                <th style=\"text-align:left;font-weight:bold;width:100%\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=taxpricevalue}\n                {if $smarty.foreach.taxpricevalue.index eq 0}\n                {else}\n                {/if}\n                <tr>\n                  <td style=\"text-align:left;nowrap\"><font size=\"1\">\n                    {if $value.html_type eq \'Text\'}\n                      {$value.label}\n                    {else}\n                      {$value.field_title} - {$value.label}\n                    {/if}\n                    {if $value.description}\n                      <div>{$value.description|truncate:30:\"...\"}</div>\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}-{/ts}</font></td>\n                  {/if}\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                    {if $priceset}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                    {elseif $priceset == 0}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm}TOTAL %1{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n              {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;white-space: nowrap\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n             {if $amountDue != 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n                    {if $contribution_status_id == $refundedStatusId}\n                      {ts}Amount Credited{/ts}\n                    {else}\n                      {ts}Amount Paid{/ts}\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$amountPaid|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\" ><b><font size=\"1\">{ts}AMOUNT DUE:{/ts}</font></b></td>\n                  <td style=\"text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"5\"></td>\n              </tr>\n              {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n                <tr>\n                  <td colspan=\"3\"><b><font size=\"1\" align=\"center\">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>\n                  <td colspan=\"2\"></td>\n                </tr>\n              {/if}\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n        <table style=\"margin-top:5px;\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\"></td>\n          </tr>\n        </table>\n\n        <table style=\"margin-top:5px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\" id=\"desc\">\n          <tr>\n            <td width=\"60%\"><b><font size=\"4\" align=\"right\">{ts}PAYMENT ADVICE{/ts}</font></b><br/><br/><font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {$domain_organization}<br />\n              {$domain_street_address} {$domain_supplemental_address_1}<br />\n              {$domain_supplemental_address_2} {$domain_state}<br />\n              {$domain_city} {$domain_postal_code}<br />\n              {$domain_country}<br />\n              {$domain_email}</div>\n              {$domain_phone}<br />\n             </font><br/><br/><font size=\"1\" align=\"left\">{$notes}</font>\n            </td>\n            <td width=\"40%\">\n              <table cellpadding=\"5\" cellspacing=\"0\"  width=\"100%\" border=\"0\">\n                <tr>\n                  <td width=\"100%\"><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                  <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{$display_name}</font></td>\n                </tr>\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Invoice Number:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n                </tr>\n                <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td></tr>\n                {if $is_pay_later == 1}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n                  </tr>\n                {else}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amountDue|crmMoney:$currency}</font></td>\n                  </tr>\n                {/if}\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Due Date:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$dueDate}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td>\n                </tr>\n              </table>\n      {/if}\n\n      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}\n      {if $config->empoweredBy}\n        <table style=\"margin-top:2px;padding-left:7px;page-break-before: always;\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n          </tr>\n        </table>\n      {/if}\n\n    <center>\n      <table style=\"font-family: Arial, Verdana, sans-serif\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\">\n        <tr>\n          <td style=\"padding-left:15px;\"><b><font size=\"4\" align=\"center\">{ts}CREDIT NOTE{/ts}</font></b></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Date:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{$domain_organization}</font></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$street_address}   {$supplemental_address_1}</font></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Credit Note Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\" style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_country}{$domain_country}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_email}{$domain_email}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_phone}{$domain_phone}{/if}\n           </font>\n          </td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:75px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n              <tr>\n                <th style=\"padding-right:28px;text-align:left;font-weight:bold;width:200px;\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=pricevalue}\n                {if $smarty.foreach.pricevalue.index eq 0}\n                  <tr><td colspan=\"5\"><hr size=\"3\" style=\"color:#000;\"></hr></td></tr>\n                {else}\n                  <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n                {/if}\n                <tr>\n                  <td style =\"text-align:left;\"  >\n                    <font size=\"1\">\n                      {if $value.html_type eq \'Text\'}\n                        {$value.label}\n                      {else}\n                        {$value.field_title} - {$value.label}\n                      {/if}\n                      {if $value.description}\n                        <div>{$value.description|truncate:30:\"...\"}</div>\n                      {/if}\n                   </font>\n                  </td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{ts 1=$taxTerm}No %1{/ts}</font></td>\n                  {/if}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  {if $priceset}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                  {elseif $priceset == 0}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n                {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td colspan=\"2\"><hr></hr></td>\n              </tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n              {if $is_pay_later == 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}LESS Credit to invoice(s){/ts}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts}REMAINING CREDIT{/ts}</font></b></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                  <td style=\"padding-left:28px;\"><font size=\"1\" align=\"right\"></font></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"3\"></td>\n              </tr>\n              <tr>\n                <td></td>\n                <td colspan=\"3\"></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      <table width=\"100%\" style=\"margin-top:5px;padding-right:45px;\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\" width=\"100%\"></td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:6px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td width=\"60%\"><font size=\"4\" align=\"right\"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div style=\"font-size:10px;max-width:300px;\">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>\n          <td width=\"40%\">\n            <table align=\"right\">\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$display_name}</font></td>\n              </tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Note#:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n              </tr>\n              <tr><td colspan=\"5\"style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Amount:{/ts}</font></td>\n                <td width=\'50px\'><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n    {/if}\n    </center>\n\n  </div>\n  </body>\n</html>\n',1,824,'contribution_invoice_receipt',0,1,0,NULL),(11,'Contributions - Recurring Start and End Notification','{ts}Recurring Contribution Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $recur_txnType eq \'START\'}\n{if $auto_renew_membership}\n{ts}Thanks for your auto renew membership sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s).{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{else}\n{ts}Thanks for your recurring contribution sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments } {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.\n\n{ts}Start Date{/ts}:  {$recur_start_date|crmDate}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{/if}\n\n{elseif $recur_txnType eq \'END\'}\n{if $auto_renew_membership}\n{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}\n\n\n{else}\n{ts}Your recurring contribution term has ended.{/ts}\n\n\n{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}\n\n\n==================================================\n{ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n\n==================================================\n{ts}Start Date{/ts}: {$recur_start_date|crmDate}\n\n{ts}End Date{/ts}: {$recur_end_date|crmDate}\n\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>&nbsp;</td>\n  </tr>\n\n    {if $recur_txnType eq \'START\'}\n     {if $auto_renew_membership}\n       <tr>\n        <td>\n         <p>{ts}Thanks for your auto renew membership sign-up.{/ts}</p>\n         <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s). {/ts}</p>\n        </td>\n       </tr>\n       {if $cancelSubscriptionUrl}\n       <tr>\n         <td {$labelStyle}>\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         </td>\n       </tr>\n       {/if}\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Thanks for your recurring contribution sign-up.{/ts}</p>\n        <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments }{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.</p>\n        <p>{ts}Start Date{/ts}: {$recur_start_date|crmDate}</p>\n       </td>\n      </tr>\n      {if $cancelSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$cancelSubscriptionUrl} You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n     {/if}\n\n    {elseif $recur_txnType eq \'END\'}\n\n     {if $auto_renew_membership}\n      <tr>\n       <td>\n        <p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>\n       </td>\n      </tr>\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Your recurring contribution term has ended.{/ts}</p>\n        <p>{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}</p>\n       </td>\n      </tr>\n      <tr>\n       <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_start_date|crmDate}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_end_date|crmDate}\n       </td>\n      </tr>\n     </table>\n       </td>\n      </tr>\n\n     {/if}\n    {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,825,'contribution_recurring_notify',1,0,0,NULL),(12,'Contributions - Recurring Start and End Notification','{ts}Recurring Contribution Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $recur_txnType eq \'START\'}\n{if $auto_renew_membership}\n{ts}Thanks for your auto renew membership sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s).{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{else}\n{ts}Thanks for your recurring contribution sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments } {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.\n\n{ts}Start Date{/ts}:  {$recur_start_date|crmDate}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{/if}\n\n{elseif $recur_txnType eq \'END\'}\n{if $auto_renew_membership}\n{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}\n\n\n{else}\n{ts}Your recurring contribution term has ended.{/ts}\n\n\n{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}\n\n\n==================================================\n{ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n\n==================================================\n{ts}Start Date{/ts}: {$recur_start_date|crmDate}\n\n{ts}End Date{/ts}: {$recur_end_date|crmDate}\n\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>&nbsp;</td>\n  </tr>\n\n    {if $recur_txnType eq \'START\'}\n     {if $auto_renew_membership}\n       <tr>\n        <td>\n         <p>{ts}Thanks for your auto renew membership sign-up.{/ts}</p>\n         <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s). {/ts}</p>\n        </td>\n       </tr>\n       {if $cancelSubscriptionUrl}\n       <tr>\n         <td {$labelStyle}>\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         </td>\n       </tr>\n       {/if}\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Thanks for your recurring contribution sign-up.{/ts}</p>\n        <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments }{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.</p>\n        <p>{ts}Start Date{/ts}: {$recur_start_date|crmDate}</p>\n       </td>\n      </tr>\n      {if $cancelSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$cancelSubscriptionUrl} You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n     {/if}\n\n    {elseif $recur_txnType eq \'END\'}\n\n     {if $auto_renew_membership}\n      <tr>\n       <td>\n        <p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>\n       </td>\n      </tr>\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Your recurring contribution term has ended.{/ts}</p>\n        <p>{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}</p>\n       </td>\n      </tr>\n      <tr>\n       <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_start_date|crmDate}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_end_date|crmDate}\n       </td>\n      </tr>\n     </table>\n       </td>\n      </tr>\n\n     {/if}\n    {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,825,'contribution_recurring_notify',0,1,0,NULL),(13,'Contributions - Recurring Cancellation Notification','{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,826,'contribution_recurring_cancelled',1,0,0,NULL),(14,'Contributions - Recurring Cancellation Notification','{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,826,'contribution_recurring_cancelled',0,1,0,NULL),(15,'Contributions - Recurring Billing Updates','{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n    <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n            {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n       </tr>\n  </table>\n</center>\n\n</body>\n</html>\n',1,827,'contribution_recurring_billing',1,0,0,NULL),(16,'Contributions - Recurring Billing Updates','{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n    <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n            {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n       </tr>\n  </table>\n</center>\n\n</body>\n</html>\n',1,827,'contribution_recurring_billing',0,1,0,NULL),(17,'Contributions - Recurring Updates','{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your recurring contribution has been updated as requested:{/ts}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}\n{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your recurring contribution has been updated as requested:{/ts}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.</p>\n\n    <p>{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,828,'contribution_recurring_edit',1,0,0,NULL),(18,'Contributions - Recurring Updates','{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your recurring contribution has been updated as requested:{/ts}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}\n{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your recurring contribution has been updated as requested:{/ts}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.</p>\n\n    <p>{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,828,'contribution_recurring_edit',0,1,0,NULL),(19,'Personal Campaign Pages - Admin Notification','{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Notification{/ts}\n\n===========================================================\n{ts}Action{/ts}: {if $mode EQ \'Update\'}{ts}Updated personal campaign page{/ts}{else}{ts}New personal campaign page{/ts}{/if}\n{ts}Personal Campaign Page Title{/ts}: {$pcpTitle}\n{ts}Current Status{/ts}: {$pcpStatus}\n{capture assign=pcpURL}{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n{ts}View Page{/ts}:\n>> {$pcpURL}\n\n{ts}Supporter{/ts}: {$supporterName}\n>> {$supporterUrl}\n\n{ts}Linked to Contribution Page{/ts}: {$contribPageTitle}\n>> {$contribPageUrl}\n\n{ts}Manage Personal Campaign Pages{/ts}:\n>> {$managePCPUrl}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=pcpURL     }{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Personal Campaign Page Notification{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Action{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {if $mode EQ \'Update\'}\n        {ts}Updated personal campaign page{/ts}\n       {else}\n        {ts}New personal campaign page{/ts}\n       {/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Personal Campaign Page Title{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpTitle}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Current Status{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpStatus}\n      </td>\n     </tr>\n\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$pcpURL}\">{ts}View Page{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Supporter{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$supporterUrl}\">{$supporterName}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Linked to Contribution Page{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$contribPageUrl}\">{$contribPageTitle}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$managePCPUrl}\">{ts}Manage Personal Campaign Pages{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,829,'pcp_notify',1,0,0,NULL),(20,'Personal Campaign Pages - Admin Notification','{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Notification{/ts}\n\n===========================================================\n{ts}Action{/ts}: {if $mode EQ \'Update\'}{ts}Updated personal campaign page{/ts}{else}{ts}New personal campaign page{/ts}{/if}\n{ts}Personal Campaign Page Title{/ts}: {$pcpTitle}\n{ts}Current Status{/ts}: {$pcpStatus}\n{capture assign=pcpURL}{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n{ts}View Page{/ts}:\n>> {$pcpURL}\n\n{ts}Supporter{/ts}: {$supporterName}\n>> {$supporterUrl}\n\n{ts}Linked to Contribution Page{/ts}: {$contribPageTitle}\n>> {$contribPageUrl}\n\n{ts}Manage Personal Campaign Pages{/ts}:\n>> {$managePCPUrl}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=pcpURL     }{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Personal Campaign Page Notification{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Action{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {if $mode EQ \'Update\'}\n        {ts}Updated personal campaign page{/ts}\n       {else}\n        {ts}New personal campaign page{/ts}\n       {/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Personal Campaign Page Title{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpTitle}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Current Status{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpStatus}\n      </td>\n     </tr>\n\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$pcpURL}\">{ts}View Page{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Supporter{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$supporterUrl}\">{$supporterName}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Linked to Contribution Page{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$contribPageUrl}\">{$contribPageTitle}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$managePCPUrl}\">{ts}Manage Personal Campaign Pages{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,829,'pcp_notify',0,1,0,NULL),(21,'Personal Campaign Pages - Supporter Status Change Notification','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{if $pcpStatus eq \'Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been approved and is now live.{/ts}\n\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n{if $isTellFriendEnabled}\n\n{ts}After logging in, you can use this form to promote your fundraising page{/ts}:\n{$pcpTellFriendURL}\n\n{/if}\n\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{* Rejected message *}\n{elseif $pcpStatus eq \'Not Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}\n\n{if $pcpNotifyEmailAddress}\n\n{ts}Please contact our site administrator for more information{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n\n    <h1>{ts}Your Personal Campaign Page{/ts}</h1>\n\n    {if $pcpStatus eq \'Approved\'}\n\n     <p>{ts}Your personal campaign page has been approved and is now live.{/ts}</p>\n     <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n     <ol>\n      <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n      <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n     </ol>\n     <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n\n     {if $isTellFriendEnabled}\n      <p><a href=\"{$pcpTellFriendURL}\">{ts}After logging in, you can use this form to promote your fundraising page{/ts}</a></p>\n     {/if}\n\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {elseif $pcpStatus eq \'Not Approved\'}\n\n     <p>{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}</p>\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Please contact our site administrator for more information{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {/if}\n\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,830,'pcp_status_change',1,0,0,NULL),(22,'Personal Campaign Pages - Supporter Status Change Notification','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{if $pcpStatus eq \'Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been approved and is now live.{/ts}\n\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n{if $isTellFriendEnabled}\n\n{ts}After logging in, you can use this form to promote your fundraising page{/ts}:\n{$pcpTellFriendURL}\n\n{/if}\n\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{* Rejected message *}\n{elseif $pcpStatus eq \'Not Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}\n\n{if $pcpNotifyEmailAddress}\n\n{ts}Please contact our site administrator for more information{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n\n    <h1>{ts}Your Personal Campaign Page{/ts}</h1>\n\n    {if $pcpStatus eq \'Approved\'}\n\n     <p>{ts}Your personal campaign page has been approved and is now live.{/ts}</p>\n     <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n     <ol>\n      <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n      <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n     </ol>\n     <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n\n     {if $isTellFriendEnabled}\n      <p><a href=\"{$pcpTellFriendURL}\">{ts}After logging in, you can use this form to promote your fundraising page{/ts}</a></p>\n     {/if}\n\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {elseif $pcpStatus eq \'Not Approved\'}\n\n     <p>{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}</p>\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Please contact our site administrator for more information{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {/if}\n\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,830,'pcp_status_change',0,1,0,NULL),(23,'Personal Campaign Pages - Supporter Welcome','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}\n\n{if $pcpStatus eq \'Approved\'}\n====================\n{ts}Promoting Your Page{/ts}\n\n====================\n{if $isTellFriendEnabled}\n\n{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:\n\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser and follow the prompts{/ts}:\n{$pcpTellFriendURL}\n{else}\n\n{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts}\n{ts}Include this link to your fundraising page in your emails{/ts}:\n{$pcpInfoURL}\n{/if}\n\n===================\n{ts}Managing Your Page{/ts}\n\n===================\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n\n{elseif $pcpStatus EQ \'Waiting Review\'}\n{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}\n\n\n{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}\n\n\n{ts}You can still preview your page prior to approval{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser{/ts}:\n{$pcpInfoURL}\n\n{/if}\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}</p>\n   </td>\n  </tr>\n\n  {if $pcpStatus eq \'Approved\'}\n\n    <tr>\n     <td>\n      <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n       <tr>\n        <th {$headerStyle}>\n         {ts}Promoting Your Page{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {if $isTellFriendEnabled}\n          <p>{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:</p>\n          <ol>\n           <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n           <li><a href=\"{$pcpTellFriendURL}\">{ts}Click this link and follow the prompts{/ts}</a></li>\n          </ol>\n         {else}\n          <p>{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts} {ts}Include this link to your fundraising page in your emails{/ts}: {$pcpInfoURL}</p>\n         {/if}\n        </td>\n       </tr>\n       <tr>\n        <th {$headerStyle}>\n         {ts}Managing Your Page{/ts}\n        </th>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n         <ol>\n          <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n          <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n         </ol>\n         <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n        </td>\n       </tr>\n       </tr>\n      </table>\n     </td>\n    </tr>\n\n   {elseif $pcpStatus EQ \'Waiting Review\'}\n\n    <tr>\n     <td>\n      <p>{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}</p>\n      <p>{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}</p>\n      <p>{ts}You can still preview your page prior to approval{/ts}:</p>\n      <ol>\n       <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n       <li><a href=\"{$pcpInfoURL}\">{ts}Click this link{/ts}</a></li>\n      </ol>\n     </td>\n    </tr>\n\n   {/if}\n\n   {if $pcpNotifyEmailAddress}\n    <tr>\n     <td>\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     </td>\n    </tr>\n   {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,831,'pcp_supporter_notify',1,0,0,NULL),(24,'Personal Campaign Pages - Supporter Welcome','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}\n\n{if $pcpStatus eq \'Approved\'}\n====================\n{ts}Promoting Your Page{/ts}\n\n====================\n{if $isTellFriendEnabled}\n\n{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:\n\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser and follow the prompts{/ts}:\n{$pcpTellFriendURL}\n{else}\n\n{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts}\n{ts}Include this link to your fundraising page in your emails{/ts}:\n{$pcpInfoURL}\n{/if}\n\n===================\n{ts}Managing Your Page{/ts}\n\n===================\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n\n{elseif $pcpStatus EQ \'Waiting Review\'}\n{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}\n\n\n{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}\n\n\n{ts}You can still preview your page prior to approval{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser{/ts}:\n{$pcpInfoURL}\n\n{/if}\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}</p>\n   </td>\n  </tr>\n\n  {if $pcpStatus eq \'Approved\'}\n\n    <tr>\n     <td>\n      <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n       <tr>\n        <th {$headerStyle}>\n         {ts}Promoting Your Page{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {if $isTellFriendEnabled}\n          <p>{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:</p>\n          <ol>\n           <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n           <li><a href=\"{$pcpTellFriendURL}\">{ts}Click this link and follow the prompts{/ts}</a></li>\n          </ol>\n         {else}\n          <p>{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts} {ts}Include this link to your fundraising page in your emails{/ts}: {$pcpInfoURL}</p>\n         {/if}\n        </td>\n       </tr>\n       <tr>\n        <th {$headerStyle}>\n         {ts}Managing Your Page{/ts}\n        </th>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n         <ol>\n          <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n          <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n         </ol>\n         <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n        </td>\n       </tr>\n       </tr>\n      </table>\n     </td>\n    </tr>\n\n   {elseif $pcpStatus EQ \'Waiting Review\'}\n\n    <tr>\n     <td>\n      <p>{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}</p>\n      <p>{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}</p>\n      <p>{ts}You can still preview your page prior to approval{/ts}:</p>\n      <ol>\n       <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n       <li><a href=\"{$pcpInfoURL}\">{ts}Click this link{/ts}</a></li>\n      </ol>\n     </td>\n    </tr>\n\n   {/if}\n\n   {if $pcpNotifyEmailAddress}\n    <tr>\n     <td>\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     </td>\n    </tr>\n   {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,831,'pcp_supporter_notify',0,1,0,NULL),(25,'Personal Campaign Pages - Owner Notification','{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Owner Notification{/ts}\n\n===========================================================\n{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}You have received a donation at your personal page{/ts}: {$page_title}\n>> {$pcpInfoURL}\n\n{ts}Your fundraising total has been updated.{/ts}\n{ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}\n{if $is_honor_roll_enabled}\n    {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}\n{/if}\n\n{ts}Received{/ts}: {$receive_date|crmDate}\n\n{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}\n\n{ts}Name{/ts}: {$donors_display_name}\n\n{ts}Email{/ts}: {$donors_email}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n  {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n  <p>{ts}You have received a donation at your personal page{/ts}: <a href=\"{$pcpInfoURL}\">{$page_title}</a></p>\n  <p>{ts}Your fundraising total has been updated.{/ts}<br/>\n    {ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts} <br/>\n    {if $is_honor_roll_enabled}\n      {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}<br/>\n    {/if}\n  </p>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n    <tr><td>{ts}Received{/ts}:</td><td> {$receive_date|crmDate}</td></tr>\n    <tr><td>{ts}Amount{/ts}:</td><td> {$total_amount|crmMoney:$currency}</td></tr>\n    <tr><td>{ts}Name{/ts}:</td><td> {$donors_display_name}</td></tr>\n    <tr><td>{ts}Email{/ts}:</td><td> {$donors_email}</td></tr>\n  </table>\n</body>\n</html>\n',1,832,'pcp_owner_notify',1,0,0,NULL),(26,'Personal Campaign Pages - Owner Notification','{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Owner Notification{/ts}\n\n===========================================================\n{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}You have received a donation at your personal page{/ts}: {$page_title}\n>> {$pcpInfoURL}\n\n{ts}Your fundraising total has been updated.{/ts}\n{ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}\n{if $is_honor_roll_enabled}\n    {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}\n{/if}\n\n{ts}Received{/ts}: {$receive_date|crmDate}\n\n{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}\n\n{ts}Name{/ts}: {$donors_display_name}\n\n{ts}Email{/ts}: {$donors_email}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n  {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n  <p>{ts}You have received a donation at your personal page{/ts}: <a href=\"{$pcpInfoURL}\">{$page_title}</a></p>\n  <p>{ts}Your fundraising total has been updated.{/ts}<br/>\n    {ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts} <br/>\n    {if $is_honor_roll_enabled}\n      {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}<br/>\n    {/if}\n  </p>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n    <tr><td>{ts}Received{/ts}:</td><td> {$receive_date|crmDate}</td></tr>\n    <tr><td>{ts}Amount{/ts}:</td><td> {$total_amount|crmMoney:$currency}</td></tr>\n    <tr><td>{ts}Name{/ts}:</td><td> {$donors_display_name}</td></tr>\n    <tr><td>{ts}Email{/ts}:</td><td> {$donors_email}</td></tr>\n  </table>\n</body>\n</html>\n',1,832,'pcp_owner_notify',0,1,0,NULL),(27,'Additional Payment Receipt or Refund Notification','{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if $component eq \'event\'} - {$event.title}{/if} - {contact.display_name}\n','{if $emailGreeting}{$emailGreeting},\n{/if}\n\n{if $isRefund}\n{ts}A refund has been issued based on changes in your registration selections.{/ts}\n{else}\n{ts}Below you will find a receipt for this payment.{/ts}\n{/if}\n{if $paymentsComplete}\n{ts}Thank you for completing this payment.{/ts}\n{/if}\n\n{if $isRefund}\n===============================================================================\n\n{ts}Refund Details{/ts}\n\n===============================================================================\n{ts}This Refund Amount{/ts}: {$refundAmount|crmMoney}\n------------------------------------------------------------------------------------\n\n{else}\n===============================================================================\n\n{ts}Payment Details{/ts}\n\n===============================================================================\n{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney}\n------------------------------------------------------------------------------------\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n\n===============================================================================\n\n{ts}Contribution Details{/ts}\n\n===============================================================================\n{ts}Total Fee{/ts}: {$totalAmount|crmMoney}\n{ts}Total Paid{/ts}: {$totalPaid|crmMoney}\n{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *}\n\n\n{if $billingName || $address}\n\n===============================================================================\n\n{ts}Billing Name and Address{/ts}\n\n===============================================================================\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_number}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===============================================================================\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $component eq \'event\'}\n===============================================================================\n\n{ts}Event Information and Location{/ts}\n\n===============================================================================\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=emptyBlockStyle }style=\"padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;\"{/capture}\n{capture assign=emptyBlockValueStyle }style=\"padding: 10px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n  <tr>\n    <td>\n      {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if $isRefund}\n        <p>{ts}A refund has been issued based on changes in your registration selections.{/ts}</p>\n      {else}\n        <p>{ts}Below you will find a receipt for this payment.{/ts}</p>\n        {if $paymentsComplete}\n          <p>{ts}Thank you for completing this contribution.{/ts}</p>\n        {/if}\n      {/if}\n    </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $isRefund}\n      <tr>\n        <th {$headerStyle}>{ts}Refund Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Refund Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$refundAmount|crmMoney}\n        </td>\n      </tr>\n    {else}\n      <tr>\n        <th {$headerStyle}>{ts}Payment Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Payment Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paymentAmount|crmMoney}\n        </td>\n      </tr>\n    {/if}\n    {if $receive_date}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction Date{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$receive_date|crmDate}\n        </td>\n      </tr>\n    {/if}\n    {if $trxn_id}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$trxn_id}\n        </td>\n      </tr>\n    {/if}\n    {if $paidBy}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Paid By{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paidBy}\n        </td>\n      </tr>\n    {/if}\n    {if $checkNumber}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$checkNumber}\n        </td>\n      </tr>\n    {/if}\n\n  <tr>\n    <th {$headerStyle}>{ts}Contribution Details{/ts}</th>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Fee{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalAmount|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Paid{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalPaid|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Balance Owed{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$amountOwed|crmMoney}\n    </td> {* This will be zero after final payment. *}\n  </tr>\n  </table>\n\n  </td>\n  </tr>\n    <tr>\n      <td>\n  <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $billingName || $address}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n            </td>\n          </tr>\n    {/if}\n    {if $credit_card_number}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n            </td>\n          </tr>\n    {/if}\n    {if $component eq \'event\'}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Event Information and Location{/ts}\n      </th>\n    </tr>\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n         {$event.event_title}<br />\n        {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n    </tr>\n\n    {if $event.participant_role}\n    <tr>\n      <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n      </td>\n      <td {$valueStyle}>\n        {$event.participant_role}\n      </td>\n    </tr>\n    {/if}\n\n    {if $isShowLocation}\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n      </td>\n    </tr>\n    {/if}\n\n    {if $location.phone.1.phone || $location.email.1.email}\n    <tr>\n      <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n      </td>\n    </tr>\n    {foreach from=$location.phone item=phone}\n    {if $phone.phone}\n          <tr>\n            <td {$labelStyle}>\n        {if $phone.phone_type}\n        {$phone.phone_type_display}\n        {else}\n        {ts}Phone{/ts}\n        {/if}\n            </td>\n            <td {$valueStyle}>\n        {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {foreach from=$location.email item=eventEmail}\n    {if $eventEmail.email}\n          <tr>\n            <td {$labelStyle}>\n        {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n        {$eventEmail.email}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {/if} {*phone block close*}\n    {/if}\n  </table>\n      </td>\n    </tr>\n\n    </table>\n  </center>\n\n </body>\n</html>\n',1,833,'payment_or_refund_notification',1,0,0,NULL),(28,'Additional Payment Receipt or Refund Notification','{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if $component eq \'event\'} - {$event.title}{/if} - {contact.display_name}\n','{if $emailGreeting}{$emailGreeting},\n{/if}\n\n{if $isRefund}\n{ts}A refund has been issued based on changes in your registration selections.{/ts}\n{else}\n{ts}Below you will find a receipt for this payment.{/ts}\n{/if}\n{if $paymentsComplete}\n{ts}Thank you for completing this payment.{/ts}\n{/if}\n\n{if $isRefund}\n===============================================================================\n\n{ts}Refund Details{/ts}\n\n===============================================================================\n{ts}This Refund Amount{/ts}: {$refundAmount|crmMoney}\n------------------------------------------------------------------------------------\n\n{else}\n===============================================================================\n\n{ts}Payment Details{/ts}\n\n===============================================================================\n{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney}\n------------------------------------------------------------------------------------\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n\n===============================================================================\n\n{ts}Contribution Details{/ts}\n\n===============================================================================\n{ts}Total Fee{/ts}: {$totalAmount|crmMoney}\n{ts}Total Paid{/ts}: {$totalPaid|crmMoney}\n{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *}\n\n\n{if $billingName || $address}\n\n===============================================================================\n\n{ts}Billing Name and Address{/ts}\n\n===============================================================================\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_number}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===============================================================================\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $component eq \'event\'}\n===============================================================================\n\n{ts}Event Information and Location{/ts}\n\n===============================================================================\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=emptyBlockStyle }style=\"padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;\"{/capture}\n{capture assign=emptyBlockValueStyle }style=\"padding: 10px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n  <tr>\n    <td>\n      {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if $isRefund}\n        <p>{ts}A refund has been issued based on changes in your registration selections.{/ts}</p>\n      {else}\n        <p>{ts}Below you will find a receipt for this payment.{/ts}</p>\n        {if $paymentsComplete}\n          <p>{ts}Thank you for completing this contribution.{/ts}</p>\n        {/if}\n      {/if}\n    </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $isRefund}\n      <tr>\n        <th {$headerStyle}>{ts}Refund Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Refund Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$refundAmount|crmMoney}\n        </td>\n      </tr>\n    {else}\n      <tr>\n        <th {$headerStyle}>{ts}Payment Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Payment Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paymentAmount|crmMoney}\n        </td>\n      </tr>\n    {/if}\n    {if $receive_date}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction Date{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$receive_date|crmDate}\n        </td>\n      </tr>\n    {/if}\n    {if $trxn_id}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$trxn_id}\n        </td>\n      </tr>\n    {/if}\n    {if $paidBy}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Paid By{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paidBy}\n        </td>\n      </tr>\n    {/if}\n    {if $checkNumber}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$checkNumber}\n        </td>\n      </tr>\n    {/if}\n\n  <tr>\n    <th {$headerStyle}>{ts}Contribution Details{/ts}</th>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Fee{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalAmount|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Paid{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalPaid|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Balance Owed{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$amountOwed|crmMoney}\n    </td> {* This will be zero after final payment. *}\n  </tr>\n  </table>\n\n  </td>\n  </tr>\n    <tr>\n      <td>\n  <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $billingName || $address}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n            </td>\n          </tr>\n    {/if}\n    {if $credit_card_number}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n            </td>\n          </tr>\n    {/if}\n    {if $component eq \'event\'}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Event Information and Location{/ts}\n      </th>\n    </tr>\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n         {$event.event_title}<br />\n        {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n    </tr>\n\n    {if $event.participant_role}\n    <tr>\n      <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n      </td>\n      <td {$valueStyle}>\n        {$event.participant_role}\n      </td>\n    </tr>\n    {/if}\n\n    {if $isShowLocation}\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n      </td>\n    </tr>\n    {/if}\n\n    {if $location.phone.1.phone || $location.email.1.email}\n    <tr>\n      <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n      </td>\n    </tr>\n    {foreach from=$location.phone item=phone}\n    {if $phone.phone}\n          <tr>\n            <td {$labelStyle}>\n        {if $phone.phone_type}\n        {$phone.phone_type_display}\n        {else}\n        {ts}Phone{/ts}\n        {/if}\n            </td>\n            <td {$valueStyle}>\n        {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {foreach from=$location.email item=eventEmail}\n    {if $eventEmail.email}\n          <tr>\n            <td {$labelStyle}>\n        {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n        {$eventEmail.email}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {/if} {*phone block close*}\n    {/if}\n  </table>\n      </td>\n    </tr>\n\n    </table>\n  </center>\n\n </body>\n</html>\n',1,833,'payment_or_refund_notification',0,1,0,NULL),(29,'Events - Registration Confirmation and Receipt (off-line)','{ts}Event Confirmation{/ts} - {$event.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $email}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Registered Email{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$email}\n{/if}\n{if $event.is_monetary} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts}\n{/if}\n{/if}\n---------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if}  {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n{/if}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amount && !$lineItem}\n{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary}\n\n{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $balanceAmount}\n{ts}Balance{/ts}: {$balanceAmount|crmMoney}\n{/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n        {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n        {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $is_pay_later }\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPre item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n\n{if $customPost}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPost item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile item=value key=customName}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$customName+1}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=val key=field}\n{if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\' }\n{if $field eq \'additionalCustomPre\' }\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPre_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{else}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPost_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{/if}\n{foreach from=$val item=v key=f}\n{$f}: {$v}\n{/foreach}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n    {/if}\n\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$email}\n       </td>\n      </tr>\n     {/if}\n\n\n     {if $event.is_monetary}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.qty}\n              </td>\n              <td>\n               {$line.unit_price|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n        {if  $pricesetFieldsCount }\n        <td>\n    {$line.participant_count}\n              </td>\n        {/if}\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n          <tr>\n           {if $priceset || $priceset == 0}\n            <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {else}\n            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {/if}\n          </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amount && !$lineItem}\n       {foreach from=$amount item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n      {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n        {if $balanceAmount}\n           {ts}Total Paid{/ts}\n        {else}\n           {ts}Total Amount{/ts}\n         {/if}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n      {if $balanceAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Balance{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$balanceAmount|crmMoney}\n        </td>\n       </tr>\n      {/if}\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n   {ts}Total Participants{/ts}</td>\n       <td {$valueStyle}>\n   {assign var=\"count\" value= 0}\n         {foreach from=$lineItem item=pcount}\n         {assign var=\"lineItemCount\" value=0}\n         {if $pcount neq \'skip\'}\n           {foreach from=$pcount item=p_count}\n           {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n           {/foreach}\n           {if $lineItemCount < 1 }\n           assign var=\"lineItemCount\" value=1}\n           {/if}\n           {assign var=\"count\" value=$count+$lineItemCount}\n         {/if}\n         {/foreach}\n   {$count}\n       </td>\n     </tr>\n     {/if}\n       {if $is_pay_later}\n        <tr>\n         <td colspan=\"2\" {$labelStyle}>\n          {$pay_later_receipt}\n         </td>\n        </tr>\n       {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customProfile}\n      {foreach from=$customProfile item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {ts 1=$customName+1}Participant Information - Participant %1{/ts}\n        </th>\n       </tr>\n       {foreach from=$value item=val key=field}\n        {if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\'}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {if $field eq \'additionalCustomPre\'}\n            {$additionalCustomPre_grouptitle}\n           {else}\n            {$additionalCustomPost_grouptitle}\n           {/if}\n          </td>\n         </tr>\n         {foreach from=$val item=v key=f}\n          <tr>\n           <td {$labelStyle}>\n            {$f}\n           </td>\n           <td {$valueStyle}>\n            {$v}\n           </td>\n          </tr>\n         {/foreach}\n        {/if}\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,834,'event_offline_receipt',1,0,0,NULL),(30,'Events - Registration Confirmation and Receipt (off-line)','{ts}Event Confirmation{/ts} - {$event.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $email}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Registered Email{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$email}\n{/if}\n{if $event.is_monetary} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts}\n{/if}\n{/if}\n---------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if}  {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n{/if}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amount && !$lineItem}\n{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary}\n\n{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $balanceAmount}\n{ts}Balance{/ts}: {$balanceAmount|crmMoney}\n{/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n        {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n        {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $is_pay_later }\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPre item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n\n{if $customPost}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPost item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile item=value key=customName}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$customName+1}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=val key=field}\n{if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\' }\n{if $field eq \'additionalCustomPre\' }\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPre_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{else}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPost_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{/if}\n{foreach from=$val item=v key=f}\n{$f}: {$v}\n{/foreach}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n    {/if}\n\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$email}\n       </td>\n      </tr>\n     {/if}\n\n\n     {if $event.is_monetary}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.qty}\n              </td>\n              <td>\n               {$line.unit_price|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n        {if  $pricesetFieldsCount }\n        <td>\n    {$line.participant_count}\n              </td>\n        {/if}\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n          <tr>\n           {if $priceset || $priceset == 0}\n            <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {else}\n            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {/if}\n          </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amount && !$lineItem}\n       {foreach from=$amount item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n      {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n        {if $balanceAmount}\n           {ts}Total Paid{/ts}\n        {else}\n           {ts}Total Amount{/ts}\n         {/if}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n      {if $balanceAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Balance{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$balanceAmount|crmMoney}\n        </td>\n       </tr>\n      {/if}\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n   {ts}Total Participants{/ts}</td>\n       <td {$valueStyle}>\n   {assign var=\"count\" value= 0}\n         {foreach from=$lineItem item=pcount}\n         {assign var=\"lineItemCount\" value=0}\n         {if $pcount neq \'skip\'}\n           {foreach from=$pcount item=p_count}\n           {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n           {/foreach}\n           {if $lineItemCount < 1 }\n           assign var=\"lineItemCount\" value=1}\n           {/if}\n           {assign var=\"count\" value=$count+$lineItemCount}\n         {/if}\n         {/foreach}\n   {$count}\n       </td>\n     </tr>\n     {/if}\n       {if $is_pay_later}\n        <tr>\n         <td colspan=\"2\" {$labelStyle}>\n          {$pay_later_receipt}\n         </td>\n        </tr>\n       {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customProfile}\n      {foreach from=$customProfile item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {ts 1=$customName+1}Participant Information - Participant %1{/ts}\n        </th>\n       </tr>\n       {foreach from=$value item=val key=field}\n        {if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\'}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {if $field eq \'additionalCustomPre\'}\n            {$additionalCustomPre_grouptitle}\n           {else}\n            {$additionalCustomPost_grouptitle}\n           {/if}\n          </td>\n         </tr>\n         {foreach from=$val item=v key=f}\n          <tr>\n           <td {$labelStyle}>\n            {$f}\n           </td>\n           <td {$valueStyle}>\n            {$v}\n           </td>\n          </tr>\n         {/foreach}\n        {/if}\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,834,'event_offline_receipt',0,1,0,NULL),(31,'Events - Registration Confirmation and Receipt (on-line)','{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n\n{else}\n  {ts}Thank you for your registration.{/ts}\n  {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to %1.{/ts}\n  {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}\n  {/if}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $payer.name}\nYou were registered by: {$payer.name}\n{/if}\n{if $event.is_monetary and not $isRequireApproval} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n\n{/if}\n{/if}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}{$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n----------------------------------------------------------------------------------------------------------------\n{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%29s\"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%33s\"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:\"%12s\"}{/if}\n{/if}\n{\"\"|string_format:\"%120s\"}\n{/foreach}\n{\"\"|string_format:\"%120s\"}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amounts && !$lineItem}\n{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary }\n\n{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle.$i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPr item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle.$j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPos item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$participantID+2}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$eachParticipant item=eachProfile key=pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$customProfile.title.$pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$eachProfile item=val key=field}\n{foreach from=$val item=v key=f}\n{$field}: {$v}\n{/foreach}\n{/foreach}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $event.allow_selfcancelxfer }\n{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=tdfirstStyle}style=\"width: 180px; padding-bottom: 15px;\"{/capture}\n{capture assign=tdStyle}style=\"width: 100px;\"{/capture}\n{capture assign=participantTotal}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n\n    {else}\n     <p>{ts}Thank you for your registration.{/ts}\n     {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}\n     {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}</p>\n\n    {/if}\n\n    <p>\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"width:100%; max-width:700px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n    {if $event.is_share}\n        <tr>\n            <td colspan=\"2\" {$valueStyle}>\n                {capture assign=eventUrl}{crmURL p=\'civicrm/event/info\' q=\"id=`$event.id`&reset=1\" a=true fe=1 h=1}{/capture}\n                {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl}\n            </td>\n        </tr>\n    {/if}\n    {if $payer.name}\n     <tr>\n       <th {$headerStyle}>\n         {ts}You were registered by:{/ts}\n       </th>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$payer.name}\n       </td>\n     </tr>\n    {/if}\n    {if $event.is_monetary and not $isRequireApproval}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if  $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td {$tdfirstStyle}>\n              {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td {$tdStyle} align=\"middle\">\n               {$line.qty}\n              </td>\n              <td {$tdStyle}>\n               {$line.unit_price|crmMoney:$currency}\n              </td>\n              {if $dataArray}\n               <td {$tdStyle}>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td {$tdStyle}>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td {$tdStyle}>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td {$tdStyle}>\n               {$line.line_total+$line.tax_amount|crmMoney:$currency}\n              </td>\n        {if $pricesetFieldsCount }<td {$tdStyle}>{$line.participant_count}</td> {/if}\n             </tr>\n            {/foreach}\n            {if $individual}\n              <tr {$participantTotal}>\n                <td colspan=3>{ts}Participant Total{/ts}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>\n              </tr>\n            {/if}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount Before Tax: {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amounts && !$lineItem}\n       {foreach from=$amounts item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney:$currency} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n\n    {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n      {ts}Total Participants{/ts}</td>\n      <td {$valueStyle}>\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n     {$count}\n     </td> </tr>\n      {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n   <tr> <th {$headerStyle}>{$customPre_grouptitle.$i}</th></tr>\n   {foreach from=$customPr item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n   {/if}\n   {/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n   <tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>\n   {foreach from=$customPos item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customProfile}\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n     <tr><th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th></tr>\n     {foreach from=$eachParticipant item=eachProfile key=pid}\n     <tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>\n     {foreach from=$eachProfile item=val key=field}\n     <tr>{foreach from=$val item=v key=f}\n         <td {$labelStyle}>{$field}</td>\n         <td {$valueStyle}>{$v}</td>\n         {/foreach}\n     </tr>\n     {/foreach}\n{/foreach}\n{/foreach}\n{/if}\n\n    {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n    </table>\n    {if $event.allow_selfcancelxfer }\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n        {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n        <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n      </td>\n     </tr>\n    {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,835,'event_online_receipt',1,0,0,NULL),(32,'Events - Registration Confirmation and Receipt (on-line)','{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n\n{else}\n  {ts}Thank you for your registration.{/ts}\n  {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to %1.{/ts}\n  {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}\n  {/if}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $payer.name}\nYou were registered by: {$payer.name}\n{/if}\n{if $event.is_monetary and not $isRequireApproval} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n\n{/if}\n{/if}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}{$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n----------------------------------------------------------------------------------------------------------------\n{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%29s\"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%33s\"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:\"%12s\"}{/if}\n{/if}\n{\"\"|string_format:\"%120s\"}\n{/foreach}\n{\"\"|string_format:\"%120s\"}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amounts && !$lineItem}\n{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary }\n\n{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle.$i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPr item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle.$j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPos item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$participantID+2}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$eachParticipant item=eachProfile key=pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$customProfile.title.$pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$eachProfile item=val key=field}\n{foreach from=$val item=v key=f}\n{$field}: {$v}\n{/foreach}\n{/foreach}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $event.allow_selfcancelxfer }\n{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=tdfirstStyle}style=\"width: 180px; padding-bottom: 15px;\"{/capture}\n{capture assign=tdStyle}style=\"width: 100px;\"{/capture}\n{capture assign=participantTotal}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n\n    {else}\n     <p>{ts}Thank you for your registration.{/ts}\n     {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}\n     {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}</p>\n\n    {/if}\n\n    <p>\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"width:100%; max-width:700px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n    {if $event.is_share}\n        <tr>\n            <td colspan=\"2\" {$valueStyle}>\n                {capture assign=eventUrl}{crmURL p=\'civicrm/event/info\' q=\"id=`$event.id`&reset=1\" a=true fe=1 h=1}{/capture}\n                {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl}\n            </td>\n        </tr>\n    {/if}\n    {if $payer.name}\n     <tr>\n       <th {$headerStyle}>\n         {ts}You were registered by:{/ts}\n       </th>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$payer.name}\n       </td>\n     </tr>\n    {/if}\n    {if $event.is_monetary and not $isRequireApproval}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if  $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td {$tdfirstStyle}>\n              {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td {$tdStyle} align=\"middle\">\n               {$line.qty}\n              </td>\n              <td {$tdStyle}>\n               {$line.unit_price|crmMoney:$currency}\n              </td>\n              {if $dataArray}\n               <td {$tdStyle}>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td {$tdStyle}>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td {$tdStyle}>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td {$tdStyle}>\n               {$line.line_total+$line.tax_amount|crmMoney:$currency}\n              </td>\n        {if $pricesetFieldsCount }<td {$tdStyle}>{$line.participant_count}</td> {/if}\n             </tr>\n            {/foreach}\n            {if $individual}\n              <tr {$participantTotal}>\n                <td colspan=3>{ts}Participant Total{/ts}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>\n              </tr>\n            {/if}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount Before Tax: {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amounts && !$lineItem}\n       {foreach from=$amounts item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney:$currency} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n\n    {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n      {ts}Total Participants{/ts}</td>\n      <td {$valueStyle}>\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n     {$count}\n     </td> </tr>\n      {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n   <tr> <th {$headerStyle}>{$customPre_grouptitle.$i}</th></tr>\n   {foreach from=$customPr item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n   {/if}\n   {/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n   <tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>\n   {foreach from=$customPos item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customProfile}\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n     <tr><th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th></tr>\n     {foreach from=$eachParticipant item=eachProfile key=pid}\n     <tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>\n     {foreach from=$eachProfile item=val key=field}\n     <tr>{foreach from=$val item=v key=f}\n         <td {$labelStyle}>{$field}</td>\n         <td {$valueStyle}>{$v}</td>\n         {/foreach}\n     </tr>\n     {/foreach}\n{/foreach}\n{/foreach}\n{/if}\n\n    {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n    </table>\n    {if $event.allow_selfcancelxfer }\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n        {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n        <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n      </td>\n     </tr>\n    {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,835,'event_online_receipt',0,1,0,NULL),(33,'Events - Receipt only','Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $is_pay_later}\n  This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n{else}\n  This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n{/if}\n\n{if $is_pay_later}\n  {$pay_later_receipt}\n{/if}\n\n  Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:\n\n{if $billing_name}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billing_name}\n\n{$billing_street_address}\n\n{$billing_city}, {$billing_state} {$billing_postal_code}\n\n{$email}\n{/if}\n\n{if $source}\n{$source}\n{/if}\n\n\n{foreach from=$line_items item=line_item}\n{$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})\n{if $line_item.event->is_show_location}\n  {$line_item.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n{$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n\n  Quantity: {$line_item.num_participants}\n\n{if $line_item.num_participants > 0}\n  {foreach from=$line_item.participants item=participant}\n    {$participant.display_name}\n  {/foreach}\n{/if}\n{if $line_item.num_waiting_participants > 0}\n  Waitlisted:\n    {foreach from=$line_item.waiting_participants item=participant}\n      {$participant.display_name}\n    {/foreach}\n{/if}\nCost: {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\nTotal For This Event: {$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n\n{/foreach}\n\n{if $discounts}\nSubtotal: {$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n--------------------------------------\nDiscounts\n{foreach from=$discounts key=myId item=i}\n  {$i.title}: -{$i.amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/if}\n======================================\nTotal: {$total|crmMoney:$currency|string_format:\"%10s\"}\n\n{if $credit_card_type}\n===========================================================\n{ts}Payment Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n{/if}\n\n  If you have questions about the status of your registration or purchase please feel free to contact us.\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n    <title></title>\n  </head>\n  <body>\n    {capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n    {capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n    {capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $is_pay_later}\n      <p>\n        This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n      </p>\n    {else}\n      <p>\n        This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n      </p>\n    {/if}\n\n    {if $is_pay_later}\n      <p>{$pay_later_receipt}</p>\n    {/if}\n\n    <p>Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n  Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:</p>\n\n{if $billing_name}\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Billing Name and Address{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$billing_name}<br />\n      {$billing_street_address}<br />\n      {$billing_city}, {$billing_state} {$billing_postal_code}<br/>\n      <br/>\n      {$email}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $credit_card_type}\n  <p>&nbsp;</p>\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Credit Card Information{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$credit_card_type}<br />\n      {$credit_card_number}<br />\n      {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $source}\n    <p>&nbsp;</p>\n    {$source}\n{/if}\n    <p>&nbsp;</p>\n    <table width=\"700\">\n      <thead>\n    <tr>\n{if $line_items}\n      <th style=\"text-align: left;\">\n      Event\n      </th>\n      <th style=\"text-align: left;\">\n      Participants\n      </th>\n{/if}\n      <th style=\"text-align: left;\">\n      Price\n      </th>\n      <th style=\"text-align: left;\">\n      Total\n      </th>\n    </tr>\n    </thead>\n      <tbody>\n  {foreach from=$line_items item=line_item}\n  <tr>\n    <td style=\"width: 220px\">\n      {$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})<br />\n      {if $line_item.event->is_show_location}\n        {$line_item.location.address.1.display|nl2br}\n      {/if}{*End of isShowLocation condition*}<br /><br />\n      {$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n    </td>\n    <td style=\"width: 180px\">\n    {$line_item.num_participants}\n      {if $line_item.num_participants > 0}\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n      {if $line_item.num_waiting_participants > 0}\n      Waitlisted:<br/>\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.waiting_participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n    </td>\n    <td style=\"width: 100px\">\n      {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n    <td style=\"width: 100px\">\n      &nbsp;{$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {/foreach}\n      </tbody>\n      <tfoot>\n  {if $discounts}\n  <tr>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      Subtotal:\n    </td>\n    <td>\n      &nbsp;{$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {foreach from=$discounts key=myId item=i}\n  <tr>\n    <td>\n      {$i.title}\n    </td>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      -{$i.amount}\n    </td>\n  </tr>\n  {/foreach}\n  {/if}\n  <tr>\n{if $line_items}\n    <td>\n    </td>\n    <td>\n    </td>\n{/if}\n    <td>\n      <strong>Total:</strong>\n    </td>\n    <td>\n      <strong>&nbsp;{$total|crmMoney:$currency|string_format:\"%10s\"}</strong>\n    </td>\n  </tr>\n      </tfoot>\n    </table>\n\n    If you have questions about the status of your registration or purchase please feel free to contact us.\n  </body>\n</html>\n',1,836,'event_registration_receipt',1,0,0,NULL),(34,'Events - Receipt only','Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $is_pay_later}\n  This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n{else}\n  This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n{/if}\n\n{if $is_pay_later}\n  {$pay_later_receipt}\n{/if}\n\n  Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:\n\n{if $billing_name}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billing_name}\n\n{$billing_street_address}\n\n{$billing_city}, {$billing_state} {$billing_postal_code}\n\n{$email}\n{/if}\n\n{if $source}\n{$source}\n{/if}\n\n\n{foreach from=$line_items item=line_item}\n{$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})\n{if $line_item.event->is_show_location}\n  {$line_item.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n{$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n\n  Quantity: {$line_item.num_participants}\n\n{if $line_item.num_participants > 0}\n  {foreach from=$line_item.participants item=participant}\n    {$participant.display_name}\n  {/foreach}\n{/if}\n{if $line_item.num_waiting_participants > 0}\n  Waitlisted:\n    {foreach from=$line_item.waiting_participants item=participant}\n      {$participant.display_name}\n    {/foreach}\n{/if}\nCost: {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\nTotal For This Event: {$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n\n{/foreach}\n\n{if $discounts}\nSubtotal: {$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n--------------------------------------\nDiscounts\n{foreach from=$discounts key=myId item=i}\n  {$i.title}: -{$i.amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/if}\n======================================\nTotal: {$total|crmMoney:$currency|string_format:\"%10s\"}\n\n{if $credit_card_type}\n===========================================================\n{ts}Payment Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n{/if}\n\n  If you have questions about the status of your registration or purchase please feel free to contact us.\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n    <title></title>\n  </head>\n  <body>\n    {capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n    {capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n    {capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $is_pay_later}\n      <p>\n        This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n      </p>\n    {else}\n      <p>\n        This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n      </p>\n    {/if}\n\n    {if $is_pay_later}\n      <p>{$pay_later_receipt}</p>\n    {/if}\n\n    <p>Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n  Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:</p>\n\n{if $billing_name}\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Billing Name and Address{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$billing_name}<br />\n      {$billing_street_address}<br />\n      {$billing_city}, {$billing_state} {$billing_postal_code}<br/>\n      <br/>\n      {$email}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $credit_card_type}\n  <p>&nbsp;</p>\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Credit Card Information{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$credit_card_type}<br />\n      {$credit_card_number}<br />\n      {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $source}\n    <p>&nbsp;</p>\n    {$source}\n{/if}\n    <p>&nbsp;</p>\n    <table width=\"700\">\n      <thead>\n    <tr>\n{if $line_items}\n      <th style=\"text-align: left;\">\n      Event\n      </th>\n      <th style=\"text-align: left;\">\n      Participants\n      </th>\n{/if}\n      <th style=\"text-align: left;\">\n      Price\n      </th>\n      <th style=\"text-align: left;\">\n      Total\n      </th>\n    </tr>\n    </thead>\n      <tbody>\n  {foreach from=$line_items item=line_item}\n  <tr>\n    <td style=\"width: 220px\">\n      {$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})<br />\n      {if $line_item.event->is_show_location}\n        {$line_item.location.address.1.display|nl2br}\n      {/if}{*End of isShowLocation condition*}<br /><br />\n      {$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n    </td>\n    <td style=\"width: 180px\">\n    {$line_item.num_participants}\n      {if $line_item.num_participants > 0}\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n      {if $line_item.num_waiting_participants > 0}\n      Waitlisted:<br/>\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.waiting_participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n    </td>\n    <td style=\"width: 100px\">\n      {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n    <td style=\"width: 100px\">\n      &nbsp;{$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {/foreach}\n      </tbody>\n      <tfoot>\n  {if $discounts}\n  <tr>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      Subtotal:\n    </td>\n    <td>\n      &nbsp;{$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {foreach from=$discounts key=myId item=i}\n  <tr>\n    <td>\n      {$i.title}\n    </td>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      -{$i.amount}\n    </td>\n  </tr>\n  {/foreach}\n  {/if}\n  <tr>\n{if $line_items}\n    <td>\n    </td>\n    <td>\n    </td>\n{/if}\n    <td>\n      <strong>Total:</strong>\n    </td>\n    <td>\n      <strong>&nbsp;{$total|crmMoney:$currency|string_format:\"%10s\"}</strong>\n    </td>\n  </tr>\n      </tfoot>\n    </table>\n\n    If you have questions about the status of your registration or purchase please feel free to contact us.\n  </body>\n</html>\n',1,836,'event_registration_receipt',0,1,0,NULL),(35,'Events - Registration Cancellation Notice','{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your Event Registration has been cancelled.{/ts}\n\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your Event Registration has been cancelled.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,837,'participant_cancelled',1,0,0,NULL),(36,'Events - Registration Cancellation Notice','{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your Event Registration has been cancelled.{/ts}\n\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your Event Registration has been cancelled.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,837,'participant_cancelled',0,1,0,NULL),(37,'Events - Registration Confirmation Invite','{ts 1=$event.event_title}Confirm your registration for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}\n\n{if !$isAdditional and $participant.id}\n\n===========================================================\n{ts}Confirm Your Registration{/ts}\n\n===========================================================\n{capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\nClick this link to go to a web page where you can confirm your registration online:\n{$confirmUrl}\n{/if}\n{if $event.allow_selfcancelxfer }\n{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>\n   </td>\n  </tr>\n  {if !$isAdditional and $participant.id}\n   <tr>\n    <th {$headerStyle}>\n     {ts}Confirm Your Registration{/ts}\n    </th>\n   </tr>\n   <tr>\n    <td colspan=\"2\" {$valueStyle}>\n     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\n     <a href=\"{$confirmUrl}\">{ts}Click here to confirm and complete your registration{/ts}</a>\n    </td>\n   </tr>\n  {/if}\n  {if $event.allow_selfcancelxfer }\n  {ts}This event allows for{/ts}\n  {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\" h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\"> {ts}self service cancel or transfer{/ts}</a>\n  {/if}\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n  {if $event.allow_selfcancelxfer }\n   <tr>\n     <td colspan=\"2\" {$valueStyle}>\n       {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n         {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n     </td>\n   </tr>\n  {/if}\n  <tr>\n   <td colspan=\"2\" {$valueStyle}>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,838,'participant_confirm',1,0,0,NULL),(38,'Events - Registration Confirmation Invite','{ts 1=$event.event_title}Confirm your registration for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}\n\n{if !$isAdditional and $participant.id}\n\n===========================================================\n{ts}Confirm Your Registration{/ts}\n\n===========================================================\n{capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\nClick this link to go to a web page where you can confirm your registration online:\n{$confirmUrl}\n{/if}\n{if $event.allow_selfcancelxfer }\n{ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>\n   </td>\n  </tr>\n  {if !$isAdditional and $participant.id}\n   <tr>\n    <th {$headerStyle}>\n     {ts}Confirm Your Registration{/ts}\n    </th>\n   </tr>\n   <tr>\n    <td colspan=\"2\" {$valueStyle}>\n     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\n     <a href=\"{$confirmUrl}\">{ts}Click here to confirm and complete your registration{/ts}</a>\n    </td>\n   </tr>\n  {/if}\n  {if $event.allow_selfcancelxfer }\n  {ts}This event allows for{/ts}\n  {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\" h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\"> {ts}self service cancel or transfer{/ts}</a>\n  {/if}\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n  {if $event.allow_selfcancelxfer }\n   <tr>\n     <td colspan=\"2\" {$valueStyle}>\n       {ts 1=$event.selfcancelxfer_time}You may transfer your registration to another participant or cancel your registration up to %1 hours before the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n         {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n     </td>\n   </tr>\n  {/if}\n  <tr>\n   <td colspan=\"2\" {$valueStyle}>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,838,'participant_confirm',0,1,0,NULL),(39,'Events - Pending Registration Expiration Notice','{ts 1=$event.event_title}Event registration has expired for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}</p>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,839,'participant_expired',1,0,0,NULL),(40,'Events - Pending Registration Expiration Notice','{ts 1=$event.event_title}Event registration has expired for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}</p>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,839,'participant_expired',0,1,0,NULL),(41,'Events - Registration Transferred Notice','{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$to_participant}Your Event Registration has been transferred to %1.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,840,'participant_transferred',1,0,0,NULL),(42,'Events - Registration Transferred Notice','{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$to_participant}Your Event Registration has been transferred to %1.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,840,'participant_transferred',0,1,0,NULL),(43,'Tell-a-Friend Email','{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/ts}\n','{$senderMessage}\n\n{if $generalLink}{ts}For more information, visit:{/ts}\n>> {$generalLink}\n\n{/if}\n{if $contribute}{ts}To make a contribution, go to:{/ts}\n>> {$pageURL}\n\n{/if}\n{if $event}{ts}To find out more about this event, go to:{/ts}\n>> {$pageURL}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{$senderMessage}</p>\n    {if $generalLink}\n     <p><a href=\"{$generalLink}\">{ts}More information{/ts}</a></p>\n    {/if}\n    {if $contribute}\n     <p><a href=\"{$pageURL}\">{ts}Make a contribution{/ts}</a></p>\n    {/if}\n    {if $event}\n     <p><a href=\"{$pageURL}\">{ts}Find out more about this event{/ts}</a></p>\n    {/if}\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,841,'friend',1,0,0,NULL),(44,'Tell-a-Friend Email','{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/ts}\n','{$senderMessage}\n\n{if $generalLink}{ts}For more information, visit:{/ts}\n>> {$generalLink}\n\n{/if}\n{if $contribute}{ts}To make a contribution, go to:{/ts}\n>> {$pageURL}\n\n{/if}\n{if $event}{ts}To find out more about this event, go to:{/ts}\n>> {$pageURL}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{$senderMessage}</p>\n    {if $generalLink}\n     <p><a href=\"{$generalLink}\">{ts}More information{/ts}</a></p>\n    {/if}\n    {if $contribute}\n     <p><a href=\"{$pageURL}\">{ts}Make a contribution{/ts}</a></p>\n    {/if}\n    {if $event}\n     <p><a href=\"{$pageURL}\">{ts}Find out more about this event{/ts}</a></p>\n    {/if}\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,841,'friend',0,1,0,NULL),(45,'Memberships - Signup and Renewal Receipts (off-line)','{if $receiptType EQ \'membership signup\'}\n{ts}Membership Confirmation and Receipt{/ts}\n{elseif $receiptType EQ \'membership renewal\'}\n{ts}Membership Renewal Confirmation and Receipt{/ts}\n{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text_signup}\n{$formValues.receipt_text_signup}\n{elseif $formValues.receipt_text_renewal}\n{$formValues.receipt_text_renewal}\n{else}{ts}Thank you for this contribution.{/ts}{/if}\n\n{if !$lineItem}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{/if}\n{if ! $cancelled}\n{if !$lineItem}\n{ts}Membership Start Date{/ts}: {$mem_start_date}\n{ts}Membership End Date{/ts}: {$mem_end_date}\n{/if}\n\n{if $formValues.total_amount OR $formValues.total_amount eq 0 }\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if $formValues.contributionType_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{/if}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}  {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset}\n{$taxTerm} {$priceset|string_format:\"%.2f\"} %: {$value|crmMoney:$currency}\n{elseif  $priceset == 0}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if isset($totalTaxAmount)}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$formValues.total_amount|crmMoney}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{/if}\n{/if}\n\n{if $isPrimary }\n{if $billingName}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n\n{if $customValues}\n===========================================================\n{ts}Membership Options{/ts}\n\n===========================================================\n{foreach from=$customValues item=value key=customName}\n {$customName} : {$value}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text_signup}\n     <p>{$formValues.receipt_text_signup|htmlize}</p>\n    {elseif $formValues.receipt_text_renewal}\n     <p>{$formValues.receipt_text_renewal|htmlize}</p>\n    {else}\n     <p>{ts}Thank you for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     {if !$lineItem}\n     <tr>\n      <th {$headerStyle}>\n       {ts}Membership Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Membership Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$membership_name}\n      </td>\n     </tr>\n     {/if}\n     {if ! $cancelled}\n     {if !$lineItem}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_start_date}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_end_date}\n       </td>\n      </tr>\n      {/if}\n      {if $formValues.total_amount OR $formValues.total_amount eq 0 }\n       <tr>\n        <th {$headerStyle}>\n         {ts}Membership Fee{/ts}\n        </th>\n       </tr>\n       {if $formValues.contributionType_name}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.contributionType_name}\n         </td>\n        </tr>\n       {/if}\n\n       {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Fee{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n             {/if}\n       <th>{ts}Membership Start Date{/ts}</th>\n       <th>{ts}Membership End Date{/ts}</th>\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.line_total|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n               <td>\n                {$line.line_total+$line.tax_amount|crmMoney}\n               </td>\n              {/if}\n              <td>\n               {$line.start_date}\n              </td>\n        <td>\n               {$line.end_date}\n              </td>\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.total_amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n       {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset}\n         <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {elseif  $priceset == 0}\n         <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n       {/foreach}\n      {/if}\n      {/if}\n      {if isset($totalTaxAmount)}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.total_amount|crmMoney}\n        </td>\n       </tr>\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Date Received{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|truncate:10:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n       {if $formValues.paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.paidBy}\n         </td>\n        </tr>\n        {if $formValues.check_number}\n         <tr>\n          <td {$labelStyle}>\n           {ts}Check Number{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$formValues.check_number}\n          </td>\n         </tr>\n        {/if}\n       {/if}\n      {/if}\n     {/if}\n    </table>\n   </td>\n  </tr>\n\n  {if $isPrimary}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n      {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {$billingName}<br />\n         {$address}\n        </td>\n       </tr>\n      {/if}\n\n      {if $credit_card_type}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Credit Card Information{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$valueStyle}>\n         {$credit_card_type}<br />\n         {$credit_card_number}\n        </td>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {ts}Expires{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n  {if $customValues}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Options{/ts}\n       </th>\n      </tr>\n      {foreach from=$customValues item=value key=customName}\n       <tr>\n        <td {$labelStyle}>\n         {$customName}\n        </td>\n        <td {$valueStyle}>\n         {$value}\n        </td>\n       </tr>\n      {/foreach}\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,842,'membership_offline_receipt',1,0,0,NULL),(46,'Memberships - Signup and Renewal Receipts (off-line)','{if $receiptType EQ \'membership signup\'}\n{ts}Membership Confirmation and Receipt{/ts}\n{elseif $receiptType EQ \'membership renewal\'}\n{ts}Membership Renewal Confirmation and Receipt{/ts}\n{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text_signup}\n{$formValues.receipt_text_signup}\n{elseif $formValues.receipt_text_renewal}\n{$formValues.receipt_text_renewal}\n{else}{ts}Thank you for this contribution.{/ts}{/if}\n\n{if !$lineItem}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{/if}\n{if ! $cancelled}\n{if !$lineItem}\n{ts}Membership Start Date{/ts}: {$mem_start_date}\n{ts}Membership End Date{/ts}: {$mem_end_date}\n{/if}\n\n{if $formValues.total_amount OR $formValues.total_amount eq 0 }\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if $formValues.contributionType_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{/if}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}  {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset}\n{$taxTerm} {$priceset|string_format:\"%.2f\"} %: {$value|crmMoney:$currency}\n{elseif  $priceset == 0}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if isset($totalTaxAmount)}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$formValues.total_amount|crmMoney}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{/if}\n{/if}\n\n{if $isPrimary }\n{if $billingName}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n\n{if $customValues}\n===========================================================\n{ts}Membership Options{/ts}\n\n===========================================================\n{foreach from=$customValues item=value key=customName}\n {$customName} : {$value}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text_signup}\n     <p>{$formValues.receipt_text_signup|htmlize}</p>\n    {elseif $formValues.receipt_text_renewal}\n     <p>{$formValues.receipt_text_renewal|htmlize}</p>\n    {else}\n     <p>{ts}Thank you for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     {if !$lineItem}\n     <tr>\n      <th {$headerStyle}>\n       {ts}Membership Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Membership Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$membership_name}\n      </td>\n     </tr>\n     {/if}\n     {if ! $cancelled}\n     {if !$lineItem}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_start_date}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_end_date}\n       </td>\n      </tr>\n      {/if}\n      {if $formValues.total_amount OR $formValues.total_amount eq 0 }\n       <tr>\n        <th {$headerStyle}>\n         {ts}Membership Fee{/ts}\n        </th>\n       </tr>\n       {if $formValues.contributionType_name}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.contributionType_name}\n         </td>\n        </tr>\n       {/if}\n\n       {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Fee{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n             {/if}\n       <th>{ts}Membership Start Date{/ts}</th>\n       <th>{ts}Membership End Date{/ts}</th>\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.line_total|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n               <td>\n                {$line.line_total+$line.tax_amount|crmMoney}\n               </td>\n              {/if}\n              <td>\n               {$line.start_date}\n              </td>\n        <td>\n               {$line.end_date}\n              </td>\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.total_amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n       {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset}\n         <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {elseif  $priceset == 0}\n         <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n       {/foreach}\n      {/if}\n      {/if}\n      {if isset($totalTaxAmount)}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.total_amount|crmMoney}\n        </td>\n       </tr>\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Date Received{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|truncate:10:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n       {if $formValues.paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.paidBy}\n         </td>\n        </tr>\n        {if $formValues.check_number}\n         <tr>\n          <td {$labelStyle}>\n           {ts}Check Number{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$formValues.check_number}\n          </td>\n         </tr>\n        {/if}\n       {/if}\n      {/if}\n     {/if}\n    </table>\n   </td>\n  </tr>\n\n  {if $isPrimary}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n      {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {$billingName}<br />\n         {$address}\n        </td>\n       </tr>\n      {/if}\n\n      {if $credit_card_type}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Credit Card Information{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$valueStyle}>\n         {$credit_card_type}<br />\n         {$credit_card_number}\n        </td>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {ts}Expires{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n  {if $customValues}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Options{/ts}\n       </th>\n      </tr>\n      {foreach from=$customValues item=value key=customName}\n       <tr>\n        <td {$labelStyle}>\n         {$customName}\n        </td>\n        <td {$valueStyle}>\n         {$value}\n        </td>\n       </tr>\n      {/foreach}\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,842,'membership_offline_receipt',0,1,0,NULL),(47,'Memberships - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $membership_assign && !$useForMember}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n{/if}\n{if $amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if !$useForMember && $membership_amount && $is_quick_config}\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{if $amount && !$is_separate_payment }\n{ts}Contribution Amount{/ts}: {$amount|crmMoney}\n-------------------------------------------\n{ts}Total{/ts}: {$amount+$membership_amount|crmMoney}\n{/if}\n{elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{$line.description|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney}\n{else}\n{if $useForMember && $lineItem && !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{elseif $membership_amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{/if}\n\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n\n{/if}\n{if $membership_trx_id}\n{ts}Membership Transaction #{/ts}: {$membership_trx_id}\n\n{/if}\n{if $is_recur}\n{ts}This membership will be renewed automatically.{/ts}\n{if $cancelSubscriptionUrl}\n\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by visiting this web page: %1.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n{/if}\n{/if}\n\n{if $honor_block_is_active }\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or email *}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $membership_assign && !$useForMember}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Type{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_name}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n\n     {if $amount}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n\n      {if !$useForMember and $membership_amount and $is_quick_config}\n\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$membership_name}%1 Membership{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$membership_amount|crmMoney}\n        </td>\n       </tr>\n       {if $amount && !$is_separate_payment }\n         <tr>\n          <td {$labelStyle}>\n           {ts}Contribution Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$amount|crmMoney}\n          </td>\n         </tr>\n         <tr>\n           <td {$labelStyle}>\n           {ts}Total{/ts}\n            </td>\n            <td {$valueStyle}>\n            {$amount+$membership_amount|crmMoney}\n           </td>\n         </tr>\n       {/if}\n\n      {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n              {$line.description|truncate:30:\"...\"}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney}\n        </td>\n       </tr>\n\n      {else}\n       {if $useForMember && $lineItem and !$is_quick_config}\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Fee{/ts}</th>\n            {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n            {/if}\n      <th>{ts}Membership Start Date{/ts}</th>\n      <th>{ts}Membership End Date{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n             {if $dataArray}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n             {/if}\n             <td>\n              {$line.start_date}\n             </td>\n       <td>\n              {$line.end_date}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n         {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {else}\n           <td>&nbsp;{ts}NO{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {/if}\n         </tr>\n        {/foreach}\n       {/if}\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n\n     {elseif $membership_amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts 1=$membership_name}%1 Membership{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_amount|crmMoney}\n       </td>\n      </tr>\n\n\n     {/if}\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $membership_trx_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_trx_id}\n       </td>\n      </tr>\n     {/if}\n     {if $is_recur}\n       <tr>\n        <td colspan=\"2\" {$labelStyle}>\n         {ts}This membership will be renewed automatically.{/ts}\n         {if $cancelSubscriptionUrl}\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         {/if}\n        </td>\n       </tr>\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $billingName}\n       <tr>\n         <th {$headerStyle}>\n           {ts}Billing Name and Address{/ts}\n         </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}<br />\n          {$email}\n        </td>\n      </tr>\n    {elseif $email}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$email}\n        </td>\n      </tr>\n    {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,843,'membership_online_receipt',1,0,0,NULL),(48,'Memberships - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $membership_assign && !$useForMember}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n{/if}\n{if $amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if !$useForMember && $membership_amount && $is_quick_config}\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{if $amount && !$is_separate_payment }\n{ts}Contribution Amount{/ts}: {$amount|crmMoney}\n-------------------------------------------\n{ts}Total{/ts}: {$amount+$membership_amount|crmMoney}\n{/if}\n{elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{$line.description|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney}\n{else}\n{if $useForMember && $lineItem && !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{elseif $membership_amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{/if}\n\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n\n{/if}\n{if $membership_trx_id}\n{ts}Membership Transaction #{/ts}: {$membership_trx_id}\n\n{/if}\n{if $is_recur}\n{ts}This membership will be renewed automatically.{/ts}\n{if $cancelSubscriptionUrl}\n\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by visiting this web page: %1.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n{/if}\n{/if}\n\n{if $honor_block_is_active }\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or email *}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $membership_assign && !$useForMember}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Type{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_name}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n\n     {if $amount}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n\n      {if !$useForMember and $membership_amount and $is_quick_config}\n\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$membership_name}%1 Membership{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$membership_amount|crmMoney}\n        </td>\n       </tr>\n       {if $amount && !$is_separate_payment }\n         <tr>\n          <td {$labelStyle}>\n           {ts}Contribution Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$amount|crmMoney}\n          </td>\n         </tr>\n         <tr>\n           <td {$labelStyle}>\n           {ts}Total{/ts}\n            </td>\n            <td {$valueStyle}>\n            {$amount+$membership_amount|crmMoney}\n           </td>\n         </tr>\n       {/if}\n\n      {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n              {$line.description|truncate:30:\"...\"}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney}\n        </td>\n       </tr>\n\n      {else}\n       {if $useForMember && $lineItem and !$is_quick_config}\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Fee{/ts}</th>\n            {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n            {/if}\n      <th>{ts}Membership Start Date{/ts}</th>\n      <th>{ts}Membership End Date{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n             {if $dataArray}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n             {/if}\n             <td>\n              {$line.start_date}\n             </td>\n       <td>\n              {$line.end_date}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n         {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {else}\n           <td>&nbsp;{ts}NO{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {/if}\n         </tr>\n        {/foreach}\n       {/if}\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n\n     {elseif $membership_amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts 1=$membership_name}%1 Membership{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_amount|crmMoney}\n       </td>\n      </tr>\n\n\n     {/if}\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $membership_trx_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_trx_id}\n       </td>\n      </tr>\n     {/if}\n     {if $is_recur}\n       <tr>\n        <td colspan=\"2\" {$labelStyle}>\n         {ts}This membership will be renewed automatically.{/ts}\n         {if $cancelSubscriptionUrl}\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         {/if}\n        </td>\n       </tr>\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $billingName}\n       <tr>\n         <th {$headerStyle}>\n           {ts}Billing Name and Address{/ts}\n         </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}<br />\n          {$email}\n        </td>\n      </tr>\n    {elseif $email}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$email}\n        </td>\n      </tr>\n    {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,843,'membership_online_receipt',0,1,0,NULL),(49,'Memberships - Auto-renew Cancellation Notification','{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}\n\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Status{/ts}: {$membership_status}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}</p>\n\n   </td>\n  </tr>\n </table>\n <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Status{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_status}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,844,'membership_autorenew_cancelled',1,0,0,NULL),(50,'Memberships - Auto-renew Cancellation Notification','{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}\n\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Status{/ts}: {$membership_status}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}</p>\n\n   </td>\n  </tr>\n </table>\n <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Status{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_status}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,844,'membership_autorenew_cancelled',0,1,0,NULL),(51,'Memberships - Auto-renew Billing Updates','{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n   <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n         {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n      </tr>\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,845,'membership_autorenew_billing',1,0,0,NULL),(52,'Memberships - Auto-renew Billing Updates','{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n   <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n         {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n      </tr>\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,845,'membership_autorenew_billing',0,1,0,NULL),(53,'Test-drive - Receipt Header','[TEST]\n','***********************************************************\n\n{ts}Test-drive Email / Receipt{/ts}\n\n{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}\n\n***********************************************************\n','<center>\n <table id=\"crm-event_receipt_test\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <tr>\n   <td>\n    <p>{ts}Test-drive Email / Receipt{/ts}</p>\n    <p>{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}</p>\n   </td>\n  </tr>\n </table>\n</center>\n',1,846,'test_preview',1,0,0,NULL),(54,'Test-drive - Receipt Header','[TEST]\n','***********************************************************\n\n{ts}Test-drive Email / Receipt{/ts}\n\n{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}\n\n***********************************************************\n','<center>\n <table id=\"crm-event_receipt_test\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <tr>\n   <td>\n    <p>{ts}Test-drive Email / Receipt{/ts}</p>\n    <p>{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}</p>\n   </td>\n  </tr>\n </table>\n</center>\n',1,846,'test_preview',0,1,0,NULL),(55,'Pledges - Acknowledgement','{ts}Thank you for your Pledge{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n{ts}Thank you for your generous pledge.{/ts}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$total_pledge_amount|crmMoney:$currency}\n\n===========================================================\n{ts}Payment Schedule{/ts}\n\n===========================================================\n{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}\n\n{if $frequency_day}\n\n{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}\n{/if}\n\n{if $payments}\n{assign var=\"count\" value=\"1\"}\n{foreach from=$payments item=payment}\n\n{ts 1=$count}Payment %1{/ts}: {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n{assign var=\"count\" value=`$count+1`}\n{/foreach}\n{/if}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Thank you for your generous pledge.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$total_pledge_amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Schedule{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}</p>\n\n       {if $frequency_day}\n        <p>{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}</p>\n       {/if}\n      </td>\n     </tr>\n\n     {if $payments}\n      {assign var=\"count\" value=\"1\"}\n      {foreach from=$payments item=payment}\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$count}Payment %1{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n        </td>\n       </tr>\n       {assign var=\"count\" value=`$count+1`}\n      {/foreach}\n     {/if}\n\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n      </td>\n     </tr>\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,847,'pledge_acknowledge',1,0,0,NULL),(56,'Pledges - Acknowledgement','{ts}Thank you for your Pledge{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n{ts}Thank you for your generous pledge.{/ts}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$total_pledge_amount|crmMoney:$currency}\n\n===========================================================\n{ts}Payment Schedule{/ts}\n\n===========================================================\n{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}\n\n{if $frequency_day}\n\n{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}\n{/if}\n\n{if $payments}\n{assign var=\"count\" value=\"1\"}\n{foreach from=$payments item=payment}\n\n{ts 1=$count}Payment %1{/ts}: {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n{assign var=\"count\" value=`$count+1`}\n{/foreach}\n{/if}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Thank you for your generous pledge.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$total_pledge_amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Schedule{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}</p>\n\n       {if $frequency_day}\n        <p>{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}</p>\n       {/if}\n      </td>\n     </tr>\n\n     {if $payments}\n      {assign var=\"count\" value=\"1\"}\n      {foreach from=$payments item=payment}\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$count}Payment %1{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n        </td>\n       </tr>\n       {assign var=\"count\" value=`$count+1`}\n      {/foreach}\n     {/if}\n\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n      </td>\n     </tr>\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,847,'pledge_acknowledge',0,1,0,NULL),(57,'Pledges - Payment Reminder','{ts}Pledge Payment Reminder{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}\n\n===========================================================\n{ts}Payment Due{/ts}\n\n===========================================================\n{ts}Amount Due{/ts}: {$amount_due|crmMoney:$currency}\n{ts}Due Date{/ts}: {$scheduled_payment_date|truncate:10:\'\'|crmDate}\n\n{if $contribution_page_id}\n{capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\nClick this link to go to a web page where you can make your payment online:\n{$contributionUrl}\n{else}\n{ts}Please mail your payment to{/ts}:\n{$domain.address}\n{/if}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$amount|crmMoney:$currency}\n{ts}Total Paid{/ts}: {$amount_paid|crmMoney:$currency}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n\n{ts}Thank your for your generous support.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Due{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Amount Due{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_due|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    {if $contribution_page_id}\n     {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\n     <p><a href=\"{$contributionUrl}\">{ts}Go to a web page where you can make your payment online{/ts}</a></p>\n    {else}\n     <p>{ts}Please mail your payment to{/ts}: {$domain.address}</p>\n    {/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Paid{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_paid|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n    <p>{ts}Thank your for your generous support.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,848,'pledge_reminder',1,0,0,NULL),(58,'Pledges - Payment Reminder','{ts}Pledge Payment Reminder{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}\n\n===========================================================\n{ts}Payment Due{/ts}\n\n===========================================================\n{ts}Amount Due{/ts}: {$amount_due|crmMoney:$currency}\n{ts}Due Date{/ts}: {$scheduled_payment_date|truncate:10:\'\'|crmDate}\n\n{if $contribution_page_id}\n{capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\nClick this link to go to a web page where you can make your payment online:\n{$contributionUrl}\n{else}\n{ts}Please mail your payment to{/ts}:\n{$domain.address}\n{/if}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$amount|crmMoney:$currency}\n{ts}Total Paid{/ts}: {$amount_paid|crmMoney:$currency}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n\n{ts}Thank your for your generous support.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Due{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Amount Due{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_due|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    {if $contribution_page_id}\n     {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\n     <p><a href=\"{$contributionUrl}\">{ts}Go to a web page where you can make your payment online{/ts}</a></p>\n    {else}\n     <p>{ts}Please mail your payment to{/ts}: {$domain.address}</p>\n    {/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Paid{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_paid|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n    <p>{ts}Thank your for your generous support.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,848,'pledge_reminder',0,1,0,NULL),(59,'Profiles - Admin Notification','{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}\n','{ts}Submitted For:{/ts} {$displayName}\n{ts}Date:{/ts} {$currentDate}\n{ts}Contact Summary:{/ts} {$contactLink}\n\n===========================================================\n{$grouptitle}\n\n===========================================================\n{foreach from=$values item=value key=valueName}\n{$valueName}: {$value}\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Submitted For{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$displayName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Date{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$currentDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contact Summary{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$contactLink}\n      </td>\n     </tr>\n\n     <tr>\n      <th {$headerStyle}>\n       {$grouptitle}\n      </th>\n     </tr>\n\n     {foreach from=$values item=value key=valueName}\n      <tr>\n       <td {$labelStyle}>\n        {$valueName}\n       </td>\n       <td {$valueStyle}>\n        {$value}\n       </td>\n      </tr>\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,849,'uf_notify',1,0,0,NULL),(60,'Profiles - Admin Notification','{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}\n','{ts}Submitted For:{/ts} {$displayName}\n{ts}Date:{/ts} {$currentDate}\n{ts}Contact Summary:{/ts} {$contactLink}\n\n===========================================================\n{$grouptitle}\n\n===========================================================\n{foreach from=$values item=value key=valueName}\n{$valueName}: {$value}\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Submitted For{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$displayName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Date{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$currentDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contact Summary{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$contactLink}\n      </td>\n     </tr>\n\n     <tr>\n      <th {$headerStyle}>\n       {$grouptitle}\n      </th>\n     </tr>\n\n     {foreach from=$values item=value key=valueName}\n      <tr>\n       <td {$labelStyle}>\n        {$valueName}\n       </td>\n       <td {$valueStyle}>\n        {$value}\n       </td>\n      </tr>\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,849,'uf_notify',0,1,0,NULL),(61,'Petition - signature added','Thank you for signing {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n{include file=\"CRM/Campaign/Page/Petition/SocialNetwork.tpl\" petition_id=$survey_id noscript=true emailMode=true}\n',1,850,'petition_sign',1,0,0,NULL),(62,'Petition - signature added','Thank you for signing {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n{include file=\"CRM/Campaign/Page/Petition/SocialNetwork.tpl\" petition_id=$survey_id noscript=true emailMode=true}\n',1,850,'petition_sign',0,1,0,NULL),(63,'Petition - need verification','Confirmation of signature needed for {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n\nIn order to complete your signature, we must confirm your e-mail.\nPlease do so by visiting the following email confirmation web page:\n\n{$petition.confirmUrlPlainText}\n\nIf you did not sign this petition, please ignore this message.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n<p>In order to <b>complete your signature</b>, we must confirm your e-mail.\n<br />\nPlease do so by visiting the following web page by clicking\non the link below or pasting the link into your browser.\n<br /><br />\nEmail confirmation page: <a href=\"{$petition.confirmUrl} \">{$petition.confirmUrl}</a></p>\n\n<p>If you did not sign this petition, please ignore this message.</p>\n',1,851,'petition_confirmation_needed',1,0,0,NULL),(64,'Petition - need verification','Confirmation of signature needed for {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n\nIn order to complete your signature, we must confirm your e-mail.\nPlease do so by visiting the following email confirmation web page:\n\n{$petition.confirmUrlPlainText}\n\nIf you did not sign this petition, please ignore this message.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n<p>In order to <b>complete your signature</b>, we must confirm your e-mail.\n<br />\nPlease do so by visiting the following web page by clicking\non the link below or pasting the link into your browser.\n<br /><br />\nEmail confirmation page: <a href=\"{$petition.confirmUrl} \">{$petition.confirmUrl}</a></p>\n\n<p>If you did not sign this petition, please ignore this message.</p>\n',1,851,'petition_confirmation_needed',0,1,0,NULL),(65,'Sample CiviMail Newsletter Template','Sample CiviMail Newsletter','','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n<table width=612 cellpadding=0 cellspacing=0 bgcolor=\"#ffffff\">\n  <tr>\n    <td colspan=\"2\" bgcolor=\"#ffffff\" valign=\"middle\" >\n      <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" >\n        <tr>\n          <td>\n          <a href=\"https://civicrm.org\"><img src=\"https://civicrm.org/sites/civicrm.org/files/top-logo_2.png\" border=0 alt=\"Replace this logo with the URL to your own\"></a>\n          </td>\n          <td>&nbsp; &nbsp;</td>\n          <td>\n          <a href=\"https://civicrm.org\" style=\"text-decoration: none;\"><font size=5 face=\"Arial, Verdana, sans-serif\" color=\"#8bc539\">Your Newsletter Title</font></a>\n          </td>\n        </tr>\n      </table>\n    </td>\n  </tr>\n  <tr>\n    <td valign=\"top\" width=\"70%\">\n      <!-- left column -->\n      <table cellpadding=\"10\" cellspacing=\"0\" border=\"0\">\n      <tr>\n        <td style=\"font-family: Arial, Verdana, sans-serif; font-size: 12px;\" >\n        <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n        Greetings {contact.display_name},\n        <br /><br />\n        This is a sample template designed to help you get started creating and sending your own CiviMail messages. This template uses an HTML layout that is generally compatible with the wide variety of email clients that your recipients might be using (e.g. Gmail, Outlook, Yahoo, etc.).\n        <br /><br />You can select this \"Sample CiviMail Newsletter Template\" from the \"Use Template\" drop-down in Step 3 of creating a mailing, and customize it to your needs. Then check the \"Save as New Template\" box on the bottom the page to save your customized version for use in future mailings.\n        <br /><br />The logo you use must be uploaded to your server.  Copy and paste the URL path to the logo into the &lt;img src= tag in the HTML at the top.  Click \"Source\" or the Image button if you are using the text editor.\n        <br /><br />\n        Edit the color of the links and headers using the color button or by editing the HTML.\n        <br /><br />\n        Your newsletter message and donation appeal can go here.  Click the link button to <a href=\"#\">create links</a> - remember to use a fully qualified URL starting with http:// in all your links!\n        <br /><br />\n        To use CiviMail:\n        <ul>\n          <li><a href=\"http://book.civicrm.org/user/advanced-configuration/email-system-configuration/\">Configure your Email System</a>.</li>\n          <li>Make sure your web hosting provider allows outgoing bulk mail, and see if they have a restriction on quantity.  If they don\'t allow bulk mail, consider <a href=\"https://civicrm.org/providers/hosting\">finding a new host</a>.</li>\n        </ul>\n        Sincerely,\n        <br /><br />\n        Your Team\n        <br /><br />\n        </font>\n        </td>\n      </tr>\n      </table>\n    </td>\n\n    <td valign=\"top\" width=\"30%\" bgcolor=\"#ffffff\" style=\"border: 1px solid #056085;\">\n      <!-- right column -->\n      <table cellpadding=10 cellspacing=0 border=0>\n      <tr>\n        <td bgcolor=\"#056085\"><font face=\"Arial, Verdana, sans-serif\" size=\"4\" color=\"#ffffff\">News and Events</font></td>\n      </tr>\n      <tr>\n        <td style=\"color: #000; font-family: Arial, Verdana, sans-serif; font-size: 12px;\" >\n        <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n        <font color=\"#056085\"><strong>Featured Events</strong> </font><br />\n        Fundraising Dinner<br />\n        Training Meeting<br />\n        Board of Directors Annual Meeting<br />\n\n        <br /><br />\n        <font color=\"#056085\"><strong>Community Events</strong></font><br />\n        Bake Sale<br />\n        Charity Auction<br />\n        Art Exhibit<br />\n\n        <br /><br />\n        <font color=\"#056085\"><strong>Important Dates</strong></font><br />\n        Tuesday August 27<br />\n        Wednesday September 8<br />\n        Thursday September 29<br />\n        Saturday October 1<br />\n        Sunday October 20<br />\n        </font>\n        </td>\n      </tr>\n      </table>\n    </td>\n  </tr>\n\n  <tr>\n    <td colspan=\"2\">\n      <table cellpadding=\"10\" cellspacing=\"0\" border=\"0\">\n      <tr>\n        <td>\n        <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n        <font color=\"#7dc857\"><strong>Helpful Tips</strong></font>\n        <br /><br />\n        <font color=\"#3b5187\">Tokens</font><br />\n        Click \"Insert Tokens\" to dynamically insert names, addresses, and other contact data of your recipients.\n        <br /><br />\n        <font color=\"#3b5187\">Plain Text Version</font><br />\n        Some people refuse HTML emails altogether.  We recommend sending a plain-text version of your important communications to accommodate them.  Luckily, CiviCRM accommodates for this!  Just click \"Plain Text\" and copy and paste in some text.  Line breaks (carriage returns) and fully qualified URLs like http://www.example.com are all you get, no HTML here!\n        <br /><br />\n        <font color=\"#3b5187\">Play by the Rules</font><br />\n        The address of the sender is required by the Can Spam Act law.  This is an available token called domain.address.  An unsubscribe or opt-out link is also required.  There are several available tokens for this. <em>{action.optOutUrl}</em> creates a link for recipients to click if they want to opt out of receiving  emails from your organization. <em>{action.unsubscribeUrl}</em> creates a link to unsubscribe from the specific mailing list used to send this message. Click on \"Insert Tokens\" to find these and look for tokens named \"Domain\" or \"Unsubscribe\".  This sample template includes both required tokens at the bottom of the message. You can also configure a default Mailing Footer containing these tokens.\n        <br /><br />\n        <font color=\"#3b5187\">Composing Offline</font><br />\n        If you prefer to compose an HTML email offline in your own text editor, you can upload this HTML content into CiviMail or simply click \"Source\" and then copy and paste the HTML in.\n        <br /><br />\n        <font color=\"#3b5187\">Images</font><br />\n        Most email clients these days (Outlook, Gmail, etc) block image loading by default.  This is to protect their users from annoying or harmful email.  Not much we can do about this, so encourage recipients to add you to their contacts or \"whitelist\".  Also use images sparingly, do not rely on images to convey vital information, and always use HTML \"alt\" tags which describe the image content.\n        </td>\n      </tr>\n      </table>\n    </td>\n  </tr>\n  <tr>\n    <td colspan=\"2\" style=\"color: #000; font-family: Arial, Verdana, sans-serif; font-size: 10px;\">\n      <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n      <hr />\n      <a href=\"{action.unsubscribeUrl}\" title=\"click to unsubscribe\">Click here</a> to unsubscribe from this mailing list.<br /><br />\n      Our mailing address is:<br />\n      {domain.address}\n    </td>\n  </tr>\n  </table>\n\n</body>\n</html>\n',1,NULL,NULL,1,0,0,NULL),(66,'Sample Responsive Design Newsletter - Single Column Template','Sample Responsive Design Newsletter - Single Column','','<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" />\n  <meta content=\"width=device-width, initial-scale=1.0\" name=\"viewport\" />\n  <title></title>\n\n  <style type=\"text/css\">\n    {literal}\n    /* Client-specific Styles */\n    #outlook a {padding:0;} /* Force Outlook to provide a \"view in browser\" menu link. */\n    body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}\n\n    /* Prevent Webkit and Windows Mobile platforms from changing default font sizes, while not breaking desktop design. */\n    .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */\n    .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing. */\n    #backgroundTable {margin:0; padding:0; width:100% !important; line-height: 100% !important;}\n    img {outline:none; text-decoration:none;border:none; -ms-interpolation-mode: bicubic;}\n    a img {border:none;}\n    .image_fix {display:block;}\n    p {margin: 0px 0px !important;}\n    table td {border-collapse: collapse;}\n    table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }\n    a {text-decoration: none;text-decoration:none;}\n\n    /*STYLES*/\n    table[class=full] { width: 100%; clear: both; }\n\n    /*IPAD STYLES*/\n    @media only screen and (max-width: 640px) {\n    a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color:#136388;pointer-events: none;cursor: default;}\n    .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: default;color:#136388;pointer-events: auto;cursor: default;}\n    table[class=devicewidth] {width: 440px!important;text-align:center!important;}\n    table[class=devicewidthmob] {width: 416px!important;text-align:center!important;}\n    table[class=devicewidthinner] {width: 416px!important;text-align:center!important;}\n    img[class=banner] {width: 440px!important;auto!important;}\n    img[class=col2img] {width: 440px!important;height:auto!important;}\n    table[class=\"cols3inner\"] {width: 100px!important;}\n    table[class=\"col3img\"] {width: 131px!important;}\n    img[class=\"col3img\"] {width: 131px!important;height: auto!important;}\n    table[class=\"removeMobile\"]{width:10px!important;}\n    img[class=\"blog\"] {width: 440px!important;height: auto!important;}\n    }\n\n    /*IPHONE STYLES*/\n    @media only screen and (max-width: 480px) {\n    a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color: #136388;pointer-events: none;cursor: default;}\n    .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: none;color:#136388;pointer-events: auto;cursor: default;}\n\n    table[class=devicewidth] {width: 280px!important;text-align:center!important;}\n    table[class=devicewidthmob] {width: 260px!important;text-align:center!important;}\n    table[class=devicewidthinner] {width: 260px!important;text-align:center!important;}\n    img[class=banner] {width: 280px!important;height:100px!important;}\n    img[class=col2img] {width: 280px!important;height:auto!important;}\n    table[class=\"cols3inner\"] {width: 260px!important;}\n    img[class=\"col3img\"] {width: 280px!important;height: auto!important;}\n    table[class=\"col3img\"] {width: 280px!important;}\n    img[class=\"blog\"] {width: 280px!important;auto!important;}\n    td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n    td[class=\"padding-right15\"]{padding-right:15px !important;}\n    }\n\n    @media only screen and (max-device-width: 800px)\n    {td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n    td[class=\"padding-right15\"]{padding-right:15px !important;}}\n    @media only screen and (max-device-width: 769px) {\n    .devicewidthmob {font-size:16px;}\n    }\n\n    @media only screen and (max-width: 640px) {\n    .desktop-spacer {display:none !important;}\n }\n  {/literal}\n  </style>\n\n<body>\n  <!-- Start of preheader --><!-- Start of preheader -->\n  <table bgcolor=\"#89c66b\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td height=\"20\" width=\"100%\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"310\">\n  										<tbody>\n  											<tr>\n  												<td align=\"left\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; line-height:120%; color: #f8f8f8;padding-left:15px; padding-bottom:5px;\" valign=\"middle\">Organization or Program Name Here</td>\n  											</tr>\n  										</tbody>\n  									</table>\n\n  									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"emhide\" width=\"310\">\n  										<tbody>\n  											<tr>\n                          <td align=\"right\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px;color: #f8f8f8;padding-right:15px; text-align:right;\" valign=\"middle\">Month and Year</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td height=\"20\" width=\"100%\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- End of main-banner-->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td height=\"20\" width=\"100%\">\n  									<table align=\"center\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"93%\">\n  										<tbody>\n  											<tr>\n                          <td rowspan=\"2\" style=\"padding-top:10px; padding-bottom:10px;\" width=\"38%\"><img src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/civicrm-logo-transparent.png\" alt=\"Replace with your own logo\" width=\"220\" border=\"0\" /></td>\n  												<td align=\"right\" width=\"62%\">\n  												<h6 class=\"collapse\">&nbsp;</h6>\n  												</td>\n  											</tr>\n  											<tr>\n  												<td align=\"right\">\n  												<h5 style=\"font-family: Gill Sans, Gill Sans MT, Myriad Pro, DejaVu Sans Condensed, Helvetica, Arial, sans-serif; color:#136388;\">&nbsp;</h5>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody><!-- /Spacing -->\n  														<tr>\n  															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 23px; color:#f8f8f8; text-align:left; line-height: 32px; padding:5px 15px; background-color:#136388;\">Headline Here</td>\n  														</tr>\n  														<!-- Spacing -->\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- hero story -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"auto\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/650x396.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /hero image --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px; color:#89c66b;\"><a href=\"#\" style=\"color:#89c66b;\">Your Heading Here</a></td>\n  																	</tr>\n  																	<!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing --><!-- content -->\n  																	<tr>\n  																		<td style=\"padding:0 15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #7a6e67; text-align:left; line-height: 26px; padding-bottom:10px;\">{contact.email_greeting},																		</p>\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #7a6e67; text-align:left; line-height: 26px; padding-bottom:10px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!</span></p>\n  																		</td>\n  																	</tr>\n  																	<tr>\n  																		<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px; padding-left:15px;\"><a href=\"#\" style=\"color:#136388;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"read more\">Read More</a></td>\n  																	</tr>\n  																	<!-- /button --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  																	</tr>\n  																	<!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- end of hero image and story --><!-- story 1 -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody>\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- image -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"250\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/banner-image-650-250.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /image --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px;\"><a href=\"#\" style=\"color:#89c66b;\">Your Heading  Here</a></td>\n  																	</tr>\n  																	<!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing --><!-- content -->\n  																	<tr>\n  																		<td style=\"padding:0 15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #7a6e67; text-align:left; line-height: 26px; padding-bottom:10px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna </p>\n  																		</td>\n  																	</tr>\n  																	<tr>\n  																		<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px; padding-left:15px;\"><a href=\"#\" style=\"color:#136388;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"read more\">Read More</a></td>\n  																	</tr>\n  																	<!-- /button --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  																	</tr>\n  																	<!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- /story 2--><!-- banner1 -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#89c66b\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody>\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- image -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"auto\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/banner-image-650-250.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /image --><!-- content --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"padding:15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #f0f0f0; text-align:left; line-height: 26px; padding-bottom:10px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna </p>\n  																		</td>\n  																	</tr>\n  																	<!-- /button --><!-- white button -->\n  																	<!-- /button --><!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- /banner 1--><!-- banner 2 -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#136388\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody>\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- image -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"auto\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/banner-image-650-250.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /image --><!-- content --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"padding: 15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #f0f0f0; text-align:left; line-height: 26px; padding-bottom:10px;\">Remember to link the facebook and twitter links below to your pages!</p>\n  																		</td>\n  																	</tr>\n  																	<!-- /button --><!-- white button -->\n  																	<tr>\n  																		<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px; padding-bottom:10px; padding-left:15px;\"><a href=\"#\" style=\"color:#ffffff;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"read more\">Read More</a></td>\n  																	</tr>\n  																	<!-- /button --><!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- /banner2 --><!-- footer -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"footer\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#89c66b\"  border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td><!-- logo -->\n  									<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"250\">\n  										<tbody>\n  											<tr>\n  												<td width=\"20\">&nbsp;</td>\n  												<td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px;\"><a href=\"{action.unsubscribeUrl}\" style=\"color: #f0f0f0; \">Unsubscribe | </a><a href=\"{action.subscribeUrl}\"  style=\"color: #f0f0f0;\">Subscribe |</a> <a href=\"{action.optOutUrl}\" style=\"color: #f0f0f0;\">Opt out</a></span></td>\n  											</tr>\n  											<tr>\n  												<td width=\"20\">&nbsp;</td>\n  												<td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px; color: #f0f0f0;\">{domain.address}</span></td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									<!-- end of logo --><!-- start of social icons -->\n\n  									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\" vaalign=\"middle\" width=\"60\">\n  										<tbody>\n  											<tr>\n  												<td align=\"left\" height=\"22\" width=\"22\">\n  												<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/facebook.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>\n  												</td>\n  												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"10\">&nbsp;</td>\n  												<td align=\"right\" height=\"22\" width=\"22\">\n  												<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/twitter.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>\n  												</td>\n  												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"20\">&nbsp;</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									<!-- end of social icons --></td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n\n</body>\n</html>\n',1,NULL,NULL,1,0,0,NULL),(67,'Sample Responsive Design Newsletter - Two Column Template','Sample Responsive Design Newsletter - Two Column','','<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" />\n  <meta content=\"width=device-width, initial-scale=1.0\" name=\"viewport\" />\n  <title></title>\n  <style type=\"text/css\">\n     {literal}\n     img {height: auto !important;}\n     /* Client-specific Styles */\n     #outlook a {padding:0;} /* Force Outlook to provide a \"view in browser\" menu link. */\n     body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}\n\n     /* Prevent Webkit and Windows Mobile platforms from changing default font sizes, while not breaking desktop design. */\n     .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */\n     .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing. */\n     #backgroundTable {margin:0; padding:0; width:100% !important; line-height: 100% !important;}\n     img {outline:none; text-decoration:none;border:none; -ms-interpolation-mode: bicubic;}\n     a img {border:none;}\n     .image_fix {display:block;}\n     p {margin: 0px 0px !important;}\n     table td {border-collapse: collapse;}\n     table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }\n     a {/*color: #33b9ff;*/text-decoration: none;text-decoration:none!important;}\n\n\n     /*STYLES*/\n     table[class=full] { width: 100%; clear: both; }\n\n     /*IPAD STYLES*/\n     @media only screen and (max-width: 640px) {\n     a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color: #0a8cce;pointer-events: none;cursor: default;}\n     .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: default;color: #0a8cce !important;pointer-events: auto;cursor: default;}\n     table[class=devicewidth] {width: 440px!important;text-align:center!important;}\n     table[class=devicewidthmob] {width: 414px!important;text-align:center!important;}\n     table[class=devicewidthinner] {width: 414px!important;text-align:center!important;}\n     img[class=banner] {width: 440px!important;auto!important;}\n     img[class=col2img] {width: 440px!important;height:auto!important;}\n     table[class=\"cols3inner\"] {width: 100px!important;}\n     table[class=\"col3img\"] {width: 131px!important;}\n     img[class=\"col3img\"] {width: 131px!important;height: auto!important;}\n     table[class=\"removeMobile\"]{width:10px!important;}\n     img[class=\"blog\"] {width: 440px!important;height: auto!important;}\n     }\n\n     /*IPHONE STYLES*/\n     @media only screen and (max-width: 480px) {\n     a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color: #0a8cce;pointer-events: none;cursor: default;}\n     .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: default;color: #0a8cce !important; pointer-events: auto;cursor: default;}\n     table[class=devicewidth] {width: 280px!important;text-align:center!important;}\n     table[class=devicewidthmob] {width: 260px!important;text-align:center!important;}\n     table[class=devicewidthinner] {width: 260px!important;text-align:center!important;}\n     img[class=banner] {width: 280px!important;height:100px!important;}\n     img[class=col2img] {width: 280px!important;height:auto!important;}\n     table[class=\"cols3inner\"] {width: 260px!important;}\n     img[class=\"col3img\"] {width: 280px!important;height: auto!important;}\n     table[class=\"col3img\"] {width: 280px!important;}\n     img[class=\"blog\"] {width: 280px!important;auto!important;}\n     td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n     td[class=\"padding-right15\"]{padding-right:15px !important;}\n     }\n\n     @media only screen and (max-device-width: 800px)\n     {td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n     td[class=\"padding-right15\"]{padding-right:15px !important;}}\n     @media only screen and (max-device-width: 769px) {.devicewidthmob {font-size:14px;}}\n\n     @media only screen and (max-width: 640px) {.desktop-spacer {display:none !important;}\n	   }\n     {/literal}\n  </style>\n  <body>\n    <!-- Start of preheader --><!-- Start of preheader -->\n    <table bgcolor=\"#0B4151\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" width=\"100%\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"360\">\n    										<tbody>\n    											<tr>\n    												<td align=\"left\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height:120%; color: #f8f8f8;padding-left:15px;\" valign=\"middle\">Organization or Program Name Here</td>\n    											</tr>\n    										</tbody>\n    									</table>\n\n    									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"emhide\" width=\"320\">\n    										<tbody>\n    											<tr>\n    												<td align=\"right\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px;color: #f8f8f8;padding-right:15px;\" valign=\"middle\">Month Year</td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" width=\"100%\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- End of preheader --><!-- start of logo -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" width=\"100%\">\n    									<table align=\"center\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"93%\">\n    										<tbody>\n    											<tr>\n                             <td rowspan=\"2\" width=\"330\"><a href=\"#\"> <div class=\"imgpop\"><img src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/civicrm-logo-transparent.png\" alt=\"Replace with your own logo\" width=\"220\" border=\"0\" style=\"display:block;\"/></div></a></td>\n                            <td align=\"right\" >\n    												<h6 class=\"collapse\">&nbsp;</h6>\n    												</td>\n    											</tr>\n    											<tr>\n    												<td align=\"right\">\n\n    												</td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- end of logo --> <!-- hero story 1 -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"101%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#f8f8f8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody>\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    										<tbody>\n    											<tr>\n    												<td width=\"100%\">\n    												<table align=\"center\" bgcolor=\"#f8f8f8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    													<tbody><!-- /Spacing -->\n    														<tr>\n    															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457\">Hero Story Heading</td>\n    														</tr>\n    														<!-- Spacing -->\n    														<tr>\n    															<td>\n    															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"700\">\n    																<tbody><!-- image -->\n    																	<tr>\n    																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n    																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"396\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/700x396.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"700\" /></a></div>\n    																		</td>\n    																	</tr>\n    																	<!-- /image --><!-- Spacing -->\n    																	<tr>\n    																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    																	</tr>\n    																	<!-- /Spacing --><!-- hero story -->\n    																	<tr>\n    																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Subheading Here</a></td>\n    																	</tr>\n    																	<!-- Spacing -->\n    																	<tr>\n    																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    																	</tr><!-- /Spacing -->\n    																	<tr>\n    																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 26px; padding:0 15px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!</span></td>\n    																	</tr>\n\n    <!-- Spacing -->\n    																	<tr>\n    																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    																	</tr><!-- /Spacing -->\n\n              <!-- /Spacing --><!-- /hero story -->\n\n    																	<!-- Spacing -->                                                            <!-- Spacing -->\n\n\n\n    																	<!-- Spacing --><!-- end of content -->\n    																</tbody>\n    															</table>\n    															</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												</td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Section Heading -->\n    								<tr>\n    									<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457\">Section Heading Here</td>\n    								</tr>\n    								<!-- /Section Heading -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /hero story 1 --><!-- story one -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td class=\"desktop-spacer\" height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"CiviCRM helps keep the “City Beautiful” Movement”going strong\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"CiviCRM helps keep the “City Beautiful” Movement”going strong\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story one -->\n    <!-- story two -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#076187\" height=\"0\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing --><!-- Spacing -->\n    								<tr>\n    									<td class=\"desktop-spacer\" height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"How CiviCRM will take Tribodar Eco Learning Center to another level\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"How CiviCRM will take Tribodar Eco Learning Center to another level\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story two --><!-- story three -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#076187\" height=\"0\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing --><!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" class=\"desktop-spacer\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story three -->\n\n\n\n\n\n    <!-- story four -->\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody>\n                                <!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#076187\" height=\"0\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n                                <!-- Spacing -->\n    								<tr>\n    									<td class=\"desktop-spacer\" height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"Google Summer of Code\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"Google Summer of Code\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n                       <td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n                    </tr>\n                    <!-- /Spacing -->\n                    <tr>\n                      <td style=\"padding: 15px;\">\n                      <p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color:#076187; text-align:left; line-height: 26px; padding-bottom:10px;\">Remember to link the facebook and twitter links below to your pages!</p>\n                      </td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story four -->\n\n    <!-- footer -->\n\n    <!-- End of footer --><!-- Start of postfooter -->\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"footer\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n            <tbody>\n              <tr>\n                <td width=\"100%\">\n                  <table align=\"center\" bgcolor=\"#89c66b\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				        <tbody><!-- Spacing -->\n    					        <tr>\n                        <td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    					        </tr>\n    					        <!-- Spacing -->\n    					        <tr>\n                        <td><!-- logo -->\n                        <table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"250\">\n            							<tbody>\n            								<tr>\n                               <td width=\"20\">&nbsp;</td>\n                              <td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px;\"><a href=\"{action.unsubscribeUrl}\" style=\"color: #f0f0f0;\">Unsubscribe | </a><a href=\"{action.subscribeUrl}\" style=\"color: #f0f0f0;\">Subscribe |</a> <a href=\"{action.optOutUrl}\" style=\"color: #f0f0f0;\">Opt out</a></span></td>\n                            </tr>\n      											<tr>\n      												<td width=\"20\">&nbsp;</td>\n      												<td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px; color: #f0f0f0;\">{domain.address}</span></td>\n      											</tr>\n                          </tbody>\n                        </table>\n                        <!-- end of logo --><!-- start of social icons -->\n      									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\" vaalign=\"middle\" width=\"60\">\n      										<tbody>\n      											<tr>\n      												<td align=\"left\" height=\"22\" width=\"22\">\n                                <div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/facebook.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>      											  </td>\n      												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"10\">&nbsp;</td>\n      												<td align=\"right\" height=\"22\" width=\"22\">\n      												<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/twitter.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>\n      												</td>\n      												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"20\">&nbsp;</td>\n      											</tr>\n      										</tbody>\n      									</table>\n    									<!-- end of social icons --></td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#80C457\" height=\"10\" width=\"100%\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- End of footer -->\n  </body>\n</html>\n',1,NULL,NULL,1,0,0,NULL);
+INSERT INTO `civicrm_msg_template` (`id`, `msg_title`, `msg_subject`, `msg_text`, `msg_html`, `is_active`, `workflow_id`, `workflow_name`, `is_default`, `is_reserved`, `is_sms`, `pdf_format_id`) VALUES (1,'Cases - Send Copy of an Activity','{if $idHash}[case #{$idHash}]{/if} {$activitySubject}\n','===========================================================\n{ts}Activity Summary{/ts} - {$activityTypeName}\n===========================================================\n{if $isCaseActivity}\n{ts}Your Case Role(s){/ts} : {$contact.role}\n{if $manageCaseURL}\n{ts}Manage Case{/ts} : {$manageCaseURL}\n{/if}\n{/if}\n\n{if $editActURL}\n{ts}Edit activity{/ts} : {$editActURL}\n{/if}\n{if $viewActURL}\n{ts}View activity{/ts} : {$viewActURL}\n{/if}\n\n{foreach from=$activity.fields item=field}\n{if $field.type eq \'Date\'}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value}\n{/if}\n{/foreach}\n\n{foreach from=$activity.customGroups key=customGroupName item=customGroup}\n==========================================================\n{$customGroupName}\n==========================================================\n{foreach from=$customGroup item=field}\n{if $field.type eq \'Date\'}\n{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label} : {$field.value}\n{/if}\n{/foreach}\n\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Activity Summary{/ts} - {$activityTypeName}\n      </th>\n     </tr>\n     {if $isCaseActivity}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Your Case Role(s){/ts}\n       </td>\n       <td {$valueStyle}>\n        {$contact.role}\n       </td>\n      </tr>\n      {if $manageCaseURL}\n       <tr>\n       <td colspan=\"2\" {$valueStyle}>\n     <a href=\"{$manageCaseURL}\" title=\"{ts}Manage Case{/ts}\">{ts}Manage Case{/ts}</a>\n       </td>\n       </tr>\n      {/if}\n     {/if}\n     {if $editActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$editActURL}\" title=\"{ts}Edit activity{/ts}\">{ts}Edit activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {if $viewActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$viewActURL}\" title=\"{ts}View activity{/ts}\">{ts}View activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {foreach from=$activity.fields item=field}\n      <tr>\n       <td {$labelStyle}>\n        {$field.label}{if $field.category}({$field.category}){/if}\n       </td>\n       <td {$valueStyle}>\n        {if $field.type eq \'Date\'}\n         {$field.value|crmDate:$config->dateformatDatetime}\n        {else}\n         {$field.value}\n        {/if}\n       </td>\n      </tr>\n     {/foreach}\n\n     {foreach from=$activity.customGroups key=customGroupName item=customGroup}\n      <tr>\n       <th {$headerStyle}>\n        {$customGroupName}\n       </th>\n      </tr>\n      {foreach from=$customGroup item=field}\n       <tr>\n        <td {$labelStyle}>\n         {$field.label}\n        </td>\n        <td {$valueStyle}>\n         {if $field.type eq \'Date\'}\n          {$field.value|crmDate:$config->dateformatDatetime}\n         {else}\n          {$field.value}\n         {/if}\n        </td>\n       </tr>\n      {/foreach}\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,820,'case_activity',1,0,0,NULL),(2,'Cases - Send Copy of an Activity','{if $idHash}[case #{$idHash}]{/if} {$activitySubject}\n','===========================================================\n{ts}Activity Summary{/ts} - {$activityTypeName}\n===========================================================\n{if $isCaseActivity}\n{ts}Your Case Role(s){/ts} : {$contact.role}\n{if $manageCaseURL}\n{ts}Manage Case{/ts} : {$manageCaseURL}\n{/if}\n{/if}\n\n{if $editActURL}\n{ts}Edit activity{/ts} : {$editActURL}\n{/if}\n{if $viewActURL}\n{ts}View activity{/ts} : {$viewActURL}\n{/if}\n\n{foreach from=$activity.fields item=field}\n{if $field.type eq \'Date\'}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label}{if $field.category}({$field.category}){/if} : {$field.value}\n{/if}\n{/foreach}\n\n{foreach from=$activity.customGroups key=customGroupName item=customGroup}\n==========================================================\n{$customGroupName}\n==========================================================\n{foreach from=$customGroup item=field}\n{if $field.type eq \'Date\'}\n{$field.label} : {$field.value|crmDate:$config->dateformatDatetime}\n{else}\n{$field.label} : {$field.value}\n{/if}\n{/foreach}\n\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Activity Summary{/ts} - {$activityTypeName}\n      </th>\n     </tr>\n     {if $isCaseActivity}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Your Case Role(s){/ts}\n       </td>\n       <td {$valueStyle}>\n        {$contact.role}\n       </td>\n      </tr>\n      {if $manageCaseURL}\n       <tr>\n       <td colspan=\"2\" {$valueStyle}>\n     <a href=\"{$manageCaseURL}\" title=\"{ts}Manage Case{/ts}\">{ts}Manage Case{/ts}</a>\n       </td>\n       </tr>\n      {/if}\n     {/if}\n     {if $editActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$editActURL}\" title=\"{ts}Edit activity{/ts}\">{ts}Edit activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {if $viewActURL}\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n   <a href=\"{$viewActURL}\" title=\"{ts}View activity{/ts}\">{ts}View activity{/ts}</a>\n       </td>\n     </tr>\n     {/if}\n     {foreach from=$activity.fields item=field}\n      <tr>\n       <td {$labelStyle}>\n        {$field.label}{if $field.category}({$field.category}){/if}\n       </td>\n       <td {$valueStyle}>\n        {if $field.type eq \'Date\'}\n         {$field.value|crmDate:$config->dateformatDatetime}\n        {else}\n         {$field.value}\n        {/if}\n       </td>\n      </tr>\n     {/foreach}\n\n     {foreach from=$activity.customGroups key=customGroupName item=customGroup}\n      <tr>\n       <th {$headerStyle}>\n        {$customGroupName}\n       </th>\n      </tr>\n      {foreach from=$customGroup item=field}\n       <tr>\n        <td {$labelStyle}>\n         {$field.label}\n        </td>\n        <td {$valueStyle}>\n         {if $field.type eq \'Date\'}\n          {$field.value|crmDate:$config->dateformatDatetime}\n         {else}\n          {$field.value}\n         {/if}\n        </td>\n       </tr>\n      {/foreach}\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,820,'case_activity',0,1,0,NULL),(3,'Contributions - Duplicate Organization Alert','{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}\n','{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}\n{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}\n\n{ts}Organization Name{/ts}: {$onBehalfName}\n{ts}Organization Email{/ts}: {$onBehalfEmail}\n{ts}Organization Contact ID{/ts}: {$onBehalfID}\n\n{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}\n\n{if $receiptMessage}\n###########################################################\n{ts}Copy of Contribution Receipt{/ts}\n\n###########################################################\n{$receiptMessage}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}</p>\n    <p>{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Email{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfEmail}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Contact ID{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfID}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <p>{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}</p>\n   </td>\n  </tr>\n  {if $receiptMessage}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Copy of Contribution Receipt{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {* FIXME: the below is most probably not HTML-ised *}\n        {$receiptMessage}\n       </td>\n      </tr>\n     </table>\n    </td>\n   </tr>\n  {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,821,'contribution_dupalert',1,0,0,NULL),(4,'Contributions - Duplicate Organization Alert','{ts}CiviContribute Alert: Possible Duplicate Contact Record{/ts} - {contact.display_name}\n','{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}\n{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}\n\n{ts}Organization Name{/ts}: {$onBehalfName}\n{ts}Organization Email{/ts}: {$onBehalfEmail}\n{ts}Organization Contact ID{/ts}: {$onBehalfID}\n\n{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}\n\n{if $receiptMessage}\n###########################################################\n{ts}Copy of Contribution Receipt{/ts}\n\n###########################################################\n{$receiptMessage}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{ts}A contribution / membership signup was made on behalf of the organization listed below.{/ts}</p>\n    <p>{ts}The information provided matched multiple existing database records based on the configured Duplicate Matching Rules for your site.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Email{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfEmail}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Organization Contact ID{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$onBehalfID}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <p>{ts}If you think this may be a duplicate contact which should be merged with an existing record - Go to \"Contacts >> Find and Merge Duplicate Contacts\". Use the strict rule for Organizations to find the potential duplicates and merge them if appropriate.{/ts}</p>\n   </td>\n  </tr>\n  {if $receiptMessage}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Copy of Contribution Receipt{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {* FIXME: the below is most probably not HTML-ised *}\n        {$receiptMessage}\n       </td>\n      </tr>\n     </table>\n    </td>\n   </tr>\n  {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,821,'contribution_dupalert',0,1,0,NULL),(5,'Contributions - Receipt (off-line)','{ts}Contribution Receipt{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text}\n{$formValues.receipt_text}\n{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{ts}Contributor{/ts}: {contact.display_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $getTaxDetails}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $getTaxDetails} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $getTaxDetails}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"} {$line.tax_rate|string_format:\"%.2f\"} %   {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if} {/if}   {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $getTaxDetails && $dataArray}\n{ts}Amount before Tax{/ts} : {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset ||  $priceset == 0 || $value != \'\'}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}% : {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm} : {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n{ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $receipt_date}\n{ts}Receipt Date{/ts}: {$receipt_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy and !$formValues.hidden_CreditCard}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{if $formValues.trxn_id}\n{ts}Transaction ID{/ts}: {$formValues.trxn_id}\n{/if}\n\n{if $ccContribution}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $formValues.product_name}\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$formValues.product_name}\n{if $formValues.product_option}\n{ts}Option{/ts}: {$formValues.product_option}\n{/if}\n{if $formValues.product_sku}\n{ts}SKU{/ts}: {$formValues.product_sku}\n{/if}\n{if $fulfilled_date}\n{ts}Sent{/ts}: {$fulfilled_date|crmDate}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text}\n     <p>{$formValues.receipt_text|htmlize}</p>\n    {else}\n     <p>{ts}Below you will find a receipt for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Contribution Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contributor Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {contact.display_name}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Financial Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.contributionType_name}\n      </td>\n     </tr>\n\n     {if $lineItem and !$is_quick_config}\n      {foreach from=$lineItem item=value key=priceset}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $getTaxDetails}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n           {/if}\n           <th>{ts}Total{/ts}</th>\n          </tr>\n          {foreach from=$value item=line}\n           <tr>\n            <td>\n            {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:$currency}\n            </td>\n            {if $getTaxDetails}\n              <td>\n                {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                  {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                  {$line.tax_amount|crmMoney:$currency}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total+$line.tax_amount|crmMoney:$currency}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n      {/foreach}\n     {/if}\n     {if $getTaxDetails && $dataArray}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n       </tr>\n\n      {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset ||  $priceset == 0 || $value != \'\'}\n          <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {else}\n          <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.total_amount|crmMoney:$currency}\n      </td>\n     </tr>\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date Received{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n      {if $receipt_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receipt_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $formValues.paidBy and !$formValues.hidden_CreditCard}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.paidBy}\n       </td>\n      </tr>\n      {if $formValues.check_number}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $formValues.trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $ccContribution}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n       </td>\n      </tr>\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $formValues.product_name}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$formValues.product_name}\n       </td>\n      </tr>\n      {if $formValues.product_option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_option}\n        </td>\n       </tr>\n      {/if}\n      {if $formValues.product_sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_sku}\n        </td>\n       </tr>\n      {/if}\n      {if $fulfilled_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Sent{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$fulfilled_date|truncate:10:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,822,'contribution_offline_receipt',1,0,0,NULL),(6,'Contributions - Receipt (off-line)','{ts}Contribution Receipt{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text}\n{$formValues.receipt_text}\n{else}{ts}Below you will find a receipt for this contribution.{/ts}{/if}\n\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{ts}Contributor{/ts}: {contact.display_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $getTaxDetails}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $getTaxDetails} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $getTaxDetails}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"} {$line.tax_rate|string_format:\"%.2f\"} %   {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if} {/if}   {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $getTaxDetails && $dataArray}\n{ts}Amount before Tax{/ts} : {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset ||  $priceset == 0 || $value != \'\'}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}% : {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm} : {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n{ts}Total Tax Amount{/ts} : {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{ts}Total Amount{/ts} : {$formValues.total_amount|crmMoney:$currency}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $receipt_date}\n{ts}Receipt Date{/ts}: {$receipt_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy and !$formValues.hidden_CreditCard}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{if $formValues.trxn_id}\n{ts}Transaction ID{/ts}: {$formValues.trxn_id}\n{/if}\n\n{if $ccContribution}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $formValues.product_name}\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$formValues.product_name}\n{if $formValues.product_option}\n{ts}Option{/ts}: {$formValues.product_option}\n{/if}\n{if $formValues.product_sku}\n{ts}SKU{/ts}: {$formValues.product_sku}\n{/if}\n{if $fulfilled_date}\n{ts}Sent{/ts}: {$fulfilled_date|crmDate}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text}\n     <p>{$formValues.receipt_text|htmlize}</p>\n    {else}\n     <p>{ts}Below you will find a receipt for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Contribution Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contributor Name{/ts}\n      </td>\n      <td {$valueStyle}>\n       {contact.display_name}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Financial Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.contributionType_name}\n      </td>\n     </tr>\n\n     {if $lineItem and !$is_quick_config}\n      {foreach from=$lineItem item=value key=priceset}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n          <tr>\n           <th>{ts}Item{/ts}</th>\n           <th>{ts}Qty{/ts}</th>\n           <th>{ts}Each{/ts}</th>\n           {if $getTaxDetails}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n           {/if}\n           <th>{ts}Total{/ts}</th>\n          </tr>\n          {foreach from=$value item=line}\n           <tr>\n            <td>\n            {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n            </td>\n            <td>\n             {$line.qty}\n            </td>\n            <td>\n             {$line.unit_price|crmMoney:$currency}\n            </td>\n            {if $getTaxDetails}\n              <td>\n                {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                  {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                  {$line.tax_amount|crmMoney:$currency}\n                </td>\n              {else}\n                <td></td>\n                <td></td>\n              {/if}\n            {/if}\n            <td>\n             {$line.line_total+$line.tax_amount|crmMoney:$currency}\n            </td>\n           </tr>\n          {/foreach}\n         </table>\n        </td>\n       </tr>\n      {/foreach}\n     {/if}\n     {if $getTaxDetails && $dataArray}\n       <tr>\n         <td {$labelStyle}>\n           {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n           {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n       </tr>\n\n      {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset ||  $priceset == 0 || $value != \'\'}\n          <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {else}\n          <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n          <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if isset($totalTaxAmount) && $totalTaxAmount !== \'null\'}\n      <tr>\n        <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n        </td>\n      </tr>\n     {/if}\n\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$formValues.total_amount|crmMoney:$currency}\n      </td>\n     </tr>\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date Received{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n      {if $receipt_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Receipt Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receipt_date|truncate:10:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $formValues.paidBy and !$formValues.hidden_CreditCard}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Paid By{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.paidBy}\n       </td>\n      </tr>\n      {if $formValues.check_number}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.check_number}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $formValues.trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction ID{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$formValues.trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $ccContribution}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n       </td>\n      </tr>\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $formValues.product_name}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$formValues.product_name}\n       </td>\n      </tr>\n      {if $formValues.product_option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_option}\n        </td>\n       </tr>\n      {/if}\n      {if $formValues.product_sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.product_sku}\n        </td>\n       </tr>\n      {/if}\n      {if $fulfilled_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Sent{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$fulfilled_date|truncate:10:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,822,'contribution_offline_receipt',0,1,0,NULL),(7,'Contributions - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $amount}\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{if $lineItem and $priceSetID and !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney:$currency}\n{else}\n{ts}Amount{/ts}: {$amount|crmMoney:$currency} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{/if}\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n\n{if $is_recur}\n{ts}This is a recurring contribution.{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts}You can cancel future contributions at:{/ts}\n\n{$cancelSubscriptionUrl}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts}You can update billing details for this recurring contribution at:{/ts}\n\n{$updateSubscriptionBillingUrl}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts}You can update recurring contribution amount or change the number of installments for this recurring contribution at:{/ts}\n\n{$updateSubscriptionUrl}\n\n{/if}\n{/if}\n\n{if $honor_block_is_active}\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n{elseif $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or Email*}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n       </th>\n      </tr>\n\n      {if $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            {if $dataArray}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n            {/if}\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney:$currency}\n             </td>\n             {if $getTaxDetails}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney:$currency}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n             {/if}\n             <td>\n              {$line.line_total+$line.tax_amount|crmMoney:$currency}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency}\n        </td>\n       </tr>\n\n      {else}\n\n      {if $totalTaxAmount}\n         <tr>\n           <td {$labelStyle}>\n             {ts}Total Tax Amount{/ts}\n           </td>\n           <td {$valueStyle}>\n             {$totalTaxAmount|crmMoney:$currency}\n           </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n     {/if}\n\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if $is_recur}\n      <tr>\n        <td  colspan=\"2\" {$labelStyle}>\n          {ts}This is a recurring contribution.{/ts}\n          {if $cancelSubscriptionUrl}\n            {ts 1=$cancelSubscriptionUrl}You can cancel future contributions by <a href=\"%1\">visiting this web page</a>.{/ts}\n          {/if}\n        </td>\n      </tr>\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n    {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n      {elseif $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShare}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contributionPageId`\" a=true fe=1 h=1}{/capture}\n            {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl}\n        </td>\n      </tr>\n     {/if}\n\n     {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n     {elseif $email}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Registered Email{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$email}\n        </td>\n       </tr>\n     {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,823,'contribution_online_receipt',1,0,0,NULL),(8,'Contributions - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $amount}\n===========================================================\n{ts}Contribution Information{/ts}\n\n===========================================================\n{if $lineItem and $priceSetID and !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray}{$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney:$currency}\n{else}\n{ts}Amount{/ts}: {$amount|crmMoney:$currency} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{/if}\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n\n{if $is_recur}\n{ts}This is a recurring contribution.{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts}You can cancel future contributions at:{/ts}\n\n{$cancelSubscriptionUrl}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts}You can update billing details for this recurring contribution at:{/ts}\n\n{$updateSubscriptionBillingUrl}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts}You can update recurring contribution amount or change the number of installments for this recurring contribution at:{/ts}\n\n{$updateSubscriptionUrl}\n\n{/if}\n{/if}\n\n{if $honor_block_is_active}\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n{elseif $softCreditTypes and $softCredits}\n{foreach from=$softCreditTypes item=softCreditType key=n}\n===========================================================\n{$softCreditType}\n===========================================================\n{foreach from=$softCredits.$n item=value key=label}\n{$label}: {$value}\n{/foreach}\n{/foreach}\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or Email*}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Contribution Information{/ts}\n       </th>\n      </tr>\n\n      {if $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            {if $dataArray}\n             <th>{ts}Subtotal{/ts}</th>\n             <th>{ts}Tax Rate{/ts}</th>\n             <th>{ts}Tax Amount{/ts}</th>\n            {/if}\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney:$currency}\n             </td>\n             {if $getTaxDetails}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney:$currency}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney:$currency}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n             {/if}\n             <td>\n              {$line.line_total+$line.tax_amount|crmMoney:$currency}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount before Tax : {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency}\n        </td>\n       </tr>\n\n      {else}\n\n      {if $totalTaxAmount}\n         <tr>\n           <td {$labelStyle}>\n             {ts}Total Tax Amount{/ts}\n           </td>\n           <td {$valueStyle}>\n             {$totalTaxAmount|crmMoney:$currency}\n           </td>\n         </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney:$currency} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n     {/if}\n\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n    {if $is_recur}\n      <tr>\n        <td  colspan=\"2\" {$labelStyle}>\n          {ts}This is a recurring contribution.{/ts}\n          {if $cancelSubscriptionUrl}\n            {ts 1=$cancelSubscriptionUrl}You can cancel future contributions by <a href=\"%1\">visiting this web page</a>.{/ts}\n          {/if}\n        </td>\n      </tr>\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n        <tr>\n          <td colspan=\"2\" {$labelStyle}>\n            {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n    {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n      {elseif $softCreditTypes and $softCredits}\n      {foreach from=$softCreditTypes item=softCreditType key=n}\n       <tr>\n        <th {$headerStyle}>\n         {$softCreditType}\n        </th>\n       </tr>\n       {foreach from=$softCredits.$n item=value key=label}\n         <tr>\n          <td {$labelStyle}>\n           {$label}\n          </td>\n          <td {$valueStyle}>\n           {$value}\n          </td>\n         </tr>\n        {/foreach}\n       {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $isShare}\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n            {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contributionPageId`\" a=true fe=1 h=1}{/capture}\n            {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$contributionUrl title=$title pageURL=$contributionUrl}\n        </td>\n      </tr>\n     {/if}\n\n     {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n     {elseif $email}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Registered Email{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$email}\n        </td>\n       </tr>\n     {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney:$currency}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,823,'contribution_online_receipt',0,1,0,NULL),(9,'Contributions - Invoice','{if $title}\n  {if $component}\n    {if $component == \'event\'}\n      {ts 1=$title}Event Registration Invoice: %1{/ts}\n    {else}\n      {ts 1=$title}Contribution Invoice: %1{/ts}\n    {/if}\n  {/if}\n{else}\n  {ts}Invoice{/ts}\n{/if}\n - {contact.display_name}\n','{ts}Contribution Invoice{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n      <title></title>\n  </head>\n  <body>\n  <div style=\"padding-top:100px;margin-right:50px;border-style: none;\">\n    {if $config->empoweredBy}\n      <table style=\"margin-top:5px;padding-bottom:50px;\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n        </tr>\n      </table>\n    {/if}\n      <table style=\"font-family: Arial, Verdana, sans-serif;\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td width=\"30%\"><b><font size=\"4\" align=\"center\">{ts}INVOICE{/ts}</font></b></td>\n          <td width=\"50%\" valign=\"bottom\"><b><font size=\"1\" align=\"center\">{ts}Invoice Date:{/ts}</font></b></td>\n          <td valign=\"bottom\" style=\"white-space: nowrap\"><b><font size=\"1\" align=\"right\">{$domain_organization}</font></b></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$street_address} {$supplemental_address_1}</font></td>\n          <td><b><font size=\"1\" align=\"right\">{ts}Invoice Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>\n          <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{if $domain_country}{$domain_country}{/if}</font></td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\"> {$country}</font></td>\n          <td><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{if $domain_email}{$domain_email}{/if}</font> </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td valign=\"top\"><font size=\"1\" align=\"right\">{if $domain_phone}{$domain_phone}{/if}</font> </td>\n        </tr>\n      </table>\n\n             <table style=\"padding-top:75px;font-family: Arial, Verdana, sans-serif;\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n              <tr>\n                <th style=\"text-align:left;font-weight:bold;width:100%\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=taxpricevalue}\n                {if $smarty.foreach.taxpricevalue.index eq 0}\n                {else}\n                {/if}\n                <tr>\n                  <td style=\"text-align:left;nowrap\"><font size=\"1\">\n                    {if $value.html_type eq \'Text\'}\n                      {$value.label}\n                    {else}\n                      {$value.field_title} - {$value.label}\n                    {/if}\n                    {if $value.description}\n                      <div>{$value.description|truncate:30:\"...\"}</div>\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}-{/ts}</font></td>\n                  {/if}\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                    {if $priceset}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                    {elseif $priceset == 0}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm}TOTAL %1{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n              {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;white-space: nowrap\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n             {if $amountDue != 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n                    {if $contribution_status_id == $refundedStatusId}\n                      {ts}Amount Credited{/ts}\n                    {else}\n                      {ts}Amount Paid{/ts}\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$amountPaid|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\" ><b><font size=\"1\">{ts}AMOUNT DUE:{/ts}</font></b></td>\n                  <td style=\"text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"5\"></td>\n              </tr>\n              {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n                <tr>\n                  <td colspan=\"3\"><b><font size=\"1\" align=\"center\">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>\n                  <td colspan=\"2\"></td>\n                </tr>\n              {/if}\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n        <table style=\"margin-top:5px;\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\"></td>\n          </tr>\n        </table>\n\n        <table style=\"margin-top:5px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\" id=\"desc\">\n          <tr>\n            <td width=\"60%\"><b><font size=\"4\" align=\"right\">{ts}PAYMENT ADVICE{/ts}</font></b><br/><br/><font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {$domain_organization}<br />\n              {$domain_street_address} {$domain_supplemental_address_1}<br />\n              {$domain_supplemental_address_2} {$domain_state}<br />\n              {$domain_city} {$domain_postal_code}<br />\n              {$domain_country}<br />\n              {$domain_email}</div>\n              {$domain_phone}<br />\n             </font><br/><br/><font size=\"1\" align=\"left\">{$notes}</font>\n            </td>\n            <td width=\"40%\">\n              <table cellpadding=\"5\" cellspacing=\"0\"  width=\"100%\" border=\"0\">\n                <tr>\n                  <td width=\"100%\"><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                  <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{$display_name}</font></td>\n                </tr>\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Invoice Number:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n                </tr>\n                <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td></tr>\n                {if $is_pay_later == 1}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n                  </tr>\n                {else}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amountDue|crmMoney:$currency}</font></td>\n                  </tr>\n                {/if}\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Due Date:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$dueDate}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td>\n                </tr>\n              </table>\n      {/if}\n\n      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}\n      {if $config->empoweredBy}\n        <table style=\"margin-top:2px;padding-left:7px;page-break-before: always;\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n          </tr>\n        </table>\n      {/if}\n\n    <center>\n      <table style=\"font-family: Arial, Verdana, sans-serif\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\">\n        <tr>\n          <td style=\"padding-left:15px;\"><b><font size=\"4\" align=\"center\">{ts}CREDIT NOTE{/ts}</font></b></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Date:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{$domain_organization}</font></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$street_address}   {$supplemental_address_1}</font></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Credit Note Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\" style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_country}{$domain_country}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_email}{$domain_email}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_phone}{$domain_phone}{/if}\n           </font>\n          </td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:75px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n              <tr>\n                <th style=\"padding-right:28px;text-align:left;font-weight:bold;width:200px;\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=pricevalue}\n                {if $smarty.foreach.pricevalue.index eq 0}\n                  <tr><td colspan=\"5\"><hr size=\"3\" style=\"color:#000;\"></hr></td></tr>\n                {else}\n                  <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n                {/if}\n                <tr>\n                  <td style =\"text-align:left;\"  >\n                    <font size=\"1\">\n                      {if $value.html_type eq \'Text\'}\n                        {$value.label}\n                      {else}\n                        {$value.field_title} - {$value.label}\n                      {/if}\n                      {if $value.description}\n                        <div>{$value.description|truncate:30:\"...\"}</div>\n                      {/if}\n                   </font>\n                  </td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{ts 1=$taxTerm}No %1{/ts}</font></td>\n                  {/if}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  {if $priceset}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                  {elseif $priceset == 0}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n                {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td colspan=\"2\"><hr></hr></td>\n              </tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n              {if $is_pay_later == 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}LESS Credit to invoice(s){/ts}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts}REMAINING CREDIT{/ts}</font></b></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                  <td style=\"padding-left:28px;\"><font size=\"1\" align=\"right\"></font></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"3\"></td>\n              </tr>\n              <tr>\n                <td></td>\n                <td colspan=\"3\"></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      <table width=\"100%\" style=\"margin-top:5px;padding-right:45px;\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\" width=\"100%\"></td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:6px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td width=\"60%\"><font size=\"4\" align=\"right\"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div style=\"font-size:10px;max-width:300px;\">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>\n          <td width=\"40%\">\n            <table align=\"right\">\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$display_name}</font></td>\n              </tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Note#:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n              </tr>\n              <tr><td colspan=\"5\"style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Amount:{/ts}</font></td>\n                <td width=\'50px\'><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n    {/if}\n    </center>\n\n  </div>\n  </body>\n</html>\n',1,824,'contribution_invoice_receipt',1,0,0,NULL),(10,'Contributions - Invoice','{if $title}\n  {if $component}\n    {if $component == \'event\'}\n      {ts 1=$title}Event Registration Invoice: %1{/ts}\n    {else}\n      {ts 1=$title}Contribution Invoice: %1{/ts}\n    {/if}\n  {/if}\n{else}\n  {ts}Invoice{/ts}\n{/if}\n - {contact.display_name}\n','{ts}Contribution Invoice{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n      <title></title>\n  </head>\n  <body>\n  <div style=\"padding-top:100px;margin-right:50px;border-style: none;\">\n    {if $config->empoweredBy}\n      <table style=\"margin-top:5px;padding-bottom:50px;\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n        </tr>\n      </table>\n    {/if}\n      <table style=\"font-family: Arial, Verdana, sans-serif;\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n        <tr>\n          <td width=\"30%\"><b><font size=\"4\" align=\"center\">{ts}INVOICE{/ts}</font></b></td>\n          <td width=\"50%\" valign=\"bottom\"><b><font size=\"1\" align=\"center\">{ts}Invoice Date:{/ts}</font></b></td>\n          <td valign=\"bottom\" style=\"white-space: nowrap\"><b><font size=\"1\" align=\"right\">{$domain_organization}</font></b></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$street_address} {$supplemental_address_1}</font></td>\n          <td><b><font size=\"1\" align=\"right\">{ts}Invoice Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"center\">{$supplemental_address_2} {$stateProvinceAbbreviation}</font></td>\n          <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n          <td style=\"white-space: nowrap\">\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{if $domain_country}{$domain_country}{/if}</font></td>\n        </tr>\n        <tr>\n          <td><font size=\"1\" align=\"right\"> {$country}</font></td>\n          <td><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td valign=\"top\" style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{if $domain_email}{$domain_email}{/if}</font> </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td valign=\"top\"><font size=\"1\" align=\"right\">{if $domain_phone}{$domain_phone}{/if}</font> </td>\n        </tr>\n      </table>\n\n             <table style=\"padding-top:75px;font-family: Arial, Verdana, sans-serif;\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\">\n              <tr>\n                <th style=\"text-align:left;font-weight:bold;width:100%\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"text-align:right;font-weight:bold;white-space: nowrap\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=taxpricevalue}\n                {if $smarty.foreach.taxpricevalue.index eq 0}\n                {else}\n                {/if}\n                <tr>\n                  <td style=\"text-align:left;nowrap\"><font size=\"1\">\n                    {if $value.html_type eq \'Text\'}\n                      {$value.label}\n                    {else}\n                      {$value.field_title} - {$value.label}\n                    {/if}\n                    {if $value.description}\n                      <div>{$value.description|truncate:30:\"...\"}</div>\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}-{/ts}</font></td>\n                  {/if}\n                  <td style=\"text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                    {if $priceset}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                    {elseif $priceset == 0}\n                      <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">{ts 1=$taxTerm}TOTAL %1{/ts}</font></td>\n                      <td style=\"text-align:right\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n              {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"text-align:right;white-space: nowrap\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n             {if $amountDue != 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\"><font size=\"1\">\n                    {if $contribution_status_id == $refundedStatusId}\n                      {ts}Amount Credited{/ts}\n                    {else}\n                      {ts}Amount Paid{/ts}\n                    {/if}\n                   </font>\n                  </td>\n                  <td style=\"text-align:right;\"><font size=\"1\">{$amountPaid|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"text-align:right;white-space: nowrap\" ><b><font size=\"1\">{ts}AMOUNT DUE:{/ts}</font></b></td>\n                  <td style=\"text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"5\"></td>\n              </tr>\n              {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n                <tr>\n                  <td colspan=\"3\"><b><font size=\"1\" align=\"center\">{ts 1=$dueDate}DUE DATE: %1{/ts}</font></b></td>\n                  <td colspan=\"2\"></td>\n                </tr>\n              {/if}\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      {if $contribution_status_id == $pendingStatusId && $is_pay_later == 1}\n        <table style=\"margin-top:5px;\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\"></td>\n          </tr>\n        </table>\n\n        <table style=\"margin-top:5px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"0\" id=\"desc\">\n          <tr>\n            <td width=\"60%\"><b><font size=\"4\" align=\"right\">{ts}PAYMENT ADVICE{/ts}</font></b><br/><br/><font size=\"1\" align=\"left\"><b>{ts}To:{/ts}</b><div style=\"width:24em;word-wrap:break-word;\">\n              {$domain_organization}<br />\n              {$domain_street_address} {$domain_supplemental_address_1}<br />\n              {$domain_supplemental_address_2} {$domain_state}<br />\n              {$domain_city} {$domain_postal_code}<br />\n              {$domain_country}<br />\n              {$domain_email}</div>\n              {$domain_phone}<br />\n             </font><br/><br/><font size=\"1\" align=\"left\">{$notes}</font>\n            </td>\n            <td width=\"40%\">\n              <table cellpadding=\"5\" cellspacing=\"0\"  width=\"100%\" border=\"0\">\n                <tr>\n                  <td width=\"100%\"><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                  <td style=\"white-space: nowrap\"><font size=\"1\" align=\"right\">{$display_name}</font></td>\n                </tr>\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Invoice Number:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$invoice_number}</font></td>\n                </tr>\n                <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td></tr>\n                {if $is_pay_later == 1}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n                  </tr>\n                {else}\n                  <tr>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Amount Due:{/ts}</font></td>\n                    <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amountDue|crmMoney:$currency}</font></td>\n                  </tr>\n                {/if}\n                <tr>\n                  <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Due Date:{/ts}</font></td>\n                  <td><font size=\"1\" align=\"right\">{$dueDate}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></td>\n                </tr>\n              </table>\n      {/if}\n\n      {if $contribution_status_id == $refundedStatusId || $contribution_status_id == $cancelledStatusId}\n      {if $config->empoweredBy}\n        <table style=\"margin-top:2px;padding-left:7px;page-break-before: always;\">\n          <tr>\n            <td><img src=\"{$resourceBase}/i/civi99.png\" height=\"34px\" width=\"99px\"></td>\n          </tr>\n        </table>\n      {/if}\n\n    <center>\n      <table style=\"font-family: Arial, Verdana, sans-serif\" width=\"100%\" height=\"100\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\">\n        <tr>\n          <td style=\"padding-left:15px;\"><b><font size=\"4\" align=\"center\">{ts}CREDIT NOTE{/ts}</font></b></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Date:{/ts}</font></b></td>\n          <td><font size=\"1\" align=\"right\">{$domain_organization}</font></td>\n        </tr>\n        <tr>\n          {if $organization_name}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}  ({$organization_name})</font></td>\n          {else}\n            <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$display_name}</font></td>\n          {/if}\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$invoice_date}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_street_address }{$domain_street_address}{/if}\n              {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$street_address}   {$supplemental_address_1}</font></td>\n          <td style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Credit Note Number:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if}\n              {if $domain_state }{$domain_state}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"center\">{$supplemental_address_2}  {$stateProvinceAbbreviation}</font></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_city}{$domain_city}{/if}\n              {if $domain_postal_code }{$domain_postal_code}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td style=\"padding-left:17px;\"><font size=\"1\" align=\"right\">{$city}  {$postal_code}</font></td>\n          <td height=\"10\" style=\"padding-left:30px;\"><b><font size=\"1\" align=\"right\">{ts}Reference:{/ts}</font></b></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_country}{$domain_country}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td style=\"padding-left:30px;\"><font size=\"1\" align=\"right\">{$source}</font></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_email}{$domain_email}{/if}\n           </font>\n          </td>\n        </tr>\n        <tr>\n          <td></td>\n          <td></td>\n          <td>\n            <font size=\"1\" align=\"right\">\n              {if $domain_phone}{$domain_phone}{/if}\n           </font>\n          </td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:75px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td colspan=\"2\" {$valueStyle}>\n            <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n              <tr>\n                <th style=\"padding-right:28px;text-align:left;font-weight:bold;width:200px;\"><font size=\"1\">{ts}Description{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Quantity{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts}Unit Price{/ts}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{$taxTerm}</font></th>\n                <th style=\"padding-left:28px;text-align:right;font-weight:bold;\"><font size=\"1\">{ts 1=$defaultCurrency}Amount %1{/ts}</font></th>\n              </tr>\n              {foreach from=$lineItem item=value key=priceset name=pricevalue}\n                {if $smarty.foreach.pricevalue.index eq 0}\n                  <tr><td colspan=\"5\"><hr size=\"3\" style=\"color:#000;\"></hr></td></tr>\n                {else}\n                  <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n                {/if}\n                <tr>\n                  <td style =\"text-align:left;\"  >\n                    <font size=\"1\">\n                      {if $value.html_type eq \'Text\'}\n                        {$value.label}\n                      {else}\n                        {$value.field_title} - {$value.label}\n                      {/if}\n                      {if $value.description}\n                        <div>{$value.description|truncate:30:\"...\"}</div>\n                      {/if}\n                   </font>\n                  </td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.qty}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.unit_price|crmMoney:$currency}</font></td>\n                  {if $value.tax_amount != \'\'}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.tax_rate}%</font></td>\n                  {else}\n                    <td style=\"padding-left:28px;text-align:right\"><font size=\"1\">{ts 1=$taxTerm}No %1{/ts}</font></td>\n                  {/if}\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$value.subTotal|crmMoney:$currency}</font></td>\n                </tr>\n              {/foreach}\n              <tr><td colspan=\"5\" style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}Sub Total{/ts}</font></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$subTotal|crmMoney:$currency}</font></td>\n              </tr>\n              {foreach from=$dataArray item=value key=priceset}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  {if $priceset}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm 2=$priceset}TOTAL %1 %2%{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                  {elseif $priceset == 0}\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts 1=$taxTerm}TOTAL NO %1{/ts}</font></td>\n                    <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\" align=\"right\">{$value|crmMoney:$currency}</font> </td>\n                </tr>\n                {/if}\n              {/foreach}\n              <tr>\n                <td colspan=\"3\"></td>\n                <td colspan=\"2\"><hr></hr></td>\n              </tr>\n              <tr>\n                <td colspan=\"3\"></td>\n                <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>\n                <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n              {if $is_pay_later == 0}\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{ts}LESS Credit to invoice(s){/ts}</font></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><font size=\"1\">{$amount|crmMoney:$currency}</font></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td colspan=\"2\"><hr></hr></td>\n                </tr>\n                <tr>\n                  <td colspan=\"3\"></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{ts}REMAINING CREDIT{/ts}</font></b></td>\n                  <td style=\"padding-left:28px;text-align:right;\"><b><font size=\"1\">{$amountDue|crmMoney:$currency}</font></b></td>\n                  <td style=\"padding-left:28px;\"><font size=\"1\" align=\"right\"></font></td>\n                </tr>\n              {/if}\n              <br/><br/><br/>\n              <tr>\n                <td colspan=\"3\"></td>\n              </tr>\n              <tr>\n                <td></td>\n                <td colspan=\"3\"></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n\n      <table width=\"100%\" style=\"margin-top:5px;padding-right:45px;\">\n        <tr>\n          <td><img src=\"{$resourceBase}/i/contribute/cut_line.png\" height=\"15\" width=\"100%\"></td>\n        </tr>\n      </table>\n\n      <table style=\"margin-top:6px;font-family: Arial, Verdana, sans-serif\" width=\"100%\" border=\"0\" cellpadding=\"5\" cellspacing=\"5\" id=\"desc\">\n        <tr>\n          <td width=\"60%\"><font size=\"4\" align=\"right\"><b>{ts}CREDIT ADVICE{/ts}</b><br/><br /><div style=\"font-size:10px;max-width:300px;\">{ts}Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us{/ts}</div><br/></font></td>\n          <td width=\"40%\">\n            <table align=\"right\">\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Customer:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$display_name}</font></td>\n              </tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Note#:{/ts}</font></td>\n                <td><font size=\"1\" align=\"right\">{$creditnote_id}</font></td>\n              </tr>\n              <tr><td colspan=\"5\"style=\"color:#F5F5F5;\"><hr></hr></td></tr>\n              <tr>\n                <td colspan=\"2\"></td>\n                <td><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{ts}Credit Amount:{/ts}</font></td>\n                <td width=\'50px\'><font size=\"1\" align=\"right\" style=\"font-weight:bold;\">{$amount|crmMoney:$currency}</font></td>\n              </tr>\n            </table>\n          </td>\n        </tr>\n      </table>\n    {/if}\n    </center>\n\n  </div>\n  </body>\n</html>\n',1,824,'contribution_invoice_receipt',0,1,0,NULL),(11,'Contributions - Recurring Start and End Notification','{ts}Recurring Contribution Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $recur_txnType eq \'START\'}\n{if $auto_renew_membership}\n{ts}Thanks for your auto renew membership sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s).{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{else}\n{ts}Thanks for your recurring contribution sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments } {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.\n\n{ts}Start Date{/ts}:  {$recur_start_date|crmDate}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{/if}\n\n{elseif $recur_txnType eq \'END\'}\n{if $auto_renew_membership}\n{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}\n\n\n{else}\n{ts}Your recurring contribution term has ended.{/ts}\n\n\n{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}\n\n\n==================================================\n{ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n\n==================================================\n{ts}Start Date{/ts}: {$recur_start_date|crmDate}\n\n{ts}End Date{/ts}: {$recur_end_date|crmDate}\n\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>&nbsp;</td>\n  </tr>\n\n    {if $recur_txnType eq \'START\'}\n     {if $auto_renew_membership}\n       <tr>\n        <td>\n         <p>{ts}Thanks for your auto renew membership sign-up.{/ts}</p>\n         <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s). {/ts}</p>\n        </td>\n       </tr>\n       {if $cancelSubscriptionUrl}\n       <tr>\n         <td {$labelStyle}>\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         </td>\n       </tr>\n       {/if}\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Thanks for your recurring contribution sign-up.{/ts}</p>\n        <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments }{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.</p>\n        <p>{ts}Start Date{/ts}: {$recur_start_date|crmDate}</p>\n       </td>\n      </tr>\n      {if $cancelSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$cancelSubscriptionUrl} You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n     {/if}\n\n    {elseif $recur_txnType eq \'END\'}\n\n     {if $auto_renew_membership}\n      <tr>\n       <td>\n        <p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>\n       </td>\n      </tr>\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Your recurring contribution term has ended.{/ts}</p>\n        <p>{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}</p>\n       </td>\n      </tr>\n      <tr>\n       <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_start_date|crmDate}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_end_date|crmDate}\n       </td>\n      </tr>\n     </table>\n       </td>\n      </tr>\n\n     {/if}\n    {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,825,'contribution_recurring_notify',1,0,0,NULL),(12,'Contributions - Recurring Start and End Notification','{ts}Recurring Contribution Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $recur_txnType eq \'START\'}\n{if $auto_renew_membership}\n{ts}Thanks for your auto renew membership sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s).{/ts}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{else}\n{ts}Thanks for your recurring contribution sign-up.{/ts}\n\n\n{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments } {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.\n\n{ts}Start Date{/ts}:  {$recur_start_date|crmDate}\n\n{if $cancelSubscriptionUrl}\n{ts 1=$cancelSubscriptionUrl}You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n\n{if $updateSubscriptionUrl}\n{ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n\n{/if}\n{/if}\n\n{elseif $recur_txnType eq \'END\'}\n{if $auto_renew_membership}\n{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}\n\n\n{else}\n{ts}Your recurring contribution term has ended.{/ts}\n\n\n{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}\n\n\n==================================================\n{ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n\n==================================================\n{ts}Start Date{/ts}: {$recur_start_date|crmDate}\n\n{ts}End Date{/ts}: {$recur_end_date|crmDate}\n\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>&nbsp;</td>\n  </tr>\n\n    {if $recur_txnType eq \'START\'}\n     {if $auto_renew_membership}\n       <tr>\n        <td>\n         <p>{ts}Thanks for your auto renew membership sign-up.{/ts}</p>\n         <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This membership will be automatically renewed every %1 %2(s). {/ts}</p>\n        </td>\n       </tr>\n       {if $cancelSubscriptionUrl}\n       <tr>\n         <td {$labelStyle}>\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         </td>\n       </tr>\n       {/if}\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Thanks for your recurring contribution sign-up.{/ts}</p>\n        <p>{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments }{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.</p>\n        <p>{ts}Start Date{/ts}: {$recur_start_date|crmDate}</p>\n       </td>\n      </tr>\n      {if $cancelSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$cancelSubscriptionUrl} You can cancel the recurring contribution option by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n      {if $updateSubscriptionBillingUrl}\n        <tr>\n          <td {$labelStyle}>\n            {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n        </tr>\n      {/if}\n      {if $updateSubscriptionUrl}\n      <tr>\n        <td {$labelStyle}>\n          {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href=\"%1\">visiting this web page</a>.{/ts}\n        </td>\n      </tr>\n      {/if}\n     {/if}\n\n    {elseif $recur_txnType eq \'END\'}\n\n     {if $auto_renew_membership}\n      <tr>\n       <td>\n        <p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>\n       </td>\n      </tr>\n     {else}\n      <tr>\n       <td>\n        <p>{ts}Your recurring contribution term has ended.{/ts}</p>\n        <p>{ts 1=$recur_installments}You have successfully completed %1 recurring contributions. Thank you.{/ts}</p>\n       </td>\n      </tr>\n      <tr>\n       <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts 1=$recur_installments}Interval of Subscription for %1 installment(s){/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_start_date|crmDate}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$recur_end_date|crmDate}\n       </td>\n      </tr>\n     </table>\n       </td>\n      </tr>\n\n     {/if}\n    {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,825,'contribution_recurring_notify',0,1,0,NULL),(13,'Contributions - Recurring Cancellation Notification','{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,826,'contribution_recurring_cancelled',1,0,0,NULL),(14,'Contributions - Recurring Cancellation Notification','{ts}Recurring Contribution Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Your recurring contribution of %1, every %2 %3 has been cancelled as requested.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,826,'contribution_recurring_cancelled',0,1,0,NULL),(15,'Contributions - Recurring Billing Updates','{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n    <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n            {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n       </tr>\n  </table>\n</center>\n\n</body>\n</html>\n',1,827,'contribution_recurring_billing',1,0,0,NULL),(16,'Contributions - Recurring Billing Updates','{ts}Recurring Contribution Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Billing details for your recurring contribution of %1, every %2 %3 have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n    <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n            {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n       </tr>\n  </table>\n</center>\n\n</body>\n</html>\n',1,827,'contribution_recurring_billing',0,1,0,NULL),(17,'Contributions - Recurring Updates','{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your recurring contribution has been updated as requested:{/ts}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}\n{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your recurring contribution has been updated as requested:{/ts}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.</p>\n\n    <p>{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,828,'contribution_recurring_edit',1,0,0,NULL),(18,'Contributions - Recurring Updates','{ts}Recurring Contribution Update Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your recurring contribution has been updated as requested:{/ts}\n\n{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}\n{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if}\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your recurring contribution has been updated as requested:{/ts}\n    <p>{ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2 %3(s){/ts}{if $installments}{ts 1=$installments} for %1 installments{/ts}{/if}.</p>\n\n    <p>{ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,828,'contribution_recurring_edit',0,1,0,NULL),(19,'Personal Campaign Pages - Admin Notification','{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Notification{/ts}\n\n===========================================================\n{ts}Action{/ts}: {if $mode EQ \'Update\'}{ts}Updated personal campaign page{/ts}{else}{ts}New personal campaign page{/ts}{/if}\n{ts}Personal Campaign Page Title{/ts}: {$pcpTitle}\n{ts}Current Status{/ts}: {$pcpStatus}\n{capture assign=pcpURL}{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n{ts}View Page{/ts}:\n>> {$pcpURL}\n\n{ts}Supporter{/ts}: {$supporterName}\n>> {$supporterUrl}\n\n{ts}Linked to Contribution Page{/ts}: {$contribPageTitle}\n>> {$contribPageUrl}\n\n{ts}Manage Personal Campaign Pages{/ts}:\n>> {$managePCPUrl}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=pcpURL     }{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Personal Campaign Page Notification{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Action{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {if $mode EQ \'Update\'}\n        {ts}Updated personal campaign page{/ts}\n       {else}\n        {ts}New personal campaign page{/ts}\n       {/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Personal Campaign Page Title{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpTitle}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Current Status{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpStatus}\n      </td>\n     </tr>\n\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$pcpURL}\">{ts}View Page{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Supporter{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$supporterUrl}\">{$supporterName}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Linked to Contribution Page{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$contribPageUrl}\">{$contribPageTitle}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$managePCPUrl}\">{ts}Manage Personal Campaign Pages{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,829,'pcp_notify',1,0,0,NULL),(20,'Personal Campaign Pages - Admin Notification','{ts}Personal Campaign Page Notification{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Notification{/ts}\n\n===========================================================\n{ts}Action{/ts}: {if $mode EQ \'Update\'}{ts}Updated personal campaign page{/ts}{else}{ts}New personal campaign page{/ts}{/if}\n{ts}Personal Campaign Page Title{/ts}: {$pcpTitle}\n{ts}Current Status{/ts}: {$pcpStatus}\n{capture assign=pcpURL}{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n{ts}View Page{/ts}:\n>> {$pcpURL}\n\n{ts}Supporter{/ts}: {$supporterName}\n>> {$supporterUrl}\n\n{ts}Linked to Contribution Page{/ts}: {$contribPageTitle}\n>> {$contribPageUrl}\n\n{ts}Manage Personal Campaign Pages{/ts}:\n>> {$managePCPUrl}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=pcpURL     }{crmURL p=\"civicrm/pcp/info\" q=\"reset=1&id=`$pcpId`\" h=0 a=1}{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Personal Campaign Page Notification{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Action{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {if $mode EQ \'Update\'}\n        {ts}Updated personal campaign page{/ts}\n       {else}\n        {ts}New personal campaign page{/ts}\n       {/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Personal Campaign Page Title{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpTitle}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Current Status{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$pcpStatus}\n      </td>\n     </tr>\n\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$pcpURL}\">{ts}View Page{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Supporter{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$supporterUrl}\">{$supporterName}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Linked to Contribution Page{/ts}\n      </td>\n      <td {$valueStyle}>\n       <a href=\"{$contribPageUrl}\">{$contribPageTitle}</a>\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       <a href=\"{$managePCPUrl}\">{ts}Manage Personal Campaign Pages{/ts}</a>\n      </td>\n      <td></td>\n     </tr>\n\n    </table>\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,829,'pcp_notify',0,1,0,NULL),(21,'Personal Campaign Pages - Supporter Status Change Notification','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{if $pcpStatus eq \'Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been approved and is now live.{/ts}\n\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n{if $isTellFriendEnabled}\n\n{ts}After logging in, you can use this form to promote your fundraising page{/ts}:\n{$pcpTellFriendURL}\n\n{/if}\n\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{* Rejected message *}\n{elseif $pcpStatus eq \'Not Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}\n\n{if $pcpNotifyEmailAddress}\n\n{ts}Please contact our site administrator for more information{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n\n    <h1>{ts}Your Personal Campaign Page{/ts}</h1>\n\n    {if $pcpStatus eq \'Approved\'}\n\n     <p>{ts}Your personal campaign page has been approved and is now live.{/ts}</p>\n     <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n     <ol>\n      <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n      <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n     </ol>\n     <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n\n     {if $isTellFriendEnabled}\n      <p><a href=\"{$pcpTellFriendURL}\">{ts}After logging in, you can use this form to promote your fundraising page{/ts}</a></p>\n     {/if}\n\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {elseif $pcpStatus eq \'Not Approved\'}\n\n     <p>{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}</p>\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Please contact our site administrator for more information{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {/if}\n\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,830,'pcp_status_change',1,0,0,NULL),(22,'Personal Campaign Pages - Supporter Status Change Notification','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{if $pcpStatus eq \'Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been approved and is now live.{/ts}\n\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n{if $isTellFriendEnabled}\n\n{ts}After logging in, you can use this form to promote your fundraising page{/ts}:\n{$pcpTellFriendURL}\n\n{/if}\n\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{* Rejected message *}\n{elseif $pcpStatus eq \'Not Approved\'}\n============================\n{ts}Your Personal Campaign Page{/ts}\n\n============================\n\n{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}\n\n{if $pcpNotifyEmailAddress}\n\n{ts}Please contact our site administrator for more information{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n\n    <h1>{ts}Your Personal Campaign Page{/ts}</h1>\n\n    {if $pcpStatus eq \'Approved\'}\n\n     <p>{ts}Your personal campaign page has been approved and is now live.{/ts}</p>\n     <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n     <ol>\n      <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n      <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n     </ol>\n     <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n\n     {if $isTellFriendEnabled}\n      <p><a href=\"{$pcpTellFriendURL}\">{ts}After logging in, you can use this form to promote your fundraising page{/ts}</a></p>\n     {/if}\n\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {elseif $pcpStatus eq \'Not Approved\'}\n\n     <p>{ts}Your personal campaign page has been reviewed. There were some issues with the content which prevented us from approving the page. We are sorry for any inconvenience.{/ts}</p>\n     {if $pcpNotifyEmailAddress}\n      <p>{ts}Please contact our site administrator for more information{/ts}: {$pcpNotifyEmailAddress}</p>\n     {/if}\n\n    {/if}\n\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,830,'pcp_status_change',0,1,0,NULL),(23,'Personal Campaign Pages - Supporter Welcome','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}\n\n{if $pcpStatus eq \'Approved\'}\n====================\n{ts}Promoting Your Page{/ts}\n\n====================\n{if $isTellFriendEnabled}\n\n{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:\n\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser and follow the prompts{/ts}:\n{$pcpTellFriendURL}\n{else}\n\n{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts}\n{ts}Include this link to your fundraising page in your emails{/ts}:\n{$pcpInfoURL}\n{/if}\n\n===================\n{ts}Managing Your Page{/ts}\n\n===================\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n\n{elseif $pcpStatus EQ \'Waiting Review\'}\n{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}\n\n\n{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}\n\n\n{ts}You can still preview your page prior to approval{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser{/ts}:\n{$pcpInfoURL}\n\n{/if}\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}</p>\n   </td>\n  </tr>\n\n  {if $pcpStatus eq \'Approved\'}\n\n    <tr>\n     <td>\n      <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n       <tr>\n        <th {$headerStyle}>\n         {ts}Promoting Your Page{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {if $isTellFriendEnabled}\n          <p>{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:</p>\n          <ol>\n           <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n           <li><a href=\"{$pcpTellFriendURL}\">{ts}Click this link and follow the prompts{/ts}</a></li>\n          </ol>\n         {else}\n          <p>{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts} {ts}Include this link to your fundraising page in your emails{/ts}: {$pcpInfoURL}</p>\n         {/if}\n        </td>\n       </tr>\n       <tr>\n        <th {$headerStyle}>\n         {ts}Managing Your Page{/ts}\n        </th>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n         <ol>\n          <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n          <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n         </ol>\n         <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n        </td>\n       </tr>\n       </tr>\n      </table>\n     </td>\n    </tr>\n\n   {elseif $pcpStatus EQ \'Waiting Review\'}\n\n    <tr>\n     <td>\n      <p>{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}</p>\n      <p>{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}</p>\n      <p>{ts}You can still preview your page prior to approval{/ts}:</p>\n      <ol>\n       <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n       <li><a href=\"{$pcpInfoURL}\">{ts}Click this link{/ts}</a></li>\n      </ol>\n     </td>\n    </tr>\n\n   {/if}\n\n   {if $pcpNotifyEmailAddress}\n    <tr>\n     <td>\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     </td>\n    </tr>\n   {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,831,'pcp_supporter_notify',1,0,0,NULL),(24,'Personal Campaign Pages - Supporter Welcome','{ts 1=$contribPageTitle}Your Personal Campaign Page for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}\n\n{if $pcpStatus eq \'Approved\'}\n====================\n{ts}Promoting Your Page{/ts}\n\n====================\n{if $isTellFriendEnabled}\n\n{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:\n\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser and follow the prompts{/ts}:\n{$pcpTellFriendURL}\n{else}\n\n{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts}\n{ts}Include this link to your fundraising page in your emails{/ts}:\n{$pcpInfoURL}\n{/if}\n\n===================\n{ts}Managing Your Page{/ts}\n\n===================\n{ts}Whenever you want to preview, update or promote your page{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser to go to your page{/ts}:\n{$pcpInfoURL}\n\n{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}\n\n\n{elseif $pcpStatus EQ \'Waiting Review\'}\n{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}\n\n\n{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}\n\n\n{ts}You can still preview your page prior to approval{/ts}:\n1. {ts}Login to your account at{/ts}:\n{$loginUrl}\n\n2. {ts}Click or paste this link into your browser{/ts}:\n{$pcpInfoURL}\n\n{/if}\n{if $pcpNotifyEmailAddress}\n{ts}Questions? Send email to{/ts}:\n{$pcpNotifyEmailAddress}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=\"$contribPageTitle\"}Thanks for creating a personal campaign page in support of %1.{/ts}</p>\n   </td>\n  </tr>\n\n  {if $pcpStatus eq \'Approved\'}\n\n    <tr>\n     <td>\n      <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n       <tr>\n        <th {$headerStyle}>\n         {ts}Promoting Your Page{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {if $isTellFriendEnabled}\n          <p>{ts}You can begin your fundraising efforts using our \"Tell a Friend\" form{/ts}:</p>\n          <ol>\n           <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n           <li><a href=\"{$pcpTellFriendURL}\">{ts}Click this link and follow the prompts{/ts}</a></li>\n          </ol>\n         {else}\n          <p>{ts}Send email to family, friends and colleagues with a personal message about this campaign.{/ts} {ts}Include this link to your fundraising page in your emails{/ts}: {$pcpInfoURL}</p>\n         {/if}\n        </td>\n       </tr>\n       <tr>\n        <th {$headerStyle}>\n         {ts}Managing Your Page{/ts}\n        </th>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}Whenever you want to preview, update or promote your page{/ts}:</p>\n         <ol>\n          <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n          <li><a href=\"{$pcpInfoURL}\">{ts}Go to your page{/ts}</a></li>\n         </ol>\n         <p>{ts}When you view your campaign page WHILE LOGGED IN, the page includes links to edit your page, tell friends, and update your contact info.{/ts}</p>\n        </td>\n       </tr>\n       </tr>\n      </table>\n     </td>\n    </tr>\n\n   {elseif $pcpStatus EQ \'Waiting Review\'}\n\n    <tr>\n     <td>\n      <p>{ts}Your page requires administrator review before you can begin your fundraising efforts.{/ts}</p>\n      <p>{ts}A notification email has been sent to the site administrator, and you will receive another notification from them as soon as the review process is complete.{/ts}</p>\n      <p>{ts}You can still preview your page prior to approval{/ts}:</p>\n      <ol>\n       <li><a href=\"{$loginUrl}\">{ts}Login to your account{/ts}</a></li>\n       <li><a href=\"{$pcpInfoURL}\">{ts}Click this link{/ts}</a></li>\n      </ol>\n     </td>\n    </tr>\n\n   {/if}\n\n   {if $pcpNotifyEmailAddress}\n    <tr>\n     <td>\n      <p>{ts}Questions? Send email to{/ts}: {$pcpNotifyEmailAddress}</p>\n     </td>\n    </tr>\n   {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,831,'pcp_supporter_notify',0,1,0,NULL),(25,'Personal Campaign Pages - Owner Notification','{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Owner Notification{/ts}\n\n===========================================================\n{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}You have received a donation at your personal page{/ts}: {$page_title}\n>> {$pcpInfoURL}\n\n{ts}Your fundraising total has been updated.{/ts}\n{ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}\n{if $is_honor_roll_enabled}\n    {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}\n{/if}\n\n{ts}Received{/ts}: {$receive_date|crmDate}\n\n{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}\n\n{ts}Name{/ts}: {$donors_display_name}\n\n{ts}Email{/ts}: {$donors_email}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n  {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n  <p>{ts}You have received a donation at your personal page{/ts}: <a href=\"{$pcpInfoURL}\">{$page_title}</a></p>\n  <p>{ts}Your fundraising total has been updated.{/ts}<br/>\n    {ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts} <br/>\n    {if $is_honor_roll_enabled}\n      {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}<br/>\n    {/if}\n  </p>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n    <tr><td>{ts}Received{/ts}:</td><td> {$receive_date|crmDate}</td></tr>\n    <tr><td>{ts}Amount{/ts}:</td><td> {$total_amount|crmMoney:$currency}</td></tr>\n    <tr><td>{ts}Name{/ts}:</td><td> {$donors_display_name}</td></tr>\n    <tr><td>{ts}Email{/ts}:</td><td> {$donors_email}</td></tr>\n  </table>\n</body>\n</html>\n',1,832,'pcp_owner_notify',1,0,0,NULL),(26,'Personal Campaign Pages - Owner Notification','{ts}Someone has just donated to your personal campaign page{/ts} - {contact.display_name}\n','===========================================================\n{ts}Personal Campaign Page Owner Notification{/ts}\n\n===========================================================\n{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}You have received a donation at your personal page{/ts}: {$page_title}\n>> {$pcpInfoURL}\n\n{ts}Your fundraising total has been updated.{/ts}\n{ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts}\n{if $is_honor_roll_enabled}\n    {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}\n{/if}\n\n{ts}Received{/ts}: {$receive_date|crmDate}\n\n{ts}Amount{/ts}: {$total_amount|crmMoney:$currency}\n\n{ts}Name{/ts}: {$donors_display_name}\n\n{ts}Email{/ts}: {$donors_email}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n  {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n  <p>{ts}You have received a donation at your personal page{/ts}: <a href=\"{$pcpInfoURL}\">{$page_title}</a></p>\n  <p>{ts}Your fundraising total has been updated.{/ts}<br/>\n    {ts}The donor\'s information is listed below.  You can choose to contact them and convey your thanks if you wish.{/ts} <br/>\n    {if $is_honor_roll_enabled}\n      {ts}The donor\'s name has been added to your honor roll unless they asked not to be included.{/ts}<br/>\n    {/if}\n  </p>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n    <tr><td>{ts}Received{/ts}:</td><td> {$receive_date|crmDate}</td></tr>\n    <tr><td>{ts}Amount{/ts}:</td><td> {$total_amount|crmMoney:$currency}</td></tr>\n    <tr><td>{ts}Name{/ts}:</td><td> {$donors_display_name}</td></tr>\n    <tr><td>{ts}Email{/ts}:</td><td> {$donors_email}</td></tr>\n  </table>\n</body>\n</html>\n',1,832,'pcp_owner_notify',0,1,0,NULL),(27,'Additional Payment Receipt or Refund Notification','{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if $component eq \'event\'} - {$event.title}{/if} - {contact.display_name}\n','{if $emailGreeting}{$emailGreeting},\n{/if}\n\n{if $isRefund}\n{ts}A refund has been issued based on changes in your registration selections.{/ts}\n{else}\n{ts}Below you will find a receipt for this payment.{/ts}\n{/if}\n{if $paymentsComplete}\n{ts}Thank you for completing this payment.{/ts}\n{/if}\n\n{if $isRefund}\n===============================================================================\n\n{ts}Refund Details{/ts}\n\n===============================================================================\n{ts}This Refund Amount{/ts}: {$refundAmount|crmMoney}\n------------------------------------------------------------------------------------\n\n{else}\n===============================================================================\n\n{ts}Payment Details{/ts}\n\n===============================================================================\n{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney}\n------------------------------------------------------------------------------------\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n\n===============================================================================\n\n{ts}Contribution Details{/ts}\n\n===============================================================================\n{ts}Total Fee{/ts}: {$totalAmount|crmMoney}\n{ts}Total Paid{/ts}: {$totalPaid|crmMoney}\n{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *}\n\n\n{if $billingName || $address}\n\n===============================================================================\n\n{ts}Billing Name and Address{/ts}\n\n===============================================================================\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_number}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===============================================================================\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $component eq \'event\'}\n===============================================================================\n\n{ts}Event Information and Location{/ts}\n\n===============================================================================\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=emptyBlockStyle }style=\"padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;\"{/capture}\n{capture assign=emptyBlockValueStyle }style=\"padding: 10px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n  <tr>\n    <td>\n      {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if $isRefund}\n        <p>{ts}A refund has been issued based on changes in your registration selections.{/ts}</p>\n      {else}\n        <p>{ts}Below you will find a receipt for this payment.{/ts}</p>\n        {if $paymentsComplete}\n          <p>{ts}Thank you for completing this contribution.{/ts}</p>\n        {/if}\n      {/if}\n    </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $isRefund}\n      <tr>\n        <th {$headerStyle}>{ts}Refund Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Refund Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$refundAmount|crmMoney}\n        </td>\n      </tr>\n    {else}\n      <tr>\n        <th {$headerStyle}>{ts}Payment Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Payment Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paymentAmount|crmMoney}\n        </td>\n      </tr>\n    {/if}\n    {if $receive_date}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction Date{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$receive_date|crmDate}\n        </td>\n      </tr>\n    {/if}\n    {if $trxn_id}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$trxn_id}\n        </td>\n      </tr>\n    {/if}\n    {if $paidBy}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Paid By{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paidBy}\n        </td>\n      </tr>\n    {/if}\n    {if $checkNumber}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$checkNumber}\n        </td>\n      </tr>\n    {/if}\n\n  <tr>\n    <th {$headerStyle}>{ts}Contribution Details{/ts}</th>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Fee{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalAmount|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Paid{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalPaid|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Balance Owed{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$amountOwed|crmMoney}\n    </td> {* This will be zero after final payment. *}\n  </tr>\n  </table>\n\n  </td>\n  </tr>\n    <tr>\n      <td>\n  <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $billingName || $address}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n            </td>\n          </tr>\n    {/if}\n    {if $credit_card_number}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n            </td>\n          </tr>\n    {/if}\n    {if $component eq \'event\'}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Event Information and Location{/ts}\n      </th>\n    </tr>\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n         {$event.event_title}<br />\n        {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n    </tr>\n\n    {if $event.participant_role}\n    <tr>\n      <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n      </td>\n      <td {$valueStyle}>\n        {$event.participant_role}\n      </td>\n    </tr>\n    {/if}\n\n    {if $isShowLocation}\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n      </td>\n    </tr>\n    {/if}\n\n    {if $location.phone.1.phone || $location.email.1.email}\n    <tr>\n      <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n      </td>\n    </tr>\n    {foreach from=$location.phone item=phone}\n    {if $phone.phone}\n          <tr>\n            <td {$labelStyle}>\n        {if $phone.phone_type}\n        {$phone.phone_type_display}\n        {else}\n        {ts}Phone{/ts}\n        {/if}\n            </td>\n            <td {$valueStyle}>\n        {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {foreach from=$location.email item=eventEmail}\n    {if $eventEmail.email}\n          <tr>\n            <td {$labelStyle}>\n        {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n        {$eventEmail.email}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {/if} {*phone block close*}\n    {/if}\n  </table>\n      </td>\n    </tr>\n\n    </table>\n  </center>\n\n </body>\n</html>\n',1,833,'payment_or_refund_notification',1,0,0,NULL),(28,'Additional Payment Receipt or Refund Notification','{if $isRefund}{ts}Refund Notification{/ts}{else}{ts}Payment Receipt{/ts}{/if}{if $component eq \'event\'} - {$event.title}{/if} - {contact.display_name}\n','{if $emailGreeting}{$emailGreeting},\n{/if}\n\n{if $isRefund}\n{ts}A refund has been issued based on changes in your registration selections.{/ts}\n{else}\n{ts}Below you will find a receipt for this payment.{/ts}\n{/if}\n{if $paymentsComplete}\n{ts}Thank you for completing this payment.{/ts}\n{/if}\n\n{if $isRefund}\n===============================================================================\n\n{ts}Refund Details{/ts}\n\n===============================================================================\n{ts}This Refund Amount{/ts}: {$refundAmount|crmMoney}\n------------------------------------------------------------------------------------\n\n{else}\n===============================================================================\n\n{ts}Payment Details{/ts}\n\n===============================================================================\n{ts}This Payment Amount{/ts}: {$paymentAmount|crmMoney}\n------------------------------------------------------------------------------------\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n\n===============================================================================\n\n{ts}Contribution Details{/ts}\n\n===============================================================================\n{ts}Total Fee{/ts}: {$totalAmount|crmMoney}\n{ts}Total Paid{/ts}: {$totalPaid|crmMoney}\n{ts}Balance Owed{/ts}: {$amountOwed|crmMoney} {* This will be zero after final payment. *}\n\n\n{if $billingName || $address}\n\n===============================================================================\n\n{ts}Billing Name and Address{/ts}\n\n===============================================================================\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_number}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===============================================================================\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{if $component eq \'event\'}\n===============================================================================\n\n{ts}Event Information and Location{/ts}\n\n===============================================================================\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=emptyBlockStyle }style=\"padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;\"{/capture}\n{capture assign=emptyBlockValueStyle }style=\"padding: 10px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n  <tr>\n    <td>\n      {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n      {if $isRefund}\n        <p>{ts}A refund has been issued based on changes in your registration selections.{/ts}</p>\n      {else}\n        <p>{ts}Below you will find a receipt for this payment.{/ts}</p>\n        {if $paymentsComplete}\n          <p>{ts}Thank you for completing this contribution.{/ts}</p>\n        {/if}\n      {/if}\n    </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $isRefund}\n      <tr>\n        <th {$headerStyle}>{ts}Refund Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Refund Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$refundAmount|crmMoney}\n        </td>\n      </tr>\n    {else}\n      <tr>\n        <th {$headerStyle}>{ts}Payment Details{/ts}</th>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n        {ts}This Payment Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paymentAmount|crmMoney}\n        </td>\n      </tr>\n    {/if}\n    {if $receive_date}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction Date{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$receive_date|crmDate}\n        </td>\n      </tr>\n    {/if}\n    {if $trxn_id}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$trxn_id}\n        </td>\n      </tr>\n    {/if}\n    {if $paidBy}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Paid By{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$paidBy}\n        </td>\n      </tr>\n    {/if}\n    {if $checkNumber}\n      <tr>\n        <td {$labelStyle}>\n        {ts}Check Number{/ts}\n        </td>\n        <td {$valueStyle}>\n        {$checkNumber}\n        </td>\n      </tr>\n    {/if}\n\n  <tr>\n    <th {$headerStyle}>{ts}Contribution Details{/ts}</th>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Fee{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalAmount|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Total Paid{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$totalPaid|crmMoney}\n    </td>\n  </tr>\n  <tr>\n    <td {$labelStyle}>\n      {ts}Balance Owed{/ts}\n    </td>\n    <td {$valueStyle}>\n      {$amountOwed|crmMoney}\n    </td> {* This will be zero after final payment. *}\n  </tr>\n  </table>\n\n  </td>\n  </tr>\n    <tr>\n      <td>\n  <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n    {if $billingName || $address}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Billing Name and Address{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$billingName}<br />\n        {$address|nl2br}\n            </td>\n          </tr>\n    {/if}\n    {if $credit_card_number}\n          <tr>\n            <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n            </th>\n          </tr>\n          <tr>\n            <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n            </td>\n          </tr>\n    {/if}\n    {if $component eq \'event\'}\n    <tr>\n      <th {$headerStyle}>\n        {ts}Event Information and Location{/ts}\n      </th>\n    </tr>\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n         {$event.event_title}<br />\n        {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n    </tr>\n\n    {if $event.participant_role}\n    <tr>\n      <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n      </td>\n      <td {$valueStyle}>\n        {$event.participant_role}\n      </td>\n    </tr>\n    {/if}\n\n    {if $isShowLocation}\n    <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n      </td>\n    </tr>\n    {/if}\n\n    {if $location.phone.1.phone || $location.email.1.email}\n    <tr>\n      <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n      </td>\n    </tr>\n    {foreach from=$location.phone item=phone}\n    {if $phone.phone}\n          <tr>\n            <td {$labelStyle}>\n        {if $phone.phone_type}\n        {$phone.phone_type_display}\n        {else}\n        {ts}Phone{/ts}\n        {/if}\n            </td>\n            <td {$valueStyle}>\n        {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {foreach from=$location.email item=eventEmail}\n    {if $eventEmail.email}\n          <tr>\n            <td {$labelStyle}>\n        {ts}Email{/ts}\n            </td>\n            <td {$valueStyle}>\n        {$eventEmail.email}\n            </td>\n          </tr>\n    {/if}\n    {/foreach}\n    {/if} {*phone block close*}\n    {/if}\n  </table>\n      </td>\n    </tr>\n\n    </table>\n  </center>\n\n </body>\n</html>\n',1,833,'payment_or_refund_notification',0,1,0,NULL),(29,'Events - Registration Confirmation and Receipt (off-line)','{ts}Event Confirmation{/ts} - {$event.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $email}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Registered Email{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$email}\n{/if}\n{if $event.is_monetary} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts}\n{/if}\n{/if}\n---------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if}  {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n{/if}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amount && !$lineItem}\n{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary}\n\n{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $balanceAmount}\n{ts}Balance{/ts}: {$balanceAmount|crmMoney}\n{/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n        {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n        {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $is_pay_later }\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPre item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n\n{if $customPost}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPost item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile item=value key=customName}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$customName+1}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=val key=field}\n{if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\' }\n{if $field eq \'additionalCustomPre\' }\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPre_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{else}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPost_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{/if}\n{foreach from=$val item=v key=f}\n{$f}: {$v}\n{/foreach}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n    {/if}\n\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$email}\n       </td>\n      </tr>\n     {/if}\n\n\n     {if $event.is_monetary}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.qty}\n              </td>\n              <td>\n               {$line.unit_price|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n        {if  $pricesetFieldsCount }\n        <td>\n    {$line.participant_count}\n              </td>\n        {/if}\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n          <tr>\n           {if $priceset || $priceset == 0}\n            <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {else}\n            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {/if}\n          </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amount && !$lineItem}\n       {foreach from=$amount item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n      {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n        {if $balanceAmount}\n           {ts}Total Paid{/ts}\n        {else}\n           {ts}Total Amount{/ts}\n         {/if}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n      {if $balanceAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Balance{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$balanceAmount|crmMoney}\n        </td>\n       </tr>\n      {/if}\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n   {ts}Total Participants{/ts}</td>\n       <td {$valueStyle}>\n   {assign var=\"count\" value= 0}\n         {foreach from=$lineItem item=pcount}\n         {assign var=\"lineItemCount\" value=0}\n         {if $pcount neq \'skip\'}\n           {foreach from=$pcount item=p_count}\n           {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n           {/foreach}\n           {if $lineItemCount < 1 }\n           assign var=\"lineItemCount\" value=1}\n           {/if}\n           {assign var=\"count\" value=$count+$lineItemCount}\n         {/if}\n         {/foreach}\n   {$count}\n       </td>\n     </tr>\n     {/if}\n       {if $is_pay_later}\n        <tr>\n         <td colspan=\"2\" {$labelStyle}>\n          {$pay_later_receipt}\n         </td>\n        </tr>\n       {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customProfile}\n      {foreach from=$customProfile item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {ts 1=$customName+1}Participant Information - Participant %1{/ts}\n        </th>\n       </tr>\n       {foreach from=$value item=val key=field}\n        {if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\'}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {if $field eq \'additionalCustomPre\'}\n            {$additionalCustomPre_grouptitle}\n           {else}\n            {$additionalCustomPost_grouptitle}\n           {/if}\n          </td>\n         </tr>\n         {foreach from=$val item=v key=f}\n          <tr>\n           <td {$labelStyle}>\n            {$f}\n           </td>\n           <td {$valueStyle}>\n            {$v}\n           </td>\n          </tr>\n         {/foreach}\n        {/if}\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,834,'event_offline_receipt',1,0,0,NULL),(30,'Events - Registration Confirmation and Receipt (off-line)','{ts}Event Confirmation{/ts} - {$event.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $email}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Registered Email{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$email}\n{/if}\n{if $event.is_monetary} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts}\n{/if}\n{/if}\n---------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{capture assign=ts_participant_total}{if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if}  {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n{/if}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amount && !$lineItem}\n{foreach from=$amount item=amnt key=level}{$amnt.amount|crmMoney} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary}\n\n{if $balanceAmount}{ts}Total Paid{/ts}{else}{ts}Total Amount{/ts}{/if}: {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $balanceAmount}\n{ts}Balance{/ts}: {$balanceAmount|crmMoney}\n{/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n        {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n        {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $is_pay_later }\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPre item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n\n{if $customPost}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPost item=value key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n{$customName}: {$value}\n{/if}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile item=value key=customName}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$customName+1}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=val key=field}\n{if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\' }\n{if $field eq \'additionalCustomPre\' }\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPre_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{else}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$additionalCustomPost_grouptitle}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{/if}\n{foreach from=$val item=v key=f}\n{$f}: {$v}\n{/foreach}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n    {/if}\n\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$email}\n       </td>\n      </tr>\n     {/if}\n\n\n     {if $event.is_monetary}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.qty}\n              </td>\n              <td>\n               {$line.unit_price|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n        {if  $pricesetFieldsCount }\n        <td>\n    {$line.participant_count}\n              </td>\n        {/if}\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n          <tr>\n           {if $priceset || $priceset == 0}\n            <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {else}\n            <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n            <td>&nbsp;{$value|crmMoney:$currency}</td>\n           {/if}\n          </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amount && !$lineItem}\n       {foreach from=$amount item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n      {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n        {if $balanceAmount}\n           {ts}Total Paid{/ts}\n        {else}\n           {ts}Total Amount{/ts}\n         {/if}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n      {if $balanceAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Balance{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$balanceAmount|crmMoney}\n        </td>\n       </tr>\n      {/if}\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n   {ts}Total Participants{/ts}</td>\n       <td {$valueStyle}>\n   {assign var=\"count\" value= 0}\n         {foreach from=$lineItem item=pcount}\n         {assign var=\"lineItemCount\" value=0}\n         {if $pcount neq \'skip\'}\n           {foreach from=$pcount item=p_count}\n           {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n           {/foreach}\n           {if $lineItemCount < 1 }\n           assign var=\"lineItemCount\" value=1}\n           {/if}\n           {assign var=\"count\" value=$count+$lineItemCount}\n         {/if}\n         {/foreach}\n   {$count}\n       </td>\n     </tr>\n     {/if}\n       {if $is_pay_later}\n        <tr>\n         <td colspan=\"2\" {$labelStyle}>\n          {$pay_later_receipt}\n         </td>\n        </tr>\n       {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=value key=customName}\n       {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customProfile}\n      {foreach from=$customProfile item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {ts 1=$customName+1}Participant Information - Participant %1{/ts}\n        </th>\n       </tr>\n       {foreach from=$value item=val key=field}\n        {if $field eq \'additionalCustomPre\' or $field eq \'additionalCustomPost\'}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {if $field eq \'additionalCustomPre\'}\n            {$additionalCustomPre_grouptitle}\n           {else}\n            {$additionalCustomPost_grouptitle}\n           {/if}\n          </td>\n         </tr>\n         {foreach from=$val item=v key=f}\n          <tr>\n           <td {$labelStyle}>\n            {$f}\n           </td>\n           <td {$valueStyle}>\n            {$v}\n           </td>\n          </tr>\n         {/foreach}\n        {/if}\n       {/foreach}\n      {/foreach}\n     {/if}\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,834,'event_offline_receipt',0,1,0,NULL),(31,'Events - Registration Confirmation and Receipt (on-line)','{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n\n{else}\n  {ts}Thank you for your registration.{/ts}\n  {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to %1.{/ts}\n  {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}\n  {/if}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $payer.name}\nYou were registered by: {$payer.name}\n{/if}\n{if $event.is_monetary and not $isRequireApproval} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n\n{/if}\n{/if}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}{$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n----------------------------------------------------------------------------------------------------------------\n{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%29s\"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%33s\"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:\"%12s\"}{/if}\n{/if}\n{\"\"|string_format:\"%120s\"}\n{/foreach}\n{\"\"|string_format:\"%120s\"}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amounts && !$lineItem}\n{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary }\n\n{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle.$i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPr item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle.$j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPos item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$participantID+2}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$eachParticipant item=eachProfile key=pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$customProfile.title.$pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$eachProfile item=val key=field}\n{foreach from=$val item=v key=f}\n{$field}: {$v}\n{/foreach}\n{/foreach}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $event.allow_selfcancelxfer }\n{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=tdfirstStyle}style=\"width: 180px; padding-bottom: 15px;\"{/capture}\n{capture assign=tdStyle}style=\"width: 100px;\"{/capture}\n{capture assign=participantTotal}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n\n    {else}\n     <p>{ts}Thank you for your registration.{/ts}\n     {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}\n     {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}</p>\n\n    {/if}\n\n    <p>\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"width:100%; max-width:700px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n    {if $event.is_share}\n        <tr>\n            <td colspan=\"2\" {$valueStyle}>\n                {capture assign=eventUrl}{crmURL p=\'civicrm/event/info\' q=\"id=`$event.id`&reset=1\" a=true fe=1 h=1}{/capture}\n                {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl}\n            </td>\n        </tr>\n    {/if}\n    {if $payer.name}\n     <tr>\n       <th {$headerStyle}>\n         {ts}You were registered by:{/ts}\n       </th>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$payer.name}\n       </td>\n     </tr>\n    {/if}\n    {if $event.is_monetary and not $isRequireApproval}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if  $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td {$tdfirstStyle}>\n              {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td {$tdStyle} align=\"middle\">\n               {$line.qty}\n              </td>\n              <td {$tdStyle}>\n               {$line.unit_price|crmMoney:$currency}\n              </td>\n              {if $dataArray}\n               <td {$tdStyle}>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td {$tdStyle}>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td {$tdStyle}>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td {$tdStyle}>\n               {$line.line_total+$line.tax_amount|crmMoney:$currency}\n              </td>\n        {if $pricesetFieldsCount }<td {$tdStyle}>{$line.participant_count}</td> {/if}\n             </tr>\n            {/foreach}\n            {if $individual}\n              <tr {$participantTotal}>\n                <td colspan=3>{ts}Participant Total{/ts}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>\n              </tr>\n            {/if}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount Before Tax: {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amounts && !$lineItem}\n       {foreach from=$amounts item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney:$currency} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n\n    {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n      {ts}Total Participants{/ts}</td>\n      <td {$valueStyle}>\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n     {$count}\n     </td> </tr>\n      {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n   <tr> <th {$headerStyle}>{$customPre_grouptitle.$i}</th></tr>\n   {foreach from=$customPr item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n   {/if}\n   {/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n   <tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>\n   {foreach from=$customPos item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customProfile}\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n     <tr><th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th></tr>\n     {foreach from=$eachParticipant item=eachProfile key=pid}\n     <tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>\n     {foreach from=$eachProfile item=val key=field}\n     <tr>{foreach from=$val item=v key=f}\n         <td {$labelStyle}>{$field}</td>\n         <td {$valueStyle}>{$v}</td>\n         {/foreach}\n     </tr>\n     {/foreach}\n{/foreach}\n{/foreach}\n{/if}\n\n    {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n    </table>\n    {if $event.allow_selfcancelxfer }\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n        {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n        <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n      </td>\n     </tr>\n    {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,835,'event_online_receipt',1,0,0,NULL),(32,'Events - Registration Confirmation and Receipt (on-line)','{if $isOnWaitlist}{ts}Wait List Confirmation{/ts}{elseif $isRequireApproval}{ts}Registration Request Confirmation{/ts}{else}{ts}Registration Confirmation{/ts}{/if} - {$event.event_title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n{$event.confirm_email_text}\n\n{else}\n  {ts}Thank you for your registration.{/ts}\n  {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to %1.{/ts}\n  {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to waitlisted.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to registered.{/ts}{/if}\n  {/if}\n{/if}\n\n{if $isOnWaitlist}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}You have been added to the WAIT LIST for this event.{/ts}\n\n{if $isPrimary}\n{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $isRequireApproval}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Your registration has been submitted.{/ts}\n\n{if $isPrimary}\n{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}\n\n{/if}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$pay_later_receipt}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{/if}\n\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Event Information and Location{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.event_title}\n{$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n{if $event.participant_role neq \'Attendee\' and $defaultRole}\n{ts}Participant Role{/ts}: {$event.participant_role}\n{/if}\n\n{if $isShowLocation}\n{$location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $location.phone.1.phone || $location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}\n{/foreach}\n{foreach from=$location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $payer.name}\nYou were registered by: {$payer.name}\n{/if}\n{if $event.is_monetary and not $isRequireApproval} {* This section for Paid events only.*}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$event.fee_label}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{if $lineItem}{foreach from=$lineItem item=value key=priceset}\n\n{if $value neq \'skip\'}\n{if $isPrimary}\n{if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n{ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n\n{/if}\n{/if}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{/if}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{if $pricesetFieldsCount }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {/if} {$ts_total|string_format:\"%10s\"} {$ts_participant_total|string_format:\"%10s\"}\n-----------------------------------------------------------{if $pricesetFieldsCount }-----------------------------------------------------{/if}\n\n{foreach from=$value item=line}\n{if $pricesetFieldsCount }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney:$currency|string_format:\"%10s\"} {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}  {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}{$ts_participant_count|string_format:\"%10s\"}\n{/foreach}\n----------------------------------------------------------------------------------------------------------------\n{if $individual}{ts}Participant Total{/ts} {$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%29s\"} {$individual.$priceset.totalTaxAmt|crmMoney:$currency|string_format:\"%33s\"} {$individual.$priceset.totalAmtWithTax|crmMoney:$currency|string_format:\"%12s\"}{/if}\n{/if}\n{\"\"|string_format:\"%120s\"}\n{/foreach}\n{\"\"|string_format:\"%120s\"}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$totalAmount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n{/if}\n\n{if $amounts && !$lineItem}\n{foreach from=$amounts item=amnt key=level}{$amnt.amount|crmMoney:$currency} {$amnt.label}\n{/foreach}\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n{if $isPrimary }\n\n{ts}Total Amount{/ts}: {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n\n{if $pricesetFieldsCount }\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n\n{ts}Total Participants{/ts}: {$count}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$register_date|crmDate}\n{/if}\n{if $receive_date}\n{ts}Transaction Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $financialTypeName}\n{ts}Financial Type{/ts}: {$financialTypeName}\n{/if}\n{if $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n{/if}\n{if $paidBy}\n{ts}Paid By{/ts}: {$paidBy}\n{/if}\n{if $checkNumber}\n{ts}Check Number{/ts}: {$checkNumber}\n{/if}\n{if $billingName}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Billing Name and Address{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts}Credit Card Information{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n{/if} {* End of conditional section for Paid events *}\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPre_grouptitle.$i}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPr item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customPost_grouptitle.$j}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$customPos item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n{if $customProfile}\n\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{ts 1=$participantID+2}Participant Information - Participant %1{/ts}\n\n==========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$eachParticipant item=eachProfile key=pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{$customProfile.title.$pid}\n----------------------------------------------------------{if $pricesetFieldsCount }--------------------{/if}\n\n{foreach from=$eachProfile item=val key=field}\n{foreach from=$val item=v key=f}\n{$field}: {$v}\n{/foreach}\n{/foreach}\n{/foreach}\n{/foreach}\n{/if}\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{$customName}\n=========================================================={if $pricesetFieldsCount }===================={/if}\n\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $event.allow_selfcancelxfer }\n{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n{capture assign=tdfirstStyle}style=\"width: 180px; padding-bottom: 15px;\"{/capture}\n{capture assign=tdStyle}style=\"width: 100px;\"{/capture}\n{capture assign=participantTotal}style=\"margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;\"{/capture}\n\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n    {if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}\n     <p>{$event.confirm_email_text|htmlize}</p>\n\n    {else}\n     <p>{ts}Thank you for your registration.{/ts}\n     {if $participant_status}{ts 1=$participant_status}This is a confirmation that your registration has been received and your status has been updated to <strong> %1</strong>.{/ts}\n     {else}{if $isOnWaitlist}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>waitlisted</strong>.{/ts}{else}{ts}This is a confirmation that your registration has been received and your status has been updated to <strong>registered<strong>.{/ts}{/if}{/if}</p>\n\n    {/if}\n\n    <p>\n    {if $isOnWaitlist}\n     <p>{ts}You have been added to the WAIT LIST for this event.{/ts}</p>\n     {if $isPrimary}\n       <p>{ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts}</p>\n     {/if}\n    {elseif $isRequireApproval}\n     <p>{ts}Your registration has been submitted.{/ts}</p>\n     {if $isPrimary}\n      <p>{ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts}</p>\n     {/if}\n    {elseif $is_pay_later && !$isAmountzero && !$isAdditionalParticipant}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"width:100%; max-width:700px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|date_format:\"%A\"} {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|date_format:\"%A\"} {$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n\n\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.participant_role neq \'Attendee\' and $defaultRole}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Participant Role{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$event.participant_role}\n       </td>\n      </tr>\n     {/if}\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $location.phone.1.phone || $location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}\n           {$phone.phone_type_display}\n          {else}\n           {ts}Phone{/ts}\n          {/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone} {if $phone.phone_ext}&nbsp;{ts}ext.{/ts} {$phone.phone_ext}{/if}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n    {if $event.is_share}\n        <tr>\n            <td colspan=\"2\" {$valueStyle}>\n                {capture assign=eventUrl}{crmURL p=\'civicrm/event/info\' q=\"id=`$event.id`&reset=1\" a=true fe=1 h=1}{/capture}\n                {include file=\"CRM/common/SocialNetwork.tpl\" emailMode=true url=$eventUrl title=$event.title pageURL=$eventUrl}\n            </td>\n        </tr>\n    {/if}\n    {if $payer.name}\n     <tr>\n       <th {$headerStyle}>\n         {ts}You were registered by:{/ts}\n       </th>\n     </tr>\n     <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$payer.name}\n       </td>\n     </tr>\n    {/if}\n    {if $event.is_monetary and not $isRequireApproval}\n\n      <tr>\n       <th {$headerStyle}>\n        {$event.fee_label}\n       </th>\n      </tr>\n\n      {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n        {if $value neq \'skip\'}\n         {if $isPrimary}\n          {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}\n           <tr>\n            <td colspan=\"2\" {$labelStyle}>\n             {ts 1=$priceset+1}Participant %1{/ts} {$part.$priceset.info}\n            </td>\n           </tr>\n          {/if}\n         {/if}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Qty{/ts}</th>\n             <th>{ts}Each{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n             {/if}\n             <th>{ts}Total{/ts}</th>\n       {if  $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td {$tdfirstStyle}>\n              {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td {$tdStyle} align=\"middle\">\n               {$line.qty}\n              </td>\n              <td {$tdStyle}>\n               {$line.unit_price|crmMoney:$currency}\n              </td>\n              {if $dataArray}\n               <td {$tdStyle}>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td {$tdStyle}>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td {$tdStyle}>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n              {/if}\n              <td {$tdStyle}>\n               {$line.line_total+$line.tax_amount|crmMoney:$currency}\n              </td>\n        {if $pricesetFieldsCount }<td {$tdStyle}>{$line.participant_count}</td> {/if}\n             </tr>\n            {/foreach}\n            {if $individual}\n              <tr {$participantTotal}>\n                <td colspan=3>{ts}Participant Total{/ts}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax-$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=1>{$individual.$priceset.totalTaxAmt|crmMoney}</td>\n                <td colspan=2>{$individual.$priceset.totalAmtWithTax|crmMoney}</td>\n              </tr>\n            {/if}\n           </table>\n          </td>\n         </tr>\n        {/if}\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts} Amount Before Tax: {/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalAmount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n          {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {else}\n           <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n          {/if}\n         </tr>\n        {/foreach}\n       {/if}\n      {/if}\n\n      {if $amounts && !$lineItem}\n       {foreach from=$amounts item=amnt key=level}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$amnt.amount|crmMoney:$currency} {$amnt.label}\n         </td>\n        </tr>\n       {/foreach}\n      {/if}\n\n    {if $totalTaxAmount}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Tax Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalTaxAmount|crmMoney:$currency}\n        </td>\n       </tr>\n      {/if}\n      {if $isPrimary}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if}\n        </td>\n       </tr>\n       {if $pricesetFieldsCount }\n     <tr>\n       <td {$labelStyle}>\n      {ts}Total Participants{/ts}</td>\n      <td {$valueStyle}>\n      {assign var=\"count\" value= 0}\n      {foreach from=$lineItem item=pcount}\n      {assign var=\"lineItemCount\" value=0}\n      {if $pcount neq \'skip\'}\n        {foreach from=$pcount item=p_count}\n        {assign var=\"lineItemCount\" value=$lineItemCount+$p_count.participant_count}\n        {/foreach}\n      {if $lineItemCount < 1 }\n        {assign var=\"lineItemCount\" value=1}\n      {/if}\n      {assign var=\"count\" value=$count+$lineItemCount}\n      {/if}\n      {/foreach}\n     {$count}\n     </td> </tr>\n      {/if}\n\n       {if $register_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Registration Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$register_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction Date{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n       {if $financialTypeName}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$financialTypeName}\n         </td>\n        </tr>\n       {/if}\n\n       {if $trxn_id}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Transaction #{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$trxn_id}\n         </td>\n        </tr>\n       {/if}\n\n       {if $paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n         {$paidBy}\n         </td>\n        </tr>\n       {/if}\n\n       {if $checkNumber}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Check Number{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$checkNumber}\n         </td>\n        </tr>\n       {/if}\n\n       {if $billingName}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Billing Name and Address{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}\n         </td>\n        </tr>\n       {/if}\n\n       {if $credit_card_type}\n        <tr>\n         <th {$headerStyle}>\n          {ts}Credit Card Information{/ts}\n         </th>\n        </tr>\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          {$credit_card_type}<br />\n          {$credit_card_number}<br />\n          {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n\n      {/if}\n\n     {/if} {* End of conditional section for Paid events *}\n\n\n{if $customPre}\n{foreach from=$customPre item=customPr key=i}\n   <tr> <th {$headerStyle}>{$customPre_grouptitle.$i}</th></tr>\n   {foreach from=$customPr item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n   {/if}\n   {/foreach}\n{/foreach}\n{/if}\n\n{if $customPost}\n{foreach from=$customPost item=customPos key=j}\n   <tr> <th {$headerStyle}>{$customPost_grouptitle.$j}</th></tr>\n   {foreach from=$customPos item=customValue key=customName}\n   {if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n     <tr>\n         <td {$labelStyle}>{$customName}</td>\n         <td {$valueStyle}>{$customValue}</td>\n     </tr>\n{/if}\n{/foreach}\n{/foreach}\n{/if}\n\n{if $customProfile}\n{foreach from=$customProfile.profile item=eachParticipant key=participantID}\n     <tr><th {$headerStyle}>{ts 1=$participantID+2}Participant %1{/ts} </th></tr>\n     {foreach from=$eachParticipant item=eachProfile key=pid}\n     <tr><th {$headerStyle}>{$customProfile.title.$pid}</th></tr>\n     {foreach from=$eachProfile item=val key=field}\n     <tr>{foreach from=$val item=v key=f}\n         <td {$labelStyle}>{$field}</td>\n         <td {$valueStyle}>{$v}</td>\n         {/foreach}\n     </tr>\n     {/foreach}\n{/foreach}\n{/foreach}\n{/if}\n\n    {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n    </table>\n    {if $event.allow_selfcancelxfer }\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n        {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n        {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n        <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n      </td>\n     </tr>\n    {/if}\n </table>\n</center>\n\n</body>\n</html>\n',1,835,'event_online_receipt',0,1,0,NULL),(33,'Events - Receipt only','Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $is_pay_later}\n  This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n{else}\n  This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n{/if}\n\n{if $is_pay_later}\n  {$pay_later_receipt}\n{/if}\n\n  Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:\n\n{if $billing_name}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billing_name}\n\n{$billing_street_address}\n\n{$billing_city}, {$billing_state} {$billing_postal_code}\n\n{$email}\n{/if}\n\n{if $source}\n{$source}\n{/if}\n\n\n{foreach from=$line_items item=line_item}\n{$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})\n{if $line_item.event->is_show_location}\n  {$line_item.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n{$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n\n  Quantity: {$line_item.num_participants}\n\n{if $line_item.num_participants > 0}\n  {foreach from=$line_item.participants item=participant}\n    {$participant.display_name}\n  {/foreach}\n{/if}\n{if $line_item.num_waiting_participants > 0}\n  Waitlisted:\n    {foreach from=$line_item.waiting_participants item=participant}\n      {$participant.display_name}\n    {/foreach}\n{/if}\nCost: {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\nTotal For This Event: {$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n\n{/foreach}\n\n{if $discounts}\nSubtotal: {$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n--------------------------------------\nDiscounts\n{foreach from=$discounts key=myId item=i}\n  {$i.title}: -{$i.amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/if}\n======================================\nTotal: {$total|crmMoney:$currency|string_format:\"%10s\"}\n\n{if $credit_card_type}\n===========================================================\n{ts}Payment Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n{/if}\n\n  If you have questions about the status of your registration or purchase please feel free to contact us.\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n    <title></title>\n  </head>\n  <body>\n    {capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n    {capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n    {capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $is_pay_later}\n      <p>\n        This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n      </p>\n    {else}\n      <p>\n        This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n      </p>\n    {/if}\n\n    {if $is_pay_later}\n      <p>{$pay_later_receipt}</p>\n    {/if}\n\n    <p>Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n  Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:</p>\n\n{if $billing_name}\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Billing Name and Address{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$billing_name}<br />\n      {$billing_street_address}<br />\n      {$billing_city}, {$billing_state} {$billing_postal_code}<br/>\n      <br/>\n      {$email}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $credit_card_type}\n  <p>&nbsp;</p>\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Credit Card Information{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$credit_card_type}<br />\n      {$credit_card_number}<br />\n      {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $source}\n    <p>&nbsp;</p>\n    {$source}\n{/if}\n    <p>&nbsp;</p>\n    <table width=\"700\">\n      <thead>\n    <tr>\n{if $line_items}\n      <th style=\"text-align: left;\">\n      Event\n      </th>\n      <th style=\"text-align: left;\">\n      Participants\n      </th>\n{/if}\n      <th style=\"text-align: left;\">\n      Price\n      </th>\n      <th style=\"text-align: left;\">\n      Total\n      </th>\n    </tr>\n    </thead>\n      <tbody>\n  {foreach from=$line_items item=line_item}\n  <tr>\n    <td style=\"width: 220px\">\n      {$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})<br />\n      {if $line_item.event->is_show_location}\n        {$line_item.location.address.1.display|nl2br}\n      {/if}{*End of isShowLocation condition*}<br /><br />\n      {$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n    </td>\n    <td style=\"width: 180px\">\n    {$line_item.num_participants}\n      {if $line_item.num_participants > 0}\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n      {if $line_item.num_waiting_participants > 0}\n      Waitlisted:<br/>\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.waiting_participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n    </td>\n    <td style=\"width: 100px\">\n      {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n    <td style=\"width: 100px\">\n      &nbsp;{$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {/foreach}\n      </tbody>\n      <tfoot>\n  {if $discounts}\n  <tr>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      Subtotal:\n    </td>\n    <td>\n      &nbsp;{$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {foreach from=$discounts key=myId item=i}\n  <tr>\n    <td>\n      {$i.title}\n    </td>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      -{$i.amount}\n    </td>\n  </tr>\n  {/foreach}\n  {/if}\n  <tr>\n{if $line_items}\n    <td>\n    </td>\n    <td>\n    </td>\n{/if}\n    <td>\n      <strong>Total:</strong>\n    </td>\n    <td>\n      <strong>&nbsp;{$total|crmMoney:$currency|string_format:\"%10s\"}</strong>\n    </td>\n  </tr>\n      </tfoot>\n    </table>\n\n    If you have questions about the status of your registration or purchase please feel free to contact us.\n  </body>\n</html>\n',1,836,'event_registration_receipt',1,0,0,NULL),(34,'Events - Receipt only','Receipt for {if $events_in_cart} Event Registration{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $is_pay_later}\n  This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n{else}\n  This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n{/if}\n\n{if $is_pay_later}\n  {$pay_later_receipt}\n{/if}\n\n  Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:\n\n{if $billing_name}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billing_name}\n\n{$billing_street_address}\n\n{$billing_city}, {$billing_state} {$billing_postal_code}\n\n{$email}\n{/if}\n\n{if $source}\n{$source}\n{/if}\n\n\n{foreach from=$line_items item=line_item}\n{$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})\n{if $line_item.event->is_show_location}\n  {$line_item.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n{$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n\n  Quantity: {$line_item.num_participants}\n\n{if $line_item.num_participants > 0}\n  {foreach from=$line_item.participants item=participant}\n    {$participant.display_name}\n  {/foreach}\n{/if}\n{if $line_item.num_waiting_participants > 0}\n  Waitlisted:\n    {foreach from=$line_item.waiting_participants item=participant}\n      {$participant.display_name}\n    {/foreach}\n{/if}\nCost: {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\nTotal For This Event: {$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n\n{/foreach}\n\n{if $discounts}\nSubtotal: {$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n--------------------------------------\nDiscounts\n{foreach from=$discounts key=myId item=i}\n  {$i.title}: -{$i.amount|crmMoney:$currency|string_format:\"%10s\"}\n{/foreach}\n{/if}\n======================================\nTotal: {$total|crmMoney:$currency|string_format:\"%10s\"}\n\n{if $credit_card_type}\n===========================================================\n{ts}Payment Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n{/if}\n\n  If you have questions about the status of your registration or purchase please feel free to contact us.\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <head>\n    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n    <title></title>\n  </head>\n  <body>\n    {capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n    {capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n    {capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $is_pay_later}\n      <p>\n        This is being sent to you as an acknowledgement that you have registered one or more members for the following workshop, event or purchase. Please note, however, that the status of your payment is pending, and the registration for this event will not be completed until your payment is received.\n      </p>\n    {else}\n      <p>\n        This is being sent to you as a {if $is_refund}confirmation of refund{else}receipt of payment made{/if} for the following workshop, event registration or purchase.\n      </p>\n    {/if}\n\n    {if $is_pay_later}\n      <p>{$pay_later_receipt}</p>\n    {/if}\n\n    <p>Your order number is #{$transaction_id}. {if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if}\n  Here\'s a summary of your transaction placed on {$transaction_date|date_format:\"%D %I:%M %p %Z\"}:</p>\n\n{if $billing_name}\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Billing Name and Address{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$billing_name}<br />\n      {$billing_street_address}<br />\n      {$billing_city}, {$billing_state} {$billing_postal_code}<br/>\n      <br/>\n      {$email}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $credit_card_type}\n  <p>&nbsp;</p>\n  <table class=\"billing-info\">\n      <tr>\n    <th style=\"text-align: left;\">\n      {ts}Credit Card Information{/ts}\n    </th>\n      </tr>\n      <tr>\n    <td>\n      {$credit_card_type}<br />\n      {$credit_card_number}<br />\n      {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}\n    </td>\n    </tr>\n    </table>\n{/if}\n{if $source}\n    <p>&nbsp;</p>\n    {$source}\n{/if}\n    <p>&nbsp;</p>\n    <table width=\"700\">\n      <thead>\n    <tr>\n{if $line_items}\n      <th style=\"text-align: left;\">\n      Event\n      </th>\n      <th style=\"text-align: left;\">\n      Participants\n      </th>\n{/if}\n      <th style=\"text-align: left;\">\n      Price\n      </th>\n      <th style=\"text-align: left;\">\n      Total\n      </th>\n    </tr>\n    </thead>\n      <tbody>\n  {foreach from=$line_items item=line_item}\n  <tr>\n    <td style=\"width: 220px\">\n      {$line_item.event->title} ({$line_item.event->start_date|date_format:\"%D\"})<br />\n      {if $line_item.event->is_show_location}\n        {$line_item.location.address.1.display|nl2br}\n      {/if}{*End of isShowLocation condition*}<br /><br />\n      {$line_item.event->start_date|date_format:\"%D %I:%M %p\"} - {$line_item.event->end_date|date_format:\"%I:%M %p\"}\n    </td>\n    <td style=\"width: 180px\">\n    {$line_item.num_participants}\n      {if $line_item.num_participants > 0}\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n      {if $line_item.num_waiting_participants > 0}\n      Waitlisted:<br/>\n      <div class=\"participants\" style=\"padding-left: 10px;\">\n        {foreach from=$line_item.waiting_participants item=participant}\n        {$participant.display_name}<br />\n        {/foreach}\n      </div>\n      {/if}\n    </td>\n    <td style=\"width: 100px\">\n      {$line_item.cost|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n    <td style=\"width: 100px\">\n      &nbsp;{$line_item.amount|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {/foreach}\n      </tbody>\n      <tfoot>\n  {if $discounts}\n  <tr>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      Subtotal:\n    </td>\n    <td>\n      &nbsp;{$sub_total|crmMoney:$currency|string_format:\"%10s\"}\n    </td>\n  </tr>\n  {foreach from=$discounts key=myId item=i}\n  <tr>\n    <td>\n      {$i.title}\n    </td>\n    <td>\n    </td>\n    <td>\n    </td>\n    <td>\n      -{$i.amount}\n    </td>\n  </tr>\n  {/foreach}\n  {/if}\n  <tr>\n{if $line_items}\n    <td>\n    </td>\n    <td>\n    </td>\n{/if}\n    <td>\n      <strong>Total:</strong>\n    </td>\n    <td>\n      <strong>&nbsp;{$total|crmMoney:$currency|string_format:\"%10s\"}</strong>\n    </td>\n  </tr>\n      </tfoot>\n    </table>\n\n    If you have questions about the status of your registration or purchase please feel free to contact us.\n  </body>\n</html>\n',1,836,'event_registration_receipt',0,1,0,NULL),(35,'Events - Registration Cancellation Notice','{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your Event Registration has been cancelled.{/ts}\n\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your Event Registration has been cancelled.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,837,'participant_cancelled',1,0,0,NULL),(36,'Events - Registration Cancellation Notice','{ts 1=$event.event_title}Event Registration Cancelled for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}Your Event Registration has been cancelled.{/ts}\n\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Your Event Registration has been cancelled.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,837,'participant_cancelled',0,1,0,NULL),(37,'Events - Registration Confirmation Invite','{ts 1=$event.event_title}Confirm your registration for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}\n\n{if !$isAdditional and $participant.id}\n\n===========================================================\n{ts}Confirm Your Registration{/ts}\n\n===========================================================\n{capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\nClick this link to go to a web page where you can confirm your registration online:\n{$confirmUrl}\n{/if}\n{if $event.allow_selfcancelxfer }\n{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>\n   </td>\n  </tr>\n  {if !$isAdditional and $participant.id}\n   <tr>\n    <th {$headerStyle}>\n     {ts}Confirm Your Registration{/ts}\n    </th>\n   </tr>\n   <tr>\n    <td colspan=\"2\" {$valueStyle}>\n     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\n     <a href=\"{$confirmUrl}\">{ts}Click here to confirm and complete your registration{/ts}</a>\n    </td>\n   </tr>\n  {/if}\n  {if $event.allow_selfcancelxfer }\n  {ts}This event allows for{/ts}\n  {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\" h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\"> {ts}self service cancel or transfer{/ts}</a>\n  {/if}\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n  {if $event.allow_selfcancelxfer }\n   <tr>\n     <td colspan=\"2\" {$valueStyle}>\n       {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n         {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n     </td>\n   </tr>\n  {/if}\n  <tr>\n   <td colspan=\"2\" {$valueStyle}>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,838,'participant_confirm',1,0,0,NULL),(38,'Events - Registration Confirmation Invite','{ts 1=$event.event_title}Confirm your registration for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}\n\n{if !$isAdditional and $participant.id}\n\n===========================================================\n{ts}Confirm Your Registration{/ts}\n\n===========================================================\n{capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\nClick this link to go to a web page where you can confirm your registration online:\n{$confirmUrl}\n{/if}\n{if $event.allow_selfcancelxfer }\n{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}\n   {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n{ts}Transfer or cancel your registration:{/ts} {$selfService}\n{/if}\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n{if $conference_sessions}\n\n\n{ts}Your schedule:{/ts}\n{assign var=\'group_by_day\' value=\'NA\'}\n{foreach from=$conference_sessions item=session}\n{if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n{assign var=\'group_by_day\' value=$session.start_date}\n\n{$group_by_day|date_format:\"%m/%d/%Y\"}\n\n\n{/if}\n{$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}\n{if $session.location}    {$session.location}{/if}\n{/foreach}\n{/if}\n\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $event.is_public}\n{capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n{ts}Download iCalendar File:{/ts} {$icalFeed}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}This is an invitation to complete your registration that was initially waitlisted.{/ts}</p>\n   </td>\n  </tr>\n  {if !$isAdditional and $participant.id}\n   <tr>\n    <th {$headerStyle}>\n     {ts}Confirm Your Registration{/ts}\n    </th>\n   </tr>\n   <tr>\n    <td colspan=\"2\" {$valueStyle}>\n     {capture assign=confirmUrl}{crmURL p=\'civicrm/event/confirm\' q=\"reset=1&participantId=`$participant.id`&cs=`$checksumValue`\" a=true h=0 fe=1}{/capture}\n     <a href=\"{$confirmUrl}\">{ts}Click here to confirm and complete your registration{/ts}</a>\n    </td>\n   </tr>\n  {/if}\n  {if $event.allow_selfcancelxfer }\n  {ts}This event allows for{/ts}\n  {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\" h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\"> {ts}self service cancel or transfer{/ts}</a>\n  {/if}\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     {if $conference_sessions}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n  {ts}Your schedule:{/ts}\n       </td>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n  {assign var=\'group_by_day\' value=\'NA\'}\n  {foreach from=$conference_sessions item=session}\n   {if $session.start_date|date_format:\"%Y/%m/%d\" != $group_by_day|date_format:\"%Y/%m/%d\"}\n    {assign var=\'group_by_day\' value=$session.start_date}\n          <em>{$group_by_day|date_format:\"%m/%d/%Y\"}</em><br />\n   {/if}\n   {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />\n   {if $session.location}&nbsp;&nbsp;&nbsp;&nbsp;{$session.location}<br />{/if}\n  {/foreach}\n       </td>\n      </tr>\n     {/if}\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $event.is_public}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {capture assign=icalFeed}{crmURL p=\'civicrm/event/ical\' q=\"reset=1&id=`$event.id`\" h=0 a=1 fe=1}{/capture}\n        <a href=\"{$icalFeed}\">{ts}Download iCalendar File{/ts}</a>\n       </td>\n      </tr>\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n  {if $event.allow_selfcancelxfer }\n   <tr>\n     <td colspan=\"2\" {$valueStyle}>\n       {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}<br />\n         {capture assign=selfService}{crmURL p=\'civicrm/event/selfsvcupdate\' q=\"reset=1&pid=`$participant.id`&{contact.checksum}\"  h=0 a=1 fe=1}{/capture}\n       <a href=\"{$selfService}\">{ts}Click here to transfer or cancel your registration.{/ts}</a>\n     </td>\n   </tr>\n  {/if}\n  <tr>\n   <td colspan=\"2\" {$valueStyle}>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,838,'participant_confirm',0,1,0,NULL),(39,'Events - Pending Registration Expiration Notice','{ts 1=$event.event_title}Event registration has expired for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}</p>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,839,'participant_expired',1,0,0,NULL),(40,'Events - Pending Registration Expiration Notice','{ts 1=$event.event_title}Event registration has expired for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$event.event_title}Your pending event registration for %1 has expired\nbecause you did not confirm your registration.{/ts}</p>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor want to inquire about reinstating your registration for this event.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,839,'participant_expired',0,1,0,NULL),(41,'Events - Registration Transferred Notice','{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$to_participant}Your Event Registration has been transferred to %1.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,840,'participant_transferred',1,0,0,NULL),(42,'Events - Registration Transferred Notice','{ts 1=$event.event_title}Event Registration Transferred for %1{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$to_participant}Your Event Registration has been transferred to %1.{/ts}\n\n===========================================================\n{ts}Event Information and Location{/ts}\n\n===========================================================\n{$event.event_title}\n{$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n\n{ts}Participant Role{/ts}: {$participant.role}\n\n{if $isShowLocation}\n{$event.location.address.1.display|strip_tags:false}\n{/if}{*End of isShowLocation condition*}\n\n{if $event.location.phone.1.phone || $event.location.email.1.email}\n\n{ts}Event Contacts:{/ts}\n{foreach from=$event.location.phone item=phone}\n{if $phone.phone}\n\n{if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}: {$phone.phone}{/if}\n{/foreach}\n{foreach from=$event.location.email item=eventEmail}\n{if $eventEmail.email}\n\n{ts}Email{/ts}: {$eventEmail.email}{/if}{/foreach}\n{/if}\n\n{if $contact.email}\n\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$contact.email}\n{/if}\n\n{if $register_date}\n{ts}Registration Date{/ts}: {$participant.register_date|crmDate}\n{/if}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$to_participant}Your Event Registration has been Transferred to %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Event Information and Location{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       {$event.event_title}<br />\n       {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:\"%Y%m%d\" == $event.event_start_date|date_format:\"%Y%m%d\"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Participant Role{/ts}:\n      </td>\n      <td {$valueStyle}>\n       {$participant.role}\n      </td>\n     </tr>\n\n     {if $isShowLocation}\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$event.location.address.1.display|nl2br}\n       </td>\n      </tr>\n     {/if}\n\n     {if $event.location.phone.1.phone || $event.location.email.1.email}\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {ts}Event Contacts:{/ts}\n       </td>\n      </tr>\n      {foreach from=$event.location.phone item=phone}\n       {if $phone.phone}\n        <tr>\n         <td {$labelStyle}>\n          {if $phone.phone_type}{$phone.phone_type_display}{else}{ts}Phone{/ts}{/if}\n         </td>\n         <td {$valueStyle}>\n          {$phone.phone}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n      {foreach from=$event.location.email item=eventEmail}\n       {if $eventEmail.email}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Email{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$eventEmail.email}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $contact.email}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Registered Email{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$contact.email}\n       </td>\n      </tr>\n     {/if}\n\n     {if $register_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Registration Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$participant.register_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,840,'participant_transferred',0,1,0,NULL),(43,'Tell-a-Friend Email','{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/ts}\n','{$senderMessage}\n\n{if $generalLink}{ts}For more information, visit:{/ts}\n>> {$generalLink}\n\n{/if}\n{if $contribute}{ts}To make a contribution, go to:{/ts}\n>> {$pageURL}\n\n{/if}\n{if $event}{ts}To find out more about this event, go to:{/ts}\n>> {$pageURL}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{$senderMessage}</p>\n    {if $generalLink}\n     <p><a href=\"{$generalLink}\">{ts}More information{/ts}</a></p>\n    {/if}\n    {if $contribute}\n     <p><a href=\"{$pageURL}\">{ts}Make a contribution{/ts}</a></p>\n    {/if}\n    {if $event}\n     <p><a href=\"{$pageURL}\">{ts}Find out more about this event{/ts}</a></p>\n    {/if}\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,841,'friend',1,0,0,NULL),(44,'Tell-a-Friend Email','{ts 1=$senderContactName 2=$title}%1 wants you to know about %2{/ts}\n','{$senderMessage}\n\n{if $generalLink}{ts}For more information, visit:{/ts}\n>> {$generalLink}\n\n{/if}\n{if $contribute}{ts}To make a contribution, go to:{/ts}\n>> {$pageURL}\n\n{/if}\n{if $event}{ts}To find out more about this event, go to:{/ts}\n>> {$pageURL}\n{/if}\n\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <p>{$senderMessage}</p>\n    {if $generalLink}\n     <p><a href=\"{$generalLink}\">{ts}More information{/ts}</a></p>\n    {/if}\n    {if $contribute}\n     <p><a href=\"{$pageURL}\">{ts}Make a contribution{/ts}</a></p>\n    {/if}\n    {if $event}\n     <p><a href=\"{$pageURL}\">{ts}Find out more about this event{/ts}</a></p>\n    {/if}\n   </td>\n  </tr>\n </table>\n</center>\n\n</body>\n</html>\n',1,841,'friend',0,1,0,NULL),(45,'Memberships - Signup and Renewal Receipts (off-line)','{if $receiptType EQ \'membership signup\'}\n{ts}Membership Confirmation and Receipt{/ts}\n{elseif $receiptType EQ \'membership renewal\'}\n{ts}Membership Renewal Confirmation and Receipt{/ts}\n{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text_signup}\n{$formValues.receipt_text_signup}\n{elseif $formValues.receipt_text_renewal}\n{$formValues.receipt_text_renewal}\n{else}{ts}Thank you for this contribution.{/ts}{/if}\n\n{if !$lineItem}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{/if}\n{if ! $cancelled}\n{if !$lineItem}\n{ts}Membership Start Date{/ts}: {$mem_start_date}\n{ts}Membership End Date{/ts}: {$mem_end_date}\n{/if}\n\n{if $formValues.total_amount OR $formValues.total_amount eq 0 }\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if $formValues.contributionType_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{/if}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}  {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset}\n{$taxTerm} {$priceset|string_format:\"%.2f\"} %: {$value|crmMoney:$currency}\n{elseif  $priceset == 0}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if isset($totalTaxAmount)}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$formValues.total_amount|crmMoney}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{/if}\n{/if}\n\n{if $isPrimary }\n{if $billingName}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n\n{if $customValues}\n===========================================================\n{ts}Membership Options{/ts}\n\n===========================================================\n{foreach from=$customValues item=value key=customName}\n {$customName} : {$value}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text_signup}\n     <p>{$formValues.receipt_text_signup|htmlize}</p>\n    {elseif $formValues.receipt_text_renewal}\n     <p>{$formValues.receipt_text_renewal|htmlize}</p>\n    {else}\n     <p>{ts}Thank you for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     {if !$lineItem}\n     <tr>\n      <th {$headerStyle}>\n       {ts}Membership Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Membership Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$membership_name}\n      </td>\n     </tr>\n     {/if}\n     {if ! $cancelled}\n     {if !$lineItem}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_start_date}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_end_date}\n       </td>\n      </tr>\n      {/if}\n      {if $formValues.total_amount OR $formValues.total_amount eq 0 }\n       <tr>\n        <th {$headerStyle}>\n         {ts}Membership Fee{/ts}\n        </th>\n       </tr>\n       {if $formValues.contributionType_name}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.contributionType_name}\n         </td>\n        </tr>\n       {/if}\n\n       {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Fee{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n             {/if}\n       <th>{ts}Membership Start Date{/ts}</th>\n       <th>{ts}Membership End Date{/ts}</th>\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.line_total|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n               <td>\n                {$line.line_total+$line.tax_amount|crmMoney}\n               </td>\n              {/if}\n              <td>\n               {$line.start_date}\n              </td>\n        <td>\n               {$line.end_date}\n              </td>\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.total_amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n       {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset}\n         <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {elseif  $priceset == 0}\n         <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n       {/foreach}\n      {/if}\n      {/if}\n      {if isset($totalTaxAmount)}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.total_amount|crmMoney}\n        </td>\n       </tr>\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Date Received{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|truncate:10:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n       {if $formValues.paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.paidBy}\n         </td>\n        </tr>\n        {if $formValues.check_number}\n         <tr>\n          <td {$labelStyle}>\n           {ts}Check Number{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$formValues.check_number}\n          </td>\n         </tr>\n        {/if}\n       {/if}\n      {/if}\n     {/if}\n    </table>\n   </td>\n  </tr>\n\n  {if $isPrimary}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n      {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {$billingName}<br />\n         {$address}\n        </td>\n       </tr>\n      {/if}\n\n      {if $credit_card_type}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Credit Card Information{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$valueStyle}>\n         {$credit_card_type}<br />\n         {$credit_card_number}\n        </td>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {ts}Expires{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n  {if $customValues}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Options{/ts}\n       </th>\n      </tr>\n      {foreach from=$customValues item=value key=customName}\n       <tr>\n        <td {$labelStyle}>\n         {$customName}\n        </td>\n        <td {$valueStyle}>\n         {$value}\n        </td>\n       </tr>\n      {/foreach}\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,842,'membership_offline_receipt',1,0,0,NULL),(46,'Memberships - Signup and Renewal Receipts (off-line)','{if $receiptType EQ \'membership signup\'}\n{ts}Membership Confirmation and Receipt{/ts}\n{elseif $receiptType EQ \'membership renewal\'}\n{ts}Membership Renewal Confirmation and Receipt{/ts}\n{/if} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{if $formValues.receipt_text_signup}\n{$formValues.receipt_text_signup}\n{elseif $formValues.receipt_text_renewal}\n{$formValues.receipt_text_renewal}\n{else}{ts}Thank you for this contribution.{/ts}{/if}\n\n{if !$lineItem}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{/if}\n{if ! $cancelled}\n{if !$lineItem}\n{ts}Membership Start Date{/ts}: {$mem_start_date}\n{ts}Membership End Date{/ts}: {$mem_end_date}\n{/if}\n\n{if $formValues.total_amount OR $formValues.total_amount eq 0 }\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if $formValues.contributionType_name}\n{ts}Financial Type{/ts}: {$formValues.contributionType_name}\n{/if}\n{if $lineItem}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"}  {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$formValues.total_amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset}\n{$taxTerm} {$priceset|string_format:\"%.2f\"} %: {$value|crmMoney:$currency}\n{elseif  $priceset == 0}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if isset($totalTaxAmount)}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$formValues.total_amount|crmMoney}\n{if $receive_date}\n{ts}Date Received{/ts}: {$receive_date|truncate:10:\'\'|crmDate}\n{/if}\n{if $formValues.paidBy}\n{ts}Paid By{/ts}: {$formValues.paidBy}\n{if $formValues.check_number}\n{ts}Check Number{/ts}: {$formValues.check_number}\n{/if}\n{/if}\n{/if}\n{/if}\n\n{if $isPrimary }\n{if $billingName}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n{/if}\n\n{if $credit_card_type}\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n{/if}\n\n{if $customValues}\n===========================================================\n{ts}Membership Options{/ts}\n\n===========================================================\n{foreach from=$customValues item=value key=customName}\n {$customName} : {$value}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $formValues.receipt_text_signup}\n     <p>{$formValues.receipt_text_signup|htmlize}</p>\n    {elseif $formValues.receipt_text_renewal}\n     <p>{$formValues.receipt_text_renewal|htmlize}</p>\n    {else}\n     <p>{ts}Thank you for this contribution.{/ts}</p>\n    {/if}\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     {if !$lineItem}\n     <tr>\n      <th {$headerStyle}>\n       {ts}Membership Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Membership Type{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$membership_name}\n      </td>\n     </tr>\n     {/if}\n     {if ! $cancelled}\n     {if !$lineItem}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Start Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_start_date}\n       </td>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership End Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$mem_end_date}\n       </td>\n      </tr>\n      {/if}\n      {if $formValues.total_amount OR $formValues.total_amount eq 0 }\n       <tr>\n        <th {$headerStyle}>\n         {ts}Membership Fee{/ts}\n        </th>\n       </tr>\n       {if $formValues.contributionType_name}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Financial Type{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.contributionType_name}\n         </td>\n        </tr>\n       {/if}\n\n       {if $lineItem}\n       {foreach from=$lineItem item=value key=priceset}\n         <tr>\n          <td colspan=\"2\" {$valueStyle}>\n           <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n            <tr>\n             <th>{ts}Item{/ts}</th>\n             <th>{ts}Fee{/ts}</th>\n             {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n             {/if}\n       <th>{ts}Membership Start Date{/ts}</th>\n       <th>{ts}Membership End Date{/ts}</th>\n            </tr>\n            {foreach from=$value item=line}\n             <tr>\n              <td>\n        {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n              </td>\n              <td>\n               {$line.line_total|crmMoney}\n              </td>\n              {if $dataArray}\n               <td>\n                {$line.unit_price*$line.qty|crmMoney}\n               </td>\n               {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n                <td>\n                 {$line.tax_rate|string_format:\"%.2f\"}%\n                </td>\n                <td>\n                 {$line.tax_amount|crmMoney}\n                </td>\n               {else}\n                <td></td>\n                <td></td>\n               {/if}\n               <td>\n                {$line.line_total+$line.tax_amount|crmMoney}\n               </td>\n              {/if}\n              <td>\n               {$line.start_date}\n              </td>\n        <td>\n               {$line.end_date}\n              </td>\n             </tr>\n            {/foreach}\n           </table>\n          </td>\n         </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.total_amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n       {foreach from=$dataArray item=value key=priceset}\n        <tr>\n        {if $priceset}\n         <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {elseif  $priceset == 0}\n         <td>&nbsp;{ts}No{/ts} {$taxTerm}</td>\n         <td>&nbsp;{$value|crmMoney:$currency}</td>\n        {/if}\n        </tr>\n       {/foreach}\n      {/if}\n      {/if}\n      {if isset($totalTaxAmount)}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$formValues.total_amount|crmMoney}\n        </td>\n       </tr>\n       {if $receive_date}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Date Received{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$receive_date|truncate:10:\'\'|crmDate}\n         </td>\n        </tr>\n       {/if}\n       {if $formValues.paidBy}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Paid By{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$formValues.paidBy}\n         </td>\n        </tr>\n        {if $formValues.check_number}\n         <tr>\n          <td {$labelStyle}>\n           {ts}Check Number{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$formValues.check_number}\n          </td>\n         </tr>\n        {/if}\n       {/if}\n      {/if}\n     {/if}\n    </table>\n   </td>\n  </tr>\n\n  {if $isPrimary}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n\n      {if $billingName}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {$billingName}<br />\n         {$address}\n        </td>\n       </tr>\n      {/if}\n\n      {if $credit_card_type}\n       <tr>\n        <th {$headerStyle}>\n         {ts}Credit Card Information{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td {$valueStyle}>\n         {$credit_card_type}<br />\n         {$credit_card_number}\n        </td>\n       </tr>\n       <tr>\n        <td {$labelStyle}>\n         {ts}Expires{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n  {if $customValues}\n   <tr>\n    <td>\n     <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Options{/ts}\n       </th>\n      </tr>\n      {foreach from=$customValues item=value key=customName}\n       <tr>\n        <td {$labelStyle}>\n         {$customName}\n        </td>\n        <td {$valueStyle}>\n         {$value}\n        </td>\n       </tr>\n      {/foreach}\n     </table>\n    </td>\n   </tr>\n  {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,842,'membership_offline_receipt',0,1,0,NULL),(47,'Memberships - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $membership_assign && !$useForMember}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n{/if}\n{if $amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if !$useForMember && $membership_amount && $is_quick_config}\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{if $amount && !$is_separate_payment }\n{ts}Contribution Amount{/ts}: {$amount|crmMoney}\n-------------------------------------------\n{ts}Total{/ts}: {$amount+$membership_amount|crmMoney}\n{/if}\n{elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{$line.description|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney}\n{else}\n{if $useForMember && $lineItem && !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{elseif $membership_amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{/if}\n\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n\n{/if}\n{if $membership_trx_id}\n{ts}Membership Transaction #{/ts}: {$membership_trx_id}\n\n{/if}\n{if $is_recur}\n{ts}This membership will be renewed automatically.{/ts}\n{if $cancelSubscriptionUrl}\n\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by visiting this web page: %1.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n{/if}\n{/if}\n\n{if $honor_block_is_active }\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or email *}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $membership_assign && !$useForMember}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Type{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_name}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n\n     {if $amount}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n\n      {if !$useForMember and $membership_amount and $is_quick_config}\n\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$membership_name}%1 Membership{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$membership_amount|crmMoney}\n        </td>\n       </tr>\n       {if $amount && !$is_separate_payment }\n         <tr>\n          <td {$labelStyle}>\n           {ts}Contribution Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$amount|crmMoney}\n          </td>\n         </tr>\n         <tr>\n           <td {$labelStyle}>\n           {ts}Total{/ts}\n            </td>\n            <td {$valueStyle}>\n            {$amount+$membership_amount|crmMoney}\n           </td>\n         </tr>\n       {/if}\n\n      {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n              {$line.description|truncate:30:\"...\"}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney}\n        </td>\n       </tr>\n\n      {else}\n       {if $useForMember && $lineItem and !$is_quick_config}\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Fee{/ts}</th>\n            {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n            {/if}\n      <th>{ts}Membership Start Date{/ts}</th>\n      <th>{ts}Membership End Date{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n             {if $dataArray}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n             {/if}\n             <td>\n              {$line.start_date}\n             </td>\n       <td>\n              {$line.end_date}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n         {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {else}\n           <td>&nbsp;{ts}NO{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {/if}\n         </tr>\n        {/foreach}\n       {/if}\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n\n     {elseif $membership_amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts 1=$membership_name}%1 Membership{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_amount|crmMoney}\n       </td>\n      </tr>\n\n\n     {/if}\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $membership_trx_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_trx_id}\n       </td>\n      </tr>\n     {/if}\n     {if $is_recur}\n       <tr>\n        <td colspan=\"2\" {$labelStyle}>\n         {ts}This membership will be renewed automatically.{/ts}\n         {if $cancelSubscriptionUrl}\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         {/if}\n        </td>\n       </tr>\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $billingName}\n       <tr>\n         <th {$headerStyle}>\n           {ts}Billing Name and Address{/ts}\n         </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}<br />\n          {$email}\n        </td>\n      </tr>\n    {elseif $email}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$email}\n        </td>\n      </tr>\n    {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,843,'membership_online_receipt',1,0,0,NULL),(48,'Memberships - Receipt (on-line)','{if $is_pay_later}{ts}Invoice{/ts}{else}{ts}Receipt{/ts}{/if} - {$title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n{if $receipt_text}\n{$receipt_text}\n{/if}\n{if $is_pay_later}\n\n===========================================================\n{$pay_later_receipt}\n===========================================================\n{/if}\n\n{if $membership_assign && !$useForMember}\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Type{/ts}: {$membership_name}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n{/if}\n{if $amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{if !$useForMember && $membership_amount && $is_quick_config}\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{if $amount && !$is_separate_payment }\n{ts}Contribution Amount{/ts}: {$amount|crmMoney}\n-------------------------------------------\n{ts}Total{/ts}: {$amount+$membership_amount|crmMoney}\n{/if}\n{elseif !$useForMember && $lineItem and $priceSetID & !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n---------------------------------------------------------\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_qty}{ts}Qty{/ts}{/capture}\n{capture assign=ts_each}{ts}Each{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_qty|string_format:\"%5s\"} {$ts_each|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"}\n----------------------------------------------------------\n{foreach from=$value item=line}\n{$line.description|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.qty|string_format:\"%5s\"} {$line.unit_price|crmMoney|string_format:\"%10s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}\n{/foreach}\n{/foreach}\n\n{ts}Total Amount{/ts}: {$amount|crmMoney}\n{else}\n{if $useForMember && $lineItem && !$is_quick_config}\n{foreach from=$lineItem item=value key=priceset}\n{capture assign=ts_item}{ts}Item{/ts}{/capture}\n{capture assign=ts_total}{ts}Fee{/ts}{/capture}\n{if $dataArray}\n{capture assign=ts_subtotal}{ts}Subtotal{/ts}{/capture}\n{capture assign=ts_taxRate}{ts}Tax Rate{/ts}{/capture}\n{capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture}\n{capture assign=ts_total}{ts}Total{/ts}{/capture}\n{/if}\n{capture assign=ts_start_date}{ts}Membership Start Date{/ts}{/capture}\n{capture assign=ts_end_date}{ts}Membership End Date{/ts}{/capture}\n{$ts_item|string_format:\"%-30s\"} {$ts_total|string_format:\"%10s\"} {if $dataArray} {$ts_subtotal|string_format:\"%10s\"} {$ts_taxRate|string_format:\"%10s\"} {$ts_taxAmount|string_format:\"%10s\"} {$ts_total|string_format:\"%10s\"} {/if} {$ts_start_date|string_format:\"%20s\"} {$ts_end_date|string_format:\"%20s\"}\n--------------------------------------------------------------------------------------------------\n\n{foreach from=$value item=line}\n{capture assign=ts_item}{if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:\"...\"|string_format:\"%-30s\"} {$line.line_total|crmMoney|string_format:\"%10s\"}  {if $dataArray} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:\"%10s\"} {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}  {$line.tax_rate|string_format:\"%.2f\"} %  {$line.tax_amount|crmMoney:$currency|string_format:\"%10s\"} {else}                  {/if}   {$line.line_total+$line.tax_amount|crmMoney|string_format:\"%10s\"} {/if} {$line.start_date|string_format:\"%20s\"} {$line.end_date|string_format:\"%20s\"}\n{/foreach}\n{/foreach}\n\n{if $dataArray}\n{ts}Amount before Tax{/ts}: {$amount-$totalTaxAmount|crmMoney:$currency}\n\n{foreach from=$dataArray item=value key=priceset}\n{if $priceset || $priceset == 0}\n{$taxTerm} {$priceset|string_format:\"%.2f\"}%: {$value|crmMoney:$currency}\n{else}\n{ts}No{/ts} {$taxTerm}: {$value|crmMoney:$currency}\n{/if}\n{/foreach}\n{/if}\n--------------------------------------------------------------------------------------------------\n{/if}\n\n{if $totalTaxAmount}\n{ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}\n{/if}\n\n{ts}Amount{/ts}: {$amount|crmMoney} {if $amount_level } - {$amount_level} {/if}\n{/if}\n{elseif $membership_amount}\n===========================================================\n{ts}Membership Fee{/ts}\n\n===========================================================\n{ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney}\n{/if}\n\n{if $receive_date}\n\n{ts}Date{/ts}: {$receive_date|crmDate}\n{/if}\n{if $is_monetary and $trxn_id}\n{ts}Transaction #{/ts}: {$trxn_id}\n\n{/if}\n{if $membership_trx_id}\n{ts}Membership Transaction #{/ts}: {$membership_trx_id}\n\n{/if}\n{if $is_recur}\n{ts}This membership will be renewed automatically.{/ts}\n{if $cancelSubscriptionUrl}\n\n{ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by visiting this web page: %1.{/ts}\n\n{/if}\n\n{if $updateSubscriptionBillingUrl}\n\n{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n{/if}\n{/if}\n\n{if $honor_block_is_active }\n===========================================================\n{$soft_credit_type}\n===========================================================\n{foreach from=$honoreeProfile item=value key=label}\n{$label}: {$value}\n{/foreach}\n\n{/if}\n{if $pcpBlock}\n===========================================================\n{ts}Personal Campaign Page{/ts}\n\n===========================================================\n{ts}Display In Honor Roll{/ts}: {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n\n{if $pcp_roll_nickname}{ts}Nickname{/ts}: {$pcp_roll_nickname}{/if}\n\n{if $pcp_personal_note}{ts}Personal Note{/ts}: {$pcp_personal_note}{/if}\n\n{/if}\n{if $onBehalfProfile}\n===========================================================\n{ts}On Behalf Of{/ts}\n\n===========================================================\n{foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n{$onBehalfName}: {$onBehalfValue}\n{/foreach}\n{/if}\n\n{if $billingName}\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n{elseif $email}\n===========================================================\n{ts}Registered Email{/ts}\n\n===========================================================\n{$email}\n{/if} {* End billingName or email *}\n{if $credit_card_type}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n{/if}\n\n{if $selectPremium }\n===========================================================\n{ts}Premium Information{/ts}\n\n===========================================================\n{$product_name}\n{if $option}\n{ts}Option{/ts}: {$option}\n{/if}\n{if $sku}\n{ts}SKU{/ts}: {$sku}\n{/if}\n{if $start_date}\n{ts}Start Date{/ts}: {$start_date|crmDate}\n{/if}\n{if $end_date}\n{ts}End Date{/ts}: {$end_date|crmDate}\n{/if}\n{if $contact_email OR $contact_phone}\n\n{ts}For information about this premium, contact:{/ts}\n\n{if $contact_email}\n  {$contact_email}\n{/if}\n{if $contact_phone}\n  {$contact_phone}\n{/if}\n{/if}\n{if $is_deductible AND $price}\n\n{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}{/if}\n{/if}\n\n{if $customPre}\n===========================================================\n{$customPre_grouptitle}\n\n===========================================================\n{foreach from=$customPre item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n\n\n{if $customPost}\n===========================================================\n{$customPost_grouptitle}\n\n===========================================================\n{foreach from=$customPost item=customValue key=customName}\n{if ( $trackingFields and ! in_array( $customName, $trackingFields ) ) or ! $trackingFields}\n {$customName}: {$customValue}\n{/if}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n     {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    {if $receipt_text}\n     <p>{$receipt_text|htmlize}</p>\n    {/if}\n\n    {if $is_pay_later}\n     <p>{$pay_later_receipt}</p> {* FIXME: this might be text rather than HTML *}\n    {/if}\n\n   </td>\n  </tr>\n  </table>\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n     {if $membership_assign && !$useForMember}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Type{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_name}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n\n     {if $amount}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n\n      {if !$useForMember and $membership_amount and $is_quick_config}\n\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$membership_name}%1 Membership{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$membership_amount|crmMoney}\n        </td>\n       </tr>\n       {if $amount && !$is_separate_payment }\n         <tr>\n          <td {$labelStyle}>\n           {ts}Contribution Amount{/ts}\n          </td>\n          <td {$valueStyle}>\n           {$amount|crmMoney}\n          </td>\n         </tr>\n         <tr>\n           <td {$labelStyle}>\n           {ts}Total{/ts}\n            </td>\n            <td {$valueStyle}>\n            {$amount+$membership_amount|crmMoney}\n           </td>\n         </tr>\n       {/if}\n\n      {elseif !$useForMember && $lineItem and $priceSetID and !$is_quick_config}\n\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Qty{/ts}</th>\n            <th>{ts}Each{/ts}</th>\n            <th>{ts}Total{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n              {$line.description|truncate:30:\"...\"}\n             </td>\n             <td>\n              {$line.qty}\n             </td>\n             <td>\n              {$line.unit_price|crmMoney}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Total Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney}\n        </td>\n       </tr>\n\n      {else}\n       {if $useForMember && $lineItem and !$is_quick_config}\n       {foreach from=$lineItem item=value key=priceset}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <table> {* FIXME: style this table so that it looks like the text version (justification, etc.) *}\n           <tr>\n            <th>{ts}Item{/ts}</th>\n            <th>{ts}Fee{/ts}</th>\n            {if $dataArray}\n              <th>{ts}SubTotal{/ts}</th>\n              <th>{ts}Tax Rate{/ts}</th>\n              <th>{ts}Tax Amount{/ts}</th>\n              <th>{ts}Total{/ts}</th>\n            {/if}\n      <th>{ts}Membership Start Date{/ts}</th>\n      <th>{ts}Membership End Date{/ts}</th>\n           </tr>\n           {foreach from=$value item=line}\n            <tr>\n             <td>\n             {if $line.html_type eq \'Text\'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:\"...\"}</div>{/if}\n             </td>\n             <td>\n              {$line.line_total|crmMoney}\n             </td>\n             {if $dataArray}\n              <td>\n               {$line.unit_price*$line.qty|crmMoney}\n              </td>\n              {if $line.tax_rate != \"\" || $line.tax_amount != \"\"}\n               <td>\n                {$line.tax_rate|string_format:\"%.2f\"}%\n               </td>\n               <td>\n                {$line.tax_amount|crmMoney}\n               </td>\n              {else}\n               <td></td>\n               <td></td>\n              {/if}\n              <td>\n               {$line.line_total+$line.tax_amount|crmMoney}\n              </td>\n             {/if}\n             <td>\n              {$line.start_date}\n             </td>\n       <td>\n              {$line.end_date}\n             </td>\n            </tr>\n           {/foreach}\n          </table>\n         </td>\n        </tr>\n       {/foreach}\n       {if $dataArray}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Amount Before Tax:{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$amount-$totalTaxAmount|crmMoney}\n         </td>\n        </tr>\n        {foreach from=$dataArray item=value key=priceset}\n         <tr>\n         {if $priceset || $priceset == 0}\n           <td>&nbsp;{$taxTerm} {$priceset|string_format:\"%.2f\"}%</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {else}\n           <td>&nbsp;{ts}NO{/ts} {$taxTerm}</td>\n           <td>&nbsp;{$value|crmMoney:$currency}</td>\n         {/if}\n         </tr>\n        {/foreach}\n       {/if}\n       {/if}\n       {if $totalTaxAmount}\n        <tr>\n         <td {$labelStyle}>\n          {ts}Total Tax Amount{/ts}\n         </td>\n         <td {$valueStyle}>\n          {$totalTaxAmount|crmMoney:$currency}\n         </td>\n        </tr>\n       {/if}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Amount{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$amount|crmMoney} {if $amount_level} - {$amount_level}{/if}\n        </td>\n       </tr>\n\n      {/if}\n\n\n     {elseif $membership_amount}\n\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Fee{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts 1=$membership_name}%1 Membership{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_amount|crmMoney}\n       </td>\n      </tr>\n\n\n     {/if}\n\n     {if $receive_date}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Date{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$receive_date|crmDate}\n       </td>\n      </tr>\n     {/if}\n\n     {if $is_monetary and $trxn_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$trxn_id}\n       </td>\n      </tr>\n     {/if}\n\n     {if $membership_trx_id}\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Transaction #{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_trx_id}\n       </td>\n      </tr>\n     {/if}\n     {if $is_recur}\n       <tr>\n        <td colspan=\"2\" {$labelStyle}>\n         {ts}This membership will be renewed automatically.{/ts}\n         {if $cancelSubscriptionUrl}\n           {ts 1=$cancelSubscriptionUrl}You can cancel the auto-renewal option by <a href=\"%1\">visiting this web page</a>.{/ts}\n         {/if}\n        </td>\n       </tr>\n       {if $updateSubscriptionBillingUrl}\n         <tr>\n          <td colspan=\"2\" {$labelStyle}>\n           {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href=\"%1\">visiting this web page</a>.{/ts}\n          </td>\n         </tr>\n       {/if}\n     {/if}\n\n     {if $honor_block_is_active}\n      <tr>\n       <th {$headerStyle}>\n        {$soft_credit_type}\n       </th>\n      </tr>\n      {foreach from=$honoreeProfile item=value key=label}\n        <tr>\n         <td {$labelStyle}>\n          {$label}\n         </td>\n         <td {$valueStyle}>\n          {$value}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $pcpBlock}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Personal Campaign Page{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Display In Honor Roll{/ts}\n       </td>\n       <td {$valueStyle}>\n        {if $pcp_display_in_roll}{ts}Yes{/ts}{else}{ts}No{/ts}{/if}\n       </td>\n      </tr>\n      {if $pcp_roll_nickname}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Nickname{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_roll_nickname}\n        </td>\n       </tr>\n      {/if}\n      {if $pcp_personal_note}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Personal Note{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$pcp_personal_note}\n        </td>\n       </tr>\n      {/if}\n     {/if}\n\n     {if $onBehalfProfile}\n      <tr>\n       <th {$headerStyle}>\n        {$onBehalfProfile_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$onBehalfProfile item=onBehalfValue key=onBehalfName}\n        <tr>\n         <td {$labelStyle}>\n          {$onBehalfName}\n         </td>\n         <td {$valueStyle}>\n          {$onBehalfValue}\n         </td>\n        </tr>\n      {/foreach}\n     {/if}\n\n     {if $billingName}\n       <tr>\n         <th {$headerStyle}>\n           {ts}Billing Name and Address{/ts}\n         </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$billingName}<br />\n          {$address|nl2br}<br />\n          {$email}\n        </td>\n      </tr>\n    {elseif $email}\n      <tr>\n        <th {$headerStyle}>\n          {ts}Registered Email{/ts}\n        </th>\n      </tr>\n      <tr>\n        <td colspan=\"2\" {$valueStyle}>\n          {$email}\n        </td>\n      </tr>\n    {/if}\n\n     {if $credit_card_type}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n     {/if}\n\n     {if $selectPremium}\n      <tr>\n       <th {$headerStyle}>\n        {ts}Premium Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$labelStyle}>\n        {$product_name}\n       </td>\n      </tr>\n      {if $option}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Option{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$option}\n        </td>\n       </tr>\n      {/if}\n      {if $sku}\n       <tr>\n        <td {$labelStyle}>\n         {ts}SKU{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$sku}\n        </td>\n       </tr>\n      {/if}\n      {if $start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $contact_email OR $contact_phone}\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         <p>{ts}For information about this premium, contact:{/ts}</p>\n         {if $contact_email}\n          <p>{$contact_email}</p>\n         {/if}\n         {if $contact_phone}\n          <p>{$contact_phone}</p>\n         {/if}\n        </td>\n       </tr>\n      {/if}\n      {if $is_deductible AND $price}\n        <tr>\n         <td colspan=\"2\" {$valueStyle}>\n          <p>{ts 1=$price|crmMoney}The value of this premium is %1. This may affect the amount of the tax deduction you can claim. Consult your tax advisor for more information.{/ts}</p>\n         </td>\n        </tr>\n      {/if}\n     {/if}\n\n     {if $customPre}\n      <tr>\n       <th {$headerStyle}>\n        {$customPre_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPre item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n     {if $customPost}\n      <tr>\n       <th {$headerStyle}>\n        {$customPost_grouptitle}\n       </th>\n      </tr>\n      {foreach from=$customPost item=customValue key=customName}\n       {if ($trackingFields and ! in_array($customName, $trackingFields)) or ! $trackingFields}\n        <tr>\n         <td {$labelStyle}>\n          {$customName}\n         </td>\n         <td {$valueStyle}>\n          {$customValue}\n         </td>\n        </tr>\n       {/if}\n      {/foreach}\n     {/if}\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,843,'membership_online_receipt',0,1,0,NULL),(49,'Memberships - Auto-renew Cancellation Notification','{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}\n\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Status{/ts}: {$membership_status}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}</p>\n\n   </td>\n  </tr>\n </table>\n <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Status{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_status}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,844,'membership_autorenew_cancelled',1,0,0,NULL),(50,'Memberships - Auto-renew Cancellation Notification','{ts}Autorenew Membership Cancellation Notification{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}\n\n===========================================================\n{ts}Membership Information{/ts}\n\n===========================================================\n{ts}Membership Status{/ts}: {$membership_status}\n{if $mem_start_date}{ts}Membership Start Date{/ts}: {$mem_start_date|crmDate}\n{/if}\n{if $mem_end_date}{ts}Membership End Date{/ts}: {$mem_end_date|crmDate}\n{/if}\n\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}The automatic renewal of your %1 membership has been cancelled as requested. This does not affect the status of your membership - you will receive a separate notification when your membership is up for renewal.{/ts}</p>\n\n   </td>\n  </tr>\n </table>\n <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n\n      <tr>\n       <th {$headerStyle}>\n        {ts}Membership Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td {$labelStyle}>\n        {ts}Membership Status{/ts}\n       </td>\n       <td {$valueStyle}>\n        {$membership_status}\n       </td>\n      </tr>\n      {if $mem_start_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership Start Date{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$mem_start_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n      {if $mem_end_date}\n       <tr>\n        <td {$labelStyle}>\n         {ts}Membership End Date{/ts}\n        </td>\n        <td {$valueStyle}>\n          {$mem_end_date|crmDate}\n        </td>\n       </tr>\n      {/if}\n\n </table>\n</center>\n\n</body>\n</html>\n',1,844,'membership_autorenew_cancelled',0,1,0,NULL),(51,'Memberships - Auto-renew Billing Updates','{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n   <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n         {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n      </tr>\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,845,'membership_autorenew_billing',1,0,0,NULL),(52,'Memberships - Auto-renew Billing Updates','{ts}Membership Autorenewal Billing Updates{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}\n\n===========================================================\n{ts}Billing Name and Address{/ts}\n\n===========================================================\n{$billingName}\n{$address}\n\n{$email}\n\n===========================================================\n{ts}Credit Card Information{/ts}\n\n===========================================================\n{$credit_card_type}\n{$credit_card_number}\n{ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}\n\n\n{ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$membershipType}Billing details for your automatically renewed %1 membership have been updated.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n </table>\n\n  <table style=\"width:100%; max-width:500px; border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse;\">\n   <tr>\n        <th {$headerStyle}>\n         {ts}Billing Name and Address{/ts}\n        </th>\n       </tr>\n       <tr>\n        <td colspan=\"2\" {$valueStyle}>\n         {$billingName}<br />\n         {$address|nl2br}<br />\n         {$email}\n        </td>\n       </tr>\n        <tr>\n       <th {$headerStyle}>\n        {ts}Credit Card Information{/ts}\n       </th>\n      </tr>\n      <tr>\n       <td colspan=\"2\" {$valueStyle}>\n        {$credit_card_type}<br />\n        {$credit_card_number}<br />\n        {ts}Expires{/ts}: {$credit_card_exp_date|truncate:7:\'\'|crmDate}<br />\n       </td>\n      </tr>\n      <tr>\n        <td {$labelStyle}>\n         {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts}\n        </td>\n      </tr>\n\n  </table>\n</center>\n\n</body>\n</html>\n',1,845,'membership_autorenew_billing',0,1,0,NULL),(53,'Test-drive - Receipt Header','[TEST]\n','***********************************************************\n\n{ts}Test-drive Email / Receipt{/ts}\n\n{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}\n\n***********************************************************\n','<center>\n <table id=\"crm-event_receipt_test\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <tr>\n   <td>\n    <p>{ts}Test-drive Email / Receipt{/ts}</p>\n    <p>{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}</p>\n   </td>\n  </tr>\n </table>\n</center>\n',1,846,'test_preview',1,0,0,NULL),(54,'Test-drive - Receipt Header','[TEST]\n','***********************************************************\n\n{ts}Test-drive Email / Receipt{/ts}\n\n{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}\n\n***********************************************************\n','<center>\n <table id=\"crm-event_receipt_test\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n  <tr>\n   <td>\n    <p>{ts}Test-drive Email / Receipt{/ts}</p>\n    <p>{ts}This is a test-drive email. No live financial transaction has occurred.{/ts}</p>\n   </td>\n  </tr>\n </table>\n</center>\n',1,846,'test_preview',0,1,0,NULL),(55,'Pledges - Acknowledgement','{ts}Thank you for your Pledge{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n{ts}Thank you for your generous pledge.{/ts}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$total_pledge_amount|crmMoney:$currency}\n\n===========================================================\n{ts}Payment Schedule{/ts}\n\n===========================================================\n{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}\n\n{if $frequency_day}\n\n{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}\n{/if}\n\n{if $payments}\n{assign var=\"count\" value=\"1\"}\n{foreach from=$payments item=payment}\n\n{ts 1=$count}Payment %1{/ts}: {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n{assign var=\"count\" value=`$count+1`}\n{/foreach}\n{/if}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Thank you for your generous pledge.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$total_pledge_amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Schedule{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}</p>\n\n       {if $frequency_day}\n        <p>{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}</p>\n       {/if}\n      </td>\n     </tr>\n\n     {if $payments}\n      {assign var=\"count\" value=\"1\"}\n      {foreach from=$payments item=payment}\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$count}Payment %1{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n        </td>\n       </tr>\n       {assign var=\"count\" value=`$count+1`}\n      {/foreach}\n     {/if}\n\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n      </td>\n     </tr>\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,847,'pledge_acknowledge',1,0,0,NULL),(56,'Pledges - Acknowledgement','{ts}Thank you for your Pledge{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n{ts}Thank you for your generous pledge.{/ts}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$total_pledge_amount|crmMoney:$currency}\n\n===========================================================\n{ts}Payment Schedule{/ts}\n\n===========================================================\n{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}\n\n{if $frequency_day}\n\n{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}\n{/if}\n\n{if $payments}\n{assign var=\"count\" value=\"1\"}\n{foreach from=$payments item=payment}\n\n{ts 1=$count}Payment %1{/ts}: {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n{assign var=\"count\" value=`$count+1`}\n{/foreach}\n{/if}\n\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n{if $customGroup}\n{foreach from=$customGroup item=value key=customName}\n===========================================================\n{$customName}\n===========================================================\n{foreach from=$value item=v key=n}\n{$n}: {$v}\n{/foreach}\n{/foreach}\n{/if}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts}Thank you for your generous pledge.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$total_pledge_amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Schedule{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$scheduled_amount|crmMoney:$currency 2=$frequency_interval 3=$frequency_unit 4=$installments}%1 every %2 %3 for %4 installments.{/ts}</p>\n\n       {if $frequency_day}\n        <p>{ts 1=$frequency_day 2=$frequency_unit}Payments are due on day %1 of the %2.{/ts}</p>\n       {/if}\n      </td>\n     </tr>\n\n     {if $payments}\n      {assign var=\"count\" value=\"1\"}\n      {foreach from=$payments item=payment}\n       <tr>\n        <td {$labelStyle}>\n         {ts 1=$count}Payment %1{/ts}\n        </td>\n        <td {$valueStyle}>\n         {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:\'\'|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:\'\'|crmDate}{/if}\n        </td>\n       </tr>\n       {assign var=\"count\" value=`$count+1`}\n      {/foreach}\n     {/if}\n\n     <tr>\n      <td colspan=\"2\" {$valueStyle}>\n       <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n      </td>\n     </tr>\n\n     {if $customGroup}\n      {foreach from=$customGroup item=value key=customName}\n       <tr>\n        <th {$headerStyle}>\n         {$customName}\n        </th>\n       </tr>\n       {foreach from=$value item=v key=n}\n        <tr>\n         <td {$labelStyle}>\n          {$n}\n         </td>\n         <td {$valueStyle}>\n          {$v}\n         </td>\n        </tr>\n       {/foreach}\n      {/foreach}\n     {/if}\n\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,847,'pledge_acknowledge',0,1,0,NULL),(57,'Pledges - Payment Reminder','{ts}Pledge Payment Reminder{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}\n\n===========================================================\n{ts}Payment Due{/ts}\n\n===========================================================\n{ts}Amount Due{/ts}: {$amount_due|crmMoney:$currency}\n{ts}Due Date{/ts}: {$scheduled_payment_date|truncate:10:\'\'|crmDate}\n\n{if $contribution_page_id}\n{capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\nClick this link to go to a web page where you can make your payment online:\n{$contributionUrl}\n{else}\n{ts}Please mail your payment to{/ts}:\n{$domain.address}\n{/if}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$amount|crmMoney:$currency}\n{ts}Total Paid{/ts}: {$amount_paid|crmMoney:$currency}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n\n{ts}Thank your for your generous support.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Due{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Amount Due{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_due|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    {if $contribution_page_id}\n     {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\n     <p><a href=\"{$contributionUrl}\">{ts}Go to a web page where you can make your payment online{/ts}</a></p>\n    {else}\n     <p>{ts}Please mail your payment to{/ts}: {$domain.address}</p>\n    {/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Paid{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_paid|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n    <p>{ts}Thank your for your generous support.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,848,'pledge_reminder',1,0,0,NULL),(58,'Pledges - Payment Reminder','{ts}Pledge Payment Reminder{/ts} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\n{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}\n\n===========================================================\n{ts}Payment Due{/ts}\n\n===========================================================\n{ts}Amount Due{/ts}: {$amount_due|crmMoney:$currency}\n{ts}Due Date{/ts}: {$scheduled_payment_date|truncate:10:\'\'|crmDate}\n\n{if $contribution_page_id}\n{capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\nClick this link to go to a web page where you can make your payment online:\n{$contributionUrl}\n{else}\n{ts}Please mail your payment to{/ts}:\n{$domain.address}\n{/if}\n\n===========================================================\n{ts}Pledge Information{/ts}\n\n===========================================================\n{ts}Pledge Received{/ts}: {$create_date|truncate:10:\'\'|crmDate}\n{ts}Total Pledge Amount{/ts}: {$amount|crmMoney:$currency}\n{ts}Total Paid{/ts}: {$amount_paid|crmMoney:$currency}\n\n{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}\n\n\n{ts}Thank your for your generous support.{/ts}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    {assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n    <p>{ts 1=$next_payment|truncate:10:\'\'|crmDate}This is a reminder that the next payment on your pledge is due on %1.{/ts}</p>\n   </td>\n  </tr>\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Payment Due{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Amount Due{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_due|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    {if $contribution_page_id}\n     {capture assign=contributionUrl}{crmURL p=\'civicrm/contribute/transact\' q=\"reset=1&id=`$contribution_page_id`&cid=`$contact.contact_id`&pledgeId=`$pledge_id`&cs=`$checksumValue`\" a=true h=0}{/capture}\n     <p><a href=\"{$contributionUrl}\">{ts}Go to a web page where you can make your payment online{/ts}</a></p>\n    {else}\n     <p>{ts}Please mail your payment to{/ts}: {$domain.address}</p>\n    {/if}\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <th {$headerStyle}>\n       {ts}Pledge Information{/ts}\n      </th>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Pledge Received{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$create_date|truncate:10:\'\'|crmDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Pledge Amount{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount|crmMoney:$currency}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Total Paid{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$amount_paid|crmMoney:$currency}\n      </td>\n     </tr>\n    </table>\n   </td>\n  </tr>\n\n  <tr>\n   <td>\n    <p>{ts 1=$domain.phone 2=$domain.email}Please contact us at %1 or send email to %2 if you have questions\nor need to modify your payment schedule.{/ts}</p>\n    <p>{ts}Thank your for your generous support.{/ts}</p>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,848,'pledge_reminder',0,1,0,NULL),(59,'Profiles - Admin Notification','{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}\n','{ts}Submitted For:{/ts} {$displayName}\n{ts}Date:{/ts} {$currentDate}\n{ts}Contact Summary:{/ts} {$contactLink}\n\n===========================================================\n{$grouptitle}\n\n===========================================================\n{foreach from=$values item=value key=valueName}\n{$valueName}: {$value}\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Submitted For{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$displayName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Date{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$currentDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contact Summary{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$contactLink}\n      </td>\n     </tr>\n\n     <tr>\n      <th {$headerStyle}>\n       {$grouptitle}\n      </th>\n     </tr>\n\n     {foreach from=$values item=value key=valueName}\n      <tr>\n       <td {$labelStyle}>\n        {$valueName}\n       </td>\n       <td {$valueStyle}>\n        {$value}\n       </td>\n      </tr>\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,849,'uf_notify',1,0,0,NULL),(60,'Profiles - Admin Notification','{$grouptitle} {ts 1=$displayName}Submitted by %1{/ts} - {contact.display_name}\n','{ts}Submitted For:{/ts} {$displayName}\n{ts}Date:{/ts} {$currentDate}\n{ts}Contact Summary:{/ts} {$contactLink}\n\n===========================================================\n{$grouptitle}\n\n===========================================================\n{foreach from=$values item=value key=valueName}\n{$valueName}: {$value}\n{/foreach}\n','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n{capture assign=headerStyle}colspan=\"2\" style=\"text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;\"{/capture}\n{capture assign=labelStyle }style=\"padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;\"{/capture}\n{capture assign=valueStyle }style=\"padding: 4px; border-bottom: 1px solid #999;\"{/capture}\n\n<center>\n  <table id=\"crm-event_receipt\" style=\"font-family: Arial, Verdana, sans-serif; text-align: left; width:100%; max-width:700px; padding:0; margin:0; border:0px;\">\n\n  <!-- BEGIN HEADER -->\n  <!-- You can add table row(s) here with logo or other header elements -->\n  <!-- END HEADER -->\n\n  <!-- BEGIN CONTENT -->\n\n  <tr>\n   <td>\n    <table style=\"border: 1px solid #999; margin: 1em 0em 1em; border-collapse: collapse; width:100%;\">\n     <tr>\n      <td {$labelStyle}>\n       {ts}Submitted For{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$displayName}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Date{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$currentDate}\n      </td>\n     </tr>\n     <tr>\n      <td {$labelStyle}>\n       {ts}Contact Summary{/ts}\n      </td>\n      <td {$valueStyle}>\n       {$contactLink}\n      </td>\n     </tr>\n\n     <tr>\n      <th {$headerStyle}>\n       {$grouptitle}\n      </th>\n     </tr>\n\n     {foreach from=$values item=value key=valueName}\n      <tr>\n       <td {$labelStyle}>\n        {$valueName}\n       </td>\n       <td {$valueStyle}>\n        {$value}\n       </td>\n      </tr>\n     {/foreach}\n    </table>\n   </td>\n  </tr>\n\n </table>\n</center>\n\n</body>\n</html>\n',1,849,'uf_notify',0,1,0,NULL),(61,'Petition - signature added','Thank you for signing {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n{include file=\"CRM/Campaign/Page/Petition/SocialNetwork.tpl\" petition_id=$survey_id noscript=true emailMode=true}\n',1,850,'petition_sign',1,0,0,NULL),(62,'Petition - signature added','Thank you for signing {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n{include file=\"CRM/Campaign/Page/Petition/SocialNetwork.tpl\" petition_id=$survey_id noscript=true emailMode=true}\n',1,850,'petition_sign',0,1,0,NULL),(63,'Petition - need verification','Confirmation of signature needed for {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n\nIn order to complete your signature, we must confirm your e-mail.\nPlease do so by visiting the following email confirmation web page:\n\n{$petition.confirmUrlPlainText}\n\nIf you did not sign this petition, please ignore this message.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n<p>In order to <b>complete your signature</b>, we must confirm your e-mail.\n<br />\nPlease do so by visiting the following web page by clicking\non the link below or pasting the link into your browser.\n<br /><br />\nEmail confirmation page: <a href=\"{$petition.confirmUrl} \">{$petition.confirmUrl}</a></p>\n\n<p>If you did not sign this petition, please ignore this message.</p>\n',1,851,'petition_confirmation_needed',1,0,0,NULL),(64,'Petition - need verification','Confirmation of signature needed for {$petition.title} - {contact.display_name}\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}{$greeting},{/if}\n\nThank you for signing {$petition.title}.\n\nIn order to complete your signature, we must confirm your e-mail.\nPlease do so by visiting the following email confirmation web page:\n\n{$petition.confirmUrlPlainText}\n\nIf you did not sign this petition, please ignore this message.\n','{assign var=\"greeting\" value=\"{contact.email_greeting}\"}{if $greeting}<p>{$greeting},</p>{/if}\n\n<p>Thank you for signing {$petition.title}.</p>\n\n<p>In order to <b>complete your signature</b>, we must confirm your e-mail.\n<br />\nPlease do so by visiting the following web page by clicking\non the link below or pasting the link into your browser.\n<br /><br />\nEmail confirmation page: <a href=\"{$petition.confirmUrl} \">{$petition.confirmUrl}</a></p>\n\n<p>If you did not sign this petition, please ignore this message.</p>\n',1,851,'petition_confirmation_needed',0,1,0,NULL),(65,'Sample CiviMail Newsletter Template','Sample CiviMail Newsletter','','<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<head>\n <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n <title></title>\n</head>\n<body>\n\n<table width=612 cellpadding=0 cellspacing=0 bgcolor=\"#ffffff\">\n  <tr>\n    <td colspan=\"2\" bgcolor=\"#ffffff\" valign=\"middle\" >\n      <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" >\n        <tr>\n          <td>\n          <a href=\"https://civicrm.org\"><img src=\"https://civicrm.org/sites/civicrm.org/files/top-logo_2.png\" border=0 alt=\"Replace this logo with the URL to your own\"></a>\n          </td>\n          <td>&nbsp; &nbsp;</td>\n          <td>\n          <a href=\"https://civicrm.org\" style=\"text-decoration: none;\"><font size=5 face=\"Arial, Verdana, sans-serif\" color=\"#8bc539\">Your Newsletter Title</font></a>\n          </td>\n        </tr>\n      </table>\n    </td>\n  </tr>\n  <tr>\n    <td valign=\"top\" width=\"70%\">\n      <!-- left column -->\n      <table cellpadding=\"10\" cellspacing=\"0\" border=\"0\">\n      <tr>\n        <td style=\"font-family: Arial, Verdana, sans-serif; font-size: 12px;\" >\n        <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n        Greetings {contact.display_name},\n        <br /><br />\n        This is a sample template designed to help you get started creating and sending your own CiviMail messages. This template uses an HTML layout that is generally compatible with the wide variety of email clients that your recipients might be using (e.g. Gmail, Outlook, Yahoo, etc.).\n        <br /><br />You can select this \"Sample CiviMail Newsletter Template\" from the \"Use Template\" drop-down in Step 3 of creating a mailing, and customize it to your needs. Then check the \"Save as New Template\" box on the bottom the page to save your customized version for use in future mailings.\n        <br /><br />The logo you use must be uploaded to your server.  Copy and paste the URL path to the logo into the &lt;img src= tag in the HTML at the top.  Click \"Source\" or the Image button if you are using the text editor.\n        <br /><br />\n        Edit the color of the links and headers using the color button or by editing the HTML.\n        <br /><br />\n        Your newsletter message and donation appeal can go here.  Click the link button to <a href=\"#\">create links</a> - remember to use a fully qualified URL starting with http:// in all your links!\n        <br /><br />\n        To use CiviMail:\n        <ul>\n          <li><a href=\"http://book.civicrm.org/user/advanced-configuration/email-system-configuration/\">Configure your Email System</a>.</li>\n          <li>Make sure your web hosting provider allows outgoing bulk mail, and see if they have a restriction on quantity.  If they don\'t allow bulk mail, consider <a href=\"https://civicrm.org/providers/hosting\">finding a new host</a>.</li>\n        </ul>\n        Sincerely,\n        <br /><br />\n        Your Team\n        <br /><br />\n        </font>\n        </td>\n      </tr>\n      </table>\n    </td>\n\n    <td valign=\"top\" width=\"30%\" bgcolor=\"#ffffff\" style=\"border: 1px solid #056085;\">\n      <!-- right column -->\n      <table cellpadding=10 cellspacing=0 border=0>\n      <tr>\n        <td bgcolor=\"#056085\"><font face=\"Arial, Verdana, sans-serif\" size=\"4\" color=\"#ffffff\">News and Events</font></td>\n      </tr>\n      <tr>\n        <td style=\"color: #000; font-family: Arial, Verdana, sans-serif; font-size: 12px;\" >\n        <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n        <font color=\"#056085\"><strong>Featured Events</strong> </font><br />\n        Fundraising Dinner<br />\n        Training Meeting<br />\n        Board of Directors Annual Meeting<br />\n\n        <br /><br />\n        <font color=\"#056085\"><strong>Community Events</strong></font><br />\n        Bake Sale<br />\n        Charity Auction<br />\n        Art Exhibit<br />\n\n        <br /><br />\n        <font color=\"#056085\"><strong>Important Dates</strong></font><br />\n        Tuesday August 27<br />\n        Wednesday September 8<br />\n        Thursday September 29<br />\n        Saturday October 1<br />\n        Sunday October 20<br />\n        </font>\n        </td>\n      </tr>\n      </table>\n    </td>\n  </tr>\n\n  <tr>\n    <td colspan=\"2\">\n      <table cellpadding=\"10\" cellspacing=\"0\" border=\"0\">\n      <tr>\n        <td>\n        <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n        <font color=\"#7dc857\"><strong>Helpful Tips</strong></font>\n        <br /><br />\n        <font color=\"#3b5187\">Tokens</font><br />\n        Click \"Insert Tokens\" to dynamically insert names, addresses, and other contact data of your recipients.\n        <br /><br />\n        <font color=\"#3b5187\">Plain Text Version</font><br />\n        Some people refuse HTML emails altogether.  We recommend sending a plain-text version of your important communications to accommodate them.  Luckily, CiviCRM accommodates for this!  Just click \"Plain Text\" and copy and paste in some text.  Line breaks (carriage returns) and fully qualified URLs like http://www.example.com are all you get, no HTML here!\n        <br /><br />\n        <font color=\"#3b5187\">Play by the Rules</font><br />\n        The address of the sender is required by the Can Spam Act law.  This is an available token called domain.address.  An unsubscribe or opt-out link is also required.  There are several available tokens for this. <em>{action.optOutUrl}</em> creates a link for recipients to click if they want to opt out of receiving  emails from your organization. <em>{action.unsubscribeUrl}</em> creates a link to unsubscribe from the specific mailing list used to send this message. Click on \"Insert Tokens\" to find these and look for tokens named \"Domain\" or \"Unsubscribe\".  This sample template includes both required tokens at the bottom of the message. You can also configure a default Mailing Footer containing these tokens.\n        <br /><br />\n        <font color=\"#3b5187\">Composing Offline</font><br />\n        If you prefer to compose an HTML email offline in your own text editor, you can upload this HTML content into CiviMail or simply click \"Source\" and then copy and paste the HTML in.\n        <br /><br />\n        <font color=\"#3b5187\">Images</font><br />\n        Most email clients these days (Outlook, Gmail, etc) block image loading by default.  This is to protect their users from annoying or harmful email.  Not much we can do about this, so encourage recipients to add you to their contacts or \"whitelist\".  Also use images sparingly, do not rely on images to convey vital information, and always use HTML \"alt\" tags which describe the image content.\n        </td>\n      </tr>\n      </table>\n    </td>\n  </tr>\n  <tr>\n    <td colspan=\"2\" style=\"color: #000; font-family: Arial, Verdana, sans-serif; font-size: 10px;\">\n      <font face=\"Arial, Verdana, sans-serif\" size=\"2\" >\n      <hr />\n      <a href=\"{action.unsubscribeUrl}\" title=\"click to unsubscribe\">Click here</a> to unsubscribe from this mailing list.<br /><br />\n      Our mailing address is:<br />\n      {domain.address}\n    </td>\n  </tr>\n  </table>\n\n</body>\n</html>\n',1,NULL,NULL,1,0,0,NULL),(66,'Sample Responsive Design Newsletter - Single Column Template','Sample Responsive Design Newsletter - Single Column','','<html xmlns=\"http://www.w3.org/1999/xhtml\">\n<meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" />\n  <meta content=\"width=device-width, initial-scale=1.0\" name=\"viewport\" />\n  <title></title>\n\n  <style type=\"text/css\">\n    {literal}\n    /* Client-specific Styles */\n    #outlook a {padding:0;} /* Force Outlook to provide a \"view in browser\" menu link. */\n    body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}\n\n    /* Prevent Webkit and Windows Mobile platforms from changing default font sizes, while not breaking desktop design. */\n    .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */\n    .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing. */\n    #backgroundTable {margin:0; padding:0; width:100% !important; line-height: 100% !important;}\n    img {outline:none; text-decoration:none;border:none; -ms-interpolation-mode: bicubic;}\n    a img {border:none;}\n    .image_fix {display:block;}\n    p {margin: 0px 0px !important;}\n    table td {border-collapse: collapse;}\n    table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }\n    a {text-decoration: none;text-decoration:none;}\n\n    /*STYLES*/\n    table[class=full] { width: 100%; clear: both; }\n\n    /*IPAD STYLES*/\n    @media only screen and (max-width: 640px) {\n    a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color:#136388;pointer-events: none;cursor: default;}\n    .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: default;color:#136388;pointer-events: auto;cursor: default;}\n    table[class=devicewidth] {width: 440px!important;text-align:center!important;}\n    table[class=devicewidthmob] {width: 416px!important;text-align:center!important;}\n    table[class=devicewidthinner] {width: 416px!important;text-align:center!important;}\n    img[class=banner] {width: 440px!important;auto!important;}\n    img[class=col2img] {width: 440px!important;height:auto!important;}\n    table[class=\"cols3inner\"] {width: 100px!important;}\n    table[class=\"col3img\"] {width: 131px!important;}\n    img[class=\"col3img\"] {width: 131px!important;height: auto!important;}\n    table[class=\"removeMobile\"]{width:10px!important;}\n    img[class=\"blog\"] {width: 440px!important;height: auto!important;}\n    }\n\n    /*IPHONE STYLES*/\n    @media only screen and (max-width: 480px) {\n    a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color: #136388;pointer-events: none;cursor: default;}\n    .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: none;color:#136388;pointer-events: auto;cursor: default;}\n\n    table[class=devicewidth] {width: 280px!important;text-align:center!important;}\n    table[class=devicewidthmob] {width: 260px!important;text-align:center!important;}\n    table[class=devicewidthinner] {width: 260px!important;text-align:center!important;}\n    img[class=banner] {width: 280px!important;height:100px!important;}\n    img[class=col2img] {width: 280px!important;height:auto!important;}\n    table[class=\"cols3inner\"] {width: 260px!important;}\n    img[class=\"col3img\"] {width: 280px!important;height: auto!important;}\n    table[class=\"col3img\"] {width: 280px!important;}\n    img[class=\"blog\"] {width: 280px!important;auto!important;}\n    td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n    td[class=\"padding-right15\"]{padding-right:15px !important;}\n    }\n\n    @media only screen and (max-device-width: 800px)\n    {td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n    td[class=\"padding-right15\"]{padding-right:15px !important;}}\n    @media only screen and (max-device-width: 769px) {\n    .devicewidthmob {font-size:16px;}\n    }\n\n    @media only screen and (max-width: 640px) {\n    .desktop-spacer {display:none !important;}\n }\n  {/literal}\n  </style>\n\n<body>\n  <!-- Start of preheader --><!-- Start of preheader -->\n  <table bgcolor=\"#89c66b\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td height=\"20\" width=\"100%\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"310\">\n  										<tbody>\n  											<tr>\n  												<td align=\"left\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; line-height:120%; color: #f8f8f8;padding-left:15px; padding-bottom:5px;\" valign=\"middle\">Organization or Program Name Here</td>\n  											</tr>\n  										</tbody>\n  									</table>\n\n  									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"emhide\" width=\"310\">\n  										<tbody>\n  											<tr>\n                          <td align=\"right\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px;color: #f8f8f8;padding-right:15px; text-align:right;\" valign=\"middle\">Month and Year</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td height=\"20\" width=\"100%\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- End of main-banner-->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td height=\"20\" width=\"100%\">\n  									<table align=\"center\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"93%\">\n  										<tbody>\n  											<tr>\n                          <td rowspan=\"2\" style=\"padding-top:10px; padding-bottom:10px;\" width=\"38%\"><img src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/civicrm-logo-transparent.png\" alt=\"Replace with your own logo\" width=\"220\" border=\"0\" /></td>\n  												<td align=\"right\" width=\"62%\">\n  												<h6 class=\"collapse\">&nbsp;</h6>\n  												</td>\n  											</tr>\n  											<tr>\n  												<td align=\"right\">\n  												<h5 style=\"font-family: Gill Sans, Gill Sans MT, Myriad Pro, DejaVu Sans Condensed, Helvetica, Arial, sans-serif; color:#136388;\">&nbsp;</h5>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody><!-- /Spacing -->\n  														<tr>\n  															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 23px; color:#f8f8f8; text-align:left; line-height: 32px; padding:5px 15px; background-color:#136388;\">Headline Here</td>\n  														</tr>\n  														<!-- Spacing -->\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- hero story -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"auto\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/650x396.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /hero image --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px; color:#89c66b;\"><a href=\"#\" style=\"color:#89c66b;\">Your Heading Here</a></td>\n  																	</tr>\n  																	<!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing --><!-- content -->\n  																	<tr>\n  																		<td style=\"padding:0 15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #7a6e67; text-align:left; line-height: 26px; padding-bottom:10px;\">{contact.email_greeting},																		</p>\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #7a6e67; text-align:left; line-height: 26px; padding-bottom:10px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!</span></p>\n  																		</td>\n  																	</tr>\n  																	<tr>\n  																		<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px; padding-left:15px;\"><a href=\"#\" style=\"color:#136388;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"read more\">Read More</a></td>\n  																	</tr>\n  																	<!-- /button --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  																	</tr>\n  																	<!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- end of hero image and story --><!-- story 1 -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody>\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- image -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"250\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/banner-image-650-250.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /image --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px;\"><a href=\"#\" style=\"color:#89c66b;\">Your Heading  Here</a></td>\n  																	</tr>\n  																	<!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing --><!-- content -->\n  																	<tr>\n  																		<td style=\"padding:0 15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #7a6e67; text-align:left; line-height: 26px; padding-bottom:10px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna </p>\n  																		</td>\n  																	</tr>\n  																	<tr>\n  																		<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px; padding-left:15px;\"><a href=\"#\" style=\"color:#136388;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"read more\">Read More</a></td>\n  																	</tr>\n  																	<!-- /button --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  																	</tr>\n  																	<!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- /story 2--><!-- banner1 -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#89c66b\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody>\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- image -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"auto\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/banner-image-650-250.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /image --><!-- content --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"padding:15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #f0f0f0; text-align:left; line-height: 26px; padding-bottom:10px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna </p>\n  																		</td>\n  																	</tr>\n  																	<!-- /button --><!-- white button -->\n  																	<!-- /button --><!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- /banner 1--><!-- banner 2 -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td>\n  									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  										<tbody>\n  											<tr>\n  												<td width=\"100%\">\n  												<table align=\"center\" bgcolor=\"#136388\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  													<tbody>\n  														<tr>\n  															<td>\n  															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"650\">\n  																<tbody><!-- image -->\n  																	<tr>\n  																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n  																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"auto\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/banner-image-650-250.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"650\" /></a></div>\n  																		</td>\n  																	</tr>\n  																	<!-- /image --><!-- content --><!-- Spacing -->\n  																	<tr>\n  																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n  																	</tr>\n  																	<!-- /Spacing -->\n  																	<tr>\n  																		<td style=\"padding: 15px;\">\n  																		<p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color: #f0f0f0; text-align:left; line-height: 26px; padding-bottom:10px;\">Remember to link the facebook and twitter links below to your pages!</p>\n  																		</td>\n  																	</tr>\n  																	<!-- /button --><!-- white button -->\n  																	<tr>\n  																		<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px; padding-bottom:10px; padding-left:15px;\"><a href=\"#\" style=\"color:#ffffff;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"read more\">Read More</a></td>\n  																	</tr>\n  																	<!-- /button --><!-- Spacing --><!-- end of content -->\n  																</tbody>\n  															</table>\n  															</td>\n  														</tr>\n  													</tbody>\n  												</table>\n  												</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									</td>\n  								</tr>\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n  <!-- /banner2 --><!-- footer -->\n\n  <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"footer\" width=\"100%\">\n  	<tbody>\n  		<tr>\n  			<td>\n  			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  				<tbody>\n  					<tr>\n  						<td width=\"100%\">\n  						<table align=\"center\" bgcolor=\"#89c66b\"  border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"650\">\n  							<tbody><!-- Spacing -->\n  								<tr>\n  									<td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td><!-- logo -->\n  									<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"250\">\n  										<tbody>\n  											<tr>\n  												<td width=\"20\">&nbsp;</td>\n  												<td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px;\"><a href=\"{action.unsubscribeUrl}\" style=\"color: #f0f0f0; \">Unsubscribe | </a><a href=\"{action.subscribeUrl}\"  style=\"color: #f0f0f0;\">Subscribe |</a> <a href=\"{action.optOutUrl}\" style=\"color: #f0f0f0;\">Opt out</a></span></td>\n  											</tr>\n  											<tr>\n  												<td width=\"20\">&nbsp;</td>\n  												<td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px; color: #f0f0f0;\">{domain.address}</span></td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									<!-- end of logo --><!-- start of social icons -->\n\n  									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\" vaalign=\"middle\" width=\"60\">\n  										<tbody>\n  											<tr>\n  												<td align=\"left\" height=\"22\" width=\"22\">\n  												<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/facebook.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>\n  												</td>\n  												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"10\">&nbsp;</td>\n  												<td align=\"right\" height=\"22\" width=\"22\">\n  												<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/twitter.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>\n  												</td>\n  												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"20\">&nbsp;</td>\n  											</tr>\n  										</tbody>\n  									</table>\n  									<!-- end of social icons --></td>\n  								</tr>\n  								<!-- Spacing -->\n  								<tr>\n  									<td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n  								</tr>\n  								<!-- Spacing -->\n  							</tbody>\n  						</table>\n  						</td>\n  					</tr>\n  				</tbody>\n  			</table>\n  			</td>\n  		</tr>\n  	</tbody>\n  </table>\n\n</body>\n</html>\n',1,NULL,NULL,1,0,0,NULL),(67,'Sample Responsive Design Newsletter - Two Column Template','Sample Responsive Design Newsletter - Two Column','','<html xmlns=\"http://www.w3.org/1999/xhtml\">\n  <meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" />\n  <meta content=\"width=device-width, initial-scale=1.0\" name=\"viewport\" />\n  <title></title>\n  <style type=\"text/css\">\n     {literal}\n     img {height: auto !important;}\n     /* Client-specific Styles */\n     #outlook a {padding:0;} /* Force Outlook to provide a \"view in browser\" menu link. */\n     body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}\n\n     /* Prevent Webkit and Windows Mobile platforms from changing default font sizes, while not breaking desktop design. */\n     .ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */\n     .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing. */\n     #backgroundTable {margin:0; padding:0; width:100% !important; line-height: 100% !important;}\n     img {outline:none; text-decoration:none;border:none; -ms-interpolation-mode: bicubic;}\n     a img {border:none;}\n     .image_fix {display:block;}\n     p {margin: 0px 0px !important;}\n     table td {border-collapse: collapse;}\n     table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }\n     a {/*color: #33b9ff;*/text-decoration: none;text-decoration:none!important;}\n\n\n     /*STYLES*/\n     table[class=full] { width: 100%; clear: both; }\n\n     /*IPAD STYLES*/\n     @media only screen and (max-width: 640px) {\n     a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color: #0a8cce;pointer-events: none;cursor: default;}\n     .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: default;color: #0a8cce !important;pointer-events: auto;cursor: default;}\n     table[class=devicewidth] {width: 440px!important;text-align:center!important;}\n     table[class=devicewidthmob] {width: 414px!important;text-align:center!important;}\n     table[class=devicewidthinner] {width: 414px!important;text-align:center!important;}\n     img[class=banner] {width: 440px!important;auto!important;}\n     img[class=col2img] {width: 440px!important;height:auto!important;}\n     table[class=\"cols3inner\"] {width: 100px!important;}\n     table[class=\"col3img\"] {width: 131px!important;}\n     img[class=\"col3img\"] {width: 131px!important;height: auto!important;}\n     table[class=\"removeMobile\"]{width:10px!important;}\n     img[class=\"blog\"] {width: 440px!important;height: auto!important;}\n     }\n\n     /*IPHONE STYLES*/\n     @media only screen and (max-width: 480px) {\n     a[href^=\"tel\"], a[href^=\"sms\"] {text-decoration: none;color: #0a8cce;pointer-events: none;cursor: default;}\n     .mobile_link a[href^=\"tel\"], .mobile_link a[href^=\"sms\"] {text-decoration: default;color: #0a8cce !important; pointer-events: auto;cursor: default;}\n     table[class=devicewidth] {width: 280px!important;text-align:center!important;}\n     table[class=devicewidthmob] {width: 260px!important;text-align:center!important;}\n     table[class=devicewidthinner] {width: 260px!important;text-align:center!important;}\n     img[class=banner] {width: 280px!important;height:100px!important;}\n     img[class=col2img] {width: 280px!important;height:auto!important;}\n     table[class=\"cols3inner\"] {width: 260px!important;}\n     img[class=\"col3img\"] {width: 280px!important;height: auto!important;}\n     table[class=\"col3img\"] {width: 280px!important;}\n     img[class=\"blog\"] {width: 280px!important;auto!important;}\n     td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n     td[class=\"padding-right15\"]{padding-right:15px !important;}\n     }\n\n     @media only screen and (max-device-width: 800px)\n     {td[class=\"padding-top-right15\"]{padding:15px 15px 0 0 !important;}\n     td[class=\"padding-right15\"]{padding-right:15px !important;}}\n     @media only screen and (max-device-width: 769px) {.devicewidthmob {font-size:14px;}}\n\n     @media only screen and (max-width: 640px) {.desktop-spacer {display:none !important;}\n	   }\n     {/literal}\n  </style>\n  <body>\n    <!-- Start of preheader --><!-- Start of preheader -->\n    <table bgcolor=\"#0B4151\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" width=\"100%\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"360\">\n    										<tbody>\n    											<tr>\n    												<td align=\"left\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; line-height:120%; color: #f8f8f8;padding-left:15px;\" valign=\"middle\">Organization or Program Name Here</td>\n    											</tr>\n    										</tbody>\n    									</table>\n\n    									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"emhide\" width=\"320\">\n    										<tbody>\n    											<tr>\n    												<td align=\"right\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px;color: #f8f8f8;padding-right:15px;\" valign=\"middle\">Month Year</td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" width=\"100%\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- End of preheader --><!-- start of logo -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" width=\"100%\">\n    									<table align=\"center\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"93%\">\n    										<tbody>\n    											<tr>\n                             <td rowspan=\"2\" width=\"330\"><a href=\"#\"> <div class=\"imgpop\"><img src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/civicrm-logo-transparent.png\" alt=\"Replace with your own logo\" width=\"220\" border=\"0\" style=\"display:block;\"/></div></a></td>\n                            <td align=\"right\" >\n    												<h6 class=\"collapse\">&nbsp;</h6>\n    												</td>\n    											</tr>\n    											<tr>\n    												<td align=\"right\">\n\n    												</td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- end of logo --> <!-- hero story 1 -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"101%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#f8f8f8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody>\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    										<tbody>\n    											<tr>\n    												<td width=\"100%\">\n    												<table align=\"center\" bgcolor=\"#f8f8f8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    													<tbody><!-- /Spacing -->\n    														<tr>\n    															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457\">Hero Story Heading</td>\n    														</tr>\n    														<!-- Spacing -->\n    														<tr>\n    															<td>\n    															<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthinner\" width=\"700\">\n    																<tbody><!-- image -->\n    																	<tr>\n    																		<td align=\"center\" class=\"devicewidthinner\" width=\"100%\">\n    																		<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" class=\"blog\" height=\"396\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/700x396.png\" style=\"display:block; border:none; outline:none; text-decoration:none; padding:0; line-height:0;\" width=\"700\" /></a></div>\n    																		</td>\n    																	</tr>\n    																	<!-- /image --><!-- Spacing -->\n    																	<tr>\n    																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    																	</tr>\n    																	<!-- /Spacing --><!-- hero story -->\n    																	<tr>\n    																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 26px; padding:0 15px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Subheading Here</a></td>\n    																	</tr>\n    																	<!-- Spacing -->\n    																	<tr>\n    																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    																	</tr><!-- /Spacing -->\n    																	<tr>\n    																		<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 26px; padding:0 15px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!</span></td>\n    																	</tr>\n\n    <!-- Spacing -->\n    																	<tr>\n    																		<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    																	</tr><!-- /Spacing -->\n\n              <!-- /Spacing --><!-- /hero story -->\n\n    																	<!-- Spacing -->                                                            <!-- Spacing -->\n\n\n\n    																	<!-- Spacing --><!-- end of content -->\n    																</tbody>\n    															</table>\n    															</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												</td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Section Heading -->\n    								<tr>\n    									<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 24px; color:#f8f8f8; text-align:left; line-height: 26px; padding:5px 15px; background-color: #80C457\">Section Heading Here</td>\n    								</tr>\n    								<!-- /Section Heading -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /hero story 1 --><!-- story one -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td class=\"desktop-spacer\" height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"CiviCRM helps keep the “City Beautiful” Movement”going strong\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"CiviCRM helps keep the “City Beautiful” Movement”going strong\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story one -->\n    <!-- story two -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#076187\" height=\"0\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing --><!-- Spacing -->\n    								<tr>\n    									<td class=\"desktop-spacer\" height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px; text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"How CiviCRM will take Tribodar Eco Learning Center to another level\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"How CiviCRM will take Tribodar Eco Learning Center to another level\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story two --><!-- story three -->\n\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody><!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#076187\" height=\"0\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing --><!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" class=\"desktop-spacer\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;  text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"CiviCRM provides a soup-to-nuts open-source solution for Friends of the San Pedro River\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story three -->\n\n\n\n\n\n    <!-- story four -->\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"left-image\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				<tbody>\n    					<tr>\n    						<td width=\"100%\">\n    						<table align=\"center\" bgcolor=\"#ffffff\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    							<tbody>\n                                <!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#076187\" height=\"0\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n                                <!-- Spacing -->\n    								<tr>\n    									<td class=\"desktop-spacer\" height=\"20\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td>\n    									<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"660\">\n    										<tbody>\n    											<tr>\n    												<td><!-- Start of left column -->\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"330\">\n    													<tbody><!-- image -->\n    														<tr>\n    															<td align=\"center\" class=\"devicewidth\" height=\"150\" valign=\"top\" width=\"330\"><a href=\"#\"><img alt=\"\" border=\"0\" class=\"col2img\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/330x150.png\" style=\"display:block; border:none; outline:none; text-decoration:none; display:block;\" width=\"330\" /></a></td>\n    														</tr>\n    														<!-- /image -->\n    													</tbody>\n    												</table>\n    												<!-- end of left column --><!-- spacing for mobile devices-->\n\n    												<table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"mobilespacing\">\n    													<tbody>\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    													</tbody>\n    												</table>\n    												<!-- end of for mobile devices--><!-- start of right column -->\n\n    												<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidthmob\" width=\"310\">\n    													<tbody>\n    														<tr>\n    															<td class=\"padding-top-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 18px;text-align:left; line-height: 24px;\"><a href=\"#\" style=\"color:#076187; text-decoration:none; \" target=\"_blank\">Heading Here</a><a href=\"#\" style=\"color:#076187; text-decoration:none;\" target=\"_blank\" title=\"Google Summer of Code\"></a></td>\n    														</tr>\n    														<!-- end of title --><!-- Spacing -->\n    														<tr>\n    															<td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n    														</tr>\n    														<!-- /Spacing --><!-- content -->\n    														<tr>\n    															<td class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\"><span class=\"padding-right15\" style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; color: #7a6e67; text-align:left; line-height: 24px;\">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod\n                                                                tempor incididunt ut labore et dolore magna </span></td>\n    														</tr>\n    														<tr>\n    															<td style=\"font-family: Helvetica, arial, sans-serif; font-size: 14px; font-weight:bold; color: #333333; text-align:left;line-height: 24px; padding-top:10px;\"><a href=\"#\" style=\"color:#80C457;text-decoration:none;font-weight:bold;\" target=\"_blank\" title=\"Google Summer of Code\">Read More</a></td>\n    														</tr>\n    														<!-- /button --><!-- end of content -->\n    													</tbody>\n    												</table>\n    												<!-- end of right column --></td>\n    											</tr>\n    										</tbody>\n    									</table>\n    									</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n                       <td height=\"15\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\" width=\"100%\">&nbsp;</td>\n                    </tr>\n                    <!-- /Spacing -->\n                    <tr>\n                      <td style=\"padding: 15px;\">\n                      <p style=\"font-family: Helvetica, arial, sans-serif; font-size: 16px; color:#076187; text-align:left; line-height: 26px; padding-bottom:10px;\">Remember to link the facebook and twitter links below to your pages!</p>\n                      </td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- /story four -->\n\n    <!-- footer -->\n\n    <!-- End of footer --><!-- Start of postfooter -->\n    <table bgcolor=\"#d8d8d8\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"backgroundTable\" st-sortable=\"footer\" width=\"100%\">\n    	<tbody>\n    		<tr>\n    			<td>\n    			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n            <tbody>\n              <tr>\n                <td width=\"100%\">\n                  <table align=\"center\" bgcolor=\"#89c66b\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"devicewidth\" width=\"700\">\n    				        <tbody><!-- Spacing -->\n    					        <tr>\n                        <td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    					        </tr>\n    					        <!-- Spacing -->\n    					        <tr>\n                        <td><!-- logo -->\n                        <table align=\"left\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"250\">\n            							<tbody>\n            								<tr>\n                               <td width=\"20\">&nbsp;</td>\n                              <td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px;\"><a href=\"{action.unsubscribeUrl}\" style=\"color: #f0f0f0;\">Unsubscribe | </a><a href=\"{action.subscribeUrl}\" style=\"color: #f0f0f0;\">Subscribe |</a> <a href=\"{action.optOutUrl}\" style=\"color: #f0f0f0;\">Opt out</a></span></td>\n                            </tr>\n      											<tr>\n      												<td width=\"20\">&nbsp;</td>\n      												<td align=\"left\" height=\"40\" width=\"250\"><span style=\"font-family: Helvetica, arial, sans-serif; font-size: 13px; text-align:left; line-height: 26px; padding-bottom:10px; color: #f0f0f0;\">{domain.address}</span></td>\n      											</tr>\n                          </tbody>\n                        </table>\n                        <!-- end of logo --><!-- start of social icons -->\n      									<table align=\"right\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" height=\"40\" vaalign=\"middle\" width=\"60\">\n      										<tbody>\n      											<tr>\n      												<td align=\"left\" height=\"22\" width=\"22\">\n                                <div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/facebook.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>      											  </td>\n      												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"10\">&nbsp;</td>\n      												<td align=\"right\" height=\"22\" width=\"22\">\n      												<div class=\"imgpop\"><a href=\"#\" target=\"_blank\"><img alt=\"\" border=\"0\" height=\"22\" src=\"https://civicrm.org/sites/default/files/civicrm/custom/images/twitter.png\" style=\"display:block; border:none; outline:none; text-decoration:none;\" width=\"22\" /> </a></div>\n      												</td>\n      												<td align=\"left\" style=\"font-size:1px; line-height:1px;\" width=\"20\">&nbsp;</td>\n      											</tr>\n      										</tbody>\n      									</table>\n    									<!-- end of social icons --></td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td height=\"10\" style=\"font-size:1px; line-height:1px; mso-line-height-rule: exactly;\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    								<tr>\n    									<td bgcolor=\"#80C457\" height=\"10\" width=\"100%\">&nbsp;</td>\n    								</tr>\n    								<!-- Spacing -->\n    							</tbody>\n    						</table>\n    						</td>\n    					</tr>\n    				</tbody>\n    			</table>\n    			</td>\n    		</tr>\n    	</tbody>\n    </table>\n    <!-- End of footer -->\n  </body>\n</html>\n',1,NULL,NULL,1,0,0,NULL);
 /*!40000 ALTER TABLE `civicrm_msg_template` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -987,7 +987,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_note` WRITE;
 /*!40000 ALTER TABLE `civicrm_note` DISABLE KEYS */;
-INSERT INTO `civicrm_note` (`id`, `entity_table`, `entity_id`, `note`, `contact_id`, `modified_date`, `subject`, `privacy`) VALUES (1,'civicrm_contact',28,'Send newsletter for April 2005',1,'2019-09-02 00:41:40',NULL,'0'),(2,'civicrm_contact',107,'Arrange collection of funds from members',1,'2019-09-09 01:52:24',NULL,'0'),(3,'civicrm_contact',55,'Arrange for cricket match with Sunil Gavaskar',1,'2020-03-17 05:55:57',NULL,'0'),(4,'civicrm_contact',127,'Arrange for cricket match with Sunil Gavaskar',1,'2020-01-06 16:42:05',NULL,'0'),(5,'civicrm_contact',11,'Get the registration done for NGO status',1,'2020-03-14 21:36:20',NULL,'0'),(6,'civicrm_contact',31,'Arrange for cricket match with Sunil Gavaskar',1,'2020-01-15 12:34:59',NULL,'0'),(7,'civicrm_contact',9,'Get the registration done for NGO status',1,'2020-04-04 16:34:03',NULL,'0'),(8,'civicrm_contact',156,'Organize the Terry Fox run',1,'2020-06-11 17:14:32',NULL,'0'),(9,'civicrm_contact',184,'Organize the Terry Fox run',1,'2019-08-28 14:26:46',NULL,'0'),(10,'civicrm_contact',145,'Connect for presentation',1,'2020-04-11 06:37:49',NULL,'0'),(11,'civicrm_contact',142,'Get the registration done for NGO status',1,'2019-12-25 10:02:53',NULL,'0'),(12,'civicrm_contact',171,'Send reminder for annual dinner',1,'2020-01-31 09:23:45',NULL,'0'),(13,'civicrm_contact',134,'Connect for presentation',1,'2019-08-12 07:42:08',NULL,'0'),(14,'civicrm_contact',111,'Arrange collection of funds from members',1,'2020-06-17 02:20:44',NULL,'0'),(15,'civicrm_contact',50,'Arrange for cricket match with Sunil Gavaskar',1,'2020-06-25 17:58:48',NULL,'0'),(16,'civicrm_contact',122,'Contact the Commissioner of Charities',1,'2020-02-03 07:57:20',NULL,'0'),(17,'civicrm_contact',118,'Contact the Commissioner of Charities',1,'2020-07-15 08:44:29',NULL,'0'),(18,'civicrm_contact',71,'Get the registration done for NGO status',1,'2019-12-13 18:51:30',NULL,'0'),(19,'civicrm_contact',131,'Chart out route map for next 10k run',1,'2020-02-17 08:34:21',NULL,'0'),(20,'civicrm_contact',71,'Send newsletter for April 2005',1,'2019-08-13 01:44:38',NULL,'0');
+INSERT INTO `civicrm_note` (`id`, `entity_table`, `entity_id`, `note`, `contact_id`, `modified_date`, `subject`, `privacy`) VALUES (1,'civicrm_contact',20,'Organize the Terry Fox run',1,'2019-12-21 02:15:52',NULL,'0'),(2,'civicrm_contact',51,'Send reminder for annual dinner',1,'2020-08-01 10:04:18',NULL,'0'),(3,'civicrm_contact',11,'Contact the Commissioner of Charities',1,'2020-05-09 14:15:03',NULL,'0'),(4,'civicrm_contact',35,'Arrange for cricket match with Sunil Gavaskar',1,'2020-03-15 01:38:34',NULL,'0'),(5,'civicrm_contact',85,'Chart out route map for next 10k run',1,'2020-08-14 22:16:52',NULL,'0'),(6,'civicrm_contact',128,'Arrange for cricket match with Sunil Gavaskar',1,'2020-09-09 22:46:13',NULL,'0'),(7,'civicrm_contact',141,'Arrange collection of funds from members',1,'2019-10-13 22:38:34',NULL,'0'),(8,'civicrm_contact',180,'Contact the Commissioner of Charities',1,'2019-12-29 20:12:34',NULL,'0'),(9,'civicrm_contact',174,'Organize the Terry Fox run',1,'2020-04-21 20:42:15',NULL,'0'),(10,'civicrm_contact',122,'Arrange collection of funds from members',1,'2020-02-15 00:32:40',NULL,'0'),(11,'civicrm_contact',22,'Get the registration done for NGO status',1,'2020-02-12 12:15:25',NULL,'0'),(12,'civicrm_contact',48,'Send reminder for annual dinner',1,'2019-10-23 00:53:28',NULL,'0'),(13,'civicrm_contact',43,'Get the registration done for NGO status',1,'2020-09-04 06:45:51',NULL,'0'),(14,'civicrm_contact',141,'Contact the Commissioner of Charities',1,'2019-11-11 21:42:48',NULL,'0'),(15,'civicrm_contact',61,'Organize the Terry Fox run',1,'2020-03-04 06:38:26',NULL,'0'),(16,'civicrm_contact',187,'Connect for presentation',1,'2020-04-26 23:01:13',NULL,'0'),(17,'civicrm_contact',196,'Chart out route map for next 10k run',1,'2020-08-10 07:41:18',NULL,'0'),(18,'civicrm_contact',50,'Organize the Terry Fox run',1,'2020-04-24 15:23:31',NULL,'0'),(19,'civicrm_contact',111,'Arrange collection of funds from members',1,'2020-08-04 04:30:50',NULL,'0'),(20,'civicrm_contact',95,'Connect for presentation',1,'2019-10-06 13:25:50',NULL,'0');
 /*!40000 ALTER TABLE `civicrm_note` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1026,7 +1026,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_participant` WRITE;
 /*!40000 ALTER TABLE `civicrm_participant` DISABLE KEYS */;
-INSERT INTO `civicrm_participant` (`id`, `contact_id`, `event_id`, `status_id`, `role_id`, `register_date`, `source`, `fee_level`, `is_test`, `is_pay_later`, `fee_amount`, `registered_by_id`, `discount_id`, `fee_currency`, `campaign_id`, `discount_amount`, `cart_id`, `must_wait`, `transferred_to_contact_id`) VALUES (1,140,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(2,167,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(3,95,3,3,'3','2008-05-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(4,103,1,4,'4','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(5,73,2,1,'1','2008-01-10 00:00:00','Check','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(6,155,3,2,'2','2008-03-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(7,170,1,3,'3','2009-07-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(8,56,2,4,'4','2009-03-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(9,68,3,1,'1','2008-02-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(10,172,1,2,'2','2008-02-01 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(11,133,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(12,31,3,4,'4','2009-03-06 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(13,57,1,1,'2','2008-06-04 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(14,111,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(15,8,3,4,'1','2008-07-04 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(16,109,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(17,195,2,2,'3','2008-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(18,162,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(19,5,1,2,'1','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(20,94,2,4,'1','2009-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(21,41,3,1,'4','2008-03-25 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(22,54,1,2,'3','2009-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(23,102,2,4,'1','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(24,24,3,3,'1','2008-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(25,180,3,2,'2','2008-04-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(26,21,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(27,19,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(28,175,3,3,'3','2009-12-12 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(29,30,1,4,'4','2009-12-13 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(30,114,2,1,'1','2009-12-14 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(31,6,3,2,'2','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(32,44,1,3,'3','2009-07-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(33,129,2,4,'4','2009-03-07 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(34,60,3,1,'1','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(35,165,1,2,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(36,120,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(37,49,3,4,'4','2009-03-06 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(38,23,1,1,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(39,18,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(40,200,3,4,'1','2009-12-14 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(41,99,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(42,196,2,2,'3','2009-12-15 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(43,130,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(44,90,1,2,'1','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(45,98,2,4,'1','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(46,70,3,1,'4','2009-12-13 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(47,194,1,2,'3','2009-10-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(48,105,2,4,'1','2009-12-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(49,110,3,3,'1','2009-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(50,106,3,2,'2','2009-04-05 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_participant` (`id`, `contact_id`, `event_id`, `status_id`, `role_id`, `register_date`, `source`, `fee_level`, `is_test`, `is_pay_later`, `fee_amount`, `registered_by_id`, `discount_id`, `fee_currency`, `campaign_id`, `discount_amount`, `cart_id`, `must_wait`, `transferred_to_contact_id`) VALUES (1,157,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(2,60,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(3,26,3,3,'3','2008-05-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(4,193,1,4,'4','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(5,115,2,1,'1','2008-01-10 00:00:00','Check','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(6,172,3,2,'2','2008-03-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(7,82,1,3,'3','2009-07-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(8,103,2,4,'4','2009-03-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(9,129,3,1,'1','2008-02-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(10,50,1,2,'2','2008-02-01 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(11,196,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(12,169,3,4,'4','2009-03-06 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(13,94,1,1,'2','2008-06-04 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(14,153,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(15,155,3,4,'1','2008-07-04 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(16,76,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(17,95,2,2,'3','2008-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(18,111,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(19,187,1,2,'1','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(20,84,2,4,'1','2009-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(21,101,3,1,'4','2008-03-25 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(22,137,1,2,'3','2009-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(23,78,2,4,'1','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(24,167,3,3,'1','2008-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(25,11,3,2,'2','2008-04-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(26,77,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(27,128,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(28,48,3,3,'3','2009-12-12 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(29,80,1,4,'4','2009-12-13 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(30,140,2,1,'1','2009-12-14 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(31,21,3,2,'2','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(32,191,1,3,'3','2009-07-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(33,160,2,4,'4','2009-03-07 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(34,188,3,1,'1','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(35,114,1,2,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(36,52,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(37,7,3,4,'4','2009-03-06 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(38,135,1,1,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(39,79,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(40,67,3,4,'1','2009-12-14 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(41,27,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(42,146,2,2,'3','2009-12-15 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(43,8,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(44,161,1,2,'1','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(45,85,2,4,'1','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(46,46,3,1,'4','2009-12-13 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(47,181,1,2,'3','2009-10-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(48,13,2,4,'1','2009-12-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(49,147,3,3,'1','2009-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(50,53,3,2,'2','2009-04-05 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_participant` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1036,7 +1036,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_participant_payment` WRITE;
 /*!40000 ALTER TABLE `civicrm_participant_payment` DISABLE KEYS */;
-INSERT INTO `civicrm_participant_payment` (`id`, `participant_id`, `contribution_id`) VALUES (1,19,45),(2,31,46),(3,15,47),(4,39,48),(5,27,49),(6,26,50),(7,38,51),(8,24,52),(9,29,53),(10,12,54),(11,21,55),(12,32,56),(13,37,57),(14,22,58),(15,8,59),(16,13,60),(17,34,61),(18,9,62),(19,46,63),(20,5,64),(21,44,65),(22,20,66),(23,3,67),(24,45,68),(25,41,69),(26,23,70),(27,4,71),(28,48,72),(29,50,73),(30,16,74),(31,49,75),(32,14,76),(33,30,77),(34,36,78),(35,33,79),(36,43,80),(37,11,81),(38,1,82),(39,6,83),(40,18,84),(41,35,85),(42,2,86),(43,7,87),(44,10,88),(45,28,89),(46,25,90),(47,47,91),(48,17,92),(49,42,93),(50,40,94);
+INSERT INTO `civicrm_participant_payment` (`id`, `participant_id`, `contribution_id`) VALUES (1,37,45),(2,43,46),(3,25,47),(4,48,48),(5,31,49),(6,3,50),(7,41,51),(8,46,52),(9,28,53),(10,10,54),(11,36,55),(12,50,56),(13,2,57),(14,40,58),(15,16,59),(16,26,60),(17,23,61),(18,39,62),(19,29,63),(20,7,64),(21,20,65),(22,45,66),(23,13,67),(24,17,68),(25,21,69),(26,8,70),(27,18,71),(28,35,72),(29,5,73),(30,27,74),(31,9,75),(32,38,76),(33,22,77),(34,30,78),(35,42,79),(36,49,80),(37,14,81),(38,15,82),(39,1,83),(40,33,84),(41,44,85),(42,24,86),(43,12,87),(44,6,88),(45,47,89),(46,19,90),(47,34,91),(48,32,92),(49,4,93),(50,11,94);
 /*!40000 ALTER TABLE `civicrm_participant_payment` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1084,7 +1084,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_pcp` WRITE;
 /*!40000 ALTER TABLE `civicrm_pcp` DISABLE KEYS */;
-INSERT INTO `civicrm_pcp` (`id`, `contact_id`, `status_id`, `title`, `intro_text`, `page_text`, `donate_link_text`, `page_id`, `page_type`, `pcp_block_id`, `is_thermometer`, `is_honor_roll`, `goal_amount`, `currency`, `is_active`, `is_notify`) VALUES (1,57,2,'My Personal Civi Fundraiser','I\'m on a mission to get all my friends and family to help support my favorite open-source civic sector CRM.','<p>Friends and family - please help build much needed infrastructure for the civic sector by supporting my personal campaign!</p>\r\n<p><a href=\"https://civicrm.org\">You can learn more about CiviCRM here</a>.</p>\r\n<p>Then click the <strong>Contribute Now</strong> button to go to our easy-to-use online contribution form.</p>','Contribute Now',1,'contribute',1,1,1,5000.00,'USD',1,1);
+INSERT INTO `civicrm_pcp` (`id`, `contact_id`, `status_id`, `title`, `intro_text`, `page_text`, `donate_link_text`, `page_id`, `page_type`, `pcp_block_id`, `is_thermometer`, `is_honor_roll`, `goal_amount`, `currency`, `is_active`, `is_notify`) VALUES (1,117,2,'My Personal Civi Fundraiser','I\'m on a mission to get all my friends and family to help support my favorite open-source civic sector CRM.','<p>Friends and family - please help build much needed infrastructure for the civic sector by supporting my personal campaign!</p>\r\n<p><a href=\"https://civicrm.org\">You can learn more about CiviCRM here</a>.</p>\r\n<p>Then click the <strong>Contribute Now</strong> button to go to our easy-to-use online contribution form.</p>','Contribute Now',1,'contribute',1,1,1,5000.00,'USD',1,1);
 /*!40000 ALTER TABLE `civicrm_pcp` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1104,7 +1104,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_phone` WRITE;
 /*!40000 ALTER TABLE `civicrm_phone` DISABLE KEYS */;
-INSERT INTO `civicrm_phone` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `mobile_provider_id`, `phone`, `phone_ext`, `phone_numeric`, `phone_type_id`) VALUES (1,24,1,1,0,NULL,'274-9635',NULL,'2749635',2),(2,17,1,1,0,NULL,'(229) 879-2778',NULL,'2298792778',1),(3,17,1,0,0,NULL,'799-7889',NULL,'7997889',2),(4,182,1,1,0,NULL,'(244) 685-2219',NULL,'2446852219',1),(5,182,1,0,0,NULL,'(865) 344-9781',NULL,'8653449781',2),(6,138,1,1,0,NULL,'402-4943',NULL,'4024943',2),(7,53,1,1,0,NULL,'204-2790',NULL,'2042790',2),(8,53,1,0,0,NULL,'766-4872',NULL,'7664872',2),(9,15,1,1,0,NULL,'(668) 853-1518',NULL,'6688531518',2),(10,83,1,1,0,NULL,'241-1379',NULL,'2411379',1),(11,120,1,1,0,NULL,'397-9037',NULL,'3979037',1),(12,120,1,0,0,NULL,'730-9455',NULL,'7309455',1),(13,193,1,1,0,NULL,'(676) 251-4852',NULL,'6762514852',2),(14,162,1,1,0,NULL,'521-3006',NULL,'5213006',2),(15,66,1,1,0,NULL,'530-6693',NULL,'5306693',2),(16,66,1,0,0,NULL,'731-4325',NULL,'7314325',1),(17,92,1,1,0,NULL,'(220) 590-9485',NULL,'2205909485',1),(18,92,1,0,0,NULL,'(203) 368-1646',NULL,'2033681646',1),(19,167,1,1,0,NULL,'(750) 209-2869',NULL,'7502092869',2),(20,167,1,0,0,NULL,'890-9055',NULL,'8909055',2),(21,190,1,1,0,NULL,'(652) 629-9114',NULL,'6526299114',1),(22,190,1,0,0,NULL,'(293) 584-8018',NULL,'2935848018',1),(23,184,1,1,0,NULL,'437-1558',NULL,'4371558',2),(24,67,1,1,0,NULL,'(424) 686-1017',NULL,'4246861017',1),(25,67,1,0,0,NULL,'716-5913',NULL,'7165913',1),(26,183,1,1,0,NULL,'(423) 421-9523',NULL,'4234219523',2),(27,175,1,1,0,NULL,'880-2156',NULL,'8802156',2),(28,129,1,1,0,NULL,'(488) 267-9425',NULL,'4882679425',1),(29,129,1,0,0,NULL,'859-5831',NULL,'8595831',2),(30,197,1,1,0,NULL,'(454) 513-8343',NULL,'4545138343',2),(31,197,1,0,0,NULL,'(553) 619-5071',NULL,'5536195071',2),(32,122,1,1,0,NULL,'718-4550',NULL,'7184550',1),(33,122,1,0,0,NULL,'289-9260',NULL,'2899260',1),(34,7,1,1,0,NULL,'(206) 479-5991',NULL,'2064795991',2),(35,7,1,0,0,NULL,'285-4636',NULL,'2854636',1),(36,154,1,1,0,NULL,'430-8301',NULL,'4308301',1),(37,154,1,0,0,NULL,'(435) 851-5287',NULL,'4358515287',2),(38,51,1,1,0,NULL,'304-7100',NULL,'3047100',2),(39,51,1,0,0,NULL,'238-5124',NULL,'2385124',2),(40,97,1,1,0,NULL,'(814) 212-3197',NULL,'8142123197',1),(41,111,1,1,0,NULL,'756-3086',NULL,'7563086',2),(42,111,1,0,0,NULL,'365-2538',NULL,'3652538',2),(43,143,1,1,0,NULL,'816-4755',NULL,'8164755',2),(44,77,1,1,0,NULL,'(235) 641-2496',NULL,'2356412496',1),(45,77,1,0,0,NULL,'713-4703',NULL,'7134703',1),(46,186,1,1,0,NULL,'474-5007',NULL,'4745007',2),(47,12,1,1,0,NULL,'617-7751',NULL,'6177751',1),(48,8,1,1,0,NULL,'(537) 372-7316',NULL,'5373727316',2),(49,84,1,1,0,NULL,'792-7270',NULL,'7927270',2),(50,84,1,0,0,NULL,'(801) 234-1538',NULL,'8012341538',2),(51,71,1,1,0,NULL,'392-6885',NULL,'3926885',2),(52,71,1,0,0,NULL,'288-3964',NULL,'2883964',2),(53,119,1,1,0,NULL,'446-4383',NULL,'4464383',2),(54,119,1,0,0,NULL,'(596) 657-2384',NULL,'5966572384',2),(55,161,1,1,0,NULL,'635-8492',NULL,'6358492',2),(56,60,1,1,0,NULL,'(691) 530-1922',NULL,'6915301922',1),(57,31,1,1,0,NULL,'(283) 732-1513',NULL,'2837321513',2),(58,55,1,1,0,NULL,'657-5967',NULL,'6575967',1),(59,55,1,0,0,NULL,'272-6026',NULL,'2726026',1),(60,64,1,1,0,NULL,'673-2317',NULL,'6732317',2),(61,64,1,0,0,NULL,'534-1878',NULL,'5341878',2),(62,41,1,1,0,NULL,'460-9430',NULL,'4609430',2),(63,30,1,1,0,NULL,'306-2031',NULL,'3062031',2),(64,2,1,1,0,NULL,'612-2909',NULL,'6122909',1),(65,2,1,0,0,NULL,'(737) 473-7543',NULL,'7374737543',2),(66,118,1,1,0,NULL,'755-9391',NULL,'7559391',1),(67,87,1,1,0,NULL,'(463) 596-6006',NULL,'4635966006',2),(68,87,1,0,0,NULL,'560-2341',NULL,'5602341',1),(69,23,1,1,0,NULL,'(408) 243-9215',NULL,'4082439215',1),(70,5,1,1,0,NULL,'(467) 735-2801',NULL,'4677352801',1),(71,5,1,0,0,NULL,'(585) 618-1985',NULL,'5856181985',2),(72,93,1,1,0,NULL,'774-6122',NULL,'7746122',2),(73,18,1,1,0,NULL,'(859) 599-7380',NULL,'8595997380',1),(74,176,1,1,0,NULL,'(352) 842-5208',NULL,'3528425208',2),(75,80,1,1,0,NULL,'(664) 231-4436',NULL,'6642314436',1),(76,80,1,0,0,NULL,'(274) 257-4985',NULL,'2742574985',1),(77,44,1,1,0,NULL,'881-5788',NULL,'8815788',2),(78,44,1,0,0,NULL,'(866) 667-8364',NULL,'8666678364',1),(79,52,1,1,0,NULL,'(611) 572-3049',NULL,'6115723049',2),(80,165,1,1,0,NULL,'228-4756',NULL,'2284756',1),(81,127,1,1,0,NULL,'555-6328',NULL,'5556328',1),(82,127,1,0,0,NULL,'(327) 478-4987',NULL,'3274784987',1),(83,172,1,1,0,NULL,'(487) 597-4192',NULL,'4875974192',2),(84,172,1,0,0,NULL,'372-7179',NULL,'3727179',1),(85,125,1,1,0,NULL,'216-1481',NULL,'2161481',1),(86,74,1,1,0,NULL,'(492) 296-6332',NULL,'4922966332',1),(87,74,1,0,0,NULL,'287-8009',NULL,'2878009',2),(88,47,1,1,0,NULL,'(425) 785-7087',NULL,'4257857087',2),(89,159,1,1,0,NULL,'(368) 300-4630',NULL,'3683004630',1),(90,102,1,1,0,NULL,'(443) 534-9192',NULL,'4435349192',1),(91,149,1,1,0,NULL,'(802) 411-1496',NULL,'8024111496',1),(92,192,1,1,0,NULL,'(297) 209-2106',NULL,'2972092106',2),(93,192,1,0,0,NULL,'(705) 606-6556',NULL,'7056066556',1),(94,134,1,1,0,NULL,'(632) 400-9500',NULL,'6324009500',1),(95,134,1,0,0,NULL,'(328) 557-6995',NULL,'3285576995',2),(96,100,1,1,0,NULL,'(629) 623-5518',NULL,'6296235518',2),(97,100,1,0,0,NULL,'(787) 824-4620',NULL,'7878244620',2),(98,34,1,1,0,NULL,'(576) 532-4124',NULL,'5765324124',1),(99,113,1,1,0,NULL,'208-4699',NULL,'2084699',1),(100,110,1,1,0,NULL,'(766) 397-6252',NULL,'7663976252',2),(101,110,1,0,0,NULL,'663-2594',NULL,'6632594',2),(102,191,1,1,0,NULL,'(711) 752-3110',NULL,'7117523110',2),(103,191,1,0,0,NULL,'455-8038',NULL,'4558038',2),(104,151,1,1,0,NULL,'496-3771',NULL,'4963771',1),(105,82,1,1,0,NULL,'(281) 214-6022',NULL,'2812146022',1),(106,82,1,0,0,NULL,'(652) 390-7860',NULL,'6523907860',2),(107,196,1,1,0,NULL,'533-5816',NULL,'5335816',1),(108,94,1,1,0,NULL,'(749) 574-5597',NULL,'7495745597',2),(109,188,1,1,0,NULL,'529-8632',NULL,'5298632',2),(110,195,1,1,0,NULL,'(395) 227-9037',NULL,'3952279037',1),(111,28,1,1,0,NULL,'718-8866',NULL,'7188866',2),(112,28,1,0,0,NULL,'814-1318',NULL,'8141318',2),(113,141,1,1,0,NULL,'(783) 818-5891',NULL,'7838185891',2),(114,141,1,0,0,NULL,'898-2730',NULL,'8982730',1),(115,112,1,1,0,NULL,'(558) 458-8429',NULL,'5584588429',2),(116,112,1,0,0,NULL,'(308) 797-1765',NULL,'3087971765',1),(117,152,1,1,0,NULL,'(373) 427-1144',NULL,'3734271144',2),(118,61,1,1,0,NULL,'374-7266',NULL,'3747266',2),(119,108,1,1,0,NULL,'661-5380',NULL,'6615380',1),(120,108,1,0,0,NULL,'(647) 666-4232',NULL,'6476664232',1),(121,54,1,1,0,NULL,'445-1977',NULL,'4451977',2),(122,54,1,0,0,NULL,'405-2942',NULL,'4052942',1),(123,155,1,1,0,NULL,'784-9465',NULL,'7849465',1),(124,103,1,1,0,NULL,'265-9328',NULL,'2659328',2),(125,63,1,1,0,NULL,'(735) 686-1024',NULL,'7356861024',1),(126,63,1,0,0,NULL,'(679) 205-2507',NULL,'6792052507',2),(127,68,1,1,0,NULL,'(214) 665-4847',NULL,'2146654847',1),(128,68,1,0,0,NULL,'256-3774',NULL,'2563774',1),(129,70,1,1,0,NULL,'429-1869',NULL,'4291869',1),(130,70,1,0,0,NULL,'219-2851',NULL,'2192851',1),(131,10,1,1,0,NULL,'716-2365',NULL,'7162365',1),(132,130,1,1,0,NULL,'600-7888',NULL,'6007888',2),(133,140,1,1,0,NULL,'267-9456',NULL,'2679456',1),(134,58,1,1,0,NULL,'(255) 537-6804',NULL,'2555376804',2),(135,58,1,0,0,NULL,'785-9517',NULL,'7859517',2),(136,48,1,1,0,NULL,'(369) 720-9933',NULL,'3697209933',1),(137,135,1,1,0,NULL,'577-3243',NULL,'5773243',2),(138,43,1,1,0,NULL,'(561) 878-3542',NULL,'5618783542',2),(139,20,1,1,0,NULL,'(240) 599-5126',NULL,'2405995126',2),(140,13,1,1,0,NULL,'(896) 730-2208',NULL,'8967302208',2),(141,13,1,0,0,NULL,'891-6610',NULL,'8916610',1),(142,194,1,1,0,NULL,'(582) 263-1870',NULL,'5822631870',2),(143,131,1,1,0,NULL,'209-4992',NULL,'2094992',2),(144,131,1,0,0,NULL,'(357) 393-9592',NULL,'3573939592',2),(145,75,1,1,0,NULL,'297-3631',NULL,'2973631',1),(146,75,1,0,0,NULL,'(735) 516-9375',NULL,'7355169375',1),(147,104,1,1,0,NULL,'(202) 624-1843',NULL,'2026241843',2),(148,153,1,1,0,NULL,'577-2814',NULL,'5772814',2),(149,153,1,0,0,NULL,'(672) 816-3429',NULL,'6728163429',2),(150,39,1,1,0,NULL,'(413) 541-3220',NULL,'4135413220',1),(151,189,1,1,0,NULL,'(562) 845-6038',NULL,'5628456038',2),(152,36,1,1,0,NULL,'359-6033',NULL,'3596033',1),(153,36,1,0,0,NULL,'(574) 836-8694',NULL,'5748368694',1),(154,171,1,1,0,NULL,'(631) 326-9216',NULL,'6313269216',2),(155,25,1,1,0,NULL,'(632) 417-4898',NULL,'6324174898',1),(156,180,1,1,0,NULL,'699-9692',NULL,'6999692',2),(157,158,1,1,0,NULL,'258-5034',NULL,'2585034',1),(158,NULL,1,0,0,NULL,'204 222-1000',NULL,'2042221000',1),(159,NULL,1,0,0,NULL,'204 223-1000',NULL,'2042231000',1),(160,NULL,1,0,0,NULL,'303 323-1000',NULL,'3033231000',1);
+INSERT INTO `civicrm_phone` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `mobile_provider_id`, `phone`, `phone_ext`, `phone_numeric`, `phone_type_id`) VALUES (1,94,1,1,0,NULL,'407-4490',NULL,'4074490',1),(2,105,1,1,0,NULL,'(845) 293-7533',NULL,'8452937533',2),(3,105,1,0,0,NULL,'(389) 833-5963',NULL,'3898335963',2),(4,25,1,1,0,NULL,'588-1096',NULL,'5881096',2),(5,117,1,1,0,NULL,'(370) 204-2603',NULL,'3702042603',1),(6,145,1,1,0,NULL,'(463) 742-8478',NULL,'4637428478',2),(7,145,1,0,0,NULL,'207-8061',NULL,'2078061',2),(8,194,1,1,0,NULL,'(719) 439-3592',NULL,'7194393592',1),(9,103,1,1,0,NULL,'(300) 893-2392',NULL,'3008932392',2),(10,177,1,1,0,NULL,'(511) 715-1541',NULL,'5117151541',1),(11,185,1,1,0,NULL,'413-9520',NULL,'4139520',1),(12,185,1,0,0,NULL,'699-1910',NULL,'6991910',2),(13,130,1,1,0,NULL,'(443) 890-9733',NULL,'4438909733',1),(14,152,1,1,0,NULL,'370-4838',NULL,'3704838',2),(15,152,1,0,0,NULL,'(822) 784-5370',NULL,'8227845370',1),(16,102,1,1,0,NULL,'(710) 667-2627',NULL,'7106672627',2),(17,65,1,1,0,NULL,'819-3401',NULL,'8193401',1),(18,201,1,1,0,NULL,'(334) 830-3482',NULL,'3348303482',1),(19,201,1,0,0,NULL,'882-6903',NULL,'8826903',1),(20,86,1,1,0,NULL,'847-3586',NULL,'8473586',1),(21,142,1,1,0,NULL,'807-6213',NULL,'8076213',1),(22,70,1,1,0,NULL,'(744) 748-7789',NULL,'7447487789',1),(23,70,1,0,0,NULL,'308-6097',NULL,'3086097',1),(24,126,1,1,0,NULL,'809-7358',NULL,'8097358',1),(25,170,1,1,0,NULL,'(580) 468-7159',NULL,'5804687159',1),(26,200,1,1,0,NULL,'(524) 419-2849',NULL,'5244192849',2),(27,200,1,0,0,NULL,'872-4356',NULL,'8724356',2),(28,51,1,1,0,NULL,'(743) 315-7045',NULL,'7433157045',2),(29,150,1,1,0,NULL,'887-5105',NULL,'8875105',1),(30,150,1,0,0,NULL,'(747) 437-3966',NULL,'7474373966',1),(31,43,1,1,0,NULL,'519-4567',NULL,'5194567',1),(32,43,1,0,0,NULL,'774-3321',NULL,'7743321',1),(33,17,1,1,0,NULL,'(489) 898-5178',NULL,'4898985178',2),(34,17,1,0,0,NULL,'(874) 445-3093',NULL,'8744453093',1),(35,197,1,1,0,NULL,'595-5547',NULL,'5955547',2),(36,197,1,0,0,NULL,'255-7656',NULL,'2557656',2),(37,88,1,1,0,NULL,'(445) 452-6746',NULL,'4454526746',1),(38,88,1,0,0,NULL,'(872) 375-1249',NULL,'8723751249',1),(39,21,1,1,0,NULL,'(416) 423-9427',NULL,'4164239427',1),(40,127,1,1,0,NULL,'215-8558',NULL,'2158558',2),(41,59,1,1,0,NULL,'(459) 503-6007',NULL,'4595036007',2),(42,176,1,1,0,NULL,'(628) 809-6147',NULL,'6288096147',1),(43,118,1,1,0,NULL,'693-1625',NULL,'6931625',1),(44,118,1,0,0,NULL,'893-8754',NULL,'8938754',1),(45,156,1,1,0,NULL,'350-9058',NULL,'3509058',1),(46,111,1,1,0,NULL,'(427) 777-8863',NULL,'4277778863',1),(47,19,1,1,0,NULL,'(363) 306-2082',NULL,'3633062082',2),(48,19,1,0,0,NULL,'317-1598',NULL,'3171598',2),(49,166,1,1,0,NULL,'742-7890',NULL,'7427890',1),(50,180,1,1,0,NULL,'634-9898',NULL,'6349898',1),(51,180,1,0,0,NULL,'(805) 299-8983',NULL,'8052998983',1),(52,12,1,1,0,NULL,'(218) 542-1734',NULL,'2185421734',2),(53,12,1,0,0,NULL,'703-3192',NULL,'7033192',1),(54,132,1,1,0,NULL,'832-9698',NULL,'8329698',1),(55,57,1,1,0,NULL,'(828) 380-7875',NULL,'8283807875',2),(56,144,1,1,0,NULL,'(609) 289-9417',NULL,'6092899417',2),(57,191,1,1,0,NULL,'236-2095',NULL,'2362095',1),(58,157,1,1,0,NULL,'693-9591',NULL,'6939591',2),(59,46,1,1,0,NULL,'824-3608',NULL,'8243608',2),(60,129,1,1,0,NULL,'421-7315',NULL,'4217315',1),(61,52,1,1,0,NULL,'291-2610',NULL,'2912610',2),(62,52,1,0,0,NULL,'(694) 288-8032',NULL,'6942888032',1),(63,28,1,1,0,NULL,'218-2857',NULL,'2182857',1),(64,107,1,1,0,NULL,'(607) 207-1590',NULL,'6072071590',1),(65,136,1,1,0,NULL,'(792) 688-9352',NULL,'7926889352',1),(66,41,1,1,0,NULL,'(387) 441-7759',NULL,'3874417759',1),(67,72,1,1,0,NULL,'(691) 801-1142',NULL,'6918011142',2),(68,72,1,0,0,NULL,'489-2410',NULL,'4892410',2),(69,89,1,1,0,NULL,'407-2208',NULL,'4072208',2),(70,89,1,0,0,NULL,'439-3945',NULL,'4393945',2),(71,49,1,1,0,NULL,'808-4164',NULL,'8084164',2),(72,49,1,0,0,NULL,'627-4100',NULL,'6274100',1),(73,153,1,1,0,NULL,'682-8516',NULL,'6828516',1),(74,125,1,1,0,NULL,'397-8548',NULL,'3978548',2),(75,125,1,0,0,NULL,'375-6875',NULL,'3756875',2),(76,162,1,1,0,NULL,'738-2268',NULL,'7382268',1),(77,162,1,0,0,NULL,'759-5422',NULL,'7595422',1),(78,13,1,1,0,NULL,'(805) 697-2759',NULL,'8056972759',2),(79,56,1,1,0,NULL,'736-9711',NULL,'7369711',1),(80,56,1,0,0,NULL,'395-4444',NULL,'3954444',2),(81,33,1,1,0,NULL,'483-5196',NULL,'4835196',2),(82,24,1,1,0,NULL,'469-2466',NULL,'4692466',1),(83,188,1,1,0,NULL,'292-4061',NULL,'2924061',1),(84,77,1,1,0,NULL,'(497) 324-6618',NULL,'4973246618',1),(85,161,1,1,0,NULL,'691-4077',NULL,'6914077',1),(86,161,1,0,0,NULL,'(396) 409-5228',NULL,'3964095228',2),(87,60,1,1,0,NULL,'664-7881',NULL,'6647881',1),(88,164,1,1,0,NULL,'(756) 534-8706',NULL,'7565348706',2),(89,164,1,0,0,NULL,'416-6210',NULL,'4166210',2),(90,147,1,1,0,NULL,'281-2011',NULL,'2812011',2),(91,147,1,0,0,NULL,'586-5666',NULL,'5865666',1),(92,173,1,1,0,NULL,'(836) 553-8707',NULL,'8365538707',2),(93,173,1,0,0,NULL,'(618) 534-5092',NULL,'6185345092',1),(94,16,1,1,0,NULL,'(610) 432-6289',NULL,'6104326289',2),(95,16,1,0,0,NULL,'254-9515',NULL,'2549515',1),(96,29,1,1,0,NULL,'685-3908',NULL,'6853908',2),(97,29,1,0,0,NULL,'(278) 268-2884',NULL,'2782682884',1),(98,50,1,1,0,NULL,'(654) 398-5725',NULL,'6543985725',2),(99,190,1,1,0,NULL,'436-1619',NULL,'4361619',1),(100,190,1,0,0,NULL,'423-1355',NULL,'4231355',2),(101,163,1,1,0,NULL,'380-8587',NULL,'3808587',1),(102,181,1,1,0,NULL,'356-9736',NULL,'3569736',2),(103,181,1,0,0,NULL,'(670) 430-4196',NULL,'6704304196',2),(104,189,1,1,0,NULL,'(718) 357-6624',NULL,'7183576624',2),(105,5,1,1,0,NULL,'(391) 604-8751',NULL,'3916048751',1),(106,5,1,0,0,NULL,'702-7052',NULL,'7027052',2),(107,79,1,1,0,NULL,'856-1393',NULL,'8561393',2),(108,82,1,1,0,NULL,'697-6303',NULL,'6976303',2),(109,87,1,1,0,NULL,'269-5529',NULL,'2695529',1),(110,87,1,0,0,NULL,'844-2742',NULL,'8442742',1),(111,15,1,1,0,NULL,'(331) 444-3306',NULL,'3314443306',1),(112,108,1,1,0,NULL,'(621) 236-8085',NULL,'6212368085',1),(113,40,1,1,0,NULL,'248-6404',NULL,'2486404',2),(114,40,1,0,0,NULL,'845-7925',NULL,'8457925',1),(115,138,1,1,0,NULL,'321-3606',NULL,'3213606',2),(116,135,1,1,0,NULL,'(526) 260-4435',NULL,'5262604435',2),(117,135,1,0,0,NULL,'217-8226',NULL,'2178226',2),(118,168,1,1,0,NULL,'(637) 777-8653',NULL,'6377778653',1),(119,168,1,0,0,NULL,'(234) 558-1055',NULL,'2345581055',1),(120,80,1,1,0,NULL,'(320) 638-3388',NULL,'3206383388',2),(121,80,1,0,0,NULL,'231-1175',NULL,'2311175',1),(122,4,1,1,0,NULL,'658-3244',NULL,'6583244',1),(123,4,1,0,0,NULL,'505-3054',NULL,'5053054',2),(124,83,1,1,0,NULL,'553-1937',NULL,'5531937',2),(125,83,1,0,0,NULL,'327-9761',NULL,'3279761',1),(126,42,1,1,0,NULL,'(895) 861-2526',NULL,'8958612526',1),(127,42,1,0,0,NULL,'(423) 271-2934',NULL,'4232712934',1),(128,2,1,1,0,NULL,'(377) 889-9607',NULL,'3778899607',1),(129,139,1,1,0,NULL,'(690) 457-8377',NULL,'6904578377',1),(130,175,1,1,0,NULL,'(881) 293-8411',NULL,'8812938411',1),(131,14,1,1,0,NULL,'231-8009',NULL,'2318009',1),(132,14,1,0,0,NULL,'(467) 442-6144',NULL,'4674426144',2),(133,97,1,1,0,NULL,'777-2979',NULL,'7772979',2),(134,97,1,0,0,NULL,'(495) 729-9394',NULL,'4957299394',1),(135,58,1,1,0,NULL,'743-3904',NULL,'7433904',2),(136,68,1,1,0,NULL,'804-6037',NULL,'8046037',1),(137,68,1,0,0,NULL,'(676) 396-3406',NULL,'6763963406',1),(138,53,1,1,0,NULL,'776-5432',NULL,'7765432',2),(139,172,1,1,0,NULL,'(385) 376-6702',NULL,'3853766702',1),(140,172,1,0,0,NULL,'(472) 686-6524',NULL,'4726866524',2),(141,71,1,1,0,NULL,'876-1844',NULL,'8761844',2),(142,71,1,0,0,NULL,'415-1520',NULL,'4151520',1),(143,120,1,1,0,NULL,'561-7861',NULL,'5617861',2),(144,120,1,0,0,NULL,'(584) 262-9787',NULL,'5842629787',1),(145,26,1,1,0,NULL,'222-8898',NULL,'2228898',1),(146,95,1,1,0,NULL,'(553) 771-4049',NULL,'5537714049',1),(147,31,1,1,0,NULL,'(887) 219-9808',NULL,'8872199808',1),(148,34,1,1,0,NULL,'879-9563',NULL,'8799563',2),(149,159,1,1,0,NULL,'(898) 288-8559',NULL,'8982888559',2),(150,NULL,1,0,0,NULL,'204 222-1000',NULL,'2042221000',1),(151,NULL,1,0,0,NULL,'204 223-1000',NULL,'2042231000',1),(152,NULL,1,0,0,NULL,'303 323-1000',NULL,'3033231000',1);
 /*!40000 ALTER TABLE `civicrm_phone` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1261,7 +1261,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_relationship` WRITE;
 /*!40000 ALTER TABLE `civicrm_relationship` DISABLE KEYS */;
-INSERT INTO `civicrm_relationship` (`id`, `contact_id_a`, `contact_id_b`, `relationship_type_id`, `start_date`, `end_date`, `is_active`, `description`, `is_permission_a_b`, `is_permission_b_a`, `case_id`) VALUES (1,74,172,1,NULL,NULL,1,NULL,0,0,NULL),(2,47,172,1,NULL,NULL,1,NULL,0,0,NULL),(3,74,125,1,NULL,NULL,1,NULL,0,0,NULL),(4,47,125,1,NULL,NULL,1,NULL,0,0,NULL),(5,47,74,4,NULL,NULL,1,NULL,0,0,NULL),(6,125,11,8,NULL,NULL,1,NULL,0,0,NULL),(7,74,11,8,NULL,NULL,1,NULL,0,0,NULL),(8,47,11,8,NULL,NULL,1,NULL,0,0,NULL),(9,172,11,7,NULL,NULL,0,NULL,0,0,NULL),(10,125,172,2,NULL,NULL,0,NULL,0,0,NULL),(11,126,159,1,NULL,NULL,1,NULL,0,0,NULL),(12,9,159,1,NULL,NULL,1,NULL,0,0,NULL),(13,126,102,1,NULL,NULL,1,NULL,0,0,NULL),(14,9,102,1,NULL,NULL,1,NULL,0,0,NULL),(15,9,126,4,NULL,NULL,1,NULL,0,0,NULL),(16,102,128,8,NULL,NULL,1,NULL,0,0,NULL),(17,126,128,8,NULL,NULL,1,NULL,0,0,NULL),(18,9,128,8,NULL,NULL,1,NULL,0,0,NULL),(19,159,128,7,NULL,NULL,0,NULL,0,0,NULL),(20,102,159,2,NULL,NULL,0,NULL,0,0,NULL),(21,40,198,1,NULL,NULL,1,NULL,0,0,NULL),(22,85,198,1,NULL,NULL,1,NULL,0,0,NULL),(23,40,149,1,NULL,NULL,1,NULL,0,0,NULL),(24,85,149,1,NULL,NULL,1,NULL,0,0,NULL),(25,85,40,4,NULL,NULL,1,NULL,0,0,NULL),(26,149,38,8,NULL,NULL,1,NULL,0,0,NULL),(27,40,38,8,NULL,NULL,1,NULL,0,0,NULL),(28,85,38,8,NULL,NULL,1,NULL,0,0,NULL),(29,198,38,7,NULL,NULL,1,NULL,0,0,NULL),(30,149,198,2,NULL,NULL,1,NULL,0,0,NULL),(31,134,192,1,NULL,NULL,1,NULL,0,0,NULL),(32,100,192,1,NULL,NULL,1,NULL,0,0,NULL),(33,134,170,1,NULL,NULL,1,NULL,0,0,NULL),(34,100,170,1,NULL,NULL,1,NULL,0,0,NULL),(35,100,134,4,NULL,NULL,1,NULL,0,0,NULL),(36,170,136,8,NULL,NULL,1,NULL,0,0,NULL),(37,134,136,8,NULL,NULL,1,NULL,0,0,NULL),(38,100,136,8,NULL,NULL,1,NULL,0,0,NULL),(39,192,136,7,NULL,NULL,0,NULL,0,0,NULL),(40,170,192,2,NULL,NULL,0,NULL,0,0,NULL),(41,59,34,1,NULL,NULL,1,NULL,0,0,NULL),(42,110,34,1,NULL,NULL,1,NULL,0,0,NULL),(43,59,113,1,NULL,NULL,1,NULL,0,0,NULL),(44,110,113,1,NULL,NULL,1,NULL,0,0,NULL),(45,110,59,4,NULL,NULL,1,NULL,0,0,NULL),(46,113,32,8,NULL,NULL,1,NULL,0,0,NULL),(47,59,32,8,NULL,NULL,1,NULL,0,0,NULL),(48,110,32,8,NULL,NULL,1,NULL,0,0,NULL),(49,34,32,7,NULL,NULL,1,NULL,0,0,NULL),(50,113,34,2,NULL,NULL,1,NULL,0,0,NULL),(51,147,191,1,NULL,NULL,1,NULL,0,0,NULL),(52,151,191,1,NULL,NULL,1,NULL,0,0,NULL),(53,147,160,1,NULL,NULL,1,NULL,0,0,NULL),(54,151,160,1,NULL,NULL,1,NULL,0,0,NULL),(55,151,147,4,NULL,NULL,1,NULL,0,0,NULL),(56,160,27,8,NULL,NULL,1,NULL,0,0,NULL),(57,147,27,8,NULL,NULL,1,NULL,0,0,NULL),(58,151,27,8,NULL,NULL,1,NULL,0,0,NULL),(59,191,27,7,NULL,NULL,1,NULL,0,0,NULL),(60,160,191,2,NULL,NULL,1,NULL,0,0,NULL),(61,94,82,1,NULL,NULL,1,NULL,0,0,NULL),(62,188,82,1,NULL,NULL,1,NULL,0,0,NULL),(63,94,196,1,NULL,NULL,1,NULL,0,0,NULL),(64,188,196,1,NULL,NULL,1,NULL,0,0,NULL),(65,188,94,4,NULL,NULL,1,NULL,0,0,NULL),(66,196,116,8,NULL,NULL,1,NULL,0,0,NULL),(67,94,116,8,NULL,NULL,1,NULL,0,0,NULL),(68,188,116,8,NULL,NULL,1,NULL,0,0,NULL),(69,82,116,7,NULL,NULL,0,NULL,0,0,NULL),(70,196,82,2,NULL,NULL,0,NULL,0,0,NULL),(71,28,195,1,NULL,NULL,1,NULL,0,0,NULL),(72,133,195,1,NULL,NULL,1,NULL,0,0,NULL),(73,28,173,1,NULL,NULL,1,NULL,0,0,NULL),(74,133,173,1,NULL,NULL,1,NULL,0,0,NULL),(75,133,28,4,NULL,NULL,1,NULL,0,0,NULL),(76,173,106,8,NULL,NULL,1,NULL,0,0,NULL),(77,28,106,8,NULL,NULL,1,NULL,0,0,NULL),(78,133,106,8,NULL,NULL,1,NULL,0,0,NULL),(79,195,106,7,NULL,NULL,0,NULL,0,0,NULL),(80,173,195,2,NULL,NULL,0,NULL,0,0,NULL),(81,152,141,1,NULL,NULL,1,NULL,0,0,NULL),(82,61,141,1,NULL,NULL,1,NULL,0,0,NULL),(83,152,112,1,NULL,NULL,1,NULL,0,0,NULL),(84,61,112,1,NULL,NULL,1,NULL,0,0,NULL),(85,61,152,4,NULL,NULL,1,NULL,0,0,NULL),(86,112,22,8,NULL,NULL,1,NULL,0,0,NULL),(87,152,22,8,NULL,NULL,1,NULL,0,0,NULL),(88,61,22,8,NULL,NULL,1,NULL,0,0,NULL),(89,141,22,7,NULL,NULL,1,NULL,0,0,NULL),(90,112,141,2,NULL,NULL,1,NULL,0,0,NULL),(91,155,108,1,NULL,NULL,1,NULL,0,0,NULL),(92,29,108,1,NULL,NULL,1,NULL,0,0,NULL),(93,155,54,1,NULL,NULL,1,NULL,0,0,NULL),(94,29,54,1,NULL,NULL,1,NULL,0,0,NULL),(95,29,155,4,NULL,NULL,1,NULL,0,0,NULL),(96,54,115,8,NULL,NULL,1,NULL,0,0,NULL),(97,155,115,8,NULL,NULL,1,NULL,0,0,NULL),(98,29,115,8,NULL,NULL,1,NULL,0,0,NULL),(99,108,115,7,NULL,NULL,1,NULL,0,0,NULL),(100,54,108,2,NULL,NULL,1,NULL,0,0,NULL),(101,63,103,1,NULL,NULL,1,NULL,0,0,NULL),(102,95,103,1,NULL,NULL,1,NULL,0,0,NULL),(103,63,201,1,NULL,NULL,1,NULL,0,0,NULL),(104,95,201,1,NULL,NULL,1,NULL,0,0,NULL),(105,95,63,4,NULL,NULL,1,NULL,0,0,NULL),(106,201,35,8,NULL,NULL,1,NULL,0,0,NULL),(107,63,35,8,NULL,NULL,1,NULL,0,0,NULL),(108,95,35,8,NULL,NULL,1,NULL,0,0,NULL),(109,103,35,7,NULL,NULL,1,NULL,0,0,NULL),(110,201,103,2,NULL,NULL,1,NULL,0,0,NULL),(111,114,107,1,NULL,NULL,1,NULL,0,0,NULL),(112,70,107,1,NULL,NULL,1,NULL,0,0,NULL),(113,114,68,1,NULL,NULL,1,NULL,0,0,NULL),(114,70,68,1,NULL,NULL,1,NULL,0,0,NULL),(115,70,114,4,NULL,NULL,1,NULL,0,0,NULL),(116,68,177,8,NULL,NULL,1,NULL,0,0,NULL),(117,114,177,8,NULL,NULL,1,NULL,0,0,NULL),(118,70,177,8,NULL,NULL,1,NULL,0,0,NULL),(119,107,177,7,NULL,NULL,1,NULL,0,0,NULL),(120,68,107,2,NULL,NULL,1,NULL,0,0,NULL),(121,140,10,1,NULL,NULL,1,NULL,0,0,NULL),(122,58,10,1,NULL,NULL,1,NULL,0,0,NULL),(123,140,130,1,NULL,NULL,1,NULL,0,0,NULL),(124,58,130,1,NULL,NULL,1,NULL,0,0,NULL),(125,58,140,4,NULL,NULL,1,NULL,0,0,NULL),(126,130,150,8,NULL,NULL,1,NULL,0,0,NULL),(127,140,150,8,NULL,NULL,1,NULL,0,0,NULL),(128,58,150,8,NULL,NULL,1,NULL,0,0,NULL),(129,10,150,7,NULL,NULL,1,NULL,0,0,NULL),(130,130,10,2,NULL,NULL,1,NULL,0,0,NULL),(131,78,187,1,NULL,NULL,1,NULL,0,0,NULL),(132,181,187,1,NULL,NULL,1,NULL,0,0,NULL),(133,78,48,1,NULL,NULL,1,NULL,0,0,NULL),(134,181,48,1,NULL,NULL,1,NULL,0,0,NULL),(135,181,78,4,NULL,NULL,1,NULL,0,0,NULL),(136,48,72,8,NULL,NULL,1,NULL,0,0,NULL),(137,78,72,8,NULL,NULL,1,NULL,0,0,NULL),(138,181,72,8,NULL,NULL,1,NULL,0,0,NULL),(139,187,72,7,NULL,NULL,0,NULL,0,0,NULL),(140,48,187,2,NULL,NULL,0,NULL,0,0,NULL),(141,20,135,1,NULL,NULL,1,NULL,0,0,NULL),(142,13,135,1,NULL,NULL,1,NULL,0,0,NULL),(143,20,43,1,NULL,NULL,1,NULL,0,0,NULL),(144,13,43,1,NULL,NULL,1,NULL,0,0,NULL),(145,13,20,4,NULL,NULL,1,NULL,0,0,NULL),(146,43,21,8,NULL,NULL,1,NULL,0,0,NULL),(147,20,21,8,NULL,NULL,1,NULL,0,0,NULL),(148,13,21,8,NULL,NULL,1,NULL,0,0,NULL),(149,135,21,7,NULL,NULL,0,NULL,0,0,NULL),(150,43,135,2,NULL,NULL,0,NULL,0,0,NULL),(151,89,194,1,NULL,NULL,1,NULL,0,0,NULL),(152,75,194,1,NULL,NULL,1,NULL,0,0,NULL),(153,89,131,1,NULL,NULL,1,NULL,0,0,NULL),(154,75,131,1,NULL,NULL,1,NULL,0,0,NULL),(155,75,89,4,NULL,NULL,1,NULL,0,0,NULL),(156,131,19,8,NULL,NULL,1,NULL,0,0,NULL),(157,89,19,8,NULL,NULL,1,NULL,0,0,NULL),(158,75,19,8,NULL,NULL,1,NULL,0,0,NULL),(159,194,19,7,NULL,NULL,0,NULL,0,0,NULL),(160,131,194,2,NULL,NULL,0,NULL,0,0,NULL),(161,121,104,1,NULL,NULL,1,NULL,0,0,NULL),(162,39,104,1,NULL,NULL,1,NULL,0,0,NULL),(163,121,153,1,NULL,NULL,1,NULL,0,0,NULL),(164,39,153,1,NULL,NULL,1,NULL,0,0,NULL),(165,39,121,4,NULL,NULL,1,NULL,0,0,NULL),(166,153,168,8,NULL,NULL,1,NULL,0,0,NULL),(167,121,168,8,NULL,NULL,1,NULL,0,0,NULL),(168,39,168,8,NULL,NULL,1,NULL,0,0,NULL),(169,104,168,7,NULL,NULL,1,NULL,0,0,NULL),(170,153,104,2,NULL,NULL,1,NULL,0,0,NULL),(171,36,42,1,NULL,NULL,1,NULL,0,0,NULL),(172,26,42,1,NULL,NULL,1,NULL,0,0,NULL),(173,36,189,1,NULL,NULL,1,NULL,0,0,NULL),(174,26,189,1,NULL,NULL,1,NULL,0,0,NULL),(175,26,36,4,NULL,NULL,1,NULL,0,0,NULL),(176,189,101,8,NULL,NULL,1,NULL,0,0,NULL),(177,36,101,8,NULL,NULL,1,NULL,0,0,NULL),(178,26,101,8,NULL,NULL,1,NULL,0,0,NULL),(179,42,101,7,NULL,NULL,1,NULL,0,0,NULL),(180,189,42,2,NULL,NULL,1,NULL,0,0,NULL),(181,69,171,1,NULL,NULL,1,NULL,0,0,NULL),(182,109,171,1,NULL,NULL,1,NULL,0,0,NULL),(183,69,200,1,NULL,NULL,1,NULL,0,0,NULL),(184,109,200,1,NULL,NULL,1,NULL,0,0,NULL),(185,109,69,4,NULL,NULL,1,NULL,0,0,NULL),(186,200,98,8,NULL,NULL,1,NULL,0,0,NULL),(187,69,98,8,NULL,NULL,1,NULL,0,0,NULL),(188,109,98,8,NULL,NULL,1,NULL,0,0,NULL),(189,171,98,7,NULL,NULL,1,NULL,0,0,NULL),(190,200,171,2,NULL,NULL,1,NULL,0,0,NULL),(191,158,25,1,NULL,NULL,1,NULL,0,0,NULL),(192,4,25,1,NULL,NULL,1,NULL,0,0,NULL),(193,158,180,1,NULL,NULL,1,NULL,0,0,NULL),(194,4,180,1,NULL,NULL,1,NULL,0,0,NULL),(195,4,158,4,NULL,NULL,1,NULL,0,0,NULL),(196,180,163,8,NULL,NULL,1,NULL,0,0,NULL),(197,158,163,8,NULL,NULL,1,NULL,0,0,NULL),(198,4,163,8,NULL,NULL,1,NULL,0,0,NULL),(199,25,163,7,NULL,NULL,0,NULL,0,0,NULL),(200,180,25,2,NULL,NULL,0,NULL,0,0,NULL),(201,26,14,5,NULL,NULL,1,NULL,0,0,NULL),(202,36,37,5,NULL,NULL,1,NULL,0,0,NULL),(203,20,46,5,NULL,NULL,1,NULL,0,0,NULL),(204,89,50,5,NULL,NULL,1,NULL,0,0,NULL),(205,189,56,5,NULL,NULL,1,NULL,0,0,NULL),(206,29,62,5,NULL,NULL,1,NULL,0,0,NULL),(207,75,73,5,NULL,NULL,1,NULL,0,0,NULL),(208,197,86,5,NULL,NULL,1,NULL,0,0,NULL),(209,120,91,5,NULL,NULL,1,NULL,0,0,NULL),(210,151,105,5,NULL,NULL,1,NULL,0,0,NULL),(211,85,117,5,NULL,NULL,1,NULL,0,0,NULL),(212,34,137,5,NULL,NULL,1,NULL,0,0,NULL),(213,170,142,5,NULL,NULL,1,NULL,0,0,NULL),(214,18,144,5,NULL,NULL,1,NULL,0,0,NULL),(215,104,148,5,NULL,NULL,1,NULL,0,0,NULL),(216,57,157,5,NULL,NULL,1,NULL,0,0,NULL),(217,185,174,5,NULL,NULL,1,NULL,0,0,NULL),(218,186,178,5,NULL,NULL,1,NULL,0,0,NULL);
+INSERT INTO `civicrm_relationship` (`id`, `contact_id_a`, `contact_id_b`, `relationship_type_id`, `start_date`, `end_date`, `is_active`, `description`, `is_permission_a_b`, `is_permission_b_a`, `case_id`) VALUES (1,67,22,1,NULL,NULL,1,NULL,0,0,NULL),(2,125,22,1,NULL,NULL,1,NULL,0,0,NULL),(3,67,153,1,NULL,NULL,1,NULL,0,0,NULL),(4,125,153,1,NULL,NULL,1,NULL,0,0,NULL),(5,125,67,4,NULL,NULL,1,NULL,0,0,NULL),(6,153,182,8,NULL,NULL,1,NULL,0,0,NULL),(7,67,182,8,NULL,NULL,1,NULL,0,0,NULL),(8,125,182,8,NULL,NULL,1,NULL,0,0,NULL),(9,22,182,7,NULL,NULL,0,NULL,0,0,NULL),(10,153,22,2,NULL,NULL,0,NULL,0,0,NULL),(11,184,162,1,NULL,NULL,1,NULL,0,0,NULL),(12,56,162,1,NULL,NULL,1,NULL,0,0,NULL),(13,184,13,1,NULL,NULL,1,NULL,0,0,NULL),(14,56,13,1,NULL,NULL,1,NULL,0,0,NULL),(15,56,184,4,NULL,NULL,1,NULL,0,0,NULL),(16,13,178,8,NULL,NULL,1,NULL,0,0,NULL),(17,184,178,8,NULL,NULL,1,NULL,0,0,NULL),(18,56,178,8,NULL,NULL,1,NULL,0,0,NULL),(19,162,178,7,NULL,NULL,1,NULL,0,0,NULL),(20,13,162,2,NULL,NULL,1,NULL,0,0,NULL),(21,196,61,1,NULL,NULL,1,NULL,0,0,NULL),(22,24,61,1,NULL,NULL,1,NULL,0,0,NULL),(23,196,33,1,NULL,NULL,1,NULL,0,0,NULL),(24,24,33,1,NULL,NULL,1,NULL,0,0,NULL),(25,24,196,4,NULL,NULL,1,NULL,0,0,NULL),(26,33,171,8,NULL,NULL,1,NULL,0,0,NULL),(27,196,171,8,NULL,NULL,1,NULL,0,0,NULL),(28,24,171,8,NULL,NULL,1,NULL,0,0,NULL),(29,61,171,7,NULL,NULL,1,NULL,0,0,NULL),(30,33,61,2,NULL,NULL,1,NULL,0,0,NULL),(31,77,188,1,NULL,NULL,1,NULL,0,0,NULL),(32,161,188,1,NULL,NULL,1,NULL,0,0,NULL),(33,77,93,1,NULL,NULL,1,NULL,0,0,NULL),(34,161,93,1,NULL,NULL,1,NULL,0,0,NULL),(35,161,77,4,NULL,NULL,1,NULL,0,0,NULL),(36,93,160,8,NULL,NULL,1,NULL,0,0,NULL),(37,77,160,8,NULL,NULL,1,NULL,0,0,NULL),(38,161,160,8,NULL,NULL,1,NULL,0,0,NULL),(39,188,160,7,NULL,NULL,1,NULL,0,0,NULL),(40,93,188,2,NULL,NULL,1,NULL,0,0,NULL),(41,74,60,1,NULL,NULL,1,NULL,0,0,NULL),(42,164,60,1,NULL,NULL,1,NULL,0,0,NULL),(43,74,131,1,NULL,NULL,1,NULL,0,0,NULL),(44,164,131,1,NULL,NULL,1,NULL,0,0,NULL),(45,164,74,4,NULL,NULL,1,NULL,0,0,NULL),(46,131,6,8,NULL,NULL,1,NULL,0,0,NULL),(47,74,6,8,NULL,NULL,1,NULL,0,0,NULL),(48,164,6,8,NULL,NULL,1,NULL,0,0,NULL),(49,60,6,7,NULL,NULL,1,NULL,0,0,NULL),(50,131,60,2,NULL,NULL,1,NULL,0,0,NULL),(51,16,147,1,NULL,NULL,1,NULL,0,0,NULL),(52,29,147,1,NULL,NULL,1,NULL,0,0,NULL),(53,16,173,1,NULL,NULL,1,NULL,0,0,NULL),(54,29,173,1,NULL,NULL,1,NULL,0,0,NULL),(55,29,16,4,NULL,NULL,1,NULL,0,0,NULL),(56,173,123,8,NULL,NULL,1,NULL,0,0,NULL),(57,16,123,8,NULL,NULL,1,NULL,0,0,NULL),(58,29,123,8,NULL,NULL,1,NULL,0,0,NULL),(59,147,123,7,NULL,NULL,1,NULL,0,0,NULL),(60,173,147,2,NULL,NULL,1,NULL,0,0,NULL),(61,113,50,1,NULL,NULL,1,NULL,0,0,NULL),(62,163,50,1,NULL,NULL,1,NULL,0,0,NULL),(63,113,190,1,NULL,NULL,1,NULL,0,0,NULL),(64,163,190,1,NULL,NULL,1,NULL,0,0,NULL),(65,163,113,4,NULL,NULL,1,NULL,0,0,NULL),(66,190,45,8,NULL,NULL,1,NULL,0,0,NULL),(67,113,45,8,NULL,NULL,1,NULL,0,0,NULL),(68,163,45,8,NULL,NULL,1,NULL,0,0,NULL),(69,50,45,7,NULL,NULL,0,NULL,0,0,NULL),(70,190,50,2,NULL,NULL,0,NULL,0,0,NULL),(71,183,181,1,NULL,NULL,1,NULL,0,0,NULL),(72,189,181,1,NULL,NULL,1,NULL,0,0,NULL),(73,183,151,1,NULL,NULL,1,NULL,0,0,NULL),(74,189,151,1,NULL,NULL,1,NULL,0,0,NULL),(75,189,183,4,NULL,NULL,1,NULL,0,0,NULL),(76,151,140,8,NULL,NULL,1,NULL,0,0,NULL),(77,183,140,8,NULL,NULL,1,NULL,0,0,NULL),(78,189,140,8,NULL,NULL,1,NULL,0,0,NULL),(79,181,140,7,NULL,NULL,0,NULL,0,0,NULL),(80,151,181,2,NULL,NULL,0,NULL,0,0,NULL),(81,79,5,1,NULL,NULL,1,NULL,0,0,NULL),(82,82,5,1,NULL,NULL,1,NULL,0,0,NULL),(83,79,174,1,NULL,NULL,1,NULL,0,0,NULL),(84,82,174,1,NULL,NULL,1,NULL,0,0,NULL),(85,82,79,4,NULL,NULL,1,NULL,0,0,NULL),(86,174,78,8,NULL,NULL,1,NULL,0,0,NULL),(87,79,78,8,NULL,NULL,1,NULL,0,0,NULL),(88,82,78,8,NULL,NULL,1,NULL,0,0,NULL),(89,5,78,7,NULL,NULL,0,NULL,0,0,NULL),(90,174,5,2,NULL,NULL,0,NULL,0,0,NULL),(91,11,87,1,NULL,NULL,1,NULL,0,0,NULL),(92,108,87,1,NULL,NULL,1,NULL,0,0,NULL),(93,11,15,1,NULL,NULL,1,NULL,0,0,NULL),(94,108,15,1,NULL,NULL,1,NULL,0,0,NULL),(95,108,11,4,NULL,NULL,1,NULL,0,0,NULL),(96,15,133,8,NULL,NULL,1,NULL,0,0,NULL),(97,11,133,8,NULL,NULL,1,NULL,0,0,NULL),(98,108,133,8,NULL,NULL,1,NULL,0,0,NULL),(99,87,133,7,NULL,NULL,0,NULL,0,0,NULL),(100,15,87,2,NULL,NULL,0,NULL,0,0,NULL),(101,96,100,1,NULL,NULL,1,NULL,0,0,NULL),(102,36,100,1,NULL,NULL,1,NULL,0,0,NULL),(103,96,40,1,NULL,NULL,1,NULL,0,0,NULL),(104,36,40,1,NULL,NULL,1,NULL,0,0,NULL),(105,36,96,4,NULL,NULL,1,NULL,0,0,NULL),(106,40,119,8,NULL,NULL,1,NULL,0,0,NULL),(107,96,119,8,NULL,NULL,1,NULL,0,0,NULL),(108,36,119,8,NULL,NULL,1,NULL,0,0,NULL),(109,100,119,7,NULL,NULL,1,NULL,0,0,NULL),(110,40,100,2,NULL,NULL,1,NULL,0,0,NULL),(111,135,138,1,NULL,NULL,1,NULL,0,0,NULL),(112,48,138,1,NULL,NULL,1,NULL,0,0,NULL),(113,135,64,1,NULL,NULL,1,NULL,0,0,NULL),(114,48,64,1,NULL,NULL,1,NULL,0,0,NULL),(115,48,135,4,NULL,NULL,1,NULL,0,0,NULL),(116,64,148,8,NULL,NULL,1,NULL,0,0,NULL),(117,135,148,8,NULL,NULL,1,NULL,0,0,NULL),(118,48,148,8,NULL,NULL,1,NULL,0,0,NULL),(119,138,148,7,NULL,NULL,1,NULL,0,0,NULL),(120,64,138,2,NULL,NULL,1,NULL,0,0,NULL),(121,80,168,1,NULL,NULL,1,NULL,0,0,NULL),(122,4,168,1,NULL,NULL,1,NULL,0,0,NULL),(123,80,195,1,NULL,NULL,1,NULL,0,0,NULL),(124,4,195,1,NULL,NULL,1,NULL,0,0,NULL),(125,4,80,4,NULL,NULL,1,NULL,0,0,NULL),(126,195,137,8,NULL,NULL,1,NULL,0,0,NULL),(127,80,137,8,NULL,NULL,1,NULL,0,0,NULL),(128,4,137,8,NULL,NULL,1,NULL,0,0,NULL),(129,168,137,7,NULL,NULL,1,NULL,0,0,NULL),(130,195,168,2,NULL,NULL,1,NULL,0,0,NULL),(131,63,83,1,NULL,NULL,1,NULL,0,0,NULL),(132,2,83,1,NULL,NULL,1,NULL,0,0,NULL),(133,63,42,1,NULL,NULL,1,NULL,0,0,NULL),(134,2,42,1,NULL,NULL,1,NULL,0,0,NULL),(135,2,63,4,NULL,NULL,1,NULL,0,0,NULL),(136,42,186,8,NULL,NULL,1,NULL,0,0,NULL),(137,63,186,8,NULL,NULL,1,NULL,0,0,NULL),(138,2,186,8,NULL,NULL,1,NULL,0,0,NULL),(139,83,186,7,NULL,NULL,0,NULL,0,0,NULL),(140,42,83,2,NULL,NULL,0,NULL,0,0,NULL),(141,18,73,1,NULL,NULL,1,NULL,0,0,NULL),(142,165,73,1,NULL,NULL,1,NULL,0,0,NULL),(143,18,143,1,NULL,NULL,1,NULL,0,0,NULL),(144,165,143,1,NULL,NULL,1,NULL,0,0,NULL),(145,165,18,4,NULL,NULL,1,NULL,0,0,NULL),(146,143,38,8,NULL,NULL,1,NULL,0,0,NULL),(147,18,38,8,NULL,NULL,1,NULL,0,0,NULL),(148,165,38,8,NULL,NULL,1,NULL,0,0,NULL),(149,73,38,7,NULL,NULL,1,NULL,0,0,NULL),(150,143,73,2,NULL,NULL,1,NULL,0,0,NULL),(151,175,139,1,NULL,NULL,1,NULL,0,0,NULL),(152,14,139,1,NULL,NULL,1,NULL,0,0,NULL),(153,175,192,1,NULL,NULL,1,NULL,0,0,NULL),(154,14,192,1,NULL,NULL,1,NULL,0,0,NULL),(155,14,175,4,NULL,NULL,1,NULL,0,0,NULL),(156,192,75,8,NULL,NULL,1,NULL,0,0,NULL),(157,175,75,8,NULL,NULL,1,NULL,0,0,NULL),(158,14,75,8,NULL,NULL,1,NULL,0,0,NULL),(159,139,75,7,NULL,NULL,0,NULL,0,0,NULL),(160,192,139,2,NULL,NULL,0,NULL,0,0,NULL),(161,68,97,1,NULL,NULL,1,NULL,0,0,NULL),(162,53,97,1,NULL,NULL,1,NULL,0,0,NULL),(163,68,58,1,NULL,NULL,1,NULL,0,0,NULL),(164,53,58,1,NULL,NULL,1,NULL,0,0,NULL),(165,53,68,4,NULL,NULL,1,NULL,0,0,NULL),(166,58,7,8,NULL,NULL,1,NULL,0,0,NULL),(167,68,7,8,NULL,NULL,1,NULL,0,0,NULL),(168,53,7,8,NULL,NULL,1,NULL,0,0,NULL),(169,97,7,7,NULL,NULL,0,NULL,0,0,NULL),(170,58,97,2,NULL,NULL,0,NULL,0,0,NULL),(171,120,172,1,NULL,NULL,1,NULL,0,0,NULL),(172,124,172,1,NULL,NULL,1,NULL,0,0,NULL),(173,120,71,1,NULL,NULL,1,NULL,0,0,NULL),(174,124,71,1,NULL,NULL,1,NULL,0,0,NULL),(175,124,120,4,NULL,NULL,1,NULL,0,0,NULL),(176,71,32,8,NULL,NULL,1,NULL,0,0,NULL),(177,120,32,8,NULL,NULL,1,NULL,0,0,NULL),(178,124,32,8,NULL,NULL,1,NULL,0,0,NULL),(179,172,32,7,NULL,NULL,1,NULL,0,0,NULL),(180,71,172,2,NULL,NULL,1,NULL,0,0,NULL),(181,95,44,1,NULL,NULL,1,NULL,0,0,NULL),(182,112,44,1,NULL,NULL,1,NULL,0,0,NULL),(183,95,26,1,NULL,NULL,1,NULL,0,0,NULL),(184,112,26,1,NULL,NULL,1,NULL,0,0,NULL),(185,112,95,4,NULL,NULL,1,NULL,0,0,NULL),(186,26,154,8,NULL,NULL,1,NULL,0,0,NULL),(187,95,154,8,NULL,NULL,1,NULL,0,0,NULL),(188,112,154,8,NULL,NULL,1,NULL,0,0,NULL),(189,44,154,7,NULL,NULL,0,NULL,0,0,NULL),(190,26,44,2,NULL,NULL,0,NULL,0,0,NULL),(191,35,31,1,NULL,NULL,1,NULL,0,0,NULL),(192,159,31,1,NULL,NULL,1,NULL,0,0,NULL),(193,35,34,1,NULL,NULL,1,NULL,0,0,NULL),(194,159,34,1,NULL,NULL,1,NULL,0,0,NULL),(195,159,35,4,NULL,NULL,1,NULL,0,0,NULL),(196,34,187,8,NULL,NULL,1,NULL,0,0,NULL),(197,35,187,8,NULL,NULL,1,NULL,0,0,NULL),(198,159,187,8,NULL,NULL,1,NULL,0,0,NULL),(199,31,187,7,NULL,NULL,1,NULL,0,0,NULL),(200,34,31,2,NULL,NULL,1,NULL,0,0,NULL),(201,42,8,5,NULL,NULL,1,NULL,0,0,NULL),(202,58,9,5,NULL,NULL,1,NULL,0,0,NULL),(203,125,10,5,NULL,NULL,1,NULL,0,0,NULL),(204,73,20,5,NULL,NULL,1,NULL,0,0,NULL),(205,172,37,5,NULL,NULL,1,NULL,0,0,NULL),(206,77,55,5,NULL,NULL,1,NULL,0,0,NULL),(207,143,62,5,NULL,NULL,1,NULL,0,0,NULL),(208,156,66,5,NULL,NULL,1,NULL,0,0,NULL),(209,18,69,5,NULL,NULL,1,NULL,0,0,NULL),(210,61,76,5,NULL,NULL,1,NULL,0,0,NULL),(211,174,84,5,NULL,NULL,1,NULL,0,0,NULL),(212,22,98,5,NULL,NULL,1,NULL,0,0,NULL),(213,60,114,5,NULL,NULL,1,NULL,0,0,NULL),(214,40,115,5,NULL,NULL,1,NULL,0,0,NULL),(215,198,121,5,NULL,NULL,1,NULL,0,0,NULL),(216,170,128,5,NULL,NULL,1,NULL,0,0,NULL),(217,100,134,5,NULL,NULL,1,NULL,0,0,NULL),(218,29,149,5,NULL,NULL,1,NULL,0,0,NULL),(219,129,155,5,NULL,NULL,1,NULL,0,0,NULL);
 /*!40000 ALTER TABLE `civicrm_relationship` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1271,7 +1271,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_relationship_cache` WRITE;
 /*!40000 ALTER TABLE `civicrm_relationship_cache` DISABLE KEYS */;
-INSERT INTO `civicrm_relationship_cache` (`id`, `relationship_id`, `relationship_type_id`, `orientation`, `near_contact_id`, `near_relation`, `far_contact_id`, `far_relation`, `is_active`, `start_date`, `end_date`) VALUES (1,1,1,'a_b',74,'Child of',172,'Parent of',1,NULL,NULL),(2,1,1,'b_a',172,'Parent of',74,'Child of',1,NULL,NULL),(3,2,1,'a_b',47,'Child of',172,'Parent of',1,NULL,NULL),(4,2,1,'b_a',172,'Parent of',47,'Child of',1,NULL,NULL),(5,3,1,'a_b',74,'Child of',125,'Parent of',1,NULL,NULL),(6,3,1,'b_a',125,'Parent of',74,'Child of',1,NULL,NULL),(7,4,1,'a_b',47,'Child of',125,'Parent of',1,NULL,NULL),(8,4,1,'b_a',125,'Parent of',47,'Child of',1,NULL,NULL),(9,5,4,'a_b',47,'Sibling of',74,'Sibling of',1,NULL,NULL),(10,5,4,'b_a',74,'Sibling of',47,'Sibling of',1,NULL,NULL),(11,6,8,'a_b',125,'Household Member of',11,'Household Member is',1,NULL,NULL),(12,6,8,'b_a',11,'Household Member is',125,'Household Member of',1,NULL,NULL),(13,7,8,'a_b',74,'Household Member of',11,'Household Member is',1,NULL,NULL),(14,7,8,'b_a',11,'Household Member is',74,'Household Member of',1,NULL,NULL),(15,8,8,'a_b',47,'Household Member of',11,'Household Member is',1,NULL,NULL),(16,8,8,'b_a',11,'Household Member is',47,'Household Member of',1,NULL,NULL),(17,9,7,'a_b',172,'Head of Household for',11,'Head of Household is',0,NULL,NULL),(18,9,7,'b_a',11,'Head of Household is',172,'Head of Household for',0,NULL,NULL),(19,10,2,'a_b',125,'Spouse of',172,'Spouse of',0,NULL,NULL),(20,10,2,'b_a',172,'Spouse of',125,'Spouse of',0,NULL,NULL),(21,11,1,'a_b',126,'Child of',159,'Parent of',1,NULL,NULL),(22,11,1,'b_a',159,'Parent of',126,'Child of',1,NULL,NULL),(23,12,1,'a_b',9,'Child of',159,'Parent of',1,NULL,NULL),(24,12,1,'b_a',159,'Parent of',9,'Child of',1,NULL,NULL),(25,13,1,'a_b',126,'Child of',102,'Parent of',1,NULL,NULL),(26,13,1,'b_a',102,'Parent of',126,'Child of',1,NULL,NULL),(27,14,1,'a_b',9,'Child of',102,'Parent of',1,NULL,NULL),(28,14,1,'b_a',102,'Parent of',9,'Child of',1,NULL,NULL),(29,15,4,'a_b',9,'Sibling of',126,'Sibling of',1,NULL,NULL),(30,15,4,'b_a',126,'Sibling of',9,'Sibling of',1,NULL,NULL),(31,16,8,'a_b',102,'Household Member of',128,'Household Member is',1,NULL,NULL),(32,16,8,'b_a',128,'Household Member is',102,'Household Member of',1,NULL,NULL),(33,17,8,'a_b',126,'Household Member of',128,'Household Member is',1,NULL,NULL),(34,17,8,'b_a',128,'Household Member is',126,'Household Member of',1,NULL,NULL),(35,18,8,'a_b',9,'Household Member of',128,'Household Member is',1,NULL,NULL),(36,18,8,'b_a',128,'Household Member is',9,'Household Member of',1,NULL,NULL),(37,19,7,'a_b',159,'Head of Household for',128,'Head of Household is',0,NULL,NULL),(38,19,7,'b_a',128,'Head of Household is',159,'Head of Household for',0,NULL,NULL),(39,20,2,'a_b',102,'Spouse of',159,'Spouse of',0,NULL,NULL),(40,20,2,'b_a',159,'Spouse of',102,'Spouse of',0,NULL,NULL),(41,21,1,'a_b',40,'Child of',198,'Parent of',1,NULL,NULL),(42,21,1,'b_a',198,'Parent of',40,'Child of',1,NULL,NULL),(43,22,1,'a_b',85,'Child of',198,'Parent of',1,NULL,NULL),(44,22,1,'b_a',198,'Parent of',85,'Child of',1,NULL,NULL),(45,23,1,'a_b',40,'Child of',149,'Parent of',1,NULL,NULL),(46,23,1,'b_a',149,'Parent of',40,'Child of',1,NULL,NULL),(47,24,1,'a_b',85,'Child of',149,'Parent of',1,NULL,NULL),(48,24,1,'b_a',149,'Parent of',85,'Child of',1,NULL,NULL),(49,25,4,'a_b',85,'Sibling of',40,'Sibling of',1,NULL,NULL),(50,25,4,'b_a',40,'Sibling of',85,'Sibling of',1,NULL,NULL),(51,26,8,'a_b',149,'Household Member of',38,'Household Member is',1,NULL,NULL),(52,26,8,'b_a',38,'Household Member is',149,'Household Member of',1,NULL,NULL),(53,27,8,'a_b',40,'Household Member of',38,'Household Member is',1,NULL,NULL),(54,27,8,'b_a',38,'Household Member is',40,'Household Member of',1,NULL,NULL),(55,28,8,'a_b',85,'Household Member of',38,'Household Member is',1,NULL,NULL),(56,28,8,'b_a',38,'Household Member is',85,'Household Member of',1,NULL,NULL),(57,29,7,'a_b',198,'Head of Household for',38,'Head of Household is',1,NULL,NULL),(58,29,7,'b_a',38,'Head of Household is',198,'Head of Household for',1,NULL,NULL),(59,30,2,'a_b',149,'Spouse of',198,'Spouse of',1,NULL,NULL),(60,30,2,'b_a',198,'Spouse of',149,'Spouse of',1,NULL,NULL),(61,31,1,'a_b',134,'Child of',192,'Parent of',1,NULL,NULL),(62,31,1,'b_a',192,'Parent of',134,'Child of',1,NULL,NULL),(63,32,1,'a_b',100,'Child of',192,'Parent of',1,NULL,NULL),(64,32,1,'b_a',192,'Parent of',100,'Child of',1,NULL,NULL),(65,33,1,'a_b',134,'Child of',170,'Parent of',1,NULL,NULL),(66,33,1,'b_a',170,'Parent of',134,'Child of',1,NULL,NULL),(67,34,1,'a_b',100,'Child of',170,'Parent of',1,NULL,NULL),(68,34,1,'b_a',170,'Parent of',100,'Child of',1,NULL,NULL),(69,35,4,'a_b',100,'Sibling of',134,'Sibling of',1,NULL,NULL),(70,35,4,'b_a',134,'Sibling of',100,'Sibling of',1,NULL,NULL),(71,36,8,'a_b',170,'Household Member of',136,'Household Member is',1,NULL,NULL),(72,36,8,'b_a',136,'Household Member is',170,'Household Member of',1,NULL,NULL),(73,37,8,'a_b',134,'Household Member of',136,'Household Member is',1,NULL,NULL),(74,37,8,'b_a',136,'Household Member is',134,'Household Member of',1,NULL,NULL),(75,38,8,'a_b',100,'Household Member of',136,'Household Member is',1,NULL,NULL),(76,38,8,'b_a',136,'Household Member is',100,'Household Member of',1,NULL,NULL),(77,39,7,'a_b',192,'Head of Household for',136,'Head of Household is',0,NULL,NULL),(78,39,7,'b_a',136,'Head of Household is',192,'Head of Household for',0,NULL,NULL),(79,40,2,'a_b',170,'Spouse of',192,'Spouse of',0,NULL,NULL),(80,40,2,'b_a',192,'Spouse of',170,'Spouse of',0,NULL,NULL),(81,41,1,'a_b',59,'Child of',34,'Parent of',1,NULL,NULL),(82,41,1,'b_a',34,'Parent of',59,'Child of',1,NULL,NULL),(83,42,1,'a_b',110,'Child of',34,'Parent of',1,NULL,NULL),(84,42,1,'b_a',34,'Parent of',110,'Child of',1,NULL,NULL),(85,43,1,'a_b',59,'Child of',113,'Parent of',1,NULL,NULL),(86,43,1,'b_a',113,'Parent of',59,'Child of',1,NULL,NULL),(87,44,1,'a_b',110,'Child of',113,'Parent of',1,NULL,NULL),(88,44,1,'b_a',113,'Parent of',110,'Child of',1,NULL,NULL),(89,45,4,'a_b',110,'Sibling of',59,'Sibling of',1,NULL,NULL),(90,45,4,'b_a',59,'Sibling of',110,'Sibling of',1,NULL,NULL),(91,46,8,'a_b',113,'Household Member of',32,'Household Member is',1,NULL,NULL),(92,46,8,'b_a',32,'Household Member is',113,'Household Member of',1,NULL,NULL),(93,47,8,'a_b',59,'Household Member of',32,'Household Member is',1,NULL,NULL),(94,47,8,'b_a',32,'Household Member is',59,'Household Member of',1,NULL,NULL),(95,48,8,'a_b',110,'Household Member of',32,'Household Member is',1,NULL,NULL),(96,48,8,'b_a',32,'Household Member is',110,'Household Member of',1,NULL,NULL),(97,49,7,'a_b',34,'Head of Household for',32,'Head of Household is',1,NULL,NULL),(98,49,7,'b_a',32,'Head of Household is',34,'Head of Household for',1,NULL,NULL),(99,50,2,'a_b',113,'Spouse of',34,'Spouse of',1,NULL,NULL),(100,50,2,'b_a',34,'Spouse of',113,'Spouse of',1,NULL,NULL),(101,51,1,'a_b',147,'Child of',191,'Parent of',1,NULL,NULL),(102,51,1,'b_a',191,'Parent of',147,'Child of',1,NULL,NULL),(103,52,1,'a_b',151,'Child of',191,'Parent of',1,NULL,NULL),(104,52,1,'b_a',191,'Parent of',151,'Child of',1,NULL,NULL),(105,53,1,'a_b',147,'Child of',160,'Parent of',1,NULL,NULL),(106,53,1,'b_a',160,'Parent of',147,'Child of',1,NULL,NULL),(107,54,1,'a_b',151,'Child of',160,'Parent of',1,NULL,NULL),(108,54,1,'b_a',160,'Parent of',151,'Child of',1,NULL,NULL),(109,55,4,'a_b',151,'Sibling of',147,'Sibling of',1,NULL,NULL),(110,55,4,'b_a',147,'Sibling of',151,'Sibling of',1,NULL,NULL),(111,56,8,'a_b',160,'Household Member of',27,'Household Member is',1,NULL,NULL),(112,56,8,'b_a',27,'Household Member is',160,'Household Member of',1,NULL,NULL),(113,57,8,'a_b',147,'Household Member of',27,'Household Member is',1,NULL,NULL),(114,57,8,'b_a',27,'Household Member is',147,'Household Member of',1,NULL,NULL),(115,58,8,'a_b',151,'Household Member of',27,'Household Member is',1,NULL,NULL),(116,58,8,'b_a',27,'Household Member is',151,'Household Member of',1,NULL,NULL),(117,59,7,'a_b',191,'Head of Household for',27,'Head of Household is',1,NULL,NULL),(118,59,7,'b_a',27,'Head of Household is',191,'Head of Household for',1,NULL,NULL),(119,60,2,'a_b',160,'Spouse of',191,'Spouse of',1,NULL,NULL),(120,60,2,'b_a',191,'Spouse of',160,'Spouse of',1,NULL,NULL),(121,61,1,'a_b',94,'Child of',82,'Parent of',1,NULL,NULL),(122,61,1,'b_a',82,'Parent of',94,'Child of',1,NULL,NULL),(123,62,1,'a_b',188,'Child of',82,'Parent of',1,NULL,NULL),(124,62,1,'b_a',82,'Parent of',188,'Child of',1,NULL,NULL),(125,63,1,'a_b',94,'Child of',196,'Parent of',1,NULL,NULL),(126,63,1,'b_a',196,'Parent of',94,'Child of',1,NULL,NULL),(127,64,1,'a_b',188,'Child of',196,'Parent of',1,NULL,NULL),(128,64,1,'b_a',196,'Parent of',188,'Child of',1,NULL,NULL),(129,65,4,'a_b',188,'Sibling of',94,'Sibling of',1,NULL,NULL),(130,65,4,'b_a',94,'Sibling of',188,'Sibling of',1,NULL,NULL),(131,66,8,'a_b',196,'Household Member of',116,'Household Member is',1,NULL,NULL),(132,66,8,'b_a',116,'Household Member is',196,'Household Member of',1,NULL,NULL),(133,67,8,'a_b',94,'Household Member of',116,'Household Member is',1,NULL,NULL),(134,67,8,'b_a',116,'Household Member is',94,'Household Member of',1,NULL,NULL),(135,68,8,'a_b',188,'Household Member of',116,'Household Member is',1,NULL,NULL),(136,68,8,'b_a',116,'Household Member is',188,'Household Member of',1,NULL,NULL),(137,69,7,'a_b',82,'Head of Household for',116,'Head of Household is',0,NULL,NULL),(138,69,7,'b_a',116,'Head of Household is',82,'Head of Household for',0,NULL,NULL),(139,70,2,'a_b',196,'Spouse of',82,'Spouse of',0,NULL,NULL),(140,70,2,'b_a',82,'Spouse of',196,'Spouse of',0,NULL,NULL),(141,71,1,'a_b',28,'Child of',195,'Parent of',1,NULL,NULL),(142,71,1,'b_a',195,'Parent of',28,'Child of',1,NULL,NULL),(143,72,1,'a_b',133,'Child of',195,'Parent of',1,NULL,NULL),(144,72,1,'b_a',195,'Parent of',133,'Child of',1,NULL,NULL),(145,73,1,'a_b',28,'Child of',173,'Parent of',1,NULL,NULL),(146,73,1,'b_a',173,'Parent of',28,'Child of',1,NULL,NULL),(147,74,1,'a_b',133,'Child of',173,'Parent of',1,NULL,NULL),(148,74,1,'b_a',173,'Parent of',133,'Child of',1,NULL,NULL),(149,75,4,'a_b',133,'Sibling of',28,'Sibling of',1,NULL,NULL),(150,75,4,'b_a',28,'Sibling of',133,'Sibling of',1,NULL,NULL),(151,76,8,'a_b',173,'Household Member of',106,'Household Member is',1,NULL,NULL),(152,76,8,'b_a',106,'Household Member is',173,'Household Member of',1,NULL,NULL),(153,77,8,'a_b',28,'Household Member of',106,'Household Member is',1,NULL,NULL),(154,77,8,'b_a',106,'Household Member is',28,'Household Member of',1,NULL,NULL),(155,78,8,'a_b',133,'Household Member of',106,'Household Member is',1,NULL,NULL),(156,78,8,'b_a',106,'Household Member is',133,'Household Member of',1,NULL,NULL),(157,79,7,'a_b',195,'Head of Household for',106,'Head of Household is',0,NULL,NULL),(158,79,7,'b_a',106,'Head of Household is',195,'Head of Household for',0,NULL,NULL),(159,80,2,'a_b',173,'Spouse of',195,'Spouse of',0,NULL,NULL),(160,80,2,'b_a',195,'Spouse of',173,'Spouse of',0,NULL,NULL),(161,81,1,'a_b',152,'Child of',141,'Parent of',1,NULL,NULL),(162,81,1,'b_a',141,'Parent of',152,'Child of',1,NULL,NULL),(163,82,1,'a_b',61,'Child of',141,'Parent of',1,NULL,NULL),(164,82,1,'b_a',141,'Parent of',61,'Child of',1,NULL,NULL),(165,83,1,'a_b',152,'Child of',112,'Parent of',1,NULL,NULL),(166,83,1,'b_a',112,'Parent of',152,'Child of',1,NULL,NULL),(167,84,1,'a_b',61,'Child of',112,'Parent of',1,NULL,NULL),(168,84,1,'b_a',112,'Parent of',61,'Child of',1,NULL,NULL),(169,85,4,'a_b',61,'Sibling of',152,'Sibling of',1,NULL,NULL),(170,85,4,'b_a',152,'Sibling of',61,'Sibling of',1,NULL,NULL),(171,86,8,'a_b',112,'Household Member of',22,'Household Member is',1,NULL,NULL),(172,86,8,'b_a',22,'Household Member is',112,'Household Member of',1,NULL,NULL),(173,87,8,'a_b',152,'Household Member of',22,'Household Member is',1,NULL,NULL),(174,87,8,'b_a',22,'Household Member is',152,'Household Member of',1,NULL,NULL),(175,88,8,'a_b',61,'Household Member of',22,'Household Member is',1,NULL,NULL),(176,88,8,'b_a',22,'Household Member is',61,'Household Member of',1,NULL,NULL),(177,89,7,'a_b',141,'Head of Household for',22,'Head of Household is',1,NULL,NULL),(178,89,7,'b_a',22,'Head of Household is',141,'Head of Household for',1,NULL,NULL),(179,90,2,'a_b',112,'Spouse of',141,'Spouse of',1,NULL,NULL),(180,90,2,'b_a',141,'Spouse of',112,'Spouse of',1,NULL,NULL),(181,91,1,'a_b',155,'Child of',108,'Parent of',1,NULL,NULL),(182,91,1,'b_a',108,'Parent of',155,'Child of',1,NULL,NULL),(183,92,1,'a_b',29,'Child of',108,'Parent of',1,NULL,NULL),(184,92,1,'b_a',108,'Parent of',29,'Child of',1,NULL,NULL),(185,93,1,'a_b',155,'Child of',54,'Parent of',1,NULL,NULL),(186,93,1,'b_a',54,'Parent of',155,'Child of',1,NULL,NULL),(187,94,1,'a_b',29,'Child of',54,'Parent of',1,NULL,NULL),(188,94,1,'b_a',54,'Parent of',29,'Child of',1,NULL,NULL),(189,95,4,'a_b',29,'Sibling of',155,'Sibling of',1,NULL,NULL),(190,95,4,'b_a',155,'Sibling of',29,'Sibling of',1,NULL,NULL),(191,96,8,'a_b',54,'Household Member of',115,'Household Member is',1,NULL,NULL),(192,96,8,'b_a',115,'Household Member is',54,'Household Member of',1,NULL,NULL),(193,97,8,'a_b',155,'Household Member of',115,'Household Member is',1,NULL,NULL),(194,97,8,'b_a',115,'Household Member is',155,'Household Member of',1,NULL,NULL),(195,98,8,'a_b',29,'Household Member of',115,'Household Member is',1,NULL,NULL),(196,98,8,'b_a',115,'Household Member is',29,'Household Member of',1,NULL,NULL),(197,99,7,'a_b',108,'Head of Household for',115,'Head of Household is',1,NULL,NULL),(198,99,7,'b_a',115,'Head of Household is',108,'Head of Household for',1,NULL,NULL),(199,100,2,'a_b',54,'Spouse of',108,'Spouse of',1,NULL,NULL),(200,100,2,'b_a',108,'Spouse of',54,'Spouse of',1,NULL,NULL),(201,101,1,'a_b',63,'Child of',103,'Parent of',1,NULL,NULL),(202,101,1,'b_a',103,'Parent of',63,'Child of',1,NULL,NULL),(203,102,1,'a_b',95,'Child of',103,'Parent of',1,NULL,NULL),(204,102,1,'b_a',103,'Parent of',95,'Child of',1,NULL,NULL),(205,103,1,'a_b',63,'Child of',201,'Parent of',1,NULL,NULL),(206,103,1,'b_a',201,'Parent of',63,'Child of',1,NULL,NULL),(207,104,1,'a_b',95,'Child of',201,'Parent of',1,NULL,NULL),(208,104,1,'b_a',201,'Parent of',95,'Child of',1,NULL,NULL),(209,105,4,'a_b',95,'Sibling of',63,'Sibling of',1,NULL,NULL),(210,105,4,'b_a',63,'Sibling of',95,'Sibling of',1,NULL,NULL),(211,106,8,'a_b',201,'Household Member of',35,'Household Member is',1,NULL,NULL),(212,106,8,'b_a',35,'Household Member is',201,'Household Member of',1,NULL,NULL),(213,107,8,'a_b',63,'Household Member of',35,'Household Member is',1,NULL,NULL),(214,107,8,'b_a',35,'Household Member is',63,'Household Member of',1,NULL,NULL),(215,108,8,'a_b',95,'Household Member of',35,'Household Member is',1,NULL,NULL),(216,108,8,'b_a',35,'Household Member is',95,'Household Member of',1,NULL,NULL),(217,109,7,'a_b',103,'Head of Household for',35,'Head of Household is',1,NULL,NULL),(218,109,7,'b_a',35,'Head of Household is',103,'Head of Household for',1,NULL,NULL),(219,110,2,'a_b',201,'Spouse of',103,'Spouse of',1,NULL,NULL),(220,110,2,'b_a',103,'Spouse of',201,'Spouse of',1,NULL,NULL),(221,111,1,'a_b',114,'Child of',107,'Parent of',1,NULL,NULL),(222,111,1,'b_a',107,'Parent of',114,'Child of',1,NULL,NULL),(223,112,1,'a_b',70,'Child of',107,'Parent of',1,NULL,NULL),(224,112,1,'b_a',107,'Parent of',70,'Child of',1,NULL,NULL),(225,113,1,'a_b',114,'Child of',68,'Parent of',1,NULL,NULL),(226,113,1,'b_a',68,'Parent of',114,'Child of',1,NULL,NULL),(227,114,1,'a_b',70,'Child of',68,'Parent of',1,NULL,NULL),(228,114,1,'b_a',68,'Parent of',70,'Child of',1,NULL,NULL),(229,115,4,'a_b',70,'Sibling of',114,'Sibling of',1,NULL,NULL),(230,115,4,'b_a',114,'Sibling of',70,'Sibling of',1,NULL,NULL),(231,116,8,'a_b',68,'Household Member of',177,'Household Member is',1,NULL,NULL),(232,116,8,'b_a',177,'Household Member is',68,'Household Member of',1,NULL,NULL),(233,117,8,'a_b',114,'Household Member of',177,'Household Member is',1,NULL,NULL),(234,117,8,'b_a',177,'Household Member is',114,'Household Member of',1,NULL,NULL),(235,118,8,'a_b',70,'Household Member of',177,'Household Member is',1,NULL,NULL),(236,118,8,'b_a',177,'Household Member is',70,'Household Member of',1,NULL,NULL),(237,119,7,'a_b',107,'Head of Household for',177,'Head of Household is',1,NULL,NULL),(238,119,7,'b_a',177,'Head of Household is',107,'Head of Household for',1,NULL,NULL),(239,120,2,'a_b',68,'Spouse of',107,'Spouse of',1,NULL,NULL),(240,120,2,'b_a',107,'Spouse of',68,'Spouse of',1,NULL,NULL),(241,121,1,'a_b',140,'Child of',10,'Parent of',1,NULL,NULL),(242,121,1,'b_a',10,'Parent of',140,'Child of',1,NULL,NULL),(243,122,1,'a_b',58,'Child of',10,'Parent of',1,NULL,NULL),(244,122,1,'b_a',10,'Parent of',58,'Child of',1,NULL,NULL),(245,123,1,'a_b',140,'Child of',130,'Parent of',1,NULL,NULL),(246,123,1,'b_a',130,'Parent of',140,'Child of',1,NULL,NULL),(247,124,1,'a_b',58,'Child of',130,'Parent of',1,NULL,NULL),(248,124,1,'b_a',130,'Parent of',58,'Child of',1,NULL,NULL),(249,125,4,'a_b',58,'Sibling of',140,'Sibling of',1,NULL,NULL),(250,125,4,'b_a',140,'Sibling of',58,'Sibling of',1,NULL,NULL),(251,126,8,'a_b',130,'Household Member of',150,'Household Member is',1,NULL,NULL),(252,126,8,'b_a',150,'Household Member is',130,'Household Member of',1,NULL,NULL),(253,127,8,'a_b',140,'Household Member of',150,'Household Member is',1,NULL,NULL),(254,127,8,'b_a',150,'Household Member is',140,'Household Member of',1,NULL,NULL),(255,128,8,'a_b',58,'Household Member of',150,'Household Member is',1,NULL,NULL),(256,128,8,'b_a',150,'Household Member is',58,'Household Member of',1,NULL,NULL),(257,129,7,'a_b',10,'Head of Household for',150,'Head of Household is',1,NULL,NULL),(258,129,7,'b_a',150,'Head of Household is',10,'Head of Household for',1,NULL,NULL),(259,130,2,'a_b',130,'Spouse of',10,'Spouse of',1,NULL,NULL),(260,130,2,'b_a',10,'Spouse of',130,'Spouse of',1,NULL,NULL),(261,131,1,'a_b',78,'Child of',187,'Parent of',1,NULL,NULL),(262,131,1,'b_a',187,'Parent of',78,'Child of',1,NULL,NULL),(263,132,1,'a_b',181,'Child of',187,'Parent of',1,NULL,NULL),(264,132,1,'b_a',187,'Parent of',181,'Child of',1,NULL,NULL),(265,133,1,'a_b',78,'Child of',48,'Parent of',1,NULL,NULL),(266,133,1,'b_a',48,'Parent of',78,'Child of',1,NULL,NULL),(267,134,1,'a_b',181,'Child of',48,'Parent of',1,NULL,NULL),(268,134,1,'b_a',48,'Parent of',181,'Child of',1,NULL,NULL),(269,135,4,'a_b',181,'Sibling of',78,'Sibling of',1,NULL,NULL),(270,135,4,'b_a',78,'Sibling of',181,'Sibling of',1,NULL,NULL),(271,136,8,'a_b',48,'Household Member of',72,'Household Member is',1,NULL,NULL),(272,136,8,'b_a',72,'Household Member is',48,'Household Member of',1,NULL,NULL),(273,137,8,'a_b',78,'Household Member of',72,'Household Member is',1,NULL,NULL),(274,137,8,'b_a',72,'Household Member is',78,'Household Member of',1,NULL,NULL),(275,138,8,'a_b',181,'Household Member of',72,'Household Member is',1,NULL,NULL),(276,138,8,'b_a',72,'Household Member is',181,'Household Member of',1,NULL,NULL),(277,139,7,'a_b',187,'Head of Household for',72,'Head of Household is',0,NULL,NULL),(278,139,7,'b_a',72,'Head of Household is',187,'Head of Household for',0,NULL,NULL),(279,140,2,'a_b',48,'Spouse of',187,'Spouse of',0,NULL,NULL),(280,140,2,'b_a',187,'Spouse of',48,'Spouse of',0,NULL,NULL),(281,141,1,'a_b',20,'Child of',135,'Parent of',1,NULL,NULL),(282,141,1,'b_a',135,'Parent of',20,'Child of',1,NULL,NULL),(283,142,1,'a_b',13,'Child of',135,'Parent of',1,NULL,NULL),(284,142,1,'b_a',135,'Parent of',13,'Child of',1,NULL,NULL),(285,143,1,'a_b',20,'Child of',43,'Parent of',1,NULL,NULL),(286,143,1,'b_a',43,'Parent of',20,'Child of',1,NULL,NULL),(287,144,1,'a_b',13,'Child of',43,'Parent of',1,NULL,NULL),(288,144,1,'b_a',43,'Parent of',13,'Child of',1,NULL,NULL),(289,145,4,'a_b',13,'Sibling of',20,'Sibling of',1,NULL,NULL),(290,145,4,'b_a',20,'Sibling of',13,'Sibling of',1,NULL,NULL),(291,146,8,'a_b',43,'Household Member of',21,'Household Member is',1,NULL,NULL),(292,146,8,'b_a',21,'Household Member is',43,'Household Member of',1,NULL,NULL),(293,147,8,'a_b',20,'Household Member of',21,'Household Member is',1,NULL,NULL),(294,147,8,'b_a',21,'Household Member is',20,'Household Member of',1,NULL,NULL),(295,148,8,'a_b',13,'Household Member of',21,'Household Member is',1,NULL,NULL),(296,148,8,'b_a',21,'Household Member is',13,'Household Member of',1,NULL,NULL),(297,149,7,'a_b',135,'Head of Household for',21,'Head of Household is',0,NULL,NULL),(298,149,7,'b_a',21,'Head of Household is',135,'Head of Household for',0,NULL,NULL),(299,150,2,'a_b',43,'Spouse of',135,'Spouse of',0,NULL,NULL),(300,150,2,'b_a',135,'Spouse of',43,'Spouse of',0,NULL,NULL),(301,151,1,'a_b',89,'Child of',194,'Parent of',1,NULL,NULL),(302,151,1,'b_a',194,'Parent of',89,'Child of',1,NULL,NULL),(303,152,1,'a_b',75,'Child of',194,'Parent of',1,NULL,NULL),(304,152,1,'b_a',194,'Parent of',75,'Child of',1,NULL,NULL),(305,153,1,'a_b',89,'Child of',131,'Parent of',1,NULL,NULL),(306,153,1,'b_a',131,'Parent of',89,'Child of',1,NULL,NULL),(307,154,1,'a_b',75,'Child of',131,'Parent of',1,NULL,NULL),(308,154,1,'b_a',131,'Parent of',75,'Child of',1,NULL,NULL),(309,155,4,'a_b',75,'Sibling of',89,'Sibling of',1,NULL,NULL),(310,155,4,'b_a',89,'Sibling of',75,'Sibling of',1,NULL,NULL),(311,156,8,'a_b',131,'Household Member of',19,'Household Member is',1,NULL,NULL),(312,156,8,'b_a',19,'Household Member is',131,'Household Member of',1,NULL,NULL),(313,157,8,'a_b',89,'Household Member of',19,'Household Member is',1,NULL,NULL),(314,157,8,'b_a',19,'Household Member is',89,'Household Member of',1,NULL,NULL),(315,158,8,'a_b',75,'Household Member of',19,'Household Member is',1,NULL,NULL),(316,158,8,'b_a',19,'Household Member is',75,'Household Member of',1,NULL,NULL),(317,159,7,'a_b',194,'Head of Household for',19,'Head of Household is',0,NULL,NULL),(318,159,7,'b_a',19,'Head of Household is',194,'Head of Household for',0,NULL,NULL),(319,160,2,'a_b',131,'Spouse of',194,'Spouse of',0,NULL,NULL),(320,160,2,'b_a',194,'Spouse of',131,'Spouse of',0,NULL,NULL),(321,161,1,'a_b',121,'Child of',104,'Parent of',1,NULL,NULL),(322,161,1,'b_a',104,'Parent of',121,'Child of',1,NULL,NULL),(323,162,1,'a_b',39,'Child of',104,'Parent of',1,NULL,NULL),(324,162,1,'b_a',104,'Parent of',39,'Child of',1,NULL,NULL),(325,163,1,'a_b',121,'Child of',153,'Parent of',1,NULL,NULL),(326,163,1,'b_a',153,'Parent of',121,'Child of',1,NULL,NULL),(327,164,1,'a_b',39,'Child of',153,'Parent of',1,NULL,NULL),(328,164,1,'b_a',153,'Parent of',39,'Child of',1,NULL,NULL),(329,165,4,'a_b',39,'Sibling of',121,'Sibling of',1,NULL,NULL),(330,165,4,'b_a',121,'Sibling of',39,'Sibling of',1,NULL,NULL),(331,166,8,'a_b',153,'Household Member of',168,'Household Member is',1,NULL,NULL),(332,166,8,'b_a',168,'Household Member is',153,'Household Member of',1,NULL,NULL),(333,167,8,'a_b',121,'Household Member of',168,'Household Member is',1,NULL,NULL),(334,167,8,'b_a',168,'Household Member is',121,'Household Member of',1,NULL,NULL),(335,168,8,'a_b',39,'Household Member of',168,'Household Member is',1,NULL,NULL),(336,168,8,'b_a',168,'Household Member is',39,'Household Member of',1,NULL,NULL),(337,169,7,'a_b',104,'Head of Household for',168,'Head of Household is',1,NULL,NULL),(338,169,7,'b_a',168,'Head of Household is',104,'Head of Household for',1,NULL,NULL),(339,170,2,'a_b',153,'Spouse of',104,'Spouse of',1,NULL,NULL),(340,170,2,'b_a',104,'Spouse of',153,'Spouse of',1,NULL,NULL),(341,171,1,'a_b',36,'Child of',42,'Parent of',1,NULL,NULL),(342,171,1,'b_a',42,'Parent of',36,'Child of',1,NULL,NULL),(343,172,1,'a_b',26,'Child of',42,'Parent of',1,NULL,NULL),(344,172,1,'b_a',42,'Parent of',26,'Child of',1,NULL,NULL),(345,173,1,'a_b',36,'Child of',189,'Parent of',1,NULL,NULL),(346,173,1,'b_a',189,'Parent of',36,'Child of',1,NULL,NULL),(347,174,1,'a_b',26,'Child of',189,'Parent of',1,NULL,NULL),(348,174,1,'b_a',189,'Parent of',26,'Child of',1,NULL,NULL),(349,175,4,'a_b',26,'Sibling of',36,'Sibling of',1,NULL,NULL),(350,175,4,'b_a',36,'Sibling of',26,'Sibling of',1,NULL,NULL),(351,176,8,'a_b',189,'Household Member of',101,'Household Member is',1,NULL,NULL),(352,176,8,'b_a',101,'Household Member is',189,'Household Member of',1,NULL,NULL),(353,177,8,'a_b',36,'Household Member of',101,'Household Member is',1,NULL,NULL),(354,177,8,'b_a',101,'Household Member is',36,'Household Member of',1,NULL,NULL),(355,178,8,'a_b',26,'Household Member of',101,'Household Member is',1,NULL,NULL),(356,178,8,'b_a',101,'Household Member is',26,'Household Member of',1,NULL,NULL),(357,179,7,'a_b',42,'Head of Household for',101,'Head of Household is',1,NULL,NULL),(358,179,7,'b_a',101,'Head of Household is',42,'Head of Household for',1,NULL,NULL),(359,180,2,'a_b',189,'Spouse of',42,'Spouse of',1,NULL,NULL),(360,180,2,'b_a',42,'Spouse of',189,'Spouse of',1,NULL,NULL),(361,181,1,'a_b',69,'Child of',171,'Parent of',1,NULL,NULL),(362,181,1,'b_a',171,'Parent of',69,'Child of',1,NULL,NULL),(363,182,1,'a_b',109,'Child of',171,'Parent of',1,NULL,NULL),(364,182,1,'b_a',171,'Parent of',109,'Child of',1,NULL,NULL),(365,183,1,'a_b',69,'Child of',200,'Parent of',1,NULL,NULL),(366,183,1,'b_a',200,'Parent of',69,'Child of',1,NULL,NULL),(367,184,1,'a_b',109,'Child of',200,'Parent of',1,NULL,NULL),(368,184,1,'b_a',200,'Parent of',109,'Child of',1,NULL,NULL),(369,185,4,'a_b',109,'Sibling of',69,'Sibling of',1,NULL,NULL),(370,185,4,'b_a',69,'Sibling of',109,'Sibling of',1,NULL,NULL),(371,186,8,'a_b',200,'Household Member of',98,'Household Member is',1,NULL,NULL),(372,186,8,'b_a',98,'Household Member is',200,'Household Member of',1,NULL,NULL),(373,187,8,'a_b',69,'Household Member of',98,'Household Member is',1,NULL,NULL),(374,187,8,'b_a',98,'Household Member is',69,'Household Member of',1,NULL,NULL),(375,188,8,'a_b',109,'Household Member of',98,'Household Member is',1,NULL,NULL),(376,188,8,'b_a',98,'Household Member is',109,'Household Member of',1,NULL,NULL),(377,189,7,'a_b',171,'Head of Household for',98,'Head of Household is',1,NULL,NULL),(378,189,7,'b_a',98,'Head of Household is',171,'Head of Household for',1,NULL,NULL),(379,190,2,'a_b',200,'Spouse of',171,'Spouse of',1,NULL,NULL),(380,190,2,'b_a',171,'Spouse of',200,'Spouse of',1,NULL,NULL),(381,191,1,'a_b',158,'Child of',25,'Parent of',1,NULL,NULL),(382,191,1,'b_a',25,'Parent of',158,'Child of',1,NULL,NULL),(383,192,1,'a_b',4,'Child of',25,'Parent of',1,NULL,NULL),(384,192,1,'b_a',25,'Parent of',4,'Child of',1,NULL,NULL),(385,193,1,'a_b',158,'Child of',180,'Parent of',1,NULL,NULL),(386,193,1,'b_a',180,'Parent of',158,'Child of',1,NULL,NULL),(387,194,1,'a_b',4,'Child of',180,'Parent of',1,NULL,NULL),(388,194,1,'b_a',180,'Parent of',4,'Child of',1,NULL,NULL),(389,195,4,'a_b',4,'Sibling of',158,'Sibling of',1,NULL,NULL),(390,195,4,'b_a',158,'Sibling of',4,'Sibling of',1,NULL,NULL),(391,196,8,'a_b',180,'Household Member of',163,'Household Member is',1,NULL,NULL),(392,196,8,'b_a',163,'Household Member is',180,'Household Member of',1,NULL,NULL),(393,197,8,'a_b',158,'Household Member of',163,'Household Member is',1,NULL,NULL),(394,197,8,'b_a',163,'Household Member is',158,'Household Member of',1,NULL,NULL),(395,198,8,'a_b',4,'Household Member of',163,'Household Member is',1,NULL,NULL),(396,198,8,'b_a',163,'Household Member is',4,'Household Member of',1,NULL,NULL),(397,199,7,'a_b',25,'Head of Household for',163,'Head of Household is',0,NULL,NULL),(398,199,7,'b_a',163,'Head of Household is',25,'Head of Household for',0,NULL,NULL),(399,200,2,'a_b',180,'Spouse of',25,'Spouse of',0,NULL,NULL),(400,200,2,'b_a',25,'Spouse of',180,'Spouse of',0,NULL,NULL),(401,201,5,'a_b',26,'Employee of',14,'Employer of',1,NULL,NULL),(402,201,5,'b_a',14,'Employer of',26,'Employee of',1,NULL,NULL),(403,202,5,'a_b',36,'Employee of',37,'Employer of',1,NULL,NULL),(404,202,5,'b_a',37,'Employer of',36,'Employee of',1,NULL,NULL),(405,203,5,'a_b',20,'Employee of',46,'Employer of',1,NULL,NULL),(406,203,5,'b_a',46,'Employer of',20,'Employee of',1,NULL,NULL),(407,204,5,'a_b',89,'Employee of',50,'Employer of',1,NULL,NULL),(408,204,5,'b_a',50,'Employer of',89,'Employee of',1,NULL,NULL),(409,205,5,'a_b',189,'Employee of',56,'Employer of',1,NULL,NULL),(410,205,5,'b_a',56,'Employer of',189,'Employee of',1,NULL,NULL),(411,206,5,'a_b',29,'Employee of',62,'Employer of',1,NULL,NULL),(412,206,5,'b_a',62,'Employer of',29,'Employee of',1,NULL,NULL),(413,207,5,'a_b',75,'Employee of',73,'Employer of',1,NULL,NULL),(414,207,5,'b_a',73,'Employer of',75,'Employee of',1,NULL,NULL),(415,208,5,'a_b',197,'Employee of',86,'Employer of',1,NULL,NULL),(416,208,5,'b_a',86,'Employer of',197,'Employee of',1,NULL,NULL),(417,209,5,'a_b',120,'Employee of',91,'Employer of',1,NULL,NULL),(418,209,5,'b_a',91,'Employer of',120,'Employee of',1,NULL,NULL),(419,210,5,'a_b',151,'Employee of',105,'Employer of',1,NULL,NULL),(420,210,5,'b_a',105,'Employer of',151,'Employee of',1,NULL,NULL),(421,211,5,'a_b',85,'Employee of',117,'Employer of',1,NULL,NULL),(422,211,5,'b_a',117,'Employer of',85,'Employee of',1,NULL,NULL),(423,212,5,'a_b',34,'Employee of',137,'Employer of',1,NULL,NULL),(424,212,5,'b_a',137,'Employer of',34,'Employee of',1,NULL,NULL),(425,213,5,'a_b',170,'Employee of',142,'Employer of',1,NULL,NULL),(426,213,5,'b_a',142,'Employer of',170,'Employee of',1,NULL,NULL),(427,214,5,'a_b',18,'Employee of',144,'Employer of',1,NULL,NULL),(428,214,5,'b_a',144,'Employer of',18,'Employee of',1,NULL,NULL),(429,215,5,'a_b',104,'Employee of',148,'Employer of',1,NULL,NULL),(430,215,5,'b_a',148,'Employer of',104,'Employee of',1,NULL,NULL),(431,216,5,'a_b',57,'Employee of',157,'Employer of',1,NULL,NULL),(432,216,5,'b_a',157,'Employer of',57,'Employee of',1,NULL,NULL),(433,217,5,'a_b',185,'Employee of',174,'Employer of',1,NULL,NULL),(434,217,5,'b_a',174,'Employer of',185,'Employee of',1,NULL,NULL),(435,218,5,'a_b',186,'Employee of',178,'Employer of',1,NULL,NULL),(436,218,5,'b_a',178,'Employer of',186,'Employee of',1,NULL,NULL);
+INSERT INTO `civicrm_relationship_cache` (`id`, `relationship_id`, `relationship_type_id`, `orientation`, `near_contact_id`, `near_relation`, `far_contact_id`, `far_relation`, `is_active`, `start_date`, `end_date`) VALUES (1,1,1,'a_b',67,'Child of',22,'Parent of',1,NULL,NULL),(2,1,1,'b_a',22,'Parent of',67,'Child of',1,NULL,NULL),(3,2,1,'a_b',125,'Child of',22,'Parent of',1,NULL,NULL),(4,2,1,'b_a',22,'Parent of',125,'Child of',1,NULL,NULL),(5,3,1,'a_b',67,'Child of',153,'Parent of',1,NULL,NULL),(6,3,1,'b_a',153,'Parent of',67,'Child of',1,NULL,NULL),(7,4,1,'a_b',125,'Child of',153,'Parent of',1,NULL,NULL),(8,4,1,'b_a',153,'Parent of',125,'Child of',1,NULL,NULL),(9,5,4,'a_b',125,'Sibling of',67,'Sibling of',1,NULL,NULL),(10,5,4,'b_a',67,'Sibling of',125,'Sibling of',1,NULL,NULL),(11,6,8,'a_b',153,'Household Member of',182,'Household Member is',1,NULL,NULL),(12,6,8,'b_a',182,'Household Member is',153,'Household Member of',1,NULL,NULL),(13,7,8,'a_b',67,'Household Member of',182,'Household Member is',1,NULL,NULL),(14,7,8,'b_a',182,'Household Member is',67,'Household Member of',1,NULL,NULL),(15,8,8,'a_b',125,'Household Member of',182,'Household Member is',1,NULL,NULL),(16,8,8,'b_a',182,'Household Member is',125,'Household Member of',1,NULL,NULL),(17,9,7,'a_b',22,'Head of Household for',182,'Head of Household is',0,NULL,NULL),(18,9,7,'b_a',182,'Head of Household is',22,'Head of Household for',0,NULL,NULL),(19,10,2,'a_b',153,'Spouse of',22,'Spouse of',0,NULL,NULL),(20,10,2,'b_a',22,'Spouse of',153,'Spouse of',0,NULL,NULL),(21,11,1,'a_b',184,'Child of',162,'Parent of',1,NULL,NULL),(22,11,1,'b_a',162,'Parent of',184,'Child of',1,NULL,NULL),(23,12,1,'a_b',56,'Child of',162,'Parent of',1,NULL,NULL),(24,12,1,'b_a',162,'Parent of',56,'Child of',1,NULL,NULL),(25,13,1,'a_b',184,'Child of',13,'Parent of',1,NULL,NULL),(26,13,1,'b_a',13,'Parent of',184,'Child of',1,NULL,NULL),(27,14,1,'a_b',56,'Child of',13,'Parent of',1,NULL,NULL),(28,14,1,'b_a',13,'Parent of',56,'Child of',1,NULL,NULL),(29,15,4,'a_b',56,'Sibling of',184,'Sibling of',1,NULL,NULL),(30,15,4,'b_a',184,'Sibling of',56,'Sibling of',1,NULL,NULL),(31,16,8,'a_b',13,'Household Member of',178,'Household Member is',1,NULL,NULL),(32,16,8,'b_a',178,'Household Member is',13,'Household Member of',1,NULL,NULL),(33,17,8,'a_b',184,'Household Member of',178,'Household Member is',1,NULL,NULL),(34,17,8,'b_a',178,'Household Member is',184,'Household Member of',1,NULL,NULL),(35,18,8,'a_b',56,'Household Member of',178,'Household Member is',1,NULL,NULL),(36,18,8,'b_a',178,'Household Member is',56,'Household Member of',1,NULL,NULL),(37,19,7,'a_b',162,'Head of Household for',178,'Head of Household is',1,NULL,NULL),(38,19,7,'b_a',178,'Head of Household is',162,'Head of Household for',1,NULL,NULL),(39,20,2,'a_b',13,'Spouse of',162,'Spouse of',1,NULL,NULL),(40,20,2,'b_a',162,'Spouse of',13,'Spouse of',1,NULL,NULL),(41,21,1,'a_b',196,'Child of',61,'Parent of',1,NULL,NULL),(42,21,1,'b_a',61,'Parent of',196,'Child of',1,NULL,NULL),(43,22,1,'a_b',24,'Child of',61,'Parent of',1,NULL,NULL),(44,22,1,'b_a',61,'Parent of',24,'Child of',1,NULL,NULL),(45,23,1,'a_b',196,'Child of',33,'Parent of',1,NULL,NULL),(46,23,1,'b_a',33,'Parent of',196,'Child of',1,NULL,NULL),(47,24,1,'a_b',24,'Child of',33,'Parent of',1,NULL,NULL),(48,24,1,'b_a',33,'Parent of',24,'Child of',1,NULL,NULL),(49,25,4,'a_b',24,'Sibling of',196,'Sibling of',1,NULL,NULL),(50,25,4,'b_a',196,'Sibling of',24,'Sibling of',1,NULL,NULL),(51,26,8,'a_b',33,'Household Member of',171,'Household Member is',1,NULL,NULL),(52,26,8,'b_a',171,'Household Member is',33,'Household Member of',1,NULL,NULL),(53,27,8,'a_b',196,'Household Member of',171,'Household Member is',1,NULL,NULL),(54,27,8,'b_a',171,'Household Member is',196,'Household Member of',1,NULL,NULL),(55,28,8,'a_b',24,'Household Member of',171,'Household Member is',1,NULL,NULL),(56,28,8,'b_a',171,'Household Member is',24,'Household Member of',1,NULL,NULL),(57,29,7,'a_b',61,'Head of Household for',171,'Head of Household is',1,NULL,NULL),(58,29,7,'b_a',171,'Head of Household is',61,'Head of Household for',1,NULL,NULL),(59,30,2,'a_b',33,'Spouse of',61,'Spouse of',1,NULL,NULL),(60,30,2,'b_a',61,'Spouse of',33,'Spouse of',1,NULL,NULL),(61,31,1,'a_b',77,'Child of',188,'Parent of',1,NULL,NULL),(62,31,1,'b_a',188,'Parent of',77,'Child of',1,NULL,NULL),(63,32,1,'a_b',161,'Child of',188,'Parent of',1,NULL,NULL),(64,32,1,'b_a',188,'Parent of',161,'Child of',1,NULL,NULL),(65,33,1,'a_b',77,'Child of',93,'Parent of',1,NULL,NULL),(66,33,1,'b_a',93,'Parent of',77,'Child of',1,NULL,NULL),(67,34,1,'a_b',161,'Child of',93,'Parent of',1,NULL,NULL),(68,34,1,'b_a',93,'Parent of',161,'Child of',1,NULL,NULL),(69,35,4,'a_b',161,'Sibling of',77,'Sibling of',1,NULL,NULL),(70,35,4,'b_a',77,'Sibling of',161,'Sibling of',1,NULL,NULL),(71,36,8,'a_b',93,'Household Member of',160,'Household Member is',1,NULL,NULL),(72,36,8,'b_a',160,'Household Member is',93,'Household Member of',1,NULL,NULL),(73,37,8,'a_b',77,'Household Member of',160,'Household Member is',1,NULL,NULL),(74,37,8,'b_a',160,'Household Member is',77,'Household Member of',1,NULL,NULL),(75,38,8,'a_b',161,'Household Member of',160,'Household Member is',1,NULL,NULL),(76,38,8,'b_a',160,'Household Member is',161,'Household Member of',1,NULL,NULL),(77,39,7,'a_b',188,'Head of Household for',160,'Head of Household is',1,NULL,NULL),(78,39,7,'b_a',160,'Head of Household is',188,'Head of Household for',1,NULL,NULL),(79,40,2,'a_b',93,'Spouse of',188,'Spouse of',1,NULL,NULL),(80,40,2,'b_a',188,'Spouse of',93,'Spouse of',1,NULL,NULL),(81,41,1,'a_b',74,'Child of',60,'Parent of',1,NULL,NULL),(82,41,1,'b_a',60,'Parent of',74,'Child of',1,NULL,NULL),(83,42,1,'a_b',164,'Child of',60,'Parent of',1,NULL,NULL),(84,42,1,'b_a',60,'Parent of',164,'Child of',1,NULL,NULL),(85,43,1,'a_b',74,'Child of',131,'Parent of',1,NULL,NULL),(86,43,1,'b_a',131,'Parent of',74,'Child of',1,NULL,NULL),(87,44,1,'a_b',164,'Child of',131,'Parent of',1,NULL,NULL),(88,44,1,'b_a',131,'Parent of',164,'Child of',1,NULL,NULL),(89,45,4,'a_b',164,'Sibling of',74,'Sibling of',1,NULL,NULL),(90,45,4,'b_a',74,'Sibling of',164,'Sibling of',1,NULL,NULL),(91,46,8,'a_b',131,'Household Member of',6,'Household Member is',1,NULL,NULL),(92,46,8,'b_a',6,'Household Member is',131,'Household Member of',1,NULL,NULL),(93,47,8,'a_b',74,'Household Member of',6,'Household Member is',1,NULL,NULL),(94,47,8,'b_a',6,'Household Member is',74,'Household Member of',1,NULL,NULL),(95,48,8,'a_b',164,'Household Member of',6,'Household Member is',1,NULL,NULL),(96,48,8,'b_a',6,'Household Member is',164,'Household Member of',1,NULL,NULL),(97,49,7,'a_b',60,'Head of Household for',6,'Head of Household is',1,NULL,NULL),(98,49,7,'b_a',6,'Head of Household is',60,'Head of Household for',1,NULL,NULL),(99,50,2,'a_b',131,'Spouse of',60,'Spouse of',1,NULL,NULL),(100,50,2,'b_a',60,'Spouse of',131,'Spouse of',1,NULL,NULL),(101,51,1,'a_b',16,'Child of',147,'Parent of',1,NULL,NULL),(102,51,1,'b_a',147,'Parent of',16,'Child of',1,NULL,NULL),(103,52,1,'a_b',29,'Child of',147,'Parent of',1,NULL,NULL),(104,52,1,'b_a',147,'Parent of',29,'Child of',1,NULL,NULL),(105,53,1,'a_b',16,'Child of',173,'Parent of',1,NULL,NULL),(106,53,1,'b_a',173,'Parent of',16,'Child of',1,NULL,NULL),(107,54,1,'a_b',29,'Child of',173,'Parent of',1,NULL,NULL),(108,54,1,'b_a',173,'Parent of',29,'Child of',1,NULL,NULL),(109,55,4,'a_b',29,'Sibling of',16,'Sibling of',1,NULL,NULL),(110,55,4,'b_a',16,'Sibling of',29,'Sibling of',1,NULL,NULL),(111,56,8,'a_b',173,'Household Member of',123,'Household Member is',1,NULL,NULL),(112,56,8,'b_a',123,'Household Member is',173,'Household Member of',1,NULL,NULL),(113,57,8,'a_b',16,'Household Member of',123,'Household Member is',1,NULL,NULL),(114,57,8,'b_a',123,'Household Member is',16,'Household Member of',1,NULL,NULL),(115,58,8,'a_b',29,'Household Member of',123,'Household Member is',1,NULL,NULL),(116,58,8,'b_a',123,'Household Member is',29,'Household Member of',1,NULL,NULL),(117,59,7,'a_b',147,'Head of Household for',123,'Head of Household is',1,NULL,NULL),(118,59,7,'b_a',123,'Head of Household is',147,'Head of Household for',1,NULL,NULL),(119,60,2,'a_b',173,'Spouse of',147,'Spouse of',1,NULL,NULL),(120,60,2,'b_a',147,'Spouse of',173,'Spouse of',1,NULL,NULL),(121,61,1,'a_b',113,'Child of',50,'Parent of',1,NULL,NULL),(122,61,1,'b_a',50,'Parent of',113,'Child of',1,NULL,NULL),(123,62,1,'a_b',163,'Child of',50,'Parent of',1,NULL,NULL),(124,62,1,'b_a',50,'Parent of',163,'Child of',1,NULL,NULL),(125,63,1,'a_b',113,'Child of',190,'Parent of',1,NULL,NULL),(126,63,1,'b_a',190,'Parent of',113,'Child of',1,NULL,NULL),(127,64,1,'a_b',163,'Child of',190,'Parent of',1,NULL,NULL),(128,64,1,'b_a',190,'Parent of',163,'Child of',1,NULL,NULL),(129,65,4,'a_b',163,'Sibling of',113,'Sibling of',1,NULL,NULL),(130,65,4,'b_a',113,'Sibling of',163,'Sibling of',1,NULL,NULL),(131,66,8,'a_b',190,'Household Member of',45,'Household Member is',1,NULL,NULL),(132,66,8,'b_a',45,'Household Member is',190,'Household Member of',1,NULL,NULL),(133,67,8,'a_b',113,'Household Member of',45,'Household Member is',1,NULL,NULL),(134,67,8,'b_a',45,'Household Member is',113,'Household Member of',1,NULL,NULL),(135,68,8,'a_b',163,'Household Member of',45,'Household Member is',1,NULL,NULL),(136,68,8,'b_a',45,'Household Member is',163,'Household Member of',1,NULL,NULL),(137,69,7,'a_b',50,'Head of Household for',45,'Head of Household is',0,NULL,NULL),(138,69,7,'b_a',45,'Head of Household is',50,'Head of Household for',0,NULL,NULL),(139,70,2,'a_b',190,'Spouse of',50,'Spouse of',0,NULL,NULL),(140,70,2,'b_a',50,'Spouse of',190,'Spouse of',0,NULL,NULL),(141,71,1,'a_b',183,'Child of',181,'Parent of',1,NULL,NULL),(142,71,1,'b_a',181,'Parent of',183,'Child of',1,NULL,NULL),(143,72,1,'a_b',189,'Child of',181,'Parent of',1,NULL,NULL),(144,72,1,'b_a',181,'Parent of',189,'Child of',1,NULL,NULL),(145,73,1,'a_b',183,'Child of',151,'Parent of',1,NULL,NULL),(146,73,1,'b_a',151,'Parent of',183,'Child of',1,NULL,NULL),(147,74,1,'a_b',189,'Child of',151,'Parent of',1,NULL,NULL),(148,74,1,'b_a',151,'Parent of',189,'Child of',1,NULL,NULL),(149,75,4,'a_b',189,'Sibling of',183,'Sibling of',1,NULL,NULL),(150,75,4,'b_a',183,'Sibling of',189,'Sibling of',1,NULL,NULL),(151,76,8,'a_b',151,'Household Member of',140,'Household Member is',1,NULL,NULL),(152,76,8,'b_a',140,'Household Member is',151,'Household Member of',1,NULL,NULL),(153,77,8,'a_b',183,'Household Member of',140,'Household Member is',1,NULL,NULL),(154,77,8,'b_a',140,'Household Member is',183,'Household Member of',1,NULL,NULL),(155,78,8,'a_b',189,'Household Member of',140,'Household Member is',1,NULL,NULL),(156,78,8,'b_a',140,'Household Member is',189,'Household Member of',1,NULL,NULL),(157,79,7,'a_b',181,'Head of Household for',140,'Head of Household is',0,NULL,NULL),(158,79,7,'b_a',140,'Head of Household is',181,'Head of Household for',0,NULL,NULL),(159,80,2,'a_b',151,'Spouse of',181,'Spouse of',0,NULL,NULL),(160,80,2,'b_a',181,'Spouse of',151,'Spouse of',0,NULL,NULL),(161,81,1,'a_b',79,'Child of',5,'Parent of',1,NULL,NULL),(162,81,1,'b_a',5,'Parent of',79,'Child of',1,NULL,NULL),(163,82,1,'a_b',82,'Child of',5,'Parent of',1,NULL,NULL),(164,82,1,'b_a',5,'Parent of',82,'Child of',1,NULL,NULL),(165,83,1,'a_b',79,'Child of',174,'Parent of',1,NULL,NULL),(166,83,1,'b_a',174,'Parent of',79,'Child of',1,NULL,NULL),(167,84,1,'a_b',82,'Child of',174,'Parent of',1,NULL,NULL),(168,84,1,'b_a',174,'Parent of',82,'Child of',1,NULL,NULL),(169,85,4,'a_b',82,'Sibling of',79,'Sibling of',1,NULL,NULL),(170,85,4,'b_a',79,'Sibling of',82,'Sibling of',1,NULL,NULL),(171,86,8,'a_b',174,'Household Member of',78,'Household Member is',1,NULL,NULL),(172,86,8,'b_a',78,'Household Member is',174,'Household Member of',1,NULL,NULL),(173,87,8,'a_b',79,'Household Member of',78,'Household Member is',1,NULL,NULL),(174,87,8,'b_a',78,'Household Member is',79,'Household Member of',1,NULL,NULL),(175,88,8,'a_b',82,'Household Member of',78,'Household Member is',1,NULL,NULL),(176,88,8,'b_a',78,'Household Member is',82,'Household Member of',1,NULL,NULL),(177,89,7,'a_b',5,'Head of Household for',78,'Head of Household is',0,NULL,NULL),(178,89,7,'b_a',78,'Head of Household is',5,'Head of Household for',0,NULL,NULL),(179,90,2,'a_b',174,'Spouse of',5,'Spouse of',0,NULL,NULL),(180,90,2,'b_a',5,'Spouse of',174,'Spouse of',0,NULL,NULL),(181,91,1,'a_b',11,'Child of',87,'Parent of',1,NULL,NULL),(182,91,1,'b_a',87,'Parent of',11,'Child of',1,NULL,NULL),(183,92,1,'a_b',108,'Child of',87,'Parent of',1,NULL,NULL),(184,92,1,'b_a',87,'Parent of',108,'Child of',1,NULL,NULL),(185,93,1,'a_b',11,'Child of',15,'Parent of',1,NULL,NULL),(186,93,1,'b_a',15,'Parent of',11,'Child of',1,NULL,NULL),(187,94,1,'a_b',108,'Child of',15,'Parent of',1,NULL,NULL),(188,94,1,'b_a',15,'Parent of',108,'Child of',1,NULL,NULL),(189,95,4,'a_b',108,'Sibling of',11,'Sibling of',1,NULL,NULL),(190,95,4,'b_a',11,'Sibling of',108,'Sibling of',1,NULL,NULL),(191,96,8,'a_b',15,'Household Member of',133,'Household Member is',1,NULL,NULL),(192,96,8,'b_a',133,'Household Member is',15,'Household Member of',1,NULL,NULL),(193,97,8,'a_b',11,'Household Member of',133,'Household Member is',1,NULL,NULL),(194,97,8,'b_a',133,'Household Member is',11,'Household Member of',1,NULL,NULL),(195,98,8,'a_b',108,'Household Member of',133,'Household Member is',1,NULL,NULL),(196,98,8,'b_a',133,'Household Member is',108,'Household Member of',1,NULL,NULL),(197,99,7,'a_b',87,'Head of Household for',133,'Head of Household is',0,NULL,NULL),(198,99,7,'b_a',133,'Head of Household is',87,'Head of Household for',0,NULL,NULL),(199,100,2,'a_b',15,'Spouse of',87,'Spouse of',0,NULL,NULL),(200,100,2,'b_a',87,'Spouse of',15,'Spouse of',0,NULL,NULL),(201,101,1,'a_b',96,'Child of',100,'Parent of',1,NULL,NULL),(202,101,1,'b_a',100,'Parent of',96,'Child of',1,NULL,NULL),(203,102,1,'a_b',36,'Child of',100,'Parent of',1,NULL,NULL),(204,102,1,'b_a',100,'Parent of',36,'Child of',1,NULL,NULL),(205,103,1,'a_b',96,'Child of',40,'Parent of',1,NULL,NULL),(206,103,1,'b_a',40,'Parent of',96,'Child of',1,NULL,NULL),(207,104,1,'a_b',36,'Child of',40,'Parent of',1,NULL,NULL),(208,104,1,'b_a',40,'Parent of',36,'Child of',1,NULL,NULL),(209,105,4,'a_b',36,'Sibling of',96,'Sibling of',1,NULL,NULL),(210,105,4,'b_a',96,'Sibling of',36,'Sibling of',1,NULL,NULL),(211,106,8,'a_b',40,'Household Member of',119,'Household Member is',1,NULL,NULL),(212,106,8,'b_a',119,'Household Member is',40,'Household Member of',1,NULL,NULL),(213,107,8,'a_b',96,'Household Member of',119,'Household Member is',1,NULL,NULL),(214,107,8,'b_a',119,'Household Member is',96,'Household Member of',1,NULL,NULL),(215,108,8,'a_b',36,'Household Member of',119,'Household Member is',1,NULL,NULL),(216,108,8,'b_a',119,'Household Member is',36,'Household Member of',1,NULL,NULL),(217,109,7,'a_b',100,'Head of Household for',119,'Head of Household is',1,NULL,NULL),(218,109,7,'b_a',119,'Head of Household is',100,'Head of Household for',1,NULL,NULL),(219,110,2,'a_b',40,'Spouse of',100,'Spouse of',1,NULL,NULL),(220,110,2,'b_a',100,'Spouse of',40,'Spouse of',1,NULL,NULL),(221,111,1,'a_b',135,'Child of',138,'Parent of',1,NULL,NULL),(222,111,1,'b_a',138,'Parent of',135,'Child of',1,NULL,NULL),(223,112,1,'a_b',48,'Child of',138,'Parent of',1,NULL,NULL),(224,112,1,'b_a',138,'Parent of',48,'Child of',1,NULL,NULL),(225,113,1,'a_b',135,'Child of',64,'Parent of',1,NULL,NULL),(226,113,1,'b_a',64,'Parent of',135,'Child of',1,NULL,NULL),(227,114,1,'a_b',48,'Child of',64,'Parent of',1,NULL,NULL),(228,114,1,'b_a',64,'Parent of',48,'Child of',1,NULL,NULL),(229,115,4,'a_b',48,'Sibling of',135,'Sibling of',1,NULL,NULL),(230,115,4,'b_a',135,'Sibling of',48,'Sibling of',1,NULL,NULL),(231,116,8,'a_b',64,'Household Member of',148,'Household Member is',1,NULL,NULL),(232,116,8,'b_a',148,'Household Member is',64,'Household Member of',1,NULL,NULL),(233,117,8,'a_b',135,'Household Member of',148,'Household Member is',1,NULL,NULL),(234,117,8,'b_a',148,'Household Member is',135,'Household Member of',1,NULL,NULL),(235,118,8,'a_b',48,'Household Member of',148,'Household Member is',1,NULL,NULL),(236,118,8,'b_a',148,'Household Member is',48,'Household Member of',1,NULL,NULL),(237,119,7,'a_b',138,'Head of Household for',148,'Head of Household is',1,NULL,NULL),(238,119,7,'b_a',148,'Head of Household is',138,'Head of Household for',1,NULL,NULL),(239,120,2,'a_b',64,'Spouse of',138,'Spouse of',1,NULL,NULL),(240,120,2,'b_a',138,'Spouse of',64,'Spouse of',1,NULL,NULL),(241,121,1,'a_b',80,'Child of',168,'Parent of',1,NULL,NULL),(242,121,1,'b_a',168,'Parent of',80,'Child of',1,NULL,NULL),(243,122,1,'a_b',4,'Child of',168,'Parent of',1,NULL,NULL),(244,122,1,'b_a',168,'Parent of',4,'Child of',1,NULL,NULL),(245,123,1,'a_b',80,'Child of',195,'Parent of',1,NULL,NULL),(246,123,1,'b_a',195,'Parent of',80,'Child of',1,NULL,NULL),(247,124,1,'a_b',4,'Child of',195,'Parent of',1,NULL,NULL),(248,124,1,'b_a',195,'Parent of',4,'Child of',1,NULL,NULL),(249,125,4,'a_b',4,'Sibling of',80,'Sibling of',1,NULL,NULL),(250,125,4,'b_a',80,'Sibling of',4,'Sibling of',1,NULL,NULL),(251,126,8,'a_b',195,'Household Member of',137,'Household Member is',1,NULL,NULL),(252,126,8,'b_a',137,'Household Member is',195,'Household Member of',1,NULL,NULL),(253,127,8,'a_b',80,'Household Member of',137,'Household Member is',1,NULL,NULL),(254,127,8,'b_a',137,'Household Member is',80,'Household Member of',1,NULL,NULL),(255,128,8,'a_b',4,'Household Member of',137,'Household Member is',1,NULL,NULL),(256,128,8,'b_a',137,'Household Member is',4,'Household Member of',1,NULL,NULL),(257,129,7,'a_b',168,'Head of Household for',137,'Head of Household is',1,NULL,NULL),(258,129,7,'b_a',137,'Head of Household is',168,'Head of Household for',1,NULL,NULL),(259,130,2,'a_b',195,'Spouse of',168,'Spouse of',1,NULL,NULL),(260,130,2,'b_a',168,'Spouse of',195,'Spouse of',1,NULL,NULL),(261,131,1,'a_b',63,'Child of',83,'Parent of',1,NULL,NULL),(262,131,1,'b_a',83,'Parent of',63,'Child of',1,NULL,NULL),(263,132,1,'a_b',2,'Child of',83,'Parent of',1,NULL,NULL),(264,132,1,'b_a',83,'Parent of',2,'Child of',1,NULL,NULL),(265,133,1,'a_b',63,'Child of',42,'Parent of',1,NULL,NULL),(266,133,1,'b_a',42,'Parent of',63,'Child of',1,NULL,NULL),(267,134,1,'a_b',2,'Child of',42,'Parent of',1,NULL,NULL),(268,134,1,'b_a',42,'Parent of',2,'Child of',1,NULL,NULL),(269,135,4,'a_b',2,'Sibling of',63,'Sibling of',1,NULL,NULL),(270,135,4,'b_a',63,'Sibling of',2,'Sibling of',1,NULL,NULL),(271,136,8,'a_b',42,'Household Member of',186,'Household Member is',1,NULL,NULL),(272,136,8,'b_a',186,'Household Member is',42,'Household Member of',1,NULL,NULL),(273,137,8,'a_b',63,'Household Member of',186,'Household Member is',1,NULL,NULL),(274,137,8,'b_a',186,'Household Member is',63,'Household Member of',1,NULL,NULL),(275,138,8,'a_b',2,'Household Member of',186,'Household Member is',1,NULL,NULL),(276,138,8,'b_a',186,'Household Member is',2,'Household Member of',1,NULL,NULL),(277,139,7,'a_b',83,'Head of Household for',186,'Head of Household is',0,NULL,NULL),(278,139,7,'b_a',186,'Head of Household is',83,'Head of Household for',0,NULL,NULL),(279,140,2,'a_b',42,'Spouse of',83,'Spouse of',0,NULL,NULL),(280,140,2,'b_a',83,'Spouse of',42,'Spouse of',0,NULL,NULL),(281,141,1,'a_b',18,'Child of',73,'Parent of',1,NULL,NULL),(282,141,1,'b_a',73,'Parent of',18,'Child of',1,NULL,NULL),(283,142,1,'a_b',165,'Child of',73,'Parent of',1,NULL,NULL),(284,142,1,'b_a',73,'Parent of',165,'Child of',1,NULL,NULL),(285,143,1,'a_b',18,'Child of',143,'Parent of',1,NULL,NULL),(286,143,1,'b_a',143,'Parent of',18,'Child of',1,NULL,NULL),(287,144,1,'a_b',165,'Child of',143,'Parent of',1,NULL,NULL),(288,144,1,'b_a',143,'Parent of',165,'Child of',1,NULL,NULL),(289,145,4,'a_b',165,'Sibling of',18,'Sibling of',1,NULL,NULL),(290,145,4,'b_a',18,'Sibling of',165,'Sibling of',1,NULL,NULL),(291,146,8,'a_b',143,'Household Member of',38,'Household Member is',1,NULL,NULL),(292,146,8,'b_a',38,'Household Member is',143,'Household Member of',1,NULL,NULL),(293,147,8,'a_b',18,'Household Member of',38,'Household Member is',1,NULL,NULL),(294,147,8,'b_a',38,'Household Member is',18,'Household Member of',1,NULL,NULL),(295,148,8,'a_b',165,'Household Member of',38,'Household Member is',1,NULL,NULL),(296,148,8,'b_a',38,'Household Member is',165,'Household Member of',1,NULL,NULL),(297,149,7,'a_b',73,'Head of Household for',38,'Head of Household is',1,NULL,NULL),(298,149,7,'b_a',38,'Head of Household is',73,'Head of Household for',1,NULL,NULL),(299,150,2,'a_b',143,'Spouse of',73,'Spouse of',1,NULL,NULL),(300,150,2,'b_a',73,'Spouse of',143,'Spouse of',1,NULL,NULL),(301,151,1,'a_b',175,'Child of',139,'Parent of',1,NULL,NULL),(302,151,1,'b_a',139,'Parent of',175,'Child of',1,NULL,NULL),(303,152,1,'a_b',14,'Child of',139,'Parent of',1,NULL,NULL),(304,152,1,'b_a',139,'Parent of',14,'Child of',1,NULL,NULL),(305,153,1,'a_b',175,'Child of',192,'Parent of',1,NULL,NULL),(306,153,1,'b_a',192,'Parent of',175,'Child of',1,NULL,NULL),(307,154,1,'a_b',14,'Child of',192,'Parent of',1,NULL,NULL),(308,154,1,'b_a',192,'Parent of',14,'Child of',1,NULL,NULL),(309,155,4,'a_b',14,'Sibling of',175,'Sibling of',1,NULL,NULL),(310,155,4,'b_a',175,'Sibling of',14,'Sibling of',1,NULL,NULL),(311,156,8,'a_b',192,'Household Member of',75,'Household Member is',1,NULL,NULL),(312,156,8,'b_a',75,'Household Member is',192,'Household Member of',1,NULL,NULL),(313,157,8,'a_b',175,'Household Member of',75,'Household Member is',1,NULL,NULL),(314,157,8,'b_a',75,'Household Member is',175,'Household Member of',1,NULL,NULL),(315,158,8,'a_b',14,'Household Member of',75,'Household Member is',1,NULL,NULL),(316,158,8,'b_a',75,'Household Member is',14,'Household Member of',1,NULL,NULL),(317,159,7,'a_b',139,'Head of Household for',75,'Head of Household is',0,NULL,NULL),(318,159,7,'b_a',75,'Head of Household is',139,'Head of Household for',0,NULL,NULL),(319,160,2,'a_b',192,'Spouse of',139,'Spouse of',0,NULL,NULL),(320,160,2,'b_a',139,'Spouse of',192,'Spouse of',0,NULL,NULL),(321,161,1,'a_b',68,'Child of',97,'Parent of',1,NULL,NULL),(322,161,1,'b_a',97,'Parent of',68,'Child of',1,NULL,NULL),(323,162,1,'a_b',53,'Child of',97,'Parent of',1,NULL,NULL),(324,162,1,'b_a',97,'Parent of',53,'Child of',1,NULL,NULL),(325,163,1,'a_b',68,'Child of',58,'Parent of',1,NULL,NULL),(326,163,1,'b_a',58,'Parent of',68,'Child of',1,NULL,NULL),(327,164,1,'a_b',53,'Child of',58,'Parent of',1,NULL,NULL),(328,164,1,'b_a',58,'Parent of',53,'Child of',1,NULL,NULL),(329,165,4,'a_b',53,'Sibling of',68,'Sibling of',1,NULL,NULL),(330,165,4,'b_a',68,'Sibling of',53,'Sibling of',1,NULL,NULL),(331,166,8,'a_b',58,'Household Member of',7,'Household Member is',1,NULL,NULL),(332,166,8,'b_a',7,'Household Member is',58,'Household Member of',1,NULL,NULL),(333,167,8,'a_b',68,'Household Member of',7,'Household Member is',1,NULL,NULL),(334,167,8,'b_a',7,'Household Member is',68,'Household Member of',1,NULL,NULL),(335,168,8,'a_b',53,'Household Member of',7,'Household Member is',1,NULL,NULL),(336,168,8,'b_a',7,'Household Member is',53,'Household Member of',1,NULL,NULL),(337,169,7,'a_b',97,'Head of Household for',7,'Head of Household is',0,NULL,NULL),(338,169,7,'b_a',7,'Head of Household is',97,'Head of Household for',0,NULL,NULL),(339,170,2,'a_b',58,'Spouse of',97,'Spouse of',0,NULL,NULL),(340,170,2,'b_a',97,'Spouse of',58,'Spouse of',0,NULL,NULL),(341,171,1,'a_b',120,'Child of',172,'Parent of',1,NULL,NULL),(342,171,1,'b_a',172,'Parent of',120,'Child of',1,NULL,NULL),(343,172,1,'a_b',124,'Child of',172,'Parent of',1,NULL,NULL),(344,172,1,'b_a',172,'Parent of',124,'Child of',1,NULL,NULL),(345,173,1,'a_b',120,'Child of',71,'Parent of',1,NULL,NULL),(346,173,1,'b_a',71,'Parent of',120,'Child of',1,NULL,NULL),(347,174,1,'a_b',124,'Child of',71,'Parent of',1,NULL,NULL),(348,174,1,'b_a',71,'Parent of',124,'Child of',1,NULL,NULL),(349,175,4,'a_b',124,'Sibling of',120,'Sibling of',1,NULL,NULL),(350,175,4,'b_a',120,'Sibling of',124,'Sibling of',1,NULL,NULL),(351,176,8,'a_b',71,'Household Member of',32,'Household Member is',1,NULL,NULL),(352,176,8,'b_a',32,'Household Member is',71,'Household Member of',1,NULL,NULL),(353,177,8,'a_b',120,'Household Member of',32,'Household Member is',1,NULL,NULL),(354,177,8,'b_a',32,'Household Member is',120,'Household Member of',1,NULL,NULL),(355,178,8,'a_b',124,'Household Member of',32,'Household Member is',1,NULL,NULL),(356,178,8,'b_a',32,'Household Member is',124,'Household Member of',1,NULL,NULL),(357,179,7,'a_b',172,'Head of Household for',32,'Head of Household is',1,NULL,NULL),(358,179,7,'b_a',32,'Head of Household is',172,'Head of Household for',1,NULL,NULL),(359,180,2,'a_b',71,'Spouse of',172,'Spouse of',1,NULL,NULL),(360,180,2,'b_a',172,'Spouse of',71,'Spouse of',1,NULL,NULL),(361,181,1,'a_b',95,'Child of',44,'Parent of',1,NULL,NULL),(362,181,1,'b_a',44,'Parent of',95,'Child of',1,NULL,NULL),(363,182,1,'a_b',112,'Child of',44,'Parent of',1,NULL,NULL),(364,182,1,'b_a',44,'Parent of',112,'Child of',1,NULL,NULL),(365,183,1,'a_b',95,'Child of',26,'Parent of',1,NULL,NULL),(366,183,1,'b_a',26,'Parent of',95,'Child of',1,NULL,NULL),(367,184,1,'a_b',112,'Child of',26,'Parent of',1,NULL,NULL),(368,184,1,'b_a',26,'Parent of',112,'Child of',1,NULL,NULL),(369,185,4,'a_b',112,'Sibling of',95,'Sibling of',1,NULL,NULL),(370,185,4,'b_a',95,'Sibling of',112,'Sibling of',1,NULL,NULL),(371,186,8,'a_b',26,'Household Member of',154,'Household Member is',1,NULL,NULL),(372,186,8,'b_a',154,'Household Member is',26,'Household Member of',1,NULL,NULL),(373,187,8,'a_b',95,'Household Member of',154,'Household Member is',1,NULL,NULL),(374,187,8,'b_a',154,'Household Member is',95,'Household Member of',1,NULL,NULL),(375,188,8,'a_b',112,'Household Member of',154,'Household Member is',1,NULL,NULL),(376,188,8,'b_a',154,'Household Member is',112,'Household Member of',1,NULL,NULL),(377,189,7,'a_b',44,'Head of Household for',154,'Head of Household is',0,NULL,NULL),(378,189,7,'b_a',154,'Head of Household is',44,'Head of Household for',0,NULL,NULL),(379,190,2,'a_b',26,'Spouse of',44,'Spouse of',0,NULL,NULL),(380,190,2,'b_a',44,'Spouse of',26,'Spouse of',0,NULL,NULL),(381,191,1,'a_b',35,'Child of',31,'Parent of',1,NULL,NULL),(382,191,1,'b_a',31,'Parent of',35,'Child of',1,NULL,NULL),(383,192,1,'a_b',159,'Child of',31,'Parent of',1,NULL,NULL),(384,192,1,'b_a',31,'Parent of',159,'Child of',1,NULL,NULL),(385,193,1,'a_b',35,'Child of',34,'Parent of',1,NULL,NULL),(386,193,1,'b_a',34,'Parent of',35,'Child of',1,NULL,NULL),(387,194,1,'a_b',159,'Child of',34,'Parent of',1,NULL,NULL),(388,194,1,'b_a',34,'Parent of',159,'Child of',1,NULL,NULL),(389,195,4,'a_b',159,'Sibling of',35,'Sibling of',1,NULL,NULL),(390,195,4,'b_a',35,'Sibling of',159,'Sibling of',1,NULL,NULL),(391,196,8,'a_b',34,'Household Member of',187,'Household Member is',1,NULL,NULL),(392,196,8,'b_a',187,'Household Member is',34,'Household Member of',1,NULL,NULL),(393,197,8,'a_b',35,'Household Member of',187,'Household Member is',1,NULL,NULL),(394,197,8,'b_a',187,'Household Member is',35,'Household Member of',1,NULL,NULL),(395,198,8,'a_b',159,'Household Member of',187,'Household Member is',1,NULL,NULL),(396,198,8,'b_a',187,'Household Member is',159,'Household Member of',1,NULL,NULL),(397,199,7,'a_b',31,'Head of Household for',187,'Head of Household is',1,NULL,NULL),(398,199,7,'b_a',187,'Head of Household is',31,'Head of Household for',1,NULL,NULL),(399,200,2,'a_b',34,'Spouse of',31,'Spouse of',1,NULL,NULL),(400,200,2,'b_a',31,'Spouse of',34,'Spouse of',1,NULL,NULL),(401,201,5,'a_b',42,'Employee of',8,'Employer of',1,NULL,NULL),(402,201,5,'b_a',8,'Employer of',42,'Employee of',1,NULL,NULL),(403,202,5,'a_b',58,'Employee of',9,'Employer of',1,NULL,NULL),(404,202,5,'b_a',9,'Employer of',58,'Employee of',1,NULL,NULL),(405,203,5,'a_b',125,'Employee of',10,'Employer of',1,NULL,NULL),(406,203,5,'b_a',10,'Employer of',125,'Employee of',1,NULL,NULL),(407,204,5,'a_b',73,'Employee of',20,'Employer of',1,NULL,NULL),(408,204,5,'b_a',20,'Employer of',73,'Employee of',1,NULL,NULL),(409,205,5,'a_b',172,'Employee of',37,'Employer of',1,NULL,NULL),(410,205,5,'b_a',37,'Employer of',172,'Employee of',1,NULL,NULL),(411,206,5,'a_b',77,'Employee of',55,'Employer of',1,NULL,NULL),(412,206,5,'b_a',55,'Employer of',77,'Employee of',1,NULL,NULL),(413,207,5,'a_b',143,'Employee of',62,'Employer of',1,NULL,NULL),(414,207,5,'b_a',62,'Employer of',143,'Employee of',1,NULL,NULL),(415,208,5,'a_b',156,'Employee of',66,'Employer of',1,NULL,NULL),(416,208,5,'b_a',66,'Employer of',156,'Employee of',1,NULL,NULL),(417,209,5,'a_b',18,'Employee of',69,'Employer of',1,NULL,NULL),(418,209,5,'b_a',69,'Employer of',18,'Employee of',1,NULL,NULL),(419,210,5,'a_b',61,'Employee of',76,'Employer of',1,NULL,NULL),(420,210,5,'b_a',76,'Employer of',61,'Employee of',1,NULL,NULL),(421,211,5,'a_b',174,'Employee of',84,'Employer of',1,NULL,NULL),(422,211,5,'b_a',84,'Employer of',174,'Employee of',1,NULL,NULL),(423,212,5,'a_b',22,'Employee of',98,'Employer of',1,NULL,NULL),(424,212,5,'b_a',98,'Employer of',22,'Employee of',1,NULL,NULL),(425,213,5,'a_b',60,'Employee of',114,'Employer of',1,NULL,NULL),(426,213,5,'b_a',114,'Employer of',60,'Employee of',1,NULL,NULL),(427,214,5,'a_b',40,'Employee of',115,'Employer of',1,NULL,NULL),(428,214,5,'b_a',115,'Employer of',40,'Employee of',1,NULL,NULL),(429,215,5,'a_b',198,'Employee of',121,'Employer of',1,NULL,NULL),(430,215,5,'b_a',121,'Employer of',198,'Employee of',1,NULL,NULL),(431,216,5,'a_b',170,'Employee of',128,'Employer of',1,NULL,NULL),(432,216,5,'b_a',128,'Employer of',170,'Employee of',1,NULL,NULL),(433,217,5,'a_b',100,'Employee of',134,'Employer of',1,NULL,NULL),(434,217,5,'b_a',134,'Employer of',100,'Employee of',1,NULL,NULL),(435,218,5,'a_b',29,'Employee of',149,'Employer of',1,NULL,NULL),(436,218,5,'b_a',149,'Employer of',29,'Employee of',1,NULL,NULL),(437,219,5,'a_b',129,'Employee of',155,'Employer of',1,NULL,NULL),(438,219,5,'b_a',155,'Employer of',129,'Employee of',1,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_relationship_cache` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1347,7 +1347,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_subscription_history` WRITE;
 /*!40000 ALTER TABLE `civicrm_subscription_history` DISABLE KEYS */;
-INSERT INTO `civicrm_subscription_history` (`id`, `contact_id`, `group_id`, `date`, `method`, `status`, `tracking`) VALUES (1,169,2,'2019-11-20 21:26:21','Admin','Added',NULL),(2,24,2,'2019-12-23 11:52:30','Email','Added',NULL),(3,124,2,'2019-11-18 09:34:53','Email','Added',NULL),(4,57,2,'2019-09-21 08:05:46','Admin','Added',NULL),(5,17,2,'2019-11-27 11:47:55','Email','Added',NULL),(6,182,2,'2020-03-12 13:17:00','Email','Added',NULL),(7,99,2,'2019-08-04 20:42:42','Email','Added',NULL),(8,138,2,'2020-07-14 02:26:21','Email','Added',NULL),(9,81,2,'2020-02-17 20:51:29','Email','Added',NULL),(10,53,2,'2019-12-12 16:46:40','Email','Added',NULL),(11,15,2,'2020-06-08 11:55:39','Email','Added',NULL),(12,33,2,'2019-12-02 00:17:20','Email','Added',NULL),(13,179,2,'2019-09-18 20:51:54','Admin','Added',NULL),(14,83,2,'2020-02-21 16:59:13','Email','Added',NULL),(15,164,2,'2019-09-04 18:42:28','Email','Added',NULL),(16,146,2,'2019-08-16 17:31:30','Admin','Added',NULL),(17,120,2,'2019-10-25 00:35:51','Admin','Added',NULL),(18,193,2,'2020-05-08 16:05:56','Email','Added',NULL),(19,76,2,'2019-08-18 21:58:45','Email','Added',NULL),(20,162,2,'2019-08-25 15:21:21','Email','Added',NULL),(21,66,2,'2019-08-21 12:54:54','Admin','Added',NULL),(22,92,2,'2019-08-30 06:33:41','Admin','Added',NULL),(23,167,2,'2020-03-26 10:25:26','Email','Added',NULL),(24,65,2,'2020-04-21 20:54:05','Admin','Added',NULL),(25,190,2,'2019-09-11 17:19:20','Email','Added',NULL),(26,184,2,'2019-12-21 22:09:38','Email','Added',NULL),(27,67,2,'2019-08-13 13:10:41','Email','Added',NULL),(28,185,2,'2020-05-16 21:14:47','Admin','Added',NULL),(29,183,2,'2020-06-23 07:14:06','Email','Added',NULL),(30,175,2,'2019-12-09 11:30:16','Admin','Added',NULL),(31,129,2,'2020-03-06 02:22:27','Email','Added',NULL),(32,197,2,'2019-08-28 11:28:01','Email','Added',NULL),(33,122,2,'2019-09-12 07:55:23','Email','Added',NULL),(34,7,2,'2019-11-13 02:54:04','Admin','Added',NULL),(35,154,2,'2019-08-30 21:35:11','Email','Added',NULL),(36,51,2,'2020-03-13 22:09:33','Email','Added',NULL),(37,97,2,'2020-01-04 06:55:30','Email','Added',NULL),(38,111,2,'2020-04-21 03:12:40','Admin','Added',NULL),(39,143,2,'2019-11-15 07:26:31','Email','Added',NULL),(40,77,2,'2020-04-10 22:45:14','Email','Added',NULL),(41,186,2,'2020-05-11 19:35:51','Admin','Added',NULL),(42,12,2,'2020-02-20 08:29:05','Admin','Added',NULL),(43,8,2,'2020-01-17 21:34:08','Admin','Added',NULL),(44,84,2,'2020-05-11 14:40:31','Email','Added',NULL),(45,71,2,'2019-12-18 13:22:22','Admin','Added',NULL),(46,3,2,'2020-06-23 16:06:41','Email','Added',NULL),(47,123,2,'2020-04-15 15:26:58','Admin','Added',NULL),(48,119,2,'2020-02-11 11:16:39','Admin','Added',NULL),(49,161,2,'2019-09-14 18:37:42','Admin','Added',NULL),(50,145,2,'2020-05-23 07:34:56','Email','Added',NULL),(51,60,2,'2019-08-22 10:28:33','Email','Added',NULL),(52,31,2,'2019-11-13 10:56:38','Email','Added',NULL),(53,55,2,'2020-02-13 23:43:08','Admin','Added',NULL),(54,88,2,'2019-12-24 11:11:02','Email','Added',NULL),(55,64,2,'2020-02-03 07:32:36','Admin','Added',NULL),(56,41,2,'2019-08-08 18:06:57','Email','Added',NULL),(57,30,2,'2020-04-26 23:17:36','Email','Added',NULL),(58,2,2,'2020-01-16 00:51:51','Email','Added',NULL),(59,156,2,'2019-11-24 19:05:36','Email','Added',NULL),(60,118,2,'2020-05-08 22:41:55','Admin','Added',NULL),(61,87,3,'2020-02-12 19:47:53','Email','Added',NULL),(62,49,3,'2019-11-24 14:21:59','Email','Added',NULL),(63,23,3,'2020-03-20 02:01:17','Email','Added',NULL),(64,5,3,'2020-02-12 06:13:02','Email','Added',NULL),(65,93,3,'2020-03-26 23:29:51','Admin','Added',NULL),(66,18,3,'2019-09-26 12:23:17','Email','Added',NULL),(67,6,3,'2019-09-19 13:40:19','Admin','Added',NULL),(68,199,3,'2020-04-23 00:44:59','Email','Added',NULL),(69,176,3,'2020-02-29 17:05:30','Email','Added',NULL),(70,132,3,'2020-02-17 15:44:05','Admin','Added',NULL),(71,80,3,'2020-03-01 11:59:37','Email','Added',NULL),(72,45,3,'2020-01-23 09:13:35','Admin','Added',NULL),(73,44,3,'2019-08-22 22:38:26','Admin','Added',NULL),(74,96,3,'2020-07-20 11:43:21','Email','Added',NULL),(75,166,3,'2019-10-22 19:46:03','Email','Added',NULL),(76,169,4,'2020-04-20 15:35:07','Email','Added',NULL),(77,138,4,'2019-09-14 05:27:21','Admin','Added',NULL),(78,164,4,'2019-12-21 08:53:52','Email','Added',NULL),(79,92,4,'2019-11-08 12:12:13','Email','Added',NULL),(80,183,4,'2020-02-20 08:24:27','Email','Added',NULL),(81,51,4,'2020-05-18 10:54:03','Admin','Added',NULL),(82,8,4,'2019-08-23 17:30:49','Admin','Added',NULL),(83,145,4,'2020-06-15 07:19:20','Email','Added',NULL);
+INSERT INTO `civicrm_subscription_history` (`id`, `contact_id`, `group_id`, `date`, `method`, `status`, `tracking`) VALUES (1,94,2,'2020-02-24 21:34:18','Email','Added',NULL),(2,105,2,'2020-08-11 05:04:20','Email','Added',NULL),(3,25,2,'2019-11-04 22:08:34','Email','Added',NULL),(4,117,2,'2020-05-23 21:35:14','Admin','Added',NULL),(5,99,2,'2020-07-28 00:56:26','Email','Added',NULL),(6,145,2,'2020-02-05 20:35:11','Email','Added',NULL),(7,30,2,'2020-01-06 16:35:10','Admin','Added',NULL),(8,194,2,'2020-06-20 05:18:39','Admin','Added',NULL),(9,103,2,'2020-02-29 04:54:27','Email','Added',NULL),(10,177,2,'2019-12-31 13:59:56','Email','Added',NULL),(11,85,2,'2020-07-01 15:02:48','Admin','Added',NULL),(12,54,2,'2020-07-21 17:15:05','Email','Added',NULL),(13,185,2,'2020-05-10 15:26:42','Email','Added',NULL),(14,130,2,'2020-04-06 17:52:01','Email','Added',NULL),(15,152,2,'2020-02-25 08:46:39','Email','Added',NULL),(16,102,2,'2019-09-24 19:09:22','Admin','Added',NULL),(17,122,2,'2020-06-04 06:50:22','Email','Added',NULL),(18,65,2,'2019-09-29 16:20:16','Admin','Added',NULL),(19,201,2,'2020-02-19 04:12:33','Admin','Added',NULL),(20,86,2,'2020-01-13 16:10:10','Admin','Added',NULL),(21,142,2,'2020-07-08 17:00:37','Admin','Added',NULL),(22,70,2,'2019-09-21 02:11:21','Email','Added',NULL),(23,141,2,'2020-02-15 21:32:32','Admin','Added',NULL),(24,126,2,'2020-06-19 11:28:07','Email','Added',NULL),(25,39,2,'2020-05-22 12:12:10','Email','Added',NULL),(26,110,2,'2019-11-14 06:48:44','Email','Added',NULL),(27,170,2,'2019-12-21 12:13:05','Admin','Added',NULL),(28,169,2,'2020-03-04 17:43:21','Email','Added',NULL),(29,200,2,'2020-09-15 04:02:51','Admin','Added',NULL),(30,23,2,'2020-08-30 07:55:26','Email','Added',NULL),(31,91,2,'2020-01-13 00:53:36','Email','Added',NULL),(32,51,2,'2020-07-21 12:31:06','Email','Added',NULL),(33,92,2,'2020-04-09 20:36:58','Email','Added',NULL),(34,150,2,'2019-09-29 02:51:16','Admin','Added',NULL),(35,104,2,'2020-05-02 10:11:59','Admin','Added',NULL),(36,43,2,'2020-04-08 14:26:27','Admin','Added',NULL),(37,198,2,'2019-12-29 07:31:09','Email','Added',NULL),(38,17,2,'2020-01-23 21:29:19','Email','Added',NULL),(39,179,2,'2019-12-14 02:31:00','Email','Added',NULL),(40,197,2,'2020-01-24 11:05:55','Email','Added',NULL),(41,88,2,'2020-02-23 03:08:37','Admin','Added',NULL),(42,21,2,'2020-04-28 20:40:32','Email','Added',NULL),(43,127,2,'2020-05-13 22:00:47','Email','Added',NULL),(44,59,2,'2020-03-01 06:39:03','Admin','Added',NULL),(45,176,2,'2020-04-24 16:58:38','Email','Added',NULL),(46,118,2,'2020-04-24 01:25:34','Admin','Added',NULL),(47,156,2,'2020-01-27 11:43:34','Email','Added',NULL),(48,111,2,'2020-02-08 11:22:02','Admin','Added',NULL),(49,19,2,'2020-05-01 19:14:19','Email','Added',NULL),(50,166,2,'2020-02-03 10:31:08','Admin','Added',NULL),(51,180,2,'2020-03-16 19:38:07','Admin','Added',NULL),(52,12,2,'2020-01-22 08:27:03','Admin','Added',NULL),(53,193,2,'2020-08-22 00:15:05','Admin','Added',NULL),(54,3,2,'2020-01-15 10:22:11','Email','Added',NULL),(55,132,2,'2019-10-02 03:47:25','Email','Added',NULL),(56,57,2,'2019-12-30 03:38:04','Email','Added',NULL),(57,144,2,'2020-05-27 18:23:32','Admin','Added',NULL),(58,191,2,'2020-07-21 19:58:58','Admin','Added',NULL),(59,157,2,'2020-03-31 12:07:31','Admin','Added',NULL),(60,46,2,'2020-01-29 17:18:27','Admin','Added',NULL),(61,81,3,'2020-02-16 23:57:48','Email','Added',NULL),(62,129,3,'2020-08-26 12:56:28','Admin','Added',NULL),(63,109,3,'2019-11-14 10:36:15','Email','Added',NULL),(64,52,3,'2020-03-12 23:02:56','Email','Added',NULL),(65,28,3,'2020-03-20 23:53:01','Email','Added',NULL),(66,146,3,'2020-08-10 23:36:49','Email','Added',NULL),(67,107,3,'2020-07-21 21:17:56','Admin','Added',NULL),(68,27,3,'2019-09-26 05:59:46','Email','Added',NULL),(69,47,3,'2020-03-13 22:06:15','Email','Added',NULL),(70,158,3,'2020-06-06 08:27:20','Admin','Added',NULL),(71,167,3,'2020-01-10 07:50:32','Email','Added',NULL),(72,106,3,'2020-07-28 15:28:51','Admin','Added',NULL),(73,199,3,'2020-01-07 18:37:07','Admin','Added',NULL),(74,136,3,'2020-06-17 12:12:18','Email','Added',NULL),(75,41,3,'2020-08-04 13:01:10','Email','Added',NULL),(76,94,4,'2020-08-28 08:06:19','Email','Added',NULL),(77,194,4,'2020-05-03 11:20:03','Email','Added',NULL),(78,152,4,'2020-09-07 18:45:04','Admin','Added',NULL),(79,70,4,'2019-10-18 17:30:08','Email','Added',NULL),(80,200,4,'2019-12-07 10:13:20','Admin','Added',NULL),(81,43,4,'2020-01-30 08:39:01','Admin','Added',NULL),(82,127,4,'2020-05-05 06:29:00','Email','Added',NULL),(83,166,4,'2019-11-10 23:48:58','Email','Added',NULL);
 /*!40000 ALTER TABLE `civicrm_subscription_history` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1443,7 +1443,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_website` WRITE;
 /*!40000 ALTER TABLE `civicrm_website` DISABLE KEYS */;
-INSERT INTO `civicrm_website` (`id`, `contact_id`, `url`, `website_type_id`) VALUES (1,174,'http://northpointdevelopmentschool.org',1),(2,105,'http://urbanculture.org',1),(3,144,'http://globalempowerment.org',1),(4,148,'http://dallaspartnership.org',1),(5,90,'http://rebeccafellowship.org',1),(6,86,'http://beechdevelopmenttrust.org',1),(7,56,'http://kentuckyinitiative.org',1),(8,137,'http://aptossustainability.org',1),(9,14,'http://bltechnologyfund.org',1),(10,178,'http://sierrasoftwaresolutions.org',1),(11,117,'http://maincollective.org',1),(12,157,'http://moxahaladevelopmentalliance.org',1),(13,91,'http://greenpoetry.org',1),(14,79,'http://ogdensburgpoetry.org',1),(15,37,'http://urbanactionschool.org',1),(16,46,'http://greeninitiative.org',1),(17,50,'http://collegehealthassociation.org',1);
+INSERT INTO `civicrm_website` (`id`, `contact_id`, `url`, `website_type_id`) VALUES (1,69,'http://starkvillepoetrynetwork.org',1),(2,66,'http://minnesotaculturepartnership.org',1),(3,84,'http://arizonatrust.org',1),(4,121,'http://hadleyempowermentcenter.org',1),(5,9,'http://virginiacenter.org',1),(6,8,'http://northpointartsinitiative.org',1),(7,155,'http://oklahomaenvironmental.org',1),(8,101,'http://louisianahealthfellowship.org',1),(9,20,'http://mcintyreschool.org',1),(10,114,'http://communityhealth.org',1),(11,134,'http://sdenvironmentalpartnership.org',1),(12,10,'http://ruralpartnership.org',1),(13,55,'http://svadvocacyalliance.org',1),(14,149,'http://maineducation.org',1),(15,128,'http://mlkingadvocacy.org',1);
 /*!40000 ALTER TABLE `civicrm_website` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1475,7 +1475,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-07-24 15:34:05
+-- Dump completed on 2020-09-16 13:29:33
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |

From f36fd0f6ff53cc1683e29ecf8e83be78bd1cfc1e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 15:53:39 +1200
Subject: [PATCH 631/834] [Ref] Separate url path calculation into the relevant
 classes

---
 CRM/Event/Form/Participant.php   | 67 +++++++++-----------------------
 CRM/Event/Form/Task/Register.php | 38 ++++++++++++++++++
 2 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
index 5697924b8799..71c3204b8ce7 100644
--- a/CRM/Event/Form/Participant.php
+++ b/CRM/Event/Form/Participant.php
@@ -338,55 +338,7 @@ public function preProcess() {
       return CRM_Event_Form_EventFees::preProcess($this);
     }
 
-    //check the mode when this form is called either single or as
-    //search task action
-    if ($this->_single) {
-      $this->assign('urlPath', 'civicrm/contact/view/participant');
-      if (!$this->_id && !$this->_contactId) {
-        $breadCrumbs = [
-          [
-            'title' => ts('CiviEvent Dashboard'),
-            'url' => CRM_Utils_System::url('civicrm/event', 'reset=1'),
-          ],
-        ];
-
-        CRM_Utils_System::appendBreadCrumb($breadCrumbs);
-      }
-    }
-    else {
-      //set the appropriate action
-      $context = $this->get('context');
-      $urlString = 'civicrm/contact/search';
-      $this->_action = CRM_Core_Action::BASIC;
-      switch ($context) {
-        case 'advanced':
-          $urlString = 'civicrm/contact/search/advanced';
-          $this->_action = CRM_Core_Action::ADVANCED;
-          break;
-
-        case 'builder':
-          $urlString = 'civicrm/contact/search/builder';
-          $this->_action = CRM_Core_Action::PROFILE;
-          break;
-
-        case 'basic':
-          $urlString = 'civicrm/contact/search/basic';
-          $this->_action = CRM_Core_Action::BASIC;
-          break;
-
-        case 'custom':
-          $urlString = 'civicrm/contact/search/custom';
-          $this->_action = CRM_Core_Action::COPY;
-          break;
-      }
-      CRM_Contact_Form_Task::preProcessCommon($this);
-
-      $this->_contactId = NULL;
-
-      //set ajax path, this used for custom data building
-      $this->assign('urlPath', $urlString);
-      $this->assign('urlPathVar', "_qf_Participant_display=true&qfKey={$this->controller->_key}");
-    }
+    $this->assignUrlPath();
 
     $this->assign('single', $this->_single);
 
@@ -2329,4 +2281,21 @@ public function getFeeDetails($participantIds, $hasLineItems = FALSE) {
     return $feeDetails;
   }
 
+  /**
+   * Assign the url path to the template.
+   */
+  protected function assignUrlPath() {
+    $this->assign('urlPath', 'civicrm/contact/view/participant');
+    if (!$this->_id && !$this->_contactId) {
+      $breadCrumbs = [
+        [
+          'title' => ts('CiviEvent Dashboard'),
+          'url' => CRM_Utils_System::url('civicrm/event', 'reset=1'),
+        ],
+      ];
+
+      CRM_Utils_System::appendBreadCrumb($breadCrumbs);
+    }
+  }
+
 }
diff --git a/CRM/Event/Form/Task/Register.php b/CRM/Event/Form/Task/Register.php
index af434f4fd456..b13a5619db24 100644
--- a/CRM/Event/Form/Task/Register.php
+++ b/CRM/Event/Form/Task/Register.php
@@ -37,4 +37,42 @@ class CRM_Event_Form_Task_Register extends CRM_Event_Form_Participant {
    */
   public $_single = FALSE;
 
+  /**
+   * Assign the url path to the template.
+   */
+  protected function assignUrlPath() {
+    //set the appropriate action
+    $context = $this->get('context');
+    $urlString = 'civicrm/contact/search';
+    $this->_action = CRM_Core_Action::BASIC;
+    switch ($context) {
+      case 'advanced':
+        $urlString = 'civicrm/contact/search/advanced';
+        $this->_action = CRM_Core_Action::ADVANCED;
+        break;
+
+      case 'builder':
+        $urlString = 'civicrm/contact/search/builder';
+        $this->_action = CRM_Core_Action::PROFILE;
+        break;
+
+      case 'basic':
+        $urlString = 'civicrm/contact/search/basic';
+        $this->_action = CRM_Core_Action::BASIC;
+        break;
+
+      case 'custom':
+        $urlString = 'civicrm/contact/search/custom';
+        $this->_action = CRM_Core_Action::COPY;
+        break;
+    }
+    CRM_Contact_Form_Task::preProcessCommon($this);
+
+    $this->_contactId = NULL;
+
+    //set ajax path, this used for custom data building
+    $this->assign('urlPath', $urlString);
+    $this->assign('urlPathVar', "_qf_Participant_display=true&qfKey={$this->controller->_key}");
+  }
+
 }

From 3a2a6e86302b3b5ad4f39d9c404f3ea4c8226bdb Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 00:00:50 -0700
Subject: [PATCH 632/834] (REF) Extract `CRM_Core_CodeGen_GenerateData`

This moves the class from `sql/GenerateData.php` to `CRM/Core/CodeGen/GenerateData.php`, which makes
it easier to reference in other workflows.
---
 CRM/Core/CodeGen/GenerateData.php | 1919 ++++++++++++++++++++++++++++
 sql/GenerateData.php              | 1923 +----------------------------
 2 files changed, 1920 insertions(+), 1922 deletions(-)
 create mode 100644 CRM/Core/CodeGen/GenerateData.php

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
new file mode 100644
index 000000000000..5e8ea032e343
--- /dev/null
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -0,0 +1,1919 @@
+<?php
+
+class CRM_Core_CodeGen_GenerateData {
+
+  /**
+   * Constants
+   */
+
+  // Set ADD_TO_DB = FALSE to do a dry run
+  const ADD_TO_DB = TRUE;
+
+  const DATA_FILENAME = "sample_data.xml";
+  const NUM_DOMAIN = 1;
+  const NUM_CONTACT = 200;
+  const INDIVIDUAL_PERCENT = 80;
+  const HOUSEHOLD_PERCENT = 10;
+  const ORGANIZATION_PERCENT = 10;
+  const NUM_INDIVIDUAL_PER_HOUSEHOLD = 4;
+  const NUM_ACTIVITY = 150;
+
+  // Location types from the table crm_location_type
+  const HOME = 1;
+  const WORK = 2;
+  const MAIN = 3;
+  const OTHER = 4;
+
+  /**
+   * Class constructor
+   */
+  public function __construct() {
+    // initialize all the vars
+    $this->numIndividual = self::INDIVIDUAL_PERCENT * self::NUM_CONTACT / 100;
+    $this->numHousehold = self::HOUSEHOLD_PERCENT * self::NUM_CONTACT / 100;
+    $this->numOrganization = self::ORGANIZATION_PERCENT * self::NUM_CONTACT / 100;
+    $this->numStrictIndividual = $this->numIndividual - ($this->numHousehold * self::NUM_INDIVIDUAL_PER_HOUSEHOLD);
+
+    // Parse data file
+    foreach ((array) simplexml_load_file(self::DATA_FILENAME) as $key => $val) {
+      $val = (array) $val;
+      $this->sampleData[$key] = (array) $val['item'];
+    }
+    // Init DB
+    $config = CRM_Core_Config::singleton();
+
+    // Relationship types indexed by name_a_b from the table civicrm_relationship_type
+    $this->relTypes = CRM_Utils_Array::index(array('name_a_b'), CRM_Core_PseudoConstant::relationshipType('name'));
+
+  }
+
+  /**
+   * Public wrapper for calling private "add" functions
+   * Provides user feedback
+   * @param $itemName
+   */
+  public function generate($itemName) {
+    echo "Generating $itemName\n";
+    $fn = "add$itemName";
+    $this->$fn();
+  }
+
+  /**
+   * this function creates arrays for the following
+   *
+   * domain id
+   * contact id
+   * contact_location id
+   * contact_contact_location id
+   * contact_email uuid
+   * contact_phone_uuid
+   * contact_instant_message uuid
+   * contact_relationship uuid
+   * contact_task uuid
+   * contact_note uuid
+   */
+  public function initID() {
+    // get the domain and contact id arrays
+    $this->domain = range(1, self::NUM_DOMAIN);
+    shuffle($this->domain);
+
+    // Get first contact id
+    $this->startCid = $cid = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_contact");
+    $this->contact = range($cid + 1, $cid + self::NUM_CONTACT);
+    shuffle($this->contact);
+
+    // get the individual, household  and organizaton contacts
+    $offset = 0;
+    $this->Individual = array_slice($this->contact, $offset, $this->numIndividual);
+    $offset += $this->numIndividual;
+    $this->Household = array_slice($this->contact, $offset, $this->numHousehold);
+    $offset += $this->numHousehold;
+    $this->Organization = array_slice($this->contact, $offset, $this->numOrganization);
+
+    // get the strict individual contacts (i.e individual contacts not belonging to any household)
+    $this->strictIndividual = array_slice($this->Individual, 0, $this->numStrictIndividual);
+
+    // get the household to individual mapping array
+    $this->householdIndividual = array_slice($this->Individual, $this->numStrictIndividual);
+    $this->householdIndividual = array_chunk($this->householdIndividual, self::NUM_INDIVIDUAL_PER_HOUSEHOLD);
+    $this->householdIndividual = array_combine($this->Household, $this->householdIndividual);
+  }
+
+  /*
+   * private members
+   *
+   */
+
+  /**
+   * enum's from database
+   * @var array
+   */
+  private $preferredCommunicationMethod = array('1', '2', '3', '4', '5');
+  private $contactType = array('Individual', 'Household', 'Organization');
+  private $phoneType = array('1', '2', '3', '4');
+
+  /**
+   * customizable enums (foreign keys)
+   * @var array
+   */
+  private $prefix = array(
+    // Female
+    1 => array(
+      1 => 'Mrs.',
+      2 => 'Ms.',
+      4 => 'Dr.',
+    ),
+    // Male
+    2 => array(
+      3 => 'Mr.',
+      4 => 'Dr.',
+    ),
+  );
+  /**
+   * @var array
+   */
+  private $suffix = array(1 => 'Jr.', 2 => 'Sr.', 3 => 'II', 4 => 'III');
+  private $gender = array(1 => 'female', 2 => 'male');
+
+  /**
+   * store domain id's
+   * @var array
+   */
+  private $domain = array();
+
+  /**
+   * store contact id's
+   * @var array
+   */
+  private $contact = array();
+  private $Individual = array();
+  private $Household = array();
+  private $Organization = array();
+
+  // store which contacts have a location entity
+  /**
+   * for automatic management of is_primary field
+   * @var array
+   */
+  private $location = array(
+    'Email' => array(),
+    'Phone' => array(),
+    'Address' => array(),
+  );
+
+  /**
+   * stores the strict individual id and household id to individual id mapping
+   * @var array
+   */
+  private $strictIndividual = array();
+  private $householdIndividual = array();
+  private $householdName = array();
+
+  /**
+   * sample data in xml format
+   * @var array
+   */
+  private $sampleData = array();
+
+  /**
+   * private vars
+   * @var array
+   */
+  private $startCid;
+  private $numIndividual = 0;
+  private $numHousehold = 0;
+  private $numOrganization = 0;
+  private $numStrictIndividual = 0;
+  private $stateMap = array();
+  private $states = array();
+
+  private $groupMembershipStatus = array('Added', 'Removed', 'Pending');
+  private $subscriptionHistoryMethod = array('Admin', 'Email');
+  private $deceasedContactIds = array();
+
+  /*********************************
+   * private methods
+   * *******************************
+   * @param int $size
+   * @return string
+   */
+
+  /**
+   * Get a randomly generated string.
+   *
+   * @param int $size
+   *
+   * @return string
+   */
+  private function randomString($size = 32) {
+    $string = "";
+
+    // get an ascii code for each character
+    for ($i = 0; $i < $size; $i++) {
+      $random_int = mt_rand(65, 122);
+      if (($random_int < 97) && ($random_int > 90)) {
+        // if ascii code between 90 and 97 substitute with space
+        $random_int = 32;
+      }
+      $random_char = chr($random_int);
+      $string .= $random_char;
+    }
+    return $string;
+  }
+
+  /**
+   * @return string
+   */
+  private function randomChar() {
+    return chr(mt_rand(65, 90));
+  }
+
+  /**
+   * Get a random item from the sample data or any other array
+   *
+   * @param $items (array or string) - if string, used as key for sample data, if array, used as data source
+   *
+   * @return mixed (element from array)
+   *
+   * @private
+   */
+  private function randomItem($items) {
+    if (!is_array($items)) {
+      $key = $items;
+      $items = $this->sampleData[$key];
+    }
+    if (!$items) {
+      echo "Error: no items found for '$key'\n";
+      return FALSE;
+    }
+    return $items[mt_rand(0, count($items) - 1)];
+  }
+
+  /**
+   * @param $items
+   *
+   * @return mixed
+   */
+  private function randomIndex($items) {
+    return $this->randomItem(array_keys($items));
+  }
+
+  /**
+   * @param $items
+   *
+   * @return array
+   */
+  private function randomKeyValue($items) {
+    $key = $this->randomIndex($items);
+    return array($key, $items[$key]);
+  }
+
+  /**
+   * @param $chance
+   *
+   * @return int
+   */
+  private function probability($chance) {
+    if (mt_rand(0, 100) < ($chance * 100)) {
+      return 1;
+    }
+    return 0;
+  }
+
+  /**
+   * Generate a random date.
+   *
+   *   If both $startDate and $endDate are defined generate
+   *   date between them.
+   *
+   *   If only startDate is specified then date generated is
+   *   between startDate + 1 year.
+   *
+   *   if only endDate is specified then date generated is
+   *   between endDate - 1 year.
+   *
+   *   if none are specified - date is between today - 1year
+   *   and today
+   *
+   * @param  int $startDate Start Date in Unix timestamp
+   * @param  int $endDate End Date in Unix timestamp
+   * @access private
+   *
+   * @return string randomly generated date in the format "Ymd"
+   *
+   */
+  private function randomDate($startDate = 0, $endDate = 0) {
+
+    // number of seconds per year
+    $numSecond = 31536000;
+    $dateFormat = "YmdHis";
+    $today = time();
+
+    // both are defined
+    if ($startDate && $endDate) {
+      return date($dateFormat, mt_rand($startDate, $endDate));
+    }
+
+    // only startDate is defined
+    if ($startDate) {
+      return date($dateFormat, mt_rand($startDate, $startDate + $numSecond));
+    }
+
+    // only endDate is defined
+    if ($startDate) {
+      return date($dateFormat, mt_rand($endDate - $numSecond, $endDate));
+    }
+
+    // none are defined
+    return date($dateFormat, mt_rand($today - $numSecond, $today));
+  }
+
+  /**
+   * Automatically manage the is_primary field by tracking which contacts have each item
+   * @param $cid
+   * @param $type
+   * @return int
+   */
+  private function isPrimary($cid, $type) {
+    if (empty($this->location[$type][$cid])) {
+      $this->location[$type][$cid] = TRUE;
+      return 1;
+    }
+    return 0;
+  }
+
+  /**
+   * Execute a query unless we are doing a dry run
+   * Note: this wrapper should not be used for SELECT queries
+   * @param $query
+   * @param array $params
+   * @return \CRM_Core_DAO
+   */
+  private function _query($query, $params = array()) {
+    if (self::ADD_TO_DB) {
+      return CRM_Core_DAO::executeQuery($query, $params);
+    }
+  }
+
+  /**
+   * Call dao insert method unless we are doing a dry run
+   * @param $dao
+   */
+  private function _insert(&$dao) {
+    if (self::ADD_TO_DB) {
+      if (!$dao->insert()) {
+        echo "ERROR INSERT: " . mysqli_error($dao->getConnection()->connection) . "\n";
+        print_r($dao);
+        exit(1);
+      }
+    }
+  }
+
+  /**
+   * Call dao update method unless we are doing a dry run
+   * @param $dao
+   */
+  private function _update(&$dao) {
+    if (self::ADD_TO_DB) {
+      if (!$dao->update()) {
+        echo "ERROR UPDATE: " . mysqli_error($dao->getConnection()->connection) . "\n";
+        print_r($dao);
+        exit(1);
+      }
+    }
+  }
+
+  /**
+   * Add core DAO object
+   * @param $type
+   * @param $params
+   */
+  private function _addDAO($type, $params) {
+    $daoName = "CRM_Core_DAO_$type";
+    $obj = new $daoName();
+    foreach ($params as $key => $value) {
+      $obj->$key = $value;
+    }
+    if (isset($this->location[$type])) {
+      $obj->is_primary = $this->isPrimary($params['contact_id'], $type);
+    }
+    $this->_insert($obj);
+  }
+
+  /**
+   * Fetch contact type based on stored mapping
+   * @param $id
+   * @return string $type
+   */
+  private function getContactType($id) {
+    foreach (array('Individual', 'Household', 'Organization') as $type) {
+      if (in_array($id, $this->$type)) {
+        return $type;
+      }
+    }
+  }
+
+  /**
+   * This method adds NUM_DOMAIN domains and then adds NUM_REVISION
+   * revisions for each domain with the latest revision being the last one..
+   */
+  private function addDomain() {
+
+    /* Add a location for domain 1 */
+
+    $domain = new CRM_Core_DAO_Domain();
+    for ($id = 2; $id <= self::NUM_DOMAIN; $id++) {
+      // domain name is pretty simple. it is "Domain $id"
+      $domain->name = "Domain $id";
+      $domain->description = "Description $id";
+      $domain->contact_name = $this->randomName();
+
+      // insert domain
+      $this->_insert($domain);
+    }
+  }
+
+  /**
+   * @return string
+   */
+  public function randomName() {
+    $first_name = $this->randomItem(($this->probability(.5) ? 'fe' : '') . 'male_name');
+    $middle_name = ucfirst($this->randomChar());
+    $last_name = $this->randomItem('last_name');
+    return "$first_name $middle_name. $last_name";
+  }
+
+  /**
+   * This method adds data to the contact table
+   *
+   * id - from $contact
+   * contact_type 'Individual' 'Household' 'Organization'
+   * preferred_communication (random 1 to 3)
+   */
+  private function addContact() {
+    $contact = new CRM_Contact_DAO_Contact();
+    $cid = $this->startCid;
+
+    for ($id = $cid + 1; $id <= $cid + self::NUM_CONTACT; $id++) {
+      $contact->contact_type = $this->getContactType($id);
+      $contact->do_not_phone = $this->probability(.2);
+      $contact->do_not_email = $this->probability(.2);
+      $contact->do_not_post = $this->probability(.2);
+      $contact->do_not_trade = $this->probability(.2);
+      $contact->preferred_communication_method = NULL;
+      if ($this->probability(.5)) {
+        $contact->preferred_communication_method = CRM_Core_DAO::VALUE_SEPARATOR . $this->randomItem($this->preferredCommunicationMethod) . CRM_Core_DAO::VALUE_SEPARATOR;
+      }
+      $contact->source = 'Sample Data';
+      $this->_insert($contact);
+    }
+  }
+
+  /**
+   * addIndividual()
+   *
+   * This method adds individual's data to the contact table
+   *
+   * The following fields are generated and added.
+   *
+   * contact_uuid - individual
+   * contact_rid - latest one
+   * first_name 'First Name $contact_uuid'
+   * middle_name 'Middle Name $contact_uuid'
+   * last_name 'Last Name $contact_uuid'
+   * job_title 'Job Title $contact_uuid'
+   *
+   */
+  private function addIndividual() {
+
+    $contact = new CRM_Contact_DAO_Contact();
+    $year = 60 * 60 * 24 * 365.25;
+    $now = time();
+
+    foreach ($this->Individual as $cid) {
+      $contact->is_deceased = $contact->gender_id = $contact->birth_date = $contact->deceased_date = $email = NULL;
+      list($gender_id, $gender) = $this->randomKeyValue($this->gender);
+      $birth_date = mt_rand($now - 90 * $year, $now - 10 * $year);
+
+      $contact->last_name = $this->randomItem('last_name');
+
+      // Manage household names
+      if (!in_array($contact->id, $this->strictIndividual)) {
+        // Find position in household
+        foreach ($this->householdIndividual as $householdId => $house) {
+          foreach ($house as $position => $memberId) {
+            if ($memberId == $cid) {
+              break 2;
+            }
+          }
+        }
+        // Head of household: set name
+        if (empty($this->householdName[$householdId])) {
+          $this->householdName[$householdId] = $contact->last_name;
+        }
+        // Kids get household name, spouse might get it
+        if ($position > 1 || $this->probability(.5)) {
+          $contact->last_name = $this->householdName[$householdId];
+        }
+        elseif ($this->householdName[$householdId] != $contact->last_name) {
+          // Spouse might hyphenate name
+          if ($this->probability(.5)) {
+            $contact->last_name .= '-' . $this->householdName[$householdId];
+          }
+          // Kids might hyphenate name
+          else {
+            $this->householdName[$householdId] .= '-' . $contact->last_name;
+          }
+        }
+        // Sensible ages and genders
+        $offset = mt_rand($now - 40 * $year, $now);
+        // Parents
+        if ($position < 2) {
+          $birth_date = mt_rand($offset - 35 * $year, $offset - 20 * $year);
+          if ($this->probability(.8)) {
+            $gender_id = 2 - $position;
+            $gender = $this->gender[$gender_id];
+          }
+        }
+        // Kids
+        else {
+          $birth_date = mt_rand($offset - 10 * $year, $offset);
+        }
+      }
+      // Non household people
+      else {
+        if ($this->probability(.6)) {
+          $this->_addAddress($cid);
+        }
+      }
+
+      $contact->first_name = $this->randomItem($gender . '_name');
+      $contact->middle_name = $this->probability(.5) ? '' : ucfirst($this->randomChar());
+      $age = intval(($now - $birth_date) / $year);
+
+      // Prefix and suffix by gender and age
+      $contact->prefix_id = $contact->suffix_id = $prefix = $suffix = NULL;
+      if ($this->probability(.5) && $age > 20) {
+        list($contact->prefix_id, $prefix) = $this->randomKeyValue($this->prefix[$gender_id]);
+        $prefix .= ' ';
+      }
+      if ($gender == 'male' && $this->probability(.50)) {
+        list($contact->suffix_id, $suffix) = $this->randomKeyValue($this->suffix);
+        $suffix = ' ' . $suffix;
+      }
+      if ($this->probability(.7)) {
+        $contact->gender_id = $gender_id;
+      }
+      if ($this->probability(.7)) {
+        $contact->birth_date = date("Ymd", $birth_date);
+      }
+
+      // Deceased probability based on age
+      if ($contact->gender_id && $contact->gender_id == 2) {
+        $checkAge = 64;
+      }
+      else {
+        $checkAge = 68;
+      }
+      if ($age > $checkAge && count($this->deceasedContactIds) < 4) {
+        $contact->is_deceased = $this->probability(($age - 30) / 100);
+        if ($contact->is_deceased && $this->probability(.7)) {
+          $contact->deceased_date = $this->randomDate();
+        }
+      }
+
+      // Add 0, 1 or 2 email address
+      $count = mt_rand(0, 2);
+      for ($i = 0; $i < $count; ++$i) {
+        $email = $this->_individualEmail($contact);
+        $this->_addEmail($cid, $email, self::HOME);
+      }
+
+      // Add 0, 1 or 2 phones
+      $count = mt_rand(0, 2);
+      for ($i = 0; $i < $count; ++$i) {
+        $this->_addPhone($cid);
+      }
+
+      // Occasionally you get contacts with just an email in the db
+      if ($this->probability(.2) && $email) {
+        $contact->first_name = $contact->last_name = $contact->middle_name = NULL;
+        $contact->is_deceased = $contact->gender_id = $contact->birth_date = $contact->deceased_date = NULL;
+        $contact->display_name = $contact->sort_name = $email;
+        $contact->postal_greeting_display = $contact->email_greeting_display = "Dear $email";
+      }
+      else {
+        $contact->display_name = $prefix . $contact->first_name . ' ' . $contact->last_name . $suffix;
+        $contact->sort_name = $contact->last_name . ', ' . $contact->first_name;
+        $contact->postal_greeting_display = $contact->email_greeting_display = 'Dear ' . $contact->first_name;
+      }
+      $contact->addressee_id = $contact->postal_greeting_id = $contact->email_greeting_id = 1;
+      $contact->addressee_display = $contact->display_name;
+      $contact->hash = crc32($contact->sort_name);
+      $contact->id = $cid;
+      $this->_update($contact);
+      if ($contact->is_deceased) {
+        $this->deceasedContactIds[] = $cid;
+      }
+    }
+  }
+
+  /**
+   * This method adds household's data to the contact table
+   *
+   * The following fields are generated and added.
+   *
+   * contact_uuid - household_individual
+   * contact_rid - latest one
+   * household_name 'household $contact_uuid primary contact $primary_contact_uuid'
+   * nick_name 'nick $contact_uuid'
+   * primary_contact_uuid = $household_individual[$contact_uuid][0];
+   *
+   */
+  private function addHousehold() {
+
+    $contact = new CRM_Contact_DAO_Contact();
+    foreach ($this->Household as $cid) {
+      // Add address
+      $this->_addAddress($cid);
+
+      $contact->id = $cid;
+      $contact->household_name = $this->householdName[$cid] . " family";
+      // need to update the sort name for the main contact table
+      $contact->display_name = $contact->sort_name = $contact->household_name;
+      $contact->postal_greeting_id = $contact->email_greeting_id = 5;
+      $contact->postal_greeting_display = $contact->email_greeting_display = 'Dear ' . $contact->household_name;
+      $contact->addressee_id = 2;
+      $contact->addressee_display = $contact->display_name;
+      $contact->hash = crc32($contact->sort_name);
+      $this->_update($contact);
+    }
+  }
+
+  /**
+   * This method adds organization data to the contact table
+   *
+   * The following fields are generated and added.
+   *
+   * contact_uuid - organization
+   * contact_rid - latest one
+   * organization_name 'organization $contact_uuid'
+   * legal_name 'legal  $contact_uuid'
+   * nick_name 'nick $contact_uuid'
+   * sic_code 'sic $contact_uuid'
+   * primary_contact_id - random individual contact uuid
+   *
+   */
+  private function addOrganization() {
+
+    $org = new CRM_Contact_DAO_Contact();
+    $employees = $this->Individual;
+    shuffle($employees);
+
+    foreach ($this->Organization as $key => $id) {
+      $org->primary_contact_id = $website = $email = NULL;
+      $org->id = $id;
+      $address = $this->_addAddress($id);
+
+      $namePre = $this->randomItem('organization_prefix');
+      $nameMid = $this->randomItem('organization_name');
+      $namePost = $this->randomItem('organization_suffix');
+
+      // Some orgs are named after their location
+      if ($this->probability(.7)) {
+        $place = $this->randomItem(array('city', 'street_name', 'state'));
+        $namePre = $address[$place];
+      }
+      $org->organization_name = "$namePre $nameMid $namePost";
+
+      // Most orgs have a website and email
+      if ($this->probability(.8)) {
+        $website = $this->_addWebsite($id, $org->organization_name);
+        $url = str_replace('http://', '', $website['url']);
+        $email = $this->randomItem('email_address') . '@' . $url;
+        $this->_addEmail($id, $email, self::MAIN);
+      }
+
+      // current employee
+      if ($this->probability(.8)) {
+        $indiv = new CRM_Contact_DAO_Contact();
+        $org->primary_contact_id = $indiv->id = $employees[$key];
+        $indiv->organization_name = $org->organization_name;
+        $indiv->employer_id = $id;
+        $this->_update($indiv);
+        // Share address with employee
+        if ($this->probability(.8)) {
+          $this->_addAddress($indiv->id, $id);
+        }
+        // Add work email for employee
+        if ($website) {
+          $indiv->find(TRUE);
+          $email = $this->_individualEmail($indiv, $url);
+          $this->_addEmail($indiv->id, $email, self::WORK);
+        }
+      }
+
+      // need to update the sort name for the main contact table
+      $org->display_name = $org->sort_name = $org->organization_name;
+      $org->addressee_id = 3;
+      $org->addressee_display = $org->display_name;
+      $org->hash = crc32($org->sort_name);
+      $this->_update($org);
+    }
+  }
+
+  /**
+   * This method adds data to the contact_relationship table
+   */
+  private function addRelationship() {
+
+    $relationship = new CRM_Contact_DAO_Relationship();
+
+    // Household relationships
+    foreach ($this->householdIndividual as $household_id => $household_member) {
+      // Default active
+      $relationship->is_active = 1;
+
+      // add child_of relationship for each child
+      $relationship->relationship_type_id = $this->relTypes['Child of']['id'];
+      foreach (array(0, 1) as $parent) {
+        foreach (array(2, 3) as $child) {
+          $relationship->contact_id_a = $household_member[$child];
+          $relationship->contact_id_b = $household_member[$parent];
+          $this->_insert($relationship);
+        }
+      }
+
+      // add sibling_of relationship
+      $relationship->relationship_type_id = $this->relTypes['Sibling of']['id'];
+      $relationship->contact_id_a = $household_member[3];
+      $relationship->contact_id_b = $household_member[2];
+      $this->_insert($relationship);
+
+      // add member_of_household relationships and shared address
+      $relationship->relationship_type_id = $this->relTypes['Household Member of']['id'];
+      $relationship->contact_id_b = $household_id;
+      for ($i = 1; $i < 4; ++$i) {
+        $relationship->contact_id_a = $household_member[$i];
+        $this->_insert($relationship);
+        $this->_addAddress($household_member[$i], $household_id);
+      }
+
+      // Divorced/separated couples - end relationship and different address
+      if ($this->probability(.4)) {
+        $relationship->is_active = 0;
+        $this->_addAddress($household_member[0]);
+      }
+      else {
+        $this->_addAddress($household_member[0], $household_id);
+      }
+
+      // add head_of_household relationship 1 for head of house
+      $relationship->relationship_type_id = $this->relTypes['Head of Household for']['id'];
+      $relationship->contact_id_a = $household_member[0];
+      $relationship->contact_id_b = $household_id;
+      $this->_insert($relationship);
+
+      // add spouse_of relationship 1 for both the spouses
+      $relationship->relationship_type_id = $this->relTypes['Spouse of']['id'];
+      $relationship->contact_id_a = $household_member[1];
+      $relationship->contact_id_b = $household_member[0];
+      $this->_insert($relationship);
+    }
+
+    // Add current employer relationships
+    $this->_query("INSERT INTO civicrm_relationship
+      (contact_id_a, contact_id_b, relationship_type_id, is_active)
+      (SELECT id, employer_id, " . $this->relTypes['Employee of']['id'] . ", 1 FROM civicrm_contact WHERE employer_id IN (" . implode(',', $this->Organization) . "))"
+    );
+  }
+
+  /**
+   * Create an address for a contact
+   *
+   * @param $cid int: contact id
+   * @param $masterContactId int: set if this is a shared address
+   *
+   * @return array
+   */
+  private function _addAddress($cid, $masterContactId = NULL) {
+
+    // Share existing address
+    if ($masterContactId) {
+      $dao = new CRM_Core_DAO_Address();
+      $dao->is_primary = 1;
+      $dao->contact_id = $masterContactId;
+      $dao->find(TRUE);
+      $dao->master_id = $dao->id;
+      $dao->id = NULL;
+      $dao->contact_id = $cid;
+      $dao->is_primary = $this->isPrimary($cid, 'Address');
+      $dao->location_type_id = $this->getContactType($masterContactId) == 'Organization' ? self::WORK : self::HOME;
+      $this->_insert($dao);
+    }
+
+    // Generate new address
+    else {
+      $params = array(
+        'contact_id' => $cid,
+        'location_type_id' => $this->getContactType($cid) == 'Organization' ? self::MAIN : self::HOME,
+        'street_number' => mt_rand(1, 1000),
+        'street_number_suffix' => ucfirst($this->randomChar()),
+        'street_name' => $this->randomItem('street_name'),
+        'street_type' => $this->randomItem('street_type'),
+        'street_number_postdirectional' => $this->randomItem('address_direction'),
+        'county_id' => 1,
+      );
+
+      $params['street_address'] = $params['street_number'] . $params['street_number_suffix'] . " " . $params['street_name'] . " " . $params['street_type'] . " " . $params['street_number_postdirectional'];
+
+      if ($params['location_type_id'] == self::MAIN) {
+        $params['supplemental_address_1'] = $this->randomItem('supplemental_addresses_1');
+      }
+
+      // Hack to add lat/long (limited to USA based addresses)
+      list(
+        $params['country_id'],
+        $params['state_province_id'],
+        $params['city'],
+        $params['postal_code'],
+        $params['geo_code_1'],
+        $params['geo_code_2'],
+        ) = $this->getZipCodeInfo();
+
+      $this->_addDAO('Address', $params);
+      $params['state'] = $this->states[$params['state_province_id']];
+      return $params;
+    }
+  }
+
+  /**
+   * Add a phone number for a contact
+   *
+   * @param $cid int: contact id
+   *
+   * @return array
+   */
+  private function _addPhone($cid) {
+    $area = $this->probability(.5) ? '' : mt_rand(201, 899);
+    $pre = mt_rand(201, 899);
+    $post = mt_rand(1000, 9999);
+    $params = array(
+      'location_type_id' => $this->getContactType($cid) == 'Organization' ? self::MAIN : self::HOME,
+      'contact_id' => $cid,
+      'phone' => ($area ? "($area) " : '') . "$pre-$post",
+      'phone_numeric' => $area . $pre . $post,
+      'phone_type_id' => mt_rand(1, 2),
+    );
+    $this->_addDAO('Phone', $params);
+    return $params;
+  }
+
+  /**
+   * Add an email for a contact
+   *
+   * @param $cid int: contact id
+   * @param $email
+   * @param $locationType
+   *
+   * @return array
+   */
+  private function _addEmail($cid, $email, $locationType) {
+    $params = array(
+      'location_type_id' => $locationType,
+      'contact_id' => $cid,
+      'email' => $email,
+    );
+    $this->_addDAO('Email', $params);
+    return $params;
+  }
+
+  /**
+   * Add a website based on organization name
+   * Using common naming patterns
+   *
+   * @param $cid int: contact id
+   * @param $name str: contact name
+   *
+   * @return array
+   */
+  private function _addWebsite($cid, $name) {
+    $part = array_pad(explode(' ', strtolower($name)), 3, '');
+    if (count($part) > 3) {
+      // Abbreviate the place name if it's two words
+      $domain = $part[0][0] . $part[1][0] . $part[2] . $part[3];
+    }
+    else {
+      // Common naming patterns
+      switch (mt_rand(1, 3)) {
+        case 1:
+          $domain = $part[0] . $part[1] . $part[2];
+          break;
+
+        case 2:
+          $domain = $part[0] . $part[1];
+          break;
+
+        case 3:
+          $domain = $part[0] . $part[2];
+          break;
+      }
+    }
+    $params = array(
+      'website_type_id' => 1,
+      'location_type_id' => self::MAIN,
+      'contact_id' => $cid,
+      'url' => "http://$domain.org",
+    );
+    $this->_addDAO('Website', $params);
+    return $params;
+  }
+
+  /**
+   * Create an email address based on a person's name
+   * Using common naming patterns
+   *
+   * @param $contact obj: individual contact record
+   * @param $domain str: supply a domain (i.e. for a work address)
+   *
+   * @return string
+   */
+  private function _individualEmail($contact, $domain = NULL) {
+    $first = $contact->first_name;
+    $last = $contact->last_name;
+    $f = $first[0];
+    $l = $last[0];
+    $m = $contact->middle_name ? $contact->middle_name[0] . '.' : '';
+    // Common naming patterns
+    switch (mt_rand(1, 6)) {
+      case 1:
+        $email = $first . $last;
+        break;
+
+      case 2:
+        $email = "$last.$first";
+        break;
+
+      case 3:
+        $email = $last . $f;
+        break;
+
+      case 4:
+        $email = $first . $l;
+        break;
+
+      case 5:
+        $email = "$last.$m$first";
+        break;
+
+      case 6:
+        $email = "$f$m$last";
+        break;
+    }
+    //to ensure we dont insert
+    //invalid characters in email
+    $email = preg_replace("([^a-zA-Z0-9_\.-]*)", "", $email);
+
+    // Some people have numbers in their address
+    if ($this->probability(.4)) {
+      $email .= mt_rand(1, 99);
+    }
+    // Generate random domain if not specified
+    if (!$domain) {
+      $domain = $this->randomItem('email_domain') . '.' . $this->randomItem('email_tld');
+    }
+    return strtolower($email) . '@' . $domain;
+  }
+
+  /**
+   * This method populates the civicrm_entity_tag table
+   */
+  private function addEntityTag() {
+
+    $entity_tag = new CRM_Core_DAO_EntityTag();
+
+    // add categories 1,2,3 for Organizations.
+    for ($i = 0; $i < $this->numOrganization; $i += 2) {
+      $org_id = $this->Organization[$i];
+      // echo "org_id = $org_id\n";
+      $entity_tag->entity_id = $this->Organization[$i];
+      $entity_tag->entity_table = 'civicrm_contact';
+      $entity_tag->tag_id = mt_rand(1, 3);
+      $this->_insert($entity_tag);
+    }
+
+    // add categories 4,5 for Individuals.
+    for ($i = 0; $i < $this->numIndividual; $i += 2) {
+      $entity_tag->entity_table = 'civicrm_contact';
+      $entity_tag->entity_id = $this->Individual[$i];
+      if (($entity_tag->entity_id) % 3) {
+        $entity_tag->tag_id = mt_rand(4, 5);
+        $this->_insert($entity_tag);
+      }
+      else {
+        // some of the individuals are in both categories (4 and 5).
+        $entity_tag->tag_id = 4;
+        $this->_insert($entity_tag);
+        $entity_tag->tag_id = 5;
+        $this->_insert($entity_tag);
+      }
+    }
+  }
+
+  /**
+   * This method populates the civicrm_group_contact table
+   */
+  private function addGroup() {
+    // add the 3 groups first
+    foreach ($this->sampleData['group'] as $groupName) {
+      $group = new CRM_Contact_BAO_Group();
+      $group->name = $group->title = $groupName;
+      $group->group_type = "
1
2
";
+      $group->visibility = 'Public Pages';
+      $group->is_active = 1;
+      $group->save();
+    }
+
+    // 60 are for newsletter
+    for ($i = 0; $i < 60; $i++) {
+      $groupContact = new CRM_Contact_DAO_GroupContact();
+      // newsletter subscribers
+      $groupContact->group_id = 2;
+      $groupContact->contact_id = $this->Individual[$i];
+      // always add members
+      $groupContact->status = 'Added';
+
+      $subscriptionHistory = new CRM_Contact_DAO_SubscriptionHistory();
+      $subscriptionHistory->contact_id = $groupContact->contact_id;
+
+      $subscriptionHistory->group_id = $groupContact->group_id;
+      $subscriptionHistory->status = $groupContact->status;
+      // method
+      $subscriptionHistory->method = $this->randomItem($this->subscriptionHistoryMethod);
+      $subscriptionHistory->date = $this->randomDate();
+      if ($groupContact->status != 'Pending') {
+        $this->_insert($groupContact);
+      }
+      $this->_insert($subscriptionHistory);
+    }
+
+    // 15 volunteers
+    for ($i = 0; $i < 15; $i++) {
+      $groupContact = new CRM_Contact_DAO_GroupContact();
+      // Volunteers
+      $groupContact->group_id = 3;
+      $groupContact->contact_id = $this->Individual[$i + 60];
+      // membership status
+      $groupContact->status = 'Added';
+
+      $subscriptionHistory = new CRM_Contact_DAO_SubscriptionHistory();
+      $subscriptionHistory->contact_id = $groupContact->contact_id;
+      $subscriptionHistory->group_id = $groupContact->group_id;
+      $subscriptionHistory->status = $groupContact->status;
+      // method
+      $subscriptionHistory->method = $this->randomItem($this->subscriptionHistoryMethod);
+      $subscriptionHistory->date = $this->randomDate();
+
+      if ($groupContact->status != 'Pending') {
+        $this->_insert($groupContact);
+      }
+      $this->_insert($subscriptionHistory);
+    }
+
+    // 8 advisory board group
+    for ($i = 0; $i < 8; $i++) {
+      $groupContact = new CRM_Contact_DAO_GroupContact();
+      // advisory board group
+      $groupContact->group_id = 4;
+      $groupContact->contact_id = $this->Individual[$i * 7];
+      // membership status
+      $groupContact->status = 'Added';
+
+      $subscriptionHistory = new CRM_Contact_DAO_SubscriptionHistory();
+      $subscriptionHistory->contact_id = $groupContact->contact_id;
+      $subscriptionHistory->group_id = $groupContact->group_id;
+      $subscriptionHistory->status = $groupContact->status;
+      // method
+      $subscriptionHistory->method = $this->randomItem($this->subscriptionHistoryMethod);
+      $subscriptionHistory->date = $this->randomDate();
+
+      if ($groupContact->status != 'Pending') {
+        $this->_insert($groupContact);
+      }
+      $this->_insert($subscriptionHistory);
+    }
+
+    //In this function when we add groups that time we are cache the contact fields
+    //But at the end of setup we are appending sample custom data, so for consistency
+    //reset the cache.
+    Civi::cache('fields')->flush();
+    CRM_Core_BAO_Cache::resetCaches();
+  }
+
+  /**
+   * This method populates the civicrm_note table
+   */
+  private function addNote() {
+    $params = array(
+      'entity_table' => 'civicrm_contact',
+      'contact_id' => 1,
+      'privacy' => 0,
+    );
+    for ($i = 0; $i < self::NUM_CONTACT; $i += 10) {
+      $params['entity_id'] = $this->randomItem($this->contact);
+      $params['note'] = $this->randomItem('note');
+      $params['modified_date'] = $this->randomDate();
+      $this->_addDAO('Note', $params);
+    }
+  }
+
+  /**
+   * This method populates the civicrm_activity_history table
+   */
+  private function addActivity() {
+    $contactDAO = new CRM_Contact_DAO_Contact();
+    $contactDAO->contact_type = 'Individual';
+    $contactDAO->selectAdd();
+    $contactDAO->selectAdd('id');
+    $contactDAO->orderBy('sort_name');
+    $contactDAO->find();
+
+    $count = 0;
+    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
+    while ($contactDAO->fetch()) {
+      if ($count++ > 2) {
+        break;
+      }
+      for ($i = 0; $i < self::NUM_ACTIVITY; $i++) {
+        $activityDAO = new CRM_Activity_DAO_Activity();
+        $activityId = CRM_Core_OptionGroup::values('activity_type', NULL, NULL, NULL, ' AND v.name IN ("Tell A Friend", "Pledge Acknowledgment")');
+        $activityTypeID = array_rand($activityId);
+        $activity = CRM_Core_PseudoConstant::activityType();
+        $activityDAO->activity_type_id = $activityTypeID;
+        $activityDAO->subject = "Subject for $activity[$activityTypeID]";
+        $activityDAO->activity_date_time = $this->randomDate();
+        $activityDAO->status_id = 2;
+        $this->_insert($activityDAO);
+
+        $activityContactDAO = new CRM_Activity_DAO_ActivityContact();
+        $activityContactDAO->activity_id = $activityDAO->id;
+        $activityContactDAO->contact_id = $contactDAO->id;
+        $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Source', $activityContacts);
+        $this->_insert($activityContactDAO);
+
+        if ($activityTypeID == 9) {
+          $activityContactDAO = new CRM_Activity_DAO_ActivityContact();
+          $activityContactDAO->activity_id = $activityDAO->id;
+          $activityContactDAO->contact_id = mt_rand(1, 101);
+          $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Targets', $activityContacts);
+          $this->_insert($activityContactDAO);
+        }
+      }
+    }
+  }
+
+  /**
+   * @return array
+   */
+  public function getZipCodeInfo() {
+
+    if (!$this->stateMap) {
+      $query = 'SELECT id, name, abbreviation from civicrm_state_province where country_id = 1228';
+      $dao = new CRM_Core_DAO();
+      $dao->query($query);
+      $this->stateMap = array();
+      while ($dao->fetch()) {
+        $this->stateMap[$dao->abbreviation] = $dao->id;
+        $this->states[$dao->id] = $dao->name;
+      }
+    }
+
+    static $zipCodes = NULL;
+    if ($zipCodes === NULL) {
+      $zipCodes = json_decode(file_get_contents(__DIR__ . '/zipcodes.json'));
+    }
+
+    $zipCode = $zipCodes[mt_rand(0, count($zipCodes))];
+
+    if ($this->stateMap[$zipCode->state]) {
+      $stateID = $this->stateMap[$zipCode->state];
+    }
+    else {
+      $stateID = 1004;
+    }
+
+    $zip = str_pad($zipCode->zip, 5, '0', STR_PAD_LEFT);
+    return array(1228, $stateID, $zipCode->city, $zip, $zipCode->latitude, $zipCode->longitude);
+  }
+
+  /**
+   * @param $zipCode
+   *
+   * @return array
+   */
+  public static function getLatLong($zipCode) {
+    $query = "http://maps.google.com/maps?q=$zipCode&output=js";
+    $userAgent = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0";
+
+    $ch = curl_init();
+    curl_setopt($ch, CURLOPT_URL, $query);
+    curl_setopt($ch, CURLOPT_HEADER, FALSE);
+    curl_setopt($ch, CURLOPT_USERAGENT, $userAgent);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+    // grab URL and pass it to the browser
+    $outstr = curl_exec($ch);
+
+    // close CURL resource, and free up system resources
+    curl_close($ch);
+
+    $preg = "/'(<\?xml.+?)',/s";
+    preg_match($preg, $outstr, $matches);
+    if ($matches[1]) {
+      $xml = simplexml_load_string($matches[1]);
+      $attributes = $xml->center->attributes();
+      if (!empty($attributes)) {
+        return array((float ) $attributes['lat'], (float ) $attributes['lng']);
+      }
+    }
+    return array(NULL, NULL);
+  }
+
+  private function addMembershipType() {
+    $organizationDAO = new CRM_Contact_DAO_Contact();
+    $organizationDAO->id = 5;
+    $organizationDAO->find(TRUE);
+    $contact_id = $organizationDAO->contact_id;
+
+    $membershipType = "INSERT INTO civicrm_membership_type
+        (name, description, member_of_contact_id, financial_type_id, minimum_fee, duration_unit, duration_interval, period_type, fixed_period_start_day, fixed_period_rollover_day, relationship_type_id, relationship_direction, visibility, weight, is_active)
+        VALUES
+        ('General', 'Regular annual membership.', " . $contact_id . ", 2, 100, 'year', 1, 'rolling',null, null, 7, 'b_a', 'Public', 1, 1),
+        ('Student', 'Discount membership for full-time students.', " . $contact_id . ", 2, 50, 'year', 1, 'rolling', null, null, 7, 'b_a', 'Public', 2, 1),
+        ('Lifetime', 'Lifetime membership.', " . $contact_id . ", 2, 1200, 'lifetime', 1, 'rolling', null, null, 7, 'b_a', 'Admin', 3, 1);
+        ";
+    $this->_query($membershipType);
+  }
+
+  private function addMembership() {
+    $contact = new CRM_Contact_DAO_Contact();
+    $contact->query("SELECT id FROM civicrm_contact where contact_type = 'Individual'");
+    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
+    while ($contact->fetch()) {
+      $contacts[] = $contact->id;
+    }
+    shuffle($contacts);
+
+    $randomContacts = array_slice($contacts, 20, 30);
+
+    $sources = array('Payment', 'Donation', 'Check');
+    $membershipTypes = array(1, 2);
+    $membershipTypeNames = array('General', 'Student');
+    $statuses = array(3, 4);
+
+    $membership = "
+INSERT INTO civicrm_membership
+        (contact_id, membership_type_id, join_date, start_date, end_date, source, status_id)
+VALUES
+";
+
+    $activity = "
+INSERT INTO civicrm_activity
+        (source_record_id, activity_type_id, subject, activity_date_time, duration, location, phone_id, phone_number, details, priority_id,parent_id, is_test, status_id)
+VALUES
+";
+
+    $activityContact = "
+INSERT INTO civicrm_activity_contact
+  (activity_id, contact_id, record_type_id)
+VALUES
+";
+
+    $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity");
+    $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
+    foreach ($randomContacts as $count => $dontCare) {
+      $source = $this->randomItem($sources);
+      $activitySourceId = $count + 1;
+      $currentActivityID++;
+      $activityContact .= "( $currentActivityID, {$randomContacts[$count]}, {$sourceID} )";
+      if ((($count + 1) % 11 == 0)) {
+        // lifetime membership, status can be anything
+        $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y')));
+        $membership .= "( {$randomContacts[$count]}, 3, '{$startDate}', '{$startDate}', null, '{$source}', 1)";
+        $activity .= "( {$activitySourceId}, 7, 'Lifetime', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
+      }
+      elseif (($count + 1) % 5 == 0) {
+        // Grace or expired, memberhsip type is random of 1 & 2
+        $randIndex = array_rand($membershipTypes);
+        $membershipTypeId = $membershipTypes[$randIndex];
+        $membershipStatusId = $statuses[$randIndex];
+        $membershipTypeName = $membershipTypeNames[$randIndex];
+        $YearFactor = $membershipTypeId * 2;
+        //reverse the type and consider as year factor.
+        if ($YearFactor != 2) {
+          $YearFactor = 1;
+        }
+        $dateFactor = ($count * ($YearFactor) * ($YearFactor) * ($YearFactor));
+        $startDate = date('Y-m-d', mktime(0, 0, 0,
+          date('m'),
+          (date('d') - ($dateFactor)),
+          (date('Y') - ($YearFactor))
+        ));
+        $partOfDate = explode('-', $startDate);
+        $endDate = date('Y-m-d', mktime(0, 0, 0,
+          $partOfDate[1],
+          ($partOfDate[2] - 1),
+          ($partOfDate[0] + ($YearFactor))
+        ));
+
+        $membership .= "( {$randomContacts[$count]}, {$membershipTypeId}, '{$startDate}', '{$startDate}', '{$endDate}', '{$source}', {$membershipStatusId})";
+        $activity .= "( {$activitySourceId}, 7, '{$membershipTypeName}', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
+      }
+      elseif (($count + 1) % 2 == 0) {
+        // membership type 2
+        $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y')));
+        $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - ($count + 1)), (date('Y') + 1)));
+        $membership .= "( {$randomContacts[$count]}, 2, '{$startDate}', '{$startDate}', '{$endDate}', '{$source}', 1)";
+        $activity .= "( {$activitySourceId}, 7, 'Student', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
+      }
+      else {
+        // membership type 1
+        $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y')));
+        $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - ($count + 1)), (date('Y') + 2)));
+        $membership .= "( {$randomContacts[$count]}, 1, '{$startDate}', '{$startDate}', '{$endDate}', '{$source}', 1)";
+        $activity .= "( {$activitySourceId}, 7, 'General', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
+      }
+
+      if ($count != 29) {
+        $membership .= ",";
+        $activity .= ",";
+        $activityContact .= ",";
+      }
+    }
+
+    $this->_query($membership);
+    $this->_query($activity);
+    $this->_query($activityContact);
+  }
+
+  /**
+   * @param $date
+   *
+   * @return string
+   */
+  public static function repairDate($date) {
+    $dropArray = array('-' => '', ':' => '', ' ' => '');
+    return strtr($date, $dropArray);
+  }
+
+  private function addMembershipLog() {
+    $membership = new CRM_Member_DAO_Membership();
+    $membership->query("SELECT id FROM civicrm_membership");
+    while ($membership->fetch()) {
+      $ids[] = $membership->id;
+    }
+    foreach ($ids as $id) {
+      $membership = new CRM_Member_DAO_Membership();
+      $membership->id = $id;
+      $membershipLog = new CRM_Member_DAO_MembershipLog();
+      if ($membership->find(TRUE)) {
+        $membershipLog->membership_id = $membership->id;
+        $membershipLog->status_id = $membership->status_id;
+        $membershipLog->start_date = self::repairDate($membership->start_date);
+        $membershipLog->end_date = self::repairDate($membership->end_date);
+        $membershipLog->modified_id = $membership->contact_id;
+        $membershipLog->modified_date = date("Ymd");
+        $membershipLog->membership_type_id = $membership->membership_type_id;
+        $membershipLog->save();
+      }
+      $membershipLog = NULL;
+    }
+  }
+
+  private function addEvent() {
+    $event = "INSERT INTO civicrm_address ( contact_id, location_type_id, is_primary, is_billing, street_address, street_number, street_number_suffix, street_number_predirectional, street_name, street_type, street_number_postdirectional, street_unit, supplemental_address_1, supplemental_address_2, supplemental_address_3, city, county_id, state_province_id, postal_code_suffix, postal_code, usps_adc, country_id, geo_code_1, geo_code_2, timezone)
+      VALUES
+      ( NULL, 1, 1, 1, '14S El Camino Way E', 14, 'S', NULL, 'El Camino', 'Way', NULL, NULL, NULL, NULL, NULL, 'Collinsville', NULL, 1006, NULL, '6022', NULL, 1228, 41.8328, -72.9253, NULL),
+      ( NULL, 1, 1, 1, '11B Woodbridge Path SW', 11, 'B', NULL, 'Woodbridge', 'Path', NULL, NULL, NULL, NULL, NULL, 'Dayton', NULL, 1034, NULL, '45417', NULL, 1228, 39.7531, -84.2471, NULL),
+      ( NULL, 1, 1, 1, '581O Lincoln Dr SW', 581, 'O', NULL, 'Lincoln', 'Dr', NULL, NULL, NULL, NULL, NULL, 'Santa Fe', NULL, 1030, NULL, '87594', NULL, 1228, 35.5212, -105.982, NULL)
+      ";
+    $this->_query($event);
+
+    $sql = "SELECT id from civicrm_address where street_address = '14S El Camino Way E'";
+    $eventAdd1 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_address where street_address = '11B Woodbridge Path SW'";
+    $eventAdd2 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_address where street_address = '581O Lincoln Dr SW'";
+    $eventAdd3 = CRM_Core_DAO::singleValueQuery($sql);
+
+    $event = "INSERT INTO civicrm_email (contact_id, location_type_id, email, is_primary, is_billing, on_hold, hold_date, reset_date)
+       VALUES
+       (NULL, 1, 'development@example.org', 0, 0, 0, NULL, NULL),
+       (NULL, 1, 'tournaments@example.org', 0, 0, 0, NULL, NULL),
+       (NULL, 1, 'celebration@example.org', 0, 0, 0, NULL, NULL)
+       ";
+    $this->_query($event);
+
+    $sql = "SELECT id from civicrm_email where email = 'development@example.org'";
+    $eventEmail1 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_email where email = 'tournaments@example.org'";
+    $eventEmail2 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_email where email = 'celebration@example.org'";
+    $eventEmail3 = CRM_Core_DAO::singleValueQuery($sql);
+
+    $event = "INSERT INTO civicrm_phone (contact_id, location_type_id, is_primary, is_billing, mobile_provider_id, phone, phone_numeric, phone_type_id)
+       VALUES
+       (NULL, 1, 0, 0, NULL, '204 222-1000', '2042221000', '1'),
+       (NULL, 1, 0, 0, NULL, '204 223-1000', '2042231000', '1'),
+       (NULL, 1, 0, 0, NULL, '303 323-1000', '3033231000', '1')
+       ";
+    $this->_query($event);
+
+    $sql = "SELECT id from civicrm_phone where phone = '204 222-1000'";
+    $eventPhone1 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_phone where phone = '204 223-1000'";
+    $eventPhone2 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_phone where phone = '303 323-1000'";
+    $eventPhone3 = CRM_Core_DAO::singleValueQuery($sql);
+
+    $event = "INSERT INTO civicrm_loc_block ( address_id, email_id, phone_id, address_2_id, email_2_id, phone_2_id)
+       VALUES
+      ( $eventAdd1, $eventEmail1, $eventPhone1, NULL,NULL,NULL),
+      ( $eventAdd2, $eventEmail2, $eventPhone2, NULL,NULL,NULL),
+      ( $eventAdd3, $eventEmail3, $eventPhone3, NULL,NULL,NULL)
+       ";
+
+    $this->_query($event);
+
+    $sql = "SELECT id from civicrm_loc_block where phone_id = $eventPhone1 AND email_id = $eventEmail1 AND address_id = $eventAdd1";
+    $eventLok1 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_loc_block where phone_id = $eventPhone2 AND email_id = $eventEmail2 AND address_id = $eventAdd2";
+    $eventLok2 = CRM_Core_DAO::singleValueQuery($sql);
+    $sql = "SELECT id from civicrm_loc_block where phone_id = $eventPhone3 AND email_id = $eventEmail3 AND address_id = $eventAdd3";
+    $eventLok3 = CRM_Core_DAO::singleValueQuery($sql);
+
+    $event = "INSERT INTO civicrm_event
+        ( title, summary, description, event_type_id, participant_listing_id, is_public, start_date, end_date, is_online_registration, registration_link_text, max_participants, event_full_text, is_monetary, financial_type_id, is_map, is_active, fee_label, is_show_location, loc_block_id,intro_text, footer_text, confirm_title, confirm_text, confirm_footer_text, is_email_confirm, confirm_email_text, confirm_from_name, confirm_from_email, cc_confirm, bcc_confirm, default_fee_id, thankyou_title, thankyou_text, thankyou_footer_text, is_pay_later, pay_later_text, pay_later_receipt, is_multiple_registrations, allow_same_participant_emails, currency )
+        VALUES
+        ( 'Fall Fundraiser Dinner', 'Kick up your heels at our Fall Fundraiser Dinner/Dance at Glen Echo Park! Come by yourself or bring a partner, friend or the entire family!', 'This event benefits our teen programs. Admission includes a full 3 course meal and wine or soft drinks. Grab your dancing shoes, bring the kids and come join the party!', 3, 1, 1, '" . date('Y-m-d 17:00:00', strtotime("+6 months")) . "', '" . date('Y-m-d 17:00:00', strtotime("+6 months +2 days")) . "', 1, 'Register Now', 100, 'Sorry! The Fall Fundraiser Dinner is full. Please call Jane at 204 222-1000 ext 33 if you want to be added to the waiting list.', 1, 4, 1, 1, 'Dinner Contribution', 1 ,$eventLok1,'Fill in the information below to join as at this wonderful dinner event.', NULL, 'Confirm Your Registration Information', 'Review the information below carefully.', NULL, 1, 'Contact the Development Department if you need to make any changes to your registration.', 'Fundraising Dept.', 'development@example.org', NULL, NULL, NULL, 'Thanks for Registering!', '<p>Thank you for your support. Your contribution will help us build even better tools.</p><p>Please tell your friends and colleagues about this wonderful event.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 1, 'I will send payment by check', 'Send a check payable to Our Organization within 3 business days to hold your reservation. Checks should be sent to: 100 Main St., Suite 3, San Francisco CA 94110', 1, 0, 'USD' ),
+        ( 'Summer Solstice Festival Day Concert', 'Festival Day is coming! Join us and help support your parks.', 'We will gather at noon, learn a song all together,  and then join in a joyous procession to the pavilion. We will be one of many groups performing at this wonderful concert which benefits our city parks.', 5, 1, 1, '" . date('Y-m-d 12:00:00', strtotime("-1 day")) . "', '" . date('Y-m-d 17:00:00', strtotime("-1 day")) . "', 1, 'Register Now', 50, 'We have all the singers we can handle. Come to the pavilion anyway and join in from the audience.', 1, 2, NULL, 1, 'Festival Fee', 1, $eventLok2, 'Complete the form below and click Continue to register online for the festival. Or you can register by calling us at 204 222-1000 ext 22.', '', 'Confirm Your Registration Information', '', '', 1, 'This email confirms your registration. If you have questions or need to change your registration - please do not hesitate to call us.', 'Event Dept.', 'events@example.org', '', NULL, NULL, 'Thanks for Your Joining In!', '<p>Thank you for your support. Your participation will help build new parks.</p><p>Please tell your friends and colleagues about the concert.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 1, 0, 'USD' ),
+        ( 'Rain-forest Cup Youth Soccer Tournament', 'Sign up your team to participate in this fun tournament which benefits several Rain-forest protection groups in the Amazon basin.', 'This is a FYSA Sanctioned Tournament, which is open to all USSF/FIFA affiliated organizations for boys and girls in age groups: U9-U10 (6v6), U11-U12 (8v8), and U13-U17 (Full Sided).', 3, 1, 1, '" . date('Y-m-d 07:00:00', strtotime("+7 months")) . "', '" . date('Y-m-d 17:00:00', strtotime("+7 months +3 days")) . "', 1, 'Register Now', 500, 'Sorry! All available team slots for this tournament have been filled. Contact Jill Futbol for information about the waiting list and next years event.', 1, 4, NULL, 1, 'Tournament Fees',1, $eventLok3, 'Complete the form below to register your team for this year''s tournament.', '<em>A Soccer Youth Event</em>', 'Review and Confirm Your Registration Information', '', '<em>A Soccer Youth Event</em>', 1, 'Contact our Tournament Director for eligibility details.', 'Tournament Director', 'tournament@example.org', '', NULL, NULL, 'Thanks for Your Support!', '<p>Thank you for your support. Your participation will help save thousands of acres of rainforest.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 0, 0, 'USD' )
+         ";
+    $this->_query($event);
+
+    //CRM-4464
+    $eventTemplates = "INSERT INTO civicrm_event
+        ( is_template, template_title, event_type_id, default_role_id, participant_listing_id, is_public, is_monetary, is_online_registration, is_multiple_registrations, allow_same_participant_emails, is_email_confirm, financial_type_id, fee_label, confirm_title, thankyou_title, confirm_from_name, confirm_from_email, is_active, currency )
+        VALUES
+        ( 1, 'Free Meeting without Online Registration', 4, 1, 1, 1, 0, 0, null, null, null, null,             null, null, null, null, null, 1, 'USD'  ),
+        ( 1, 'Free Meeting with Online Registration',    4, 1, 1, 1, 0, 1,    1,    1,    0, null,             null, 'Confirm Your Registration Information', 'Thanks for Registering!', null, null, 1, 'USD'  ),
+        ( 1, 'Paid Conference with Online Registration', 1, 1, 1, 1, 1, 1,    1,    1,    1,     4, 'Conference Fee', 'Confirm Your Registration Information', 'Thanks for Registering!', 'Event Template Dept.', 'event_templates@example.org', 1, 'USD' )";
+
+    $this->_query($eventTemplates);
+
+    $ufJoinValues = $tellFriendValues = array();
+    $profileID = CRM_Core_DAO::singleValueQuery("Select id from civicrm_uf_group where name ='event_registration'");
+
+    // grab id's for all events and event templates
+    $query = "
+SELECT  id
+  FROM  civicrm_event";
+
+    $template = CRM_Core_DAO::executeQuery($query);
+    while ($template->fetch()) {
+      if ($profileID) {
+        $ufJoinValues[] = "( 1, 'CiviEvent', 'civicrm_event', {$template->id}, 1, {$profileID} )";
+      }
+      $tellFriendValues[] = "( 'civicrm_event', {$template->id}, 'Tell A Friend', '<p>Help us spread the word about this event. Use the space below to personalize your email message - let your friends know why you''re attending. Then fill in the name(s) and email address(es) and click ''Send Your Message''.</p>', 'Thought you might be interested in checking out this event. I''m planning on attending.', NULL, 'Thanks for Spreading the Word', '<p>Thanks for spreading the word about this event to your friends.</p>', 1)";
+    }
+
+    //insert values in civicrm_uf_join for the required event_registration profile - CRM-9587
+    if (!empty($ufJoinValues)) {
+      $includeProfile = "INSERT INTO civicrm_uf_join
+                               (is_active, module, entity_table, entity_id, weight, uf_group_id )
+                               VALUES " . implode(',', $ufJoinValues);
+      $this->_query($includeProfile);
+    }
+
+    //insert values in civicrm_tell_friend
+    if (!empty($tellFriendValues)) {
+      $tellFriend = "INSERT INTO civicrm_tell_friend
+                           (entity_table, entity_id, title, intro, suggested_message,
+                           general_link,  thankyou_title, thankyou_text, is_active)
+                           VALUES " . implode(',', $tellFriendValues);
+      $this->_query($tellFriend);
+    }
+  }
+
+  private function addParticipant() {
+    $contact = new CRM_Contact_DAO_Contact();
+    $contact->query("SELECT id FROM civicrm_contact");
+    while ($contact->fetch()) {
+      $contacts[] = $contact->id;
+    }
+    shuffle($contacts);
+    $randomContacts = array_slice($contacts, 20, 50);
+
+    $participant = "
+INSERT INTO civicrm_participant
+        (contact_id, event_id, status_id, role_id, register_date, source, fee_level, is_test, fee_amount, fee_currency)
+VALUES
+        ( " . $randomContacts[0] . ", 1, 1, 1, '2009-01-21', 'Check', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[1] . ", 2, 2, 2, '2008-05-07', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[2] . ", 3, 3, 3, '2008-05-05', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD') ,
+        ( " . $randomContacts[3] . ", 1, 4, 4, '2008-10-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[4] . ", 2, 1, 1, '2008-01-10', 'Check', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[5] . ", 3, 2, 2, '2008-03-05', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[6] . ", 1, 3, 3, '2009-07-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[7] . ", 2, 4, 4, '2009-03-07', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[8] . ", 3, 1, 1, '2008-02-05', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[9] . ", 1, 2, 2, '2008-02-01', 'Check', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[10] . ", 2, 3, 3, '2009-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[11] . ", 3, 4, 4, '2009-03-06', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[12] . ", 1, 1, 2, '2008-06-04', 'Credit Card', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[13] . ", 2, 2, 3, '2008-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[14] . ", 3, 4, 1, '2008-07-04', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[15] . ", 1, 4, 2, '2009-01-21', 'Credit Card', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[16] . ", 2, 2, 3, '2008-01-10', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[17] . ", 3, 3, 1, '2009-03-05', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[18] . ", 1, 2, 1, '2008-10-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[19] . ", 2, 4, 1, '2009-01-10', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[20] . ", 3, 1, 4, '2008-03-25', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[21] . ", 1, 2, 3, '2009-10-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[22] . ", 2, 4, 1, '2008-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[23] . ", 3, 3, 1, '2008-03-11', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[24] . ", 3, 2, 2, '2008-04-05', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[25] . ", 1, 1, 1, '2009-01-21', 'Check', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[26] . ", 2, 2, 2, '2008-05-07', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[27] . ", 3, 3, 3, '2009-12-12', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[28] . ", 1, 4, 4, '2009-12-13', 'Credit Card', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[29] . ", 2, 1, 1, '2009-12-14', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[30] . ", 3, 2, 2, '2009-12-15', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[31] . ", 1, 3, 3, '2009-07-21', 'Check', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[32] . ", 2, 4, 4, '2009-03-07', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[33] . ", 3, 1, 1, '2009-12-15', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[34] . ", 1, 2, 2, '2009-12-13', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[35] . ", 2, 3, 3, '2009-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[36] . ", 3, 4, 4, '2009-03-06', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[37] . ", 1, 1, 2, '2009-12-13', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[38] . ", 2, 2, 3, '2008-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[39] . ", 3, 4, 1, '2009-12-14', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[40] . ", 1, 4, 2, '2009-01-21', 'Credit Card', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[41] . ", 2, 2, 3, '2009-12-15', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[42] . ", 3, 3, 1, '2009-03-05', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[43] . ", 1, 2, 1, '2009-12-13', 'Direct Transfer', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[44] . ", 2, 4, 1, '2009-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[45] . ", 3, 1, 4, '2009-12-13', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[46] . ", 1, 2, 3, '2009-10-21', 'Credit Card', 'Single', 0, 50, 'USD'),
+        ( " . $randomContacts[47] . ", 2, 4, 1, '2009-12-10', 'Credit Card', 'Soprano', 0, 50, 'USD'),
+        ( " . $randomContacts[48] . ", 3, 3, 1, '2009-03-11', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
+        ( " . $randomContacts[49] . ", 3, 2, 2, '2009-04-05', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD');
+";
+    $this->_query($participant);
+
+    $query = "
+INSERT INTO civicrm_activity
+    (source_record_id, activity_type_id, subject, activity_date_time, duration, location, phone_id, phone_number, details, priority_id,parent_id, is_test, status_id)
+VALUES
+    (01, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (02, 5, 'NULL', '2008-05-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (03, 5, 'NULL', '2008-05-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (04, 5, 'NULL', '2008-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (05, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (06, 5, 'NULL', '2008-03-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (07, 5, 'NULL', '2009-07-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (08, 5, 'NULL', '2009-03-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (09, 5, 'NULL', '2008-02-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (10, 5, 'NULL', '2008-02-01 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (11, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (12, 5, 'NULL', '2009-03-06 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (13, 5, 'NULL', '2008-06-04 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (14, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (15, 5, 'NULL', '2008-07-04 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (16, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (17, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (18, 5, 'NULL', '2009-03-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (19, 5, 'NULL', '2008-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (20, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (21, 5, 'NULL', '2008-03-25 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (22, 5, 'NULL', '2009-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (23, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (24, 5, 'NULL', '2008-03-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (25, 5, 'NULL', '2008-04-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (26, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (27, 5, 'NULL', '2008-05-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (28, 5, 'NULL', '2009-12-12 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (29, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (30, 5, 'NULL', '2009-12-14 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (31, 5, 'NULL', '2009-12-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (32, 5, 'NULL', '2009-07-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (33, 5, 'NULL', '2009-03-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (34, 5, 'NULL', '2009-12-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (35, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (36, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (37, 5, 'NULL', '2009-03-06 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (38, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (39, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (40, 5, 'NULL', '2009-12-14 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (41, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (42, 5, 'NULL', '2009-12-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (43, 5, 'NULL', '2009-03-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (44, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (45, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (46, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (47, 5, 'NULL', '2009-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (48, 5, 'NULL', '2009-12-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (49, 5, 'NULL', '2009-03-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (50, 5, 'NULL', '2009-04-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )
+    ";
+    $this->_query($query);
+
+    $activityContact = "
+INSERT INTO civicrm_activity_contact
+  (contact_id, activity_id, record_type_id)
+VALUES
+";
+    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
+    $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity");
+    $currentActivityID -= 50;
+    $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
+    for ($i = 0; $i < 50; $i++) {
+      $currentActivityID++;
+      $activityContact .= "({$randomContacts[$i]}, $currentActivityID, $sourceID)";
+      if ($i != 49) {
+        $activityContact .= ", ";
+      }
+    }
+    $this->_query($activityContact);
+  }
+
+  private function addPCP() {
+    $query = "
+INSERT INTO `civicrm_pcp`
+    (contact_id, status_id, title, intro_text, page_text, donate_link_text, page_id, page_type, is_thermometer, is_honor_roll, goal_amount, currency, is_active, pcp_block_id, is_notify)
+VALUES
+    ({$this->Individual[3]}, 2, 'My Personal Civi Fundraiser', 'I''m on a mission to get all my friends and family to help support my favorite open-source civic sector CRM.', '<p>Friends and family - please help build much needed infrastructure for the civic sector by supporting my personal campaign!</p>\r\n<p><a href=\"https://civicrm.org\">You can learn more about CiviCRM here</a>.</p>\r\n<p>Then click the <strong>Contribute Now</strong> button to go to our easy-to-use online contribution form.</p>', 'Contribute Now', 1, 'contribute', 1, 1, 5000.00, 'USD', 1, 1, 1);
+";
+    $this->_query($query);
+  }
+
+  private function addContribution() {
+    $query = "
+INSERT INTO civicrm_contribution
+    (contact_id, financial_type_id, payment_instrument_id, receive_date, non_deductible_amount, total_amount, trxn_id, check_number, currency, cancel_date, cancel_reason, receipt_date, thankyou_date, source )
+VALUES
+    (2, 1, 4, '2010-04-11 00:00:00', 0.00, 125.00, NULL, '1041', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
+    (4, 1, 1, '2010-03-21 00:00:00', 0.00, 50.00, 'P20901X1', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Save the Penguins' ),
+    (6, 1, 4, '2010-04-29 00:00:00', 0.00, 25.00, NULL, '2095', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
+    (8, 1, 4, '2010-04-11 00:00:00', 0.00, 50.00, NULL, '10552', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
+    (16, 1, 4, '2010-04-15 00:00:00', 0.00, 500.00, NULL, '509', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
+    (19, 1, 4, '2010-04-11 00:00:00', 0.00, 175.00, NULL, '102', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
+    (82, 1, 1, '2010-03-27 00:00:00', 0.00, 50.00, 'P20193L2', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Save the Penguins' ),
+    (92, 1, 1, '2010-03-08 00:00:00', 0.00, 10.00, 'P40232Y3', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Help CiviCRM' ),
+    (34, 1, 1, '2010-04-22 00:00:00', 0.00, 250.00, 'P20193L6', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Help CiviCRM' ),
+    (71, 1, 1, '2009-07-01 11:53:50', 0.00, 500.00, 'PL71', NULL, 'USD', NULL, NULL, NULL, NULL, NULL ),
+    (43, 1, 1, '2009-07-01 12:55:41', 0.00, 200.00, 'PL43II', NULL, 'USD', NULL, NULL, NULL, NULL, NULL ),
+    (32, 1, 1, '2009-10-01 11:53:50', 0.00, 200.00, 'PL32I', NULL, 'USD', NULL, NULL, NULL, NULL, NULL ),
+    (32, 1, 1, '2009-12-01 12:55:41', 0.00, 200.00, 'PL32II', NULL, 'USD', NULL, NULL, NULL, NULL, NULL );
+";
+    $this->_query($query);
+
+    $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity");
+    $query = "
+INSERT INTO civicrm_activity
+    (source_record_id, activity_type_id, subject, activity_date_time, duration, location, phone_id, phone_number, details, priority_id,parent_id, is_test, status_id)
+VALUES
+    (1, 6, '$ 125.00-Apr 2007 Mailer 1', '2010-04-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (2, 6, '$ 50.00-Online: Save the Penguins', '2010-03-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (3, 6, '$ 25.00-Apr 2007 Mailer 1', '2010-04-29 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (4, 6, '$ 50.00-Apr 2007 Mailer 1', '2010-04-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (5, 6, '$ 500.00-Apr 2007 Mailer 1', '2010-04-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (6, 6, '$ 175.00-Apr 2007 Mailer 1', '2010-04-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (7, 6, '$ 50.00-Online: Save the Penguins', '2010-03-27 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (8, 6, '$ 10.00-Online: Save the Penguins', '2010-03-08 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (9, 6, '$ 250.00-Online: Save the Penguins', '2010-04-22 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (10, 6, NULL, '2009-07-01 11:53:50', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (11, 6, NULL, '2009-07-01 12:55:41', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (12, 6, NULL, '2009-10-01 11:53:50', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
+    (13, 6, NULL, '2009-12-01 12:55:41', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 );
+    ";
+    $this->_query($query);
+
+    $activityContact = "
+INSERT INTO civicrm_activity_contact
+  (contact_id, activity_id, record_type_id)
+VALUES
+";
+
+    $arbitraryNumbers = array(2, 4, 6, 8, 16, 19, 82, 92, 34, 71, 43, 32, 32);
+    for ($i = 0; $i < count($arbitraryNumbers); $i++) {
+      $currentActivityID++;
+      $activityContact .= "({$arbitraryNumbers[$i]}, $currentActivityID, 2)";
+      if ($i != count($arbitraryNumbers) - 1) {
+        $activityContact .= ", ";
+      }
+    }
+    $this->_query($activityContact);
+  }
+
+  private function addSoftContribution() {
+
+    $sql = "SELECT id from civicrm_contribution where contact_id = 92";
+    $contriId1 = CRM_Core_DAO::singleValueQuery($sql);
+
+    $sql = "SELECT id from civicrm_contribution where contact_id = 34";
+    $contriId2 = CRM_Core_DAO::singleValueQuery($sql);
+
+    $sql = "SELECT cov.value FROM civicrm_option_value cov LEFT JOIN civicrm_option_group cog ON cog.id = cov.option_group_id WHERE cov.name = 'pcp' AND cog.name = 'soft_credit_type'";
+
+    $pcpId = CRM_Core_DAO::singleValueQuery($sql);
+
+    $query = "
+INSERT INTO `civicrm_contribution_soft`
+      ( contribution_id, contact_id ,amount , currency, pcp_id , pcp_display_in_roll ,pcp_roll_nickname,pcp_personal_note, soft_credit_type_id )
+VALUES
+    ( $contriId1, {$this->Individual[3]}, 10.00, 'USD', 1, 1, 'Jones Family', 'Helping Hands', $pcpId),
+    ( $contriId2, {$this->Individual[3]}, 250.00, 'USD', 1, 1, 'Annie and the kids', 'Annie Helps', $pcpId);
+ ";
+
+    $this->_query($query);
+  }
+
+  private function addPledge() {
+    $pledge = "INSERT INTO civicrm_pledge
+        (contact_id, financial_type_id, contribution_page_id, amount, original_installment_amount, currency,frequency_unit, frequency_interval, frequency_day, installments, start_date, create_date, acknowledge_date, modified_date, cancel_date, end_date, status_id, is_test)
+        VALUES
+       (71, 1, 1, 500.00, '500', 'USD', 'month', 1, 1, 1, '2009-07-01 00:00:00', '2009-06-26 00:00:00', NULL, NULL, NULL,'2009-07-01 00:00:00', 1, 0),
+       (43, 1, 1, 800.00, '200', 'USD', 'month', 3, 1, 4, '2009-07-01 00:00:00', '2009-06-23 00:00:00', '2009-06-23 00:00:00', NULL, NULL, '2009-04-01 10:11:40', 5, 0),
+       (32, 1, 1, 600.00, '200', 'USD', 'month', 1, 1, 3, '2009-10-01 00:00:00', '2009-09-14 00:00:00', '2009-09-14 00:00:00', NULL, NULL, '2009-12-01 00:00:00', 5, 0);
+";
+    $this->_query($pledge);
+  }
+
+  private function addPledgePayment() {
+    $pledgePayment = "INSERT INTO civicrm_pledge_payment
+        ( pledge_id, contribution_id, scheduled_amount, actual_amount, currency, scheduled_date, reminder_date, reminder_count, status_id)
+       VALUES
+         (1, 10, 500.00, 500.00, 'USD','2009-07-01 00:00:00', null, 0, 1 ),
+         (2, 11,   200.00, 200.00, 'USD','2009-07-01 00:00:00', null, 0,  1 ),
+         (2, null, 200.00, null, 'USD', '2009-10-01 00:00:00', null, 0,  2 ),
+         (2, null, 200.00, null, 'USD', '2009-01-01 00:00:00', null, 0,  2 ),
+         (2, null, 200.00, null, 'USD', '2009-04-01 00:00:00', null, 0,  2 ),
+
+         (3, 12,   200.00, 200.00, 'USD', '2009-10-01 00:00:00', null, 0, 1 ),
+         (3, 13,   200.00, 200.00, 'USD', '2009-11-01 00:0:00', '2009-10-28 00:00:00', 1, 1),
+         (3, null, 200.00, null, 'USD', '2009-12-01 00:00:00', null, 0, 2 );
+        ";
+    $this->_query($pledgePayment);
+  }
+
+  private function addContributionLineItem() {
+    $query = " INSERT INTO civicrm_line_item (`entity_table`, `entity_id`, contribution_id, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`)
+SELECT 'civicrm_contribution', cc.id, cc.id contribution_id, cpf.id as price_field, cpfv.label, 1, cc.total_amount, cc.total_amount line_total, 0, cpfv.id as price_field_value, cpfv.financial_type_id
+FROM civicrm_contribution cc
+LEFT JOIN civicrm_price_set cps ON cps.name = 'default_contribution_amount'
+LEFT JOIN civicrm_price_field cpf ON cpf.price_set_id = cps.id
+LEFT JOIN civicrm_price_field_value cpfv ON cpfv.price_field_id = cpf.id
+order by cc.id; ";
+    $this->_query($query);
+  }
+
+  private function addAccountingEntries() {
+    $components = array('contribution', 'membership', 'participant');
+    $select = 'SELECT contribution.id contribution_id, cli.id as line_item_id, contribution.contact_id, contribution.receive_date, contribution.total_amount, contribution.currency, cli.label,
+      cli.financial_type_id,  cefa.financial_account_id, contribution.payment_instrument_id, contribution.check_number, contribution.trxn_id';
+    $where = 'WHERE cefa.account_relationship = 1';
+    $financialAccountId = CRM_Financial_BAO_FinancialTypeAccount::getInstrumentFinancialAccount(4);
+    foreach ($components as $component) {
+      if ($component == 'contribution') {
+        $from = 'FROM `civicrm_contribution` contribution';
+      }
+      else {
+        $from = " FROM `civicrm_{$component}` {$component}
+          INNER JOIN civicrm_{$component}_payment cpp ON cpp.{$component}_id = {$component}.id
+          INNER JOIN civicrm_contribution contribution on contribution.id = cpp.contribution_id";
+      }
+      $from .= " INNER JOIN civicrm_line_item cli ON cli.entity_id = {$component}.id and cli.entity_table = 'civicrm_{$component}'
+        INNER JOIN civicrm_entity_financial_account cefa ON cefa.entity_id =  cli.financial_type_id ";
+      $sql = " {$select} {$from} {$where} ";
+      $result = CRM_Core_DAO::executeQuery($sql);
+      $this->addFinancialItem($result, $financialAccountId);
+    }
+  }
+
+  /**
+   * @param $result
+   * @param null $financialAccountId
+   */
+  private function addFinancialItem($result, $financialAccountId) {
+    $defaultFinancialAccount = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_financial_account WHERE is_default = 1 AND financial_account_type_id = 1");
+    while ($result->fetch()) {
+      $trxnParams = array(
+        'trxn_date' => CRM_Utils_Date::processDate($result->receive_date),
+        'total_amount' => $result->total_amount,
+        'currency' => $result->currency,
+        'status_id' => 1,
+        'trxn_id' => $result->trxn_id,
+        'contribution_id' => $result->contribution_id,
+        'to_financial_account_id' => empty($financialAccountId[$result->payment_instrument_id]) ? $defaultFinancialAccount : $financialAccountId[$result->payment_instrument_id],
+        'payment_instrument_id' => $result->payment_instrument_id,
+        'check_number' => $result->check_number,
+        'is_payment' => 1,
+      );
+      $trxn = CRM_Core_BAO_FinancialTrxn::create($trxnParams);
+      $financialItem = array(
+        'transaction_date' => CRM_Utils_Date::processDate($result->receive_date),
+        'amount' => $result->total_amount,
+        'currency' => $result->currency,
+        'status_id' => 1,
+        'entity_id' => $result->line_item_id,
+        'contact_id' => $result->contact_id,
+        'entity_table' => 'civicrm_line_item',
+        'description' => $result->label,
+        'financial_account_id' => $result->financial_account_id,
+      );
+      $trxnId['id'] = $trxn->id;
+      CRM_Financial_BAO_FinancialItem::create($financialItem, NULL, $trxnId);
+    }
+  }
+
+  private function addLineItemParticipants() {
+    $participant = new CRM_Event_DAO_Participant();
+    $participant->query("INSERT INTO civicrm_line_item (`entity_table`, `entity_id`, contribution_id, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`)
+SELECT 'civicrm_participant', cp.id, cpp.contribution_id, cpfv.price_field_id, cpfv.label, 1, cpfv.amount, cpfv.amount as line_total, 0, cpfv.id, cpfv.financial_type_id FROM civicrm_participant cp LEFT JOIN civicrm_participant_payment cpp ON cpp.participant_id = cp.id
+LEFT JOIN civicrm_price_set_entity cpe ON cpe.entity_id = cp.event_id LEFT JOIN civicrm_price_field cpf ON cpf.price_set_id = cpe.price_set_id LEFT JOIN civicrm_price_field_value cpfv ON cpfv.price_field_id = cpf.id WHERE cpfv.label = cp.fee_level");
+  }
+
+  private function addMembershipPayment() {
+    $maxContribution = CRM_Core_DAO::singleValueQuery("select max(id) from civicrm_contribution");
+    $financialTypeID = CRM_Core_DAO::singleValueQuery("select id from civicrm_financial_type where name = 'Member Dues'");
+    $paymentInstrumentID = CRM_Core_DAO::singleValueQuery("select value from civicrm_option_value where name = 'Credit Card' AND option_group_id = (SELECT id from civicrm_option_group where name = 'payment_instrument')");
+    $sql = "INSERT INTO civicrm_contribution (contact_id,financial_type_id,payment_instrument_id, receive_date, total_amount, currency, source, contribution_status_id)
+SELECT  cm.contact_id, $financialTypeID, $paymentInstrumentID, now(), cmt.minimum_fee, 'USD', CONCAT(cmt.name, ' Membership: Offline signup'), 1 FROM `civicrm_membership` cm
+LEFT JOIN civicrm_membership_type cmt ON cmt.id = cm.membership_type_id;";
+
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_membership_payment (contribution_id,membership_id)
+SELECT cc.id, cm.id FROM civicrm_contribution cc
+LEFT JOIN civicrm_membership cm ON cm.contact_id = cc.contact_id
+WHERE cc.id > $maxContribution;";
+
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_line_item (entity_table, entity_id, contribution_id, price_field_value_id, price_field_id, label, qty, unit_price, line_total, financial_type_id)
+SELECT 'civicrm_membership', cm.id, cmp.contribution_id, cpfv.id, cpfv.price_field_id, cpfv.label, 1, cpfv.amount, cpfv.amount as unit_price, cpfv.financial_type_id FROM `civicrm_membership` cm
+LEFT JOIN civicrm_membership_payment cmp ON cmp.membership_id = cm.id
+LEFT JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cm.membership_type_id
+LEFT JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id
+LEFT JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id
+WHERE cps.name = 'default_membership_type_amount'";
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_activity(source_record_id, activity_type_id, subject, activity_date_time, status_id, details)
+SELECT id, 6, CONCAT('$ ', total_amount, ' - ', source), now(), 2, 'Membership Payment' FROM civicrm_contribution WHERE id > $maxContribution";
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type_id)
+SELECT c.contact_id, a.id, 2
+FROM   civicrm_contribution c, civicrm_activity a
+WHERE  c.id > $maxContribution
+AND    a.source_record_id = c.id
+AND    a.details = 'Membership Payment'
+";
+    $this->_query($sql);
+  }
+
+  private function addParticipantPayment() {
+    $maxContribution = CRM_Core_DAO::singleValueQuery("select max(id) from civicrm_contribution");
+    $financialTypeID = CRM_Core_DAO::singleValueQuery("select id from civicrm_financial_type where name = 'Event Fee'");
+    $paymentInstrumentID = CRM_Core_DAO::singleValueQuery("select value from civicrm_option_value where name = 'Credit Card' AND option_group_id = (SELECT id from civicrm_option_group where name = 'payment_instrument')");
+    $sql = "INSERT INTO civicrm_contribution (contact_id, financial_type_id, payment_instrument_id, receive_date, total_amount, currency, receipt_date, source, contribution_status_id)
+SELECT  `contact_id`, $financialTypeID, $paymentInstrumentID, now(), `fee_amount`, 'USD', now(), CONCAT(ce.title, ' : Offline registration'), 1  FROM `civicrm_participant` cp
+LEFT JOIN civicrm_event ce ON ce.id = cp.event_id
+group by `contact_id`, `fee_amount`, `title`;";
+
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_participant_payment (contribution_id,participant_id)
+SELECT cc.id, cp.id FROM civicrm_contribution cc
+LEFT JOIN civicrm_participant cp ON cp.contact_id = cc.contact_id
+WHERE cc.id > $maxContribution";
+
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_activity(source_record_id, activity_type_id, subject, activity_date_time, status_id, details)
+SELECT id, 6, CONCAT('$ ', total_amount, ' - ', source), now(), 2, 'Participant' FROM `civicrm_contribution` WHERE id > $maxContribution";
+    $this->_query($sql);
+
+    $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type_id)
+SELECT c.contact_id, a.id, 2
+FROM   civicrm_contribution c, civicrm_activity a
+WHERE  c.id > $maxContribution
+AND    a.source_record_id = c.id
+AND    a.details = 'Participant Payment'
+";
+    $this->_query($sql);
+  }
+
+}
diff --git a/sql/GenerateData.php b/sql/GenerateData.php
index dc52d9008d2a..afa8de67a85a 100644
--- a/sql/GenerateData.php
+++ b/sql/GenerateData.php
@@ -76,1929 +76,8 @@
 require_once 'CRM/Core/ClassLoader.php';
 CRM_Core_ClassLoader::singleton()->register();
 
-/**
- * Class CRM_GCD
- */
-class CRM_GCD {
-
-  /**
-   * Constants
-   */
-
-  // Set ADD_TO_DB = FALSE to do a dry run
-  const ADD_TO_DB = TRUE;
-
-  const DATA_FILENAME = "sample_data.xml";
-  const NUM_DOMAIN = 1;
-  const NUM_CONTACT = 200;
-  const INDIVIDUAL_PERCENT = 80;
-  const HOUSEHOLD_PERCENT = 10;
-  const ORGANIZATION_PERCENT = 10;
-  const NUM_INDIVIDUAL_PER_HOUSEHOLD = 4;
-  const NUM_ACTIVITY = 150;
-
-  // Location types from the table crm_location_type
-  const HOME = 1;
-  const WORK = 2;
-  const MAIN = 3;
-  const OTHER = 4;
-
-  /**
-   * Class constructor
-   */
-  public function __construct() {
-    // initialize all the vars
-    $this->numIndividual = self::INDIVIDUAL_PERCENT * self::NUM_CONTACT / 100;
-    $this->numHousehold = self::HOUSEHOLD_PERCENT * self::NUM_CONTACT / 100;
-    $this->numOrganization = self::ORGANIZATION_PERCENT * self::NUM_CONTACT / 100;
-    $this->numStrictIndividual = $this->numIndividual - ($this->numHousehold * self::NUM_INDIVIDUAL_PER_HOUSEHOLD);
-
-    // Parse data file
-    foreach ((array) simplexml_load_file(self::DATA_FILENAME) as $key => $val) {
-      $val = (array) $val;
-      $this->sampleData[$key] = (array) $val['item'];
-    }
-    // Init DB
-    $config = CRM_Core_Config::singleton();
-
-    // Relationship types indexed by name_a_b from the table civicrm_relationship_type
-    $this->relTypes = CRM_Utils_Array::index(array('name_a_b'), CRM_Core_PseudoConstant::relationshipType('name'));
-
-  }
-
-  /**
-   * Public wrapper for calling private "add" functions
-   * Provides user feedback
-   * @param $itemName
-   */
-  public function generate($itemName) {
-    echo "Generating $itemName\n";
-    $fn = "add$itemName";
-    $this->$fn();
-  }
-
-  /**
-   * this function creates arrays for the following
-   *
-   * domain id
-   * contact id
-   * contact_location id
-   * contact_contact_location id
-   * contact_email uuid
-   * contact_phone_uuid
-   * contact_instant_message uuid
-   * contact_relationship uuid
-   * contact_task uuid
-   * contact_note uuid
-   */
-  public function initID() {
-    // get the domain and contact id arrays
-    $this->domain = range(1, self::NUM_DOMAIN);
-    shuffle($this->domain);
-
-    // Get first contact id
-    $this->startCid = $cid = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_contact");
-    $this->contact = range($cid + 1, $cid + self::NUM_CONTACT);
-    shuffle($this->contact);
-
-    // get the individual, household  and organizaton contacts
-    $offset = 0;
-    $this->Individual = array_slice($this->contact, $offset, $this->numIndividual);
-    $offset += $this->numIndividual;
-    $this->Household = array_slice($this->contact, $offset, $this->numHousehold);
-    $offset += $this->numHousehold;
-    $this->Organization = array_slice($this->contact, $offset, $this->numOrganization);
-
-    // get the strict individual contacts (i.e individual contacts not belonging to any household)
-    $this->strictIndividual = array_slice($this->Individual, 0, $this->numStrictIndividual);
-
-    // get the household to individual mapping array
-    $this->householdIndividual = array_slice($this->Individual, $this->numStrictIndividual);
-    $this->householdIndividual = array_chunk($this->householdIndividual, self::NUM_INDIVIDUAL_PER_HOUSEHOLD);
-    $this->householdIndividual = array_combine($this->Household, $this->householdIndividual);
-  }
-
-  /*
-   * private members
-   *
-   */
-
-  /**
-   * enum's from database
-   * @var array
-   */
-  private $preferredCommunicationMethod = array('1', '2', '3', '4', '5');
-  private $contactType = array('Individual', 'Household', 'Organization');
-  private $phoneType = array('1', '2', '3', '4');
-
-  /**
-   * customizable enums (foreign keys)
-   * @var array
-   */
-  private $prefix = array(
-    // Female
-    1 => array(
-      1 => 'Mrs.',
-      2 => 'Ms.',
-      4 => 'Dr.',
-    ),
-    // Male
-    2 => array(
-      3 => 'Mr.',
-      4 => 'Dr.',
-    ),
-  );
-  /**
-   * @var array
-   */
-  private $suffix = array(1 => 'Jr.', 2 => 'Sr.', 3 => 'II', 4 => 'III');
-  private $gender = array(1 => 'female', 2 => 'male');
-
-  /**
-   * store domain id's
-   * @var array
-   */
-  private $domain = array();
-
-  /**
-   * store contact id's
-   * @var array
-   */
-  private $contact = array();
-  private $Individual = array();
-  private $Household = array();
-  private $Organization = array();
-
-  // store which contacts have a location entity
-  /**
-   * for automatic management of is_primary field
-   * @var array
-   */
-  private $location = array(
-    'Email' => array(),
-    'Phone' => array(),
-    'Address' => array(),
-  );
-
-  /**
-   * stores the strict individual id and household id to individual id mapping
-   * @var array
-   */
-  private $strictIndividual = array();
-  private $householdIndividual = array();
-  private $householdName = array();
-
-  /**
-   * sample data in xml format
-   * @var array
-   */
-  private $sampleData = array();
-
-  /**
-   * private vars
-   * @var array
-   */
-  private $startCid;
-  private $numIndividual = 0;
-  private $numHousehold = 0;
-  private $numOrganization = 0;
-  private $numStrictIndividual = 0;
-  private $stateMap = array();
-  private $states = array();
-
-  private $groupMembershipStatus = array('Added', 'Removed', 'Pending');
-  private $subscriptionHistoryMethod = array('Admin', 'Email');
-  private $deceasedContactIds = array();
-
-  /*********************************
-   * private methods
-   * *******************************
-   * @param int $size
-   * @return string
-   */
-
-  /**
-   * Get a randomly generated string.
-   *
-   * @param int $size
-   *
-   * @return string
-   */
-  private function randomString($size = 32) {
-    $string = "";
-
-    // get an ascii code for each character
-    for ($i = 0; $i < $size; $i++) {
-      $random_int = mt_rand(65, 122);
-      if (($random_int < 97) && ($random_int > 90)) {
-        // if ascii code between 90 and 97 substitute with space
-        $random_int = 32;
-      }
-      $random_char = chr($random_int);
-      $string .= $random_char;
-    }
-    return $string;
-  }
-
-  /**
-   * @return string
-   */
-  private function randomChar() {
-    return chr(mt_rand(65, 90));
-  }
-
-  /**
-   * Get a random item from the sample data or any other array
-   *
-   * @param $items (array or string) - if string, used as key for sample data, if array, used as data source
-   *
-   * @return mixed (element from array)
-   *
-   * @private
-   */
-  private function randomItem($items) {
-    if (!is_array($items)) {
-      $key = $items;
-      $items = $this->sampleData[$key];
-    }
-    if (!$items) {
-      echo "Error: no items found for '$key'\n";
-      return FALSE;
-    }
-    return $items[mt_rand(0, count($items) - 1)];
-  }
-
-  /**
-   * @param $items
-   *
-   * @return mixed
-   */
-  private function randomIndex($items) {
-    return $this->randomItem(array_keys($items));
-  }
-
-  /**
-   * @param $items
-   *
-   * @return array
-   */
-  private function randomKeyValue($items) {
-    $key = $this->randomIndex($items);
-    return array($key, $items[$key]);
-  }
-
-  /**
-   * @param $chance
-   *
-   * @return int
-   */
-  private function probability($chance) {
-    if (mt_rand(0, 100) < ($chance * 100)) {
-      return 1;
-    }
-    return 0;
-  }
-
-  /**
-   * Generate a random date.
-   *
-   *   If both $startDate and $endDate are defined generate
-   *   date between them.
-   *
-   *   If only startDate is specified then date generated is
-   *   between startDate + 1 year.
-   *
-   *   if only endDate is specified then date generated is
-   *   between endDate - 1 year.
-   *
-   *   if none are specified - date is between today - 1year
-   *   and today
-   *
-   * @param  int $startDate Start Date in Unix timestamp
-   * @param  int $endDate End Date in Unix timestamp
-   * @access private
-   *
-   * @return string randomly generated date in the format "Ymd"
-   *
-   */
-  private function randomDate($startDate = 0, $endDate = 0) {
-
-    // number of seconds per year
-    $numSecond = 31536000;
-    $dateFormat = "YmdHis";
-    $today = time();
-
-    // both are defined
-    if ($startDate && $endDate) {
-      return date($dateFormat, mt_rand($startDate, $endDate));
-    }
-
-    // only startDate is defined
-    if ($startDate) {
-      return date($dateFormat, mt_rand($startDate, $startDate + $numSecond));
-    }
-
-    // only endDate is defined
-    if ($startDate) {
-      return date($dateFormat, mt_rand($endDate - $numSecond, $endDate));
-    }
-
-    // none are defined
-    return date($dateFormat, mt_rand($today - $numSecond, $today));
-  }
-
-  /**
-   * Automatically manage the is_primary field by tracking which contacts have each item
-   * @param $cid
-   * @param $type
-   * @return int
-   */
-  private function isPrimary($cid, $type) {
-    if (empty($this->location[$type][$cid])) {
-      $this->location[$type][$cid] = TRUE;
-      return 1;
-    }
-    return 0;
-  }
-
-  /**
-   * Execute a query unless we are doing a dry run
-   * Note: this wrapper should not be used for SELECT queries
-   * @param $query
-   * @param array $params
-   * @return \CRM_Core_DAO
-   */
-  private function _query($query, $params = array()) {
-    if (self::ADD_TO_DB) {
-      return CRM_Core_DAO::executeQuery($query, $params);
-    }
-  }
-
-  /**
-   * Call dao insert method unless we are doing a dry run
-   * @param $dao
-   */
-  private function _insert(&$dao) {
-    if (self::ADD_TO_DB) {
-      if (!$dao->insert()) {
-        echo "ERROR INSERT: " . mysqli_error($dao->getConnection()->connection) . "\n";
-        print_r($dao);
-        exit(1);
-      }
-    }
-  }
-
-  /**
-   * Call dao update method unless we are doing a dry run
-   * @param $dao
-   */
-  private function _update(&$dao) {
-    if (self::ADD_TO_DB) {
-      if (!$dao->update()) {
-        echo "ERROR UPDATE: " . mysqli_error($dao->getConnection()->connection) . "\n";
-        print_r($dao);
-        exit(1);
-      }
-    }
-  }
-
-  /**
-   * Add core DAO object
-   * @param $type
-   * @param $params
-   */
-  private function _addDAO($type, $params) {
-    $daoName = "CRM_Core_DAO_$type";
-    $obj = new $daoName();
-    foreach ($params as $key => $value) {
-      $obj->$key = $value;
-    }
-    if (isset($this->location[$type])) {
-      $obj->is_primary = $this->isPrimary($params['contact_id'], $type);
-    }
-    $this->_insert($obj);
-  }
-
-  /**
-   * Fetch contact type based on stored mapping
-   * @param $id
-   * @return string $type
-   */
-  private function getContactType($id) {
-    foreach (array('Individual', 'Household', 'Organization') as $type) {
-      if (in_array($id, $this->$type)) {
-        return $type;
-      }
-    }
-  }
-
-  /**
-   * This method adds NUM_DOMAIN domains and then adds NUM_REVISION
-   * revisions for each domain with the latest revision being the last one..
-   */
-  private function addDomain() {
-
-    /* Add a location for domain 1 */
-
-    $domain = new CRM_Core_DAO_Domain();
-    for ($id = 2; $id <= self::NUM_DOMAIN; $id++) {
-      // domain name is pretty simple. it is "Domain $id"
-      $domain->name = "Domain $id";
-      $domain->description = "Description $id";
-      $domain->contact_name = $this->randomName();
-
-      // insert domain
-      $this->_insert($domain);
-    }
-  }
-
-  /**
-   * @return string
-   */
-  public function randomName() {
-    $first_name = $this->randomItem(($this->probability(.5) ? 'fe' : '') . 'male_name');
-    $middle_name = ucfirst($this->randomChar());
-    $last_name = $this->randomItem('last_name');
-    return "$first_name $middle_name. $last_name";
-  }
-
-  /**
-   * This method adds data to the contact table
-   *
-   * id - from $contact
-   * contact_type 'Individual' 'Household' 'Organization'
-   * preferred_communication (random 1 to 3)
-   */
-  private function addContact() {
-    $contact = new CRM_Contact_DAO_Contact();
-    $cid = $this->startCid;
-
-    for ($id = $cid + 1; $id <= $cid + self::NUM_CONTACT; $id++) {
-      $contact->contact_type = $this->getContactType($id);
-      $contact->do_not_phone = $this->probability(.2);
-      $contact->do_not_email = $this->probability(.2);
-      $contact->do_not_post = $this->probability(.2);
-      $contact->do_not_trade = $this->probability(.2);
-      $contact->preferred_communication_method = NULL;
-      if ($this->probability(.5)) {
-        $contact->preferred_communication_method = CRM_Core_DAO::VALUE_SEPARATOR . $this->randomItem($this->preferredCommunicationMethod) . CRM_Core_DAO::VALUE_SEPARATOR;
-      }
-      $contact->source = 'Sample Data';
-      $this->_insert($contact);
-    }
-  }
-
-  /**
-   * addIndividual()
-   *
-   * This method adds individual's data to the contact table
-   *
-   * The following fields are generated and added.
-   *
-   * contact_uuid - individual
-   * contact_rid - latest one
-   * first_name 'First Name $contact_uuid'
-   * middle_name 'Middle Name $contact_uuid'
-   * last_name 'Last Name $contact_uuid'
-   * job_title 'Job Title $contact_uuid'
-   *
-   */
-  private function addIndividual() {
-
-    $contact = new CRM_Contact_DAO_Contact();
-    $year = 60 * 60 * 24 * 365.25;
-    $now = time();
-
-    foreach ($this->Individual as $cid) {
-      $contact->is_deceased = $contact->gender_id = $contact->birth_date = $contact->deceased_date = $email = NULL;
-      list($gender_id, $gender) = $this->randomKeyValue($this->gender);
-      $birth_date = mt_rand($now - 90 * $year, $now - 10 * $year);
-
-      $contact->last_name = $this->randomItem('last_name');
-
-      // Manage household names
-      if (!in_array($contact->id, $this->strictIndividual)) {
-        // Find position in household
-        foreach ($this->householdIndividual as $householdId => $house) {
-          foreach ($house as $position => $memberId) {
-            if ($memberId == $cid) {
-              break 2;
-            }
-          }
-        }
-        // Head of household: set name
-        if (empty($this->householdName[$householdId])) {
-          $this->householdName[$householdId] = $contact->last_name;
-        }
-        // Kids get household name, spouse might get it
-        if ($position > 1 || $this->probability(.5)) {
-          $contact->last_name = $this->householdName[$householdId];
-        }
-        elseif ($this->householdName[$householdId] != $contact->last_name) {
-          // Spouse might hyphenate name
-          if ($this->probability(.5)) {
-            $contact->last_name .= '-' . $this->householdName[$householdId];
-          }
-          // Kids might hyphenate name
-          else {
-            $this->householdName[$householdId] .= '-' . $contact->last_name;
-          }
-        }
-        // Sensible ages and genders
-        $offset = mt_rand($now - 40 * $year, $now);
-        // Parents
-        if ($position < 2) {
-          $birth_date = mt_rand($offset - 35 * $year, $offset - 20 * $year);
-          if ($this->probability(.8)) {
-            $gender_id = 2 - $position;
-            $gender = $this->gender[$gender_id];
-          }
-        }
-        // Kids
-        else {
-          $birth_date = mt_rand($offset - 10 * $year, $offset);
-        }
-      }
-      // Non household people
-      else {
-        if ($this->probability(.6)) {
-          $this->_addAddress($cid);
-        }
-      }
-
-      $contact->first_name = $this->randomItem($gender . '_name');
-      $contact->middle_name = $this->probability(.5) ? '' : ucfirst($this->randomChar());
-      $age = intval(($now - $birth_date) / $year);
-
-      // Prefix and suffix by gender and age
-      $contact->prefix_id = $contact->suffix_id = $prefix = $suffix = NULL;
-      if ($this->probability(.5) && $age > 20) {
-        list($contact->prefix_id, $prefix) = $this->randomKeyValue($this->prefix[$gender_id]);
-        $prefix .= ' ';
-      }
-      if ($gender == 'male' && $this->probability(.50)) {
-        list($contact->suffix_id, $suffix) = $this->randomKeyValue($this->suffix);
-        $suffix = ' ' . $suffix;
-      }
-      if ($this->probability(.7)) {
-        $contact->gender_id = $gender_id;
-      }
-      if ($this->probability(.7)) {
-        $contact->birth_date = date("Ymd", $birth_date);
-      }
-
-      // Deceased probability based on age
-      if ($contact->gender_id && $contact->gender_id == 2) {
-        $checkAge = 64;
-      }
-      else {
-        $checkAge = 68;
-      }
-      if ($age > $checkAge && count($this->deceasedContactIds) < 4) {
-        $contact->is_deceased = $this->probability(($age - 30) / 100);
-        if ($contact->is_deceased && $this->probability(.7)) {
-          $contact->deceased_date = $this->randomDate();
-        }
-      }
-
-      // Add 0, 1 or 2 email address
-      $count = mt_rand(0, 2);
-      for ($i = 0; $i < $count; ++$i) {
-        $email = $this->_individualEmail($contact);
-        $this->_addEmail($cid, $email, self::HOME);
-      }
-
-      // Add 0, 1 or 2 phones
-      $count = mt_rand(0, 2);
-      for ($i = 0; $i < $count; ++$i) {
-        $this->_addPhone($cid);
-      }
-
-      // Occasionally you get contacts with just an email in the db
-      if ($this->probability(.2) && $email) {
-        $contact->first_name = $contact->last_name = $contact->middle_name = NULL;
-        $contact->is_deceased = $contact->gender_id = $contact->birth_date = $contact->deceased_date = NULL;
-        $contact->display_name = $contact->sort_name = $email;
-        $contact->postal_greeting_display = $contact->email_greeting_display = "Dear $email";
-      }
-      else {
-        $contact->display_name = $prefix . $contact->first_name . ' ' . $contact->last_name . $suffix;
-        $contact->sort_name = $contact->last_name . ', ' . $contact->first_name;
-        $contact->postal_greeting_display = $contact->email_greeting_display = 'Dear ' . $contact->first_name;
-      }
-      $contact->addressee_id = $contact->postal_greeting_id = $contact->email_greeting_id = 1;
-      $contact->addressee_display = $contact->display_name;
-      $contact->hash = crc32($contact->sort_name);
-      $contact->id = $cid;
-      $this->_update($contact);
-      if ($contact->is_deceased) {
-        $this->deceasedContactIds[] = $cid;
-      }
-    }
-  }
-
-  /**
-   * This method adds household's data to the contact table
-   *
-   * The following fields are generated and added.
-   *
-   * contact_uuid - household_individual
-   * contact_rid - latest one
-   * household_name 'household $contact_uuid primary contact $primary_contact_uuid'
-   * nick_name 'nick $contact_uuid'
-   * primary_contact_uuid = $household_individual[$contact_uuid][0];
-   *
-   */
-  private function addHousehold() {
-
-    $contact = new CRM_Contact_DAO_Contact();
-    foreach ($this->Household as $cid) {
-      // Add address
-      $this->_addAddress($cid);
-
-      $contact->id = $cid;
-      $contact->household_name = $this->householdName[$cid] . " family";
-      // need to update the sort name for the main contact table
-      $contact->display_name = $contact->sort_name = $contact->household_name;
-      $contact->postal_greeting_id = $contact->email_greeting_id = 5;
-      $contact->postal_greeting_display = $contact->email_greeting_display = 'Dear ' . $contact->household_name;
-      $contact->addressee_id = 2;
-      $contact->addressee_display = $contact->display_name;
-      $contact->hash = crc32($contact->sort_name);
-      $this->_update($contact);
-    }
-  }
-
-  /**
-   * This method adds organization data to the contact table
-   *
-   * The following fields are generated and added.
-   *
-   * contact_uuid - organization
-   * contact_rid - latest one
-   * organization_name 'organization $contact_uuid'
-   * legal_name 'legal  $contact_uuid'
-   * nick_name 'nick $contact_uuid'
-   * sic_code 'sic $contact_uuid'
-   * primary_contact_id - random individual contact uuid
-   *
-   */
-  private function addOrganization() {
-
-    $org = new CRM_Contact_DAO_Contact();
-    $employees = $this->Individual;
-    shuffle($employees);
-
-    foreach ($this->Organization as $key => $id) {
-      $org->primary_contact_id = $website = $email = NULL;
-      $org->id = $id;
-      $address = $this->_addAddress($id);
-
-      $namePre = $this->randomItem('organization_prefix');
-      $nameMid = $this->randomItem('organization_name');
-      $namePost = $this->randomItem('organization_suffix');
-
-      // Some orgs are named after their location
-      if ($this->probability(.7)) {
-        $place = $this->randomItem(array('city', 'street_name', 'state'));
-        $namePre = $address[$place];
-      }
-      $org->organization_name = "$namePre $nameMid $namePost";
-
-      // Most orgs have a website and email
-      if ($this->probability(.8)) {
-        $website = $this->_addWebsite($id, $org->organization_name);
-        $url = str_replace('http://', '', $website['url']);
-        $email = $this->randomItem('email_address') . '@' . $url;
-        $this->_addEmail($id, $email, self::MAIN);
-      }
-
-      // current employee
-      if ($this->probability(.8)) {
-        $indiv = new CRM_Contact_DAO_Contact();
-        $org->primary_contact_id = $indiv->id = $employees[$key];
-        $indiv->organization_name = $org->organization_name;
-        $indiv->employer_id = $id;
-        $this->_update($indiv);
-        // Share address with employee
-        if ($this->probability(.8)) {
-          $this->_addAddress($indiv->id, $id);
-        }
-        // Add work email for employee
-        if ($website) {
-          $indiv->find(TRUE);
-          $email = $this->_individualEmail($indiv, $url);
-          $this->_addEmail($indiv->id, $email, self::WORK);
-        }
-      }
-
-      // need to update the sort name for the main contact table
-      $org->display_name = $org->sort_name = $org->organization_name;
-      $org->addressee_id = 3;
-      $org->addressee_display = $org->display_name;
-      $org->hash = crc32($org->sort_name);
-      $this->_update($org);
-    }
-  }
-
-  /**
-   * This method adds data to the contact_relationship table
-   */
-  private function addRelationship() {
-
-    $relationship = new CRM_Contact_DAO_Relationship();
-
-    // Household relationships
-    foreach ($this->householdIndividual as $household_id => $household_member) {
-      // Default active
-      $relationship->is_active = 1;
-
-      // add child_of relationship for each child
-      $relationship->relationship_type_id = $this->relTypes['Child of']['id'];
-      foreach (array(0, 1) as $parent) {
-        foreach (array(2, 3) as $child) {
-          $relationship->contact_id_a = $household_member[$child];
-          $relationship->contact_id_b = $household_member[$parent];
-          $this->_insert($relationship);
-        }
-      }
-
-      // add sibling_of relationship
-      $relationship->relationship_type_id = $this->relTypes['Sibling of']['id'];
-      $relationship->contact_id_a = $household_member[3];
-      $relationship->contact_id_b = $household_member[2];
-      $this->_insert($relationship);
-
-      // add member_of_household relationships and shared address
-      $relationship->relationship_type_id = $this->relTypes['Household Member of']['id'];
-      $relationship->contact_id_b = $household_id;
-      for ($i = 1; $i < 4; ++$i) {
-        $relationship->contact_id_a = $household_member[$i];
-        $this->_insert($relationship);
-        $this->_addAddress($household_member[$i], $household_id);
-      }
-
-      // Divorced/separated couples - end relationship and different address
-      if ($this->probability(.4)) {
-        $relationship->is_active = 0;
-        $this->_addAddress($household_member[0]);
-      }
-      else {
-        $this->_addAddress($household_member[0], $household_id);
-      }
-
-      // add head_of_household relationship 1 for head of house
-      $relationship->relationship_type_id = $this->relTypes['Head of Household for']['id'];
-      $relationship->contact_id_a = $household_member[0];
-      $relationship->contact_id_b = $household_id;
-      $this->_insert($relationship);
-
-      // add spouse_of relationship 1 for both the spouses
-      $relationship->relationship_type_id = $this->relTypes['Spouse of']['id'];
-      $relationship->contact_id_a = $household_member[1];
-      $relationship->contact_id_b = $household_member[0];
-      $this->_insert($relationship);
-    }
-
-    // Add current employer relationships
-    $this->_query("INSERT INTO civicrm_relationship
-      (contact_id_a, contact_id_b, relationship_type_id, is_active)
-      (SELECT id, employer_id, " . $this->relTypes['Employee of']['id'] . ", 1 FROM civicrm_contact WHERE employer_id IN (" . implode(',', $this->Organization) . "))"
-    );
-  }
-
-  /**
-   * Create an address for a contact
-   *
-   * @param $cid int: contact id
-   * @param $masterContactId int: set if this is a shared address
-   *
-   * @return array
-   */
-  private function _addAddress($cid, $masterContactId = NULL) {
-
-    // Share existing address
-    if ($masterContactId) {
-      $dao = new CRM_Core_DAO_Address();
-      $dao->is_primary = 1;
-      $dao->contact_id = $masterContactId;
-      $dao->find(TRUE);
-      $dao->master_id = $dao->id;
-      $dao->id = NULL;
-      $dao->contact_id = $cid;
-      $dao->is_primary = $this->isPrimary($cid, 'Address');
-      $dao->location_type_id = $this->getContactType($masterContactId) == 'Organization' ? self::WORK : self::HOME;
-      $this->_insert($dao);
-    }
-
-    // Generate new address
-    else {
-      $params = array(
-        'contact_id' => $cid,
-        'location_type_id' => $this->getContactType($cid) == 'Organization' ? self::MAIN : self::HOME,
-        'street_number' => mt_rand(1, 1000),
-        'street_number_suffix' => ucfirst($this->randomChar()),
-        'street_name' => $this->randomItem('street_name'),
-        'street_type' => $this->randomItem('street_type'),
-        'street_number_postdirectional' => $this->randomItem('address_direction'),
-        'county_id' => 1,
-      );
-
-      $params['street_address'] = $params['street_number'] . $params['street_number_suffix'] . " " . $params['street_name'] . " " . $params['street_type'] . " " . $params['street_number_postdirectional'];
-
-      if ($params['location_type_id'] == self::MAIN) {
-        $params['supplemental_address_1'] = $this->randomItem('supplemental_addresses_1');
-      }
-
-      // Hack to add lat/long (limited to USA based addresses)
-      list(
-        $params['country_id'],
-        $params['state_province_id'],
-        $params['city'],
-        $params['postal_code'],
-        $params['geo_code_1'],
-        $params['geo_code_2'],
-        ) = $this->getZipCodeInfo();
-
-      $this->_addDAO('Address', $params);
-      $params['state'] = $this->states[$params['state_province_id']];
-      return $params;
-    }
-  }
-
-  /**
-   * Add a phone number for a contact
-   *
-   * @param $cid int: contact id
-   *
-   * @return array
-   */
-  private function _addPhone($cid) {
-    $area = $this->probability(.5) ? '' : mt_rand(201, 899);
-    $pre = mt_rand(201, 899);
-    $post = mt_rand(1000, 9999);
-    $params = array(
-      'location_type_id' => $this->getContactType($cid) == 'Organization' ? self::MAIN : self::HOME,
-      'contact_id' => $cid,
-      'phone' => ($area ? "($area) " : '') . "$pre-$post",
-      'phone_numeric' => $area . $pre . $post,
-      'phone_type_id' => mt_rand(1, 2),
-    );
-    $this->_addDAO('Phone', $params);
-    return $params;
-  }
-
-  /**
-   * Add an email for a contact
-   *
-   * @param $cid int: contact id
-   * @param $email
-   * @param $locationType
-   *
-   * @return array
-   */
-  private function _addEmail($cid, $email, $locationType) {
-    $params = array(
-      'location_type_id' => $locationType,
-      'contact_id' => $cid,
-      'email' => $email,
-    );
-    $this->_addDAO('Email', $params);
-    return $params;
-  }
-
-  /**
-   * Add a website based on organization name
-   * Using common naming patterns
-   *
-   * @param $cid int: contact id
-   * @param $name str: contact name
-   *
-   * @return array
-   */
-  private function _addWebsite($cid, $name) {
-    $part = array_pad(explode(' ', strtolower($name)), 3, '');
-    if (count($part) > 3) {
-      // Abbreviate the place name if it's two words
-      $domain = $part[0][0] . $part[1][0] . $part[2] . $part[3];
-    }
-    else {
-      // Common naming patterns
-      switch (mt_rand(1, 3)) {
-        case 1:
-          $domain = $part[0] . $part[1] . $part[2];
-          break;
-
-        case 2:
-          $domain = $part[0] . $part[1];
-          break;
-
-        case 3:
-          $domain = $part[0] . $part[2];
-          break;
-      }
-    }
-    $params = array(
-      'website_type_id' => 1,
-      'location_type_id' => self::MAIN,
-      'contact_id' => $cid,
-      'url' => "http://$domain.org",
-    );
-    $this->_addDAO('Website', $params);
-    return $params;
-  }
-
-  /**
-   * Create an email address based on a person's name
-   * Using common naming patterns
-   *
-   * @param $contact obj: individual contact record
-   * @param $domain str: supply a domain (i.e. for a work address)
-   *
-   * @return string
-   */
-  private function _individualEmail($contact, $domain = NULL) {
-    $first = $contact->first_name;
-    $last = $contact->last_name;
-    $f = $first[0];
-    $l = $last[0];
-    $m = $contact->middle_name ? $contact->middle_name[0] . '.' : '';
-    // Common naming patterns
-    switch (mt_rand(1, 6)) {
-      case 1:
-        $email = $first . $last;
-        break;
-
-      case 2:
-        $email = "$last.$first";
-        break;
-
-      case 3:
-        $email = $last . $f;
-        break;
-
-      case 4:
-        $email = $first . $l;
-        break;
-
-      case 5:
-        $email = "$last.$m$first";
-        break;
-
-      case 6:
-        $email = "$f$m$last";
-        break;
-    }
-    //to ensure we dont insert
-    //invalid characters in email
-    $email = preg_replace("([^a-zA-Z0-9_\.-]*)", "", $email);
-
-    // Some people have numbers in their address
-    if ($this->probability(.4)) {
-      $email .= mt_rand(1, 99);
-    }
-    // Generate random domain if not specified
-    if (!$domain) {
-      $domain = $this->randomItem('email_domain') . '.' . $this->randomItem('email_tld');
-    }
-    return strtolower($email) . '@' . $domain;
-  }
-
-  /**
-   * This method populates the civicrm_entity_tag table
-   */
-  private function addEntityTag() {
-
-    $entity_tag = new CRM_Core_DAO_EntityTag();
-
-    // add categories 1,2,3 for Organizations.
-    for ($i = 0; $i < $this->numOrganization; $i += 2) {
-      $org_id = $this->Organization[$i];
-      // echo "org_id = $org_id\n";
-      $entity_tag->entity_id = $this->Organization[$i];
-      $entity_tag->entity_table = 'civicrm_contact';
-      $entity_tag->tag_id = mt_rand(1, 3);
-      $this->_insert($entity_tag);
-    }
-
-    // add categories 4,5 for Individuals.
-    for ($i = 0; $i < $this->numIndividual; $i += 2) {
-      $entity_tag->entity_table = 'civicrm_contact';
-      $entity_tag->entity_id = $this->Individual[$i];
-      if (($entity_tag->entity_id) % 3) {
-        $entity_tag->tag_id = mt_rand(4, 5);
-        $this->_insert($entity_tag);
-      }
-      else {
-        // some of the individuals are in both categories (4 and 5).
-        $entity_tag->tag_id = 4;
-        $this->_insert($entity_tag);
-        $entity_tag->tag_id = 5;
-        $this->_insert($entity_tag);
-      }
-    }
-  }
-
-  /**
-   * This method populates the civicrm_group_contact table
-   */
-  private function addGroup() {
-    // add the 3 groups first
-    foreach ($this->sampleData['group'] as $groupName) {
-      $group = new CRM_Contact_BAO_Group();
-      $group->name = $group->title = $groupName;
-      $group->group_type = "
1
2
";
-      $group->visibility = 'Public Pages';
-      $group->is_active = 1;
-      $group->save();
-    }
-
-    // 60 are for newsletter
-    for ($i = 0; $i < 60; $i++) {
-      $groupContact = new CRM_Contact_DAO_GroupContact();
-      // newsletter subscribers
-      $groupContact->group_id = 2;
-      $groupContact->contact_id = $this->Individual[$i];
-      // always add members
-      $groupContact->status = 'Added';
-
-      $subscriptionHistory = new CRM_Contact_DAO_SubscriptionHistory();
-      $subscriptionHistory->contact_id = $groupContact->contact_id;
-
-      $subscriptionHistory->group_id = $groupContact->group_id;
-      $subscriptionHistory->status = $groupContact->status;
-      // method
-      $subscriptionHistory->method = $this->randomItem($this->subscriptionHistoryMethod);
-      $subscriptionHistory->date = $this->randomDate();
-      if ($groupContact->status != 'Pending') {
-        $this->_insert($groupContact);
-      }
-      $this->_insert($subscriptionHistory);
-    }
-
-    // 15 volunteers
-    for ($i = 0; $i < 15; $i++) {
-      $groupContact = new CRM_Contact_DAO_GroupContact();
-      // Volunteers
-      $groupContact->group_id = 3;
-      $groupContact->contact_id = $this->Individual[$i + 60];
-      // membership status
-      $groupContact->status = 'Added';
-
-      $subscriptionHistory = new CRM_Contact_DAO_SubscriptionHistory();
-      $subscriptionHistory->contact_id = $groupContact->contact_id;
-      $subscriptionHistory->group_id = $groupContact->group_id;
-      $subscriptionHistory->status = $groupContact->status;
-      // method
-      $subscriptionHistory->method = $this->randomItem($this->subscriptionHistoryMethod);
-      $subscriptionHistory->date = $this->randomDate();
-
-      if ($groupContact->status != 'Pending') {
-        $this->_insert($groupContact);
-      }
-      $this->_insert($subscriptionHistory);
-    }
-
-    // 8 advisory board group
-    for ($i = 0; $i < 8; $i++) {
-      $groupContact = new CRM_Contact_DAO_GroupContact();
-      // advisory board group
-      $groupContact->group_id = 4;
-      $groupContact->contact_id = $this->Individual[$i * 7];
-      // membership status
-      $groupContact->status = 'Added';
-
-      $subscriptionHistory = new CRM_Contact_DAO_SubscriptionHistory();
-      $subscriptionHistory->contact_id = $groupContact->contact_id;
-      $subscriptionHistory->group_id = $groupContact->group_id;
-      $subscriptionHistory->status = $groupContact->status;
-      // method
-      $subscriptionHistory->method = $this->randomItem($this->subscriptionHistoryMethod);
-      $subscriptionHistory->date = $this->randomDate();
-
-      if ($groupContact->status != 'Pending') {
-        $this->_insert($groupContact);
-      }
-      $this->_insert($subscriptionHistory);
-    }
-
-    //In this function when we add groups that time we are cache the contact fields
-    //But at the end of setup we are appending sample custom data, so for consistency
-    //reset the cache.
-    Civi::cache('fields')->flush();
-    CRM_Core_BAO_Cache::resetCaches();
-  }
-
-  /**
-   * This method populates the civicrm_note table
-   */
-  private function addNote() {
-    $params = array(
-      'entity_table' => 'civicrm_contact',
-      'contact_id' => 1,
-      'privacy' => 0,
-    );
-    for ($i = 0; $i < self::NUM_CONTACT; $i += 10) {
-      $params['entity_id'] = $this->randomItem($this->contact);
-      $params['note'] = $this->randomItem('note');
-      $params['modified_date'] = $this->randomDate();
-      $this->_addDAO('Note', $params);
-    }
-  }
-
-  /**
-   * This method populates the civicrm_activity_history table
-   */
-  private function addActivity() {
-    $contactDAO = new CRM_Contact_DAO_Contact();
-    $contactDAO->contact_type = 'Individual';
-    $contactDAO->selectAdd();
-    $contactDAO->selectAdd('id');
-    $contactDAO->orderBy('sort_name');
-    $contactDAO->find();
-
-    $count = 0;
-    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
-    while ($contactDAO->fetch()) {
-      if ($count++ > 2) {
-        break;
-      }
-      for ($i = 0; $i < self::NUM_ACTIVITY; $i++) {
-        $activityDAO = new CRM_Activity_DAO_Activity();
-        $activityId = CRM_Core_OptionGroup::values('activity_type', NULL, NULL, NULL, ' AND v.name IN ("Tell A Friend", "Pledge Acknowledgment")');
-        $activityTypeID = array_rand($activityId);
-        $activity = CRM_Core_PseudoConstant::activityType();
-        $activityDAO->activity_type_id = $activityTypeID;
-        $activityDAO->subject = "Subject for $activity[$activityTypeID]";
-        $activityDAO->activity_date_time = $this->randomDate();
-        $activityDAO->status_id = 2;
-        $this->_insert($activityDAO);
-
-        $activityContactDAO = new CRM_Activity_DAO_ActivityContact();
-        $activityContactDAO->activity_id = $activityDAO->id;
-        $activityContactDAO->contact_id = $contactDAO->id;
-        $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Source', $activityContacts);
-        $this->_insert($activityContactDAO);
-
-        if ($activityTypeID == 9) {
-          $activityContactDAO = new CRM_Activity_DAO_ActivityContact();
-          $activityContactDAO->activity_id = $activityDAO->id;
-          $activityContactDAO->contact_id = mt_rand(1, 101);
-          $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Targets', $activityContacts);
-          $this->_insert($activityContactDAO);
-        }
-      }
-    }
-  }
-
-  /**
-   * @return array
-   */
-  public function getZipCodeInfo() {
-
-    if (!$this->stateMap) {
-      $query = 'SELECT id, name, abbreviation from civicrm_state_province where country_id = 1228';
-      $dao = new CRM_Core_DAO();
-      $dao->query($query);
-      $this->stateMap = array();
-      while ($dao->fetch()) {
-        $this->stateMap[$dao->abbreviation] = $dao->id;
-        $this->states[$dao->id] = $dao->name;
-      }
-    }
-
-    static $zipCodes = NULL;
-    if ($zipCodes === NULL) {
-      $zipCodes = json_decode(file_get_contents(__DIR__ . '/zipcodes.json'));
-    }
-
-    $zipCode = $zipCodes[mt_rand(0, count($zipCodes))];
-
-    if ($this->stateMap[$zipCode->state]) {
-      $stateID = $this->stateMap[$zipCode->state];
-    }
-    else {
-      $stateID = 1004;
-    }
-
-    $zip = str_pad($zipCode->zip, 5, '0', STR_PAD_LEFT);
-    return array(1228, $stateID, $zipCode->city, $zip, $zipCode->latitude, $zipCode->longitude);
-  }
-
-  /**
-   * @param $zipCode
-   *
-   * @return array
-   */
-  public static function getLatLong($zipCode) {
-    $query = "http://maps.google.com/maps?q=$zipCode&output=js";
-    $userAgent = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en-US; rv:1.7.5) Gecko/20041107 Firefox/1.0";
-
-    $ch = curl_init();
-    curl_setopt($ch, CURLOPT_URL, $query);
-    curl_setopt($ch, CURLOPT_HEADER, FALSE);
-    curl_setopt($ch, CURLOPT_USERAGENT, $userAgent);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-    // grab URL and pass it to the browser
-    $outstr = curl_exec($ch);
-
-    // close CURL resource, and free up system resources
-    curl_close($ch);
-
-    $preg = "/'(<\?xml.+?)',/s";
-    preg_match($preg, $outstr, $matches);
-    if ($matches[1]) {
-      $xml = simplexml_load_string($matches[1]);
-      $attributes = $xml->center->attributes();
-      if (!empty($attributes)) {
-        return array((float ) $attributes['lat'], (float ) $attributes['lng']);
-      }
-    }
-    return array(NULL, NULL);
-  }
-
-  private function addMembershipType() {
-    $organizationDAO = new CRM_Contact_DAO_Contact();
-    $organizationDAO->id = 5;
-    $organizationDAO->find(TRUE);
-    $contact_id = $organizationDAO->contact_id;
-
-    $membershipType = "INSERT INTO civicrm_membership_type
-        (name, description, member_of_contact_id, financial_type_id, minimum_fee, duration_unit, duration_interval, period_type, fixed_period_start_day, fixed_period_rollover_day, relationship_type_id, relationship_direction, visibility, weight, is_active)
-        VALUES
-        ('General', 'Regular annual membership.', " . $contact_id . ", 2, 100, 'year', 1, 'rolling',null, null, 7, 'b_a', 'Public', 1, 1),
-        ('Student', 'Discount membership for full-time students.', " . $contact_id . ", 2, 50, 'year', 1, 'rolling', null, null, 7, 'b_a', 'Public', 2, 1),
-        ('Lifetime', 'Lifetime membership.', " . $contact_id . ", 2, 1200, 'lifetime', 1, 'rolling', null, null, 7, 'b_a', 'Admin', 3, 1);
-        ";
-    $this->_query($membershipType);
-  }
-
-  private function addMembership() {
-    $contact = new CRM_Contact_DAO_Contact();
-    $contact->query("SELECT id FROM civicrm_contact where contact_type = 'Individual'");
-    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
-    while ($contact->fetch()) {
-      $contacts[] = $contact->id;
-    }
-    shuffle($contacts);
-
-    $randomContacts = array_slice($contacts, 20, 30);
-
-    $sources = array('Payment', 'Donation', 'Check');
-    $membershipTypes = array(1, 2);
-    $membershipTypeNames = array('General', 'Student');
-    $statuses = array(3, 4);
-
-    $membership = "
-INSERT INTO civicrm_membership
-        (contact_id, membership_type_id, join_date, start_date, end_date, source, status_id)
-VALUES
-";
-
-    $activity = "
-INSERT INTO civicrm_activity
-        (source_record_id, activity_type_id, subject, activity_date_time, duration, location, phone_id, phone_number, details, priority_id,parent_id, is_test, status_id)
-VALUES
-";
-
-    $activityContact = "
-INSERT INTO civicrm_activity_contact
-  (activity_id, contact_id, record_type_id)
-VALUES
-";
-
-    $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity");
-    $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
-    foreach ($randomContacts as $count => $dontCare) {
-      $source = $this->randomItem($sources);
-      $activitySourceId = $count + 1;
-      $currentActivityID++;
-      $activityContact .= "( $currentActivityID, {$randomContacts[$count]}, {$sourceID} )";
-      if ((($count + 1) % 11 == 0)) {
-        // lifetime membership, status can be anything
-        $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y')));
-        $membership .= "( {$randomContacts[$count]}, 3, '{$startDate}', '{$startDate}', null, '{$source}', 1)";
-        $activity .= "( {$activitySourceId}, 7, 'Lifetime', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
-      }
-      elseif (($count + 1) % 5 == 0) {
-        // Grace or expired, memberhsip type is random of 1 & 2
-        $randIndex = array_rand($membershipTypes);
-        $membershipTypeId = $membershipTypes[$randIndex];
-        $membershipStatusId = $statuses[$randIndex];
-        $membershipTypeName = $membershipTypeNames[$randIndex];
-        $YearFactor = $membershipTypeId * 2;
-        //reverse the type and consider as year factor.
-        if ($YearFactor != 2) {
-          $YearFactor = 1;
-        }
-        $dateFactor = ($count * ($YearFactor) * ($YearFactor) * ($YearFactor));
-        $startDate = date('Y-m-d', mktime(0, 0, 0,
-          date('m'),
-          (date('d') - ($dateFactor)),
-          (date('Y') - ($YearFactor))
-        ));
-        $partOfDate = explode('-', $startDate);
-        $endDate = date('Y-m-d', mktime(0, 0, 0,
-          $partOfDate[1],
-          ($partOfDate[2] - 1),
-          ($partOfDate[0] + ($YearFactor))
-        ));
-
-        $membership .= "( {$randomContacts[$count]}, {$membershipTypeId}, '{$startDate}', '{$startDate}', '{$endDate}', '{$source}', {$membershipStatusId})";
-        $activity .= "( {$activitySourceId}, 7, '{$membershipTypeName}', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
-      }
-      elseif (($count + 1) % 2 == 0) {
-        // membership type 2
-        $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y')));
-        $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - ($count + 1)), (date('Y') + 1)));
-        $membership .= "( {$randomContacts[$count]}, 2, '{$startDate}', '{$startDate}', '{$endDate}', '{$source}', 1)";
-        $activity .= "( {$activitySourceId}, 7, 'Student', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
-      }
-      else {
-        // membership type 1
-        $startDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - $count), date('Y')));
-        $endDate = date('Y-m-d', mktime(0, 0, 0, date('m'), (date('d') - ($count + 1)), (date('Y') + 2)));
-        $membership .= "( {$randomContacts[$count]}, 1, '{$startDate}', '{$startDate}', '{$endDate}', '{$source}', 1)";
-        $activity .= "( {$activitySourceId}, 7, 'General', '{$startDate} 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )";
-      }
-
-      if ($count != 29) {
-        $membership .= ",";
-        $activity .= ",";
-        $activityContact .= ",";
-      }
-    }
-
-    $this->_query($membership);
-    $this->_query($activity);
-    $this->_query($activityContact);
-  }
-
-  /**
-   * @param $date
-   *
-   * @return string
-   */
-  public static function repairDate($date) {
-    $dropArray = array('-' => '', ':' => '', ' ' => '');
-    return strtr($date, $dropArray);
-  }
-
-  private function addMembershipLog() {
-    $membership = new CRM_Member_DAO_Membership();
-    $membership->query("SELECT id FROM civicrm_membership");
-    while ($membership->fetch()) {
-      $ids[] = $membership->id;
-    }
-    foreach ($ids as $id) {
-      $membership = new CRM_Member_DAO_Membership();
-      $membership->id = $id;
-      $membershipLog = new CRM_Member_DAO_MembershipLog();
-      if ($membership->find(TRUE)) {
-        $membershipLog->membership_id = $membership->id;
-        $membershipLog->status_id = $membership->status_id;
-        $membershipLog->start_date = self::repairDate($membership->start_date);
-        $membershipLog->end_date = self::repairDate($membership->end_date);
-        $membershipLog->modified_id = $membership->contact_id;
-        $membershipLog->modified_date = date("Ymd");
-        $membershipLog->membership_type_id = $membership->membership_type_id;
-        $membershipLog->save();
-      }
-      $membershipLog = NULL;
-    }
-  }
-
-  private function addEvent() {
-    $event = "INSERT INTO civicrm_address ( contact_id, location_type_id, is_primary, is_billing, street_address, street_number, street_number_suffix, street_number_predirectional, street_name, street_type, street_number_postdirectional, street_unit, supplemental_address_1, supplemental_address_2, supplemental_address_3, city, county_id, state_province_id, postal_code_suffix, postal_code, usps_adc, country_id, geo_code_1, geo_code_2, timezone)
-      VALUES
-      ( NULL, 1, 1, 1, '14S El Camino Way E', 14, 'S', NULL, 'El Camino', 'Way', NULL, NULL, NULL, NULL, NULL, 'Collinsville', NULL, 1006, NULL, '6022', NULL, 1228, 41.8328, -72.9253, NULL),
-      ( NULL, 1, 1, 1, '11B Woodbridge Path SW', 11, 'B', NULL, 'Woodbridge', 'Path', NULL, NULL, NULL, NULL, NULL, 'Dayton', NULL, 1034, NULL, '45417', NULL, 1228, 39.7531, -84.2471, NULL),
-      ( NULL, 1, 1, 1, '581O Lincoln Dr SW', 581, 'O', NULL, 'Lincoln', 'Dr', NULL, NULL, NULL, NULL, NULL, 'Santa Fe', NULL, 1030, NULL, '87594', NULL, 1228, 35.5212, -105.982, NULL)
-      ";
-    $this->_query($event);
-
-    $sql = "SELECT id from civicrm_address where street_address = '14S El Camino Way E'";
-    $eventAdd1 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_address where street_address = '11B Woodbridge Path SW'";
-    $eventAdd2 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_address where street_address = '581O Lincoln Dr SW'";
-    $eventAdd3 = CRM_Core_DAO::singleValueQuery($sql);
-
-    $event = "INSERT INTO civicrm_email (contact_id, location_type_id, email, is_primary, is_billing, on_hold, hold_date, reset_date)
-       VALUES
-       (NULL, 1, 'development@example.org', 0, 0, 0, NULL, NULL),
-       (NULL, 1, 'tournaments@example.org', 0, 0, 0, NULL, NULL),
-       (NULL, 1, 'celebration@example.org', 0, 0, 0, NULL, NULL)
-       ";
-    $this->_query($event);
-
-    $sql = "SELECT id from civicrm_email where email = 'development@example.org'";
-    $eventEmail1 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_email where email = 'tournaments@example.org'";
-    $eventEmail2 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_email where email = 'celebration@example.org'";
-    $eventEmail3 = CRM_Core_DAO::singleValueQuery($sql);
-
-    $event = "INSERT INTO civicrm_phone (contact_id, location_type_id, is_primary, is_billing, mobile_provider_id, phone, phone_numeric, phone_type_id)
-       VALUES
-       (NULL, 1, 0, 0, NULL, '204 222-1000', '2042221000', '1'),
-       (NULL, 1, 0, 0, NULL, '204 223-1000', '2042231000', '1'),
-       (NULL, 1, 0, 0, NULL, '303 323-1000', '3033231000', '1')
-       ";
-    $this->_query($event);
-
-    $sql = "SELECT id from civicrm_phone where phone = '204 222-1000'";
-    $eventPhone1 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_phone where phone = '204 223-1000'";
-    $eventPhone2 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_phone where phone = '303 323-1000'";
-    $eventPhone3 = CRM_Core_DAO::singleValueQuery($sql);
-
-    $event = "INSERT INTO civicrm_loc_block ( address_id, email_id, phone_id, address_2_id, email_2_id, phone_2_id)
-       VALUES
-      ( $eventAdd1, $eventEmail1, $eventPhone1, NULL,NULL,NULL),
-      ( $eventAdd2, $eventEmail2, $eventPhone2, NULL,NULL,NULL),
-      ( $eventAdd3, $eventEmail3, $eventPhone3, NULL,NULL,NULL)
-       ";
-
-    $this->_query($event);
-
-    $sql = "SELECT id from civicrm_loc_block where phone_id = $eventPhone1 AND email_id = $eventEmail1 AND address_id = $eventAdd1";
-    $eventLok1 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_loc_block where phone_id = $eventPhone2 AND email_id = $eventEmail2 AND address_id = $eventAdd2";
-    $eventLok2 = CRM_Core_DAO::singleValueQuery($sql);
-    $sql = "SELECT id from civicrm_loc_block where phone_id = $eventPhone3 AND email_id = $eventEmail3 AND address_id = $eventAdd3";
-    $eventLok3 = CRM_Core_DAO::singleValueQuery($sql);
-
-    $event = "INSERT INTO civicrm_event
-        ( title, summary, description, event_type_id, participant_listing_id, is_public, start_date, end_date, is_online_registration, registration_link_text, max_participants, event_full_text, is_monetary, financial_type_id, is_map, is_active, fee_label, is_show_location, loc_block_id,intro_text, footer_text, confirm_title, confirm_text, confirm_footer_text, is_email_confirm, confirm_email_text, confirm_from_name, confirm_from_email, cc_confirm, bcc_confirm, default_fee_id, thankyou_title, thankyou_text, thankyou_footer_text, is_pay_later, pay_later_text, pay_later_receipt, is_multiple_registrations, allow_same_participant_emails, currency )
-        VALUES
-        ( 'Fall Fundraiser Dinner', 'Kick up your heels at our Fall Fundraiser Dinner/Dance at Glen Echo Park! Come by yourself or bring a partner, friend or the entire family!', 'This event benefits our teen programs. Admission includes a full 3 course meal and wine or soft drinks. Grab your dancing shoes, bring the kids and come join the party!', 3, 1, 1, '" . date('Y-m-d 17:00:00', strtotime("+6 months")) . "', '" . date('Y-m-d 17:00:00', strtotime("+6 months +2 days")) . "', 1, 'Register Now', 100, 'Sorry! The Fall Fundraiser Dinner is full. Please call Jane at 204 222-1000 ext 33 if you want to be added to the waiting list.', 1, 4, 1, 1, 'Dinner Contribution', 1 ,$eventLok1,'Fill in the information below to join as at this wonderful dinner event.', NULL, 'Confirm Your Registration Information', 'Review the information below carefully.', NULL, 1, 'Contact the Development Department if you need to make any changes to your registration.', 'Fundraising Dept.', 'development@example.org', NULL, NULL, NULL, 'Thanks for Registering!', '<p>Thank you for your support. Your contribution will help us build even better tools.</p><p>Please tell your friends and colleagues about this wonderful event.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 1, 'I will send payment by check', 'Send a check payable to Our Organization within 3 business days to hold your reservation. Checks should be sent to: 100 Main St., Suite 3, San Francisco CA 94110', 1, 0, 'USD' ),
-        ( 'Summer Solstice Festival Day Concert', 'Festival Day is coming! Join us and help support your parks.', 'We will gather at noon, learn a song all together,  and then join in a joyous procession to the pavilion. We will be one of many groups performing at this wonderful concert which benefits our city parks.', 5, 1, 1, '" . date('Y-m-d 12:00:00', strtotime("-1 day")) . "', '" . date('Y-m-d 17:00:00', strtotime("-1 day")) . "', 1, 'Register Now', 50, 'We have all the singers we can handle. Come to the pavilion anyway and join in from the audience.', 1, 2, NULL, 1, 'Festival Fee', 1, $eventLok2, 'Complete the form below and click Continue to register online for the festival. Or you can register by calling us at 204 222-1000 ext 22.', '', 'Confirm Your Registration Information', '', '', 1, 'This email confirms your registration. If you have questions or need to change your registration - please do not hesitate to call us.', 'Event Dept.', 'events@example.org', '', NULL, NULL, 'Thanks for Your Joining In!', '<p>Thank you for your support. Your participation will help build new parks.</p><p>Please tell your friends and colleagues about the concert.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 1, 0, 'USD' ),
-        ( 'Rain-forest Cup Youth Soccer Tournament', 'Sign up your team to participate in this fun tournament which benefits several Rain-forest protection groups in the Amazon basin.', 'This is a FYSA Sanctioned Tournament, which is open to all USSF/FIFA affiliated organizations for boys and girls in age groups: U9-U10 (6v6), U11-U12 (8v8), and U13-U17 (Full Sided).', 3, 1, 1, '" . date('Y-m-d 07:00:00', strtotime("+7 months")) . "', '" . date('Y-m-d 17:00:00', strtotime("+7 months +3 days")) . "', 1, 'Register Now', 500, 'Sorry! All available team slots for this tournament have been filled. Contact Jill Futbol for information about the waiting list and next years event.', 1, 4, NULL, 1, 'Tournament Fees',1, $eventLok3, 'Complete the form below to register your team for this year''s tournament.', '<em>A Soccer Youth Event</em>', 'Review and Confirm Your Registration Information', '', '<em>A Soccer Youth Event</em>', 1, 'Contact our Tournament Director for eligibility details.', 'Tournament Director', 'tournament@example.org', '', NULL, NULL, 'Thanks for Your Support!', '<p>Thank you for your support. Your participation will help save thousands of acres of rainforest.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 0, 0, 'USD' )
-         ";
-    $this->_query($event);
-
-    //CRM-4464
-    $eventTemplates = "INSERT INTO civicrm_event
-        ( is_template, template_title, event_type_id, default_role_id, participant_listing_id, is_public, is_monetary, is_online_registration, is_multiple_registrations, allow_same_participant_emails, is_email_confirm, financial_type_id, fee_label, confirm_title, thankyou_title, confirm_from_name, confirm_from_email, is_active, currency )
-        VALUES
-        ( 1, 'Free Meeting without Online Registration', 4, 1, 1, 1, 0, 0, null, null, null, null,             null, null, null, null, null, 1, 'USD'  ),
-        ( 1, 'Free Meeting with Online Registration',    4, 1, 1, 1, 0, 1,    1,    1,    0, null,             null, 'Confirm Your Registration Information', 'Thanks for Registering!', null, null, 1, 'USD'  ),
-        ( 1, 'Paid Conference with Online Registration', 1, 1, 1, 1, 1, 1,    1,    1,    1,     4, 'Conference Fee', 'Confirm Your Registration Information', 'Thanks for Registering!', 'Event Template Dept.', 'event_templates@example.org', 1, 'USD' )";
-
-    $this->_query($eventTemplates);
-
-    $ufJoinValues = $tellFriendValues = array();
-    $profileID = CRM_Core_DAO::singleValueQuery("Select id from civicrm_uf_group where name ='event_registration'");
-
-    // grab id's for all events and event templates
-    $query = "
-SELECT  id
-  FROM  civicrm_event";
-
-    $template = CRM_Core_DAO::executeQuery($query);
-    while ($template->fetch()) {
-      if ($profileID) {
-        $ufJoinValues[] = "( 1, 'CiviEvent', 'civicrm_event', {$template->id}, 1, {$profileID} )";
-      }
-      $tellFriendValues[] = "( 'civicrm_event', {$template->id}, 'Tell A Friend', '<p>Help us spread the word about this event. Use the space below to personalize your email message - let your friends know why you''re attending. Then fill in the name(s) and email address(es) and click ''Send Your Message''.</p>', 'Thought you might be interested in checking out this event. I''m planning on attending.', NULL, 'Thanks for Spreading the Word', '<p>Thanks for spreading the word about this event to your friends.</p>', 1)";
-    }
-
-    //insert values in civicrm_uf_join for the required event_registration profile - CRM-9587
-    if (!empty($ufJoinValues)) {
-      $includeProfile = "INSERT INTO civicrm_uf_join
-                               (is_active, module, entity_table, entity_id, weight, uf_group_id )
-                               VALUES " . implode(',', $ufJoinValues);
-      $this->_query($includeProfile);
-    }
-
-    //insert values in civicrm_tell_friend
-    if (!empty($tellFriendValues)) {
-      $tellFriend = "INSERT INTO civicrm_tell_friend
-                           (entity_table, entity_id, title, intro, suggested_message,
-                           general_link,  thankyou_title, thankyou_text, is_active)
-                           VALUES " . implode(',', $tellFriendValues);
-      $this->_query($tellFriend);
-    }
-  }
-
-  private function addParticipant() {
-    $contact = new CRM_Contact_DAO_Contact();
-    $contact->query("SELECT id FROM civicrm_contact");
-    while ($contact->fetch()) {
-      $contacts[] = $contact->id;
-    }
-    shuffle($contacts);
-    $randomContacts = array_slice($contacts, 20, 50);
-
-    $participant = "
-INSERT INTO civicrm_participant
-        (contact_id, event_id, status_id, role_id, register_date, source, fee_level, is_test, fee_amount, fee_currency)
-VALUES
-        ( " . $randomContacts[0] . ", 1, 1, 1, '2009-01-21', 'Check', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[1] . ", 2, 2, 2, '2008-05-07', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[2] . ", 3, 3, 3, '2008-05-05', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD') ,
-        ( " . $randomContacts[3] . ", 1, 4, 4, '2008-10-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[4] . ", 2, 1, 1, '2008-01-10', 'Check', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[5] . ", 3, 2, 2, '2008-03-05', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[6] . ", 1, 3, 3, '2009-07-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[7] . ", 2, 4, 4, '2009-03-07', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[8] . ", 3, 1, 1, '2008-02-05', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[9] . ", 1, 2, 2, '2008-02-01', 'Check', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[10] . ", 2, 3, 3, '2009-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[11] . ", 3, 4, 4, '2009-03-06', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[12] . ", 1, 1, 2, '2008-06-04', 'Credit Card', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[13] . ", 2, 2, 3, '2008-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[14] . ", 3, 4, 1, '2008-07-04', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[15] . ", 1, 4, 2, '2009-01-21', 'Credit Card', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[16] . ", 2, 2, 3, '2008-01-10', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[17] . ", 3, 3, 1, '2009-03-05', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[18] . ", 1, 2, 1, '2008-10-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[19] . ", 2, 4, 1, '2009-01-10', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[20] . ", 3, 1, 4, '2008-03-25', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[21] . ", 1, 2, 3, '2009-10-21', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[22] . ", 2, 4, 1, '2008-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[23] . ", 3, 3, 1, '2008-03-11', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[24] . ", 3, 2, 2, '2008-04-05', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[25] . ", 1, 1, 1, '2009-01-21', 'Check', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[26] . ", 2, 2, 2, '2008-05-07', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[27] . ", 3, 3, 3, '2009-12-12', 'Direct Transfer', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[28] . ", 1, 4, 4, '2009-12-13', 'Credit Card', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[29] . ", 2, 1, 1, '2009-12-14', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[30] . ", 3, 2, 2, '2009-12-15', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[31] . ", 1, 3, 3, '2009-07-21', 'Check', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[32] . ", 2, 4, 4, '2009-03-07', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[33] . ", 3, 1, 1, '2009-12-15', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[34] . ", 1, 2, 2, '2009-12-13', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[35] . ", 2, 3, 3, '2009-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[36] . ", 3, 4, 4, '2009-03-06', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[37] . ", 1, 1, 2, '2009-12-13', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[38] . ", 2, 2, 3, '2008-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[39] . ", 3, 4, 1, '2009-12-14', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[40] . ", 1, 4, 2, '2009-01-21', 'Credit Card', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[41] . ", 2, 2, 3, '2009-12-15', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[42] . ", 3, 3, 1, '2009-03-05', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[43] . ", 1, 2, 1, '2009-12-13', 'Direct Transfer', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[44] . ", 2, 4, 1, '2009-01-10', 'Direct Transfer', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[45] . ", 3, 1, 4, '2009-12-13', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[46] . ", 1, 2, 3, '2009-10-21', 'Credit Card', 'Single', 0, 50, 'USD'),
-        ( " . $randomContacts[47] . ", 2, 4, 1, '2009-12-10', 'Credit Card', 'Soprano', 0, 50, 'USD'),
-        ( " . $randomContacts[48] . ", 3, 3, 1, '2009-03-11', 'Credit Card', 'Tiny-tots (ages 5-8)', 0, 800, 'USD'),
-        ( " . $randomContacts[49] . ", 3, 2, 2, '2009-04-05', 'Check', 'Tiny-tots (ages 5-8)', 0, 800, 'USD');
-";
-    $this->_query($participant);
-
-    $query = "
-INSERT INTO civicrm_activity
-    (source_record_id, activity_type_id, subject, activity_date_time, duration, location, phone_id, phone_number, details, priority_id,parent_id, is_test, status_id)
-VALUES
-    (01, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (02, 5, 'NULL', '2008-05-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (03, 5, 'NULL', '2008-05-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (04, 5, 'NULL', '2008-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (05, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (06, 5, 'NULL', '2008-03-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (07, 5, 'NULL', '2009-07-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (08, 5, 'NULL', '2009-03-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (09, 5, 'NULL', '2008-02-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (10, 5, 'NULL', '2008-02-01 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (11, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (12, 5, 'NULL', '2009-03-06 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (13, 5, 'NULL', '2008-06-04 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (14, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (15, 5, 'NULL', '2008-07-04 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (16, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (17, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (18, 5, 'NULL', '2009-03-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (19, 5, 'NULL', '2008-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (20, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (21, 5, 'NULL', '2008-03-25 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (22, 5, 'NULL', '2009-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (23, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (24, 5, 'NULL', '2008-03-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (25, 5, 'NULL', '2008-04-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (26, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (27, 5, 'NULL', '2008-05-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (28, 5, 'NULL', '2009-12-12 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (29, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (30, 5, 'NULL', '2009-12-14 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (31, 5, 'NULL', '2009-12-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (32, 5, 'NULL', '2009-07-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (33, 5, 'NULL', '2009-03-07 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (34, 5, 'NULL', '2009-12-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (35, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (36, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (37, 5, 'NULL', '2009-03-06 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (38, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (39, 5, 'NULL', '2008-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (40, 5, 'NULL', '2009-12-14 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (41, 5, 'NULL', '2009-01-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (42, 5, 'NULL', '2009-12-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (43, 5, 'NULL', '2009-03-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (44, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (45, 5, 'NULL', '2009-01-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (46, 5, 'NULL', '2009-12-13 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (47, 5, 'NULL', '2009-10-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (48, 5, 'NULL', '2009-12-10 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (49, 5, 'NULL', '2009-03-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (50, 5, 'NULL', '2009-04-05 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 )
-    ";
-    $this->_query($query);
-
-    $activityContact = "
-INSERT INTO civicrm_activity_contact
-  (contact_id, activity_id, record_type_id)
-VALUES
-";
-    $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
-    $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity");
-    $currentActivityID -= 50;
-    $sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
-    for ($i = 0; $i < 50; $i++) {
-      $currentActivityID++;
-      $activityContact .= "({$randomContacts[$i]}, $currentActivityID, $sourceID)";
-      if ($i != 49) {
-        $activityContact .= ", ";
-      }
-    }
-    $this->_query($activityContact);
-  }
-
-  private function addPCP() {
-    $query = "
-INSERT INTO `civicrm_pcp`
-    (contact_id, status_id, title, intro_text, page_text, donate_link_text, page_id, page_type, is_thermometer, is_honor_roll, goal_amount, currency, is_active, pcp_block_id, is_notify)
-VALUES
-    ({$this->Individual[3]}, 2, 'My Personal Civi Fundraiser', 'I''m on a mission to get all my friends and family to help support my favorite open-source civic sector CRM.', '<p>Friends and family - please help build much needed infrastructure for the civic sector by supporting my personal campaign!</p>\r\n<p><a href=\"https://civicrm.org\">You can learn more about CiviCRM here</a>.</p>\r\n<p>Then click the <strong>Contribute Now</strong> button to go to our easy-to-use online contribution form.</p>', 'Contribute Now', 1, 'contribute', 1, 1, 5000.00, 'USD', 1, 1, 1);
-";
-    $this->_query($query);
-  }
-
-  private function addContribution() {
-    $query = "
-INSERT INTO civicrm_contribution
-    (contact_id, financial_type_id, payment_instrument_id, receive_date, non_deductible_amount, total_amount, trxn_id, check_number, currency, cancel_date, cancel_reason, receipt_date, thankyou_date, source )
-VALUES
-    (2, 1, 4, '2010-04-11 00:00:00', 0.00, 125.00, NULL, '1041', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
-    (4, 1, 1, '2010-03-21 00:00:00', 0.00, 50.00, 'P20901X1', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Save the Penguins' ),
-    (6, 1, 4, '2010-04-29 00:00:00', 0.00, 25.00, NULL, '2095', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
-    (8, 1, 4, '2010-04-11 00:00:00', 0.00, 50.00, NULL, '10552', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
-    (16, 1, 4, '2010-04-15 00:00:00', 0.00, 500.00, NULL, '509', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
-    (19, 1, 4, '2010-04-11 00:00:00', 0.00, 175.00, NULL, '102', 'USD', NULL, NULL, NULL, NULL, 'Apr 2007 Mailer 1' ),
-    (82, 1, 1, '2010-03-27 00:00:00', 0.00, 50.00, 'P20193L2', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Save the Penguins' ),
-    (92, 1, 1, '2010-03-08 00:00:00', 0.00, 10.00, 'P40232Y3', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Help CiviCRM' ),
-    (34, 1, 1, '2010-04-22 00:00:00', 0.00, 250.00, 'P20193L6', NULL, 'USD', NULL, NULL, NULL, NULL, 'Online: Help CiviCRM' ),
-    (71, 1, 1, '2009-07-01 11:53:50', 0.00, 500.00, 'PL71', NULL, 'USD', NULL, NULL, NULL, NULL, NULL ),
-    (43, 1, 1, '2009-07-01 12:55:41', 0.00, 200.00, 'PL43II', NULL, 'USD', NULL, NULL, NULL, NULL, NULL ),
-    (32, 1, 1, '2009-10-01 11:53:50', 0.00, 200.00, 'PL32I', NULL, 'USD', NULL, NULL, NULL, NULL, NULL ),
-    (32, 1, 1, '2009-12-01 12:55:41', 0.00, 200.00, 'PL32II', NULL, 'USD', NULL, NULL, NULL, NULL, NULL );
-";
-    $this->_query($query);
-
-    $currentActivityID = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_activity");
-    $query = "
-INSERT INTO civicrm_activity
-    (source_record_id, activity_type_id, subject, activity_date_time, duration, location, phone_id, phone_number, details, priority_id,parent_id, is_test, status_id)
-VALUES
-    (1, 6, '$ 125.00-Apr 2007 Mailer 1', '2010-04-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (2, 6, '$ 50.00-Online: Save the Penguins', '2010-03-21 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (3, 6, '$ 25.00-Apr 2007 Mailer 1', '2010-04-29 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (4, 6, '$ 50.00-Apr 2007 Mailer 1', '2010-04-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (5, 6, '$ 500.00-Apr 2007 Mailer 1', '2010-04-15 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (6, 6, '$ 175.00-Apr 2007 Mailer 1', '2010-04-11 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (7, 6, '$ 50.00-Online: Save the Penguins', '2010-03-27 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (8, 6, '$ 10.00-Online: Save the Penguins', '2010-03-08 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (9, 6, '$ 250.00-Online: Save the Penguins', '2010-04-22 00:00:00', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (10, 6, NULL, '2009-07-01 11:53:50', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (11, 6, NULL, '2009-07-01 12:55:41', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (12, 6, NULL, '2009-10-01 11:53:50', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 ),
-    (13, 6, NULL, '2009-12-01 12:55:41', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2 );
-    ";
-    $this->_query($query);
-
-    $activityContact = "
-INSERT INTO civicrm_activity_contact
-  (contact_id, activity_id, record_type_id)
-VALUES
-";
-
-    $arbitraryNumbers = array(2, 4, 6, 8, 16, 19, 82, 92, 34, 71, 43, 32, 32);
-    for ($i = 0; $i < count($arbitraryNumbers); $i++) {
-      $currentActivityID++;
-      $activityContact .= "({$arbitraryNumbers[$i]}, $currentActivityID, 2)";
-      if ($i != count($arbitraryNumbers) - 1) {
-        $activityContact .= ", ";
-      }
-    }
-    $this->_query($activityContact);
-  }
-
-  private function addSoftContribution() {
-
-    $sql = "SELECT id from civicrm_contribution where contact_id = 92";
-    $contriId1 = CRM_Core_DAO::singleValueQuery($sql);
-
-    $sql = "SELECT id from civicrm_contribution where contact_id = 34";
-    $contriId2 = CRM_Core_DAO::singleValueQuery($sql);
-
-    $sql = "SELECT cov.value FROM civicrm_option_value cov LEFT JOIN civicrm_option_group cog ON cog.id = cov.option_group_id WHERE cov.name = 'pcp' AND cog.name = 'soft_credit_type'";
-
-    $pcpId = CRM_Core_DAO::singleValueQuery($sql);
-
-    $query = "
-INSERT INTO `civicrm_contribution_soft`
-      ( contribution_id, contact_id ,amount , currency, pcp_id , pcp_display_in_roll ,pcp_roll_nickname,pcp_personal_note, soft_credit_type_id )
-VALUES
-    ( $contriId1, {$this->Individual[3]}, 10.00, 'USD', 1, 1, 'Jones Family', 'Helping Hands', $pcpId),
-    ( $contriId2, {$this->Individual[3]}, 250.00, 'USD', 1, 1, 'Annie and the kids', 'Annie Helps', $pcpId);
- ";
-
-    $this->_query($query);
-  }
-
-  private function addPledge() {
-    $pledge = "INSERT INTO civicrm_pledge
-        (contact_id, financial_type_id, contribution_page_id, amount, original_installment_amount, currency,frequency_unit, frequency_interval, frequency_day, installments, start_date, create_date, acknowledge_date, modified_date, cancel_date, end_date, status_id, is_test)
-        VALUES
-       (71, 1, 1, 500.00, '500', 'USD', 'month', 1, 1, 1, '2009-07-01 00:00:00', '2009-06-26 00:00:00', NULL, NULL, NULL,'2009-07-01 00:00:00', 1, 0),
-       (43, 1, 1, 800.00, '200', 'USD', 'month', 3, 1, 4, '2009-07-01 00:00:00', '2009-06-23 00:00:00', '2009-06-23 00:00:00', NULL, NULL, '2009-04-01 10:11:40', 5, 0),
-       (32, 1, 1, 600.00, '200', 'USD', 'month', 1, 1, 3, '2009-10-01 00:00:00', '2009-09-14 00:00:00', '2009-09-14 00:00:00', NULL, NULL, '2009-12-01 00:00:00', 5, 0);
-";
-    $this->_query($pledge);
-  }
-
-  private function addPledgePayment() {
-    $pledgePayment = "INSERT INTO civicrm_pledge_payment
-        ( pledge_id, contribution_id, scheduled_amount, actual_amount, currency, scheduled_date, reminder_date, reminder_count, status_id)
-       VALUES
-         (1, 10, 500.00, 500.00, 'USD','2009-07-01 00:00:00', null, 0, 1 ),
-         (2, 11,   200.00, 200.00, 'USD','2009-07-01 00:00:00', null, 0,  1 ),
-         (2, null, 200.00, null, 'USD', '2009-10-01 00:00:00', null, 0,  2 ),
-         (2, null, 200.00, null, 'USD', '2009-01-01 00:00:00', null, 0,  2 ),
-         (2, null, 200.00, null, 'USD', '2009-04-01 00:00:00', null, 0,  2 ),
-
-         (3, 12,   200.00, 200.00, 'USD', '2009-10-01 00:00:00', null, 0, 1 ),
-         (3, 13,   200.00, 200.00, 'USD', '2009-11-01 00:0:00', '2009-10-28 00:00:00', 1, 1),
-         (3, null, 200.00, null, 'USD', '2009-12-01 00:00:00', null, 0, 2 );
-        ";
-    $this->_query($pledgePayment);
-  }
-
-  private function addContributionLineItem() {
-    $query = " INSERT INTO civicrm_line_item (`entity_table`, `entity_id`, contribution_id, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`)
-SELECT 'civicrm_contribution', cc.id, cc.id contribution_id, cpf.id as price_field, cpfv.label, 1, cc.total_amount, cc.total_amount line_total, 0, cpfv.id as price_field_value, cpfv.financial_type_id
-FROM civicrm_contribution cc
-LEFT JOIN civicrm_price_set cps ON cps.name = 'default_contribution_amount'
-LEFT JOIN civicrm_price_field cpf ON cpf.price_set_id = cps.id
-LEFT JOIN civicrm_price_field_value cpfv ON cpfv.price_field_id = cpf.id
-order by cc.id; ";
-    $this->_query($query);
-  }
-
-  private function addAccountingEntries() {
-    $components = array('contribution', 'membership', 'participant');
-    $select = 'SELECT contribution.id contribution_id, cli.id as line_item_id, contribution.contact_id, contribution.receive_date, contribution.total_amount, contribution.currency, cli.label,
-      cli.financial_type_id,  cefa.financial_account_id, contribution.payment_instrument_id, contribution.check_number, contribution.trxn_id';
-    $where = 'WHERE cefa.account_relationship = 1';
-    $financialAccountId = CRM_Financial_BAO_FinancialTypeAccount::getInstrumentFinancialAccount(4);
-    foreach ($components as $component) {
-      if ($component == 'contribution') {
-        $from = 'FROM `civicrm_contribution` contribution';
-      }
-      else {
-        $from = " FROM `civicrm_{$component}` {$component}
-          INNER JOIN civicrm_{$component}_payment cpp ON cpp.{$component}_id = {$component}.id
-          INNER JOIN civicrm_contribution contribution on contribution.id = cpp.contribution_id";
-      }
-      $from .= " INNER JOIN civicrm_line_item cli ON cli.entity_id = {$component}.id and cli.entity_table = 'civicrm_{$component}'
-        INNER JOIN civicrm_entity_financial_account cefa ON cefa.entity_id =  cli.financial_type_id ";
-      $sql = " {$select} {$from} {$where} ";
-      $result = CRM_Core_DAO::executeQuery($sql);
-      $this->addFinancialItem($result, $financialAccountId);
-    }
-  }
-
-  /**
-   * @param $result
-   * @param null $financialAccountId
-   */
-  private function addFinancialItem($result, $financialAccountId) {
-    $defaultFinancialAccount = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_financial_account WHERE is_default = 1 AND financial_account_type_id = 1");
-    while ($result->fetch()) {
-      $trxnParams = array(
-        'trxn_date' => CRM_Utils_Date::processDate($result->receive_date),
-        'total_amount' => $result->total_amount,
-        'currency' => $result->currency,
-        'status_id' => 1,
-        'trxn_id' => $result->trxn_id,
-        'contribution_id' => $result->contribution_id,
-        'to_financial_account_id' => empty($financialAccountId[$result->payment_instrument_id]) ? $defaultFinancialAccount : $financialAccountId[$result->payment_instrument_id],
-        'payment_instrument_id' => $result->payment_instrument_id,
-        'check_number' => $result->check_number,
-        'is_payment' => 1,
-      );
-      $trxn = CRM_Core_BAO_FinancialTrxn::create($trxnParams);
-      $financialItem = array(
-        'transaction_date' => CRM_Utils_Date::processDate($result->receive_date),
-        'amount' => $result->total_amount,
-        'currency' => $result->currency,
-        'status_id' => 1,
-        'entity_id' => $result->line_item_id,
-        'contact_id' => $result->contact_id,
-        'entity_table' => 'civicrm_line_item',
-        'description' => $result->label,
-        'financial_account_id' => $result->financial_account_id,
-      );
-      $trxnId['id'] = $trxn->id;
-      CRM_Financial_BAO_FinancialItem::create($financialItem, NULL, $trxnId);
-    }
-  }
-
-  private function addLineItemParticipants() {
-    $participant = new CRM_Event_DAO_Participant();
-    $participant->query("INSERT INTO civicrm_line_item (`entity_table`, `entity_id`, contribution_id, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`)
-SELECT 'civicrm_participant', cp.id, cpp.contribution_id, cpfv.price_field_id, cpfv.label, 1, cpfv.amount, cpfv.amount as line_total, 0, cpfv.id, cpfv.financial_type_id FROM civicrm_participant cp LEFT JOIN civicrm_participant_payment cpp ON cpp.participant_id = cp.id
-LEFT JOIN civicrm_price_set_entity cpe ON cpe.entity_id = cp.event_id LEFT JOIN civicrm_price_field cpf ON cpf.price_set_id = cpe.price_set_id LEFT JOIN civicrm_price_field_value cpfv ON cpfv.price_field_id = cpf.id WHERE cpfv.label = cp.fee_level");
-  }
-
-  private function addMembershipPayment() {
-    $maxContribution = CRM_Core_DAO::singleValueQuery("select max(id) from civicrm_contribution");
-    $financialTypeID = CRM_Core_DAO::singleValueQuery("select id from civicrm_financial_type where name = 'Member Dues'");
-    $paymentInstrumentID = CRM_Core_DAO::singleValueQuery("select value from civicrm_option_value where name = 'Credit Card' AND option_group_id = (SELECT id from civicrm_option_group where name = 'payment_instrument')");
-    $sql = "INSERT INTO civicrm_contribution (contact_id,financial_type_id,payment_instrument_id, receive_date, total_amount, currency, source, contribution_status_id)
-SELECT  cm.contact_id, $financialTypeID, $paymentInstrumentID, now(), cmt.minimum_fee, 'USD', CONCAT(cmt.name, ' Membership: Offline signup'), 1 FROM `civicrm_membership` cm
-LEFT JOIN civicrm_membership_type cmt ON cmt.id = cm.membership_type_id;";
-
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_membership_payment (contribution_id,membership_id)
-SELECT cc.id, cm.id FROM civicrm_contribution cc
-LEFT JOIN civicrm_membership cm ON cm.contact_id = cc.contact_id
-WHERE cc.id > $maxContribution;";
-
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_line_item (entity_table, entity_id, contribution_id, price_field_value_id, price_field_id, label, qty, unit_price, line_total, financial_type_id)
-SELECT 'civicrm_membership', cm.id, cmp.contribution_id, cpfv.id, cpfv.price_field_id, cpfv.label, 1, cpfv.amount, cpfv.amount as unit_price, cpfv.financial_type_id FROM `civicrm_membership` cm
-LEFT JOIN civicrm_membership_payment cmp ON cmp.membership_id = cm.id
-LEFT JOIN civicrm_price_field_value cpfv ON cpfv.membership_type_id = cm.membership_type_id
-LEFT JOIN civicrm_price_field cpf ON cpf.id = cpfv.price_field_id
-LEFT JOIN civicrm_price_set cps ON cps.id = cpf.price_set_id
-WHERE cps.name = 'default_membership_type_amount'";
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_activity(source_record_id, activity_type_id, subject, activity_date_time, status_id, details)
-SELECT id, 6, CONCAT('$ ', total_amount, ' - ', source), now(), 2, 'Membership Payment' FROM civicrm_contribution WHERE id > $maxContribution";
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type_id)
-SELECT c.contact_id, a.id, 2
-FROM   civicrm_contribution c, civicrm_activity a
-WHERE  c.id > $maxContribution
-AND    a.source_record_id = c.id
-AND    a.details = 'Membership Payment'
-";
-    $this->_query($sql);
-  }
-
-  private function addParticipantPayment() {
-    $maxContribution = CRM_Core_DAO::singleValueQuery("select max(id) from civicrm_contribution");
-    $financialTypeID = CRM_Core_DAO::singleValueQuery("select id from civicrm_financial_type where name = 'Event Fee'");
-    $paymentInstrumentID = CRM_Core_DAO::singleValueQuery("select value from civicrm_option_value where name = 'Credit Card' AND option_group_id = (SELECT id from civicrm_option_group where name = 'payment_instrument')");
-    $sql = "INSERT INTO civicrm_contribution (contact_id, financial_type_id, payment_instrument_id, receive_date, total_amount, currency, receipt_date, source, contribution_status_id)
-SELECT  `contact_id`, $financialTypeID, $paymentInstrumentID, now(), `fee_amount`, 'USD', now(), CONCAT(ce.title, ' : Offline registration'), 1  FROM `civicrm_participant` cp
-LEFT JOIN civicrm_event ce ON ce.id = cp.event_id
-group by `contact_id`, `fee_amount`, `title`;";
-
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_participant_payment (contribution_id,participant_id)
-SELECT cc.id, cp.id FROM civicrm_contribution cc
-LEFT JOIN civicrm_participant cp ON cp.contact_id = cc.contact_id
-WHERE cc.id > $maxContribution";
-
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_activity(source_record_id, activity_type_id, subject, activity_date_time, status_id, details)
-SELECT id, 6, CONCAT('$ ', total_amount, ' - ', source), now(), 2, 'Participant' FROM `civicrm_contribution` WHERE id > $maxContribution";
-    $this->_query($sql);
-
-    $sql = "INSERT INTO civicrm_activity_contact(contact_id, activity_id, record_type_id)
-SELECT c.contact_id, a.id, 2
-FROM   civicrm_contribution c, civicrm_activity a
-WHERE  c.id > $maxContribution
-AND    a.source_record_id = c.id
-AND    a.details = 'Participant Payment'
-";
-    $this->_query($sql);
-  }
-
-}
-
 echo ("Starting data generation on " . date("F dS h:i:s A") . "\n");
-$gcd = new CRM_GCD();
+$gcd = new CRM_Core_CodeGen_GenerateData();
 $gcd->initID();
 $gcd->generate('Domain');
 $gcd->generate('Contact');

From f04b3586a06ee505bfb11761219590cbfdc3e0e0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 11:48:49 +1200
Subject: [PATCH 633/834] Add check to ensure all have a primary address, fix
 identified but in IM.add

---
 CRM/Core/BAO/IM.php                         |   8 +-
 tests/phpunit/CRM/Export/BAO/ExportTest.php |   7 ++
 tests/phpunit/CiviTest/CiviUnitTestCase.php | 123 +++++++++++++++++++-
 3 files changed, 135 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/IM.php b/CRM/Core/BAO/IM.php
index 3a950122dd68..cdab960f6553 100644
--- a/CRM/Core/BAO/IM.php
+++ b/CRM/Core/BAO/IM.php
@@ -24,9 +24,15 @@ class CRM_Core_BAO_IM extends CRM_Core_DAO_IM {
    * Create or update IM record.
    *
    * @param array $params
-   * @return CRM_Core_DAO_IM
+   *
+   * @return \CRM_Core_DAO|\CRM_Core_DAO_IM
+   * @throws \CRM_Core_Exception
+   * @throws \API_Exception
    */
   public static function add($params) {
+    if (empty($params['id']) || is_numeric($params['is_primary'] ?? NULL)) {
+      CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
+    }
     return self::writeRecord($params);
   }
 
diff --git a/tests/phpunit/CRM/Export/BAO/ExportTest.php b/tests/phpunit/CRM/Export/BAO/ExportTest.php
index 3db128633f5b..7d21e3cfc09d 100644
--- a/tests/phpunit/CRM/Export/BAO/ExportTest.php
+++ b/tests/phpunit/CRM/Export/BAO/ExportTest.php
@@ -47,6 +47,13 @@ class CRM_Export_BAO_ExportTest extends CiviUnitTestCase {
 
   protected $locationTypes = [];
 
+  /**
+   * Should location types be checked to ensure primary addresses are correctly assigned after each test.
+   *
+   * @var bool
+   */
+  protected $isLocationTypesOnPostAssert = TRUE;
+
   /**
    * Processor generated in test.
    *
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 0930fb4f1e50..e2b1b4d65ea3 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -144,6 +144,13 @@ class CiviUnitTestCase extends PHPUnit\Framework\TestCase {
    */
   protected $isValidateFinancialsOnPostAssert = FALSE;
 
+  /**
+   * Should location types be checked to ensure primary addresses are correctly assigned after each test.
+   *
+   * @var bool
+   */
+  protected $isLocationTypesOnPostAssert = FALSE;
+
   /**
    * Class used for hooks during tests.
    *
@@ -495,6 +502,9 @@ protected function tearDown() {
    * @throws \CRM_Core_Exception
    */
   protected function assertPostConditions() {
+    if ($this->isLocationTypesOnPostAssert) {
+      $this->assertLocationValidity();
+    }
     if (!$this->isValidateFinancialsOnPostAssert) {
       return;
     }
@@ -3662,8 +3672,117 @@ public function createCase($clientId, $loggedInUser = NULL, $extra = NULL) {
       'activity_details' => '',
     ];
     $form = new CRM_Case_Form_Case();
-    $caseObj = $form->testSubmit($caseParams, "OpenCase", $loggedInUser, "standalone");
-    return $caseObj;
+    return $form->testSubmit($caseParams, 'OpenCase', $loggedInUser, 'standalone');
+  }
+
+  /**
+   * Validate that all location entities have exactly one primary.
+   *
+   * This query takes about 2 minutes on a DB with 10s of millions of contacts.
+   */
+  public function assertLocationValidity() {
+    $this->assertEquals(0, CRM_Core_DAO::singleValueQuery('SELECT COUNT(*) FROM
+
+(SELECT a1.contact_id
+FROM civicrm_address a1
+  LEFT JOIN civicrm_address a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE
+  a1.is_primary = 1
+  AND a2.id IS NOT NULL
+  AND a1.contact_id IS NOT NULL
+UNION
+SELECT a1.contact_id
+FROM civicrm_address a1
+       LEFT JOIN civicrm_address a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE a1.is_primary = 0
+  AND a2.id IS NULL
+  AND a1.contact_id IS NOT NULL
+
+UNION
+
+SELECT a1.contact_id
+FROM civicrm_email a1
+       LEFT JOIN civicrm_email a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE
+    a1.is_primary = 1
+  AND a2.id IS NOT NULL
+  AND a1.contact_id IS NOT NULL
+UNION
+SELECT a1.contact_id
+FROM civicrm_email a1
+       LEFT JOIN civicrm_email a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE a1.is_primary = 0
+  AND a2.id IS NULL
+  AND a1.contact_id IS NOT NULL
+
+UNION
+
+SELECT a1.contact_id
+FROM civicrm_phone a1
+       LEFT JOIN civicrm_phone a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE
+    a1.is_primary = 1
+  AND a2.id IS NOT NULL
+  AND a1.contact_id IS NOT NULL
+UNION
+SELECT a1.contact_id
+FROM civicrm_phone a1
+       LEFT JOIN civicrm_phone a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE a1.is_primary = 0
+  AND a2.id IS NULL
+  AND a1.contact_id IS NOT NULL
+
+UNION
+
+SELECT a1.contact_id
+FROM civicrm_im a1
+       LEFT JOIN civicrm_im a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE
+    a1.is_primary = 1
+  AND a2.id IS NOT NULL
+  AND a1.contact_id IS NOT NULL
+UNION
+SELECT a1.contact_id
+FROM civicrm_im a1
+       LEFT JOIN civicrm_im a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE a1.is_primary = 0
+  AND a2.id IS NULL
+  AND a1.contact_id IS NOT NULL
+
+UNION
+
+SELECT a1.contact_id
+FROM civicrm_openid a1
+       LEFT JOIN civicrm_openid a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE (a1.is_primary = 1 AND a2.id IS NOT NULL)
+UNION
+
+SELECT a1.contact_id
+FROM civicrm_openid a1
+       LEFT JOIN civicrm_openid a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE
+    a1.is_primary = 1
+  AND a2.id IS NOT NULL
+  AND a1.contact_id IS NOT NULL
+UNION
+SELECT a1.contact_id
+FROM civicrm_openid a1
+       LEFT JOIN civicrm_openid a2 ON a1.id <> a2.id AND a2.is_primary = 1
+  AND a1.contact_id = a2.contact_id
+WHERE a1.is_primary = 0
+  AND a2.id IS NULL
+  AND a1.contact_id IS NOT NULL) as primary_descrepancies
+    '));
   }
 
 }

From 0a02f094b527879c5e4d0a0d6ab183a709b05003 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 22:31:05 +1200
Subject: [PATCH 634/834] Remove deprecated code lines

---
 CRM/Core/BAO/Email.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index 0dd1bca05a49..4de9573d6331 100644
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -54,10 +54,6 @@ public static function add(&$params) {
     $hook = empty($params['id']) ? 'create' : 'edit';
     CRM_Utils_Hook::pre($hook, 'Email', CRM_Utils_Array::value('id', $params), $params);
 
-    if (isset($params['is_bulkmail']) && $params['is_bulkmail'] === 'null') {
-      CRM_Core_Error::deprecatedFunctionWarning('It is not valid to set bulkmail to null, it is boolean');
-      $params['bulkmail'] = 0;
-    }
     $email = new CRM_Core_DAO_Email();
     $email->copyValues($params);
     if (!empty($email->email)) {

From d94d506c394c2c3ea8f0f52fabeefae69bcafdcd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 00:58:19 -0700
Subject: [PATCH 635/834] (REF) Extract `CRM_Core_CodeGen_GenerateData` - Fix
 path reference

When this class moved to a new folder, the relative paths changed.
---
 CRM/Core/CodeGen/GenerateData.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 5e8ea032e343..7f47b64c6a7b 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -35,7 +35,7 @@ public function __construct() {
     $this->numStrictIndividual = $this->numIndividual - ($this->numHousehold * self::NUM_INDIVIDUAL_PER_HOUSEHOLD);
 
     // Parse data file
-    foreach ((array) simplexml_load_file(self::DATA_FILENAME) as $key => $val) {
+    foreach ((array) simplexml_load_file(self::getCivicrmDir() . '/sql/' . self::DATA_FILENAME) as $key => $val) {
       $val = (array) $val;
       $this->sampleData[$key] = (array) $val['item'];
     }
@@ -1190,7 +1190,7 @@ public function getZipCodeInfo() {
 
     static $zipCodes = NULL;
     if ($zipCodes === NULL) {
-      $zipCodes = json_decode(file_get_contents(__DIR__ . '/zipcodes.json'));
+      $zipCodes = json_decode(file_get_contents(self::getCivicrmDir() . '/sql/zipcodes.json'));
     }
 
     $zipCode = $zipCodes[mt_rand(0, count($zipCodes))];
@@ -1916,4 +1916,11 @@ private function addParticipantPayment() {
     $this->_query($sql);
   }
 
+  /**
+   * @return string
+   */
+  protected static function getCivicrmDir():string {
+    return dirname(dirname(dirname(__DIR__)));
+  }
+
 }

From 38cdbfc7a6507fd346e28b05da1d53ea996bf94e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 00:25:18 -0700
Subject: [PATCH 636/834] (REF) GenerateData - Extract method 'randomInt()'

This it easier to have one random number generator used for all 'randomFoo()' functions.
---
 CRM/Core/CodeGen/GenerateData.php | 67 ++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 7f47b64c6a7b..8ad5fdedf66c 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -194,10 +194,21 @@ public function initID() {
   /*********************************
    * private methods
    * *******************************
-   * @param int $size
-   * @return string
    */
 
+  /**
+   * Random number generator.
+   *
+   * All other random() functions should derive from this.
+   *
+   * @param int $min
+   * @param int $max
+   * @return int
+   */
+  private function randomInt($min, $max) {
+    return mt_rand($min, $max);
+  }
+
   /**
    * Get a randomly generated string.
    *
@@ -210,7 +221,7 @@ private function randomString($size = 32) {
 
     // get an ascii code for each character
     for ($i = 0; $i < $size; $i++) {
-      $random_int = mt_rand(65, 122);
+      $random_int = $this->randomInt(65, 122);
       if (($random_int < 97) && ($random_int > 90)) {
         // if ascii code between 90 and 97 substitute with space
         $random_int = 32;
@@ -225,7 +236,7 @@ private function randomString($size = 32) {
    * @return string
    */
   private function randomChar() {
-    return chr(mt_rand(65, 90));
+    return chr($this->randomInt(65, 90));
   }
 
   /**
@@ -246,7 +257,7 @@ private function randomItem($items) {
       echo "Error: no items found for '$key'\n";
       return FALSE;
     }
-    return $items[mt_rand(0, count($items) - 1)];
+    return $items[$this->randomInt(0, count($items) - 1)];
   }
 
   /**
@@ -274,7 +285,7 @@ private function randomKeyValue($items) {
    * @return int
    */
   private function probability($chance) {
-    if (mt_rand(0, 100) < ($chance * 100)) {
+    if ($this->randomInt(0, 100) < ($chance * 100)) {
       return 1;
     }
     return 0;
@@ -311,21 +322,21 @@ private function randomDate($startDate = 0, $endDate = 0) {
 
     // both are defined
     if ($startDate && $endDate) {
-      return date($dateFormat, mt_rand($startDate, $endDate));
+      return date($dateFormat, $this->randomInt($startDate, $endDate));
     }
 
     // only startDate is defined
     if ($startDate) {
-      return date($dateFormat, mt_rand($startDate, $startDate + $numSecond));
+      return date($dateFormat, $this->randomInt($startDate, $startDate + $numSecond));
     }
 
     // only endDate is defined
     if ($startDate) {
-      return date($dateFormat, mt_rand($endDate - $numSecond, $endDate));
+      return date($dateFormat, $this->randomInt($endDate - $numSecond, $endDate));
     }
 
     // none are defined
-    return date($dateFormat, mt_rand($today - $numSecond, $today));
+    return date($dateFormat, $this->randomInt($today - $numSecond, $today));
   }
 
   /**
@@ -493,7 +504,7 @@ private function addIndividual() {
     foreach ($this->Individual as $cid) {
       $contact->is_deceased = $contact->gender_id = $contact->birth_date = $contact->deceased_date = $email = NULL;
       list($gender_id, $gender) = $this->randomKeyValue($this->gender);
-      $birth_date = mt_rand($now - 90 * $year, $now - 10 * $year);
+      $birth_date = $this->randomInt($now - 90 * $year, $now - 10 * $year);
 
       $contact->last_name = $this->randomItem('last_name');
 
@@ -526,10 +537,10 @@ private function addIndividual() {
           }
         }
         // Sensible ages and genders
-        $offset = mt_rand($now - 40 * $year, $now);
+        $offset = $this->randomInt($now - 40 * $year, $now);
         // Parents
         if ($position < 2) {
-          $birth_date = mt_rand($offset - 35 * $year, $offset - 20 * $year);
+          $birth_date = $this->randomInt($offset - 35 * $year, $offset - 20 * $year);
           if ($this->probability(.8)) {
             $gender_id = 2 - $position;
             $gender = $this->gender[$gender_id];
@@ -537,7 +548,7 @@ private function addIndividual() {
         }
         // Kids
         else {
-          $birth_date = mt_rand($offset - 10 * $year, $offset);
+          $birth_date = $this->randomInt($offset - 10 * $year, $offset);
         }
       }
       // Non household people
@@ -583,14 +594,14 @@ private function addIndividual() {
       }
 
       // Add 0, 1 or 2 email address
-      $count = mt_rand(0, 2);
+      $count = $this->randomInt(0, 2);
       for ($i = 0; $i < $count; ++$i) {
         $email = $this->_individualEmail($contact);
         $this->_addEmail($cid, $email, self::HOME);
       }
 
       // Add 0, 1 or 2 phones
-      $count = mt_rand(0, 2);
+      $count = $this->randomInt(0, 2);
       for ($i = 0; $i < $count; ++$i) {
         $this->_addPhone($cid);
       }
@@ -817,7 +828,7 @@ private function _addAddress($cid, $masterContactId = NULL) {
       $params = array(
         'contact_id' => $cid,
         'location_type_id' => $this->getContactType($cid) == 'Organization' ? self::MAIN : self::HOME,
-        'street_number' => mt_rand(1, 1000),
+        'street_number' => $this->randomInt(1, 1000),
         'street_number_suffix' => ucfirst($this->randomChar()),
         'street_name' => $this->randomItem('street_name'),
         'street_type' => $this->randomItem('street_type'),
@@ -855,15 +866,15 @@ private function _addAddress($cid, $masterContactId = NULL) {
    * @return array
    */
   private function _addPhone($cid) {
-    $area = $this->probability(.5) ? '' : mt_rand(201, 899);
-    $pre = mt_rand(201, 899);
-    $post = mt_rand(1000, 9999);
+    $area = $this->probability(.5) ? '' : $this->randomInt(201, 899);
+    $pre = $this->randomInt(201, 899);
+    $post = $this->randomInt(1000, 9999);
     $params = array(
       'location_type_id' => $this->getContactType($cid) == 'Organization' ? self::MAIN : self::HOME,
       'contact_id' => $cid,
       'phone' => ($area ? "($area) " : '') . "$pre-$post",
       'phone_numeric' => $area . $pre . $post,
-      'phone_type_id' => mt_rand(1, 2),
+      'phone_type_id' => $this->randomInt(1, 2),
     );
     $this->_addDAO('Phone', $params);
     return $params;
@@ -905,7 +916,7 @@ private function _addWebsite($cid, $name) {
     }
     else {
       // Common naming patterns
-      switch (mt_rand(1, 3)) {
+      switch ($this->randomInt(1, 3)) {
         case 1:
           $domain = $part[0] . $part[1] . $part[2];
           break;
@@ -945,7 +956,7 @@ private function _individualEmail($contact, $domain = NULL) {
     $l = $last[0];
     $m = $contact->middle_name ? $contact->middle_name[0] . '.' : '';
     // Common naming patterns
-    switch (mt_rand(1, 6)) {
+    switch ($this->randomInt(1, 6)) {
       case 1:
         $email = $first . $last;
         break;
@@ -976,7 +987,7 @@ private function _individualEmail($contact, $domain = NULL) {
 
     // Some people have numbers in their address
     if ($this->probability(.4)) {
-      $email .= mt_rand(1, 99);
+      $email .= $this->randomInt(1, 99);
     }
     // Generate random domain if not specified
     if (!$domain) {
@@ -998,7 +1009,7 @@ private function addEntityTag() {
       // echo "org_id = $org_id\n";
       $entity_tag->entity_id = $this->Organization[$i];
       $entity_tag->entity_table = 'civicrm_contact';
-      $entity_tag->tag_id = mt_rand(1, 3);
+      $entity_tag->tag_id = $this->randomInt(1, 3);
       $this->_insert($entity_tag);
     }
 
@@ -1007,7 +1018,7 @@ private function addEntityTag() {
       $entity_tag->entity_table = 'civicrm_contact';
       $entity_tag->entity_id = $this->Individual[$i];
       if (($entity_tag->entity_id) % 3) {
-        $entity_tag->tag_id = mt_rand(4, 5);
+        $entity_tag->tag_id = $this->randomInt(4, 5);
         $this->_insert($entity_tag);
       }
       else {
@@ -1164,7 +1175,7 @@ private function addActivity() {
         if ($activityTypeID == 9) {
           $activityContactDAO = new CRM_Activity_DAO_ActivityContact();
           $activityContactDAO->activity_id = $activityDAO->id;
-          $activityContactDAO->contact_id = mt_rand(1, 101);
+          $activityContactDAO->contact_id = $this->randomInt(1, 101);
           $activityContactDAO->record_type_id = CRM_Utils_Array::key('Activity Targets', $activityContacts);
           $this->_insert($activityContactDAO);
         }
@@ -1193,7 +1204,7 @@ public function getZipCodeInfo() {
       $zipCodes = json_decode(file_get_contents(self::getCivicrmDir() . '/sql/zipcodes.json'));
     }
 
-    $zipCode = $zipCodes[mt_rand(0, count($zipCodes))];
+    $zipCode = $zipCodes[$this->randomInt(0, count($zipCodes))];
 
     if ($this->stateMap[$zipCode->state]) {
       $stateID = $this->stateMap[$zipCode->state];

From 849e0b9760d4762ad2c8820b70a863a5fa4c5785 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 00:30:56 -0700
Subject: [PATCH 637/834] GenerateData - Make the generated sample data more
 stable (wrt mt_rand)

---
 CRM/Core/CodeGen/GenerateData.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 8ad5fdedf66c..74e0a4d41a9d 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -27,8 +27,9 @@ class CRM_Core_CodeGen_GenerateData {
   /**
    * Class constructor
    */
-  public function __construct() {
+  public function __construct($seed = '123456789') {
     // initialize all the vars
+    $this->seed = $seed;
     $this->numIndividual = self::INDIVIDUAL_PERCENT * self::NUM_CONTACT / 100;
     $this->numHousehold = self::HOUSEHOLD_PERCENT * self::NUM_CONTACT / 100;
     $this->numOrganization = self::ORGANIZATION_PERCENT * self::NUM_CONTACT / 100;
@@ -104,6 +105,11 @@ public function initID() {
    *
    */
 
+  /**
+   * @var int
+   */
+  private $seed;
+
   /**
    * enum's from database
    * @var array
@@ -201,12 +207,17 @@ public function initID() {
    *
    * All other random() functions should derive from this.
    *
+   * This is very weak RNG. The goal is to provide a reproducible sequence of
+   * random-ish values for generating dummy-data.
+   *
    * @param int $min
    * @param int $max
    * @return int
    */
   private function randomInt($min, $max) {
-    return mt_rand($min, $max);
+    $range = min(1 + $max - $min, mt_getrandmax());
+    $this->seed = md5($this->seed . chr(0) . $min . chr(0) . $max);
+    return $min + (hexdec(substr($this->seed, 20, 8)) % $range);
   }
 
   /**

From 82d3248201e0ddf6bc5a2e3e20baff39e8c0272b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 02:27:15 -0700
Subject: [PATCH 638/834] GenerateData - Make the generated sample data more
 stable (wrt time)

---
 CRM/Core/CodeGen/GenerateData.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 74e0a4d41a9d..75cc3348daeb 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -30,6 +30,7 @@ class CRM_Core_CodeGen_GenerateData {
   public function __construct($seed = '123456789') {
     // initialize all the vars
     $this->seed = $seed;
+    $this->time = strtotime(date('Y') . '-01-01 02:03:04');
     $this->numIndividual = self::INDIVIDUAL_PERCENT * self::NUM_CONTACT / 100;
     $this->numHousehold = self::HOUSEHOLD_PERCENT * self::NUM_CONTACT / 100;
     $this->numOrganization = self::ORGANIZATION_PERCENT * self::NUM_CONTACT / 100;
@@ -329,7 +330,7 @@ private function randomDate($startDate = 0, $endDate = 0) {
     // number of seconds per year
     $numSecond = 31536000;
     $dateFormat = "YmdHis";
-    $today = time();
+    $today = $this->time;
 
     // both are defined
     if ($startDate && $endDate) {
@@ -510,7 +511,7 @@ private function addIndividual() {
 
     $contact = new CRM_Contact_DAO_Contact();
     $year = 60 * 60 * 24 * 365.25;
-    $now = time();
+    $now = $this->time;
 
     foreach ($this->Individual as $cid) {
       $contact->is_deceased = $contact->gender_id = $contact->birth_date = $contact->deceased_date = $email = NULL;
@@ -1477,9 +1478,9 @@ private function addEvent() {
     $event = "INSERT INTO civicrm_event
         ( title, summary, description, event_type_id, participant_listing_id, is_public, start_date, end_date, is_online_registration, registration_link_text, max_participants, event_full_text, is_monetary, financial_type_id, is_map, is_active, fee_label, is_show_location, loc_block_id,intro_text, footer_text, confirm_title, confirm_text, confirm_footer_text, is_email_confirm, confirm_email_text, confirm_from_name, confirm_from_email, cc_confirm, bcc_confirm, default_fee_id, thankyou_title, thankyou_text, thankyou_footer_text, is_pay_later, pay_later_text, pay_later_receipt, is_multiple_registrations, allow_same_participant_emails, currency )
         VALUES
-        ( 'Fall Fundraiser Dinner', 'Kick up your heels at our Fall Fundraiser Dinner/Dance at Glen Echo Park! Come by yourself or bring a partner, friend or the entire family!', 'This event benefits our teen programs. Admission includes a full 3 course meal and wine or soft drinks. Grab your dancing shoes, bring the kids and come join the party!', 3, 1, 1, '" . date('Y-m-d 17:00:00', strtotime("+6 months")) . "', '" . date('Y-m-d 17:00:00', strtotime("+6 months +2 days")) . "', 1, 'Register Now', 100, 'Sorry! The Fall Fundraiser Dinner is full. Please call Jane at 204 222-1000 ext 33 if you want to be added to the waiting list.', 1, 4, 1, 1, 'Dinner Contribution', 1 ,$eventLok1,'Fill in the information below to join as at this wonderful dinner event.', NULL, 'Confirm Your Registration Information', 'Review the information below carefully.', NULL, 1, 'Contact the Development Department if you need to make any changes to your registration.', 'Fundraising Dept.', 'development@example.org', NULL, NULL, NULL, 'Thanks for Registering!', '<p>Thank you for your support. Your contribution will help us build even better tools.</p><p>Please tell your friends and colleagues about this wonderful event.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 1, 'I will send payment by check', 'Send a check payable to Our Organization within 3 business days to hold your reservation. Checks should be sent to: 100 Main St., Suite 3, San Francisco CA 94110', 1, 0, 'USD' ),
-        ( 'Summer Solstice Festival Day Concert', 'Festival Day is coming! Join us and help support your parks.', 'We will gather at noon, learn a song all together,  and then join in a joyous procession to the pavilion. We will be one of many groups performing at this wonderful concert which benefits our city parks.', 5, 1, 1, '" . date('Y-m-d 12:00:00', strtotime("-1 day")) . "', '" . date('Y-m-d 17:00:00', strtotime("-1 day")) . "', 1, 'Register Now', 50, 'We have all the singers we can handle. Come to the pavilion anyway and join in from the audience.', 1, 2, NULL, 1, 'Festival Fee', 1, $eventLok2, 'Complete the form below and click Continue to register online for the festival. Or you can register by calling us at 204 222-1000 ext 22.', '', 'Confirm Your Registration Information', '', '', 1, 'This email confirms your registration. If you have questions or need to change your registration - please do not hesitate to call us.', 'Event Dept.', 'events@example.org', '', NULL, NULL, 'Thanks for Your Joining In!', '<p>Thank you for your support. Your participation will help build new parks.</p><p>Please tell your friends and colleagues about the concert.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 1, 0, 'USD' ),
-        ( 'Rain-forest Cup Youth Soccer Tournament', 'Sign up your team to participate in this fun tournament which benefits several Rain-forest protection groups in the Amazon basin.', 'This is a FYSA Sanctioned Tournament, which is open to all USSF/FIFA affiliated organizations for boys and girls in age groups: U9-U10 (6v6), U11-U12 (8v8), and U13-U17 (Full Sided).', 3, 1, 1, '" . date('Y-m-d 07:00:00', strtotime("+7 months")) . "', '" . date('Y-m-d 17:00:00', strtotime("+7 months +3 days")) . "', 1, 'Register Now', 500, 'Sorry! All available team slots for this tournament have been filled. Contact Jill Futbol for information about the waiting list and next years event.', 1, 4, NULL, 1, 'Tournament Fees',1, $eventLok3, 'Complete the form below to register your team for this year''s tournament.', '<em>A Soccer Youth Event</em>', 'Review and Confirm Your Registration Information', '', '<em>A Soccer Youth Event</em>', 1, 'Contact our Tournament Director for eligibility details.', 'Tournament Director', 'tournament@example.org', '', NULL, NULL, 'Thanks for Your Support!', '<p>Thank you for your support. Your participation will help save thousands of acres of rainforest.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 0, 0, 'USD' )
+        ( 'Fall Fundraiser Dinner', 'Kick up your heels at our Fall Fundraiser Dinner/Dance at Glen Echo Park! Come by yourself or bring a partner, friend or the entire family!', 'This event benefits our teen programs. Admission includes a full 3 course meal and wine or soft drinks. Grab your dancing shoes, bring the kids and come join the party!', 3, 1, 1, '" . date('Y-m-d 17:00:00', strtotime("+6 months", $this->time)) . "', '" . date('Y-m-d 17:00:00', strtotime("+6 months +2 days", $this->time)) . "', 1, 'Register Now', 100, 'Sorry! The Fall Fundraiser Dinner is full. Please call Jane at 204 222-1000 ext 33 if you want to be added to the waiting list.', 1, 4, 1, 1, 'Dinner Contribution', 1 ,$eventLok1,'Fill in the information below to join as at this wonderful dinner event.', NULL, 'Confirm Your Registration Information', 'Review the information below carefully.', NULL, 1, 'Contact the Development Department if you need to make any changes to your registration.', 'Fundraising Dept.', 'development@example.org', NULL, NULL, NULL, 'Thanks for Registering!', '<p>Thank you for your support. Your contribution will help us build even better tools.</p><p>Please tell your friends and colleagues about this wonderful event.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 1, 'I will send payment by check', 'Send a check payable to Our Organization within 3 business days to hold your reservation. Checks should be sent to: 100 Main St., Suite 3, San Francisco CA 94110', 1, 0, 'USD' ),
+        ( 'Summer Solstice Festival Day Concert', 'Festival Day is coming! Join us and help support your parks.', 'We will gather at noon, learn a song all together,  and then join in a joyous procession to the pavilion. We will be one of many groups performing at this wonderful concert which benefits our city parks.', 5, 1, 1, '" . date('Y-m-d 12:00:00', strtotime("-1 day", $this->time)) . "', '" . date('Y-m-d 17:00:00', strtotime("-1 day", $this->time)) . "', 1, 'Register Now', 50, 'We have all the singers we can handle. Come to the pavilion anyway and join in from the audience.', 1, 2, NULL, 1, 'Festival Fee', 1, $eventLok2, 'Complete the form below and click Continue to register online for the festival. Or you can register by calling us at 204 222-1000 ext 22.', '', 'Confirm Your Registration Information', '', '', 1, 'This email confirms your registration. If you have questions or need to change your registration - please do not hesitate to call us.', 'Event Dept.', 'events@example.org', '', NULL, NULL, 'Thanks for Your Joining In!', '<p>Thank you for your support. Your participation will help build new parks.</p><p>Please tell your friends and colleagues about the concert.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 1, 0, 'USD' ),
+        ( 'Rain-forest Cup Youth Soccer Tournament', 'Sign up your team to participate in this fun tournament which benefits several Rain-forest protection groups in the Amazon basin.', 'This is a FYSA Sanctioned Tournament, which is open to all USSF/FIFA affiliated organizations for boys and girls in age groups: U9-U10 (6v6), U11-U12 (8v8), and U13-U17 (Full Sided).', 3, 1, 1, '" . date('Y-m-d 07:00:00', strtotime("+7 months", $this->time)) . "', '" . date('Y-m-d 17:00:00', strtotime("+7 months +3 days", $this->time)) . "', 1, 'Register Now', 500, 'Sorry! All available team slots for this tournament have been filled. Contact Jill Futbol for information about the waiting list and next years event.', 1, 4, NULL, 1, 'Tournament Fees',1, $eventLok3, 'Complete the form below to register your team for this year''s tournament.', '<em>A Soccer Youth Event</em>', 'Review and Confirm Your Registration Information', '', '<em>A Soccer Youth Event</em>', 1, 'Contact our Tournament Director for eligibility details.', 'Tournament Director', 'tournament@example.org', '', NULL, NULL, 'Thanks for Your Support!', '<p>Thank you for your support. Your participation will help save thousands of acres of rainforest.</p>', '<p><a href=https://civicrm.org>Back to CiviCRM Home Page</a></p>', 0, NULL, NULL, 0, 0, 'USD' )
          ";
     $this->_query($event);
 

From 0049e17abfb3abf8c532a806f7468ab7d4f6390b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 02:28:11 -0700
Subject: [PATCH 639/834] GenerateData - Make the generated sample data more
 stable (wrt shuffle+array_rand)

---
 CRM/Core/CodeGen/GenerateData.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 75cc3348daeb..eea39e6591d5 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -77,12 +77,12 @@ public function generate($itemName) {
   public function initID() {
     // get the domain and contact id arrays
     $this->domain = range(1, self::NUM_DOMAIN);
-    shuffle($this->domain);
+    $this->domain = $this->shuffle($this->domain);
 
     // Get first contact id
     $this->startCid = $cid = CRM_Core_DAO::singleValueQuery("SELECT MAX(id) FROM civicrm_contact");
     $this->contact = range($cid + 1, $cid + self::NUM_CONTACT);
-    shuffle($this->contact);
+    $this->contact = $this->shuffle($this->contact);
 
     // get the individual, household  and organizaton contacts
     $offset = 0;
@@ -291,6 +291,16 @@ private function randomKeyValue($items) {
     return array($key, $items[$key]);
   }
 
+  private function shuffle($array) {
+    for ($i = count($array) - 1; $i >= 1; $i--) {
+      $j = $this->randomInt(0, $i);
+      $tmp = $array[$i];
+      $array[$i] = $array[$j];
+      $array[$j] = $tmp;
+    }
+    return $array;
+  }
+
   /**
    * @param $chance
    *
@@ -691,7 +701,7 @@ private function addOrganization() {
 
     $org = new CRM_Contact_DAO_Contact();
     $employees = $this->Individual;
-    shuffle($employees);
+    $employees = $this->shuffle($employees);
 
     foreach ($this->Organization as $key => $id) {
       $org->primary_contact_id = $website = $email = NULL;
@@ -1170,7 +1180,7 @@ private function addActivity() {
       for ($i = 0; $i < self::NUM_ACTIVITY; $i++) {
         $activityDAO = new CRM_Activity_DAO_Activity();
         $activityId = CRM_Core_OptionGroup::values('activity_type', NULL, NULL, NULL, ' AND v.name IN ("Tell A Friend", "Pledge Acknowledgment")');
-        $activityTypeID = array_rand($activityId);
+        $activityTypeID = $this->randomIndex($activityId);
         $activity = CRM_Core_PseudoConstant::activityType();
         $activityDAO->activity_type_id = $activityTypeID;
         $activityDAO->subject = "Subject for $activity[$activityTypeID]";
@@ -1285,7 +1295,7 @@ private function addMembership() {
     while ($contact->fetch()) {
       $contacts[] = $contact->id;
     }
-    shuffle($contacts);
+    $contacts = $this->shuffle($contacts);
 
     $randomContacts = array_slice($contacts, 20, 30);
 
@@ -1327,7 +1337,7 @@ private function addMembership() {
       }
       elseif (($count + 1) % 5 == 0) {
         // Grace or expired, memberhsip type is random of 1 & 2
-        $randIndex = array_rand($membershipTypes);
+        $randIndex = $this->randomIndex($membershipTypes);
         $membershipTypeId = $membershipTypes[$randIndex];
         $membershipStatusId = $statuses[$randIndex];
         $membershipTypeName = $membershipTypeNames[$randIndex];
@@ -1534,7 +1544,7 @@ private function addParticipant() {
     while ($contact->fetch()) {
       $contacts[] = $contact->id;
     }
-    shuffle($contacts);
+    $contacts = $this->shuffle($contacts);
     $randomContacts = array_slice($contacts, 20, 50);
 
     $participant = "

From 6397fe92540529aabaee44e474f5f623ef0669f0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 00:39:14 -0700
Subject: [PATCH 640/834] (REF) GenerateData - Extract method 'generateAll()'

---
 CRM/Core/CodeGen/GenerateData.php | 30 ++++++++++++++++++++++++++++++
 sql/GenerateData.php              | 26 +-------------------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index eea39e6591d5..182fbd6432cd 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -46,7 +46,37 @@ public function __construct($seed = '123456789') {
 
     // Relationship types indexed by name_a_b from the table civicrm_relationship_type
     $this->relTypes = CRM_Utils_Array::index(array('name_a_b'), CRM_Core_PseudoConstant::relationshipType('name'));
+  }
 
+  /**
+   * Create a full, standard set of random data.
+   */
+  public function generateAll() {
+    $this->initID();
+    $this->generate('Domain');
+    $this->generate('Contact');
+    $this->generate('Individual');
+    $this->generate('Household');
+    $this->generate('Organization');
+    $this->generate('Relationship');
+    $this->generate('EntityTag');
+    $this->generate('Group');
+    $this->generate('Note');
+    $this->generate('Activity');
+    $this->generate('Event');
+    $this->generate('Contribution');
+    $this->generate('ContributionLineItem');
+    $this->generate('Membership');
+    $this->generate('MembershipPayment');
+    $this->generate('MembershipLog');
+    $this->generate('PCP');
+    $this->generate('SoftContribution');
+    $this->generate('Pledge');
+    $this->generate('PledgePayment');
+    $this->generate('Participant');
+    $this->generate('ParticipantPayment');
+    $this->generate('LineItemParticipants');
+    $this->generate('AccountingEntries');
   }
 
   /**
diff --git a/sql/GenerateData.php b/sql/GenerateData.php
index afa8de67a85a..84732496f514 100644
--- a/sql/GenerateData.php
+++ b/sql/GenerateData.php
@@ -78,29 +78,5 @@
 
 echo ("Starting data generation on " . date("F dS h:i:s A") . "\n");
 $gcd = new CRM_Core_CodeGen_GenerateData();
-$gcd->initID();
-$gcd->generate('Domain');
-$gcd->generate('Contact');
-$gcd->generate('Individual');
-$gcd->generate('Household');
-$gcd->generate('Organization');
-$gcd->generate('Relationship');
-$gcd->generate('EntityTag');
-$gcd->generate('Group');
-$gcd->generate('Note');
-$gcd->generate('Activity');
-$gcd->generate('Event');
-$gcd->generate('Contribution');
-$gcd->generate('ContributionLineItem');
-$gcd->generate('Membership');
-$gcd->generate('MembershipPayment');
-$gcd->generate('MembershipLog');
-$gcd->generate('PCP');
-$gcd->generate('SoftContribution');
-$gcd->generate('Pledge');
-$gcd->generate('PledgePayment');
-$gcd->generate('Participant');
-$gcd->generate('ParticipantPayment');
-$gcd->generate('LineItemParticipants');
-$gcd->generate('AccountingEntries');
+$gcd->generateAll();
 echo ("Ending data generation on " . date("F dS h:i:s A") . "\n");

From 07e41513a2b8640acb1e89c60731da7f90032445 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 01:08:03 -0700
Subject: [PATCH 641/834] (REF) GenerateData - Use overrideable 'echo'. Use
 exceptions.

This removes elements of GenerateData which perform direct output to the user. there
are basically two cases:

1. Outputting advisory/status info (e.g. "echo"). This now goes through a method, which
   can be overriden/replaced.

2. Displaying errors from DAO-calls. Now-a-days, DAO-calls can raise their own exceptions,
   so we don't need to sprinkle it without error-outputs.
---
 CRM/Core/CodeGen/GenerateData.php | 25 +++++++++++++------------
 sql/GenerateData.php              | 15 +++++++++------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 182fbd6432cd..3d7268f52081 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -79,13 +79,22 @@ public function generateAll() {
     $this->generate('AccountingEntries');
   }
 
+  /**
+   * Write a log message.
+   *
+   * @param string $message
+   */
+  public function write($message) {
+    echo $message;
+  }
+
   /**
    * Public wrapper for calling private "add" functions
    * Provides user feedback
    * @param $itemName
    */
   public function generate($itemName) {
-    echo "Generating $itemName\n";
+    $this->write("Generating $itemName\n");
     $fn = "add$itemName";
     $this->$fn();
   }
@@ -296,7 +305,7 @@ private function randomItem($items) {
       $items = $this->sampleData[$key];
     }
     if (!$items) {
-      echo "Error: no items found for '$key'\n";
+      $this->write("Error: no items found for '$key'\n");
       return FALSE;
     }
     return $items[$this->randomInt(0, count($items) - 1)];
@@ -424,11 +433,7 @@ private function _query($query, $params = array()) {
    */
   private function _insert(&$dao) {
     if (self::ADD_TO_DB) {
-      if (!$dao->insert()) {
-        echo "ERROR INSERT: " . mysqli_error($dao->getConnection()->connection) . "\n";
-        print_r($dao);
-        exit(1);
-      }
+      $dao->insert();
     }
   }
 
@@ -438,11 +443,7 @@ private function _insert(&$dao) {
    */
   private function _update(&$dao) {
     if (self::ADD_TO_DB) {
-      if (!$dao->update()) {
-        echo "ERROR UPDATE: " . mysqli_error($dao->getConnection()->connection) . "\n";
-        print_r($dao);
-        exit(1);
-      }
+      $dao->update();
     }
   }
 
diff --git a/sql/GenerateData.php b/sql/GenerateData.php
index 84732496f514..977a251b06de 100644
--- a/sql/GenerateData.php
+++ b/sql/GenerateData.php
@@ -71,12 +71,15 @@
 
 
 require_once '../civicrm.config.php';
-
-// autoload
-require_once 'CRM/Core/ClassLoader.php';
-CRM_Core_ClassLoader::singleton()->register();
+CRM_Core_Config::singleton();
 
 echo ("Starting data generation on " . date("F dS h:i:s A") . "\n");
-$gcd = new CRM_Core_CodeGen_GenerateData();
-$gcd->generateAll();
+try {
+  $scope = CRM_Core_TemporaryErrorScope::useException();
+  $gcd = new CRM_Core_CodeGen_GenerateData();
+  $gcd->generateAll();
+}
+catch (Exception $e) {
+  echo CRM_Core_Error::formatTextException($e);
+}
 echo ("Ending data generation on " . date("F dS h:i:s A") . "\n");

From 38b93530b55ca7647571d2af28a923e99646df10 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 16 Sep 2020 02:58:36 -0700
Subject: [PATCH 642/834] (REF) GenerateData - Allow external control
 randomness

---
 CRM/Core/CodeGen/GenerateData.php | 9 +++++++--
 sql/GenerateData.php              | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/CodeGen/GenerateData.php b/CRM/Core/CodeGen/GenerateData.php
index 3d7268f52081..31a2352c3f8c 100644
--- a/CRM/Core/CodeGen/GenerateData.php
+++ b/CRM/Core/CodeGen/GenerateData.php
@@ -26,11 +26,16 @@ class CRM_Core_CodeGen_GenerateData {
 
   /**
    * Class constructor
+   *
+   * @param string|int $seed
+   *   Some scalar value used as the starting point for random-number generation.
+   * @param int $time
+   *   A timestamp; some facsimile of "now".
    */
-  public function __construct($seed = '123456789') {
+  public function __construct($seed, $time) {
     // initialize all the vars
     $this->seed = $seed;
-    $this->time = strtotime(date('Y') . '-01-01 02:03:04');
+    $this->time = $time;
     $this->numIndividual = self::INDIVIDUAL_PERCENT * self::NUM_CONTACT / 100;
     $this->numHousehold = self::HOUSEHOLD_PERCENT * self::NUM_CONTACT / 100;
     $this->numOrganization = self::ORGANIZATION_PERCENT * self::NUM_CONTACT / 100;
diff --git a/sql/GenerateData.php b/sql/GenerateData.php
index 977a251b06de..6928bf57afb8 100644
--- a/sql/GenerateData.php
+++ b/sql/GenerateData.php
@@ -76,7 +76,10 @@
 echo ("Starting data generation on " . date("F dS h:i:s A") . "\n");
 try {
   $scope = CRM_Core_TemporaryErrorScope::useException();
-  $gcd = new CRM_Core_CodeGen_GenerateData();
+  // Generate reproducible data-set
+  // $gcd = new CRM_Core_CodeGen_GenerateData('1234', strtotime(date('Y') . '-01-01 02:03:04'));
+  // Generate unique data-set
+  $gcd = new CRM_Core_CodeGen_GenerateData(time(), time());
   $gcd->generateAll();
 }
 catch (Exception $e) {

From 5c35dd00c2f55353426a9cad43761847c85c753d Mon Sep 17 00:00:00 2001
From: John Kingsnorth <john@johnkingsnorth.co.uk>
Date: Wed, 16 Sep 2020 12:11:06 +0100
Subject: [PATCH 643/834] dev/core#2027 Add/update to UK county list

---
 .../Incremental/sql/5.31.alpha1.mysql.tpl     | 35 ++++++++++++++++-
 sql/civicrm_generated.mysql                   |  2 +-
 xml/templates/civicrm_state_province.tpl      | 38 +++++++++++++++++--
 3 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
index e87793f05151..3c5148fc51df 100644
--- a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
@@ -6,5 +6,38 @@ WHERE html_type IN ('Select Country', 'Select State/Province');
 
 {* make period_type required - it already is so the update is precautionary *}
 UPDATE civicrm_membership_type SET period_type = 'rolling' WHERE period_type IS NULL;
-ALTER TABLE civicrm_membership_type MODIFY `period_type` varchar(8) NOT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.'
+ALTER TABLE civicrm_membership_type MODIFY `period_type` varchar(8) NOT NULL COMMENT 'Rolling membership period starts on signup date. Fixed membership periods start on fixed_period_start_day.';
 
+{* dev/core#2027 Add missing sub-divisions for Northern Ireland and Wales *}
+SET @UKCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'United Kingdom');
+INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUES
+(@UKCountryId, "ANN", "Antrim and Newtownabbey"),
+(@UKCountryId, "AND", "Ards and North Down"),
+(@UKCountryId, "ABC", "Armagh City, Banbridge and Craigavon"),
+(@UKCountryId, "BFS", "Belfast"),
+(@UKCountryId, "CCG", "Causeway Coast and Glens"),
+(@UKCountryId, "DRS", "Derry City and Strabane"),
+(@UKCountryId, "FMO", "Fermanagh and Omagh"),
+(@UKCountryId, "LBC", "Lisburn and Castlereagh"),
+(@UKCountryId, "MEA", "Mid and East Antrim"),
+(@UKCountryId, "MUL", "Mid Ulster"),
+(@UKCountryId, "NMD", "Newry, Mourne and Down"),
+(@UKCountryId, "BGW", "Blaenau Gwent"),
+(@UKCountryId, "BGE", "Bridgend"),
+(@UKCountryId, "CAY", "Caerphilly"),
+(@UKCountryId, "CRF", "Cardiff"),
+(@UKCountryId, "CRF", "Carmarthenshire"),
+(@UKCountryId, "CGN", "Ceredigion"),
+(@UKCountryId, "CWY", "Conwy"),
+(@UKCountryId, "DEN", "Denbighshire"),
+(@UKCountryId, "FLN", "Flintshire"),
+(@UKCountryId, "AGY", "Isle of Anglesey"),
+(@UKCountryId, "MTY", "Merthyr Tydfil"),
+(@UKCountryId, "NTL", "Neath Port Talbot"),
+(@UKCountryId, "NWP", "Newport"),
+(@UKCountryId, "PEM", "Pembrokeshire"),
+(@UKCountryId, "RCT", "Rhondda, Cynon, Taff"),
+(@UKCountryId, "SWA", "Swansea"),
+(@UKCountryId, "TOF", "Torfaen"),
+(@UKCountryId, "VGL", "Vale of Glamorgan, The"),
+(@UKCountryId, "WRX", "Wrexham");
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index cc0230c48a58..efdf1b78bce0 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -1328,7 +1328,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_state_province` WRITE;
 /*!40000 ALTER TABLE `civicrm_state_province` DISABLE KEYS */;
-INSERT INTO `civicrm_state_province` (`id`, `name`, `abbreviation`, `country_id`) VALUES (1000,'Alabama','AL',1228),(1001,'Alaska','AK',1228),(1002,'Arizona','AZ',1228),(1003,'Arkansas','AR',1228),(1004,'California','CA',1228),(1005,'Colorado','CO',1228),(1006,'Connecticut','CT',1228),(1007,'Delaware','DE',1228),(1008,'Florida','FL',1228),(1009,'Georgia','GA',1228),(1010,'Hawaii','HI',1228),(1011,'Idaho','ID',1228),(1012,'Illinois','IL',1228),(1013,'Indiana','IN',1228),(1014,'Iowa','IA',1228),(1015,'Kansas','KS',1228),(1016,'Kentucky','KY',1228),(1017,'Louisiana','LA',1228),(1018,'Maine','ME',1228),(1019,'Maryland','MD',1228),(1020,'Massachusetts','MA',1228),(1021,'Michigan','MI',1228),(1022,'Minnesota','MN',1228),(1023,'Mississippi','MS',1228),(1024,'Missouri','MO',1228),(1025,'Montana','MT',1228),(1026,'Nebraska','NE',1228),(1027,'Nevada','NV',1228),(1028,'New Hampshire','NH',1228),(1029,'New Jersey','NJ',1228),(1030,'New Mexico','NM',1228),(1031,'New York','NY',1228),(1032,'North Carolina','NC',1228),(1033,'North Dakota','ND',1228),(1034,'Ohio','OH',1228),(1035,'Oklahoma','OK',1228),(1036,'Oregon','OR',1228),(1037,'Pennsylvania','PA',1228),(1038,'Rhode Island','RI',1228),(1039,'South Carolina','SC',1228),(1040,'South Dakota','SD',1228),(1041,'Tennessee','TN',1228),(1042,'Texas','TX',1228),(1043,'Utah','UT',1228),(1044,'Vermont','VT',1228),(1045,'Virginia','VA',1228),(1046,'Washington','WA',1228),(1047,'West Virginia','WV',1228),(1048,'Wisconsin','WI',1228),(1049,'Wyoming','WY',1228),(1050,'District of Columbia','DC',1228),(1052,'American Samoa','AS',1228),(1053,'Guam','GU',1228),(1055,'Northern Mariana Islands','MP',1228),(1056,'Puerto Rico','PR',1228),(1057,'Virgin Islands','VI',1228),(1058,'United States Minor Outlying Islands','UM',1228),(1059,'Armed Forces Europe','AE',1228),(1060,'Armed Forces Americas','AA',1228),(1061,'Armed Forces Pacific','AP',1228),(1100,'Alberta','AB',1039),(1101,'British Columbia','BC',1039),(1102,'Manitoba','MB',1039),(1103,'New Brunswick','NB',1039),(1104,'Newfoundland and Labrador','NL',1039),(1105,'Northwest Territories','NT',1039),(1106,'Nova Scotia','NS',1039),(1107,'Nunavut','NU',1039),(1108,'Ontario','ON',1039),(1109,'Prince Edward Island','PE',1039),(1110,'Quebec','QC',1039),(1111,'Saskatchewan','SK',1039),(1112,'Yukon Territory','YT',1039),(1200,'Maharashtra','MM',1101),(1201,'Karnataka','KA',1101),(1202,'Andhra Pradesh','AP',1101),(1203,'Arunachal Pradesh','AR',1101),(1204,'Assam','AS',1101),(1205,'Bihar','BR',1101),(1206,'Chhattisgarh','CH',1101),(1207,'Goa','GA',1101),(1208,'Gujarat','GJ',1101),(1209,'Haryana','HR',1101),(1210,'Himachal Pradesh','HP',1101),(1211,'Jammu and Kashmir','JK',1101),(1212,'Jharkhand','JH',1101),(1213,'Kerala','KL',1101),(1214,'Madhya Pradesh','MP',1101),(1215,'Manipur','MN',1101),(1216,'Meghalaya','ML',1101),(1217,'Mizoram','MZ',1101),(1218,'Nagaland','NL',1101),(1219,'Orissa','OR',1101),(1220,'Punjab','PB',1101),(1221,'Rajasthan','RJ',1101),(1222,'Sikkim','SK',1101),(1223,'Tamil Nadu','TN',1101),(1224,'Tripura','TR',1101),(1225,'Uttarakhand','UT',1101),(1226,'Uttar Pradesh','UP',1101),(1227,'West Bengal','WB',1101),(1228,'Andaman and Nicobar Islands','AN',1101),(1229,'Dadra and Nagar Haveli','DN',1101),(1230,'Daman and Diu','DD',1101),(1231,'Delhi','DL',1101),(1232,'Lakshadweep','LD',1101),(1233,'Pondicherry','PY',1101),(1300,'mazowieckie','MZ',1172),(1301,'pomorskie','PM',1172),(1302,'dolnośląskie','DS',1172),(1303,'kujawsko-pomorskie','KP',1172),(1304,'lubelskie','LU',1172),(1305,'lubuskie','LB',1172),(1306,'łódzkie','LD',1172),(1307,'małopolskie','MA',1172),(1308,'opolskie','OP',1172),(1309,'podkarpackie','PK',1172),(1310,'podlaskie','PD',1172),(1311,'śląskie','SL',1172),(1312,'świętokrzyskie','SK',1172),(1313,'warmińsko-mazurskie','WN',1172),(1314,'wielkopolskie','WP',1172),(1315,'zachodniopomorskie','ZP',1172),(1500,'Abu Zaby','AZ',1225),(1501,'\'Ajman','AJ',1225),(1502,'Al Fujayrah','FU',1225),(1503,'Ash Shariqah','SH',1225),(1504,'Dubayy','DU',1225),(1505,'Ra\'s al Khaymah','RK',1225),(1506,'Dac Lac','33',1233),(1507,'Umm al Qaywayn','UQ',1225),(1508,'Badakhshan','BDS',1001),(1509,'Badghis','BDG',1001),(1510,'Baghlan','BGL',1001),(1511,'Balkh','BAL',1001),(1512,'Bamian','BAM',1001),(1513,'Farah','FRA',1001),(1514,'Faryab','FYB',1001),(1515,'Ghazni','GHA',1001),(1516,'Ghowr','GHO',1001),(1517,'Helmand','HEL',1001),(1518,'Herat','HER',1001),(1519,'Jowzjan','JOW',1001),(1520,'Kabul','KAB',1001),(1521,'Kandahar','KAN',1001),(1522,'Kapisa','KAP',1001),(1523,'Khowst','KHO',1001),(1524,'Konar','KNR',1001),(1525,'Kondoz','KDZ',1001),(1526,'Laghman','LAG',1001),(1527,'Lowgar','LOW',1001),(1528,'Nangrahar','NAN',1001),(1529,'Nimruz','NIM',1001),(1530,'Nurestan','NUR',1001),(1531,'Oruzgan','ORU',1001),(1532,'Paktia','PIA',1001),(1533,'Paktika','PKA',1001),(1534,'Parwan','PAR',1001),(1535,'Samangan','SAM',1001),(1536,'Sar-e Pol','SAR',1001),(1537,'Takhar','TAK',1001),(1538,'Wardak','WAR',1001),(1539,'Zabol','ZAB',1001),(1540,'Berat','BR',1002),(1541,'Bulqizë','BU',1002),(1542,'Delvinë','DL',1002),(1543,'Devoll','DV',1002),(1544,'Dibër','DI',1002),(1545,'Durrës','DR',1002),(1546,'Elbasan','EL',1002),(1547,'Fier','FR',1002),(1548,'Gramsh','GR',1002),(1549,'Gjirokastër','GJ',1002),(1550,'Has','HA',1002),(1551,'Kavajë','KA',1002),(1552,'Kolonjë','ER',1002),(1553,'Korçë','KO',1002),(1554,'Krujë','KR',1002),(1555,'Kuçovë','KC',1002),(1556,'Kukës','KU',1002),(1557,'Kurbin','KB',1002),(1558,'Lezhë','LE',1002),(1559,'Librazhd','LB',1002),(1560,'Lushnjë','LU',1002),(1561,'Malësi e Madhe','MM',1002),(1562,'Mallakastër','MK',1002),(1563,'Mat','MT',1002),(1564,'Mirditë','MR',1002),(1565,'Peqin','PQ',1002),(1566,'Përmet','PR',1002),(1567,'Pogradec','PG',1002),(1568,'Pukë','PU',1002),(1569,'Sarandë','SR',1002),(1570,'Skrapar','SK',1002),(1571,'Shkodër','SH',1002),(1572,'Tepelenë','TE',1002),(1573,'Tiranë','TR',1002),(1574,'Tropojë','TP',1002),(1575,'Vlorë','VL',1002),(1576,'Erevan','ER',1011),(1577,'Aragacotn','AG',1011),(1578,'Ararat','AR',1011),(1579,'Armavir','AV',1011),(1580,'Gegarkunik\'','GR',1011),(1581,'Kotayk\'','KT',1011),(1582,'Lory','LO',1011),(1583,'Sirak','SH',1011),(1584,'Syunik\'','SU',1011),(1585,'Tavus','TV',1011),(1586,'Vayoc Jor','VD',1011),(1587,'Bengo','BGO',1006),(1588,'Benguela','BGU',1006),(1589,'Bie','BIE',1006),(1590,'Cabinda','CAB',1006),(1591,'Cuando-Cubango','CCU',1006),(1592,'Cuanza Norte','CNO',1006),(1593,'Cuanza Sul','CUS',1006),(1594,'Cunene','CNN',1006),(1595,'Huambo','HUA',1006),(1596,'Huila','HUI',1006),(1597,'Luanda','LUA',1006),(1598,'Lunda Norte','LNO',1006),(1599,'Lunda Sul','LSU',1006),(1600,'Malange','MAL',1006),(1601,'Moxico','MOX',1006),(1602,'Namibe','NAM',1006),(1603,'Uige','UIG',1006),(1604,'Zaire','ZAI',1006),(1605,'Capital federal','C',1010),(1606,'Buenos Aires','B',1010),(1607,'Catamarca','K',1010),(1608,'Cordoba','X',1010),(1609,'Corrientes','W',1010),(1610,'Chaco','H',1010),(1611,'Chubut','U',1010),(1612,'Entre Rios','E',1010),(1613,'Formosa','P',1010),(1614,'Jujuy','Y',1010),(1615,'La Pampa','L',1010),(1616,'Mendoza','M',1010),(1617,'Misiones','N',1010),(1618,'Neuquen','Q',1010),(1619,'Rio Negro','R',1010),(1620,'Salta','A',1010),(1621,'San Juan','J',1010),(1622,'San Luis','D',1010),(1623,'Santa Cruz','Z',1010),(1624,'Santa Fe','S',1010),(1625,'Santiago del Estero','G',1010),(1626,'Tierra del Fuego','V',1010),(1627,'Tucuman','T',1010),(1628,'Burgenland','1',1014),(1629,'Kärnten','2',1014),(1630,'Niederösterreich','3',1014),(1631,'Oberösterreich','4',1014),(1632,'Salzburg','5',1014),(1633,'Steiermark','6',1014),(1634,'Tirol','7',1014),(1635,'Vorarlberg','8',1014),(1636,'Wien','9',1014),(1637,'Australian Antarctic Territory','AAT',1008),(1638,'Australian Capital Territory','ACT',1013),(1639,'Northern Territory','NT',1013),(1640,'New South Wales','NSW',1013),(1641,'Queensland','QLD',1013),(1642,'South Australia','SA',1013),(1643,'Tasmania','TAS',1013),(1644,'Victoria','VIC',1013),(1645,'Western Australia','WA',1013),(1646,'Naxcivan','NX',1015),(1647,'Ali Bayramli','AB',1015),(1648,'Baki','BA',1015),(1649,'Ganca','GA',1015),(1650,'Lankaran','LA',1015),(1651,'Mingacevir','MI',1015),(1652,'Naftalan','NA',1015),(1653,'Saki','SA',1015),(1654,'Sumqayit','SM',1015),(1655,'Susa','SS',1015),(1656,'Xankandi','XA',1015),(1657,'Yevlax','YE',1015),(1658,'Abseron','ABS',1015),(1659,'Agcabadi','AGC',1015),(1660,'Agdam','AGM',1015),(1661,'Agdas','AGS',1015),(1662,'Agstafa','AGA',1015),(1663,'Agsu','AGU',1015),(1664,'Astara','AST',1015),(1665,'Babak','BAB',1015),(1666,'Balakan','BAL',1015),(1667,'Barda','BAR',1015),(1668,'Beylagan','BEY',1015),(1669,'Bilasuvar','BIL',1015),(1670,'Cabrayll','CAB',1015),(1671,'Calilabad','CAL',1015),(1672,'Culfa','CUL',1015),(1673,'Daskasan','DAS',1015),(1674,'Davaci','DAV',1015),(1675,'Fuzuli','FUZ',1015),(1676,'Gadabay','GAD',1015),(1677,'Goranboy','GOR',1015),(1678,'Goycay','GOY',1015),(1679,'Haciqabul','HAC',1015),(1680,'Imisli','IMI',1015),(1681,'Ismayilli','ISM',1015),(1682,'Kalbacar','KAL',1015),(1683,'Kurdamir','KUR',1015),(1684,'Lacin','LAC',1015),(1685,'Lerik','LER',1015),(1686,'Masalli','MAS',1015),(1687,'Neftcala','NEF',1015),(1688,'Oguz','OGU',1015),(1689,'Ordubad','ORD',1015),(1690,'Qabala','QAB',1015),(1691,'Qax','QAX',1015),(1692,'Qazax','QAZ',1015),(1693,'Qobustan','QOB',1015),(1694,'Quba','QBA',1015),(1695,'Qubadli','QBI',1015),(1696,'Qusar','QUS',1015),(1697,'Saatli','SAT',1015),(1698,'Sabirabad','SAB',1015),(1699,'Sadarak','SAD',1015),(1700,'Sahbuz','SAH',1015),(1701,'Salyan','SAL',1015),(1702,'Samaxi','SMI',1015),(1703,'Samkir','SKR',1015),(1704,'Samux','SMX',1015),(1705,'Sarur','SAR',1015),(1706,'Siyazan','SIY',1015),(1707,'Tartar','TAR',1015),(1708,'Tovuz','TOV',1015),(1709,'Ucar','UCA',1015),(1710,'Xacmaz','XAC',1015),(1711,'Xanlar','XAN',1015),(1712,'Xizi','XIZ',1015),(1713,'Xocali','XCI',1015),(1714,'Xocavand','XVD',1015),(1715,'Yardimli','YAR',1015),(1716,'Zangilan','ZAN',1015),(1717,'Zaqatala','ZAQ',1015),(1718,'Zardab','ZAR',1015),(1719,'Federacija Bosna i Hercegovina','BIH',1026),(1720,'Republika Srpska','SRP',1026),(1721,'Bagerhat zila','05',1017),(1722,'Bandarban zila','01',1017),(1723,'Barguna zila','02',1017),(1724,'Barisal zila','06',1017),(1725,'Bhola zila','07',1017),(1726,'Bogra zila','03',1017),(1727,'Brahmanbaria zila','04',1017),(1728,'Chandpur zila','09',1017),(1729,'Chittagong zila','10',1017),(1730,'Chuadanga zila','12',1017),(1731,'Comilla zila','08',1017),(1732,'Cox\'s Bazar zila','11',1017),(1733,'Dhaka zila','13',1017),(1734,'Dinajpur zila','14',1017),(1735,'Faridpur zila','15',1017),(1736,'Feni zila','16',1017),(1737,'Gaibandha zila','19',1017),(1738,'Gazipur zila','18',1017),(1739,'Gopalganj zila','17',1017),(1740,'Habiganj zila','20',1017),(1741,'Jaipurhat zila','24',1017),(1742,'Jamalpur zila','21',1017),(1743,'Jessore zila','22',1017),(1744,'Jhalakati zila','25',1017),(1745,'Jhenaidah zila','23',1017),(1746,'Khagrachari zila','29',1017),(1747,'Khulna zila','27',1017),(1748,'Kishorganj zila','26',1017),(1749,'Kurigram zila','28',1017),(1750,'Kushtia zila','30',1017),(1751,'Lakshmipur zila','31',1017),(1752,'Lalmonirhat zila','32',1017),(1753,'Madaripur zila','36',1017),(1754,'Magura zila','37',1017),(1755,'Manikganj zila','33',1017),(1756,'Meherpur zila','39',1017),(1757,'Moulvibazar zila','38',1017),(1758,'Munshiganj zila','35',1017),(1759,'Mymensingh zila','34',1017),(1760,'Naogaon zila','48',1017),(1761,'Narail zila','43',1017),(1762,'Narayanganj zila','40',1017),(1763,'Narsingdi zila','42',1017),(1764,'Natore zila','44',1017),(1765,'Nawabganj zila','45',1017),(1766,'Netrakona zila','41',1017),(1767,'Nilphamari zila','46',1017),(1768,'Noakhali zila','47',1017),(1769,'Pabna zila','49',1017),(1770,'Panchagarh zila','52',1017),(1771,'Patuakhali zila','51',1017),(1772,'Pirojpur zila','50',1017),(1773,'Rajbari zila','53',1017),(1774,'Rajshahi zila','54',1017),(1775,'Rangamati zila','56',1017),(1776,'Rangpur zila','55',1017),(1777,'Satkhira zila','58',1017),(1778,'Shariatpur zila','62',1017),(1779,'Sherpur zila','57',1017),(1780,'Sirajganj zila','59',1017),(1781,'Sunamganj zila','61',1017),(1782,'Sylhet zila','60',1017),(1783,'Tangail zila','63',1017),(1784,'Thakurgaon zila','64',1017),(1785,'Antwerpen','VAN',1020),(1786,'Brabant Wallon','WBR',1020),(1787,'Hainaut','WHT',1020),(1788,'Liege','WLG',1020),(1789,'Limburg','VLI',1020),(1790,'Luxembourg','WLX',1020),(1791,'Namur','WNA',1020),(1792,'Oost-Vlaanderen','VOV',1020),(1793,'Vlaams-Brabant','VBR',1020),(1794,'West-Vlaanderen','VWV',1020),(1795,'Bale','BAL',1034),(1796,'Bam','BAM',1034),(1797,'Banwa','BAN',1034),(1798,'Bazega','BAZ',1034),(1799,'Bougouriba','BGR',1034),(1800,'Boulgou','BLG',1034),(1801,'Boulkiemde','BLK',1034),(1802,'Comoe','COM',1034),(1803,'Ganzourgou','GAN',1034),(1804,'Gnagna','GNA',1034),(1805,'Gourma','GOU',1034),(1806,'Houet','HOU',1034),(1807,'Ioba','IOB',1034),(1808,'Kadiogo','KAD',1034),(1809,'Kenedougou','KEN',1034),(1810,'Komondjari','KMD',1034),(1811,'Kompienga','KMP',1034),(1812,'Kossi','KOS',1034),(1813,'Koulpulogo','KOP',1034),(1814,'Kouritenga','KOT',1034),(1815,'Kourweogo','KOW',1034),(1816,'Leraba','LER',1034),(1817,'Loroum','LOR',1034),(1818,'Mouhoun','MOU',1034),(1819,'Nahouri','NAO',1034),(1820,'Namentenga','NAM',1034),(1821,'Nayala','NAY',1034),(1822,'Noumbiel','NOU',1034),(1823,'Oubritenga','OUB',1034),(1824,'Oudalan','OUD',1034),(1825,'Passore','PAS',1034),(1826,'Poni','PON',1034),(1827,'Sanguie','SNG',1034),(1828,'Sanmatenga','SMT',1034),(1829,'Seno','SEN',1034),(1830,'Siasili','SIS',1034),(1831,'Soum','SOM',1034),(1832,'Sourou','SOR',1034),(1833,'Tapoa','TAP',1034),(1834,'Tui','TUI',1034),(1835,'Yagha','YAG',1034),(1836,'Yatenga','YAT',1034),(1837,'Ziro','ZIR',1034),(1838,'Zondoma','ZON',1034),(1839,'Zoundweogo','ZOU',1034),(1840,'Blagoevgrad','01',1033),(1841,'Burgas','02',1033),(1842,'Dobrich','08',1033),(1843,'Gabrovo','07',1033),(1844,'Haskovo','26',1033),(1845,'Yambol','28',1033),(1846,'Kardzhali','09',1033),(1847,'Kyustendil','10',1033),(1848,'Lovech','11',1033),(1849,'Montana','12',1033),(1850,'Pazardzhik','13',1033),(1851,'Pernik','14',1033),(1852,'Pleven','15',1033),(1853,'Plovdiv','16',1033),(1854,'Razgrad','17',1033),(1855,'Ruse','18',1033),(1856,'Silistra','19',1033),(1857,'Sliven','20',1033),(1858,'Smolyan','21',1033),(1859,'Sofia','23',1033),(1860,'Stara Zagora','24',1033),(1861,'Shumen','27',1033),(1862,'Targovishte','25',1033),(1863,'Varna','03',1033),(1864,'Veliko Tarnovo','04',1033),(1865,'Vidin','05',1033),(1866,'Vratsa','06',1033),(1867,'Al Hadd','01',1016),(1868,'Al Manamah','03',1016),(1869,'Al Mintaqah al Gharbiyah','10',1016),(1870,'Al Mintagah al Wusta','07',1016),(1871,'Al Mintaqah ash Shamaliyah','05',1016),(1872,'Al Muharraq','02',1016),(1873,'Ar Rifa','09',1016),(1874,'Jidd Hafs','04',1016),(1875,'Madluat Jamad','12',1016),(1876,'Madluat Isa','08',1016),(1877,'Mintaqat Juzur tawar','11',1016),(1878,'Sitrah','06',1016),(1879,'Bubanza','BB',1036),(1880,'Bujumbura','BJ',1036),(1881,'Bururi','BR',1036),(1882,'Cankuzo','CA',1036),(1883,'Cibitoke','CI',1036),(1884,'Gitega','GI',1036),(1885,'Karuzi','KR',1036),(1886,'Kayanza','KY',1036),(1887,'Makamba','MA',1036),(1888,'Muramvya','MU',1036),(1889,'Mwaro','MW',1036),(1890,'Ngozi','NG',1036),(1891,'Rutana','RT',1036),(1892,'Ruyigi','RY',1036),(1893,'Alibori','AL',1022),(1894,'Atakora','AK',1022),(1895,'Atlantique','AQ',1022),(1896,'Borgou','BO',1022),(1897,'Collines','CO',1022),(1898,'Donga','DO',1022),(1899,'Kouffo','KO',1022),(1900,'Littoral','LI',1022),(1901,'Mono','MO',1022),(1902,'Oueme','OU',1022),(1903,'Plateau','PL',1022),(1904,'Zou','ZO',1022),(1905,'Belait','BE',1032),(1906,'Brunei-Muara','BM',1032),(1907,'Temburong','TE',1032),(1908,'Tutong','TU',1032),(1909,'Cochabamba','C',1025),(1910,'Chuquisaca','H',1025),(1911,'El Beni','B',1025),(1912,'La Paz','L',1025),(1913,'Oruro','O',1025),(1914,'Pando','N',1025),(1915,'Potosi','P',1025),(1916,'Tarija','T',1025),(1917,'Acre','AC',1029),(1918,'Alagoas','AL',1029),(1919,'Amazonas','AM',1029),(1920,'Amapa','AP',1029),(1921,'Bahia','BA',1029),(1922,'Ceara','CE',1029),(1923,'Distrito Federal','DF',1029),(1924,'Espirito Santo','ES',1029),(1926,'Goias','GO',1029),(1927,'Maranhao','MA',1029),(1928,'Minas Gerais','MG',1029),(1929,'Mato Grosso do Sul','MS',1029),(1930,'Mato Grosso','MT',1029),(1931,'Para','PA',1029),(1932,'Paraiba','PB',1029),(1933,'Pernambuco','PE',1029),(1934,'Piaui','PI',1029),(1935,'Parana','PR',1029),(1936,'Rio de Janeiro','RJ',1029),(1937,'Rio Grande do Norte','RN',1029),(1938,'Rondonia','RO',1029),(1939,'Roraima','RR',1029),(1940,'Rio Grande do Sul','RS',1029),(1941,'Santa Catarina','SC',1029),(1942,'Sergipe','SE',1029),(1943,'Sao Paulo','SP',1029),(1944,'Tocantins','TO',1029),(1945,'Acklins and Crooked Islands','AC',1212),(1946,'Bimini','BI',1212),(1947,'Cat Island','CI',1212),(1948,'Exuma','EX',1212),(1955,'Inagua','IN',1212),(1957,'Long Island','LI',1212),(1959,'Mayaguana','MG',1212),(1960,'New Providence','NP',1212),(1962,'Ragged Island','RI',1212),(1966,'Bumthang','33',1024),(1967,'Chhukha','12',1024),(1968,'Dagana','22',1024),(1969,'Gasa','GA',1024),(1970,'Ha','13',1024),(1971,'Lhuentse','44',1024),(1972,'Monggar','42',1024),(1973,'Paro','11',1024),(1974,'Pemagatshel','43',1024),(1975,'Punakha','23',1024),(1976,'Samdrup Jongkha','45',1024),(1977,'Samtee','14',1024),(1978,'Sarpang','31',1024),(1979,'Thimphu','15',1024),(1980,'Trashigang','41',1024),(1981,'Trashi Yangtse','TY',1024),(1982,'Trongsa','32',1024),(1983,'Tsirang','21',1024),(1984,'Wangdue Phodrang','24',1024),(1985,'Zhemgang','34',1024),(1986,'Central','CE',1027),(1987,'Ghanzi','GH',1027),(1988,'Kgalagadi','KG',1027),(1989,'Kgatleng','KL',1027),(1990,'Kweneng','KW',1027),(1991,'Ngamiland','NG',1027),(1992,'North-East','NE',1027),(1993,'North-West','NW',1027),(1994,'South-East','SE',1027),(1995,'Southern','SO',1027),(1996,'Brèsckaja voblasc\'','BR',1019),(1997,'Homel\'skaja voblasc\'','HO',1019),(1998,'Hrodzenskaja voblasc\'','HR',1019),(1999,'Mahilëuskaja voblasc\'','MA',1019),(2000,'Minskaja voblasc\'','MI',1019),(2001,'Vicebskaja voblasc\'','VI',1019),(2002,'Belize','BZ',1021),(2003,'Cayo','CY',1021),(2004,'Corozal','CZL',1021),(2005,'Orange Walk','OW',1021),(2006,'Stann Creek','SC',1021),(2007,'Toledo','TOL',1021),(2008,'Kinshasa','KN',1050),(2011,'Equateur','EQ',1050),(2014,'Kasai-Oriental','KE',1050),(2016,'Maniema','MA',1050),(2017,'Nord-Kivu','NK',1050),(2019,'Sud-Kivu','SK',1050),(2020,'Bangui','BGF',1042),(2021,'Bamingui-Bangoran','BB',1042),(2022,'Basse-Kotto','BK',1042),(2023,'Haute-Kotto','HK',1042),(2024,'Haut-Mbomou','HM',1042),(2025,'Kemo','KG',1042),(2026,'Lobaye','LB',1042),(2027,'Mambere-Kadei','HS',1042),(2028,'Mbomou','MB',1042),(2029,'Nana-Grebizi','KB',1042),(2030,'Nana-Mambere','NM',1042),(2031,'Ombella-Mpoko','MP',1042),(2032,'Ouaka','UK',1042),(2033,'Ouham','AC',1042),(2034,'Ouham-Pende','OP',1042),(2035,'Sangha-Mbaere','SE',1042),(2036,'Vakaga','VR',1042),(2037,'Brazzaville','BZV',1051),(2038,'Bouenza','11',1051),(2039,'Cuvette','8',1051),(2040,'Cuvette-Ouest','15',1051),(2041,'Kouilou','5',1051),(2042,'Lekoumou','2',1051),(2043,'Likouala','7',1051),(2044,'Niari','9',1051),(2045,'Plateaux','14',1051),(2046,'Pool','12',1051),(2047,'Sangha','13',1051),(2048,'Aargau','AG',1205),(2049,'Appenzell Innerrhoden','AI',1205),(2050,'Appenzell Ausserrhoden','AR',1205),(2051,'Bern','BE',1205),(2052,'Basel-Landschaft','BL',1205),(2053,'Basel-Stadt','BS',1205),(2054,'Fribourg','FR',1205),(2055,'Geneva','GE',1205),(2056,'Glarus','GL',1205),(2057,'Graubunden','GR',1205),(2058,'Jura','JU',1205),(2059,'Luzern','LU',1205),(2060,'Neuchatel','NE',1205),(2061,'Nidwalden','NW',1205),(2062,'Obwalden','OW',1205),(2063,'Sankt Gallen','SG',1205),(2064,'Schaffhausen','SH',1205),(2065,'Solothurn','SO',1205),(2066,'Schwyz','SZ',1205),(2067,'Thurgau','TG',1205),(2068,'Ticino','TI',1205),(2069,'Uri','UR',1205),(2070,'Vaud','VD',1205),(2071,'Valais','VS',1205),(2072,'Zug','ZG',1205),(2073,'Zurich','ZH',1205),(2074,'18 Montagnes','06',1054),(2075,'Agnebi','16',1054),(2076,'Bas-Sassandra','09',1054),(2077,'Denguele','10',1054),(2078,'Haut-Sassandra','02',1054),(2079,'Lacs','07',1054),(2080,'Lagunes','01',1054),(2081,'Marahoue','12',1054),(2082,'Moyen-Comoe','05',1054),(2083,'Nzi-Comoe','11',1054),(2084,'Savanes','03',1054),(2085,'Sud-Bandama','15',1054),(2086,'Sud-Comoe','13',1054),(2087,'Vallee du Bandama','04',1054),(2088,'Worodouqou','14',1054),(2089,'Zanzan','08',1054),(2090,'Aisen del General Carlos Ibanez del Campo','AI',1044),(2091,'Antofagasta','AN',1044),(2092,'Araucania','AR',1044),(2093,'Atacama','AT',1044),(2094,'Bio-Bio','BI',1044),(2095,'Coquimbo','CO',1044),(2096,'Libertador General Bernardo O\'Higgins','LI',1044),(2097,'Los Lagos','LL',1044),(2098,'Magallanes','MA',1044),(2099,'Maule','ML',1044),(2100,'Santiago Metropolitan','SM',1044),(2101,'Tarapaca','TA',1044),(2102,'Valparaiso','VS',1044),(2103,'Adamaoua','AD',1038),(2104,'Centre','CE',1038),(2105,'East','ES',1038),(2106,'Far North','EN',1038),(2107,'North','NO',1038),(2108,'South','SW',1038),(2109,'South-West','SW',1038),(2110,'West','OU',1038),(2111,'Beijing','11',1045),(2112,'Chongqing','50',1045),(2113,'Shanghai','31',1045),(2114,'Tianjin','12',1045),(2115,'Anhui','34',1045),(2116,'Fujian','35',1045),(2117,'Gansu','62',1045),(2118,'Guangdong','44',1045),(2119,'Guizhou','52',1045),(2120,'Hainan','46',1045),(2121,'Hebei','13',1045),(2122,'Heilongjiang','23',1045),(2123,'Henan','41',1045),(2124,'Hubei','42',1045),(2125,'Hunan','43',1045),(2126,'Jiangsu','32',1045),(2127,'Jiangxi','36',1045),(2128,'Jilin','22',1045),(2129,'Liaoning','21',1045),(2130,'Qinghai','63',1045),(2131,'Shaanxi','61',1045),(2132,'Shandong','37',1045),(2133,'Shanxi','14',1045),(2134,'Sichuan','51',1045),(2135,'Taiwan','71',1045),(2136,'Yunnan','53',1045),(2137,'Zhejiang','33',1045),(2138,'Guangxi','45',1045),(2139,'Neia Mongol (mn)','15',1045),(2140,'Xinjiang','65',1045),(2141,'Xizang','54',1045),(2142,'Hong Kong','91',1045),(2143,'Macau','92',1045),(2144,'Distrito Capital de Bogotá','DC',1048),(2145,'Amazonea','AMA',1048),(2146,'Antioquia','ANT',1048),(2147,'Arauca','ARA',1048),(2148,'Atlántico','ATL',1048),(2149,'Bolívar','BOL',1048),(2150,'Boyacá','BOY',1048),(2151,'Caldea','CAL',1048),(2152,'Caquetá','CAQ',1048),(2153,'Casanare','CAS',1048),(2154,'Cauca','CAU',1048),(2155,'Cesar','CES',1048),(2156,'Córdoba','COR',1048),(2157,'Cundinamarca','CUN',1048),(2158,'Chocó','CHO',1048),(2159,'Guainía','GUA',1048),(2160,'Guaviare','GUV',1048),(2161,'La Guajira','LAG',1048),(2162,'Magdalena','MAG',1048),(2163,'Meta','MET',1048),(2164,'Nariño','NAR',1048),(2165,'Norte de Santander','NSA',1048),(2166,'Putumayo','PUT',1048),(2167,'Quindio','QUI',1048),(2168,'Risaralda','RIS',1048),(2169,'San Andrés, Providencia y Santa Catalina','SAP',1048),(2170,'Santander','SAN',1048),(2171,'Sucre','SUC',1048),(2172,'Tolima','TOL',1048),(2173,'Valle del Cauca','VAC',1048),(2174,'Vaupés','VAU',1048),(2175,'Vichada','VID',1048),(2176,'Alajuela','A',1053),(2177,'Cartago','C',1053),(2178,'Guanacaste','G',1053),(2179,'Heredia','H',1053),(2180,'Limon','L',1053),(2181,'Puntarenas','P',1053),(2182,'San Jose','SJ',1053),(2183,'Camagey','09',1056),(2184,'Ciego de `vila','08',1056),(2185,'Cienfuegos','06',1056),(2186,'Ciudad de La Habana','03',1056),(2187,'Granma','12',1056),(2188,'Guantanamo','14',1056),(2189,'Holquin','11',1056),(2190,'La Habana','02',1056),(2191,'Las Tunas','10',1056),(2192,'Matanzas','04',1056),(2193,'Pinar del Rio','01',1056),(2194,'Sancti Spiritus','07',1056),(2195,'Santiago de Cuba','13',1056),(2196,'Villa Clara','05',1056),(2197,'Isla de la Juventud','99',1056),(2198,'Pinar del Roo','PR',1056),(2199,'Ciego de Avila','CA',1056),(2200,'Camagoey','CG',1056),(2201,'Holgun','HO',1056),(2202,'Sancti Spritus','SS',1056),(2203,'Municipio Especial Isla de la Juventud','IJ',1056),(2204,'Boa Vista','BV',1040),(2205,'Brava','BR',1040),(2206,'Calheta de Sao Miguel','CS',1040),(2207,'Fogo','FO',1040),(2208,'Maio','MA',1040),(2209,'Mosteiros','MO',1040),(2210,'Paul','PA',1040),(2211,'Porto Novo','PN',1040),(2212,'Praia','PR',1040),(2213,'Ribeira Grande','RG',1040),(2214,'Sal','SL',1040),(2215,'Sao Domingos','SD',1040),(2216,'Sao Filipe','SF',1040),(2217,'Sao Nicolau','SN',1040),(2218,'Sao Vicente','SV',1040),(2219,'Tarrafal','TA',1040),(2220,'Ammochostos Magusa','04',1057),(2221,'Keryneia','06',1057),(2222,'Larnaka','03',1057),(2223,'Lefkosia','01',1057),(2224,'Lemesos','02',1057),(2225,'Pafos','05',1057),(2226,'Jihočeský kraj','JC',1058),(2227,'Jihomoravský kraj','JM',1058),(2228,'Karlovarský kraj','KA',1058),(2229,'Královéhradecký kraj','KR',1058),(2230,'Liberecký kraj','LI',1058),(2231,'Moravskoslezský kraj','MO',1058),(2232,'Olomoucký kraj','OL',1058),(2233,'Pardubický kraj','PA',1058),(2234,'Plzeňský kraj','PL',1058),(2235,'Praha, hlavní město','PR',1058),(2236,'Středočeský kraj','ST',1058),(2237,'Ústecký kraj','US',1058),(2238,'Vysočina','VY',1058),(2239,'Zlínský kraj','ZL',1058),(2240,'Baden-Württemberg','BW',1082),(2241,'Bayern','BY',1082),(2242,'Bremen','HB',1082),(2243,'Hamburg','HH',1082),(2244,'Hessen','HE',1082),(2245,'Niedersachsen','NI',1082),(2246,'Nordrhein-Westfalen','NW',1082),(2247,'Rheinland-Pfalz','RP',1082),(2248,'Saarland','SL',1082),(2249,'Schleswig-Holstein','SH',1082),(2250,'Berlin','BE',1082),(2251,'Brandenburg','BB',1082),(2252,'Mecklenburg-Vorpommern','MV',1082),(2253,'Sachsen','SN',1082),(2254,'Sachsen-Anhalt','ST',1082),(2255,'Thüringen','TH',1082),(2256,'Ali Sabiah','AS',1060),(2257,'Dikhil','DI',1060),(2258,'Djibouti','DJ',1060),(2259,'Obock','OB',1060),(2260,'Tadjoura','TA',1060),(2261,'Frederiksberg','147',1059),(2262,'Copenhagen City','101',1059),(2263,'Copenhagen','015',1059),(2264,'Frederiksborg','020',1059),(2265,'Roskilde','025',1059),(2266,'Vestsjælland','030',1059),(2267,'Storstrøm','035',1059),(2268,'Bornholm','040',1059),(2269,'Fyn','042',1059),(2270,'South Jutland','050',1059),(2271,'Ribe','055',1059),(2272,'Vejle','060',1059),(2273,'Ringkjøbing','065',1059),(2274,'Århus','070',1059),(2275,'Viborg','076',1059),(2276,'North Jutland','080',1059),(2277,'Distrito Nacional (Santo Domingo)','01',1062),(2278,'Azua','02',1062),(2279,'Bahoruco','03',1062),(2280,'Barahona','04',1062),(2281,'Dajabón','05',1062),(2282,'Duarte','06',1062),(2283,'El Seybo [El Seibo]','08',1062),(2284,'Espaillat','09',1062),(2285,'Hato Mayor','30',1062),(2286,'Independencia','10',1062),(2287,'La Altagracia','11',1062),(2288,'La Estrelleta [Elias Pina]','07',1062),(2289,'La Romana','12',1062),(2290,'La Vega','13',1062),(2291,'Maroia Trinidad Sánchez','14',1062),(2292,'Monseñor Nouel','28',1062),(2293,'Monte Cristi','15',1062),(2294,'Monte Plata','29',1062),(2295,'Pedernales','16',1062),(2296,'Peravia','17',1062),(2297,'Puerto Plata','18',1062),(2298,'Salcedo','19',1062),(2299,'Samaná','20',1062),(2300,'San Cristóbal','21',1062),(2301,'San Pedro de Macorís','23',1062),(2302,'Sánchez Ramírez','24',1062),(2303,'Santiago','25',1062),(2304,'Santiago Rodríguez','26',1062),(2305,'Valverde','27',1062),(2306,'Adrar','01',1003),(2307,'Ain Defla','44',1003),(2308,'Ain Tmouchent','46',1003),(2309,'Alger','16',1003),(2310,'Annaba','23',1003),(2311,'Batna','05',1003),(2312,'Bechar','08',1003),(2313,'Bejaia','06',1003),(2314,'Biskra','07',1003),(2315,'Blida','09',1003),(2316,'Bordj Bou Arreridj','34',1003),(2317,'Bouira','10',1003),(2318,'Boumerdes','35',1003),(2319,'Chlef','02',1003),(2320,'Constantine','25',1003),(2321,'Djelfa','17',1003),(2322,'El Bayadh','32',1003),(2323,'El Oued','39',1003),(2324,'El Tarf','36',1003),(2325,'Ghardaia','47',1003),(2326,'Guelma','24',1003),(2327,'Illizi','33',1003),(2328,'Jijel','18',1003),(2329,'Khenchela','40',1003),(2330,'Laghouat','03',1003),(2331,'Mascara','29',1003),(2332,'Medea','26',1003),(2333,'Mila','43',1003),(2334,'Mostaganem','27',1003),(2335,'Msila','28',1003),(2336,'Naama','45',1003),(2337,'Oran','31',1003),(2338,'Ouargla','30',1003),(2339,'Oum el Bouaghi','04',1003),(2340,'Relizane','48',1003),(2341,'Saida','20',1003),(2342,'Setif','19',1003),(2343,'Sidi Bel Abbes','22',1003),(2344,'Skikda','21',1003),(2345,'Souk Ahras','41',1003),(2346,'Tamanghasset','11',1003),(2347,'Tebessa','12',1003),(2348,'Tiaret','14',1003),(2349,'Tindouf','37',1003),(2350,'Tipaza','42',1003),(2351,'Tissemsilt','38',1003),(2352,'Tizi Ouzou','15',1003),(2353,'Tlemcen','13',1003),(2354,'Azuay','A',1064),(2355,'Bolivar','B',1064),(2356,'Canar','F',1064),(2357,'Carchi','C',1064),(2358,'Cotopaxi','X',1064),(2359,'Chimborazo','H',1064),(2360,'El Oro','O',1064),(2361,'Esmeraldas','E',1064),(2362,'Galapagos','W',1064),(2363,'Guayas','G',1064),(2364,'Imbabura','I',1064),(2365,'Loja','L',1064),(2366,'Los Rios','R',1064),(2367,'Manabi','M',1064),(2368,'Morona-Santiago','S',1064),(2369,'Napo','N',1064),(2370,'Orellana','D',1064),(2371,'Pastaza','Y',1064),(2372,'Pichincha','P',1064),(2373,'Sucumbios','U',1064),(2374,'Tungurahua','T',1064),(2375,'Zamora-Chinchipe','Z',1064),(2376,'Harjumaa','37',1069),(2377,'Hiiumaa','39',1069),(2378,'Ida-Virumaa','44',1069),(2379,'Jõgevamaa','49',1069),(2380,'Järvamaa','51',1069),(2381,'Läänemaa','57',1069),(2382,'Lääne-Virumaa','59',1069),(2383,'Põlvamaa','65',1069),(2384,'Pärnumaa','67',1069),(2385,'Raplamaa','70',1069),(2386,'Saaremaa','74',1069),(2387,'Tartumaa','7B',1069),(2388,'Valgamaa','82',1069),(2389,'Viljandimaa','84',1069),(2390,'Võrumaa','86',1069),(2391,'Ad Daqahllyah','DK',1065),(2392,'Al Bahr al Ahmar','BA',1065),(2393,'Al Buhayrah','BH',1065),(2394,'Al Fayym','FYM',1065),(2395,'Al Gharbiyah','GH',1065),(2396,'Al Iskandarlyah','ALX',1065),(2397,'Al Isma illyah','IS',1065),(2398,'Al Jizah','GZ',1065),(2399,'Al Minuflyah','MNF',1065),(2400,'Al Minya','MN',1065),(2401,'Al Qahirah','C',1065),(2402,'Al Qalyublyah','KB',1065),(2403,'Al Wadi al Jadid','WAD',1065),(2404,'Ash Sharqiyah','SHR',1065),(2405,'As Suways','SUZ',1065),(2406,'Aswan','ASN',1065),(2407,'Asyut','AST',1065),(2408,'Bani Suwayf','BNS',1065),(2409,'Bur Sa\'id','PTS',1065),(2410,'Dumyat','DT',1065),(2411,'Janub Sina\'','JS',1065),(2412,'Kafr ash Shaykh','KFS',1065),(2413,'Matruh','MT',1065),(2414,'Qina','KN',1065),(2415,'Shamal Sina\'','SIN',1065),(2416,'Suhaj','SHG',1065),(2417,'Anseba','AN',1068),(2418,'Debub','DU',1068),(2419,'Debubawi Keyih Bahri [Debub-Keih-Bahri]','DK',1068),(2420,'Gash-Barka','GB',1068),(2421,'Maakel [Maekel]','MA',1068),(2422,'Semenawi Keyih Bahri [Semien-Keih-Bahri]','SK',1068),(2423,'Álava','VI',1198),(2424,'Albacete','AB',1198),(2425,'Alicante','A',1198),(2426,'Almería','AL',1198),(2427,'Asturias','O',1198),(2428,'Ávila','AV',1198),(2429,'Badajoz','BA',1198),(2430,'Baleares','PM',1198),(2431,'Barcelona','B',1198),(2432,'Burgos','BU',1198),(2433,'Cáceres','CC',1198),(2434,'Cádiz','CA',1198),(2435,'Cantabria','S',1198),(2436,'Castellón','CS',1198),(2437,'Ciudad Real','CR',1198),(2438,'Cuenca','CU',1198),(2439,'Girona [Gerona]','GE',1198),(2440,'Granada','GR',1198),(2441,'Guadalajara','GU',1198),(2442,'Guipúzcoa','SS',1198),(2443,'Huelva','H',1198),(2444,'Huesca','HU',1198),(2445,'Jaén','J',1198),(2446,'La Coruña','C',1198),(2447,'La Rioja','LO',1198),(2448,'Las Palmas','GC',1198),(2449,'León','LE',1198),(2450,'Lleida [Lérida]','L',1198),(2451,'Lugo','LU',1198),(2452,'Madrid','M',1198),(2453,'Málaga','MA',1198),(2454,'Murcia','MU',1198),(2455,'Navarra','NA',1198),(2456,'Ourense','OR',1198),(2457,'Palencia','P',1198),(2458,'Pontevedra','PO',1198),(2459,'Salamanca','SA',1198),(2460,'Santa Cruz de Tenerife','TF',1198),(2461,'Segovia','SG',1198),(2462,'Sevilla','SE',1198),(2463,'Soria','SO',1198),(2464,'Tarragona','T',1198),(2465,'Teruel','TE',1198),(2466,'Valencia','V',1198),(2467,'Valladolid','VA',1198),(2468,'Vizcaya','BI',1198),(2469,'Zamora','ZA',1198),(2470,'Zaragoza','Z',1198),(2471,'Ceuta','CE',1198),(2472,'Melilla','ML',1198),(2473,'Addis Ababa','AA',1070),(2474,'Dire Dawa','DD',1070),(2475,'Afar','AF',1070),(2476,'Amara','AM',1070),(2477,'Benshangul-Gumaz','BE',1070),(2478,'Gambela Peoples','GA',1070),(2479,'Harari People','HA',1070),(2480,'Oromia','OR',1070),(2481,'Somali','SO',1070),(2482,'Southern Nations, Nationalities and Peoples','SN',1070),(2483,'Tigrai','TI',1070),(2490,'Eastern','E',1074),(2491,'Northern','N',1074),(2492,'Western','W',1074),(2493,'Rotuma','R',1074),(2494,'Chuuk','TRK',1141),(2495,'Kosrae','KSA',1141),(2496,'Pohnpei','PNI',1141),(2497,'Yap','YAP',1141),(2498,'Ain','01',1076),(2499,'Aisne','02',1076),(2500,'Allier','03',1076),(2501,'Alpes-de-Haute-Provence','04',1076),(2502,'Alpes-Maritimes','06',1076),(2503,'Ardèche','07',1076),(2504,'Ardennes','08',1076),(2505,'Ariège','09',1076),(2506,'Aube','10',1076),(2507,'Aude','11',1076),(2508,'Aveyron','12',1076),(2509,'Bas-Rhin','67',1076),(2510,'Bouches-du-Rhône','13',1076),(2511,'Calvados','14',1076),(2512,'Cantal','15',1076),(2513,'Charente','16',1076),(2514,'Charente-Maritime','17',1076),(2515,'Cher','18',1076),(2516,'Corrèze','19',1076),(2517,'Corse-du-Sud','20A',1076),(2518,'Côte-d\'Or','21',1076),(2519,'Côtes-d\'Armor','22',1076),(2520,'Creuse','23',1076),(2521,'Deux-Sèvres','79',1076),(2522,'Dordogne','24',1076),(2523,'Doubs','25',1076),(2524,'Drôme','26',1076),(2525,'Essonne','91',1076),(2526,'Eure','27',1076),(2527,'Eure-et-Loir','28',1076),(2528,'Finistère','29',1076),(2529,'Gard','30',1076),(2530,'Gers','32',1076),(2531,'Gironde','33',1076),(2532,'Haut-Rhin','68',1076),(2533,'Haute-Corse','20B',1076),(2534,'Haute-Garonne','31',1076),(2535,'Haute-Loire','43',1076),(2536,'Haute-Saône','70',1076),(2537,'Haute-Savoie','74',1076),(2538,'Haute-Vienne','87',1076),(2539,'Hautes-Alpes','05',1076),(2540,'Hautes-Pyrénées','65',1076),(2541,'Hauts-de-Seine','92',1076),(2542,'Hérault','34',1076),(2543,'Indre','36',1076),(2544,'Ille-et-Vilaine','35',1076),(2545,'Indre-et-Loire','37',1076),(2546,'Isère','38',1076),(2547,'Landes','40',1076),(2548,'Loir-et-Cher','41',1076),(2549,'Loire','42',1076),(2550,'Loire-Atlantique','44',1076),(2551,'Loiret','45',1076),(2552,'Lot','46',1076),(2553,'Lot-et-Garonne','47',1076),(2554,'Lozère','48',1076),(2555,'Maine-et-Loire','49',1076),(2556,'Manche','50',1076),(2557,'Marne','51',1076),(2558,'Mayenne','53',1076),(2559,'Meurthe-et-Moselle','54',1076),(2560,'Meuse','55',1076),(2561,'Morbihan','56',1076),(2562,'Moselle','57',1076),(2563,'Nièvre','58',1076),(2564,'Nord','59',1076),(2565,'Oise','60',1076),(2566,'Orne','61',1076),(2567,'Paris','75',1076),(2568,'Pas-de-Calais','62',1076),(2569,'Puy-de-Dôme','63',1076),(2570,'Pyrénées-Atlantiques','64',1076),(2571,'Pyrénées-Orientales','66',1076),(2572,'Rhône','69',1076),(2573,'Saône-et-Loire','71',1076),(2574,'Sarthe','72',1076),(2575,'Savoie','73',1076),(2576,'Seine-et-Marne','77',1076),(2577,'Seine-Maritime','76',1076),(2578,'Seine-Saint-Denis','93',1076),(2579,'Somme','80',1076),(2580,'Tarn','81',1076),(2581,'Tarn-et-Garonne','82',1076),(2582,'Val d\'Oise','95',1076),(2583,'Territoire de Belfort','90',1076),(2584,'Val-de-Marne','94',1076),(2585,'Var','83',1076),(2586,'Vaucluse','84',1076),(2587,'Vendée','85',1076),(2588,'Vienne','86',1076),(2589,'Vosges','88',1076),(2590,'Yonne','89',1076),(2591,'Yvelines','78',1076),(2592,'Aberdeen City','ABE',1226),(2593,'Aberdeenshire','ABD',1226),(2594,'Angus','ANS',1226),(2595,'Co Antrim','ANT',1226),(2597,'Argyll and Bute','AGB',1226),(2598,'Co Armagh','ARM',1226),(2606,'Bedfordshire','BDF',1226),(2612,'Gwent','BGW',1226),(2620,'Bristol, City of','BST',1226),(2622,'Buckinghamshire','BKM',1226),(2626,'Cambridgeshire','CAM',1226),(2634,'Cheshire','CHS',1226),(2635,'Clackmannanshire','CLK',1226),(2639,'Cornwall','CON',1226),(2643,'Cumbria','CMA',1226),(2647,'Derbyshire','DBY',1226),(2648,'Co Londonderry','DRY',1226),(2649,'Devon','DEV',1226),(2651,'Dorset','DOR',1226),(2652,'Co Down','DOW',1226),(2654,'Dumfries and Galloway','DGY',1226),(2655,'Dundee City','DND',1226),(2657,'County Durham','DUR',1226),(2659,'East Ayrshire','EAY',1226),(2660,'East Dunbartonshire','EDU',1226),(2661,'East Lothian','ELN',1226),(2662,'East Renfrewshire','ERW',1226),(2663,'East Riding of Yorkshire','ERY',1226),(2664,'East Sussex','ESX',1226),(2665,'Edinburgh, City of','EDH',1226),(2666,'Na h-Eileanan Siar','ELS',1226),(2668,'Essex','ESS',1226),(2669,'Falkirk','FAL',1226),(2670,'Co Fermanagh','FER',1226),(2671,'Fife','FIF',1226),(2674,'Glasgow City','GLG',1226),(2675,'Gloucestershire','GLS',1226),(2678,'Gwynedd','GWN',1226),(2682,'Hampshire','HAM',1226),(2687,'Herefordshire','HEF',1226),(2688,'Hertfordshire','HRT',1226),(2689,'Highland','HED',1226),(2692,'Inverclyde','IVC',1226),(2694,'Isle of Wight','IOW',1226),(2699,'Kent','KEN',1226),(2705,'Lancashire','LAN',1226),(2709,'Leicestershire','LEC',1226),(2712,'Lincolnshire','LIN',1226),(2723,'Midlothian','MLN',1226),(2726,'Moray','MRY',1226),(2734,'Norfolk','NFK',1226),(2735,'North Ayrshire','NAY',1226),(2738,'North Lanarkshire','NLK',1226),(2742,'North Yorkshire','NYK',1226),(2743,'Northamptonshire','NTH',1226),(2744,'Northumberland','NBL',1226),(2746,'Nottinghamshire','NTT',1226),(2747,'Oldham','OLD',1226),(2748,'Omagh','OMH',1226),(2749,'Orkney Islands','ORR',1226),(2750,'Oxfordshire','OXF',1226),(2752,'Perth and Kinross','PKN',1226),(2757,'Powys','POW',1226),(2761,'Renfrewshire','RFW',1226),(2766,'Rutland','RUT',1226),(2770,'Scottish Borders','SCB',1226),(2773,'Shetland Islands','ZET',1226),(2774,'Shropshire','SHR',1226),(2777,'Somerset','SOM',1226),(2778,'South Ayrshire','SAY',1226),(2779,'South Gloucestershire','SGC',1226),(2780,'South Lanarkshire','SLK',1226),(2785,'Staffordshire','STS',1226),(2786,'Stirling','STG',1226),(2791,'Suffolk','SFK',1226),(2793,'Surrey','SRY',1226),(2804,'Mid Glamorgan','VGL',1226),(2811,'Warwickshire','WAR',1226),(2813,'West Dunbartonshire','WDU',1226),(2814,'West Lothian','WLN',1226),(2815,'West Sussex','WSX',1226),(2818,'Wiltshire','WIL',1226),(2823,'Worcestershire','WOR',1226),(2826,'Ashanti','AH',1083),(2827,'Brong-Ahafo','BA',1083),(2828,'Greater Accra','AA',1083),(2829,'Upper East','UE',1083),(2830,'Upper West','UW',1083),(2831,'Volta','TV',1083),(2832,'Banjul','B',1213),(2833,'Lower River','L',1213),(2834,'MacCarthy Island','M',1213),(2835,'North Bank','N',1213),(2836,'Upper River','U',1213),(2837,'Beyla','BE',1091),(2838,'Boffa','BF',1091),(2839,'Boke','BK',1091),(2840,'Coyah','CO',1091),(2841,'Dabola','DB',1091),(2842,'Dalaba','DL',1091),(2843,'Dinguiraye','DI',1091),(2844,'Dubreka','DU',1091),(2845,'Faranah','FA',1091),(2846,'Forecariah','FO',1091),(2847,'Fria','FR',1091),(2848,'Gaoual','GA',1091),(2849,'Guekedou','GU',1091),(2850,'Kankan','KA',1091),(2851,'Kerouane','KE',1091),(2852,'Kindia','KD',1091),(2853,'Kissidougou','KS',1091),(2854,'Koubia','KB',1091),(2855,'Koundara','KN',1091),(2856,'Kouroussa','KO',1091),(2857,'Labe','LA',1091),(2858,'Lelouma','LE',1091),(2859,'Lola','LO',1091),(2860,'Macenta','MC',1091),(2861,'Mali','ML',1091),(2862,'Mamou','MM',1091),(2863,'Mandiana','MD',1091),(2864,'Nzerekore','NZ',1091),(2865,'Pita','PI',1091),(2866,'Siguiri','SI',1091),(2867,'Telimele','TE',1091),(2868,'Tougue','TO',1091),(2869,'Yomou','YO',1091),(2870,'Region Continental','C',1067),(2871,'Region Insular','I',1067),(2872,'Annobon','AN',1067),(2873,'Bioko Norte','BN',1067),(2874,'Bioko Sur','BS',1067),(2875,'Centro Sur','CS',1067),(2876,'Kie-Ntem','KN',1067),(2877,'Litoral','LI',1067),(2878,'Wele-Nzas','WN',1067),(2879,'Achaïa','13',1085),(2880,'Aitolia-Akarnania','01',1085),(2881,'Argolis','11',1085),(2882,'Arkadia','12',1085),(2883,'Arta','31',1085),(2884,'Attiki','A1',1085),(2885,'Chalkidiki','64',1085),(2886,'Chania','94',1085),(2887,'Chios','85',1085),(2888,'Dodekanisos','81',1085),(2889,'Drama','52',1085),(2890,'Evros','71',1085),(2891,'Evrytania','05',1085),(2892,'Evvoia','04',1085),(2893,'Florina','63',1085),(2894,'Fokis','07',1085),(2895,'Fthiotis','06',1085),(2896,'Grevena','51',1085),(2897,'Ileia','14',1085),(2898,'Imathia','53',1085),(2899,'Ioannina','33',1085),(2900,'Irakleion','91',1085),(2901,'Karditsa','41',1085),(2902,'Kastoria','56',1085),(2903,'Kavalla','55',1085),(2904,'Kefallinia','23',1085),(2905,'Kerkyra','22',1085),(2906,'Kilkis','57',1085),(2907,'Korinthia','15',1085),(2908,'Kozani','58',1085),(2909,'Kyklades','82',1085),(2910,'Lakonia','16',1085),(2911,'Larisa','42',1085),(2912,'Lasithion','92',1085),(2913,'Lefkas','24',1085),(2914,'Lesvos','83',1085),(2915,'Magnisia','43',1085),(2916,'Messinia','17',1085),(2917,'Pella','59',1085),(2918,'Preveza','34',1085),(2919,'Rethymnon','93',1085),(2920,'Rodopi','73',1085),(2921,'Samos','84',1085),(2922,'Serrai','62',1085),(2923,'Thesprotia','32',1085),(2924,'Thessaloniki','54',1085),(2925,'Trikala','44',1085),(2926,'Voiotia','03',1085),(2927,'Xanthi','72',1085),(2928,'Zakynthos','21',1085),(2929,'Agio Oros','69',1085),(2930,'Alta Verapaz','AV',1090),(2931,'Baja Verapaz','BV',1090),(2932,'Chimaltenango','CM',1090),(2933,'Chiquimula','CQ',1090),(2934,'El Progreso','PR',1090),(2935,'Escuintla','ES',1090),(2936,'Guatemala','GU',1090),(2937,'Huehuetenango','HU',1090),(2938,'Izabal','IZ',1090),(2939,'Jalapa','JA',1090),(2940,'Jutiapa','JU',1090),(2941,'Peten','PE',1090),(2942,'Quetzaltenango','QZ',1090),(2943,'Quiche','QC',1090),(2944,'Retalhuleu','RE',1090),(2945,'Sacatepequez','SA',1090),(2946,'San Marcos','SM',1090),(2947,'Santa Rosa','SR',1090),(2948,'Sololá','SO',1090),(2949,'Suchitepequez','SU',1090),(2950,'Totonicapan','TO',1090),(2951,'Zacapa','ZA',1090),(2952,'Bissau','BS',1092),(2953,'Bafata','BA',1092),(2954,'Biombo','BM',1092),(2955,'Bolama','BL',1092),(2956,'Cacheu','CA',1092),(2957,'Gabu','GA',1092),(2958,'Oio','OI',1092),(2959,'Quloara','QU',1092),(2960,'Tombali S','TO',1092),(2961,'Barima-Waini','BA',1093),(2962,'Cuyuni-Mazaruni','CU',1093),(2963,'Demerara-Mahaica','DE',1093),(2964,'East Berbice-Corentyne','EB',1093),(2965,'Essequibo Islands-West Demerara','ES',1093),(2966,'Mahaica-Berbice','MA',1093),(2967,'Pomeroon-Supenaam','PM',1093),(2968,'Potaro-Siparuni','PT',1093),(2969,'Upper Demerara-Berbice','UD',1093),(2970,'Upper Takutu-Upper Essequibo','UT',1093),(2971,'Atlantida','AT',1097),(2972,'Colon','CL',1097),(2973,'Comayagua','CM',1097),(2974,'Copan','CP',1097),(2975,'Cortes','CR',1097),(2976,'Choluteca','CH',1097),(2977,'El Paraiso','EP',1097),(2978,'Francisco Morazan','FM',1097),(2979,'Gracias a Dios','GD',1097),(2980,'Intibuca','IN',1097),(2981,'Islas de la Bahia','IB',1097),(2982,'Lempira','LE',1097),(2983,'Ocotepeque','OC',1097),(2984,'Olancho','OL',1097),(2985,'Santa Barbara','SB',1097),(2986,'Valle','VA',1097),(2987,'Yoro','YO',1097),(2988,'Bjelovarsko-bilogorska zupanija','07',1055),(2989,'Brodsko-posavska zupanija','12',1055),(2990,'Dubrovacko-neretvanska zupanija','19',1055),(2991,'Istarska zupanija','18',1055),(2992,'Karlovacka zupanija','04',1055),(2993,'Koprivnickco-krizevacka zupanija','06',1055),(2994,'Krapinako-zagorska zupanija','02',1055),(2995,'Licko-senjska zupanija','09',1055),(2996,'Medimurska zupanija','20',1055),(2997,'Osjecko-baranjska zupanija','14',1055),(2998,'Pozesko-slavonska zupanija','11',1055),(2999,'Primorsko-goranska zupanija','08',1055),(3000,'Sisacko-moelavacka Iupanija','03',1055),(3001,'Splitako-dalmatinska zupanija','17',1055),(3002,'Sibenako-kninska zupanija','15',1055),(3003,'Varaidinska zupanija','05',1055),(3004,'VirovitiEko-podravska zupanija','10',1055),(3005,'VuRovarako-srijemska zupanija','16',1055),(3006,'Zadaraka','13',1055),(3007,'Zagrebacka zupanija','01',1055),(3008,'Grande-Anse','GA',1094),(3009,'Nord-Est','NE',1094),(3010,'Nord-Ouest','NO',1094),(3011,'Ouest','OU',1094),(3012,'Sud','SD',1094),(3013,'Sud-Est','SE',1094),(3014,'Budapest','BU',1099),(3015,'Bács-Kiskun','BK',1099),(3016,'Baranya','BA',1099),(3017,'Békés','BE',1099),(3018,'Borsod-Abaúj-Zemplén','BZ',1099),(3019,'Csongrád','CS',1099),(3020,'Fejér','FE',1099),(3021,'Győr-Moson-Sopron','GS',1099),(3022,'Hajdu-Bihar','HB',1099),(3023,'Heves','HE',1099),(3024,'Jász-Nagykun-Szolnok','JN',1099),(3025,'Komárom-Esztergom','KE',1099),(3026,'Nográd','NO',1099),(3027,'Pest','PE',1099),(3028,'Somogy','SO',1099),(3029,'Szabolcs-Szatmár-Bereg','SZ',1099),(3030,'Tolna','TO',1099),(3031,'Vas','VA',1099),(3032,'Veszprém','VE',1099),(3033,'Zala','ZA',1099),(3034,'Békéscsaba','BC',1099),(3035,'Debrecen','DE',1099),(3036,'Dunaújváros','DU',1099),(3037,'Eger','EG',1099),(3038,'Győr','GY',1099),(3039,'Hódmezővásárhely','HV',1099),(3040,'Kaposvár','KV',1099),(3041,'Kecskemét','KM',1099),(3042,'Miskolc','MI',1099),(3043,'Nagykanizsa','NK',1099),(3044,'Nyiregyháza','NY',1099),(3045,'Pécs','PS',1099),(3046,'Salgótarján','ST',1099),(3047,'Sopron','SN',1099),(3048,'Szeged','SD',1099),(3049,'Székesfehérvár','SF',1099),(3050,'Szekszárd','SS',1099),(3051,'Szolnok','SK',1099),(3052,'Szombathely','SH',1099),(3053,'Tatabánya','TB',1099),(3054,'Zalaegerszeg','ZE',1099),(3055,'Bali','BA',1102),(3056,'Kepulauan Bangka Belitung','BB',1102),(3057,'Banten','BT',1102),(3058,'Bengkulu','BE',1102),(3059,'Gorontalo','GO',1102),(3060,'Papua Barat','PB',1102),(3061,'Jambi','JA',1102),(3062,'Jawa Barat','JB',1102),(3063,'Jawa Tengah','JT',1102),(3064,'Jawa Timur','JI',1102),(3065,'Kalimantan Barat','KB',1102),(3066,'Kalimantan Timur','KI',1102),(3067,'Kalimantan Selatan','KS',1102),(3068,'Kepulauan Riau','KR',1102),(3069,'Lampung','LA',1102),(3070,'Maluku','MA',1102),(3071,'Maluku Utara','MU',1102),(3072,'Nusa Tenggara Barat','NB',1102),(3073,'Nusa Tenggara Timur','NT',1102),(3074,'Papua','PA',1102),(3075,'Riau','RI',1102),(3076,'Sulawesi Selatan','SN',1102),(3077,'Sulawesi Tengah','ST',1102),(3078,'Sulawesi Tenggara','SG',1102),(3079,'Sulawesi Utara','SA',1102),(3080,'Sumatra Barat','SB',1102),(3081,'Sumatra Selatan','SS',1102),(3082,'Sumatera Utara','SU',1102),(3083,'DKI Jakarta','JK',1102),(3084,'Aceh','AC',1102),(3085,'DI Yogyakarta','YO',1102),(3086,'Cork','C',1105),(3087,'Clare','CE',1105),(3088,'Cavan','CN',1105),(3089,'Carlow','CW',1105),(3090,'Dublin','D',1105),(3091,'Donegal','DL',1105),(3092,'Galway','G',1105),(3093,'Kildare','KE',1105),(3094,'Kilkenny','KK',1105),(3095,'Kerry','KY',1105),(3096,'Longford','LD',1105),(3097,'Louth','LH',1105),(3098,'Limerick','LK',1105),(3099,'Leitrim','LM',1105),(3100,'Laois','LS',1105),(3101,'Meath','MH',1105),(3102,'Monaghan','MN',1105),(3103,'Mayo','MO',1105),(3104,'Offaly','OY',1105),(3105,'Roscommon','RN',1105),(3106,'Sligo','SO',1105),(3107,'Tipperary','TA',1105),(3108,'Waterford','WD',1105),(3109,'Westmeath','WH',1105),(3110,'Wicklow','WW',1105),(3111,'Wexford','WX',1105),(3112,'HaDarom','D',1106),(3113,'HaMerkaz','M',1106),(3114,'HaZafon','Z',1106),(3115,'Haifa','HA',1106),(3116,'Tel-Aviv','TA',1106),(3117,'Jerusalem','JM',1106),(3118,'Al Anbar','AN',1104),(3119,'Al Ba,rah','BA',1104),(3120,'Al Muthanna','MU',1104),(3121,'Al Qadisiyah','QA',1104),(3122,'An Najef','NA',1104),(3123,'Arbil','AR',1104),(3124,'As Sulaymaniyah','SW',1104),(3125,'At Ta\'mim','TS',1104),(3126,'Babil','BB',1104),(3127,'Baghdad','BG',1104),(3128,'Dahuk','DA',1104),(3129,'Dhi Qar','DQ',1104),(3130,'Diyala','DI',1104),(3131,'Karbala\'','KA',1104),(3132,'Maysan','MA',1104),(3133,'Ninawa','NI',1104),(3134,'Salah ad Din','SD',1104),(3135,'Wasit','WA',1104),(3136,'Ardabil','03',1103),(3137,'Azarbayjan-e Gharbi','02',1103),(3138,'Azarbayjan-e Sharqi','01',1103),(3139,'Bushehr','06',1103),(3140,'Chahar Mahall va Bakhtiari','08',1103),(3141,'Esfahan','04',1103),(3142,'Fars','14',1103),(3143,'Gilan','19',1103),(3144,'Golestan','27',1103),(3145,'Hamadan','24',1103),(3146,'Hormozgan','23',1103),(3147,'Iiam','05',1103),(3148,'Kerman','15',1103),(3149,'Kermanshah','17',1103),(3150,'Khorasan','09',1103),(3151,'Khuzestan','10',1103),(3152,'Kohjiluyeh va Buyer Ahmad','18',1103),(3153,'Kordestan','16',1103),(3154,'Lorestan','20',1103),(3155,'Markazi','22',1103),(3156,'Mazandaran','21',1103),(3157,'Qazvin','28',1103),(3158,'Qom','26',1103),(3159,'Semnan','12',1103),(3160,'Sistan va Baluchestan','13',1103),(3161,'Tehran','07',1103),(3162,'Yazd','25',1103),(3163,'Zanjan','11',1103),(3164,'Austurland','7',1100),(3165,'Hofuoborgarsvaeoi utan Reykjavikur','1',1100),(3166,'Norourland eystra','6',1100),(3167,'Norourland vestra','5',1100),(3168,'Reykjavik','0',1100),(3169,'Suourland','8',1100),(3170,'Suournes','2',1100),(3171,'Vestfirolr','4',1100),(3172,'Vesturland','3',1100),(3173,'Agrigento','AG',1107),(3174,'Alessandria','AL',1107),(3175,'Ancona','AN',1107),(3176,'Aosta','AO',1107),(3177,'Arezzo','AR',1107),(3178,'Ascoli Piceno','AP',1107),(3179,'Asti','AT',1107),(3180,'Avellino','AV',1107),(3181,'Bari','BA',1107),(3182,'Belluno','BL',1107),(3183,'Benevento','BN',1107),(3184,'Bergamo','BG',1107),(3185,'Biella','BI',1107),(3186,'Bologna','BO',1107),(3187,'Bolzano','BZ',1107),(3188,'Brescia','BS',1107),(3189,'Brindisi','BR',1107),(3190,'Cagliari','CA',1107),(3191,'Caltanissetta','CL',1107),(3192,'Campobasso','CB',1107),(3193,'Caserta','CE',1107),(3194,'Catania','CT',1107),(3195,'Catanzaro','CZ',1107),(3196,'Chieti','CH',1107),(3197,'Como','CO',1107),(3198,'Cosenza','CS',1107),(3199,'Cremona','CR',1107),(3200,'Crotone','KR',1107),(3201,'Cuneo','CN',1107),(3202,'Enna','EN',1107),(3203,'Ferrara','FE',1107),(3204,'Firenze','FI',1107),(3205,'Foggia','FG',1107),(3206,'Forlì-Cesena','FC',1107),(3207,'Frosinone','FR',1107),(3208,'Genova','GE',1107),(3209,'Gorizia','GO',1107),(3210,'Grosseto','GR',1107),(3211,'Imperia','IM',1107),(3212,'Isernia','IS',1107),(3213,'L\'Aquila','AQ',1107),(3214,'La Spezia','SP',1107),(3215,'Latina','LT',1107),(3216,'Lecce','LE',1107),(3217,'Lecco','LC',1107),(3218,'Livorno','LI',1107),(3219,'Lodi','LO',1107),(3220,'Lucca','LU',1107),(3221,'Macerata','MC',1107),(3222,'Mantova','MN',1107),(3223,'Massa-Carrara','MS',1107),(3224,'Matera','MT',1107),(3225,'Messina','ME',1107),(3226,'Milano','MI',1107),(3227,'Modena','MO',1107),(3228,'Napoli','NA',1107),(3229,'Novara','NO',1107),(3230,'Nuoro','NU',1107),(3231,'Oristano','OR',1107),(3232,'Padova','PD',1107),(3233,'Palermo','PA',1107),(3234,'Parma','PR',1107),(3235,'Pavia','PV',1107),(3236,'Perugia','PG',1107),(3237,'Pesaro e Urbino','PU',1107),(3238,'Pescara','PE',1107),(3239,'Piacenza','PC',1107),(3240,'Pisa','PI',1107),(3241,'Pistoia','PT',1107),(3242,'Pordenone','PN',1107),(3243,'Potenza','PZ',1107),(3244,'Prato','PO',1107),(3245,'Ragusa','RG',1107),(3246,'Ravenna','RA',1107),(3247,'Reggio Calabria','RC',1107),(3248,'Reggio Emilia','RE',1107),(3249,'Rieti','RI',1107),(3250,'Rimini','RN',1107),(3251,'Roma','RM',1107),(3252,'Rovigo','RO',1107),(3253,'Salerno','SA',1107),(3254,'Sassari','SS',1107),(3255,'Savona','SV',1107),(3256,'Siena','SI',1107),(3257,'Siracusa','SR',1107),(3258,'Sondrio','SO',1107),(3259,'Taranto','TA',1107),(3260,'Teramo','TE',1107),(3261,'Terni','TR',1107),(3262,'Torino','TO',1107),(3263,'Trapani','TP',1107),(3264,'Trento','TN',1107),(3265,'Treviso','TV',1107),(3266,'Trieste','TS',1107),(3267,'Udine','UD',1107),(3268,'Varese','VA',1107),(3269,'Venezia','VE',1107),(3270,'Verbano-Cusio-Ossola','VB',1107),(3271,'Vercelli','VC',1107),(3272,'Verona','VR',1107),(3273,'Vibo Valentia','VV',1107),(3274,'Vicenza','VI',1107),(3275,'Viterbo','VT',1107),(3276,'Aichi','23',1109),(3277,'Akita','05',1109),(3278,'Aomori','02',1109),(3279,'Chiba','12',1109),(3280,'Ehime','38',1109),(3281,'Fukui','18',1109),(3282,'Fukuoka','40',1109),(3283,'Fukusima','07',1109),(3284,'Gifu','21',1109),(3285,'Gunma','10',1109),(3286,'Hiroshima','34',1109),(3287,'Hokkaido','01',1109),(3288,'Hyogo','28',1109),(3289,'Ibaraki','08',1109),(3290,'Ishikawa','17',1109),(3291,'Iwate','03',1109),(3292,'Kagawa','37',1109),(3293,'Kagoshima','46',1109),(3294,'Kanagawa','14',1109),(3295,'Kochi','39',1109),(3296,'Kumamoto','43',1109),(3297,'Kyoto','26',1109),(3298,'Mie','24',1109),(3299,'Miyagi','04',1109),(3300,'Miyazaki','45',1109),(3301,'Nagano','20',1109),(3302,'Nagasaki','42',1109),(3303,'Nara','29',1109),(3304,'Niigata','15',1109),(3305,'Oita','44',1109),(3306,'Okayama','33',1109),(3307,'Okinawa','47',1109),(3308,'Osaka','27',1109),(3309,'Saga','41',1109),(3310,'Saitama','11',1109),(3311,'Shiga','25',1109),(3312,'Shimane','32',1109),(3313,'Shizuoka','22',1109),(3314,'Tochigi','09',1109),(3315,'Tokushima','36',1109),(3316,'Tokyo','13',1109),(3317,'Tottori','31',1109),(3318,'Toyama','16',1109),(3319,'Wakayama','30',1109),(3320,'Yamagata','06',1109),(3321,'Yamaguchi','35',1109),(3322,'Yamanashi','19',1109),(3323,'Clarendon','CN',1108),(3324,'Hanover','HR',1108),(3325,'Kingston','KN',1108),(3326,'Portland','PD',1108),(3327,'Saint Andrew','AW',1108),(3328,'Saint Ann','AN',1108),(3329,'Saint Catherine','CE',1108),(3330,'Saint Elizabeth','EH',1108),(3331,'Saint James','JS',1108),(3332,'Saint Mary','MY',1108),(3333,'Saint Thomas','TS',1108),(3334,'Trelawny','TY',1108),(3335,'Westmoreland','WD',1108),(3336,'Ajln','AJ',1110),(3337,'Al \'Aqaba','AQ',1110),(3338,'Al Balqa\'','BA',1110),(3339,'Al Karak','KA',1110),(3340,'Al Mafraq','MA',1110),(3341,'Amman','AM',1110),(3342,'At Tafilah','AT',1110),(3343,'Az Zarga','AZ',1110),(3344,'Irbid','JR',1110),(3345,'Jarash','JA',1110),(3346,'Ma\'an','MN',1110),(3347,'Madaba','MD',1110),(3353,'Bishkek','GB',1117),(3354,'Batken','B',1117),(3355,'Chu','C',1117),(3356,'Jalal-Abad','J',1117),(3357,'Naryn','N',1117),(3358,'Osh','O',1117),(3359,'Talas','T',1117),(3360,'Ysyk-Kol','Y',1117),(3361,'Krong Kaeb','23',1037),(3362,'Krong Pailin','24',1037),(3363,'Xrong Preah Sihanouk','18',1037),(3364,'Phnom Penh','12',1037),(3365,'Baat Dambang','2',1037),(3366,'Banteay Mean Chey','1',1037),(3367,'Rampong Chaam','3',1037),(3368,'Kampong Chhnang','4',1037),(3369,'Kampong Spueu','5',1037),(3370,'Kampong Thum','6',1037),(3371,'Kampot','7',1037),(3372,'Kandaal','8',1037),(3373,'Kach Kong','9',1037),(3374,'Krachoh','10',1037),(3375,'Mondol Kiri','11',1037),(3376,'Otdar Mean Chey','22',1037),(3377,'Pousaat','15',1037),(3378,'Preah Vihear','13',1037),(3379,'Prey Veaeng','14',1037),(3380,'Rotanak Kiri','16',1037),(3381,'Siem Reab','17',1037),(3382,'Stueng Traeng','19',1037),(3383,'Svaay Rieng','20',1037),(3384,'Taakaev','21',1037),(3385,'Gilbert Islands','G',1113),(3386,'Line Islands','L',1113),(3387,'Phoenix Islands','P',1113),(3388,'Anjouan Ndzouani','A',1049),(3389,'Grande Comore Ngazidja','G',1049),(3390,'Moheli Moili','M',1049),(3391,'Kaesong-si','KAE',1114),(3392,'Nampo-si','NAM',1114),(3393,'Pyongyang-ai','PYO',1114),(3394,'Chagang-do','CHA',1114),(3395,'Hamgyongbuk-do','HAB',1114),(3396,'Hamgyongnam-do','HAN',1114),(3397,'Hwanghaebuk-do','HWB',1114),(3398,'Hwanghaenam-do','HWN',1114),(3399,'Kangwon-do','KAN',1114),(3400,'Pyonganbuk-do','PYB',1114),(3401,'Pyongannam-do','PYN',1114),(3402,'Yanggang-do','YAN',1114),(3403,'Najin Sonbong-si','NAJ',1114),(3404,'Seoul Teugbyeolsi','11',1115),(3405,'Busan Gwang\'yeogsi','26',1115),(3406,'Daegu Gwang\'yeogsi','27',1115),(3407,'Daejeon Gwang\'yeogsi','30',1115),(3408,'Gwangju Gwang\'yeogsi','29',1115),(3409,'Incheon Gwang\'yeogsi','28',1115),(3410,'Ulsan Gwang\'yeogsi','31',1115),(3411,'Chungcheongbugdo','43',1115),(3412,'Chungcheongnamdo','44',1115),(3413,'Gang\'weondo','42',1115),(3414,'Gyeonggido','41',1115),(3415,'Gyeongsangbugdo','47',1115),(3416,'Gyeongsangnamdo','48',1115),(3417,'Jejudo','49',1115),(3418,'Jeonrabugdo','45',1115),(3419,'Jeonranamdo','46',1115),(3420,'Al Ahmadi','AH',1116),(3421,'Al Farwanlyah','FA',1116),(3422,'Al Jahrah','JA',1116),(3423,'Al Kuwayt','KU',1116),(3424,'Hawalli','HA',1116),(3425,'Almaty','ALA',1111),(3426,'Astana','AST',1111),(3427,'Almaty oblysy','ALM',1111),(3428,'Aqmola oblysy','AKM',1111),(3429,'Aqtobe oblysy','AKT',1111),(3430,'Atyrau oblyfiy','ATY',1111),(3431,'Batys Quzaqstan oblysy','ZAP',1111),(3432,'Mangghystau oblysy','MAN',1111),(3433,'Ongtustik Quzaqstan oblysy','YUZ',1111),(3434,'Pavlodar oblysy','PAV',1111),(3435,'Qaraghandy oblysy','KAR',1111),(3436,'Qostanay oblysy','KUS',1111),(3437,'Qyzylorda oblysy','KZY',1111),(3438,'Shyghys Quzaqstan oblysy','VOS',1111),(3439,'Soltustik Quzaqstan oblysy','SEV',1111),(3440,'Zhambyl oblysy Zhambylskaya oblast\'','ZHA',1111),(3441,'Vientiane','VT',1118),(3442,'Attapu','AT',1118),(3443,'Bokeo','BK',1118),(3444,'Bolikhamxai','BL',1118),(3445,'Champasak','CH',1118),(3446,'Houaphan','HO',1118),(3447,'Khammouan','KH',1118),(3448,'Louang Namtha','LM',1118),(3449,'Louangphabang','LP',1118),(3450,'Oudomxai','OU',1118),(3451,'Phongsali','PH',1118),(3452,'Salavan','SL',1118),(3453,'Savannakhet','SV',1118),(3454,'Xaignabouli','XA',1118),(3455,'Xiasomboun','XN',1118),(3456,'Xekong','XE',1118),(3457,'Xiangkhoang','XI',1118),(3458,'Beirut','BA',1120),(3459,'Beqaa','BI',1120),(3460,'Mount Lebanon','JL',1120),(3461,'North Lebanon','AS',1120),(3462,'South Lebanon','JA',1120),(3463,'Nabatieh','NA',1120),(3464,'Ampara','52',1199),(3465,'Anuradhapura','71',1199),(3466,'Badulla','81',1199),(3467,'Batticaloa','51',1199),(3468,'Colombo','11',1199),(3469,'Galle','31',1199),(3470,'Gampaha','12',1199),(3471,'Hambantota','33',1199),(3472,'Jaffna','41',1199),(3473,'Kalutara','13',1199),(3474,'Kandy','21',1199),(3475,'Kegalla','92',1199),(3476,'Kilinochchi','42',1199),(3477,'Kurunegala','61',1199),(3478,'Mannar','43',1199),(3479,'Matale','22',1199),(3480,'Matara','32',1199),(3481,'Monaragala','82',1199),(3482,'Mullaittivu','45',1199),(3483,'Nuwara Eliya','23',1199),(3484,'Polonnaruwa','72',1199),(3485,'Puttalum','62',1199),(3486,'Ratnapura','91',1199),(3487,'Trincomalee','53',1199),(3488,'VavunLya','44',1199),(3489,'Bomi','BM',1122),(3490,'Bong','BG',1122),(3491,'Grand Basaa','GB',1122),(3492,'Grand Cape Mount','CM',1122),(3493,'Grand Gedeh','GG',1122),(3494,'Grand Kru','GK',1122),(3495,'Lofa','LO',1122),(3496,'Margibi','MG',1122),(3497,'Maryland','MY',1122),(3498,'Montserrado','MO',1122),(3499,'Nimba','NI',1122),(3500,'Rivercess','RI',1122),(3501,'Sinoe','SI',1122),(3502,'Berea','D',1121),(3503,'Butha-Buthe','B',1121),(3504,'Leribe','C',1121),(3505,'Mafeteng','E',1121),(3506,'Maseru','A',1121),(3507,'Mohale\'s Hoek','F',1121),(3508,'Mokhotlong','J',1121),(3509,'Qacha\'s Nek','H',1121),(3510,'Quthing','G',1121),(3511,'Thaba-Tseka','K',1121),(3512,'Alytaus Apskritis','AL',1125),(3513,'Kauno Apskritis','KU',1125),(3514,'Klaipėdos Apskritis','KL',1125),(3515,'Marijampolės Apskritis','MR',1125),(3516,'Panevėžio Apskritis','PN',1125),(3517,'Šiaulių Apskritis','SA',1125),(3518,'Tauragės Apskritis','TA',1125),(3519,'Telšių Apskritis','TE',1125),(3520,'Utenos Apskritis','UT',1125),(3521,'Vilniaus Apskritis','VL',1125),(3522,'Diekirch','D',1126),(3523,'GreveNmacher','G',1126),(3550,'Daugavpils','DGV',1119),(3551,'Jelgava','JEL',1119),(3552,'Jūrmala','JUR',1119),(3553,'Liepāja','LPX',1119),(3554,'Rēzekne','REZ',1119),(3555,'Rīga','RIX',1119),(3556,'Ventspils','VEN',1119),(3557,'Ajdābiyā','AJ',1123),(3558,'Al Buţnān','BU',1123),(3559,'Al Hizām al Akhdar','HZ',1123),(3560,'Al Jabal al Akhdar','JA',1123),(3561,'Al Jifārah','JI',1123),(3562,'Al Jufrah','JU',1123),(3563,'Al Kufrah','KF',1123),(3564,'Al Marj','MJ',1123),(3565,'Al Marqab','MB',1123),(3566,'Al Qaţrūn','QT',1123),(3567,'Al Qubbah','QB',1123),(3568,'Al Wāhah','WA',1123),(3569,'An Nuqaţ al Khams','NQ',1123),(3570,'Ash Shāţi\'','SH',1123),(3571,'Az Zāwiyah','ZA',1123),(3572,'Banghāzī','BA',1123),(3573,'Banī Walīd','BW',1123),(3574,'Darnah','DR',1123),(3575,'Ghadāmis','GD',1123),(3576,'Gharyān','GR',1123),(3577,'Ghāt','GT',1123),(3578,'Jaghbūb','JB',1123),(3579,'Mişrātah','MI',1123),(3580,'Mizdah','MZ',1123),(3581,'Murzuq','MQ',1123),(3582,'Nālūt','NL',1123),(3583,'Sabhā','SB',1123),(3584,'Şabrātah Şurmān','SS',1123),(3585,'Surt','SR',1123),(3586,'Tājūrā\' wa an Nawāhī al Arbāh','TN',1123),(3587,'Ţarābulus','TB',1123),(3588,'Tarhūnah-Masallātah','TM',1123),(3589,'Wādī al hayāt','WD',1123),(3590,'Yafran-Jādū','YJ',1123),(3591,'Agadir','AGD',1146),(3592,'Aït Baha','BAH',1146),(3593,'Aït Melloul','MEL',1146),(3594,'Al Haouz','HAO',1146),(3595,'Al Hoceïma','HOC',1146),(3596,'Assa-Zag','ASZ',1146),(3597,'Azilal','AZI',1146),(3598,'Beni Mellal','BEM',1146),(3599,'Ben Sllmane','BES',1146),(3600,'Berkane','BER',1146),(3601,'Boujdour','BOD',1146),(3602,'Boulemane','BOM',1146),(3603,'Casablanca  [Dar el Beïda]','CAS',1146),(3604,'Chefchaouene','CHE',1146),(3605,'Chichaoua','CHI',1146),(3606,'El Hajeb','HAJ',1146),(3607,'El Jadida','JDI',1146),(3608,'Errachidia','ERR',1146),(3609,'Essaouira','ESI',1146),(3610,'Es Smara','ESM',1146),(3611,'Fès','FES',1146),(3612,'Figuig','FIG',1146),(3613,'Guelmim','GUE',1146),(3614,'Ifrane','IFR',1146),(3615,'Jerada','JRA',1146),(3616,'Kelaat Sraghna','KES',1146),(3617,'Kénitra','KEN',1146),(3618,'Khemisaet','KHE',1146),(3619,'Khenifra','KHN',1146),(3620,'Khouribga','KHO',1146),(3621,'Laâyoune (EH)','LAA',1146),(3622,'Larache','LAP',1146),(3623,'Marrakech','MAR',1146),(3624,'Meknsès','MEK',1146),(3625,'Nador','NAD',1146),(3626,'Ouarzazate','OUA',1146),(3627,'Oued ed Dahab (EH)','OUD',1146),(3628,'Oujda','OUJ',1146),(3629,'Rabat-Salé','RBA',1146),(3630,'Safi','SAF',1146),(3631,'Sefrou','SEF',1146),(3632,'Settat','SET',1146),(3633,'Sidl Kacem','SIK',1146),(3634,'Tanger','TNG',1146),(3635,'Tan-Tan','TNT',1146),(3636,'Taounate','TAO',1146),(3637,'Taroudannt','TAR',1146),(3638,'Tata','TAT',1146),(3639,'Taza','TAZ',1146),(3640,'Tétouan','TET',1146),(3641,'Tiznit','TIZ',1146),(3642,'Gagauzia, Unitate Teritoriala Autonoma','GA',1142),(3643,'Chisinau','CU',1142),(3644,'Stinga Nistrului, unitatea teritoriala din','SN',1142),(3645,'Balti','BA',1142),(3646,'Cahul','CA',1142),(3647,'Edinet','ED',1142),(3648,'Lapusna','LA',1142),(3649,'Orhei','OR',1142),(3650,'Soroca','SO',1142),(3651,'Taraclia','TA',1142),(3652,'Tighina [Bender]','TI',1142),(3653,'Ungheni','UN',1142),(3654,'Antananarivo','T',1129),(3655,'Antsiranana','D',1129),(3656,'Fianarantsoa','F',1129),(3657,'Mahajanga','M',1129),(3658,'Toamasina','A',1129),(3659,'Toliara','U',1129),(3660,'Ailinglapalap','ALL',1135),(3661,'Ailuk','ALK',1135),(3662,'Arno','ARN',1135),(3663,'Aur','AUR',1135),(3664,'Ebon','EBO',1135),(3665,'Eniwetok','ENI',1135),(3666,'Jaluit','JAL',1135),(3667,'Kili','KIL',1135),(3668,'Kwajalein','KWA',1135),(3669,'Lae','LAE',1135),(3670,'Lib','LIB',1135),(3671,'Likiep','LIK',1135),(3672,'Majuro','MAJ',1135),(3673,'Maloelap','MAL',1135),(3674,'Mejit','MEJ',1135),(3675,'Mili','MIL',1135),(3676,'Namorik','NMK',1135),(3677,'Namu','NMU',1135),(3678,'Rongelap','RON',1135),(3679,'Ujae','UJA',1135),(3680,'Ujelang','UJL',1135),(3681,'Utirik','UTI',1135),(3682,'Wotho','WTN',1135),(3683,'Wotje','WTJ',1135),(3684,'Bamako','BK0',1133),(3685,'Gao','7',1133),(3686,'Kayes','1',1133),(3687,'Kidal','8',1133),(3688,'Xoulikoro','2',1133),(3689,'Mopti','5',1133),(3690,'S69ou','4',1133),(3691,'Sikasso','3',1133),(3692,'Tombouctou','6',1133),(3693,'Ayeyarwady','07',1035),(3694,'Bago','02',1035),(3695,'Magway','03',1035),(3696,'Mandalay','04',1035),(3697,'Sagaing','01',1035),(3698,'Tanintharyi','05',1035),(3699,'Yangon','06',1035),(3700,'Chin','14',1035),(3701,'Kachin','11',1035),(3702,'Kayah','12',1035),(3703,'Kayin','13',1035),(3704,'Mon','15',1035),(3705,'Rakhine','16',1035),(3706,'Shan','17',1035),(3707,'Ulaanbaatar','1',1144),(3708,'Arhangay','073',1144),(3709,'Bayanhongor','069',1144),(3710,'Bayan-Olgiy','071',1144),(3711,'Bulgan','067',1144),(3712,'Darhan uul','037',1144),(3713,'Dornod','061',1144),(3714,'Dornogov,','063',1144),(3715,'DundgovL','059',1144),(3716,'Dzavhan','057',1144),(3717,'Govi-Altay','065',1144),(3718,'Govi-Smber','064',1144),(3719,'Hentiy','039',1144),(3720,'Hovd','043',1144),(3721,'Hovsgol','041',1144),(3722,'Omnogovi','053',1144),(3723,'Orhon','035',1144),(3724,'Ovorhangay','055',1144),(3725,'Selenge','049',1144),(3726,'Shbaatar','051',1144),(3727,'Tov','047',1144),(3728,'Uvs','046',1144),(3729,'Nouakchott','NKC',1137),(3730,'Assaba','03',1137),(3731,'Brakna','05',1137),(3732,'Dakhlet Nouadhibou','08',1137),(3733,'Gorgol','04',1137),(3734,'Guidimaka','10',1137),(3735,'Hodh ech Chargui','01',1137),(3736,'Hodh el Charbi','02',1137),(3737,'Inchiri','12',1137),(3738,'Tagant','09',1137),(3739,'Tiris Zemmour','11',1137),(3740,'Trarza','06',1137),(3741,'Beau Bassin-Rose Hill','BR',1138),(3742,'Curepipe','CU',1138),(3743,'Port Louis','PU',1138),(3744,'Quatre Bornes','QB',1138),(3745,'Vacosa-Phoenix','VP',1138),(3746,'Black River','BL',1138),(3747,'Flacq','FL',1138),(3748,'Grand Port','GP',1138),(3749,'Moka','MO',1138),(3750,'Pamplemousses','PA',1138),(3751,'Plaines Wilhems','PW',1138),(3752,'Riviere du Rempart','RP',1138),(3753,'Savanne','SA',1138),(3754,'Agalega Islands','AG',1138),(3755,'Cargados Carajos Shoals','CC',1138),(3756,'Rodrigues Island','RO',1138),(3757,'Male','MLE',1132),(3758,'Alif','02',1132),(3759,'Baa','20',1132),(3760,'Dhaalu','17',1132),(3761,'Faafu','14',1132),(3762,'Gaaf Alif','27',1132),(3763,'Gaefu Dhaalu','28',1132),(3764,'Gnaviyani','29',1132),(3765,'Haa Alif','07',1132),(3766,'Haa Dhaalu','23',1132),(3767,'Kaafu','26',1132),(3768,'Laamu','05',1132),(3769,'Lhaviyani','03',1132),(3770,'Meemu','12',1132),(3771,'Noonu','25',1132),(3772,'Raa','13',1132),(3773,'Seenu','01',1132),(3774,'Shaviyani','24',1132),(3775,'Thaa','08',1132),(3776,'Vaavu','04',1132),(3777,'Balaka','BA',1130),(3778,'Blantyre','BL',1130),(3779,'Chikwawa','CK',1130),(3780,'Chiradzulu','CR',1130),(3781,'Chitipa','CT',1130),(3782,'Dedza','DE',1130),(3783,'Dowa','DO',1130),(3784,'Karonga','KR',1130),(3785,'Kasungu','KS',1130),(3786,'Likoma Island','LK',1130),(3787,'Lilongwe','LI',1130),(3788,'Machinga','MH',1130),(3789,'Mangochi','MG',1130),(3790,'Mchinji','MC',1130),(3791,'Mulanje','MU',1130),(3792,'Mwanza','MW',1130),(3793,'Mzimba','MZ',1130),(3794,'Nkhata Bay','NB',1130),(3795,'Nkhotakota','NK',1130),(3796,'Nsanje','NS',1130),(3797,'Ntcheu','NU',1130),(3798,'Ntchisi','NI',1130),(3799,'Phalomba','PH',1130),(3800,'Rumphi','RU',1130),(3801,'Salima','SA',1130),(3802,'Thyolo','TH',1130),(3803,'Zomba','ZO',1130),(3804,'Aguascalientes','AGU',1140),(3805,'Baja California','BCN',1140),(3806,'Baja California Sur','BCS',1140),(3807,'Campeche','CAM',1140),(3808,'Coahuila','COA',1140),(3809,'Colima','COL',1140),(3810,'Chiapas','CHP',1140),(3811,'Chihuahua','CHH',1140),(3812,'Durango','DUR',1140),(3813,'Guanajuato','GUA',1140),(3814,'Guerrero','GRO',1140),(3815,'Hidalgo','HID',1140),(3816,'Jalisco','JAL',1140),(3817,'Mexico','MEX',1140),(3818,'Michoacin','MIC',1140),(3819,'Morelos','MOR',1140),(3820,'Nayarit','NAY',1140),(3821,'Nuevo Leon','NLE',1140),(3822,'Oaxaca','OAX',1140),(3823,'Puebla','PUE',1140),(3824,'Queretaro','QUE',1140),(3825,'Quintana Roo','ROO',1140),(3826,'San Luis Potosi','SLP',1140),(3827,'Sinaloa','SIN',1140),(3828,'Sonora','SON',1140),(3829,'Tabasco','TAB',1140),(3830,'Tamaulipas','TAM',1140),(3831,'Tlaxcala','TLA',1140),(3832,'Veracruz','VER',1140),(3833,'Yucatan','YUC',1140),(3834,'Zacatecas','ZAC',1140),(3835,'Wilayah Persekutuan Kuala Lumpur','14',1131),(3836,'Wilayah Persekutuan Labuan','15',1131),(3837,'Wilayah Persekutuan Putrajaya','16',1131),(3838,'Johor','01',1131),(3839,'Kedah','02',1131),(3840,'Kelantan','03',1131),(3841,'Melaka','04',1131),(3842,'Negeri Sembilan','05',1131),(3843,'Pahang','06',1131),(3844,'Perak','08',1131),(3845,'Perlis','09',1131),(3846,'Pulau Pinang','07',1131),(3847,'Sabah','12',1131),(3848,'Sarawak','13',1131),(3849,'Selangor','10',1131),(3850,'Terengganu','11',1131),(3851,'Maputo','MPM',1147),(3852,'Cabo Delgado','P',1147),(3853,'Gaza','G',1147),(3854,'Inhambane','I',1147),(3855,'Manica','B',1147),(3856,'Numpula','N',1147),(3857,'Niaaea','A',1147),(3858,'Sofala','S',1147),(3859,'Tete','T',1147),(3860,'Zambezia','Q',1147),(3861,'Caprivi','CA',1148),(3862,'Erongo','ER',1148),(3863,'Hardap','HA',1148),(3864,'Karas','KA',1148),(3865,'Khomas','KH',1148),(3866,'Kunene','KU',1148),(3867,'Ohangwena','OW',1148),(3868,'Okavango','OK',1148),(3869,'Omaheke','OH',1148),(3870,'Omusati','OS',1148),(3871,'Oshana','ON',1148),(3872,'Oshikoto','OT',1148),(3873,'Otjozondjupa','OD',1148),(3874,'Niamey','8',1156),(3875,'Agadez','1',1156),(3876,'Diffa','2',1156),(3877,'Dosso','3',1156),(3878,'Maradi','4',1156),(3879,'Tahoua','S',1156),(3880,'Tillaberi','6',1156),(3881,'Zinder','7',1156),(3882,'Abuja Federal Capital Territory','FC',1157),(3883,'Abia','AB',1157),(3884,'Adamawa','AD',1157),(3885,'Akwa Ibom','AK',1157),(3886,'Anambra','AN',1157),(3887,'Bauchi','BA',1157),(3888,'Bayelsa','BY',1157),(3889,'Benue','BE',1157),(3890,'Borno','BO',1157),(3891,'Cross River','CR',1157),(3892,'Delta','DE',1157),(3893,'Ebonyi','EB',1157),(3894,'Edo','ED',1157),(3895,'Ekiti','EK',1157),(3896,'Enugu','EN',1157),(3897,'Gombe','GO',1157),(3898,'Imo','IM',1157),(3899,'Jigawa','JI',1157),(3900,'Kaduna','KD',1157),(3901,'Kano','KN',1157),(3902,'Katsina','KT',1157),(3903,'Kebbi','KE',1157),(3904,'Kogi','KO',1157),(3905,'Kwara','KW',1157),(3906,'Lagos','LA',1157),(3907,'Nassarawa','NA',1157),(3908,'Niger','NI',1157),(3909,'Ogun','OG',1157),(3910,'Ondo','ON',1157),(3911,'Osun','OS',1157),(3912,'Oyo','OY',1157),(3913,'Rivers','RI',1157),(3914,'Sokoto','SO',1157),(3915,'Taraba','TA',1157),(3916,'Yobe','YO',1157),(3917,'Zamfara','ZA',1157),(3918,'Boaco','BO',1155),(3919,'Carazo','CA',1155),(3920,'Chinandega','CI',1155),(3921,'Chontales','CO',1155),(3922,'Esteli','ES',1155),(3923,'Jinotega','JI',1155),(3924,'Leon','LE',1155),(3925,'Madriz','MD',1155),(3926,'Managua','MN',1155),(3927,'Masaya','MS',1155),(3928,'Matagalpa','MT',1155),(3929,'Nueva Segovia','NS',1155),(3930,'Rio San Juan','SJ',1155),(3931,'Rivas','RI',1155),(3932,'Atlantico Norte','AN',1155),(3933,'Atlantico Sur','AS',1155),(3934,'Drente','DR',1152),(3935,'Flevoland','FL',1152),(3936,'Friesland','FR',1152),(3937,'Gelderland','GL',1152),(3938,'Groningen','GR',1152),(3939,'Noord-Brabant','NB',1152),(3940,'Noord-Holland','NH',1152),(3941,'Overijssel','OV',1152),(3942,'Utrecht','UT',1152),(3943,'Zuid-Holland','ZH',1152),(3944,'Zeeland','ZL',1152),(3945,'Akershus','02',1161),(3946,'Aust-Agder','09',1161),(3947,'Buskerud','06',1161),(3948,'Finnmark','20',1161),(3949,'Hedmark','04',1161),(3950,'Hordaland','12',1161),(3951,'Møre og Romsdal','15',1161),(3952,'Nordland','18',1161),(3953,'Nord-Trøndelag','17',1161),(3954,'Oppland','05',1161),(3955,'Oslo','03',1161),(3956,'Rogaland','11',1161),(3957,'Sogn og Fjordane','14',1161),(3958,'Sør-Trøndelag','16',1161),(3959,'Telemark','06',1161),(3960,'Troms','19',1161),(3961,'Vest-Agder','10',1161),(3962,'Vestfold','07',1161),(3963,'Østfold','01',1161),(3964,'Jan Mayen','22',1161),(3965,'Svalbard','21',1161),(3966,'Auckland','AUK',1154),(3967,'Bay of Plenty','BOP',1154),(3968,'Canterbury','CAN',1154),(3969,'Gisborne','GIS',1154),(3970,'Hawkes Bay','HKB',1154),(3971,'Manawatu-Wanganui','MWT',1154),(3972,'Marlborough','MBH',1154),(3973,'Nelson','NSN',1154),(3974,'Northland','NTL',1154),(3975,'Otago','OTA',1154),(3976,'Southland','STL',1154),(3977,'Taranaki','TKI',1154),(3978,'Tasman','TAS',1154),(3979,'Waikato','WKO',1154),(3980,'Wellington','WGN',1154),(3981,'West Coast','WTC',1154),(3982,'Ad Dakhillyah','DA',1162),(3983,'Al Batinah','BA',1162),(3984,'Al Janblyah','JA',1162),(3985,'Al Wusta','WU',1162),(3986,'Ash Sharqlyah','SH',1162),(3987,'Az Zahirah','ZA',1162),(3988,'Masqat','MA',1162),(3989,'Musandam','MU',1162),(3990,'Bocas del Toro','1',1166),(3991,'Cocle','2',1166),(3992,'Chiriqui','4',1166),(3993,'Darien','5',1166),(3994,'Herrera','6',1166),(3995,'Loa Santoa','7',1166),(3996,'Panama','8',1166),(3997,'Veraguas','9',1166),(3998,'Comarca de San Blas','Q',1166),(3999,'El Callao','CAL',1169),(4000,'Ancash','ANC',1169),(4001,'Apurimac','APU',1169),(4002,'Arequipa','ARE',1169),(4003,'Ayacucho','AYA',1169),(4004,'Cajamarca','CAJ',1169),(4005,'Cuzco','CUS',1169),(4006,'Huancavelica','HUV',1169),(4007,'Huanuco','HUC',1169),(4008,'Ica','ICA',1169),(4009,'Junin','JUN',1169),(4010,'La Libertad','LAL',1169),(4011,'Lambayeque','LAM',1169),(4012,'Lima','LIM',1169),(4013,'Loreto','LOR',1169),(4014,'Madre de Dios','MDD',1169),(4015,'Moquegua','MOQ',1169),(4016,'Pasco','PAS',1169),(4017,'Piura','PIU',1169),(4018,'Puno','PUN',1169),(4019,'San Martin','SAM',1169),(4020,'Tacna','TAC',1169),(4021,'Tumbes','TUM',1169),(4022,'Ucayali','UCA',1169),(4023,'National Capital District (Port Moresby)','NCD',1167),(4024,'Chimbu','CPK',1167),(4025,'Eastern Highlands','EHG',1167),(4026,'East New Britain','EBR',1167),(4027,'East Sepik','ESW',1167),(4028,'Enga','EPW',1167),(4029,'Gulf','GPK',1167),(4030,'Madang','MPM',1167),(4031,'Manus','MRL',1167),(4032,'Milne Bay','MBA',1167),(4033,'Morobe','MPL',1167),(4034,'New Ireland','NIK',1167),(4035,'North Solomons','NSA',1167),(4036,'Santaun','SAN',1167),(4037,'Southern Highlands','SHM',1167),(4038,'Western Highlands','WHM',1167),(4039,'West New Britain','WBK',1167),(4040,'Abra','ABR',1170),(4041,'Agusan del Norte','AGN',1170),(4042,'Agusan del Sur','AGS',1170),(4043,'Aklan','AKL',1170),(4044,'Albay','ALB',1170),(4045,'Antique','ANT',1170),(4046,'Apayao','APA',1170),(4047,'Aurora','AUR',1170),(4048,'Basilan','BAS',1170),(4049,'Bataan','BAN',1170),(4050,'Batanes','BTN',1170),(4051,'Batangas','BTG',1170),(4052,'Benguet','BEN',1170),(4053,'Biliran','BIL',1170),(4054,'Bohol','BOH',1170),(4055,'Bukidnon','BUK',1170),(4056,'Bulacan','BUL',1170),(4057,'Cagayan','CAG',1170),(4058,'Camarines Norte','CAN',1170),(4059,'Camarines Sur','CAS',1170),(4060,'Camiguin','CAM',1170),(4061,'Capiz','CAP',1170),(4062,'Catanduanes','CAT',1170),(4063,'Cavite','CAV',1170),(4064,'Cebu','CEB',1170),(4065,'Compostela Valley','COM',1170),(4066,'Davao','DAV',1170),(4067,'Davao del Sur','DAS',1170),(4068,'Davao Oriental','DAO',1170),(4069,'Eastern Samar','EAS',1170),(4070,'Guimaras','GUI',1170),(4071,'Ifugao','IFU',1170),(4072,'Ilocos Norte','ILN',1170),(4073,'Ilocos Sur','ILS',1170),(4074,'Iloilo','ILI',1170),(4075,'Isabela','ISA',1170),(4076,'Kalinga-Apayso','KAL',1170),(4077,'Laguna','LAG',1170),(4078,'Lanao del Norte','LAN',1170),(4079,'Lanao del Sur','LAS',1170),(4080,'La Union','LUN',1170),(4081,'Leyte','LEY',1170),(4082,'Maguindanao','MAG',1170),(4083,'Marinduque','MAD',1170),(4084,'Masbate','MAS',1170),(4085,'Mindoro Occidental','MDC',1170),(4086,'Mindoro Oriental','MDR',1170),(4087,'Misamis Occidental','MSC',1170),(4088,'Misamis Oriental','MSR',1170),(4089,'Mountain Province','MOU',1170),(4090,'Negroe Occidental','NEC',1170),(4091,'Negros Oriental','NER',1170),(4092,'North Cotabato','NCO',1170),(4093,'Northern Samar','NSA',1170),(4094,'Nueva Ecija','NUE',1170),(4095,'Nueva Vizcaya','NUV',1170),(4096,'Palawan','PLW',1170),(4097,'Pampanga','PAM',1170),(4098,'Pangasinan','PAN',1170),(4099,'Quezon','QUE',1170),(4100,'Quirino','QUI',1170),(4101,'Rizal','RIZ',1170),(4102,'Romblon','ROM',1170),(4103,'Sarangani','SAR',1170),(4104,'Siquijor','SIG',1170),(4105,'Sorsogon','SOR',1170),(4106,'South Cotabato','SCO',1170),(4107,'Southern Leyte','SLE',1170),(4108,'Sultan Kudarat','SUK',1170),(4109,'Sulu','SLU',1170),(4110,'Surigao del Norte','SUN',1170),(4111,'Surigao del Sur','SUR',1170),(4112,'Tarlac','TAR',1170),(4113,'Tawi-Tawi','TAW',1170),(4114,'Western Samar','WSA',1170),(4115,'Zambales','ZMB',1170),(4116,'Zamboanga del Norte','ZAN',1170),(4117,'Zamboanga del Sur','ZAS',1170),(4118,'Zamboanga Sibiguey','ZSI',1170),(4119,'Islamabad Federal Capital Area','IS',1163),(4120,'Baluchistan','BA',1163),(4121,'Khyber Pakhtun Khawa','NW',1163),(4122,'Sindh','SD',1163),(4123,'Federally Administered Tribal Areas','TA',1163),(4124,'Azad Kashmir','JK',1163),(4125,'Gilgit-Baltistan','NA',1163),(4126,'Aveiro','01',1173),(4127,'Beja','02',1173),(4128,'Braga','03',1173),(4129,'Bragança','04',1173),(4130,'Castelo Branco','05',1173),(4131,'Coimbra','06',1173),(4132,'Évora','07',1173),(4133,'Faro','08',1173),(4134,'Guarda','09',1173),(4135,'Leiria','10',1173),(4136,'Lisboa','11',1173),(4137,'Portalegre','12',1173),(4138,'Porto','13',1173),(4139,'Santarém','14',1173),(4140,'Setúbal','15',1173),(4141,'Viana do Castelo','16',1173),(4142,'Vila Real','17',1173),(4143,'Viseu','18',1173),(4144,'Região Autónoma dos Açores','20',1173),(4145,'Região Autónoma da Madeira','30',1173),(4146,'Asuncion','ASU',1168),(4147,'Alto Paraguay','16',1168),(4148,'Alto Parana','10',1168),(4149,'Amambay','13',1168),(4150,'Boqueron','19',1168),(4151,'Caeguazu','5',1168),(4152,'Caazapl','6',1168),(4153,'Canindeyu','14',1168),(4154,'Concepcion','1',1168),(4155,'Cordillera','3',1168),(4156,'Guaira','4',1168),(4157,'Itapua','7',1168),(4158,'Miaiones','8',1168),(4159,'Neembucu','12',1168),(4160,'Paraguari','9',1168),(4161,'Presidente Hayes','15',1168),(4162,'San Pedro','2',1168),(4163,'Ad Dawhah','DA',1175),(4164,'Al Ghuwayriyah','GH',1175),(4165,'Al Jumayliyah','JU',1175),(4166,'Al Khawr','KH',1175),(4167,'Al Wakrah','WA',1175),(4168,'Ar Rayyan','RA',1175),(4169,'Jariyan al Batnah','JB',1175),(4170,'Madinat ash Shamal','MS',1175),(4171,'Umm Salal','US',1175),(4172,'Bucuresti','B',1176),(4173,'Alba','AB',1176),(4174,'Arad','AR',1176),(4175,'Argeș','AG',1176),(4176,'Bacău','BC',1176),(4177,'Bihor','BH',1176),(4178,'Bistrița-Năsăud','BN',1176),(4179,'Botoșani','BT',1176),(4180,'Brașov','BV',1176),(4181,'Brăila','BR',1176),(4182,'Buzău','BZ',1176),(4183,'Caraș-Severin','CS',1176),(4184,'Călărași','CL',1176),(4185,'Cluj','CJ',1176),(4186,'Constanța','CT',1176),(4187,'Covasna','CV',1176),(4188,'Dâmbovița','DB',1176),(4189,'Dolj','DJ',1176),(4190,'Galați','GL',1176),(4191,'Giurgiu','GR',1176),(4192,'Gorj','GJ',1176),(4193,'Harghita','HR',1176),(4194,'Hunedoara','HD',1176),(4195,'Ialomița','IL',1176),(4196,'Iași','IS',1176),(4197,'Ilfov','IF',1176),(4198,'Maramureș','MM',1176),(4199,'Mehedinți','MH',1176),(4200,'Mureș','MS',1176),(4201,'Neamț','NT',1176),(4202,'Olt','OT',1176),(4203,'Prahova','PH',1176),(4204,'Satu Mare','SM',1176),(4205,'Sălaj','SJ',1176),(4206,'Sibiu','SB',1176),(4207,'Suceava','SV',1176),(4208,'Teleorman','TR',1176),(4209,'Timiș','TM',1176),(4210,'Tulcea','TL',1176),(4211,'Vaslui','VS',1176),(4212,'Vâlcea','VL',1176),(4213,'Vrancea','VN',1176),(4214,'Adygeya, Respublika','AD',1177),(4215,'Altay, Respublika','AL',1177),(4216,'Bashkortostan, Respublika','BA',1177),(4217,'Buryatiya, Respublika','BU',1177),(4218,'Chechenskaya Respublika','CE',1177),(4219,'Chuvashskaya Respublika','CU',1177),(4220,'Dagestan, Respublika','DA',1177),(4221,'Ingushskaya Respublika','IN',1177),(4222,'Kabardino-Balkarskaya','KB',1177),(4223,'Kalmykiya, Respublika','KL',1177),(4224,'Karachayevo-Cherkesskaya Respublika','KC',1177),(4225,'Kareliya, Respublika','KR',1177),(4226,'Khakasiya, Respublika','KK',1177),(4227,'Komi, Respublika','KO',1177),(4228,'Mariy El, Respublika','ME',1177),(4229,'Mordoviya, Respublika','MO',1177),(4230,'Sakha, Respublika [Yakutiya]','SA',1177),(4231,'Severnaya Osetiya, Respublika','SE',1177),(4232,'Tatarstan, Respublika','TA',1177),(4233,'Tyva, Respublika [Tuva]','TY',1177),(4234,'Udmurtskaya Respublika','UD',1177),(4235,'Altayskiy kray','ALT',1177),(4236,'Khabarovskiy kray','KHA',1177),(4237,'Krasnodarskiy kray','KDA',1177),(4238,'Krasnoyarskiy kray','KYA',1177),(4239,'Primorskiy kray','PRI',1177),(4240,'Stavropol\'skiy kray','STA',1177),(4241,'Amurskaya oblast\'','AMU',1177),(4242,'Arkhangel\'skaya oblast\'','ARK',1177),(4243,'Astrakhanskaya oblast\'','AST',1177),(4244,'Belgorodskaya oblast\'','BEL',1177),(4245,'Bryanskaya oblast\'','BRY',1177),(4246,'Chelyabinskaya oblast\'','CHE',1177),(4247,'Zabaykalsky Krai\'','ZSK',1177),(4248,'Irkutskaya oblast\'','IRK',1177),(4249,'Ivanovskaya oblast\'','IVA',1177),(4250,'Kaliningradskaya oblast\'','KGD',1177),(4251,'Kaluzhskaya oblast\'','KLU',1177),(4252,'Kamchatka Krai\'','KAM',1177),(4253,'Kemerovskaya oblast\'','KEM',1177),(4254,'Kirovskaya oblast\'','KIR',1177),(4255,'Kostromskaya oblast\'','KOS',1177),(4256,'Kurganskaya oblast\'','KGN',1177),(4257,'Kurskaya oblast\'','KRS',1177),(4258,'Leningradskaya oblast\'','LEN',1177),(4259,'Lipetskaya oblast\'','LIP',1177),(4260,'Magadanskaya oblast\'','MAG',1177),(4261,'Moskovskaya oblast\'','MOS',1177),(4262,'Murmanskaya oblast\'','MUR',1177),(4263,'Nizhegorodskaya oblast\'','NIZ',1177),(4264,'Novgorodskaya oblast\'','NGR',1177),(4265,'Novosibirskaya oblast\'','NVS',1177),(4266,'Omskaya oblast\'','OMS',1177),(4267,'Orenburgskaya oblast\'','ORE',1177),(4268,'Orlovskaya oblast\'','ORL',1177),(4269,'Penzenskaya oblast\'','PNZ',1177),(4270,'Perm krai\'','PEK',1177),(4271,'Pskovskaya oblast\'','PSK',1177),(4272,'Rostovskaya oblast\'','ROS',1177),(4273,'Ryazanskaya oblast\'','RYA',1177),(4274,'Sakhalinskaya oblast\'','SAK',1177),(4275,'Samarskaya oblast\'','SAM',1177),(4276,'Saratovskaya oblast\'','SAR',1177),(4277,'Smolenskaya oblast\'','SMO',1177),(4278,'Sverdlovskaya oblast\'','SVE',1177),(4279,'Tambovskaya oblast\'','TAM',1177),(4280,'Tomskaya oblast\'','TOM',1177),(4281,'Tul\'skaya oblast\'','TUL',1177),(4282,'Tverskaya oblast\'','TVE',1177),(4283,'Tyumenskaya oblast\'','TYU',1177),(4284,'Ul\'yanovskaya oblast\'','ULY',1177),(4285,'Vladimirskaya oblast\'','VLA',1177),(4286,'Volgogradskaya oblast\'','VGG',1177),(4287,'Vologodskaya oblast\'','VLG',1177),(4288,'Voronezhskaya oblast\'','VOR',1177),(4289,'Yaroslavskaya oblast\'','YAR',1177),(4290,'Moskva','MOW',1177),(4291,'Sankt-Peterburg','SPE',1177),(4292,'Yevreyskaya avtonomnaya oblast\'','YEV',1177),(4294,'Chukotskiy avtonomnyy okrug','CHU',1177),(4296,'Khanty-Mansiyskiy avtonomnyy okrug','KHM',1177),(4299,'Nenetskiy avtonomnyy okrug','NEN',1177),(4302,'Yamalo-Nenetskiy avtonomnyy okrug','YAN',1177),(4303,'Butare','C',1178),(4304,'Byumba','I',1178),(4305,'Cyangugu','E',1178),(4306,'Gikongoro','D',1178),(4307,'Gisenyi','G',1178),(4308,'Gitarama','B',1178),(4309,'Kibungo','J',1178),(4310,'Kibuye','F',1178),(4311,'Kigali-Rural Kigali y\' Icyaro','K',1178),(4312,'Kigali-Ville Kigali Ngari','L',1178),(4313,'Mutara','M',1178),(4314,'Ruhengeri','H',1178),(4315,'Al Bahah','11',1187),(4316,'Al Hudud Ash Shamaliyah','08',1187),(4317,'Al Jawf','12',1187),(4318,'Al Madinah','03',1187),(4319,'Al Qasim','05',1187),(4320,'Ar Riyad','01',1187),(4321,'Asir','14',1187),(4322,'Ha\'il','06',1187),(4323,'Jlzan','09',1187),(4324,'Makkah','02',1187),(4325,'Najran','10',1187),(4326,'Tabuk','07',1187),(4327,'Capital Territory (Honiara)','CT',1194),(4328,'Guadalcanal','GU',1194),(4329,'Isabel','IS',1194),(4330,'Makira','MK',1194),(4331,'Malaita','ML',1194),(4332,'Temotu','TE',1194),(4333,'A\'ali an Nil','23',1200),(4334,'Al Bah al Ahmar','26',1200),(4335,'Al Buhayrat','18',1200),(4336,'Al Jazirah','07',1200),(4337,'Al Khartum','03',1200),(4338,'Al Qadarif','06',1200),(4339,'Al Wahdah','22',1200),(4340,'An Nil','04',1200),(4341,'An Nil al Abyaq','08',1200),(4342,'An Nil al Azraq','24',1200),(4343,'Ash Shamallyah','01',1200),(4344,'Bahr al Jabal','17',1200),(4345,'Gharb al Istiwa\'iyah','16',1200),(4346,'Gharb Ba~r al Ghazal','14',1200),(4347,'Gharb Darfur','12',1200),(4348,'Gharb Kurdufan','10',1200),(4349,'Janub Darfur','11',1200),(4350,'Janub Rurdufan','13',1200),(4351,'Jnqall','20',1200),(4352,'Kassala','05',1200),(4353,'Shamal Batr al Ghazal','15',1200),(4354,'Shamal Darfur','02',1200),(4355,'Shamal Kurdufan','09',1200),(4356,'Sharq al Istiwa\'iyah','19',1200),(4357,'Sinnar','25',1200),(4358,'Warab','21',1200),(4359,'Blekinge län','K',1204),(4360,'Dalarnas län','W',1204),(4361,'Gotlands län','I',1204),(4362,'Gävleborgs län','X',1204),(4363,'Hallands län','N',1204),(4364,'Jämtlands län','Z',1204),(4365,'Jönkopings län','F',1204),(4366,'Kalmar län','H',1204),(4367,'Kronobergs län','G',1204),(4368,'Norrbottens län','BD',1204),(4369,'Skåne län','M',1204),(4370,'Stockholms län','AB',1204),(4371,'Södermanlands län','D',1204),(4372,'Uppsala län','C',1204),(4373,'Värmlands län','S',1204),(4374,'Västerbottens län','AC',1204),(4375,'Västernorrlands län','Y',1204),(4376,'Västmanlands län','U',1204),(4377,'Västra Götalands län','Q',1204),(4378,'Örebro län','T',1204),(4379,'Östergötlands län','E',1204),(4380,'Saint Helena','SH',1180),(4381,'Ascension','AC',1180),(4382,'Tristan da Cunha','TA',1180),(4383,'Ajdovščina','001',1193),(4384,'Beltinci','002',1193),(4385,'Benedikt','148',1193),(4386,'Bistrica ob Sotli','149',1193),(4387,'Bled','003',1193),(4388,'Bloke','150',1193),(4389,'Bohinj','004',1193),(4390,'Borovnica','005',1193),(4391,'Bovec','006',1193),(4392,'Braslovče','151',1193),(4393,'Brda','007',1193),(4394,'Brezovica','008',1193),(4395,'Brežice','009',1193),(4396,'Cankova','152',1193),(4397,'Celje','011',1193),(4398,'Cerklje na Gorenjskem','012',1193),(4399,'Cerknica','013',1193),(4400,'Cerkno','014',1193),(4401,'Cerkvenjak','153',1193),(4402,'Črenšovci','015',1193),(4403,'Črna na Koroškem','016',1193),(4404,'Črnomelj','017',1193),(4405,'Destrnik','018',1193),(4406,'Divača','019',1193),(4407,'Dobje','154',1193),(4408,'Dobrepolje','020',1193),(4409,'Dobrna','155',1193),(4410,'Dobrova-Polhov Gradec','021',1193),(4411,'Dobrovnik','156',1193),(4412,'Dol pri Ljubljani','022',1193),(4413,'Dolenjske Toplice','157',1193),(4414,'Domžale','023',1193),(4415,'Dornava','024',1193),(4416,'Dravograd','025',1193),(4417,'Duplek','026',1193),(4418,'Gorenja vas-Poljane','027',1193),(4419,'Gorišnica','028',1193),(4420,'Gornja Radgona','029',1193),(4421,'Gornji Grad','030',1193),(4422,'Gornji Petrovci','031',1193),(4423,'Grad','158',1193),(4424,'Grosuplje','032',1193),(4425,'Hajdina','159',1193),(4426,'Hoče-Slivnica','160',1193),(4427,'Hodoš','161',1193),(4428,'Horjul','162',1193),(4429,'Hrastnik','034',1193),(4430,'Hrpelje-Kozina','035',1193),(4431,'Idrija','036',1193),(4432,'Ig','037',1193),(4433,'Ilirska Bistrica','038',1193),(4434,'Ivančna Gorica','039',1193),(4435,'Izola','040',1193),(4436,'Jesenice','041',1193),(4437,'Jezersko','163',1193),(4438,'Juršinci','042',1193),(4439,'Kamnik','043',1193),(4440,'Kanal','044',1193),(4441,'Kidričevo','045',1193),(4442,'Kobarid','046',1193),(4443,'Kobilje','047',1193),(4444,'Kočevje','048',1193),(4445,'Komen','049',1193),(4446,'Komenda','164',1193),(4447,'Koper','050',1193),(4448,'Kostel','165',1193),(4449,'Kozje','051',1193),(4450,'Kranj','052',1193),(4451,'Kranjska Gora','053',1193),(4452,'Križevci','166',1193),(4453,'Krško','054',1193),(4454,'Kungota','055',1193),(4455,'Kuzma','056',1193),(4456,'Laško','057',1193),(4457,'Lenart','058',1193),(4458,'Lendava','059',1193),(4459,'Litija','060',1193),(4460,'Ljubljana','061',1193),(4461,'Ljubno','062',1193),(4462,'Ljutomer','063',1193),(4463,'Logatec','064',1193),(4464,'Loška dolina','065',1193),(4465,'Loški Potok','066',1193),(4466,'Lovrenc na Pohorju','167',1193),(4467,'Luče','067',1193),(4468,'Lukovica','068',1193),(4469,'Majšperk','069',1193),(4470,'Maribor','070',1193),(4471,'Markovci','168',1193),(4472,'Medvode','071',1193),(4473,'Mengeš','072',1193),(4474,'Metlika','073',1193),(4475,'Mežica','074',1193),(4476,'Miklavž na Dravskem polju','169',1193),(4477,'Miren-Kostanjevica','075',1193),(4478,'Mirna Peč','170',1193),(4479,'Mislinja','076',1193),(4480,'Moravče','077',1193),(4481,'Moravske Toplice','078',1193),(4482,'Mozirje','079',1193),(4483,'Murska Sobota','080',1193),(4484,'Muta','081',1193),(4485,'Naklo','082',1193),(4486,'Nazarje','083',1193),(4487,'Nova Gorica','084',1193),(4488,'Novo mesto','085',1193),(4489,'Sveta Ana','181',1193),(4490,'Sveti Andraž v Slovenskih goricah','182',1193),(4491,'Sveti Jurij','116',1193),(4492,'Šalovci','033',1193),(4493,'Šempeter-Vrtojba','183',1193),(4494,'Šenčur','117',1193),(4495,'Šentilj','118',1193),(4496,'Šentjernej','119',1193),(4497,'Šentjur','120',1193),(4498,'Škocjan','121',1193),(4499,'Škofja Loka','122',1193),(4500,'Škofljica','123',1193),(4501,'Šmarje pri Jelšah','124',1193),(4502,'Šmartno ob Paki','125',1193),(4503,'Šmartno pri Litiji','194',1193),(4504,'Šoštanj','126',1193),(4505,'Štore','127',1193),(4506,'Tabor','184',1193),(4507,'Tišina','010',1193),(4508,'Tolmin','128',1193),(4509,'Trbovlje','129',1193),(4510,'Trebnje','130',1193),(4511,'Trnovska vas','185',1193),(4512,'Tržič','131',1193),(4513,'Trzin','186',1193),(4514,'Turnišče','132',1193),(4515,'Velenje','133',1193),(4516,'Velika Polana','187',1193),(4517,'Velike Lašče','134',1193),(4518,'Veržej','188',1193),(4519,'Videm','135',1193),(4520,'Vipava','136',1193),(4521,'Vitanje','137',1193),(4522,'Vojnik','138',1193),(4523,'Vransko','189',1193),(4524,'Vrhnika','140',1193),(4525,'Vuzenica','141',1193),(4526,'Zagorje ob Savi','142',1193),(4527,'Zavrč','143',1193),(4528,'Zreče','144',1193),(4529,'Žalec','190',1193),(4530,'Železniki','146',1193),(4531,'Žetale','191',1193),(4532,'Žiri','147',1193),(4533,'Žirovnica','192',1193),(4534,'Žužemberk','193',1193),(4535,'Banskobystrický kraj','BC',1192),(4536,'Bratislavský kraj','BL',1192),(4537,'Košický kraj','KI',1192),(4538,'Nitriansky kraj','NJ',1192),(4539,'Prešovský kraj','PV',1192),(4540,'Trenčiansky kraj','TC',1192),(4541,'Trnavský kraj','TA',1192),(4542,'Žilinský kraj','ZI',1192),(4543,'Western Area (Freetown)','W',1190),(4544,'Dakar','DK',1188),(4545,'Diourbel','DB',1188),(4546,'Fatick','FK',1188),(4547,'Kaolack','KL',1188),(4548,'Kolda','KD',1188),(4549,'Louga','LG',1188),(4550,'Matam','MT',1188),(4551,'Saint-Louis','SL',1188),(4552,'Tambacounda','TC',1188),(4553,'Thies','TH',1188),(4554,'Ziguinchor','ZG',1188),(4555,'Awdal','AW',1195),(4556,'Bakool','BK',1195),(4557,'Banaadir','BN',1195),(4558,'Bay','BY',1195),(4559,'Galguduud','GA',1195),(4560,'Gedo','GE',1195),(4561,'Hiirsan','HI',1195),(4562,'Jubbada Dhexe','JD',1195),(4563,'Jubbada Hoose','JH',1195),(4564,'Mudug','MU',1195),(4565,'Nugaal','NU',1195),(4566,'Saneag','SA',1195),(4567,'Shabeellaha Dhexe','SD',1195),(4568,'Shabeellaha Hoose','SH',1195),(4569,'Sool','SO',1195),(4570,'Togdheer','TO',1195),(4571,'Woqooyi Galbeed','WO',1195),(4572,'Brokopondo','BR',1201),(4573,'Commewijne','CM',1201),(4574,'Coronie','CR',1201),(4575,'Marowijne','MA',1201),(4576,'Nickerie','NI',1201),(4577,'Paramaribo','PM',1201),(4578,'Saramacca','SA',1201),(4579,'Sipaliwini','SI',1201),(4580,'Wanica','WA',1201),(4581,'Principe','P',1207),(4582,'Sao Tome','S',1207),(4583,'Ahuachapan','AH',1066),(4584,'Cabanas','CA',1066),(4585,'Cuscatlan','CU',1066),(4586,'Chalatenango','CH',1066),(4587,'Morazan','MO',1066),(4588,'San Miguel','SM',1066),(4589,'San Salvador','SS',1066),(4590,'Santa Ana','SA',1066),(4591,'San Vicente','SV',1066),(4592,'Sonsonate','SO',1066),(4593,'Usulutan','US',1066),(4594,'Al Hasakah','HA',1206),(4595,'Al Ladhiqiyah','LA',1206),(4596,'Al Qunaytirah','QU',1206),(4597,'Ar Raqqah','RA',1206),(4598,'As Suwayda\'','SU',1206),(4599,'Dar\'a','DR',1206),(4600,'Dayr az Zawr','DY',1206),(4601,'Dimashq','DI',1206),(4602,'Halab','HL',1206),(4603,'Hamah','HM',1206),(4604,'Jim\'','HI',1206),(4605,'Idlib','ID',1206),(4606,'Rif Dimashq','RD',1206),(4607,'Tarts','TA',1206),(4608,'Hhohho','HH',1203),(4609,'Lubombo','LU',1203),(4610,'Manzini','MA',1203),(4611,'Shiselweni','SH',1203),(4612,'Batha','BA',1043),(4613,'Biltine','BI',1043),(4614,'Borkou-Ennedi-Tibesti','BET',1043),(4615,'Chari-Baguirmi','CB',1043),(4616,'Guera','GR',1043),(4617,'Kanem','KA',1043),(4618,'Lac','LC',1043),(4619,'Logone-Occidental','LO',1043),(4620,'Logone-Oriental','LR',1043),(4621,'Mayo-Kebbi','MK',1043),(4622,'Moyen-Chari','MC',1043),(4623,'Ouaddai','OD',1043),(4624,'Salamat','SA',1043),(4625,'Tandjile','TA',1043),(4626,'Kara','K',1214),(4627,'Maritime (Region)','M',1214),(4628,'Savannes','S',1214),(4629,'Krung Thep Maha Nakhon Bangkok','10',1211),(4630,'Phatthaya','S',1211),(4631,'Amnat Charoen','37',1211),(4632,'Ang Thong','15',1211),(4633,'Buri Ram','31',1211),(4634,'Chachoengsao','24',1211),(4635,'Chai Nat','18',1211),(4636,'Chaiyaphum','36',1211),(4637,'Chanthaburi','22',1211),(4638,'Chiang Mai','50',1211),(4639,'Chiang Rai','57',1211),(4640,'Chon Buri','20',1211),(4641,'Chumphon','86',1211),(4642,'Kalasin','46',1211),(4643,'Kamphasng Phet','62',1211),(4644,'Kanchanaburi','71',1211),(4645,'Khon Kaen','40',1211),(4646,'Krabi','81',1211),(4647,'Lampang','52',1211),(4648,'Lamphun','51',1211),(4649,'Loei','42',1211),(4650,'Lop Buri','16',1211),(4651,'Mae Hong Son','58',1211),(4652,'Maha Sarakham','44',1211),(4653,'Mukdahan','49',1211),(4654,'Nakhon Nayok','26',1211),(4655,'Nakhon Pathom','73',1211),(4656,'Nakhon Phanom','48',1211),(4657,'Nakhon Ratchasima','30',1211),(4658,'Nakhon Sawan','60',1211),(4659,'Nakhon Si Thammarat','80',1211),(4660,'Nan','55',1211),(4661,'Narathiwat','96',1211),(4662,'Nong Bua Lam Phu','39',1211),(4663,'Nong Khai','43',1211),(4664,'Nonthaburi','12',1211),(4665,'Pathum Thani','13',1211),(4666,'Pattani','94',1211),(4667,'Phangnga','82',1211),(4668,'Phatthalung','93',1211),(4669,'Phayao','56',1211),(4670,'Phetchabun','67',1211),(4671,'Phetchaburi','76',1211),(4672,'Phichit','66',1211),(4673,'Phitsanulok','65',1211),(4674,'Phrae','54',1211),(4675,'Phra Nakhon Si Ayutthaya','14',1211),(4676,'Phuket','83',1211),(4677,'Prachin Buri','25',1211),(4678,'Prachuap Khiri Khan','77',1211),(4679,'Ranong','85',1211),(4680,'Ratchaburi','70',1211),(4681,'Rayong','21',1211),(4682,'Roi Et','45',1211),(4683,'Sa Kaeo','27',1211),(4684,'Sakon Nakhon','47',1211),(4685,'Samut Prakan','11',1211),(4686,'Samut Sakhon','74',1211),(4687,'Samut Songkhram','75',1211),(4688,'Saraburi','19',1211),(4689,'Satun','91',1211),(4690,'Sing Buri','17',1211),(4691,'Si Sa Ket','33',1211),(4692,'Songkhla','90',1211),(4693,'Sukhothai','64',1211),(4694,'Suphan Buri','72',1211),(4695,'Surat Thani','84',1211),(4696,'Surin','32',1211),(4697,'Tak','63',1211),(4698,'Trang','92',1211),(4699,'Trat','23',1211),(4700,'Ubon Ratchathani','34',1211),(4701,'Udon Thani','41',1211),(4702,'Uthai Thani','61',1211),(4703,'Uttaradit','53',1211),(4704,'Yala','95',1211),(4705,'Yasothon','35',1211),(4706,'Sughd','SU',1209),(4707,'Khatlon','KT',1209),(4708,'Gorno-Badakhshan','GB',1209),(4709,'Ahal','A',1220),(4710,'Balkan','B',1220),(4711,'Dasoguz','D',1220),(4712,'Lebap','L',1220),(4713,'Mary','M',1220),(4714,'Béja','31',1218),(4715,'Ben Arous','13',1218),(4716,'Bizerte','23',1218),(4717,'Gabès','81',1218),(4718,'Gafsa','71',1218),(4719,'Jendouba','32',1218),(4720,'Kairouan','41',1218),(4721,'Rasserine','42',1218),(4722,'Kebili','73',1218),(4723,'L\'Ariana','12',1218),(4724,'Le Ref','33',1218),(4725,'Mahdia','53',1218),(4726,'La Manouba','14',1218),(4727,'Medenine','82',1218),(4728,'Moneatir','52',1218),(4729,'Naboul','21',1218),(4730,'Sfax','61',1218),(4731,'Sidi Bouxid','43',1218),(4732,'Siliana','34',1218),(4733,'Sousse','51',1218),(4734,'Tataouine','83',1218),(4735,'Tozeur','72',1218),(4736,'Tunis','11',1218),(4737,'Zaghouan','22',1218),(4738,'Adana','01',1219),(4739,'Ad yaman','02',1219),(4740,'Afyon','03',1219),(4741,'Ag r','04',1219),(4742,'Aksaray','68',1219),(4743,'Amasya','05',1219),(4744,'Ankara','06',1219),(4745,'Antalya','07',1219),(4746,'Ardahan','75',1219),(4747,'Artvin','08',1219),(4748,'Aydin','09',1219),(4749,'Bal kesir','10',1219),(4750,'Bartin','74',1219),(4751,'Batman','72',1219),(4752,'Bayburt','69',1219),(4753,'Bilecik','11',1219),(4754,'Bingol','12',1219),(4755,'Bitlis','13',1219),(4756,'Bolu','14',1219),(4757,'Burdur','15',1219),(4758,'Bursa','16',1219),(4759,'Canakkale','17',1219),(4760,'Cankir','18',1219),(4761,'Corum','19',1219),(4762,'Denizli','20',1219),(4763,'Diyarbakir','21',1219),(4764,'Duzce','81',1219),(4765,'Edirne','22',1219),(4766,'Elazig','23',1219),(4767,'Erzincan','24',1219),(4768,'Erzurum','25',1219),(4769,'Eskis\'ehir','26',1219),(4770,'Gaziantep','27',1219),(4771,'Giresun','28',1219),(4772,'Gms\'hane','29',1219),(4773,'Hakkari','30',1219),(4774,'Hatay','31',1219),(4775,'Igidir','76',1219),(4776,'Isparta','32',1219),(4777,'Icel','33',1219),(4778,'Istanbul','34',1219),(4779,'Izmir','35',1219),(4780,'Kahramanmaras','46',1219),(4781,'Karabk','78',1219),(4782,'Karaman','70',1219),(4783,'Kars','36',1219),(4784,'Kastamonu','37',1219),(4785,'Kayseri','38',1219),(4786,'Kirikkale','71',1219),(4787,'Kirklareli','39',1219),(4788,'Kirs\'ehir','40',1219),(4789,'Kilis','79',1219),(4790,'Kocaeli','41',1219),(4791,'Konya','42',1219),(4792,'Ktahya','43',1219),(4793,'Malatya','44',1219),(4794,'Manisa','45',1219),(4795,'Mardin','47',1219),(4796,'Mugila','48',1219),(4797,'Mus','49',1219),(4798,'Nevs\'ehir','50',1219),(4799,'Nigide','51',1219),(4800,'Ordu','52',1219),(4801,'Osmaniye','80',1219),(4802,'Rize','53',1219),(4803,'Sakarya','54',1219),(4804,'Samsun','55',1219),(4805,'Siirt','56',1219),(4806,'Sinop','57',1219),(4807,'Sivas','58',1219),(4808,'S\'anliurfa','63',1219),(4809,'S\'rnak','73',1219),(4810,'Tekirdag','59',1219),(4811,'Tokat','60',1219),(4812,'Trabzon','61',1219),(4813,'Tunceli','62',1219),(4814,'Us\'ak','64',1219),(4815,'Van','65',1219),(4816,'Yalova','77',1219),(4817,'Yozgat','66',1219),(4818,'Zonguldak','67',1219),(4819,'Couva-Tabaquite-Talparo','CTT',1217),(4820,'Diego Martin','DMN',1217),(4821,'Eastern Tobago','ETO',1217),(4822,'Penal-Debe','PED',1217),(4823,'Princes Town','PRT',1217),(4824,'Rio Claro-Mayaro','RCM',1217),(4825,'Sangre Grande','SGE',1217),(4826,'San Juan-Laventille','SJL',1217),(4827,'Siparia','SIP',1217),(4828,'Tunapuna-Piarco','TUP',1217),(4829,'Western Tobago','WTO',1217),(4830,'Arima','ARI',1217),(4831,'Chaguanas','CHA',1217),(4832,'Point Fortin','PTF',1217),(4833,'Port of Spain','POS',1217),(4834,'San Fernando','SFO',1217),(4835,'Aileu','AL',1063),(4836,'Ainaro','AN',1063),(4837,'Bacucau','BA',1063),(4838,'Bobonaro','BO',1063),(4839,'Cova Lima','CO',1063),(4840,'Dili','DI',1063),(4841,'Ermera','ER',1063),(4842,'Laulem','LA',1063),(4843,'Liquica','LI',1063),(4844,'Manatuto','MT',1063),(4845,'Manafahi','MF',1063),(4846,'Oecussi','OE',1063),(4847,'Viqueque','VI',1063),(4848,'Changhua County','CHA',1208),(4849,'Chiayi County','CYQ',1208),(4850,'Hsinchu County','HSQ',1208),(4851,'Hualien County','HUA',1208),(4852,'Ilan County','ILA',1208),(4853,'Kaohsiung County','KHQ',1208),(4854,'Miaoli County','MIA',1208),(4855,'Nantou County','NAN',1208),(4856,'Penghu County','PEN',1208),(4857,'Pingtung County','PIF',1208),(4858,'Taichung County','TXQ',1208),(4859,'Tainan County','TNQ',1208),(4860,'Taipei County','TPQ',1208),(4861,'Taitung County','TTT',1208),(4862,'Taoyuan County','TAO',1208),(4863,'Yunlin County','YUN',1208),(4864,'Keelung City','KEE',1208),(4865,'Arusha','01',1210),(4866,'Dar-es-Salaam','02',1210),(4867,'Dodoma','03',1210),(4868,'Iringa','04',1210),(4869,'Kagera','05',1210),(4870,'Kaskazini Pemba','06',1210),(4871,'Kaskazini Unguja','07',1210),(4872,'Xigoma','08',1210),(4873,'Kilimanjaro','09',1210),(4874,'Rusini Pemba','10',1210),(4875,'Kusini Unguja','11',1210),(4876,'Lindi','12',1210),(4877,'Manyara','26',1210),(4878,'Mara','13',1210),(4879,'Mbeya','14',1210),(4880,'Mjini Magharibi','15',1210),(4881,'Morogoro','16',1210),(4882,'Mtwara','17',1210),(4883,'Pwani','19',1210),(4884,'Rukwa','20',1210),(4885,'Ruvuma','21',1210),(4886,'Shinyanga','22',1210),(4887,'Singida','23',1210),(4888,'Tabora','24',1210),(4889,'Tanga','25',1210),(4890,'Cherkas\'ka Oblast\'','71',1224),(4891,'Chernihivs\'ka Oblast\'','74',1224),(4892,'Chernivets\'ka Oblast\'','77',1224),(4893,'Dnipropetrovs\'ka Oblast\'','12',1224),(4894,'Donets\'ka Oblast\'','14',1224),(4895,'Ivano-Frankivs\'ka Oblast\'','26',1224),(4896,'Kharkivs\'ka Oblast\'','63',1224),(4897,'Khersons\'ka Oblast\'','65',1224),(4898,'Khmel\'nyts\'ka Oblast\'','68',1224),(4899,'Kirovohrads\'ka Oblast\'','35',1224),(4900,'Kyivs\'ka Oblast\'','32',1224),(4901,'Luhans\'ka Oblast\'','09',1224),(4902,'L\'vivs\'ka Oblast\'','46',1224),(4903,'Mykolaivs\'ka Oblast\'','48',1224),(4904,'Odes \'ka Oblast\'','51',1224),(4905,'Poltavs\'ka Oblast\'','53',1224),(4906,'Rivnens\'ka Oblast\'','56',1224),(4907,'Sums \'ka Oblast\'','59',1224),(4908,'Ternopil\'s\'ka Oblast\'','61',1224),(4909,'Vinnyts\'ka Oblast\'','05',1224),(4910,'Volyos\'ka Oblast\'','07',1224),(4911,'Zakarpats\'ka Oblast\'','21',1224),(4912,'Zaporiz\'ka Oblast\'','23',1224),(4913,'Zhytomyrs\'ka Oblast\'','18',1224),(4914,'Respublika Krym','43',1224),(4915,'Kyiv','30',1224),(4916,'Sevastopol','40',1224),(4917,'Adjumani','301',1223),(4918,'Apac','302',1223),(4919,'Arua','303',1223),(4920,'Bugiri','201',1223),(4921,'Bundibugyo','401',1223),(4922,'Bushenyi','402',1223),(4923,'Busia','202',1223),(4924,'Gulu','304',1223),(4925,'Hoima','403',1223),(4926,'Iganga','203',1223),(4927,'Jinja','204',1223),(4928,'Kabale','404',1223),(4929,'Kabarole','405',1223),(4930,'Kaberamaido','213',1223),(4931,'Kalangala','101',1223),(4932,'Kampala','102',1223),(4933,'Kamuli','205',1223),(4934,'Kamwenge','413',1223),(4935,'Kanungu','414',1223),(4936,'Kapchorwa','206',1223),(4937,'Kasese','406',1223),(4938,'Katakwi','207',1223),(4939,'Kayunga','112',1223),(4940,'Kibaale','407',1223),(4941,'Kiboga','103',1223),(4942,'Kisoro','408',1223),(4943,'Kitgum','305',1223),(4944,'Kotido','306',1223),(4945,'Kumi','208',1223),(4946,'Kyenjojo','415',1223),(4947,'Lira','307',1223),(4948,'Luwero','104',1223),(4949,'Masaka','105',1223),(4950,'Masindi','409',1223),(4951,'Mayuge','214',1223),(4952,'Mbale','209',1223),(4953,'Mbarara','410',1223),(4954,'Moroto','308',1223),(4955,'Moyo','309',1223),(4956,'Mpigi','106',1223),(4957,'Mubende','107',1223),(4958,'Mukono','108',1223),(4959,'Nakapiripirit','311',1223),(4960,'Nakasongola','109',1223),(4961,'Nebbi','310',1223),(4962,'Ntungamo','411',1223),(4963,'Pader','312',1223),(4964,'Pallisa','210',1223),(4965,'Rakai','110',1223),(4966,'Rukungiri','412',1223),(4967,'Sembabule','111',1223),(4968,'Sironko','215',1223),(4969,'Soroti','211',1223),(4970,'Tororo','212',1223),(4971,'Wakiso','113',1223),(4972,'Yumbe','313',1223),(4973,'Baker Island','81',1227),(4974,'Howland Island','84',1227),(4975,'Jarvis Island','86',1227),(4976,'Johnston Atoll','67',1227),(4977,'Kingman Reef','89',1227),(4978,'Midway Islands','71',1227),(4979,'Navassa Island','76',1227),(4980,'Palmyra Atoll','95',1227),(4981,'Wake Island','79',1227),(4982,'Artigsa','AR',1229),(4983,'Canelones','CA',1229),(4984,'Cerro Largo','CL',1229),(4985,'Colonia','CO',1229),(4986,'Durazno','DU',1229),(4987,'Flores','FS',1229),(4988,'Lavalleja','LA',1229),(4989,'Maldonado','MA',1229),(4990,'Montevideo','MO',1229),(4991,'Paysandu','PA',1229),(4992,'Rivera','RV',1229),(4993,'Rocha','RO',1229),(4994,'Salto','SA',1229),(4995,'Soriano','SO',1229),(4996,'Tacuarembo','TA',1229),(4997,'Treinta y Tres','TT',1229),(4998,'Toshkent (city)','TK',1230),(4999,'Qoraqalpogiston Respublikasi','QR',1230),(5000,'Andijon','AN',1230),(5001,'Buxoro','BU',1230),(5002,'Farg\'ona','FA',1230),(5003,'Jizzax','JI',1230),(5004,'Khorazm','KH',1230),(5005,'Namangan','NG',1230),(5006,'Navoiy','NW',1230),(5007,'Qashqadaryo','QA',1230),(5008,'Samarqand','SA',1230),(5009,'Sirdaryo','SI',1230),(5010,'Surxondaryo','SU',1230),(5011,'Toshkent','TO',1230),(5012,'Xorazm','XO',1230),(5013,'Distrito Federal','A',1232),(5014,'Anzoategui','B',1232),(5015,'Apure','C',1232),(5016,'Aragua','D',1232),(5017,'Barinas','E',1232),(5018,'Carabobo','G',1232),(5019,'Cojedes','H',1232),(5020,'Falcon','I',1232),(5021,'Guarico','J',1232),(5022,'Lara','K',1232),(5023,'Merida','L',1232),(5024,'Miranda','M',1232),(5025,'Monagas','N',1232),(5026,'Nueva Esparta','O',1232),(5027,'Portuguesa','P',1232),(5028,'Tachira','S',1232),(5029,'Trujillo','T',1232),(5030,'Vargas','X',1232),(5031,'Yaracuy','U',1232),(5032,'Zulia','V',1232),(5033,'Delta Amacuro','Y',1232),(5034,'Dependencias Federales','W',1232),(5035,'An Giang','44',1233),(5036,'Ba Ria - Vung Tau','43',1233),(5037,'Bac Can','53',1233),(5038,'Bac Giang','54',1233),(5039,'Bac Lieu','55',1233),(5040,'Bac Ninh','56',1233),(5041,'Ben Tre','50',1233),(5042,'Binh Dinh','31',1233),(5043,'Binh Duong','57',1233),(5044,'Binh Phuoc','58',1233),(5045,'Binh Thuan','40',1233),(5046,'Ca Mau','59',1233),(5047,'Can Tho','48',1233),(5048,'Cao Bang','04',1233),(5049,'Da Nang, thanh pho','60',1233),(5050,'Dong Nai','39',1233),(5051,'Dong Thap','45',1233),(5052,'Gia Lai','30',1233),(5053,'Ha Giang','03',1233),(5054,'Ha Nam','63',1233),(5055,'Ha Noi, thu do','64',1233),(5056,'Ha Tay','15',1233),(5057,'Ha Tinh','23',1233),(5058,'Hai Duong','61',1233),(5059,'Hai Phong, thanh pho','62',1233),(5060,'Hoa Binh','14',1233),(5061,'Ho Chi Minh, thanh pho [Sai Gon]','65',1233),(5062,'Hung Yen','66',1233),(5063,'Khanh Hoa','34',1233),(5064,'Kien Giang','47',1233),(5065,'Kon Tum','28',1233),(5066,'Lai Chau','01',1233),(5067,'Lam Dong','35',1233),(5068,'Lang Son','09',1233),(5069,'Lao Cai','02',1233),(5070,'Long An','41',1233),(5071,'Nam Dinh','67',1233),(5072,'Nghe An','22',1233),(5073,'Ninh Binh','18',1233),(5074,'Ninh Thuan','36',1233),(5075,'Phu Tho','68',1233),(5076,'Phu Yen','32',1233),(5077,'Quang Binh','24',1233),(5078,'Quang Nam','27',1233),(5079,'Quang Ngai','29',1233),(5080,'Quang Ninh','13',1233),(5081,'Quang Tri','25',1233),(5082,'Soc Trang','52',1233),(5083,'Son La','05',1233),(5084,'Tay Ninh','37',1233),(5085,'Thai Binh','20',1233),(5086,'Thai Nguyen','69',1233),(5087,'Thanh Hoa','21',1233),(5088,'Thua Thien-Hue','26',1233),(5089,'Tien Giang','46',1233),(5090,'Tra Vinh','51',1233),(5091,'Tuyen Quang','07',1233),(5092,'Vinh Long','49',1233),(5093,'Vinh Phuc','70',1233),(5094,'Yen Bai','06',1233),(5095,'Malampa','MAP',1231),(5096,'Penama','PAM',1231),(5097,'Sanma','SAM',1231),(5098,'Shefa','SEE',1231),(5099,'Tafea','TAE',1231),(5100,'Torba','TOB',1231),(5101,'A\'ana','AA',1185),(5102,'Aiga-i-le-Tai','AL',1185),(5103,'Atua','AT',1185),(5104,'Fa\'aaaleleaga','FA',1185),(5105,'Gaga\'emauga','GE',1185),(5106,'Gagaifomauga','GI',1185),(5107,'Palauli','PA',1185),(5108,'Satupa\'itea','SA',1185),(5109,'Tuamasaga','TU',1185),(5110,'Va\'a-o-Fonoti','VF',1185),(5111,'Vaisigano','VS',1185),(5112,'Crna Gora','CG',1243),(5113,'Srbija','SR',1242),(5114,'Kosovo-Metohija','KM',1242),(5115,'Vojvodina','VO',1242),(5116,'Abyan','AB',1237),(5117,'Adan','AD',1237),(5118,'Ad Dali','DA',1237),(5119,'Al Bayda\'','BA',1237),(5120,'Al Hudaydah','MU',1237),(5121,'Al Mahrah','MR',1237),(5122,'Al Mahwit','MW',1237),(5123,'Amran','AM',1237),(5124,'Dhamar','DH',1237),(5125,'Hadramawt','HD',1237),(5126,'Hajjah','HJ',1237),(5127,'Ibb','IB',1237),(5128,'Lahij','LA',1237),(5129,'Ma\'rib','MA',1237),(5130,'Sa\'dah','SD',1237),(5131,'San\'a\'','SN',1237),(5132,'Shabwah','SH',1237),(5133,'Ta\'izz','TA',1237),(5134,'Eastern Cape','EC',1196),(5135,'Free State','FS',1196),(5136,'Gauteng','GT',1196),(5137,'Kwazulu-Natal','NL',1196),(5138,'Mpumalanga','MP',1196),(5139,'Northern Cape','NC',1196),(5140,'Limpopo','NP',1196),(5141,'Western Cape','WC',1196),(5142,'Copperbelt','08',1239),(5143,'Luapula','04',1239),(5144,'Lusaka','09',1239),(5145,'North-Western','06',1239),(5146,'Bulawayo','BU',1240),(5147,'Harare','HA',1240),(5148,'Manicaland','MA',1240),(5149,'Mashonaland Central','MC',1240),(5150,'Mashonaland East','ME',1240),(5151,'Mashonaland West','MW',1240),(5152,'Masvingo','MV',1240),(5153,'Matabeleland North','MN',1240),(5154,'Matabeleland South','MS',1240),(5155,'Midlands','MI',1240),(5156,'South Karelia','SK',1075),(5157,'South Ostrobothnia','SO',1075),(5158,'Etelä-Savo','ES',1075),(5159,'Häme','HH',1075),(5160,'Itä-Uusimaa','IU',1075),(5161,'Kainuu','KA',1075),(5162,'Central Ostrobothnia','CO',1075),(5163,'Central Finland','CF',1075),(5164,'Kymenlaakso','KY',1075),(5165,'Lapland','LA',1075),(5166,'Tampere Region','TR',1075),(5167,'Ostrobothnia','OB',1075),(5168,'North Karelia','NK',1075),(5169,'Northern Ostrobothnia','NO',1075),(5170,'Northern Savo','NS',1075),(5171,'Päijät-Häme','PH',1075),(5172,'Satakunta','SK',1075),(5173,'Uusimaa','UM',1075),(5174,'South-West Finland','SW',1075),(5175,'Åland','AL',1075),(5176,'Limburg','LI',1152),(5177,'Central and Western','CW',1098),(5178,'Eastern','EA',1098),(5179,'Southern','SO',1098),(5180,'Wan Chai','WC',1098),(5181,'Kowloon City','KC',1098),(5182,'Kwun Tong','KU',1098),(5183,'Sham Shui Po','SS',1098),(5184,'Wong Tai Sin','WT',1098),(5185,'Yau Tsim Mong','YT',1098),(5186,'Islands','IS',1098),(5187,'Kwai Tsing','KI',1098),(5188,'North','NO',1098),(5189,'Sai Kung','SK',1098),(5190,'Sha Tin','ST',1098),(5191,'Tai Po','TP',1098),(5192,'Tsuen Wan','TW',1098),(5193,'Tuen Mun','TM',1098),(5194,'Yuen Long','YL',1098),(5195,'Manchester','MR',1108),(5196,'Al Manāmah (Al ‘Āşimah)','13',1016),(5197,'Al Janūbīyah','14',1016),(5199,'Al Wusţá','16',1016),(5200,'Ash Shamālīyah','17',1016),(5201,'Jenin','_A',1165),(5202,'Tubas','_B',1165),(5203,'Tulkarm','_C',1165),(5204,'Nablus','_D',1165),(5205,'Qalqilya','_E',1165),(5206,'Salfit','_F',1165),(5207,'Ramallah and Al-Bireh','_G',1165),(5208,'Jericho','_H',1165),(5209,'Jerusalem','_I',1165),(5210,'Bethlehem','_J',1165),(5211,'Hebron','_K',1165),(5212,'North Gaza','_L',1165),(5213,'Gaza','_M',1165),(5214,'Deir el-Balah','_N',1165),(5215,'Khan Yunis','_O',1165),(5216,'Rafah','_P',1165),(5217,'Brussels','BRU',1020),(5218,'Distrito Federal','DIF',1140),(5219,'Taichung City','TXG',1208),(5220,'Kaohsiung City','KHH',1208),(5221,'Taipei City','TPE',1208),(5222,'Chiayi City','CYI',1208),(5223,'Hsinchu City','HSZ',1208),(5224,'Tainan City','TNN',1208),(9000,'North West','NW',1196),(9986,'Tyne and Wear','TWR',1226),(9988,'Greater Manchester','GTM',1226),(9989,'Co Tyrone','TYR',1226),(9990,'West Yorkshire','WYK',1226),(9991,'South Yorkshire','SYK',1226),(9992,'Merseyside','MSY',1226),(9993,'Berkshire','BRK',1226),(9994,'West Midlands','WMD',1226),(9998,'West Glamorgan','WGM',1226),(9999,'London','LON',1226),(10000,'Carbonia-Iglesias','CI',1107),(10001,'Olbia-Tempio','OT',1107),(10002,'Medio Campidano','VS',1107),(10003,'Ogliastra','OG',1107),(10009,'Jura','39',1076),(10010,'Barletta-Andria-Trani','Bar',1107),(10011,'Fermo','Fer',1107),(10012,'Monza e Brianza','Mon',1107),(10013,'Clwyd','CWD',1226),(10014,'Dyfed','DFD',1226),(10015,'South Glamorgan','SGM',1226),(10016,'Artibonite','AR',1094),(10017,'Centre','CE',1094),(10018,'Nippes','NI',1094),(10019,'Nord','ND',1094),(10020,'La Rioja','F',1010),(10021,'Andorra la Vella','07',1005),(10022,'Canillo','02',1005),(10023,'Encamp','03',1005),(10024,'Escaldes-Engordany','08',1005),(10025,'La Massana','04',1005),(10026,'Ordino','05',1005),(10027,'Sant Julia de Loria','06',1005),(10028,'Abaco Islands','AB',1212),(10029,'Andros Island','AN',1212),(10030,'Berry Islands','BR',1212),(10031,'Eleuthera','EL',1212),(10032,'Grand Bahama','GB',1212),(10033,'Rum Cay','RC',1212),(10034,'San Salvador Island','SS',1212),(10035,'Kongo central','01',1050),(10036,'Kwango','02',1050),(10037,'Kwilu','03',1050),(10038,'Mai-Ndombe','04',1050),(10039,'Kasai','05',1050),(10040,'Lulua','06',1050),(10041,'Lomami','07',1050),(10042,'Sankuru','08',1050),(10043,'Ituri','09',1050),(10044,'Haut-Uele','10',1050),(10045,'Tshopo','11',1050),(10046,'Bas-Uele','12',1050),(10047,'Nord-Ubangi','13',1050),(10048,'Mongala','14',1050),(10049,'Sud-Ubangi','15',1050),(10050,'Tshuapa','16',1050),(10051,'Haut-Lomami','17',1050),(10052,'Lualaba','18',1050),(10053,'Haut-Katanga','19',1050),(10054,'Tanganyika','20',1050),(10055,'Toledo','TO',1198),(10056,'Córdoba','CO',1198),(10057,'Metropolitan Manila','MNL',1170),(10058,'La Paz','LP',1097),(10059,'Yinchuan','YN',1045),(10060,'Shizuishan','SZ',1045),(10061,'Wuzhong','WZ',1045),(10062,'Guyuan','GY',1045),(10063,'Zhongwei','ZW',1045),(10064,'Luxembourg','L',1126),(10065,'Aizkraukles novads','002',1119),(10066,'Jaunjelgavas novads','038',1119),(10067,'Pļaviņu novads','072',1119),(10068,'Kokneses novads','046',1119),(10069,'Neretas novads','065',1119),(10070,'Skrīveru novads','092',1119),(10071,'Alūksnes novads','007',1119),(10072,'Apes novads','009',1119),(10073,'Balvu novads','015',1119),(10074,'Viļakas novads','108',1119),(10075,'Baltinavas novads','014',1119),(10076,'Rugāju novads','082',1119),(10077,'Bauskas novads','016',1119),(10078,'Iecavas novads','034',1119),(10079,'Rundāles novads','083',1119),(10080,'Vecumnieku novads','105',1119),(10081,'Cēsu novads','022',1119),(10082,'Līgatnes novads','055',1119),(10083,'Amatas novads','008',1119),(10084,'Jaunpiebalgas novads','039',1119),(10085,'Priekuļu novads','075',1119),(10086,'Pārgaujas novads','070',1119),(10087,'Raunas novads','076',1119),(10088,'Vecpiebalgas novads','104',1119),(10089,'Daugavpils novads','025',1119),(10090,'Ilūkstes novads','036',1119),(10091,'Dobeles novads','026',1119),(10092,'Auces novads','010',1119),(10093,'Tērvetes novads','098',1119),(10094,'Gulbenes novads','033',1119),(10095,'Jelgavas novads','041',1119),(10096,'Ozolnieku novads','069',1119),(10097,'Jēkabpils novads','042',1119),(10098,'Aknīstes novads','004',1119),(10099,'Viesītes novads','107',1119),(10100,'Krustpils novads','049',1119),(10101,'Salas novads','085',1119),(10102,'Krāslavas novads','047',1119),(10103,'Dagdas novads','024',1119),(10104,'Aglonas novads','001',1119),(10105,'Kuldīgas novads','050',1119),(10106,'Skrundas novads','093',1119),(10107,'Alsungas novads','006',1119),(10108,'Aizputes novads','003',1119),(10109,'Durbes novads','028',1119),(10110,'Grobiņas novads','032',1119),(10111,'Pāvilostas novads','071',1119),(10112,'Priekules novads','074',1119),(10113,'Nīcas novads','066',1119),(10114,'Rucavas novads','081',1119),(10115,'Vaiņodes novads','100',1119),(10116,'Limbažu novads','054',1119),(10117,'Alojas novads','005',1119),(10118,'Salacgrīvas novads','086',1119),(10119,'Ludzas novads','058',1119),(10120,'Kārsavas novads','044',1119),(10121,'Zilupes novads','110',1119),(10122,'Ciblas novads','023',1119),(10123,'Madonas novads','059',1119),(10124,'Cesvaines novads','021',1119),(10125,'Lubānas novads','057',1119),(10126,'Varakļānu novads','102',1119),(10127,'Ērgļu novads','030',1119),(10128,'Ogres novads','067',1119),(10129,'Ikšķiles novads','035',1119),(10130,'Ķeguma novads','051',1119),(10131,'Lielvārdes novads','053',1119),(10132,'Preiļu novads','073',1119),(10133,'Līvānu novads','056',1119),(10134,'Riebiņu novads','078',1119),(10135,'Vārkavas novads','103',1119),(10136,'Rēzeknes novads','077',1119),(10137,'Viļānu novads','109',1119),(10138,'Baldones novads','013',1119),(10139,'Ķekavas novads','052',1119),(10140,'Olaines novads','068',1119),(10141,'Salaspils novads','087',1119),(10142,'Saulkrastu novads','089',1119),(10143,'Siguldas novads','091',1119),(10144,'Inčukalna novads','037',1119),(10145,'Ādažu novads','011',1119),(10146,'Babītes novads','012',1119),(10147,'Carnikavas novads','020',1119),(10148,'Garkalnes novads','031',1119),(10149,'Krimuldas novads','048',1119),(10150,'Mālpils novads','061',1119),(10151,'Mārupes novads','062',1119),(10152,'Ropažu novads','080',1119),(10153,'Sējas novads','090',1119),(10154,'Stopiņu novads','095',1119),(10155,'Saldus novads','088',1119),(10156,'Brocēnu novads','018',1119),(10157,'Talsu novads','097',1119),(10158,'Dundagas novads','027',1119),(10159,'Mērsraga novads','063',1119),(10160,'Rojas novads','079',1119),(10161,'Tukuma novads','099',1119),(10162,'Kandavas novads','043',1119),(10163,'Engures novads','029',1119),(10164,'Jaunpils novads','040',1119),(10165,'Valkas novads','101',1119),(10166,'Smiltenes novads','094',1119),(10167,'Strenču novads','096',1119),(10168,'Kocēnu novads','045',1119),(10169,'Mazsalacas novads','060',1119),(10170,'Rūjienas novads','084',1119),(10171,'Beverīnas novads','017',1119),(10172,'Burtnieku novads','019',1119),(10173,'Naukšēnu novads','064',1119),(10174,'Ventspils novads','106',1119),(10175,'Jēkabpils','JKB',1119),(10176,'Valmiera','VMR',1119),(10177,'Florida','FL',1229),(10178,'Rio Negro','RN',1229),(10179,'San Jose','SJ',1229),(10180,'Plateau','PL',1157),(10181,'Pieria','61',1085),(10182,'Los Rios','LR',1044),(10183,'Arica y Parinacota','AP',1044),(10184,'Amazonas','AMA',1169),(10185,'Kalimantan Tengah','KT',1102),(10186,'Sulawesi Barat','SR',1102),(10187,'Kalimantan Utara','KU',1102),(10188,'Ankaran','86',1193),(10189,'Apače','87',1193),(10190,'Cirkulane','88',1193),(10191,'Gorje','89',1193),(10192,'Kostanjevica na Krki','90',1193),(10193,'Log-Dragomer','91',1193),(10194,'Makole','92',1193),(10195,'Mirna','93',1193),(10196,'Mokronog-Trebelno','94',1193),(10197,'Odranci','95',1193),(10198,'Oplotnica','96',1193),(10199,'Ormož','97',1193),(10200,'Osilnica','98',1193),(10201,'Pesnica','99',1193),(10202,'Piran','100',1193),(10203,'Pivka','101',1193),(10204,'Podčetrtek','102',1193),(10205,'Podlehnik','103',1193),(10206,'Podvelka','104',1193),(10207,'Poljčane','105',1193),(10208,'Polzela','106',1193),(10209,'Postojna','107',1193),(10210,'Prebold','108',1193),(10211,'Preddvor','109',1193),(10212,'Prevalje','110',1193),(10213,'Ptuj','111',1193),(10214,'Puconci','112',1193),(10215,'Rače-Fram','113',1193),(10216,'Radeče','114',1193),(10217,'Radenci','115',1193),(10218,'Radlje ob Dravi','139',1193),(10219,'Radovljica','145',1193),(10220,'Ravne na Koroškem','171',1193),(10221,'Razkrižje','172',1193),(10222,'Rečica ob Savinji','173',1193),(10223,'Renče-Vogrsko','174',1193),(10224,'Ribnica','175',1193),(10225,'Ribnica na Pohorju','176',1193),(10226,'Rogaška Slatina','177',1193),(10227,'Rogašovci','178',1193),(10228,'Rogatec','179',1193),(10229,'Ruše','180',1193),(10230,'Selnica ob Dravi','195',1193),(10231,'Semič','196',1193),(10232,'Šentrupert','197',1193),(10233,'Sevnica','198',1193),(10234,'Sežana','199',1193),(10235,'Slovenj Gradec','200',1193),(10236,'Slovenska Bistrica','201',1193),(10237,'Slovenske Konjice','202',1193),(10238,'Šmarješke Toplice','203',1193),(10239,'Sodražica','204',1193),(10240,'Solčava','205',1193),(10241,'Središče ob Dravi','206',1193),(10242,'Starše','207',1193),(10243,'Straža','208',1193),(10244,'Sveta Trojica v Slovenskih goricah','209',1193),(10245,'Sveti Jurij v Slovenskih goricah','210',1193),(10246,'Sveti Tomaž','211',1193),(10247,'Vodice','212',1193),(10248,'Abkhazia','AB',1081),(10249,'Adjara','AJ',1081),(10250,'Tbilisi','TB',1081),(10251,'Guria','GU',1081),(10252,'Imereti','IM',1081),(10253,'Kakheti','KA',1081),(10254,'Kvemo Kartli','KK',1081),(10255,'Mtskheta-Mtianeti','MM',1081),(10256,'Racha-Lechkhumi and Kvemo Svaneti','RL',1081),(10257,'Samegrelo-Zemo Svaneti','SZ',1081),(10258,'Samtskhe-Javakheti','SJ',1081),(10259,'Shida Kartli','SK',1081),(10260,'Central','C',1074),(10261,'Punjab','PB',1163),(10262,'La Libertad','LI',1066),(10263,'La Paz','PA',1066),(10264,'La Union','UN',1066),(10265,'Littoral','LT',1038),(10266,'Nord-Ouest','NW',1038),(10267,'Telangana','TG',1101),(10268,'Ash Sharqiyah','04',1187),(10269,'Guadeloupe','GP',1076),(10270,'Martinique','MQ',1076),(10271,'Guyane','GF',1076),(10272,'La Réunion','RE',1076),(10273,'Mayotte','YT',1076),(10274,'Baringo','01',1112),(10275,'Bomet','02',1112),(10276,'Bungoma','03',1112),(10277,'Busia','04',1112),(10278,'Elgeyo/Marakwet','05',1112),(10279,'Embu','06',1112),(10280,'Garissa','07',1112),(10281,'Homa Bay','08',1112),(10282,'Isiolo','09',1112),(10283,'Kajiado','10',1112),(10284,'Kakamega','11',1112),(10285,'Kericho','12',1112),(10286,'Kiambu','13',1112),(10287,'Kilifi','14',1112),(10288,'Kirinyaga','15',1112),(10289,'Kisii','16',1112),(10290,'Kisumu','17',1112),(10291,'Kitui','18',1112),(10292,'Kwale','19',1112),(10293,'Laikipia','20',1112),(10294,'Lamu','21',1112),(10295,'Machakos','22',1112),(10296,'Makueni','23',1112),(10297,'Mandera','24',1112),(10298,'Marsabit','25',1112),(10299,'Meru','26',1112),(10300,'Migori','27',1112),(10301,'Mombasa','28',1112),(10302,'Murang\'a','29',1112),(10303,'Nairobi City','30',1112),(10304,'Nakuru','31',1112),(10305,'Nandi','32',1112),(10306,'Narok','33',1112),(10307,'Nyamira','34',1112),(10308,'Nyandarua','35',1112),(10309,'Nyeri','36',1112),(10310,'Samburu','37',1112),(10311,'Siaya','38',1112),(10312,'Taita/Taveta','39',1112),(10313,'Tana River','40',1112),(10314,'Tharaka-Nithi','41',1112),(10315,'Trans Nzoia','42',1112),(10316,'Turkana','43',1112),(10317,'Uasin Gishu','44',1112),(10318,'Vihiga','45',1112),(10319,'Wajir','46',1112),(10320,'West Pokot','47',1112),(10321,'Chandigarh','CH',1101),(10322,'Central','CP',1083),(10323,'Eastern','EP',1083),(10324,'Northern','NP',1083),(10325,'Western','WP',1083),(10326,'Saint Kitts','K',1181),(10327,'Nevis','N',1181),(10328,'Eastern','E',1190),(10329,'Northern','N',1190),(10330,'Southern','S',1190),(10331,'Dushanbe','DU',1209),(10332,'Nohiyahoi Tobei Jumhurí','RA',1209),(10333,'Wallis-et-Futuna','WF',1076),(10334,'Nouvelle-Calédonie','NC',1076),(10335,'Haute-Marne','52',1076),(10336,'Saint George','03',1009),(10337,'Saint John','04',1009),(10338,'Saint Mary','05',1009),(10339,'Saint Paul','06',1009),(10340,'Saint Peter','07',1009),(10341,'Saint Philip','08',1009),(10342,'Barbuda','10',1009),(10343,'Redonda','11',1009),(10344,'Christ Church','01',1018),(10345,'Saint Andrew','02',1018),(10346,'Saint George','03',1018),(10347,'Saint James','04',1018),(10348,'Saint John','05',1018),(10349,'Saint Joseph','06',1018),(10350,'Saint Lucy','07',1018),(10351,'Saint Michael','08',1018),(10352,'Saint Peter','09',1018),(10353,'Saint Philip','10',1018),(10354,'Saint Thomas','11',1018),(10355,'Estuaire','01',1080),(10356,'Haut-Ogooué','02',1080),(10357,'Moyen-Ogooué','03',1080),(10358,'Ngounié','04',1080),(10359,'Nyanga','05',1080),(10360,'Ogooué-Ivindo','06',1080),(10361,'Ogooué-Lolo','07',1080),(10362,'Ogooué-Maritime','08',1080),(10363,'Woleu-Ntem','09',1080),(10364,'Monmouthshire','MON',1226);
+INSERT INTO `civicrm_state_province` (`id`, `name`, `abbreviation`, `country_id`) VALUES (1000,'Alabama','AL',1228),(1001,'Alaska','AK',1228),(1002,'Arizona','AZ',1228),(1003,'Arkansas','AR',1228),(1004,'California','CA',1228),(1005,'Colorado','CO',1228),(1006,'Connecticut','CT',1228),(1007,'Delaware','DE',1228),(1008,'Florida','FL',1228),(1009,'Georgia','GA',1228),(1010,'Hawaii','HI',1228),(1011,'Idaho','ID',1228),(1012,'Illinois','IL',1228),(1013,'Indiana','IN',1228),(1014,'Iowa','IA',1228),(1015,'Kansas','KS',1228),(1016,'Kentucky','KY',1228),(1017,'Louisiana','LA',1228),(1018,'Maine','ME',1228),(1019,'Maryland','MD',1228),(1020,'Massachusetts','MA',1228),(1021,'Michigan','MI',1228),(1022,'Minnesota','MN',1228),(1023,'Mississippi','MS',1228),(1024,'Missouri','MO',1228),(1025,'Montana','MT',1228),(1026,'Nebraska','NE',1228),(1027,'Nevada','NV',1228),(1028,'New Hampshire','NH',1228),(1029,'New Jersey','NJ',1228),(1030,'New Mexico','NM',1228),(1031,'New York','NY',1228),(1032,'North Carolina','NC',1228),(1033,'North Dakota','ND',1228),(1034,'Ohio','OH',1228),(1035,'Oklahoma','OK',1228),(1036,'Oregon','OR',1228),(1037,'Pennsylvania','PA',1228),(1038,'Rhode Island','RI',1228),(1039,'South Carolina','SC',1228),(1040,'South Dakota','SD',1228),(1041,'Tennessee','TN',1228),(1042,'Texas','TX',1228),(1043,'Utah','UT',1228),(1044,'Vermont','VT',1228),(1045,'Virginia','VA',1228),(1046,'Washington','WA',1228),(1047,'West Virginia','WV',1228),(1048,'Wisconsin','WI',1228),(1049,'Wyoming','WY',1228),(1050,'District of Columbia','DC',1228),(1052,'American Samoa','AS',1228),(1053,'Guam','GU',1228),(1055,'Northern Mariana Islands','MP',1228),(1056,'Puerto Rico','PR',1228),(1057,'Virgin Islands','VI',1228),(1058,'United States Minor Outlying Islands','UM',1228),(1059,'Armed Forces Europe','AE',1228),(1060,'Armed Forces Americas','AA',1228),(1061,'Armed Forces Pacific','AP',1228),(1100,'Alberta','AB',1039),(1101,'British Columbia','BC',1039),(1102,'Manitoba','MB',1039),(1103,'New Brunswick','NB',1039),(1104,'Newfoundland and Labrador','NL',1039),(1105,'Northwest Territories','NT',1039),(1106,'Nova Scotia','NS',1039),(1107,'Nunavut','NU',1039),(1108,'Ontario','ON',1039),(1109,'Prince Edward Island','PE',1039),(1110,'Quebec','QC',1039),(1111,'Saskatchewan','SK',1039),(1112,'Yukon Territory','YT',1039),(1200,'Maharashtra','MM',1101),(1201,'Karnataka','KA',1101),(1202,'Andhra Pradesh','AP',1101),(1203,'Arunachal Pradesh','AR',1101),(1204,'Assam','AS',1101),(1205,'Bihar','BR',1101),(1206,'Chhattisgarh','CH',1101),(1207,'Goa','GA',1101),(1208,'Gujarat','GJ',1101),(1209,'Haryana','HR',1101),(1210,'Himachal Pradesh','HP',1101),(1211,'Jammu and Kashmir','JK',1101),(1212,'Jharkhand','JH',1101),(1213,'Kerala','KL',1101),(1214,'Madhya Pradesh','MP',1101),(1215,'Manipur','MN',1101),(1216,'Meghalaya','ML',1101),(1217,'Mizoram','MZ',1101),(1218,'Nagaland','NL',1101),(1219,'Orissa','OR',1101),(1220,'Punjab','PB',1101),(1221,'Rajasthan','RJ',1101),(1222,'Sikkim','SK',1101),(1223,'Tamil Nadu','TN',1101),(1224,'Tripura','TR',1101),(1225,'Uttarakhand','UT',1101),(1226,'Uttar Pradesh','UP',1101),(1227,'West Bengal','WB',1101),(1228,'Andaman and Nicobar Islands','AN',1101),(1229,'Dadra and Nagar Haveli','DN',1101),(1230,'Daman and Diu','DD',1101),(1231,'Delhi','DL',1101),(1232,'Lakshadweep','LD',1101),(1233,'Pondicherry','PY',1101),(1300,'mazowieckie','MZ',1172),(1301,'pomorskie','PM',1172),(1302,'dolnośląskie','DS',1172),(1303,'kujawsko-pomorskie','KP',1172),(1304,'lubelskie','LU',1172),(1305,'lubuskie','LB',1172),(1306,'łódzkie','LD',1172),(1307,'małopolskie','MA',1172),(1308,'opolskie','OP',1172),(1309,'podkarpackie','PK',1172),(1310,'podlaskie','PD',1172),(1311,'śląskie','SL',1172),(1312,'świętokrzyskie','SK',1172),(1313,'warmińsko-mazurskie','WN',1172),(1314,'wielkopolskie','WP',1172),(1315,'zachodniopomorskie','ZP',1172),(1500,'Abu Zaby','AZ',1225),(1501,'\'Ajman','AJ',1225),(1502,'Al Fujayrah','FU',1225),(1503,'Ash Shariqah','SH',1225),(1504,'Dubayy','DU',1225),(1505,'Ra\'s al Khaymah','RK',1225),(1506,'Dac Lac','33',1233),(1507,'Umm al Qaywayn','UQ',1225),(1508,'Badakhshan','BDS',1001),(1509,'Badghis','BDG',1001),(1510,'Baghlan','BGL',1001),(1511,'Balkh','BAL',1001),(1512,'Bamian','BAM',1001),(1513,'Farah','FRA',1001),(1514,'Faryab','FYB',1001),(1515,'Ghazni','GHA',1001),(1516,'Ghowr','GHO',1001),(1517,'Helmand','HEL',1001),(1518,'Herat','HER',1001),(1519,'Jowzjan','JOW',1001),(1520,'Kabul','KAB',1001),(1521,'Kandahar','KAN',1001),(1522,'Kapisa','KAP',1001),(1523,'Khowst','KHO',1001),(1524,'Konar','KNR',1001),(1525,'Kondoz','KDZ',1001),(1526,'Laghman','LAG',1001),(1527,'Lowgar','LOW',1001),(1528,'Nangrahar','NAN',1001),(1529,'Nimruz','NIM',1001),(1530,'Nurestan','NUR',1001),(1531,'Oruzgan','ORU',1001),(1532,'Paktia','PIA',1001),(1533,'Paktika','PKA',1001),(1534,'Parwan','PAR',1001),(1535,'Samangan','SAM',1001),(1536,'Sar-e Pol','SAR',1001),(1537,'Takhar','TAK',1001),(1538,'Wardak','WAR',1001),(1539,'Zabol','ZAB',1001),(1540,'Berat','BR',1002),(1541,'Bulqizë','BU',1002),(1542,'Delvinë','DL',1002),(1543,'Devoll','DV',1002),(1544,'Dibër','DI',1002),(1545,'Durrës','DR',1002),(1546,'Elbasan','EL',1002),(1547,'Fier','FR',1002),(1548,'Gramsh','GR',1002),(1549,'Gjirokastër','GJ',1002),(1550,'Has','HA',1002),(1551,'Kavajë','KA',1002),(1552,'Kolonjë','ER',1002),(1553,'Korçë','KO',1002),(1554,'Krujë','KR',1002),(1555,'Kuçovë','KC',1002),(1556,'Kukës','KU',1002),(1557,'Kurbin','KB',1002),(1558,'Lezhë','LE',1002),(1559,'Librazhd','LB',1002),(1560,'Lushnjë','LU',1002),(1561,'Malësi e Madhe','MM',1002),(1562,'Mallakastër','MK',1002),(1563,'Mat','MT',1002),(1564,'Mirditë','MR',1002),(1565,'Peqin','PQ',1002),(1566,'Përmet','PR',1002),(1567,'Pogradec','PG',1002),(1568,'Pukë','PU',1002),(1569,'Sarandë','SR',1002),(1570,'Skrapar','SK',1002),(1571,'Shkodër','SH',1002),(1572,'Tepelenë','TE',1002),(1573,'Tiranë','TR',1002),(1574,'Tropojë','TP',1002),(1575,'Vlorë','VL',1002),(1576,'Erevan','ER',1011),(1577,'Aragacotn','AG',1011),(1578,'Ararat','AR',1011),(1579,'Armavir','AV',1011),(1580,'Gegarkunik\'','GR',1011),(1581,'Kotayk\'','KT',1011),(1582,'Lory','LO',1011),(1583,'Sirak','SH',1011),(1584,'Syunik\'','SU',1011),(1585,'Tavus','TV',1011),(1586,'Vayoc Jor','VD',1011),(1587,'Bengo','BGO',1006),(1588,'Benguela','BGU',1006),(1589,'Bie','BIE',1006),(1590,'Cabinda','CAB',1006),(1591,'Cuando-Cubango','CCU',1006),(1592,'Cuanza Norte','CNO',1006),(1593,'Cuanza Sul','CUS',1006),(1594,'Cunene','CNN',1006),(1595,'Huambo','HUA',1006),(1596,'Huila','HUI',1006),(1597,'Luanda','LUA',1006),(1598,'Lunda Norte','LNO',1006),(1599,'Lunda Sul','LSU',1006),(1600,'Malange','MAL',1006),(1601,'Moxico','MOX',1006),(1602,'Namibe','NAM',1006),(1603,'Uige','UIG',1006),(1604,'Zaire','ZAI',1006),(1605,'Capital federal','C',1010),(1606,'Buenos Aires','B',1010),(1607,'Catamarca','K',1010),(1608,'Cordoba','X',1010),(1609,'Corrientes','W',1010),(1610,'Chaco','H',1010),(1611,'Chubut','U',1010),(1612,'Entre Rios','E',1010),(1613,'Formosa','P',1010),(1614,'Jujuy','Y',1010),(1615,'La Pampa','L',1010),(1616,'Mendoza','M',1010),(1617,'Misiones','N',1010),(1618,'Neuquen','Q',1010),(1619,'Rio Negro','R',1010),(1620,'Salta','A',1010),(1621,'San Juan','J',1010),(1622,'San Luis','D',1010),(1623,'Santa Cruz','Z',1010),(1624,'Santa Fe','S',1010),(1625,'Santiago del Estero','G',1010),(1626,'Tierra del Fuego','V',1010),(1627,'Tucuman','T',1010),(1628,'Burgenland','1',1014),(1629,'Kärnten','2',1014),(1630,'Niederösterreich','3',1014),(1631,'Oberösterreich','4',1014),(1632,'Salzburg','5',1014),(1633,'Steiermark','6',1014),(1634,'Tirol','7',1014),(1635,'Vorarlberg','8',1014),(1636,'Wien','9',1014),(1637,'Australian Antarctic Territory','AAT',1008),(1638,'Australian Capital Territory','ACT',1013),(1639,'Northern Territory','NT',1013),(1640,'New South Wales','NSW',1013),(1641,'Queensland','QLD',1013),(1642,'South Australia','SA',1013),(1643,'Tasmania','TAS',1013),(1644,'Victoria','VIC',1013),(1645,'Western Australia','WA',1013),(1646,'Naxcivan','NX',1015),(1647,'Ali Bayramli','AB',1015),(1648,'Baki','BA',1015),(1649,'Ganca','GA',1015),(1650,'Lankaran','LA',1015),(1651,'Mingacevir','MI',1015),(1652,'Naftalan','NA',1015),(1653,'Saki','SA',1015),(1654,'Sumqayit','SM',1015),(1655,'Susa','SS',1015),(1656,'Xankandi','XA',1015),(1657,'Yevlax','YE',1015),(1658,'Abseron','ABS',1015),(1659,'Agcabadi','AGC',1015),(1660,'Agdam','AGM',1015),(1661,'Agdas','AGS',1015),(1662,'Agstafa','AGA',1015),(1663,'Agsu','AGU',1015),(1664,'Astara','AST',1015),(1665,'Babak','BAB',1015),(1666,'Balakan','BAL',1015),(1667,'Barda','BAR',1015),(1668,'Beylagan','BEY',1015),(1669,'Bilasuvar','BIL',1015),(1670,'Cabrayll','CAB',1015),(1671,'Calilabad','CAL',1015),(1672,'Culfa','CUL',1015),(1673,'Daskasan','DAS',1015),(1674,'Davaci','DAV',1015),(1675,'Fuzuli','FUZ',1015),(1676,'Gadabay','GAD',1015),(1677,'Goranboy','GOR',1015),(1678,'Goycay','GOY',1015),(1679,'Haciqabul','HAC',1015),(1680,'Imisli','IMI',1015),(1681,'Ismayilli','ISM',1015),(1682,'Kalbacar','KAL',1015),(1683,'Kurdamir','KUR',1015),(1684,'Lacin','LAC',1015),(1685,'Lerik','LER',1015),(1686,'Masalli','MAS',1015),(1687,'Neftcala','NEF',1015),(1688,'Oguz','OGU',1015),(1689,'Ordubad','ORD',1015),(1690,'Qabala','QAB',1015),(1691,'Qax','QAX',1015),(1692,'Qazax','QAZ',1015),(1693,'Qobustan','QOB',1015),(1694,'Quba','QBA',1015),(1695,'Qubadli','QBI',1015),(1696,'Qusar','QUS',1015),(1697,'Saatli','SAT',1015),(1698,'Sabirabad','SAB',1015),(1699,'Sadarak','SAD',1015),(1700,'Sahbuz','SAH',1015),(1701,'Salyan','SAL',1015),(1702,'Samaxi','SMI',1015),(1703,'Samkir','SKR',1015),(1704,'Samux','SMX',1015),(1705,'Sarur','SAR',1015),(1706,'Siyazan','SIY',1015),(1707,'Tartar','TAR',1015),(1708,'Tovuz','TOV',1015),(1709,'Ucar','UCA',1015),(1710,'Xacmaz','XAC',1015),(1711,'Xanlar','XAN',1015),(1712,'Xizi','XIZ',1015),(1713,'Xocali','XCI',1015),(1714,'Xocavand','XVD',1015),(1715,'Yardimli','YAR',1015),(1716,'Zangilan','ZAN',1015),(1717,'Zaqatala','ZAQ',1015),(1718,'Zardab','ZAR',1015),(1719,'Federacija Bosna i Hercegovina','BIH',1026),(1720,'Republika Srpska','SRP',1026),(1721,'Bagerhat zila','05',1017),(1722,'Bandarban zila','01',1017),(1723,'Barguna zila','02',1017),(1724,'Barisal zila','06',1017),(1725,'Bhola zila','07',1017),(1726,'Bogra zila','03',1017),(1727,'Brahmanbaria zila','04',1017),(1728,'Chandpur zila','09',1017),(1729,'Chittagong zila','10',1017),(1730,'Chuadanga zila','12',1017),(1731,'Comilla zila','08',1017),(1732,'Cox\'s Bazar zila','11',1017),(1733,'Dhaka zila','13',1017),(1734,'Dinajpur zila','14',1017),(1735,'Faridpur zila','15',1017),(1736,'Feni zila','16',1017),(1737,'Gaibandha zila','19',1017),(1738,'Gazipur zila','18',1017),(1739,'Gopalganj zila','17',1017),(1740,'Habiganj zila','20',1017),(1741,'Jaipurhat zila','24',1017),(1742,'Jamalpur zila','21',1017),(1743,'Jessore zila','22',1017),(1744,'Jhalakati zila','25',1017),(1745,'Jhenaidah zila','23',1017),(1746,'Khagrachari zila','29',1017),(1747,'Khulna zila','27',1017),(1748,'Kishorganj zila','26',1017),(1749,'Kurigram zila','28',1017),(1750,'Kushtia zila','30',1017),(1751,'Lakshmipur zila','31',1017),(1752,'Lalmonirhat zila','32',1017),(1753,'Madaripur zila','36',1017),(1754,'Magura zila','37',1017),(1755,'Manikganj zila','33',1017),(1756,'Meherpur zila','39',1017),(1757,'Moulvibazar zila','38',1017),(1758,'Munshiganj zila','35',1017),(1759,'Mymensingh zila','34',1017),(1760,'Naogaon zila','48',1017),(1761,'Narail zila','43',1017),(1762,'Narayanganj zila','40',1017),(1763,'Narsingdi zila','42',1017),(1764,'Natore zila','44',1017),(1765,'Nawabganj zila','45',1017),(1766,'Netrakona zila','41',1017),(1767,'Nilphamari zila','46',1017),(1768,'Noakhali zila','47',1017),(1769,'Pabna zila','49',1017),(1770,'Panchagarh zila','52',1017),(1771,'Patuakhali zila','51',1017),(1772,'Pirojpur zila','50',1017),(1773,'Rajbari zila','53',1017),(1774,'Rajshahi zila','54',1017),(1775,'Rangamati zila','56',1017),(1776,'Rangpur zila','55',1017),(1777,'Satkhira zila','58',1017),(1778,'Shariatpur zila','62',1017),(1779,'Sherpur zila','57',1017),(1780,'Sirajganj zila','59',1017),(1781,'Sunamganj zila','61',1017),(1782,'Sylhet zila','60',1017),(1783,'Tangail zila','63',1017),(1784,'Thakurgaon zila','64',1017),(1785,'Antwerpen','VAN',1020),(1786,'Brabant Wallon','WBR',1020),(1787,'Hainaut','WHT',1020),(1788,'Liege','WLG',1020),(1789,'Limburg','VLI',1020),(1790,'Luxembourg','WLX',1020),(1791,'Namur','WNA',1020),(1792,'Oost-Vlaanderen','VOV',1020),(1793,'Vlaams-Brabant','VBR',1020),(1794,'West-Vlaanderen','VWV',1020),(1795,'Bale','BAL',1034),(1796,'Bam','BAM',1034),(1797,'Banwa','BAN',1034),(1798,'Bazega','BAZ',1034),(1799,'Bougouriba','BGR',1034),(1800,'Boulgou','BLG',1034),(1801,'Boulkiemde','BLK',1034),(1802,'Comoe','COM',1034),(1803,'Ganzourgou','GAN',1034),(1804,'Gnagna','GNA',1034),(1805,'Gourma','GOU',1034),(1806,'Houet','HOU',1034),(1807,'Ioba','IOB',1034),(1808,'Kadiogo','KAD',1034),(1809,'Kenedougou','KEN',1034),(1810,'Komondjari','KMD',1034),(1811,'Kompienga','KMP',1034),(1812,'Kossi','KOS',1034),(1813,'Koulpulogo','KOP',1034),(1814,'Kouritenga','KOT',1034),(1815,'Kourweogo','KOW',1034),(1816,'Leraba','LER',1034),(1817,'Loroum','LOR',1034),(1818,'Mouhoun','MOU',1034),(1819,'Nahouri','NAO',1034),(1820,'Namentenga','NAM',1034),(1821,'Nayala','NAY',1034),(1822,'Noumbiel','NOU',1034),(1823,'Oubritenga','OUB',1034),(1824,'Oudalan','OUD',1034),(1825,'Passore','PAS',1034),(1826,'Poni','PON',1034),(1827,'Sanguie','SNG',1034),(1828,'Sanmatenga','SMT',1034),(1829,'Seno','SEN',1034),(1830,'Siasili','SIS',1034),(1831,'Soum','SOM',1034),(1832,'Sourou','SOR',1034),(1833,'Tapoa','TAP',1034),(1834,'Tui','TUI',1034),(1835,'Yagha','YAG',1034),(1836,'Yatenga','YAT',1034),(1837,'Ziro','ZIR',1034),(1838,'Zondoma','ZON',1034),(1839,'Zoundweogo','ZOU',1034),(1840,'Blagoevgrad','01',1033),(1841,'Burgas','02',1033),(1842,'Dobrich','08',1033),(1843,'Gabrovo','07',1033),(1844,'Haskovo','26',1033),(1845,'Yambol','28',1033),(1846,'Kardzhali','09',1033),(1847,'Kyustendil','10',1033),(1848,'Lovech','11',1033),(1849,'Montana','12',1033),(1850,'Pazardzhik','13',1033),(1851,'Pernik','14',1033),(1852,'Pleven','15',1033),(1853,'Plovdiv','16',1033),(1854,'Razgrad','17',1033),(1855,'Ruse','18',1033),(1856,'Silistra','19',1033),(1857,'Sliven','20',1033),(1858,'Smolyan','21',1033),(1859,'Sofia','23',1033),(1860,'Stara Zagora','24',1033),(1861,'Shumen','27',1033),(1862,'Targovishte','25',1033),(1863,'Varna','03',1033),(1864,'Veliko Tarnovo','04',1033),(1865,'Vidin','05',1033),(1866,'Vratsa','06',1033),(1867,'Al Hadd','01',1016),(1868,'Al Manamah','03',1016),(1869,'Al Mintaqah al Gharbiyah','10',1016),(1870,'Al Mintagah al Wusta','07',1016),(1871,'Al Mintaqah ash Shamaliyah','05',1016),(1872,'Al Muharraq','02',1016),(1873,'Ar Rifa','09',1016),(1874,'Jidd Hafs','04',1016),(1875,'Madluat Jamad','12',1016),(1876,'Madluat Isa','08',1016),(1877,'Mintaqat Juzur tawar','11',1016),(1878,'Sitrah','06',1016),(1879,'Bubanza','BB',1036),(1880,'Bujumbura','BJ',1036),(1881,'Bururi','BR',1036),(1882,'Cankuzo','CA',1036),(1883,'Cibitoke','CI',1036),(1884,'Gitega','GI',1036),(1885,'Karuzi','KR',1036),(1886,'Kayanza','KY',1036),(1887,'Makamba','MA',1036),(1888,'Muramvya','MU',1036),(1889,'Mwaro','MW',1036),(1890,'Ngozi','NG',1036),(1891,'Rutana','RT',1036),(1892,'Ruyigi','RY',1036),(1893,'Alibori','AL',1022),(1894,'Atakora','AK',1022),(1895,'Atlantique','AQ',1022),(1896,'Borgou','BO',1022),(1897,'Collines','CO',1022),(1898,'Donga','DO',1022),(1899,'Kouffo','KO',1022),(1900,'Littoral','LI',1022),(1901,'Mono','MO',1022),(1902,'Oueme','OU',1022),(1903,'Plateau','PL',1022),(1904,'Zou','ZO',1022),(1905,'Belait','BE',1032),(1906,'Brunei-Muara','BM',1032),(1907,'Temburong','TE',1032),(1908,'Tutong','TU',1032),(1909,'Cochabamba','C',1025),(1910,'Chuquisaca','H',1025),(1911,'El Beni','B',1025),(1912,'La Paz','L',1025),(1913,'Oruro','O',1025),(1914,'Pando','N',1025),(1915,'Potosi','P',1025),(1916,'Tarija','T',1025),(1917,'Acre','AC',1029),(1918,'Alagoas','AL',1029),(1919,'Amazonas','AM',1029),(1920,'Amapa','AP',1029),(1921,'Bahia','BA',1029),(1922,'Ceara','CE',1029),(1923,'Distrito Federal','DF',1029),(1924,'Espirito Santo','ES',1029),(1926,'Goias','GO',1029),(1927,'Maranhao','MA',1029),(1928,'Minas Gerais','MG',1029),(1929,'Mato Grosso do Sul','MS',1029),(1930,'Mato Grosso','MT',1029),(1931,'Para','PA',1029),(1932,'Paraiba','PB',1029),(1933,'Pernambuco','PE',1029),(1934,'Piaui','PI',1029),(1935,'Parana','PR',1029),(1936,'Rio de Janeiro','RJ',1029),(1937,'Rio Grande do Norte','RN',1029),(1938,'Rondonia','RO',1029),(1939,'Roraima','RR',1029),(1940,'Rio Grande do Sul','RS',1029),(1941,'Santa Catarina','SC',1029),(1942,'Sergipe','SE',1029),(1943,'Sao Paulo','SP',1029),(1944,'Tocantins','TO',1029),(1945,'Acklins and Crooked Islands','AC',1212),(1946,'Bimini','BI',1212),(1947,'Cat Island','CI',1212),(1948,'Exuma','EX',1212),(1955,'Inagua','IN',1212),(1957,'Long Island','LI',1212),(1959,'Mayaguana','MG',1212),(1960,'New Providence','NP',1212),(1962,'Ragged Island','RI',1212),(1966,'Bumthang','33',1024),(1967,'Chhukha','12',1024),(1968,'Dagana','22',1024),(1969,'Gasa','GA',1024),(1970,'Ha','13',1024),(1971,'Lhuentse','44',1024),(1972,'Monggar','42',1024),(1973,'Paro','11',1024),(1974,'Pemagatshel','43',1024),(1975,'Punakha','23',1024),(1976,'Samdrup Jongkha','45',1024),(1977,'Samtee','14',1024),(1978,'Sarpang','31',1024),(1979,'Thimphu','15',1024),(1980,'Trashigang','41',1024),(1981,'Trashi Yangtse','TY',1024),(1982,'Trongsa','32',1024),(1983,'Tsirang','21',1024),(1984,'Wangdue Phodrang','24',1024),(1985,'Zhemgang','34',1024),(1986,'Central','CE',1027),(1987,'Ghanzi','GH',1027),(1988,'Kgalagadi','KG',1027),(1989,'Kgatleng','KL',1027),(1990,'Kweneng','KW',1027),(1991,'Ngamiland','NG',1027),(1992,'North-East','NE',1027),(1993,'North-West','NW',1027),(1994,'South-East','SE',1027),(1995,'Southern','SO',1027),(1996,'Brèsckaja voblasc\'','BR',1019),(1997,'Homel\'skaja voblasc\'','HO',1019),(1998,'Hrodzenskaja voblasc\'','HR',1019),(1999,'Mahilëuskaja voblasc\'','MA',1019),(2000,'Minskaja voblasc\'','MI',1019),(2001,'Vicebskaja voblasc\'','VI',1019),(2002,'Belize','BZ',1021),(2003,'Cayo','CY',1021),(2004,'Corozal','CZL',1021),(2005,'Orange Walk','OW',1021),(2006,'Stann Creek','SC',1021),(2007,'Toledo','TOL',1021),(2008,'Kinshasa','KN',1050),(2011,'Equateur','EQ',1050),(2014,'Kasai-Oriental','KE',1050),(2016,'Maniema','MA',1050),(2017,'Nord-Kivu','NK',1050),(2019,'Sud-Kivu','SK',1050),(2020,'Bangui','BGF',1042),(2021,'Bamingui-Bangoran','BB',1042),(2022,'Basse-Kotto','BK',1042),(2023,'Haute-Kotto','HK',1042),(2024,'Haut-Mbomou','HM',1042),(2025,'Kemo','KG',1042),(2026,'Lobaye','LB',1042),(2027,'Mambere-Kadei','HS',1042),(2028,'Mbomou','MB',1042),(2029,'Nana-Grebizi','KB',1042),(2030,'Nana-Mambere','NM',1042),(2031,'Ombella-Mpoko','MP',1042),(2032,'Ouaka','UK',1042),(2033,'Ouham','AC',1042),(2034,'Ouham-Pende','OP',1042),(2035,'Sangha-Mbaere','SE',1042),(2036,'Vakaga','VR',1042),(2037,'Brazzaville','BZV',1051),(2038,'Bouenza','11',1051),(2039,'Cuvette','8',1051),(2040,'Cuvette-Ouest','15',1051),(2041,'Kouilou','5',1051),(2042,'Lekoumou','2',1051),(2043,'Likouala','7',1051),(2044,'Niari','9',1051),(2045,'Plateaux','14',1051),(2046,'Pool','12',1051),(2047,'Sangha','13',1051),(2048,'Aargau','AG',1205),(2049,'Appenzell Innerrhoden','AI',1205),(2050,'Appenzell Ausserrhoden','AR',1205),(2051,'Bern','BE',1205),(2052,'Basel-Landschaft','BL',1205),(2053,'Basel-Stadt','BS',1205),(2054,'Fribourg','FR',1205),(2055,'Geneva','GE',1205),(2056,'Glarus','GL',1205),(2057,'Graubunden','GR',1205),(2058,'Jura','JU',1205),(2059,'Luzern','LU',1205),(2060,'Neuchatel','NE',1205),(2061,'Nidwalden','NW',1205),(2062,'Obwalden','OW',1205),(2063,'Sankt Gallen','SG',1205),(2064,'Schaffhausen','SH',1205),(2065,'Solothurn','SO',1205),(2066,'Schwyz','SZ',1205),(2067,'Thurgau','TG',1205),(2068,'Ticino','TI',1205),(2069,'Uri','UR',1205),(2070,'Vaud','VD',1205),(2071,'Valais','VS',1205),(2072,'Zug','ZG',1205),(2073,'Zurich','ZH',1205),(2074,'18 Montagnes','06',1054),(2075,'Agnebi','16',1054),(2076,'Bas-Sassandra','09',1054),(2077,'Denguele','10',1054),(2078,'Haut-Sassandra','02',1054),(2079,'Lacs','07',1054),(2080,'Lagunes','01',1054),(2081,'Marahoue','12',1054),(2082,'Moyen-Comoe','05',1054),(2083,'Nzi-Comoe','11',1054),(2084,'Savanes','03',1054),(2085,'Sud-Bandama','15',1054),(2086,'Sud-Comoe','13',1054),(2087,'Vallee du Bandama','04',1054),(2088,'Worodouqou','14',1054),(2089,'Zanzan','08',1054),(2090,'Aisen del General Carlos Ibanez del Campo','AI',1044),(2091,'Antofagasta','AN',1044),(2092,'Araucania','AR',1044),(2093,'Atacama','AT',1044),(2094,'Bio-Bio','BI',1044),(2095,'Coquimbo','CO',1044),(2096,'Libertador General Bernardo O\'Higgins','LI',1044),(2097,'Los Lagos','LL',1044),(2098,'Magallanes','MA',1044),(2099,'Maule','ML',1044),(2100,'Santiago Metropolitan','SM',1044),(2101,'Tarapaca','TA',1044),(2102,'Valparaiso','VS',1044),(2103,'Adamaoua','AD',1038),(2104,'Centre','CE',1038),(2105,'East','ES',1038),(2106,'Far North','EN',1038),(2107,'North','NO',1038),(2108,'South','SW',1038),(2109,'South-West','SW',1038),(2110,'West','OU',1038),(2111,'Beijing','11',1045),(2112,'Chongqing','50',1045),(2113,'Shanghai','31',1045),(2114,'Tianjin','12',1045),(2115,'Anhui','34',1045),(2116,'Fujian','35',1045),(2117,'Gansu','62',1045),(2118,'Guangdong','44',1045),(2119,'Guizhou','52',1045),(2120,'Hainan','46',1045),(2121,'Hebei','13',1045),(2122,'Heilongjiang','23',1045),(2123,'Henan','41',1045),(2124,'Hubei','42',1045),(2125,'Hunan','43',1045),(2126,'Jiangsu','32',1045),(2127,'Jiangxi','36',1045),(2128,'Jilin','22',1045),(2129,'Liaoning','21',1045),(2130,'Qinghai','63',1045),(2131,'Shaanxi','61',1045),(2132,'Shandong','37',1045),(2133,'Shanxi','14',1045),(2134,'Sichuan','51',1045),(2135,'Taiwan','71',1045),(2136,'Yunnan','53',1045),(2137,'Zhejiang','33',1045),(2138,'Guangxi','45',1045),(2139,'Neia Mongol (mn)','15',1045),(2140,'Xinjiang','65',1045),(2141,'Xizang','54',1045),(2142,'Hong Kong','91',1045),(2143,'Macau','92',1045),(2144,'Distrito Capital de Bogotá','DC',1048),(2145,'Amazonea','AMA',1048),(2146,'Antioquia','ANT',1048),(2147,'Arauca','ARA',1048),(2148,'Atlántico','ATL',1048),(2149,'Bolívar','BOL',1048),(2150,'Boyacá','BOY',1048),(2151,'Caldea','CAL',1048),(2152,'Caquetá','CAQ',1048),(2153,'Casanare','CAS',1048),(2154,'Cauca','CAU',1048),(2155,'Cesar','CES',1048),(2156,'Córdoba','COR',1048),(2157,'Cundinamarca','CUN',1048),(2158,'Chocó','CHO',1048),(2159,'Guainía','GUA',1048),(2160,'Guaviare','GUV',1048),(2161,'La Guajira','LAG',1048),(2162,'Magdalena','MAG',1048),(2163,'Meta','MET',1048),(2164,'Nariño','NAR',1048),(2165,'Norte de Santander','NSA',1048),(2166,'Putumayo','PUT',1048),(2167,'Quindio','QUI',1048),(2168,'Risaralda','RIS',1048),(2169,'San Andrés, Providencia y Santa Catalina','SAP',1048),(2170,'Santander','SAN',1048),(2171,'Sucre','SUC',1048),(2172,'Tolima','TOL',1048),(2173,'Valle del Cauca','VAC',1048),(2174,'Vaupés','VAU',1048),(2175,'Vichada','VID',1048),(2176,'Alajuela','A',1053),(2177,'Cartago','C',1053),(2178,'Guanacaste','G',1053),(2179,'Heredia','H',1053),(2180,'Limon','L',1053),(2181,'Puntarenas','P',1053),(2182,'San Jose','SJ',1053),(2183,'Camagey','09',1056),(2184,'Ciego de `vila','08',1056),(2185,'Cienfuegos','06',1056),(2186,'Ciudad de La Habana','03',1056),(2187,'Granma','12',1056),(2188,'Guantanamo','14',1056),(2189,'Holquin','11',1056),(2190,'La Habana','02',1056),(2191,'Las Tunas','10',1056),(2192,'Matanzas','04',1056),(2193,'Pinar del Rio','01',1056),(2194,'Sancti Spiritus','07',1056),(2195,'Santiago de Cuba','13',1056),(2196,'Villa Clara','05',1056),(2197,'Isla de la Juventud','99',1056),(2198,'Pinar del Roo','PR',1056),(2199,'Ciego de Avila','CA',1056),(2200,'Camagoey','CG',1056),(2201,'Holgun','HO',1056),(2202,'Sancti Spritus','SS',1056),(2203,'Municipio Especial Isla de la Juventud','IJ',1056),(2204,'Boa Vista','BV',1040),(2205,'Brava','BR',1040),(2206,'Calheta de Sao Miguel','CS',1040),(2207,'Fogo','FO',1040),(2208,'Maio','MA',1040),(2209,'Mosteiros','MO',1040),(2210,'Paul','PA',1040),(2211,'Porto Novo','PN',1040),(2212,'Praia','PR',1040),(2213,'Ribeira Grande','RG',1040),(2214,'Sal','SL',1040),(2215,'Sao Domingos','SD',1040),(2216,'Sao Filipe','SF',1040),(2217,'Sao Nicolau','SN',1040),(2218,'Sao Vicente','SV',1040),(2219,'Tarrafal','TA',1040),(2220,'Ammochostos Magusa','04',1057),(2221,'Keryneia','06',1057),(2222,'Larnaka','03',1057),(2223,'Lefkosia','01',1057),(2224,'Lemesos','02',1057),(2225,'Pafos','05',1057),(2226,'Jihočeský kraj','JC',1058),(2227,'Jihomoravský kraj','JM',1058),(2228,'Karlovarský kraj','KA',1058),(2229,'Královéhradecký kraj','KR',1058),(2230,'Liberecký kraj','LI',1058),(2231,'Moravskoslezský kraj','MO',1058),(2232,'Olomoucký kraj','OL',1058),(2233,'Pardubický kraj','PA',1058),(2234,'Plzeňský kraj','PL',1058),(2235,'Praha, hlavní město','PR',1058),(2236,'Středočeský kraj','ST',1058),(2237,'Ústecký kraj','US',1058),(2238,'Vysočina','VY',1058),(2239,'Zlínský kraj','ZL',1058),(2240,'Baden-Württemberg','BW',1082),(2241,'Bayern','BY',1082),(2242,'Bremen','HB',1082),(2243,'Hamburg','HH',1082),(2244,'Hessen','HE',1082),(2245,'Niedersachsen','NI',1082),(2246,'Nordrhein-Westfalen','NW',1082),(2247,'Rheinland-Pfalz','RP',1082),(2248,'Saarland','SL',1082),(2249,'Schleswig-Holstein','SH',1082),(2250,'Berlin','BE',1082),(2251,'Brandenburg','BB',1082),(2252,'Mecklenburg-Vorpommern','MV',1082),(2253,'Sachsen','SN',1082),(2254,'Sachsen-Anhalt','ST',1082),(2255,'Thüringen','TH',1082),(2256,'Ali Sabiah','AS',1060),(2257,'Dikhil','DI',1060),(2258,'Djibouti','DJ',1060),(2259,'Obock','OB',1060),(2260,'Tadjoura','TA',1060),(2261,'Frederiksberg','147',1059),(2262,'Copenhagen City','101',1059),(2263,'Copenhagen','015',1059),(2264,'Frederiksborg','020',1059),(2265,'Roskilde','025',1059),(2266,'Vestsjælland','030',1059),(2267,'Storstrøm','035',1059),(2268,'Bornholm','040',1059),(2269,'Fyn','042',1059),(2270,'South Jutland','050',1059),(2271,'Ribe','055',1059),(2272,'Vejle','060',1059),(2273,'Ringkjøbing','065',1059),(2274,'Århus','070',1059),(2275,'Viborg','076',1059),(2276,'North Jutland','080',1059),(2277,'Distrito Nacional (Santo Domingo)','01',1062),(2278,'Azua','02',1062),(2279,'Bahoruco','03',1062),(2280,'Barahona','04',1062),(2281,'Dajabón','05',1062),(2282,'Duarte','06',1062),(2283,'El Seybo [El Seibo]','08',1062),(2284,'Espaillat','09',1062),(2285,'Hato Mayor','30',1062),(2286,'Independencia','10',1062),(2287,'La Altagracia','11',1062),(2288,'La Estrelleta [Elias Pina]','07',1062),(2289,'La Romana','12',1062),(2290,'La Vega','13',1062),(2291,'Maroia Trinidad Sánchez','14',1062),(2292,'Monseñor Nouel','28',1062),(2293,'Monte Cristi','15',1062),(2294,'Monte Plata','29',1062),(2295,'Pedernales','16',1062),(2296,'Peravia','17',1062),(2297,'Puerto Plata','18',1062),(2298,'Salcedo','19',1062),(2299,'Samaná','20',1062),(2300,'San Cristóbal','21',1062),(2301,'San Pedro de Macorís','23',1062),(2302,'Sánchez Ramírez','24',1062),(2303,'Santiago','25',1062),(2304,'Santiago Rodríguez','26',1062),(2305,'Valverde','27',1062),(2306,'Adrar','01',1003),(2307,'Ain Defla','44',1003),(2308,'Ain Tmouchent','46',1003),(2309,'Alger','16',1003),(2310,'Annaba','23',1003),(2311,'Batna','05',1003),(2312,'Bechar','08',1003),(2313,'Bejaia','06',1003),(2314,'Biskra','07',1003),(2315,'Blida','09',1003),(2316,'Bordj Bou Arreridj','34',1003),(2317,'Bouira','10',1003),(2318,'Boumerdes','35',1003),(2319,'Chlef','02',1003),(2320,'Constantine','25',1003),(2321,'Djelfa','17',1003),(2322,'El Bayadh','32',1003),(2323,'El Oued','39',1003),(2324,'El Tarf','36',1003),(2325,'Ghardaia','47',1003),(2326,'Guelma','24',1003),(2327,'Illizi','33',1003),(2328,'Jijel','18',1003),(2329,'Khenchela','40',1003),(2330,'Laghouat','03',1003),(2331,'Mascara','29',1003),(2332,'Medea','26',1003),(2333,'Mila','43',1003),(2334,'Mostaganem','27',1003),(2335,'Msila','28',1003),(2336,'Naama','45',1003),(2337,'Oran','31',1003),(2338,'Ouargla','30',1003),(2339,'Oum el Bouaghi','04',1003),(2340,'Relizane','48',1003),(2341,'Saida','20',1003),(2342,'Setif','19',1003),(2343,'Sidi Bel Abbes','22',1003),(2344,'Skikda','21',1003),(2345,'Souk Ahras','41',1003),(2346,'Tamanghasset','11',1003),(2347,'Tebessa','12',1003),(2348,'Tiaret','14',1003),(2349,'Tindouf','37',1003),(2350,'Tipaza','42',1003),(2351,'Tissemsilt','38',1003),(2352,'Tizi Ouzou','15',1003),(2353,'Tlemcen','13',1003),(2354,'Azuay','A',1064),(2355,'Bolivar','B',1064),(2356,'Canar','F',1064),(2357,'Carchi','C',1064),(2358,'Cotopaxi','X',1064),(2359,'Chimborazo','H',1064),(2360,'El Oro','O',1064),(2361,'Esmeraldas','E',1064),(2362,'Galapagos','W',1064),(2363,'Guayas','G',1064),(2364,'Imbabura','I',1064),(2365,'Loja','L',1064),(2366,'Los Rios','R',1064),(2367,'Manabi','M',1064),(2368,'Morona-Santiago','S',1064),(2369,'Napo','N',1064),(2370,'Orellana','D',1064),(2371,'Pastaza','Y',1064),(2372,'Pichincha','P',1064),(2373,'Sucumbios','U',1064),(2374,'Tungurahua','T',1064),(2375,'Zamora-Chinchipe','Z',1064),(2376,'Harjumaa','37',1069),(2377,'Hiiumaa','39',1069),(2378,'Ida-Virumaa','44',1069),(2379,'Jõgevamaa','49',1069),(2380,'Järvamaa','51',1069),(2381,'Läänemaa','57',1069),(2382,'Lääne-Virumaa','59',1069),(2383,'Põlvamaa','65',1069),(2384,'Pärnumaa','67',1069),(2385,'Raplamaa','70',1069),(2386,'Saaremaa','74',1069),(2387,'Tartumaa','7B',1069),(2388,'Valgamaa','82',1069),(2389,'Viljandimaa','84',1069),(2390,'Võrumaa','86',1069),(2391,'Ad Daqahllyah','DK',1065),(2392,'Al Bahr al Ahmar','BA',1065),(2393,'Al Buhayrah','BH',1065),(2394,'Al Fayym','FYM',1065),(2395,'Al Gharbiyah','GH',1065),(2396,'Al Iskandarlyah','ALX',1065),(2397,'Al Isma illyah','IS',1065),(2398,'Al Jizah','GZ',1065),(2399,'Al Minuflyah','MNF',1065),(2400,'Al Minya','MN',1065),(2401,'Al Qahirah','C',1065),(2402,'Al Qalyublyah','KB',1065),(2403,'Al Wadi al Jadid','WAD',1065),(2404,'Ash Sharqiyah','SHR',1065),(2405,'As Suways','SUZ',1065),(2406,'Aswan','ASN',1065),(2407,'Asyut','AST',1065),(2408,'Bani Suwayf','BNS',1065),(2409,'Bur Sa\'id','PTS',1065),(2410,'Dumyat','DT',1065),(2411,'Janub Sina\'','JS',1065),(2412,'Kafr ash Shaykh','KFS',1065),(2413,'Matruh','MT',1065),(2414,'Qina','KN',1065),(2415,'Shamal Sina\'','SIN',1065),(2416,'Suhaj','SHG',1065),(2417,'Anseba','AN',1068),(2418,'Debub','DU',1068),(2419,'Debubawi Keyih Bahri [Debub-Keih-Bahri]','DK',1068),(2420,'Gash-Barka','GB',1068),(2421,'Maakel [Maekel]','MA',1068),(2422,'Semenawi Keyih Bahri [Semien-Keih-Bahri]','SK',1068),(2423,'Álava','VI',1198),(2424,'Albacete','AB',1198),(2425,'Alicante','A',1198),(2426,'Almería','AL',1198),(2427,'Asturias','O',1198),(2428,'Ávila','AV',1198),(2429,'Badajoz','BA',1198),(2430,'Baleares','PM',1198),(2431,'Barcelona','B',1198),(2432,'Burgos','BU',1198),(2433,'Cáceres','CC',1198),(2434,'Cádiz','CA',1198),(2435,'Cantabria','S',1198),(2436,'Castellón','CS',1198),(2437,'Ciudad Real','CR',1198),(2438,'Cuenca','CU',1198),(2439,'Girona [Gerona]','GE',1198),(2440,'Granada','GR',1198),(2441,'Guadalajara','GU',1198),(2442,'Guipúzcoa','SS',1198),(2443,'Huelva','H',1198),(2444,'Huesca','HU',1198),(2445,'Jaén','J',1198),(2446,'La Coruña','C',1198),(2447,'La Rioja','LO',1198),(2448,'Las Palmas','GC',1198),(2449,'León','LE',1198),(2450,'Lleida [Lérida]','L',1198),(2451,'Lugo','LU',1198),(2452,'Madrid','M',1198),(2453,'Málaga','MA',1198),(2454,'Murcia','MU',1198),(2455,'Navarra','NA',1198),(2456,'Ourense','OR',1198),(2457,'Palencia','P',1198),(2458,'Pontevedra','PO',1198),(2459,'Salamanca','SA',1198),(2460,'Santa Cruz de Tenerife','TF',1198),(2461,'Segovia','SG',1198),(2462,'Sevilla','SE',1198),(2463,'Soria','SO',1198),(2464,'Tarragona','T',1198),(2465,'Teruel','TE',1198),(2466,'Valencia','V',1198),(2467,'Valladolid','VA',1198),(2468,'Vizcaya','BI',1198),(2469,'Zamora','ZA',1198),(2470,'Zaragoza','Z',1198),(2471,'Ceuta','CE',1198),(2472,'Melilla','ML',1198),(2473,'Addis Ababa','AA',1070),(2474,'Dire Dawa','DD',1070),(2475,'Afar','AF',1070),(2476,'Amara','AM',1070),(2477,'Benshangul-Gumaz','BE',1070),(2478,'Gambela Peoples','GA',1070),(2479,'Harari People','HA',1070),(2480,'Oromia','OR',1070),(2481,'Somali','SO',1070),(2482,'Southern Nations, Nationalities and Peoples','SN',1070),(2483,'Tigrai','TI',1070),(2490,'Eastern','E',1074),(2491,'Northern','N',1074),(2492,'Western','W',1074),(2493,'Rotuma','R',1074),(2494,'Chuuk','TRK',1141),(2495,'Kosrae','KSA',1141),(2496,'Pohnpei','PNI',1141),(2497,'Yap','YAP',1141),(2498,'Ain','01',1076),(2499,'Aisne','02',1076),(2500,'Allier','03',1076),(2501,'Alpes-de-Haute-Provence','04',1076),(2502,'Alpes-Maritimes','06',1076),(2503,'Ardèche','07',1076),(2504,'Ardennes','08',1076),(2505,'Ariège','09',1076),(2506,'Aube','10',1076),(2507,'Aude','11',1076),(2508,'Aveyron','12',1076),(2509,'Bas-Rhin','67',1076),(2510,'Bouches-du-Rhône','13',1076),(2511,'Calvados','14',1076),(2512,'Cantal','15',1076),(2513,'Charente','16',1076),(2514,'Charente-Maritime','17',1076),(2515,'Cher','18',1076),(2516,'Corrèze','19',1076),(2517,'Corse-du-Sud','20A',1076),(2518,'Côte-d\'Or','21',1076),(2519,'Côtes-d\'Armor','22',1076),(2520,'Creuse','23',1076),(2521,'Deux-Sèvres','79',1076),(2522,'Dordogne','24',1076),(2523,'Doubs','25',1076),(2524,'Drôme','26',1076),(2525,'Essonne','91',1076),(2526,'Eure','27',1076),(2527,'Eure-et-Loir','28',1076),(2528,'Finistère','29',1076),(2529,'Gard','30',1076),(2530,'Gers','32',1076),(2531,'Gironde','33',1076),(2532,'Haut-Rhin','68',1076),(2533,'Haute-Corse','20B',1076),(2534,'Haute-Garonne','31',1076),(2535,'Haute-Loire','43',1076),(2536,'Haute-Saône','70',1076),(2537,'Haute-Savoie','74',1076),(2538,'Haute-Vienne','87',1076),(2539,'Hautes-Alpes','05',1076),(2540,'Hautes-Pyrénées','65',1076),(2541,'Hauts-de-Seine','92',1076),(2542,'Hérault','34',1076),(2543,'Indre','36',1076),(2544,'Ille-et-Vilaine','35',1076),(2545,'Indre-et-Loire','37',1076),(2546,'Isère','38',1076),(2547,'Landes','40',1076),(2548,'Loir-et-Cher','41',1076),(2549,'Loire','42',1076),(2550,'Loire-Atlantique','44',1076),(2551,'Loiret','45',1076),(2552,'Lot','46',1076),(2553,'Lot-et-Garonne','47',1076),(2554,'Lozère','48',1076),(2555,'Maine-et-Loire','49',1076),(2556,'Manche','50',1076),(2557,'Marne','51',1076),(2558,'Mayenne','53',1076),(2559,'Meurthe-et-Moselle','54',1076),(2560,'Meuse','55',1076),(2561,'Morbihan','56',1076),(2562,'Moselle','57',1076),(2563,'Nièvre','58',1076),(2564,'Nord','59',1076),(2565,'Oise','60',1076),(2566,'Orne','61',1076),(2567,'Paris','75',1076),(2568,'Pas-de-Calais','62',1076),(2569,'Puy-de-Dôme','63',1076),(2570,'Pyrénées-Atlantiques','64',1076),(2571,'Pyrénées-Orientales','66',1076),(2572,'Rhône','69',1076),(2573,'Saône-et-Loire','71',1076),(2574,'Sarthe','72',1076),(2575,'Savoie','73',1076),(2576,'Seine-et-Marne','77',1076),(2577,'Seine-Maritime','76',1076),(2578,'Seine-Saint-Denis','93',1076),(2579,'Somme','80',1076),(2580,'Tarn','81',1076),(2581,'Tarn-et-Garonne','82',1076),(2582,'Val d\'Oise','95',1076),(2583,'Territoire de Belfort','90',1076),(2584,'Val-de-Marne','94',1076),(2585,'Var','83',1076),(2586,'Vaucluse','84',1076),(2587,'Vendée','85',1076),(2588,'Vienne','86',1076),(2589,'Vosges','88',1076),(2590,'Yonne','89',1076),(2591,'Yvelines','78',1076),(2592,'Aberdeen City','ABE',1226),(2593,'Aberdeenshire','ABD',1226),(2594,'Angus','ANS',1226),(2595,'Co Antrim','ANT',1226),(2597,'Argyll and Bute','AGB',1226),(2598,'Co Armagh','ARM',1226),(2606,'Bedfordshire','BDF',1226),(2612,'Blaenau Gwent','BGW',1226),(2620,'Bristol, City of','BST',1226),(2622,'Buckinghamshire','BKM',1226),(2626,'Cambridgeshire','CAM',1226),(2634,'Cheshire','CHS',1226),(2635,'Clackmannanshire','CLK',1226),(2639,'Cornwall','CON',1226),(2643,'Cumbria','CMA',1226),(2647,'Derbyshire','DBY',1226),(2648,'Co Londonderry','DRY',1226),(2649,'Devon','DEV',1226),(2651,'Dorset','DOR',1226),(2652,'Co Down','DOW',1226),(2654,'Dumfries and Galloway','DGY',1226),(2655,'Dundee City','DND',1226),(2657,'County Durham','DUR',1226),(2659,'East Ayrshire','EAY',1226),(2660,'East Dunbartonshire','EDU',1226),(2661,'East Lothian','ELN',1226),(2662,'East Renfrewshire','ERW',1226),(2663,'East Riding of Yorkshire','ERY',1226),(2664,'East Sussex','ESX',1226),(2665,'Edinburgh, City of','EDH',1226),(2666,'Na h-Eileanan Siar','ELS',1226),(2668,'Essex','ESS',1226),(2669,'Falkirk','FAL',1226),(2670,'Co Fermanagh','FER',1226),(2671,'Fife','FIF',1226),(2674,'Glasgow City','GLG',1226),(2675,'Gloucestershire','GLS',1226),(2678,'Gwynedd','GWN',1226),(2682,'Hampshire','HAM',1226),(2687,'Herefordshire','HEF',1226),(2688,'Hertfordshire','HRT',1226),(2689,'Highland','HED',1226),(2692,'Inverclyde','IVC',1226),(2694,'Isle of Wight','IOW',1226),(2699,'Kent','KEN',1226),(2705,'Lancashire','LAN',1226),(2709,'Leicestershire','LEC',1226),(2712,'Lincolnshire','LIN',1226),(2723,'Midlothian','MLN',1226),(2726,'Moray','MRY',1226),(2734,'Norfolk','NFK',1226),(2735,'North Ayrshire','NAY',1226),(2738,'North Lanarkshire','NLK',1226),(2742,'North Yorkshire','NYK',1226),(2743,'Northamptonshire','NTH',1226),(2744,'Northumberland','NBL',1226),(2746,'Nottinghamshire','NTT',1226),(2747,'Oldham','OLD',1226),(2748,'Omagh','OMH',1226),(2749,'Orkney Islands','ORR',1226),(2750,'Oxfordshire','OXF',1226),(2752,'Perth and Kinross','PKN',1226),(2757,'Powys','POW',1226),(2761,'Renfrewshire','RFW',1226),(2766,'Rutland','RUT',1226),(2770,'Scottish Borders','SCB',1226),(2773,'Shetland Islands','ZET',1226),(2774,'Shropshire','SHR',1226),(2777,'Somerset','SOM',1226),(2778,'South Ayrshire','SAY',1226),(2779,'South Gloucestershire','SGC',1226),(2780,'South Lanarkshire','SLK',1226),(2785,'Staffordshire','STS',1226),(2786,'Stirling','STG',1226),(2791,'Suffolk','SFK',1226),(2793,'Surrey','SRY',1226),(2804,'Vale of Glamorgan, The','VGL',1226),(2811,'Warwickshire','WAR',1226),(2813,'West Dunbartonshire','WDU',1226),(2814,'West Lothian','WLN',1226),(2815,'West Sussex','WSX',1226),(2818,'Wiltshire','WIL',1226),(2823,'Worcestershire','WOR',1226),(2826,'Ashanti','AH',1083),(2827,'Brong-Ahafo','BA',1083),(2828,'Greater Accra','AA',1083),(2829,'Upper East','UE',1083),(2830,'Upper West','UW',1083),(2831,'Volta','TV',1083),(2832,'Banjul','B',1213),(2833,'Lower River','L',1213),(2834,'MacCarthy Island','M',1213),(2835,'North Bank','N',1213),(2836,'Upper River','U',1213),(2837,'Beyla','BE',1091),(2838,'Boffa','BF',1091),(2839,'Boke','BK',1091),(2840,'Coyah','CO',1091),(2841,'Dabola','DB',1091),(2842,'Dalaba','DL',1091),(2843,'Dinguiraye','DI',1091),(2844,'Dubreka','DU',1091),(2845,'Faranah','FA',1091),(2846,'Forecariah','FO',1091),(2847,'Fria','FR',1091),(2848,'Gaoual','GA',1091),(2849,'Guekedou','GU',1091),(2850,'Kankan','KA',1091),(2851,'Kerouane','KE',1091),(2852,'Kindia','KD',1091),(2853,'Kissidougou','KS',1091),(2854,'Koubia','KB',1091),(2855,'Koundara','KN',1091),(2856,'Kouroussa','KO',1091),(2857,'Labe','LA',1091),(2858,'Lelouma','LE',1091),(2859,'Lola','LO',1091),(2860,'Macenta','MC',1091),(2861,'Mali','ML',1091),(2862,'Mamou','MM',1091),(2863,'Mandiana','MD',1091),(2864,'Nzerekore','NZ',1091),(2865,'Pita','PI',1091),(2866,'Siguiri','SI',1091),(2867,'Telimele','TE',1091),(2868,'Tougue','TO',1091),(2869,'Yomou','YO',1091),(2870,'Region Continental','C',1067),(2871,'Region Insular','I',1067),(2872,'Annobon','AN',1067),(2873,'Bioko Norte','BN',1067),(2874,'Bioko Sur','BS',1067),(2875,'Centro Sur','CS',1067),(2876,'Kie-Ntem','KN',1067),(2877,'Litoral','LI',1067),(2878,'Wele-Nzas','WN',1067),(2879,'Achaïa','13',1085),(2880,'Aitolia-Akarnania','01',1085),(2881,'Argolis','11',1085),(2882,'Arkadia','12',1085),(2883,'Arta','31',1085),(2884,'Attiki','A1',1085),(2885,'Chalkidiki','64',1085),(2886,'Chania','94',1085),(2887,'Chios','85',1085),(2888,'Dodekanisos','81',1085),(2889,'Drama','52',1085),(2890,'Evros','71',1085),(2891,'Evrytania','05',1085),(2892,'Evvoia','04',1085),(2893,'Florina','63',1085),(2894,'Fokis','07',1085),(2895,'Fthiotis','06',1085),(2896,'Grevena','51',1085),(2897,'Ileia','14',1085),(2898,'Imathia','53',1085),(2899,'Ioannina','33',1085),(2900,'Irakleion','91',1085),(2901,'Karditsa','41',1085),(2902,'Kastoria','56',1085),(2903,'Kavalla','55',1085),(2904,'Kefallinia','23',1085),(2905,'Kerkyra','22',1085),(2906,'Kilkis','57',1085),(2907,'Korinthia','15',1085),(2908,'Kozani','58',1085),(2909,'Kyklades','82',1085),(2910,'Lakonia','16',1085),(2911,'Larisa','42',1085),(2912,'Lasithion','92',1085),(2913,'Lefkas','24',1085),(2914,'Lesvos','83',1085),(2915,'Magnisia','43',1085),(2916,'Messinia','17',1085),(2917,'Pella','59',1085),(2918,'Preveza','34',1085),(2919,'Rethymnon','93',1085),(2920,'Rodopi','73',1085),(2921,'Samos','84',1085),(2922,'Serrai','62',1085),(2923,'Thesprotia','32',1085),(2924,'Thessaloniki','54',1085),(2925,'Trikala','44',1085),(2926,'Voiotia','03',1085),(2927,'Xanthi','72',1085),(2928,'Zakynthos','21',1085),(2929,'Agio Oros','69',1085),(2930,'Alta Verapaz','AV',1090),(2931,'Baja Verapaz','BV',1090),(2932,'Chimaltenango','CM',1090),(2933,'Chiquimula','CQ',1090),(2934,'El Progreso','PR',1090),(2935,'Escuintla','ES',1090),(2936,'Guatemala','GU',1090),(2937,'Huehuetenango','HU',1090),(2938,'Izabal','IZ',1090),(2939,'Jalapa','JA',1090),(2940,'Jutiapa','JU',1090),(2941,'Peten','PE',1090),(2942,'Quetzaltenango','QZ',1090),(2943,'Quiche','QC',1090),(2944,'Retalhuleu','RE',1090),(2945,'Sacatepequez','SA',1090),(2946,'San Marcos','SM',1090),(2947,'Santa Rosa','SR',1090),(2948,'Sololá','SO',1090),(2949,'Suchitepequez','SU',1090),(2950,'Totonicapan','TO',1090),(2951,'Zacapa','ZA',1090),(2952,'Bissau','BS',1092),(2953,'Bafata','BA',1092),(2954,'Biombo','BM',1092),(2955,'Bolama','BL',1092),(2956,'Cacheu','CA',1092),(2957,'Gabu','GA',1092),(2958,'Oio','OI',1092),(2959,'Quloara','QU',1092),(2960,'Tombali S','TO',1092),(2961,'Barima-Waini','BA',1093),(2962,'Cuyuni-Mazaruni','CU',1093),(2963,'Demerara-Mahaica','DE',1093),(2964,'East Berbice-Corentyne','EB',1093),(2965,'Essequibo Islands-West Demerara','ES',1093),(2966,'Mahaica-Berbice','MA',1093),(2967,'Pomeroon-Supenaam','PM',1093),(2968,'Potaro-Siparuni','PT',1093),(2969,'Upper Demerara-Berbice','UD',1093),(2970,'Upper Takutu-Upper Essequibo','UT',1093),(2971,'Atlantida','AT',1097),(2972,'Colon','CL',1097),(2973,'Comayagua','CM',1097),(2974,'Copan','CP',1097),(2975,'Cortes','CR',1097),(2976,'Choluteca','CH',1097),(2977,'El Paraiso','EP',1097),(2978,'Francisco Morazan','FM',1097),(2979,'Gracias a Dios','GD',1097),(2980,'Intibuca','IN',1097),(2981,'Islas de la Bahia','IB',1097),(2982,'Lempira','LE',1097),(2983,'Ocotepeque','OC',1097),(2984,'Olancho','OL',1097),(2985,'Santa Barbara','SB',1097),(2986,'Valle','VA',1097),(2987,'Yoro','YO',1097),(2988,'Bjelovarsko-bilogorska zupanija','07',1055),(2989,'Brodsko-posavska zupanija','12',1055),(2990,'Dubrovacko-neretvanska zupanija','19',1055),(2991,'Istarska zupanija','18',1055),(2992,'Karlovacka zupanija','04',1055),(2993,'Koprivnickco-krizevacka zupanija','06',1055),(2994,'Krapinako-zagorska zupanija','02',1055),(2995,'Licko-senjska zupanija','09',1055),(2996,'Medimurska zupanija','20',1055),(2997,'Osjecko-baranjska zupanija','14',1055),(2998,'Pozesko-slavonska zupanija','11',1055),(2999,'Primorsko-goranska zupanija','08',1055),(3000,'Sisacko-moelavacka Iupanija','03',1055),(3001,'Splitako-dalmatinska zupanija','17',1055),(3002,'Sibenako-kninska zupanija','15',1055),(3003,'Varaidinska zupanija','05',1055),(3004,'VirovitiEko-podravska zupanija','10',1055),(3005,'VuRovarako-srijemska zupanija','16',1055),(3006,'Zadaraka','13',1055),(3007,'Zagrebacka zupanija','01',1055),(3008,'Grande-Anse','GA',1094),(3009,'Nord-Est','NE',1094),(3010,'Nord-Ouest','NO',1094),(3011,'Ouest','OU',1094),(3012,'Sud','SD',1094),(3013,'Sud-Est','SE',1094),(3014,'Budapest','BU',1099),(3015,'Bács-Kiskun','BK',1099),(3016,'Baranya','BA',1099),(3017,'Békés','BE',1099),(3018,'Borsod-Abaúj-Zemplén','BZ',1099),(3019,'Csongrád','CS',1099),(3020,'Fejér','FE',1099),(3021,'Győr-Moson-Sopron','GS',1099),(3022,'Hajdu-Bihar','HB',1099),(3023,'Heves','HE',1099),(3024,'Jász-Nagykun-Szolnok','JN',1099),(3025,'Komárom-Esztergom','KE',1099),(3026,'Nográd','NO',1099),(3027,'Pest','PE',1099),(3028,'Somogy','SO',1099),(3029,'Szabolcs-Szatmár-Bereg','SZ',1099),(3030,'Tolna','TO',1099),(3031,'Vas','VA',1099),(3032,'Veszprém','VE',1099),(3033,'Zala','ZA',1099),(3034,'Békéscsaba','BC',1099),(3035,'Debrecen','DE',1099),(3036,'Dunaújváros','DU',1099),(3037,'Eger','EG',1099),(3038,'Győr','GY',1099),(3039,'Hódmezővásárhely','HV',1099),(3040,'Kaposvár','KV',1099),(3041,'Kecskemét','KM',1099),(3042,'Miskolc','MI',1099),(3043,'Nagykanizsa','NK',1099),(3044,'Nyiregyháza','NY',1099),(3045,'Pécs','PS',1099),(3046,'Salgótarján','ST',1099),(3047,'Sopron','SN',1099),(3048,'Szeged','SD',1099),(3049,'Székesfehérvár','SF',1099),(3050,'Szekszárd','SS',1099),(3051,'Szolnok','SK',1099),(3052,'Szombathely','SH',1099),(3053,'Tatabánya','TB',1099),(3054,'Zalaegerszeg','ZE',1099),(3055,'Bali','BA',1102),(3056,'Kepulauan Bangka Belitung','BB',1102),(3057,'Banten','BT',1102),(3058,'Bengkulu','BE',1102),(3059,'Gorontalo','GO',1102),(3060,'Papua Barat','PB',1102),(3061,'Jambi','JA',1102),(3062,'Jawa Barat','JB',1102),(3063,'Jawa Tengah','JT',1102),(3064,'Jawa Timur','JI',1102),(3065,'Kalimantan Barat','KB',1102),(3066,'Kalimantan Timur','KI',1102),(3067,'Kalimantan Selatan','KS',1102),(3068,'Kepulauan Riau','KR',1102),(3069,'Lampung','LA',1102),(3070,'Maluku','MA',1102),(3071,'Maluku Utara','MU',1102),(3072,'Nusa Tenggara Barat','NB',1102),(3073,'Nusa Tenggara Timur','NT',1102),(3074,'Papua','PA',1102),(3075,'Riau','RI',1102),(3076,'Sulawesi Selatan','SN',1102),(3077,'Sulawesi Tengah','ST',1102),(3078,'Sulawesi Tenggara','SG',1102),(3079,'Sulawesi Utara','SA',1102),(3080,'Sumatra Barat','SB',1102),(3081,'Sumatra Selatan','SS',1102),(3082,'Sumatera Utara','SU',1102),(3083,'DKI Jakarta','JK',1102),(3084,'Aceh','AC',1102),(3085,'DI Yogyakarta','YO',1102),(3086,'Cork','C',1105),(3087,'Clare','CE',1105),(3088,'Cavan','CN',1105),(3089,'Carlow','CW',1105),(3090,'Dublin','D',1105),(3091,'Donegal','DL',1105),(3092,'Galway','G',1105),(3093,'Kildare','KE',1105),(3094,'Kilkenny','KK',1105),(3095,'Kerry','KY',1105),(3096,'Longford','LD',1105),(3097,'Louth','LH',1105),(3098,'Limerick','LK',1105),(3099,'Leitrim','LM',1105),(3100,'Laois','LS',1105),(3101,'Meath','MH',1105),(3102,'Monaghan','MN',1105),(3103,'Mayo','MO',1105),(3104,'Offaly','OY',1105),(3105,'Roscommon','RN',1105),(3106,'Sligo','SO',1105),(3107,'Tipperary','TA',1105),(3108,'Waterford','WD',1105),(3109,'Westmeath','WH',1105),(3110,'Wicklow','WW',1105),(3111,'Wexford','WX',1105),(3112,'HaDarom','D',1106),(3113,'HaMerkaz','M',1106),(3114,'HaZafon','Z',1106),(3115,'Haifa','HA',1106),(3116,'Tel-Aviv','TA',1106),(3117,'Jerusalem','JM',1106),(3118,'Al Anbar','AN',1104),(3119,'Al Ba,rah','BA',1104),(3120,'Al Muthanna','MU',1104),(3121,'Al Qadisiyah','QA',1104),(3122,'An Najef','NA',1104),(3123,'Arbil','AR',1104),(3124,'As Sulaymaniyah','SW',1104),(3125,'At Ta\'mim','TS',1104),(3126,'Babil','BB',1104),(3127,'Baghdad','BG',1104),(3128,'Dahuk','DA',1104),(3129,'Dhi Qar','DQ',1104),(3130,'Diyala','DI',1104),(3131,'Karbala\'','KA',1104),(3132,'Maysan','MA',1104),(3133,'Ninawa','NI',1104),(3134,'Salah ad Din','SD',1104),(3135,'Wasit','WA',1104),(3136,'Ardabil','03',1103),(3137,'Azarbayjan-e Gharbi','02',1103),(3138,'Azarbayjan-e Sharqi','01',1103),(3139,'Bushehr','06',1103),(3140,'Chahar Mahall va Bakhtiari','08',1103),(3141,'Esfahan','04',1103),(3142,'Fars','14',1103),(3143,'Gilan','19',1103),(3144,'Golestan','27',1103),(3145,'Hamadan','24',1103),(3146,'Hormozgan','23',1103),(3147,'Iiam','05',1103),(3148,'Kerman','15',1103),(3149,'Kermanshah','17',1103),(3150,'Khorasan','09',1103),(3151,'Khuzestan','10',1103),(3152,'Kohjiluyeh va Buyer Ahmad','18',1103),(3153,'Kordestan','16',1103),(3154,'Lorestan','20',1103),(3155,'Markazi','22',1103),(3156,'Mazandaran','21',1103),(3157,'Qazvin','28',1103),(3158,'Qom','26',1103),(3159,'Semnan','12',1103),(3160,'Sistan va Baluchestan','13',1103),(3161,'Tehran','07',1103),(3162,'Yazd','25',1103),(3163,'Zanjan','11',1103),(3164,'Austurland','7',1100),(3165,'Hofuoborgarsvaeoi utan Reykjavikur','1',1100),(3166,'Norourland eystra','6',1100),(3167,'Norourland vestra','5',1100),(3168,'Reykjavik','0',1100),(3169,'Suourland','8',1100),(3170,'Suournes','2',1100),(3171,'Vestfirolr','4',1100),(3172,'Vesturland','3',1100),(3173,'Agrigento','AG',1107),(3174,'Alessandria','AL',1107),(3175,'Ancona','AN',1107),(3176,'Aosta','AO',1107),(3177,'Arezzo','AR',1107),(3178,'Ascoli Piceno','AP',1107),(3179,'Asti','AT',1107),(3180,'Avellino','AV',1107),(3181,'Bari','BA',1107),(3182,'Belluno','BL',1107),(3183,'Benevento','BN',1107),(3184,'Bergamo','BG',1107),(3185,'Biella','BI',1107),(3186,'Bologna','BO',1107),(3187,'Bolzano','BZ',1107),(3188,'Brescia','BS',1107),(3189,'Brindisi','BR',1107),(3190,'Cagliari','CA',1107),(3191,'Caltanissetta','CL',1107),(3192,'Campobasso','CB',1107),(3193,'Caserta','CE',1107),(3194,'Catania','CT',1107),(3195,'Catanzaro','CZ',1107),(3196,'Chieti','CH',1107),(3197,'Como','CO',1107),(3198,'Cosenza','CS',1107),(3199,'Cremona','CR',1107),(3200,'Crotone','KR',1107),(3201,'Cuneo','CN',1107),(3202,'Enna','EN',1107),(3203,'Ferrara','FE',1107),(3204,'Firenze','FI',1107),(3205,'Foggia','FG',1107),(3206,'Forlì-Cesena','FC',1107),(3207,'Frosinone','FR',1107),(3208,'Genova','GE',1107),(3209,'Gorizia','GO',1107),(3210,'Grosseto','GR',1107),(3211,'Imperia','IM',1107),(3212,'Isernia','IS',1107),(3213,'L\'Aquila','AQ',1107),(3214,'La Spezia','SP',1107),(3215,'Latina','LT',1107),(3216,'Lecce','LE',1107),(3217,'Lecco','LC',1107),(3218,'Livorno','LI',1107),(3219,'Lodi','LO',1107),(3220,'Lucca','LU',1107),(3221,'Macerata','MC',1107),(3222,'Mantova','MN',1107),(3223,'Massa-Carrara','MS',1107),(3224,'Matera','MT',1107),(3225,'Messina','ME',1107),(3226,'Milano','MI',1107),(3227,'Modena','MO',1107),(3228,'Napoli','NA',1107),(3229,'Novara','NO',1107),(3230,'Nuoro','NU',1107),(3231,'Oristano','OR',1107),(3232,'Padova','PD',1107),(3233,'Palermo','PA',1107),(3234,'Parma','PR',1107),(3235,'Pavia','PV',1107),(3236,'Perugia','PG',1107),(3237,'Pesaro e Urbino','PU',1107),(3238,'Pescara','PE',1107),(3239,'Piacenza','PC',1107),(3240,'Pisa','PI',1107),(3241,'Pistoia','PT',1107),(3242,'Pordenone','PN',1107),(3243,'Potenza','PZ',1107),(3244,'Prato','PO',1107),(3245,'Ragusa','RG',1107),(3246,'Ravenna','RA',1107),(3247,'Reggio Calabria','RC',1107),(3248,'Reggio Emilia','RE',1107),(3249,'Rieti','RI',1107),(3250,'Rimini','RN',1107),(3251,'Roma','RM',1107),(3252,'Rovigo','RO',1107),(3253,'Salerno','SA',1107),(3254,'Sassari','SS',1107),(3255,'Savona','SV',1107),(3256,'Siena','SI',1107),(3257,'Siracusa','SR',1107),(3258,'Sondrio','SO',1107),(3259,'Taranto','TA',1107),(3260,'Teramo','TE',1107),(3261,'Terni','TR',1107),(3262,'Torino','TO',1107),(3263,'Trapani','TP',1107),(3264,'Trento','TN',1107),(3265,'Treviso','TV',1107),(3266,'Trieste','TS',1107),(3267,'Udine','UD',1107),(3268,'Varese','VA',1107),(3269,'Venezia','VE',1107),(3270,'Verbano-Cusio-Ossola','VB',1107),(3271,'Vercelli','VC',1107),(3272,'Verona','VR',1107),(3273,'Vibo Valentia','VV',1107),(3274,'Vicenza','VI',1107),(3275,'Viterbo','VT',1107),(3276,'Aichi','23',1109),(3277,'Akita','05',1109),(3278,'Aomori','02',1109),(3279,'Chiba','12',1109),(3280,'Ehime','38',1109),(3281,'Fukui','18',1109),(3282,'Fukuoka','40',1109),(3283,'Fukusima','07',1109),(3284,'Gifu','21',1109),(3285,'Gunma','10',1109),(3286,'Hiroshima','34',1109),(3287,'Hokkaido','01',1109),(3288,'Hyogo','28',1109),(3289,'Ibaraki','08',1109),(3290,'Ishikawa','17',1109),(3291,'Iwate','03',1109),(3292,'Kagawa','37',1109),(3293,'Kagoshima','46',1109),(3294,'Kanagawa','14',1109),(3295,'Kochi','39',1109),(3296,'Kumamoto','43',1109),(3297,'Kyoto','26',1109),(3298,'Mie','24',1109),(3299,'Miyagi','04',1109),(3300,'Miyazaki','45',1109),(3301,'Nagano','20',1109),(3302,'Nagasaki','42',1109),(3303,'Nara','29',1109),(3304,'Niigata','15',1109),(3305,'Oita','44',1109),(3306,'Okayama','33',1109),(3307,'Okinawa','47',1109),(3308,'Osaka','27',1109),(3309,'Saga','41',1109),(3310,'Saitama','11',1109),(3311,'Shiga','25',1109),(3312,'Shimane','32',1109),(3313,'Shizuoka','22',1109),(3314,'Tochigi','09',1109),(3315,'Tokushima','36',1109),(3316,'Tokyo','13',1109),(3317,'Tottori','31',1109),(3318,'Toyama','16',1109),(3319,'Wakayama','30',1109),(3320,'Yamagata','06',1109),(3321,'Yamaguchi','35',1109),(3322,'Yamanashi','19',1109),(3323,'Clarendon','CN',1108),(3324,'Hanover','HR',1108),(3325,'Kingston','KN',1108),(3326,'Portland','PD',1108),(3327,'Saint Andrew','AW',1108),(3328,'Saint Ann','AN',1108),(3329,'Saint Catherine','CE',1108),(3330,'Saint Elizabeth','EH',1108),(3331,'Saint James','JS',1108),(3332,'Saint Mary','MY',1108),(3333,'Saint Thomas','TS',1108),(3334,'Trelawny','TY',1108),(3335,'Westmoreland','WD',1108),(3336,'Ajln','AJ',1110),(3337,'Al \'Aqaba','AQ',1110),(3338,'Al Balqa\'','BA',1110),(3339,'Al Karak','KA',1110),(3340,'Al Mafraq','MA',1110),(3341,'Amman','AM',1110),(3342,'At Tafilah','AT',1110),(3343,'Az Zarga','AZ',1110),(3344,'Irbid','JR',1110),(3345,'Jarash','JA',1110),(3346,'Ma\'an','MN',1110),(3347,'Madaba','MD',1110),(3353,'Bishkek','GB',1117),(3354,'Batken','B',1117),(3355,'Chu','C',1117),(3356,'Jalal-Abad','J',1117),(3357,'Naryn','N',1117),(3358,'Osh','O',1117),(3359,'Talas','T',1117),(3360,'Ysyk-Kol','Y',1117),(3361,'Krong Kaeb','23',1037),(3362,'Krong Pailin','24',1037),(3363,'Xrong Preah Sihanouk','18',1037),(3364,'Phnom Penh','12',1037),(3365,'Baat Dambang','2',1037),(3366,'Banteay Mean Chey','1',1037),(3367,'Rampong Chaam','3',1037),(3368,'Kampong Chhnang','4',1037),(3369,'Kampong Spueu','5',1037),(3370,'Kampong Thum','6',1037),(3371,'Kampot','7',1037),(3372,'Kandaal','8',1037),(3373,'Kach Kong','9',1037),(3374,'Krachoh','10',1037),(3375,'Mondol Kiri','11',1037),(3376,'Otdar Mean Chey','22',1037),(3377,'Pousaat','15',1037),(3378,'Preah Vihear','13',1037),(3379,'Prey Veaeng','14',1037),(3380,'Rotanak Kiri','16',1037),(3381,'Siem Reab','17',1037),(3382,'Stueng Traeng','19',1037),(3383,'Svaay Rieng','20',1037),(3384,'Taakaev','21',1037),(3385,'Gilbert Islands','G',1113),(3386,'Line Islands','L',1113),(3387,'Phoenix Islands','P',1113),(3388,'Anjouan Ndzouani','A',1049),(3389,'Grande Comore Ngazidja','G',1049),(3390,'Moheli Moili','M',1049),(3391,'Kaesong-si','KAE',1114),(3392,'Nampo-si','NAM',1114),(3393,'Pyongyang-ai','PYO',1114),(3394,'Chagang-do','CHA',1114),(3395,'Hamgyongbuk-do','HAB',1114),(3396,'Hamgyongnam-do','HAN',1114),(3397,'Hwanghaebuk-do','HWB',1114),(3398,'Hwanghaenam-do','HWN',1114),(3399,'Kangwon-do','KAN',1114),(3400,'Pyonganbuk-do','PYB',1114),(3401,'Pyongannam-do','PYN',1114),(3402,'Yanggang-do','YAN',1114),(3403,'Najin Sonbong-si','NAJ',1114),(3404,'Seoul Teugbyeolsi','11',1115),(3405,'Busan Gwang\'yeogsi','26',1115),(3406,'Daegu Gwang\'yeogsi','27',1115),(3407,'Daejeon Gwang\'yeogsi','30',1115),(3408,'Gwangju Gwang\'yeogsi','29',1115),(3409,'Incheon Gwang\'yeogsi','28',1115),(3410,'Ulsan Gwang\'yeogsi','31',1115),(3411,'Chungcheongbugdo','43',1115),(3412,'Chungcheongnamdo','44',1115),(3413,'Gang\'weondo','42',1115),(3414,'Gyeonggido','41',1115),(3415,'Gyeongsangbugdo','47',1115),(3416,'Gyeongsangnamdo','48',1115),(3417,'Jejudo','49',1115),(3418,'Jeonrabugdo','45',1115),(3419,'Jeonranamdo','46',1115),(3420,'Al Ahmadi','AH',1116),(3421,'Al Farwanlyah','FA',1116),(3422,'Al Jahrah','JA',1116),(3423,'Al Kuwayt','KU',1116),(3424,'Hawalli','HA',1116),(3425,'Almaty','ALA',1111),(3426,'Astana','AST',1111),(3427,'Almaty oblysy','ALM',1111),(3428,'Aqmola oblysy','AKM',1111),(3429,'Aqtobe oblysy','AKT',1111),(3430,'Atyrau oblyfiy','ATY',1111),(3431,'Batys Quzaqstan oblysy','ZAP',1111),(3432,'Mangghystau oblysy','MAN',1111),(3433,'Ongtustik Quzaqstan oblysy','YUZ',1111),(3434,'Pavlodar oblysy','PAV',1111),(3435,'Qaraghandy oblysy','KAR',1111),(3436,'Qostanay oblysy','KUS',1111),(3437,'Qyzylorda oblysy','KZY',1111),(3438,'Shyghys Quzaqstan oblysy','VOS',1111),(3439,'Soltustik Quzaqstan oblysy','SEV',1111),(3440,'Zhambyl oblysy Zhambylskaya oblast\'','ZHA',1111),(3441,'Vientiane','VT',1118),(3442,'Attapu','AT',1118),(3443,'Bokeo','BK',1118),(3444,'Bolikhamxai','BL',1118),(3445,'Champasak','CH',1118),(3446,'Houaphan','HO',1118),(3447,'Khammouan','KH',1118),(3448,'Louang Namtha','LM',1118),(3449,'Louangphabang','LP',1118),(3450,'Oudomxai','OU',1118),(3451,'Phongsali','PH',1118),(3452,'Salavan','SL',1118),(3453,'Savannakhet','SV',1118),(3454,'Xaignabouli','XA',1118),(3455,'Xiasomboun','XN',1118),(3456,'Xekong','XE',1118),(3457,'Xiangkhoang','XI',1118),(3458,'Beirut','BA',1120),(3459,'Beqaa','BI',1120),(3460,'Mount Lebanon','JL',1120),(3461,'North Lebanon','AS',1120),(3462,'South Lebanon','JA',1120),(3463,'Nabatieh','NA',1120),(3464,'Ampara','52',1199),(3465,'Anuradhapura','71',1199),(3466,'Badulla','81',1199),(3467,'Batticaloa','51',1199),(3468,'Colombo','11',1199),(3469,'Galle','31',1199),(3470,'Gampaha','12',1199),(3471,'Hambantota','33',1199),(3472,'Jaffna','41',1199),(3473,'Kalutara','13',1199),(3474,'Kandy','21',1199),(3475,'Kegalla','92',1199),(3476,'Kilinochchi','42',1199),(3477,'Kurunegala','61',1199),(3478,'Mannar','43',1199),(3479,'Matale','22',1199),(3480,'Matara','32',1199),(3481,'Monaragala','82',1199),(3482,'Mullaittivu','45',1199),(3483,'Nuwara Eliya','23',1199),(3484,'Polonnaruwa','72',1199),(3485,'Puttalum','62',1199),(3486,'Ratnapura','91',1199),(3487,'Trincomalee','53',1199),(3488,'VavunLya','44',1199),(3489,'Bomi','BM',1122),(3490,'Bong','BG',1122),(3491,'Grand Basaa','GB',1122),(3492,'Grand Cape Mount','CM',1122),(3493,'Grand Gedeh','GG',1122),(3494,'Grand Kru','GK',1122),(3495,'Lofa','LO',1122),(3496,'Margibi','MG',1122),(3497,'Maryland','MY',1122),(3498,'Montserrado','MO',1122),(3499,'Nimba','NI',1122),(3500,'Rivercess','RI',1122),(3501,'Sinoe','SI',1122),(3502,'Berea','D',1121),(3503,'Butha-Buthe','B',1121),(3504,'Leribe','C',1121),(3505,'Mafeteng','E',1121),(3506,'Maseru','A',1121),(3507,'Mohale\'s Hoek','F',1121),(3508,'Mokhotlong','J',1121),(3509,'Qacha\'s Nek','H',1121),(3510,'Quthing','G',1121),(3511,'Thaba-Tseka','K',1121),(3512,'Alytaus Apskritis','AL',1125),(3513,'Kauno Apskritis','KU',1125),(3514,'Klaipėdos Apskritis','KL',1125),(3515,'Marijampolės Apskritis','MR',1125),(3516,'Panevėžio Apskritis','PN',1125),(3517,'Šiaulių Apskritis','SA',1125),(3518,'Tauragės Apskritis','TA',1125),(3519,'Telšių Apskritis','TE',1125),(3520,'Utenos Apskritis','UT',1125),(3521,'Vilniaus Apskritis','VL',1125),(3522,'Diekirch','D',1126),(3523,'GreveNmacher','G',1126),(3550,'Daugavpils','DGV',1119),(3551,'Jelgava','JEL',1119),(3552,'Jūrmala','JUR',1119),(3553,'Liepāja','LPX',1119),(3554,'Rēzekne','REZ',1119),(3555,'Rīga','RIX',1119),(3556,'Ventspils','VEN',1119),(3557,'Ajdābiyā','AJ',1123),(3558,'Al Buţnān','BU',1123),(3559,'Al Hizām al Akhdar','HZ',1123),(3560,'Al Jabal al Akhdar','JA',1123),(3561,'Al Jifārah','JI',1123),(3562,'Al Jufrah','JU',1123),(3563,'Al Kufrah','KF',1123),(3564,'Al Marj','MJ',1123),(3565,'Al Marqab','MB',1123),(3566,'Al Qaţrūn','QT',1123),(3567,'Al Qubbah','QB',1123),(3568,'Al Wāhah','WA',1123),(3569,'An Nuqaţ al Khams','NQ',1123),(3570,'Ash Shāţi\'','SH',1123),(3571,'Az Zāwiyah','ZA',1123),(3572,'Banghāzī','BA',1123),(3573,'Banī Walīd','BW',1123),(3574,'Darnah','DR',1123),(3575,'Ghadāmis','GD',1123),(3576,'Gharyān','GR',1123),(3577,'Ghāt','GT',1123),(3578,'Jaghbūb','JB',1123),(3579,'Mişrātah','MI',1123),(3580,'Mizdah','MZ',1123),(3581,'Murzuq','MQ',1123),(3582,'Nālūt','NL',1123),(3583,'Sabhā','SB',1123),(3584,'Şabrātah Şurmān','SS',1123),(3585,'Surt','SR',1123),(3586,'Tājūrā\' wa an Nawāhī al Arbāh','TN',1123),(3587,'Ţarābulus','TB',1123),(3588,'Tarhūnah-Masallātah','TM',1123),(3589,'Wādī al hayāt','WD',1123),(3590,'Yafran-Jādū','YJ',1123),(3591,'Agadir','AGD',1146),(3592,'Aït Baha','BAH',1146),(3593,'Aït Melloul','MEL',1146),(3594,'Al Haouz','HAO',1146),(3595,'Al Hoceïma','HOC',1146),(3596,'Assa-Zag','ASZ',1146),(3597,'Azilal','AZI',1146),(3598,'Beni Mellal','BEM',1146),(3599,'Ben Sllmane','BES',1146),(3600,'Berkane','BER',1146),(3601,'Boujdour','BOD',1146),(3602,'Boulemane','BOM',1146),(3603,'Casablanca  [Dar el Beïda]','CAS',1146),(3604,'Chefchaouene','CHE',1146),(3605,'Chichaoua','CHI',1146),(3606,'El Hajeb','HAJ',1146),(3607,'El Jadida','JDI',1146),(3608,'Errachidia','ERR',1146),(3609,'Essaouira','ESI',1146),(3610,'Es Smara','ESM',1146),(3611,'Fès','FES',1146),(3612,'Figuig','FIG',1146),(3613,'Guelmim','GUE',1146),(3614,'Ifrane','IFR',1146),(3615,'Jerada','JRA',1146),(3616,'Kelaat Sraghna','KES',1146),(3617,'Kénitra','KEN',1146),(3618,'Khemisaet','KHE',1146),(3619,'Khenifra','KHN',1146),(3620,'Khouribga','KHO',1146),(3621,'Laâyoune (EH)','LAA',1146),(3622,'Larache','LAP',1146),(3623,'Marrakech','MAR',1146),(3624,'Meknsès','MEK',1146),(3625,'Nador','NAD',1146),(3626,'Ouarzazate','OUA',1146),(3627,'Oued ed Dahab (EH)','OUD',1146),(3628,'Oujda','OUJ',1146),(3629,'Rabat-Salé','RBA',1146),(3630,'Safi','SAF',1146),(3631,'Sefrou','SEF',1146),(3632,'Settat','SET',1146),(3633,'Sidl Kacem','SIK',1146),(3634,'Tanger','TNG',1146),(3635,'Tan-Tan','TNT',1146),(3636,'Taounate','TAO',1146),(3637,'Taroudannt','TAR',1146),(3638,'Tata','TAT',1146),(3639,'Taza','TAZ',1146),(3640,'Tétouan','TET',1146),(3641,'Tiznit','TIZ',1146),(3642,'Gagauzia, Unitate Teritoriala Autonoma','GA',1142),(3643,'Chisinau','CU',1142),(3644,'Stinga Nistrului, unitatea teritoriala din','SN',1142),(3645,'Balti','BA',1142),(3646,'Cahul','CA',1142),(3647,'Edinet','ED',1142),(3648,'Lapusna','LA',1142),(3649,'Orhei','OR',1142),(3650,'Soroca','SO',1142),(3651,'Taraclia','TA',1142),(3652,'Tighina [Bender]','TI',1142),(3653,'Ungheni','UN',1142),(3654,'Antananarivo','T',1129),(3655,'Antsiranana','D',1129),(3656,'Fianarantsoa','F',1129),(3657,'Mahajanga','M',1129),(3658,'Toamasina','A',1129),(3659,'Toliara','U',1129),(3660,'Ailinglapalap','ALL',1135),(3661,'Ailuk','ALK',1135),(3662,'Arno','ARN',1135),(3663,'Aur','AUR',1135),(3664,'Ebon','EBO',1135),(3665,'Eniwetok','ENI',1135),(3666,'Jaluit','JAL',1135),(3667,'Kili','KIL',1135),(3668,'Kwajalein','KWA',1135),(3669,'Lae','LAE',1135),(3670,'Lib','LIB',1135),(3671,'Likiep','LIK',1135),(3672,'Majuro','MAJ',1135),(3673,'Maloelap','MAL',1135),(3674,'Mejit','MEJ',1135),(3675,'Mili','MIL',1135),(3676,'Namorik','NMK',1135),(3677,'Namu','NMU',1135),(3678,'Rongelap','RON',1135),(3679,'Ujae','UJA',1135),(3680,'Ujelang','UJL',1135),(3681,'Utirik','UTI',1135),(3682,'Wotho','WTN',1135),(3683,'Wotje','WTJ',1135),(3684,'Bamako','BK0',1133),(3685,'Gao','7',1133),(3686,'Kayes','1',1133),(3687,'Kidal','8',1133),(3688,'Xoulikoro','2',1133),(3689,'Mopti','5',1133),(3690,'S69ou','4',1133),(3691,'Sikasso','3',1133),(3692,'Tombouctou','6',1133),(3693,'Ayeyarwady','07',1035),(3694,'Bago','02',1035),(3695,'Magway','03',1035),(3696,'Mandalay','04',1035),(3697,'Sagaing','01',1035),(3698,'Tanintharyi','05',1035),(3699,'Yangon','06',1035),(3700,'Chin','14',1035),(3701,'Kachin','11',1035),(3702,'Kayah','12',1035),(3703,'Kayin','13',1035),(3704,'Mon','15',1035),(3705,'Rakhine','16',1035),(3706,'Shan','17',1035),(3707,'Ulaanbaatar','1',1144),(3708,'Arhangay','073',1144),(3709,'Bayanhongor','069',1144),(3710,'Bayan-Olgiy','071',1144),(3711,'Bulgan','067',1144),(3712,'Darhan uul','037',1144),(3713,'Dornod','061',1144),(3714,'Dornogov,','063',1144),(3715,'DundgovL','059',1144),(3716,'Dzavhan','057',1144),(3717,'Govi-Altay','065',1144),(3718,'Govi-Smber','064',1144),(3719,'Hentiy','039',1144),(3720,'Hovd','043',1144),(3721,'Hovsgol','041',1144),(3722,'Omnogovi','053',1144),(3723,'Orhon','035',1144),(3724,'Ovorhangay','055',1144),(3725,'Selenge','049',1144),(3726,'Shbaatar','051',1144),(3727,'Tov','047',1144),(3728,'Uvs','046',1144),(3729,'Nouakchott','NKC',1137),(3730,'Assaba','03',1137),(3731,'Brakna','05',1137),(3732,'Dakhlet Nouadhibou','08',1137),(3733,'Gorgol','04',1137),(3734,'Guidimaka','10',1137),(3735,'Hodh ech Chargui','01',1137),(3736,'Hodh el Charbi','02',1137),(3737,'Inchiri','12',1137),(3738,'Tagant','09',1137),(3739,'Tiris Zemmour','11',1137),(3740,'Trarza','06',1137),(3741,'Beau Bassin-Rose Hill','BR',1138),(3742,'Curepipe','CU',1138),(3743,'Port Louis','PU',1138),(3744,'Quatre Bornes','QB',1138),(3745,'Vacosa-Phoenix','VP',1138),(3746,'Black River','BL',1138),(3747,'Flacq','FL',1138),(3748,'Grand Port','GP',1138),(3749,'Moka','MO',1138),(3750,'Pamplemousses','PA',1138),(3751,'Plaines Wilhems','PW',1138),(3752,'Riviere du Rempart','RP',1138),(3753,'Savanne','SA',1138),(3754,'Agalega Islands','AG',1138),(3755,'Cargados Carajos Shoals','CC',1138),(3756,'Rodrigues Island','RO',1138),(3757,'Male','MLE',1132),(3758,'Alif','02',1132),(3759,'Baa','20',1132),(3760,'Dhaalu','17',1132),(3761,'Faafu','14',1132),(3762,'Gaaf Alif','27',1132),(3763,'Gaefu Dhaalu','28',1132),(3764,'Gnaviyani','29',1132),(3765,'Haa Alif','07',1132),(3766,'Haa Dhaalu','23',1132),(3767,'Kaafu','26',1132),(3768,'Laamu','05',1132),(3769,'Lhaviyani','03',1132),(3770,'Meemu','12',1132),(3771,'Noonu','25',1132),(3772,'Raa','13',1132),(3773,'Seenu','01',1132),(3774,'Shaviyani','24',1132),(3775,'Thaa','08',1132),(3776,'Vaavu','04',1132),(3777,'Balaka','BA',1130),(3778,'Blantyre','BL',1130),(3779,'Chikwawa','CK',1130),(3780,'Chiradzulu','CR',1130),(3781,'Chitipa','CT',1130),(3782,'Dedza','DE',1130),(3783,'Dowa','DO',1130),(3784,'Karonga','KR',1130),(3785,'Kasungu','KS',1130),(3786,'Likoma Island','LK',1130),(3787,'Lilongwe','LI',1130),(3788,'Machinga','MH',1130),(3789,'Mangochi','MG',1130),(3790,'Mchinji','MC',1130),(3791,'Mulanje','MU',1130),(3792,'Mwanza','MW',1130),(3793,'Mzimba','MZ',1130),(3794,'Nkhata Bay','NB',1130),(3795,'Nkhotakota','NK',1130),(3796,'Nsanje','NS',1130),(3797,'Ntcheu','NU',1130),(3798,'Ntchisi','NI',1130),(3799,'Phalomba','PH',1130),(3800,'Rumphi','RU',1130),(3801,'Salima','SA',1130),(3802,'Thyolo','TH',1130),(3803,'Zomba','ZO',1130),(3804,'Aguascalientes','AGU',1140),(3805,'Baja California','BCN',1140),(3806,'Baja California Sur','BCS',1140),(3807,'Campeche','CAM',1140),(3808,'Coahuila','COA',1140),(3809,'Colima','COL',1140),(3810,'Chiapas','CHP',1140),(3811,'Chihuahua','CHH',1140),(3812,'Durango','DUR',1140),(3813,'Guanajuato','GUA',1140),(3814,'Guerrero','GRO',1140),(3815,'Hidalgo','HID',1140),(3816,'Jalisco','JAL',1140),(3817,'Mexico','MEX',1140),(3818,'Michoacin','MIC',1140),(3819,'Morelos','MOR',1140),(3820,'Nayarit','NAY',1140),(3821,'Nuevo Leon','NLE',1140),(3822,'Oaxaca','OAX',1140),(3823,'Puebla','PUE',1140),(3824,'Queretaro','QUE',1140),(3825,'Quintana Roo','ROO',1140),(3826,'San Luis Potosi','SLP',1140),(3827,'Sinaloa','SIN',1140),(3828,'Sonora','SON',1140),(3829,'Tabasco','TAB',1140),(3830,'Tamaulipas','TAM',1140),(3831,'Tlaxcala','TLA',1140),(3832,'Veracruz','VER',1140),(3833,'Yucatan','YUC',1140),(3834,'Zacatecas','ZAC',1140),(3835,'Wilayah Persekutuan Kuala Lumpur','14',1131),(3836,'Wilayah Persekutuan Labuan','15',1131),(3837,'Wilayah Persekutuan Putrajaya','16',1131),(3838,'Johor','01',1131),(3839,'Kedah','02',1131),(3840,'Kelantan','03',1131),(3841,'Melaka','04',1131),(3842,'Negeri Sembilan','05',1131),(3843,'Pahang','06',1131),(3844,'Perak','08',1131),(3845,'Perlis','09',1131),(3846,'Pulau Pinang','07',1131),(3847,'Sabah','12',1131),(3848,'Sarawak','13',1131),(3849,'Selangor','10',1131),(3850,'Terengganu','11',1131),(3851,'Maputo','MPM',1147),(3852,'Cabo Delgado','P',1147),(3853,'Gaza','G',1147),(3854,'Inhambane','I',1147),(3855,'Manica','B',1147),(3856,'Numpula','N',1147),(3857,'Niaaea','A',1147),(3858,'Sofala','S',1147),(3859,'Tete','T',1147),(3860,'Zambezia','Q',1147),(3861,'Caprivi','CA',1148),(3862,'Erongo','ER',1148),(3863,'Hardap','HA',1148),(3864,'Karas','KA',1148),(3865,'Khomas','KH',1148),(3866,'Kunene','KU',1148),(3867,'Ohangwena','OW',1148),(3868,'Okavango','OK',1148),(3869,'Omaheke','OH',1148),(3870,'Omusati','OS',1148),(3871,'Oshana','ON',1148),(3872,'Oshikoto','OT',1148),(3873,'Otjozondjupa','OD',1148),(3874,'Niamey','8',1156),(3875,'Agadez','1',1156),(3876,'Diffa','2',1156),(3877,'Dosso','3',1156),(3878,'Maradi','4',1156),(3879,'Tahoua','S',1156),(3880,'Tillaberi','6',1156),(3881,'Zinder','7',1156),(3882,'Abuja Federal Capital Territory','FC',1157),(3883,'Abia','AB',1157),(3884,'Adamawa','AD',1157),(3885,'Akwa Ibom','AK',1157),(3886,'Anambra','AN',1157),(3887,'Bauchi','BA',1157),(3888,'Bayelsa','BY',1157),(3889,'Benue','BE',1157),(3890,'Borno','BO',1157),(3891,'Cross River','CR',1157),(3892,'Delta','DE',1157),(3893,'Ebonyi','EB',1157),(3894,'Edo','ED',1157),(3895,'Ekiti','EK',1157),(3896,'Enugu','EN',1157),(3897,'Gombe','GO',1157),(3898,'Imo','IM',1157),(3899,'Jigawa','JI',1157),(3900,'Kaduna','KD',1157),(3901,'Kano','KN',1157),(3902,'Katsina','KT',1157),(3903,'Kebbi','KE',1157),(3904,'Kogi','KO',1157),(3905,'Kwara','KW',1157),(3906,'Lagos','LA',1157),(3907,'Nassarawa','NA',1157),(3908,'Niger','NI',1157),(3909,'Ogun','OG',1157),(3910,'Ondo','ON',1157),(3911,'Osun','OS',1157),(3912,'Oyo','OY',1157),(3913,'Rivers','RI',1157),(3914,'Sokoto','SO',1157),(3915,'Taraba','TA',1157),(3916,'Yobe','YO',1157),(3917,'Zamfara','ZA',1157),(3918,'Boaco','BO',1155),(3919,'Carazo','CA',1155),(3920,'Chinandega','CI',1155),(3921,'Chontales','CO',1155),(3922,'Esteli','ES',1155),(3923,'Jinotega','JI',1155),(3924,'Leon','LE',1155),(3925,'Madriz','MD',1155),(3926,'Managua','MN',1155),(3927,'Masaya','MS',1155),(3928,'Matagalpa','MT',1155),(3929,'Nueva Segovia','NS',1155),(3930,'Rio San Juan','SJ',1155),(3931,'Rivas','RI',1155),(3932,'Atlantico Norte','AN',1155),(3933,'Atlantico Sur','AS',1155),(3934,'Drente','DR',1152),(3935,'Flevoland','FL',1152),(3936,'Friesland','FR',1152),(3937,'Gelderland','GL',1152),(3938,'Groningen','GR',1152),(3939,'Noord-Brabant','NB',1152),(3940,'Noord-Holland','NH',1152),(3941,'Overijssel','OV',1152),(3942,'Utrecht','UT',1152),(3943,'Zuid-Holland','ZH',1152),(3944,'Zeeland','ZL',1152),(3945,'Akershus','02',1161),(3946,'Aust-Agder','09',1161),(3947,'Buskerud','06',1161),(3948,'Finnmark','20',1161),(3949,'Hedmark','04',1161),(3950,'Hordaland','12',1161),(3951,'Møre og Romsdal','15',1161),(3952,'Nordland','18',1161),(3953,'Nord-Trøndelag','17',1161),(3954,'Oppland','05',1161),(3955,'Oslo','03',1161),(3956,'Rogaland','11',1161),(3957,'Sogn og Fjordane','14',1161),(3958,'Sør-Trøndelag','16',1161),(3959,'Telemark','06',1161),(3960,'Troms','19',1161),(3961,'Vest-Agder','10',1161),(3962,'Vestfold','07',1161),(3963,'Østfold','01',1161),(3964,'Jan Mayen','22',1161),(3965,'Svalbard','21',1161),(3966,'Auckland','AUK',1154),(3967,'Bay of Plenty','BOP',1154),(3968,'Canterbury','CAN',1154),(3969,'Gisborne','GIS',1154),(3970,'Hawkes Bay','HKB',1154),(3971,'Manawatu-Wanganui','MWT',1154),(3972,'Marlborough','MBH',1154),(3973,'Nelson','NSN',1154),(3974,'Northland','NTL',1154),(3975,'Otago','OTA',1154),(3976,'Southland','STL',1154),(3977,'Taranaki','TKI',1154),(3978,'Tasman','TAS',1154),(3979,'Waikato','WKO',1154),(3980,'Wellington','WGN',1154),(3981,'West Coast','WTC',1154),(3982,'Ad Dakhillyah','DA',1162),(3983,'Al Batinah','BA',1162),(3984,'Al Janblyah','JA',1162),(3985,'Al Wusta','WU',1162),(3986,'Ash Sharqlyah','SH',1162),(3987,'Az Zahirah','ZA',1162),(3988,'Masqat','MA',1162),(3989,'Musandam','MU',1162),(3990,'Bocas del Toro','1',1166),(3991,'Cocle','2',1166),(3992,'Chiriqui','4',1166),(3993,'Darien','5',1166),(3994,'Herrera','6',1166),(3995,'Loa Santoa','7',1166),(3996,'Panama','8',1166),(3997,'Veraguas','9',1166),(3998,'Comarca de San Blas','Q',1166),(3999,'El Callao','CAL',1169),(4000,'Ancash','ANC',1169),(4001,'Apurimac','APU',1169),(4002,'Arequipa','ARE',1169),(4003,'Ayacucho','AYA',1169),(4004,'Cajamarca','CAJ',1169),(4005,'Cuzco','CUS',1169),(4006,'Huancavelica','HUV',1169),(4007,'Huanuco','HUC',1169),(4008,'Ica','ICA',1169),(4009,'Junin','JUN',1169),(4010,'La Libertad','LAL',1169),(4011,'Lambayeque','LAM',1169),(4012,'Lima','LIM',1169),(4013,'Loreto','LOR',1169),(4014,'Madre de Dios','MDD',1169),(4015,'Moquegua','MOQ',1169),(4016,'Pasco','PAS',1169),(4017,'Piura','PIU',1169),(4018,'Puno','PUN',1169),(4019,'San Martin','SAM',1169),(4020,'Tacna','TAC',1169),(4021,'Tumbes','TUM',1169),(4022,'Ucayali','UCA',1169),(4023,'National Capital District (Port Moresby)','NCD',1167),(4024,'Chimbu','CPK',1167),(4025,'Eastern Highlands','EHG',1167),(4026,'East New Britain','EBR',1167),(4027,'East Sepik','ESW',1167),(4028,'Enga','EPW',1167),(4029,'Gulf','GPK',1167),(4030,'Madang','MPM',1167),(4031,'Manus','MRL',1167),(4032,'Milne Bay','MBA',1167),(4033,'Morobe','MPL',1167),(4034,'New Ireland','NIK',1167),(4035,'North Solomons','NSA',1167),(4036,'Santaun','SAN',1167),(4037,'Southern Highlands','SHM',1167),(4038,'Western Highlands','WHM',1167),(4039,'West New Britain','WBK',1167),(4040,'Abra','ABR',1170),(4041,'Agusan del Norte','AGN',1170),(4042,'Agusan del Sur','AGS',1170),(4043,'Aklan','AKL',1170),(4044,'Albay','ALB',1170),(4045,'Antique','ANT',1170),(4046,'Apayao','APA',1170),(4047,'Aurora','AUR',1170),(4048,'Basilan','BAS',1170),(4049,'Bataan','BAN',1170),(4050,'Batanes','BTN',1170),(4051,'Batangas','BTG',1170),(4052,'Benguet','BEN',1170),(4053,'Biliran','BIL',1170),(4054,'Bohol','BOH',1170),(4055,'Bukidnon','BUK',1170),(4056,'Bulacan','BUL',1170),(4057,'Cagayan','CAG',1170),(4058,'Camarines Norte','CAN',1170),(4059,'Camarines Sur','CAS',1170),(4060,'Camiguin','CAM',1170),(4061,'Capiz','CAP',1170),(4062,'Catanduanes','CAT',1170),(4063,'Cavite','CAV',1170),(4064,'Cebu','CEB',1170),(4065,'Compostela Valley','COM',1170),(4066,'Davao','DAV',1170),(4067,'Davao del Sur','DAS',1170),(4068,'Davao Oriental','DAO',1170),(4069,'Eastern Samar','EAS',1170),(4070,'Guimaras','GUI',1170),(4071,'Ifugao','IFU',1170),(4072,'Ilocos Norte','ILN',1170),(4073,'Ilocos Sur','ILS',1170),(4074,'Iloilo','ILI',1170),(4075,'Isabela','ISA',1170),(4076,'Kalinga-Apayso','KAL',1170),(4077,'Laguna','LAG',1170),(4078,'Lanao del Norte','LAN',1170),(4079,'Lanao del Sur','LAS',1170),(4080,'La Union','LUN',1170),(4081,'Leyte','LEY',1170),(4082,'Maguindanao','MAG',1170),(4083,'Marinduque','MAD',1170),(4084,'Masbate','MAS',1170),(4085,'Mindoro Occidental','MDC',1170),(4086,'Mindoro Oriental','MDR',1170),(4087,'Misamis Occidental','MSC',1170),(4088,'Misamis Oriental','MSR',1170),(4089,'Mountain Province','MOU',1170),(4090,'Negroe Occidental','NEC',1170),(4091,'Negros Oriental','NER',1170),(4092,'North Cotabato','NCO',1170),(4093,'Northern Samar','NSA',1170),(4094,'Nueva Ecija','NUE',1170),(4095,'Nueva Vizcaya','NUV',1170),(4096,'Palawan','PLW',1170),(4097,'Pampanga','PAM',1170),(4098,'Pangasinan','PAN',1170),(4099,'Quezon','QUE',1170),(4100,'Quirino','QUI',1170),(4101,'Rizal','RIZ',1170),(4102,'Romblon','ROM',1170),(4103,'Sarangani','SAR',1170),(4104,'Siquijor','SIG',1170),(4105,'Sorsogon','SOR',1170),(4106,'South Cotabato','SCO',1170),(4107,'Southern Leyte','SLE',1170),(4108,'Sultan Kudarat','SUK',1170),(4109,'Sulu','SLU',1170),(4110,'Surigao del Norte','SUN',1170),(4111,'Surigao del Sur','SUR',1170),(4112,'Tarlac','TAR',1170),(4113,'Tawi-Tawi','TAW',1170),(4114,'Western Samar','WSA',1170),(4115,'Zambales','ZMB',1170),(4116,'Zamboanga del Norte','ZAN',1170),(4117,'Zamboanga del Sur','ZAS',1170),(4118,'Zamboanga Sibiguey','ZSI',1170),(4119,'Islamabad Federal Capital Area','IS',1163),(4120,'Baluchistan','BA',1163),(4121,'Khyber Pakhtun Khawa','NW',1163),(4122,'Sindh','SD',1163),(4123,'Federally Administered Tribal Areas','TA',1163),(4124,'Azad Kashmir','JK',1163),(4125,'Gilgit-Baltistan','NA',1163),(4126,'Aveiro','01',1173),(4127,'Beja','02',1173),(4128,'Braga','03',1173),(4129,'Bragança','04',1173),(4130,'Castelo Branco','05',1173),(4131,'Coimbra','06',1173),(4132,'Évora','07',1173),(4133,'Faro','08',1173),(4134,'Guarda','09',1173),(4135,'Leiria','10',1173),(4136,'Lisboa','11',1173),(4137,'Portalegre','12',1173),(4138,'Porto','13',1173),(4139,'Santarém','14',1173),(4140,'Setúbal','15',1173),(4141,'Viana do Castelo','16',1173),(4142,'Vila Real','17',1173),(4143,'Viseu','18',1173),(4144,'Região Autónoma dos Açores','20',1173),(4145,'Região Autónoma da Madeira','30',1173),(4146,'Asuncion','ASU',1168),(4147,'Alto Paraguay','16',1168),(4148,'Alto Parana','10',1168),(4149,'Amambay','13',1168),(4150,'Boqueron','19',1168),(4151,'Caeguazu','5',1168),(4152,'Caazapl','6',1168),(4153,'Canindeyu','14',1168),(4154,'Concepcion','1',1168),(4155,'Cordillera','3',1168),(4156,'Guaira','4',1168),(4157,'Itapua','7',1168),(4158,'Miaiones','8',1168),(4159,'Neembucu','12',1168),(4160,'Paraguari','9',1168),(4161,'Presidente Hayes','15',1168),(4162,'San Pedro','2',1168),(4163,'Ad Dawhah','DA',1175),(4164,'Al Ghuwayriyah','GH',1175),(4165,'Al Jumayliyah','JU',1175),(4166,'Al Khawr','KH',1175),(4167,'Al Wakrah','WA',1175),(4168,'Ar Rayyan','RA',1175),(4169,'Jariyan al Batnah','JB',1175),(4170,'Madinat ash Shamal','MS',1175),(4171,'Umm Salal','US',1175),(4172,'Bucuresti','B',1176),(4173,'Alba','AB',1176),(4174,'Arad','AR',1176),(4175,'Argeș','AG',1176),(4176,'Bacău','BC',1176),(4177,'Bihor','BH',1176),(4178,'Bistrița-Năsăud','BN',1176),(4179,'Botoșani','BT',1176),(4180,'Brașov','BV',1176),(4181,'Brăila','BR',1176),(4182,'Buzău','BZ',1176),(4183,'Caraș-Severin','CS',1176),(4184,'Călărași','CL',1176),(4185,'Cluj','CJ',1176),(4186,'Constanța','CT',1176),(4187,'Covasna','CV',1176),(4188,'Dâmbovița','DB',1176),(4189,'Dolj','DJ',1176),(4190,'Galați','GL',1176),(4191,'Giurgiu','GR',1176),(4192,'Gorj','GJ',1176),(4193,'Harghita','HR',1176),(4194,'Hunedoara','HD',1176),(4195,'Ialomița','IL',1176),(4196,'Iași','IS',1176),(4197,'Ilfov','IF',1176),(4198,'Maramureș','MM',1176),(4199,'Mehedinți','MH',1176),(4200,'Mureș','MS',1176),(4201,'Neamț','NT',1176),(4202,'Olt','OT',1176),(4203,'Prahova','PH',1176),(4204,'Satu Mare','SM',1176),(4205,'Sălaj','SJ',1176),(4206,'Sibiu','SB',1176),(4207,'Suceava','SV',1176),(4208,'Teleorman','TR',1176),(4209,'Timiș','TM',1176),(4210,'Tulcea','TL',1176),(4211,'Vaslui','VS',1176),(4212,'Vâlcea','VL',1176),(4213,'Vrancea','VN',1176),(4214,'Adygeya, Respublika','AD',1177),(4215,'Altay, Respublika','AL',1177),(4216,'Bashkortostan, Respublika','BA',1177),(4217,'Buryatiya, Respublika','BU',1177),(4218,'Chechenskaya Respublika','CE',1177),(4219,'Chuvashskaya Respublika','CU',1177),(4220,'Dagestan, Respublika','DA',1177),(4221,'Ingushskaya Respublika','IN',1177),(4222,'Kabardino-Balkarskaya','KB',1177),(4223,'Kalmykiya, Respublika','KL',1177),(4224,'Karachayevo-Cherkesskaya Respublika','KC',1177),(4225,'Kareliya, Respublika','KR',1177),(4226,'Khakasiya, Respublika','KK',1177),(4227,'Komi, Respublika','KO',1177),(4228,'Mariy El, Respublika','ME',1177),(4229,'Mordoviya, Respublika','MO',1177),(4230,'Sakha, Respublika [Yakutiya]','SA',1177),(4231,'Severnaya Osetiya, Respublika','SE',1177),(4232,'Tatarstan, Respublika','TA',1177),(4233,'Tyva, Respublika [Tuva]','TY',1177),(4234,'Udmurtskaya Respublika','UD',1177),(4235,'Altayskiy kray','ALT',1177),(4236,'Khabarovskiy kray','KHA',1177),(4237,'Krasnodarskiy kray','KDA',1177),(4238,'Krasnoyarskiy kray','KYA',1177),(4239,'Primorskiy kray','PRI',1177),(4240,'Stavropol\'skiy kray','STA',1177),(4241,'Amurskaya oblast\'','AMU',1177),(4242,'Arkhangel\'skaya oblast\'','ARK',1177),(4243,'Astrakhanskaya oblast\'','AST',1177),(4244,'Belgorodskaya oblast\'','BEL',1177),(4245,'Bryanskaya oblast\'','BRY',1177),(4246,'Chelyabinskaya oblast\'','CHE',1177),(4247,'Zabaykalsky Krai\'','ZSK',1177),(4248,'Irkutskaya oblast\'','IRK',1177),(4249,'Ivanovskaya oblast\'','IVA',1177),(4250,'Kaliningradskaya oblast\'','KGD',1177),(4251,'Kaluzhskaya oblast\'','KLU',1177),(4252,'Kamchatka Krai\'','KAM',1177),(4253,'Kemerovskaya oblast\'','KEM',1177),(4254,'Kirovskaya oblast\'','KIR',1177),(4255,'Kostromskaya oblast\'','KOS',1177),(4256,'Kurganskaya oblast\'','KGN',1177),(4257,'Kurskaya oblast\'','KRS',1177),(4258,'Leningradskaya oblast\'','LEN',1177),(4259,'Lipetskaya oblast\'','LIP',1177),(4260,'Magadanskaya oblast\'','MAG',1177),(4261,'Moskovskaya oblast\'','MOS',1177),(4262,'Murmanskaya oblast\'','MUR',1177),(4263,'Nizhegorodskaya oblast\'','NIZ',1177),(4264,'Novgorodskaya oblast\'','NGR',1177),(4265,'Novosibirskaya oblast\'','NVS',1177),(4266,'Omskaya oblast\'','OMS',1177),(4267,'Orenburgskaya oblast\'','ORE',1177),(4268,'Orlovskaya oblast\'','ORL',1177),(4269,'Penzenskaya oblast\'','PNZ',1177),(4270,'Perm krai\'','PEK',1177),(4271,'Pskovskaya oblast\'','PSK',1177),(4272,'Rostovskaya oblast\'','ROS',1177),(4273,'Ryazanskaya oblast\'','RYA',1177),(4274,'Sakhalinskaya oblast\'','SAK',1177),(4275,'Samarskaya oblast\'','SAM',1177),(4276,'Saratovskaya oblast\'','SAR',1177),(4277,'Smolenskaya oblast\'','SMO',1177),(4278,'Sverdlovskaya oblast\'','SVE',1177),(4279,'Tambovskaya oblast\'','TAM',1177),(4280,'Tomskaya oblast\'','TOM',1177),(4281,'Tul\'skaya oblast\'','TUL',1177),(4282,'Tverskaya oblast\'','TVE',1177),(4283,'Tyumenskaya oblast\'','TYU',1177),(4284,'Ul\'yanovskaya oblast\'','ULY',1177),(4285,'Vladimirskaya oblast\'','VLA',1177),(4286,'Volgogradskaya oblast\'','VGG',1177),(4287,'Vologodskaya oblast\'','VLG',1177),(4288,'Voronezhskaya oblast\'','VOR',1177),(4289,'Yaroslavskaya oblast\'','YAR',1177),(4290,'Moskva','MOW',1177),(4291,'Sankt-Peterburg','SPE',1177),(4292,'Yevreyskaya avtonomnaya oblast\'','YEV',1177),(4294,'Chukotskiy avtonomnyy okrug','CHU',1177),(4296,'Khanty-Mansiyskiy avtonomnyy okrug','KHM',1177),(4299,'Nenetskiy avtonomnyy okrug','NEN',1177),(4302,'Yamalo-Nenetskiy avtonomnyy okrug','YAN',1177),(4303,'Butare','C',1178),(4304,'Byumba','I',1178),(4305,'Cyangugu','E',1178),(4306,'Gikongoro','D',1178),(4307,'Gisenyi','G',1178),(4308,'Gitarama','B',1178),(4309,'Kibungo','J',1178),(4310,'Kibuye','F',1178),(4311,'Kigali-Rural Kigali y\' Icyaro','K',1178),(4312,'Kigali-Ville Kigali Ngari','L',1178),(4313,'Mutara','M',1178),(4314,'Ruhengeri','H',1178),(4315,'Al Bahah','11',1187),(4316,'Al Hudud Ash Shamaliyah','08',1187),(4317,'Al Jawf','12',1187),(4318,'Al Madinah','03',1187),(4319,'Al Qasim','05',1187),(4320,'Ar Riyad','01',1187),(4321,'Asir','14',1187),(4322,'Ha\'il','06',1187),(4323,'Jlzan','09',1187),(4324,'Makkah','02',1187),(4325,'Najran','10',1187),(4326,'Tabuk','07',1187),(4327,'Capital Territory (Honiara)','CT',1194),(4328,'Guadalcanal','GU',1194),(4329,'Isabel','IS',1194),(4330,'Makira','MK',1194),(4331,'Malaita','ML',1194),(4332,'Temotu','TE',1194),(4333,'A\'ali an Nil','23',1200),(4334,'Al Bah al Ahmar','26',1200),(4335,'Al Buhayrat','18',1200),(4336,'Al Jazirah','07',1200),(4337,'Al Khartum','03',1200),(4338,'Al Qadarif','06',1200),(4339,'Al Wahdah','22',1200),(4340,'An Nil','04',1200),(4341,'An Nil al Abyaq','08',1200),(4342,'An Nil al Azraq','24',1200),(4343,'Ash Shamallyah','01',1200),(4344,'Bahr al Jabal','17',1200),(4345,'Gharb al Istiwa\'iyah','16',1200),(4346,'Gharb Ba~r al Ghazal','14',1200),(4347,'Gharb Darfur','12',1200),(4348,'Gharb Kurdufan','10',1200),(4349,'Janub Darfur','11',1200),(4350,'Janub Rurdufan','13',1200),(4351,'Jnqall','20',1200),(4352,'Kassala','05',1200),(4353,'Shamal Batr al Ghazal','15',1200),(4354,'Shamal Darfur','02',1200),(4355,'Shamal Kurdufan','09',1200),(4356,'Sharq al Istiwa\'iyah','19',1200),(4357,'Sinnar','25',1200),(4358,'Warab','21',1200),(4359,'Blekinge län','K',1204),(4360,'Dalarnas län','W',1204),(4361,'Gotlands län','I',1204),(4362,'Gävleborgs län','X',1204),(4363,'Hallands län','N',1204),(4364,'Jämtlands län','Z',1204),(4365,'Jönkopings län','F',1204),(4366,'Kalmar län','H',1204),(4367,'Kronobergs län','G',1204),(4368,'Norrbottens län','BD',1204),(4369,'Skåne län','M',1204),(4370,'Stockholms län','AB',1204),(4371,'Södermanlands län','D',1204),(4372,'Uppsala län','C',1204),(4373,'Värmlands län','S',1204),(4374,'Västerbottens län','AC',1204),(4375,'Västernorrlands län','Y',1204),(4376,'Västmanlands län','U',1204),(4377,'Västra Götalands län','Q',1204),(4378,'Örebro län','T',1204),(4379,'Östergötlands län','E',1204),(4380,'Saint Helena','SH',1180),(4381,'Ascension','AC',1180),(4382,'Tristan da Cunha','TA',1180),(4383,'Ajdovščina','001',1193),(4384,'Beltinci','002',1193),(4385,'Benedikt','148',1193),(4386,'Bistrica ob Sotli','149',1193),(4387,'Bled','003',1193),(4388,'Bloke','150',1193),(4389,'Bohinj','004',1193),(4390,'Borovnica','005',1193),(4391,'Bovec','006',1193),(4392,'Braslovče','151',1193),(4393,'Brda','007',1193),(4394,'Brezovica','008',1193),(4395,'Brežice','009',1193),(4396,'Cankova','152',1193),(4397,'Celje','011',1193),(4398,'Cerklje na Gorenjskem','012',1193),(4399,'Cerknica','013',1193),(4400,'Cerkno','014',1193),(4401,'Cerkvenjak','153',1193),(4402,'Črenšovci','015',1193),(4403,'Črna na Koroškem','016',1193),(4404,'Črnomelj','017',1193),(4405,'Destrnik','018',1193),(4406,'Divača','019',1193),(4407,'Dobje','154',1193),(4408,'Dobrepolje','020',1193),(4409,'Dobrna','155',1193),(4410,'Dobrova-Polhov Gradec','021',1193),(4411,'Dobrovnik','156',1193),(4412,'Dol pri Ljubljani','022',1193),(4413,'Dolenjske Toplice','157',1193),(4414,'Domžale','023',1193),(4415,'Dornava','024',1193),(4416,'Dravograd','025',1193),(4417,'Duplek','026',1193),(4418,'Gorenja vas-Poljane','027',1193),(4419,'Gorišnica','028',1193),(4420,'Gornja Radgona','029',1193),(4421,'Gornji Grad','030',1193),(4422,'Gornji Petrovci','031',1193),(4423,'Grad','158',1193),(4424,'Grosuplje','032',1193),(4425,'Hajdina','159',1193),(4426,'Hoče-Slivnica','160',1193),(4427,'Hodoš','161',1193),(4428,'Horjul','162',1193),(4429,'Hrastnik','034',1193),(4430,'Hrpelje-Kozina','035',1193),(4431,'Idrija','036',1193),(4432,'Ig','037',1193),(4433,'Ilirska Bistrica','038',1193),(4434,'Ivančna Gorica','039',1193),(4435,'Izola','040',1193),(4436,'Jesenice','041',1193),(4437,'Jezersko','163',1193),(4438,'Juršinci','042',1193),(4439,'Kamnik','043',1193),(4440,'Kanal','044',1193),(4441,'Kidričevo','045',1193),(4442,'Kobarid','046',1193),(4443,'Kobilje','047',1193),(4444,'Kočevje','048',1193),(4445,'Komen','049',1193),(4446,'Komenda','164',1193),(4447,'Koper','050',1193),(4448,'Kostel','165',1193),(4449,'Kozje','051',1193),(4450,'Kranj','052',1193),(4451,'Kranjska Gora','053',1193),(4452,'Križevci','166',1193),(4453,'Krško','054',1193),(4454,'Kungota','055',1193),(4455,'Kuzma','056',1193),(4456,'Laško','057',1193),(4457,'Lenart','058',1193),(4458,'Lendava','059',1193),(4459,'Litija','060',1193),(4460,'Ljubljana','061',1193),(4461,'Ljubno','062',1193),(4462,'Ljutomer','063',1193),(4463,'Logatec','064',1193),(4464,'Loška dolina','065',1193),(4465,'Loški Potok','066',1193),(4466,'Lovrenc na Pohorju','167',1193),(4467,'Luče','067',1193),(4468,'Lukovica','068',1193),(4469,'Majšperk','069',1193),(4470,'Maribor','070',1193),(4471,'Markovci','168',1193),(4472,'Medvode','071',1193),(4473,'Mengeš','072',1193),(4474,'Metlika','073',1193),(4475,'Mežica','074',1193),(4476,'Miklavž na Dravskem polju','169',1193),(4477,'Miren-Kostanjevica','075',1193),(4478,'Mirna Peč','170',1193),(4479,'Mislinja','076',1193),(4480,'Moravče','077',1193),(4481,'Moravske Toplice','078',1193),(4482,'Mozirje','079',1193),(4483,'Murska Sobota','080',1193),(4484,'Muta','081',1193),(4485,'Naklo','082',1193),(4486,'Nazarje','083',1193),(4487,'Nova Gorica','084',1193),(4488,'Novo mesto','085',1193),(4489,'Sveta Ana','181',1193),(4490,'Sveti Andraž v Slovenskih goricah','182',1193),(4491,'Sveti Jurij','116',1193),(4492,'Šalovci','033',1193),(4493,'Šempeter-Vrtojba','183',1193),(4494,'Šenčur','117',1193),(4495,'Šentilj','118',1193),(4496,'Šentjernej','119',1193),(4497,'Šentjur','120',1193),(4498,'Škocjan','121',1193),(4499,'Škofja Loka','122',1193),(4500,'Škofljica','123',1193),(4501,'Šmarje pri Jelšah','124',1193),(4502,'Šmartno ob Paki','125',1193),(4503,'Šmartno pri Litiji','194',1193),(4504,'Šoštanj','126',1193),(4505,'Štore','127',1193),(4506,'Tabor','184',1193),(4507,'Tišina','010',1193),(4508,'Tolmin','128',1193),(4509,'Trbovlje','129',1193),(4510,'Trebnje','130',1193),(4511,'Trnovska vas','185',1193),(4512,'Tržič','131',1193),(4513,'Trzin','186',1193),(4514,'Turnišče','132',1193),(4515,'Velenje','133',1193),(4516,'Velika Polana','187',1193),(4517,'Velike Lašče','134',1193),(4518,'Veržej','188',1193),(4519,'Videm','135',1193),(4520,'Vipava','136',1193),(4521,'Vitanje','137',1193),(4522,'Vojnik','138',1193),(4523,'Vransko','189',1193),(4524,'Vrhnika','140',1193),(4525,'Vuzenica','141',1193),(4526,'Zagorje ob Savi','142',1193),(4527,'Zavrč','143',1193),(4528,'Zreče','144',1193),(4529,'Žalec','190',1193),(4530,'Železniki','146',1193),(4531,'Žetale','191',1193),(4532,'Žiri','147',1193),(4533,'Žirovnica','192',1193),(4534,'Žužemberk','193',1193),(4535,'Banskobystrický kraj','BC',1192),(4536,'Bratislavský kraj','BL',1192),(4537,'Košický kraj','KI',1192),(4538,'Nitriansky kraj','NJ',1192),(4539,'Prešovský kraj','PV',1192),(4540,'Trenčiansky kraj','TC',1192),(4541,'Trnavský kraj','TA',1192),(4542,'Žilinský kraj','ZI',1192),(4543,'Western Area (Freetown)','W',1190),(4544,'Dakar','DK',1188),(4545,'Diourbel','DB',1188),(4546,'Fatick','FK',1188),(4547,'Kaolack','KL',1188),(4548,'Kolda','KD',1188),(4549,'Louga','LG',1188),(4550,'Matam','MT',1188),(4551,'Saint-Louis','SL',1188),(4552,'Tambacounda','TC',1188),(4553,'Thies','TH',1188),(4554,'Ziguinchor','ZG',1188),(4555,'Awdal','AW',1195),(4556,'Bakool','BK',1195),(4557,'Banaadir','BN',1195),(4558,'Bay','BY',1195),(4559,'Galguduud','GA',1195),(4560,'Gedo','GE',1195),(4561,'Hiirsan','HI',1195),(4562,'Jubbada Dhexe','JD',1195),(4563,'Jubbada Hoose','JH',1195),(4564,'Mudug','MU',1195),(4565,'Nugaal','NU',1195),(4566,'Saneag','SA',1195),(4567,'Shabeellaha Dhexe','SD',1195),(4568,'Shabeellaha Hoose','SH',1195),(4569,'Sool','SO',1195),(4570,'Togdheer','TO',1195),(4571,'Woqooyi Galbeed','WO',1195),(4572,'Brokopondo','BR',1201),(4573,'Commewijne','CM',1201),(4574,'Coronie','CR',1201),(4575,'Marowijne','MA',1201),(4576,'Nickerie','NI',1201),(4577,'Paramaribo','PM',1201),(4578,'Saramacca','SA',1201),(4579,'Sipaliwini','SI',1201),(4580,'Wanica','WA',1201),(4581,'Principe','P',1207),(4582,'Sao Tome','S',1207),(4583,'Ahuachapan','AH',1066),(4584,'Cabanas','CA',1066),(4585,'Cuscatlan','CU',1066),(4586,'Chalatenango','CH',1066),(4587,'Morazan','MO',1066),(4588,'San Miguel','SM',1066),(4589,'San Salvador','SS',1066),(4590,'Santa Ana','SA',1066),(4591,'San Vicente','SV',1066),(4592,'Sonsonate','SO',1066),(4593,'Usulutan','US',1066),(4594,'Al Hasakah','HA',1206),(4595,'Al Ladhiqiyah','LA',1206),(4596,'Al Qunaytirah','QU',1206),(4597,'Ar Raqqah','RA',1206),(4598,'As Suwayda\'','SU',1206),(4599,'Dar\'a','DR',1206),(4600,'Dayr az Zawr','DY',1206),(4601,'Dimashq','DI',1206),(4602,'Halab','HL',1206),(4603,'Hamah','HM',1206),(4604,'Jim\'','HI',1206),(4605,'Idlib','ID',1206),(4606,'Rif Dimashq','RD',1206),(4607,'Tarts','TA',1206),(4608,'Hhohho','HH',1203),(4609,'Lubombo','LU',1203),(4610,'Manzini','MA',1203),(4611,'Shiselweni','SH',1203),(4612,'Batha','BA',1043),(4613,'Biltine','BI',1043),(4614,'Borkou-Ennedi-Tibesti','BET',1043),(4615,'Chari-Baguirmi','CB',1043),(4616,'Guera','GR',1043),(4617,'Kanem','KA',1043),(4618,'Lac','LC',1043),(4619,'Logone-Occidental','LO',1043),(4620,'Logone-Oriental','LR',1043),(4621,'Mayo-Kebbi','MK',1043),(4622,'Moyen-Chari','MC',1043),(4623,'Ouaddai','OD',1043),(4624,'Salamat','SA',1043),(4625,'Tandjile','TA',1043),(4626,'Kara','K',1214),(4627,'Maritime (Region)','M',1214),(4628,'Savannes','S',1214),(4629,'Krung Thep Maha Nakhon Bangkok','10',1211),(4630,'Phatthaya','S',1211),(4631,'Amnat Charoen','37',1211),(4632,'Ang Thong','15',1211),(4633,'Buri Ram','31',1211),(4634,'Chachoengsao','24',1211),(4635,'Chai Nat','18',1211),(4636,'Chaiyaphum','36',1211),(4637,'Chanthaburi','22',1211),(4638,'Chiang Mai','50',1211),(4639,'Chiang Rai','57',1211),(4640,'Chon Buri','20',1211),(4641,'Chumphon','86',1211),(4642,'Kalasin','46',1211),(4643,'Kamphasng Phet','62',1211),(4644,'Kanchanaburi','71',1211),(4645,'Khon Kaen','40',1211),(4646,'Krabi','81',1211),(4647,'Lampang','52',1211),(4648,'Lamphun','51',1211),(4649,'Loei','42',1211),(4650,'Lop Buri','16',1211),(4651,'Mae Hong Son','58',1211),(4652,'Maha Sarakham','44',1211),(4653,'Mukdahan','49',1211),(4654,'Nakhon Nayok','26',1211),(4655,'Nakhon Pathom','73',1211),(4656,'Nakhon Phanom','48',1211),(4657,'Nakhon Ratchasima','30',1211),(4658,'Nakhon Sawan','60',1211),(4659,'Nakhon Si Thammarat','80',1211),(4660,'Nan','55',1211),(4661,'Narathiwat','96',1211),(4662,'Nong Bua Lam Phu','39',1211),(4663,'Nong Khai','43',1211),(4664,'Nonthaburi','12',1211),(4665,'Pathum Thani','13',1211),(4666,'Pattani','94',1211),(4667,'Phangnga','82',1211),(4668,'Phatthalung','93',1211),(4669,'Phayao','56',1211),(4670,'Phetchabun','67',1211),(4671,'Phetchaburi','76',1211),(4672,'Phichit','66',1211),(4673,'Phitsanulok','65',1211),(4674,'Phrae','54',1211),(4675,'Phra Nakhon Si Ayutthaya','14',1211),(4676,'Phuket','83',1211),(4677,'Prachin Buri','25',1211),(4678,'Prachuap Khiri Khan','77',1211),(4679,'Ranong','85',1211),(4680,'Ratchaburi','70',1211),(4681,'Rayong','21',1211),(4682,'Roi Et','45',1211),(4683,'Sa Kaeo','27',1211),(4684,'Sakon Nakhon','47',1211),(4685,'Samut Prakan','11',1211),(4686,'Samut Sakhon','74',1211),(4687,'Samut Songkhram','75',1211),(4688,'Saraburi','19',1211),(4689,'Satun','91',1211),(4690,'Sing Buri','17',1211),(4691,'Si Sa Ket','33',1211),(4692,'Songkhla','90',1211),(4693,'Sukhothai','64',1211),(4694,'Suphan Buri','72',1211),(4695,'Surat Thani','84',1211),(4696,'Surin','32',1211),(4697,'Tak','63',1211),(4698,'Trang','92',1211),(4699,'Trat','23',1211),(4700,'Ubon Ratchathani','34',1211),(4701,'Udon Thani','41',1211),(4702,'Uthai Thani','61',1211),(4703,'Uttaradit','53',1211),(4704,'Yala','95',1211),(4705,'Yasothon','35',1211),(4706,'Sughd','SU',1209),(4707,'Khatlon','KT',1209),(4708,'Gorno-Badakhshan','GB',1209),(4709,'Ahal','A',1220),(4710,'Balkan','B',1220),(4711,'Dasoguz','D',1220),(4712,'Lebap','L',1220),(4713,'Mary','M',1220),(4714,'Béja','31',1218),(4715,'Ben Arous','13',1218),(4716,'Bizerte','23',1218),(4717,'Gabès','81',1218),(4718,'Gafsa','71',1218),(4719,'Jendouba','32',1218),(4720,'Kairouan','41',1218),(4721,'Rasserine','42',1218),(4722,'Kebili','73',1218),(4723,'L\'Ariana','12',1218),(4724,'Le Ref','33',1218),(4725,'Mahdia','53',1218),(4726,'La Manouba','14',1218),(4727,'Medenine','82',1218),(4728,'Moneatir','52',1218),(4729,'Naboul','21',1218),(4730,'Sfax','61',1218),(4731,'Sidi Bouxid','43',1218),(4732,'Siliana','34',1218),(4733,'Sousse','51',1218),(4734,'Tataouine','83',1218),(4735,'Tozeur','72',1218),(4736,'Tunis','11',1218),(4737,'Zaghouan','22',1218),(4738,'Adana','01',1219),(4739,'Ad yaman','02',1219),(4740,'Afyon','03',1219),(4741,'Ag r','04',1219),(4742,'Aksaray','68',1219),(4743,'Amasya','05',1219),(4744,'Ankara','06',1219),(4745,'Antalya','07',1219),(4746,'Ardahan','75',1219),(4747,'Artvin','08',1219),(4748,'Aydin','09',1219),(4749,'Bal kesir','10',1219),(4750,'Bartin','74',1219),(4751,'Batman','72',1219),(4752,'Bayburt','69',1219),(4753,'Bilecik','11',1219),(4754,'Bingol','12',1219),(4755,'Bitlis','13',1219),(4756,'Bolu','14',1219),(4757,'Burdur','15',1219),(4758,'Bursa','16',1219),(4759,'Canakkale','17',1219),(4760,'Cankir','18',1219),(4761,'Corum','19',1219),(4762,'Denizli','20',1219),(4763,'Diyarbakir','21',1219),(4764,'Duzce','81',1219),(4765,'Edirne','22',1219),(4766,'Elazig','23',1219),(4767,'Erzincan','24',1219),(4768,'Erzurum','25',1219),(4769,'Eskis\'ehir','26',1219),(4770,'Gaziantep','27',1219),(4771,'Giresun','28',1219),(4772,'Gms\'hane','29',1219),(4773,'Hakkari','30',1219),(4774,'Hatay','31',1219),(4775,'Igidir','76',1219),(4776,'Isparta','32',1219),(4777,'Icel','33',1219),(4778,'Istanbul','34',1219),(4779,'Izmir','35',1219),(4780,'Kahramanmaras','46',1219),(4781,'Karabk','78',1219),(4782,'Karaman','70',1219),(4783,'Kars','36',1219),(4784,'Kastamonu','37',1219),(4785,'Kayseri','38',1219),(4786,'Kirikkale','71',1219),(4787,'Kirklareli','39',1219),(4788,'Kirs\'ehir','40',1219),(4789,'Kilis','79',1219),(4790,'Kocaeli','41',1219),(4791,'Konya','42',1219),(4792,'Ktahya','43',1219),(4793,'Malatya','44',1219),(4794,'Manisa','45',1219),(4795,'Mardin','47',1219),(4796,'Mugila','48',1219),(4797,'Mus','49',1219),(4798,'Nevs\'ehir','50',1219),(4799,'Nigide','51',1219),(4800,'Ordu','52',1219),(4801,'Osmaniye','80',1219),(4802,'Rize','53',1219),(4803,'Sakarya','54',1219),(4804,'Samsun','55',1219),(4805,'Siirt','56',1219),(4806,'Sinop','57',1219),(4807,'Sivas','58',1219),(4808,'S\'anliurfa','63',1219),(4809,'S\'rnak','73',1219),(4810,'Tekirdag','59',1219),(4811,'Tokat','60',1219),(4812,'Trabzon','61',1219),(4813,'Tunceli','62',1219),(4814,'Us\'ak','64',1219),(4815,'Van','65',1219),(4816,'Yalova','77',1219),(4817,'Yozgat','66',1219),(4818,'Zonguldak','67',1219),(4819,'Couva-Tabaquite-Talparo','CTT',1217),(4820,'Diego Martin','DMN',1217),(4821,'Eastern Tobago','ETO',1217),(4822,'Penal-Debe','PED',1217),(4823,'Princes Town','PRT',1217),(4824,'Rio Claro-Mayaro','RCM',1217),(4825,'Sangre Grande','SGE',1217),(4826,'San Juan-Laventille','SJL',1217),(4827,'Siparia','SIP',1217),(4828,'Tunapuna-Piarco','TUP',1217),(4829,'Western Tobago','WTO',1217),(4830,'Arima','ARI',1217),(4831,'Chaguanas','CHA',1217),(4832,'Point Fortin','PTF',1217),(4833,'Port of Spain','POS',1217),(4834,'San Fernando','SFO',1217),(4835,'Aileu','AL',1063),(4836,'Ainaro','AN',1063),(4837,'Bacucau','BA',1063),(4838,'Bobonaro','BO',1063),(4839,'Cova Lima','CO',1063),(4840,'Dili','DI',1063),(4841,'Ermera','ER',1063),(4842,'Laulem','LA',1063),(4843,'Liquica','LI',1063),(4844,'Manatuto','MT',1063),(4845,'Manafahi','MF',1063),(4846,'Oecussi','OE',1063),(4847,'Viqueque','VI',1063),(4848,'Changhua County','CHA',1208),(4849,'Chiayi County','CYQ',1208),(4850,'Hsinchu County','HSQ',1208),(4851,'Hualien County','HUA',1208),(4852,'Ilan County','ILA',1208),(4853,'Kaohsiung County','KHQ',1208),(4854,'Miaoli County','MIA',1208),(4855,'Nantou County','NAN',1208),(4856,'Penghu County','PEN',1208),(4857,'Pingtung County','PIF',1208),(4858,'Taichung County','TXQ',1208),(4859,'Tainan County','TNQ',1208),(4860,'Taipei County','TPQ',1208),(4861,'Taitung County','TTT',1208),(4862,'Taoyuan County','TAO',1208),(4863,'Yunlin County','YUN',1208),(4864,'Keelung City','KEE',1208),(4865,'Arusha','01',1210),(4866,'Dar-es-Salaam','02',1210),(4867,'Dodoma','03',1210),(4868,'Iringa','04',1210),(4869,'Kagera','05',1210),(4870,'Kaskazini Pemba','06',1210),(4871,'Kaskazini Unguja','07',1210),(4872,'Xigoma','08',1210),(4873,'Kilimanjaro','09',1210),(4874,'Rusini Pemba','10',1210),(4875,'Kusini Unguja','11',1210),(4876,'Lindi','12',1210),(4877,'Manyara','26',1210),(4878,'Mara','13',1210),(4879,'Mbeya','14',1210),(4880,'Mjini Magharibi','15',1210),(4881,'Morogoro','16',1210),(4882,'Mtwara','17',1210),(4883,'Pwani','19',1210),(4884,'Rukwa','20',1210),(4885,'Ruvuma','21',1210),(4886,'Shinyanga','22',1210),(4887,'Singida','23',1210),(4888,'Tabora','24',1210),(4889,'Tanga','25',1210),(4890,'Cherkas\'ka Oblast\'','71',1224),(4891,'Chernihivs\'ka Oblast\'','74',1224),(4892,'Chernivets\'ka Oblast\'','77',1224),(4893,'Dnipropetrovs\'ka Oblast\'','12',1224),(4894,'Donets\'ka Oblast\'','14',1224),(4895,'Ivano-Frankivs\'ka Oblast\'','26',1224),(4896,'Kharkivs\'ka Oblast\'','63',1224),(4897,'Khersons\'ka Oblast\'','65',1224),(4898,'Khmel\'nyts\'ka Oblast\'','68',1224),(4899,'Kirovohrads\'ka Oblast\'','35',1224),(4900,'Kyivs\'ka Oblast\'','32',1224),(4901,'Luhans\'ka Oblast\'','09',1224),(4902,'L\'vivs\'ka Oblast\'','46',1224),(4903,'Mykolaivs\'ka Oblast\'','48',1224),(4904,'Odes \'ka Oblast\'','51',1224),(4905,'Poltavs\'ka Oblast\'','53',1224),(4906,'Rivnens\'ka Oblast\'','56',1224),(4907,'Sums \'ka Oblast\'','59',1224),(4908,'Ternopil\'s\'ka Oblast\'','61',1224),(4909,'Vinnyts\'ka Oblast\'','05',1224),(4910,'Volyos\'ka Oblast\'','07',1224),(4911,'Zakarpats\'ka Oblast\'','21',1224),(4912,'Zaporiz\'ka Oblast\'','23',1224),(4913,'Zhytomyrs\'ka Oblast\'','18',1224),(4914,'Respublika Krym','43',1224),(4915,'Kyiv','30',1224),(4916,'Sevastopol','40',1224),(4917,'Adjumani','301',1223),(4918,'Apac','302',1223),(4919,'Arua','303',1223),(4920,'Bugiri','201',1223),(4921,'Bundibugyo','401',1223),(4922,'Bushenyi','402',1223),(4923,'Busia','202',1223),(4924,'Gulu','304',1223),(4925,'Hoima','403',1223),(4926,'Iganga','203',1223),(4927,'Jinja','204',1223),(4928,'Kabale','404',1223),(4929,'Kabarole','405',1223),(4930,'Kaberamaido','213',1223),(4931,'Kalangala','101',1223),(4932,'Kampala','102',1223),(4933,'Kamuli','205',1223),(4934,'Kamwenge','413',1223),(4935,'Kanungu','414',1223),(4936,'Kapchorwa','206',1223),(4937,'Kasese','406',1223),(4938,'Katakwi','207',1223),(4939,'Kayunga','112',1223),(4940,'Kibaale','407',1223),(4941,'Kiboga','103',1223),(4942,'Kisoro','408',1223),(4943,'Kitgum','305',1223),(4944,'Kotido','306',1223),(4945,'Kumi','208',1223),(4946,'Kyenjojo','415',1223),(4947,'Lira','307',1223),(4948,'Luwero','104',1223),(4949,'Masaka','105',1223),(4950,'Masindi','409',1223),(4951,'Mayuge','214',1223),(4952,'Mbale','209',1223),(4953,'Mbarara','410',1223),(4954,'Moroto','308',1223),(4955,'Moyo','309',1223),(4956,'Mpigi','106',1223),(4957,'Mubende','107',1223),(4958,'Mukono','108',1223),(4959,'Nakapiripirit','311',1223),(4960,'Nakasongola','109',1223),(4961,'Nebbi','310',1223),(4962,'Ntungamo','411',1223),(4963,'Pader','312',1223),(4964,'Pallisa','210',1223),(4965,'Rakai','110',1223),(4966,'Rukungiri','412',1223),(4967,'Sembabule','111',1223),(4968,'Sironko','215',1223),(4969,'Soroti','211',1223),(4970,'Tororo','212',1223),(4971,'Wakiso','113',1223),(4972,'Yumbe','313',1223),(4973,'Baker Island','81',1227),(4974,'Howland Island','84',1227),(4975,'Jarvis Island','86',1227),(4976,'Johnston Atoll','67',1227),(4977,'Kingman Reef','89',1227),(4978,'Midway Islands','71',1227),(4979,'Navassa Island','76',1227),(4980,'Palmyra Atoll','95',1227),(4981,'Wake Island','79',1227),(4982,'Artigsa','AR',1229),(4983,'Canelones','CA',1229),(4984,'Cerro Largo','CL',1229),(4985,'Colonia','CO',1229),(4986,'Durazno','DU',1229),(4987,'Flores','FS',1229),(4988,'Lavalleja','LA',1229),(4989,'Maldonado','MA',1229),(4990,'Montevideo','MO',1229),(4991,'Paysandu','PA',1229),(4992,'Rivera','RV',1229),(4993,'Rocha','RO',1229),(4994,'Salto','SA',1229),(4995,'Soriano','SO',1229),(4996,'Tacuarembo','TA',1229),(4997,'Treinta y Tres','TT',1229),(4998,'Toshkent (city)','TK',1230),(4999,'Qoraqalpogiston Respublikasi','QR',1230),(5000,'Andijon','AN',1230),(5001,'Buxoro','BU',1230),(5002,'Farg\'ona','FA',1230),(5003,'Jizzax','JI',1230),(5004,'Khorazm','KH',1230),(5005,'Namangan','NG',1230),(5006,'Navoiy','NW',1230),(5007,'Qashqadaryo','QA',1230),(5008,'Samarqand','SA',1230),(5009,'Sirdaryo','SI',1230),(5010,'Surxondaryo','SU',1230),(5011,'Toshkent','TO',1230),(5012,'Xorazm','XO',1230),(5013,'Distrito Federal','A',1232),(5014,'Anzoategui','B',1232),(5015,'Apure','C',1232),(5016,'Aragua','D',1232),(5017,'Barinas','E',1232),(5018,'Carabobo','G',1232),(5019,'Cojedes','H',1232),(5020,'Falcon','I',1232),(5021,'Guarico','J',1232),(5022,'Lara','K',1232),(5023,'Merida','L',1232),(5024,'Miranda','M',1232),(5025,'Monagas','N',1232),(5026,'Nueva Esparta','O',1232),(5027,'Portuguesa','P',1232),(5028,'Tachira','S',1232),(5029,'Trujillo','T',1232),(5030,'Vargas','X',1232),(5031,'Yaracuy','U',1232),(5032,'Zulia','V',1232),(5033,'Delta Amacuro','Y',1232),(5034,'Dependencias Federales','W',1232),(5035,'An Giang','44',1233),(5036,'Ba Ria - Vung Tau','43',1233),(5037,'Bac Can','53',1233),(5038,'Bac Giang','54',1233),(5039,'Bac Lieu','55',1233),(5040,'Bac Ninh','56',1233),(5041,'Ben Tre','50',1233),(5042,'Binh Dinh','31',1233),(5043,'Binh Duong','57',1233),(5044,'Binh Phuoc','58',1233),(5045,'Binh Thuan','40',1233),(5046,'Ca Mau','59',1233),(5047,'Can Tho','48',1233),(5048,'Cao Bang','04',1233),(5049,'Da Nang, thanh pho','60',1233),(5050,'Dong Nai','39',1233),(5051,'Dong Thap','45',1233),(5052,'Gia Lai','30',1233),(5053,'Ha Giang','03',1233),(5054,'Ha Nam','63',1233),(5055,'Ha Noi, thu do','64',1233),(5056,'Ha Tay','15',1233),(5057,'Ha Tinh','23',1233),(5058,'Hai Duong','61',1233),(5059,'Hai Phong, thanh pho','62',1233),(5060,'Hoa Binh','14',1233),(5061,'Ho Chi Minh, thanh pho [Sai Gon]','65',1233),(5062,'Hung Yen','66',1233),(5063,'Khanh Hoa','34',1233),(5064,'Kien Giang','47',1233),(5065,'Kon Tum','28',1233),(5066,'Lai Chau','01',1233),(5067,'Lam Dong','35',1233),(5068,'Lang Son','09',1233),(5069,'Lao Cai','02',1233),(5070,'Long An','41',1233),(5071,'Nam Dinh','67',1233),(5072,'Nghe An','22',1233),(5073,'Ninh Binh','18',1233),(5074,'Ninh Thuan','36',1233),(5075,'Phu Tho','68',1233),(5076,'Phu Yen','32',1233),(5077,'Quang Binh','24',1233),(5078,'Quang Nam','27',1233),(5079,'Quang Ngai','29',1233),(5080,'Quang Ninh','13',1233),(5081,'Quang Tri','25',1233),(5082,'Soc Trang','52',1233),(5083,'Son La','05',1233),(5084,'Tay Ninh','37',1233),(5085,'Thai Binh','20',1233),(5086,'Thai Nguyen','69',1233),(5087,'Thanh Hoa','21',1233),(5088,'Thua Thien-Hue','26',1233),(5089,'Tien Giang','46',1233),(5090,'Tra Vinh','51',1233),(5091,'Tuyen Quang','07',1233),(5092,'Vinh Long','49',1233),(5093,'Vinh Phuc','70',1233),(5094,'Yen Bai','06',1233),(5095,'Malampa','MAP',1231),(5096,'Penama','PAM',1231),(5097,'Sanma','SAM',1231),(5098,'Shefa','SEE',1231),(5099,'Tafea','TAE',1231),(5100,'Torba','TOB',1231),(5101,'A\'ana','AA',1185),(5102,'Aiga-i-le-Tai','AL',1185),(5103,'Atua','AT',1185),(5104,'Fa\'aaaleleaga','FA',1185),(5105,'Gaga\'emauga','GE',1185),(5106,'Gagaifomauga','GI',1185),(5107,'Palauli','PA',1185),(5108,'Satupa\'itea','SA',1185),(5109,'Tuamasaga','TU',1185),(5110,'Va\'a-o-Fonoti','VF',1185),(5111,'Vaisigano','VS',1185),(5112,'Crna Gora','CG',1243),(5113,'Srbija','SR',1242),(5114,'Kosovo-Metohija','KM',1242),(5115,'Vojvodina','VO',1242),(5116,'Abyan','AB',1237),(5117,'Adan','AD',1237),(5118,'Ad Dali','DA',1237),(5119,'Al Bayda\'','BA',1237),(5120,'Al Hudaydah','MU',1237),(5121,'Al Mahrah','MR',1237),(5122,'Al Mahwit','MW',1237),(5123,'Amran','AM',1237),(5124,'Dhamar','DH',1237),(5125,'Hadramawt','HD',1237),(5126,'Hajjah','HJ',1237),(5127,'Ibb','IB',1237),(5128,'Lahij','LA',1237),(5129,'Ma\'rib','MA',1237),(5130,'Sa\'dah','SD',1237),(5131,'San\'a\'','SN',1237),(5132,'Shabwah','SH',1237),(5133,'Ta\'izz','TA',1237),(5134,'Eastern Cape','EC',1196),(5135,'Free State','FS',1196),(5136,'Gauteng','GT',1196),(5137,'Kwazulu-Natal','NL',1196),(5138,'Mpumalanga','MP',1196),(5139,'Northern Cape','NC',1196),(5140,'Limpopo','NP',1196),(5141,'Western Cape','WC',1196),(5142,'Copperbelt','08',1239),(5143,'Luapula','04',1239),(5144,'Lusaka','09',1239),(5145,'North-Western','06',1239),(5146,'Bulawayo','BU',1240),(5147,'Harare','HA',1240),(5148,'Manicaland','MA',1240),(5149,'Mashonaland Central','MC',1240),(5150,'Mashonaland East','ME',1240),(5151,'Mashonaland West','MW',1240),(5152,'Masvingo','MV',1240),(5153,'Matabeleland North','MN',1240),(5154,'Matabeleland South','MS',1240),(5155,'Midlands','MI',1240),(5156,'South Karelia','SK',1075),(5157,'South Ostrobothnia','SO',1075),(5158,'Etelä-Savo','ES',1075),(5159,'Häme','HH',1075),(5160,'Itä-Uusimaa','IU',1075),(5161,'Kainuu','KA',1075),(5162,'Central Ostrobothnia','CO',1075),(5163,'Central Finland','CF',1075),(5164,'Kymenlaakso','KY',1075),(5165,'Lapland','LA',1075),(5166,'Tampere Region','TR',1075),(5167,'Ostrobothnia','OB',1075),(5168,'North Karelia','NK',1075),(5169,'Northern Ostrobothnia','NO',1075),(5170,'Northern Savo','NS',1075),(5171,'Päijät-Häme','PH',1075),(5172,'Satakunta','SK',1075),(5173,'Uusimaa','UM',1075),(5174,'South-West Finland','SW',1075),(5175,'Åland','AL',1075),(5176,'Limburg','LI',1152),(5177,'Central and Western','CW',1098),(5178,'Eastern','EA',1098),(5179,'Southern','SO',1098),(5180,'Wan Chai','WC',1098),(5181,'Kowloon City','KC',1098),(5182,'Kwun Tong','KU',1098),(5183,'Sham Shui Po','SS',1098),(5184,'Wong Tai Sin','WT',1098),(5185,'Yau Tsim Mong','YT',1098),(5186,'Islands','IS',1098),(5187,'Kwai Tsing','KI',1098),(5188,'North','NO',1098),(5189,'Sai Kung','SK',1098),(5190,'Sha Tin','ST',1098),(5191,'Tai Po','TP',1098),(5192,'Tsuen Wan','TW',1098),(5193,'Tuen Mun','TM',1098),(5194,'Yuen Long','YL',1098),(5195,'Manchester','MR',1108),(5196,'Al Manāmah (Al ‘Āşimah)','13',1016),(5197,'Al Janūbīyah','14',1016),(5199,'Al Wusţá','16',1016),(5200,'Ash Shamālīyah','17',1016),(5201,'Jenin','_A',1165),(5202,'Tubas','_B',1165),(5203,'Tulkarm','_C',1165),(5204,'Nablus','_D',1165),(5205,'Qalqilya','_E',1165),(5206,'Salfit','_F',1165),(5207,'Ramallah and Al-Bireh','_G',1165),(5208,'Jericho','_H',1165),(5209,'Jerusalem','_I',1165),(5210,'Bethlehem','_J',1165),(5211,'Hebron','_K',1165),(5212,'North Gaza','_L',1165),(5213,'Gaza','_M',1165),(5214,'Deir el-Balah','_N',1165),(5215,'Khan Yunis','_O',1165),(5216,'Rafah','_P',1165),(5217,'Brussels','BRU',1020),(5218,'Distrito Federal','DIF',1140),(5219,'Taichung City','TXG',1208),(5220,'Kaohsiung City','KHH',1208),(5221,'Taipei City','TPE',1208),(5222,'Chiayi City','CYI',1208),(5223,'Hsinchu City','HSZ',1208),(5224,'Tainan City','TNN',1208),(9000,'North West','NW',1196),(9986,'Tyne and Wear','TWR',1226),(9988,'Greater Manchester','GTM',1226),(9989,'Co Tyrone','TYR',1226),(9990,'West Yorkshire','WYK',1226),(9991,'South Yorkshire','SYK',1226),(9992,'Merseyside','MSY',1226),(9993,'Berkshire','BRK',1226),(9994,'West Midlands','WMD',1226),(9998,'West Glamorgan','WGM',1226),(9999,'London','LON',1226),(10000,'Carbonia-Iglesias','CI',1107),(10001,'Olbia-Tempio','OT',1107),(10002,'Medio Campidano','VS',1107),(10003,'Ogliastra','OG',1107),(10009,'Jura','39',1076),(10010,'Barletta-Andria-Trani','Bar',1107),(10011,'Fermo','Fer',1107),(10012,'Monza e Brianza','Mon',1107),(10013,'Clwyd','CWD',1226),(10015,'South Glamorgan','SGM',1226),(10016,'Artibonite','AR',1094),(10017,'Centre','CE',1094),(10018,'Nippes','NI',1094),(10019,'Nord','ND',1094),(10020,'La Rioja','F',1010),(10021,'Andorra la Vella','07',1005),(10022,'Canillo','02',1005),(10023,'Encamp','03',1005),(10024,'Escaldes-Engordany','08',1005),(10025,'La Massana','04',1005),(10026,'Ordino','05',1005),(10027,'Sant Julia de Loria','06',1005),(10028,'Abaco Islands','AB',1212),(10029,'Andros Island','AN',1212),(10030,'Berry Islands','BR',1212),(10031,'Eleuthera','EL',1212),(10032,'Grand Bahama','GB',1212),(10033,'Rum Cay','RC',1212),(10034,'San Salvador Island','SS',1212),(10035,'Kongo central','01',1050),(10036,'Kwango','02',1050),(10037,'Kwilu','03',1050),(10038,'Mai-Ndombe','04',1050),(10039,'Kasai','05',1050),(10040,'Lulua','06',1050),(10041,'Lomami','07',1050),(10042,'Sankuru','08',1050),(10043,'Ituri','09',1050),(10044,'Haut-Uele','10',1050),(10045,'Tshopo','11',1050),(10046,'Bas-Uele','12',1050),(10047,'Nord-Ubangi','13',1050),(10048,'Mongala','14',1050),(10049,'Sud-Ubangi','15',1050),(10050,'Tshuapa','16',1050),(10051,'Haut-Lomami','17',1050),(10052,'Lualaba','18',1050),(10053,'Haut-Katanga','19',1050),(10054,'Tanganyika','20',1050),(10055,'Toledo','TO',1198),(10056,'Córdoba','CO',1198),(10057,'Metropolitan Manila','MNL',1170),(10058,'La Paz','LP',1097),(10059,'Yinchuan','YN',1045),(10060,'Shizuishan','SZ',1045),(10061,'Wuzhong','WZ',1045),(10062,'Guyuan','GY',1045),(10063,'Zhongwei','ZW',1045),(10064,'Luxembourg','L',1126),(10065,'Aizkraukles novads','002',1119),(10066,'Jaunjelgavas novads','038',1119),(10067,'Pļaviņu novads','072',1119),(10068,'Kokneses novads','046',1119),(10069,'Neretas novads','065',1119),(10070,'Skrīveru novads','092',1119),(10071,'Alūksnes novads','007',1119),(10072,'Apes novads','009',1119),(10073,'Balvu novads','015',1119),(10074,'Viļakas novads','108',1119),(10075,'Baltinavas novads','014',1119),(10076,'Rugāju novads','082',1119),(10077,'Bauskas novads','016',1119),(10078,'Iecavas novads','034',1119),(10079,'Rundāles novads','083',1119),(10080,'Vecumnieku novads','105',1119),(10081,'Cēsu novads','022',1119),(10082,'Līgatnes novads','055',1119),(10083,'Amatas novads','008',1119),(10084,'Jaunpiebalgas novads','039',1119),(10085,'Priekuļu novads','075',1119),(10086,'Pārgaujas novads','070',1119),(10087,'Raunas novads','076',1119),(10088,'Vecpiebalgas novads','104',1119),(10089,'Daugavpils novads','025',1119),(10090,'Ilūkstes novads','036',1119),(10091,'Dobeles novads','026',1119),(10092,'Auces novads','010',1119),(10093,'Tērvetes novads','098',1119),(10094,'Gulbenes novads','033',1119),(10095,'Jelgavas novads','041',1119),(10096,'Ozolnieku novads','069',1119),(10097,'Jēkabpils novads','042',1119),(10098,'Aknīstes novads','004',1119),(10099,'Viesītes novads','107',1119),(10100,'Krustpils novads','049',1119),(10101,'Salas novads','085',1119),(10102,'Krāslavas novads','047',1119),(10103,'Dagdas novads','024',1119),(10104,'Aglonas novads','001',1119),(10105,'Kuldīgas novads','050',1119),(10106,'Skrundas novads','093',1119),(10107,'Alsungas novads','006',1119),(10108,'Aizputes novads','003',1119),(10109,'Durbes novads','028',1119),(10110,'Grobiņas novads','032',1119),(10111,'Pāvilostas novads','071',1119),(10112,'Priekules novads','074',1119),(10113,'Nīcas novads','066',1119),(10114,'Rucavas novads','081',1119),(10115,'Vaiņodes novads','100',1119),(10116,'Limbažu novads','054',1119),(10117,'Alojas novads','005',1119),(10118,'Salacgrīvas novads','086',1119),(10119,'Ludzas novads','058',1119),(10120,'Kārsavas novads','044',1119),(10121,'Zilupes novads','110',1119),(10122,'Ciblas novads','023',1119),(10123,'Madonas novads','059',1119),(10124,'Cesvaines novads','021',1119),(10125,'Lubānas novads','057',1119),(10126,'Varakļānu novads','102',1119),(10127,'Ērgļu novads','030',1119),(10128,'Ogres novads','067',1119),(10129,'Ikšķiles novads','035',1119),(10130,'Ķeguma novads','051',1119),(10131,'Lielvārdes novads','053',1119),(10132,'Preiļu novads','073',1119),(10133,'Līvānu novads','056',1119),(10134,'Riebiņu novads','078',1119),(10135,'Vārkavas novads','103',1119),(10136,'Rēzeknes novads','077',1119),(10137,'Viļānu novads','109',1119),(10138,'Baldones novads','013',1119),(10139,'Ķekavas novads','052',1119),(10140,'Olaines novads','068',1119),(10141,'Salaspils novads','087',1119),(10142,'Saulkrastu novads','089',1119),(10143,'Siguldas novads','091',1119),(10144,'Inčukalna novads','037',1119),(10145,'Ādažu novads','011',1119),(10146,'Babītes novads','012',1119),(10147,'Carnikavas novads','020',1119),(10148,'Garkalnes novads','031',1119),(10149,'Krimuldas novads','048',1119),(10150,'Mālpils novads','061',1119),(10151,'Mārupes novads','062',1119),(10152,'Ropažu novads','080',1119),(10153,'Sējas novads','090',1119),(10154,'Stopiņu novads','095',1119),(10155,'Saldus novads','088',1119),(10156,'Brocēnu novads','018',1119),(10157,'Talsu novads','097',1119),(10158,'Dundagas novads','027',1119),(10159,'Mērsraga novads','063',1119),(10160,'Rojas novads','079',1119),(10161,'Tukuma novads','099',1119),(10162,'Kandavas novads','043',1119),(10163,'Engures novads','029',1119),(10164,'Jaunpils novads','040',1119),(10165,'Valkas novads','101',1119),(10166,'Smiltenes novads','094',1119),(10167,'Strenču novads','096',1119),(10168,'Kocēnu novads','045',1119),(10169,'Mazsalacas novads','060',1119),(10170,'Rūjienas novads','084',1119),(10171,'Beverīnas novads','017',1119),(10172,'Burtnieku novads','019',1119),(10173,'Naukšēnu novads','064',1119),(10174,'Ventspils novads','106',1119),(10175,'Jēkabpils','JKB',1119),(10176,'Valmiera','VMR',1119),(10177,'Florida','FL',1229),(10178,'Rio Negro','RN',1229),(10179,'San Jose','SJ',1229),(10180,'Plateau','PL',1157),(10181,'Pieria','61',1085),(10182,'Los Rios','LR',1044),(10183,'Arica y Parinacota','AP',1044),(10184,'Amazonas','AMA',1169),(10185,'Kalimantan Tengah','KT',1102),(10186,'Sulawesi Barat','SR',1102),(10187,'Kalimantan Utara','KU',1102),(10188,'Ankaran','86',1193),(10189,'Apače','87',1193),(10190,'Cirkulane','88',1193),(10191,'Gorje','89',1193),(10192,'Kostanjevica na Krki','90',1193),(10193,'Log-Dragomer','91',1193),(10194,'Makole','92',1193),(10195,'Mirna','93',1193),(10196,'Mokronog-Trebelno','94',1193),(10197,'Odranci','95',1193),(10198,'Oplotnica','96',1193),(10199,'Ormož','97',1193),(10200,'Osilnica','98',1193),(10201,'Pesnica','99',1193),(10202,'Piran','100',1193),(10203,'Pivka','101',1193),(10204,'Podčetrtek','102',1193),(10205,'Podlehnik','103',1193),(10206,'Podvelka','104',1193),(10207,'Poljčane','105',1193),(10208,'Polzela','106',1193),(10209,'Postojna','107',1193),(10210,'Prebold','108',1193),(10211,'Preddvor','109',1193),(10212,'Prevalje','110',1193),(10213,'Ptuj','111',1193),(10214,'Puconci','112',1193),(10215,'Rače-Fram','113',1193),(10216,'Radeče','114',1193),(10217,'Radenci','115',1193),(10218,'Radlje ob Dravi','139',1193),(10219,'Radovljica','145',1193),(10220,'Ravne na Koroškem','171',1193),(10221,'Razkrižje','172',1193),(10222,'Rečica ob Savinji','173',1193),(10223,'Renče-Vogrsko','174',1193),(10224,'Ribnica','175',1193),(10225,'Ribnica na Pohorju','176',1193),(10226,'Rogaška Slatina','177',1193),(10227,'Rogašovci','178',1193),(10228,'Rogatec','179',1193),(10229,'Ruše','180',1193),(10230,'Selnica ob Dravi','195',1193),(10231,'Semič','196',1193),(10232,'Šentrupert','197',1193),(10233,'Sevnica','198',1193),(10234,'Sežana','199',1193),(10235,'Slovenj Gradec','200',1193),(10236,'Slovenska Bistrica','201',1193),(10237,'Slovenske Konjice','202',1193),(10238,'Šmarješke Toplice','203',1193),(10239,'Sodražica','204',1193),(10240,'Solčava','205',1193),(10241,'Središče ob Dravi','206',1193),(10242,'Starše','207',1193),(10243,'Straža','208',1193),(10244,'Sveta Trojica v Slovenskih goricah','209',1193),(10245,'Sveti Jurij v Slovenskih goricah','210',1193),(10246,'Sveti Tomaž','211',1193),(10247,'Vodice','212',1193),(10248,'Abkhazia','AB',1081),(10249,'Adjara','AJ',1081),(10250,'Tbilisi','TB',1081),(10251,'Guria','GU',1081),(10252,'Imereti','IM',1081),(10253,'Kakheti','KA',1081),(10254,'Kvemo Kartli','KK',1081),(10255,'Mtskheta-Mtianeti','MM',1081),(10256,'Racha-Lechkhumi and Kvemo Svaneti','RL',1081),(10257,'Samegrelo-Zemo Svaneti','SZ',1081),(10258,'Samtskhe-Javakheti','SJ',1081),(10259,'Shida Kartli','SK',1081),(10260,'Central','C',1074),(10261,'Punjab','PB',1163),(10262,'La Libertad','LI',1066),(10263,'La Paz','PA',1066),(10264,'La Union','UN',1066),(10265,'Littoral','LT',1038),(10266,'Nord-Ouest','NW',1038),(10267,'Telangana','TG',1101),(10268,'Ash Sharqiyah','04',1187),(10269,'Guadeloupe','GP',1076),(10270,'Martinique','MQ',1076),(10271,'Guyane','GF',1076),(10272,'La Réunion','RE',1076),(10273,'Mayotte','YT',1076),(10274,'Baringo','01',1112),(10275,'Bomet','02',1112),(10276,'Bungoma','03',1112),(10277,'Busia','04',1112),(10278,'Elgeyo/Marakwet','05',1112),(10279,'Embu','06',1112),(10280,'Garissa','07',1112),(10281,'Homa Bay','08',1112),(10282,'Isiolo','09',1112),(10283,'Kajiado','10',1112),(10284,'Kakamega','11',1112),(10285,'Kericho','12',1112),(10286,'Kiambu','13',1112),(10287,'Kilifi','14',1112),(10288,'Kirinyaga','15',1112),(10289,'Kisii','16',1112),(10290,'Kisumu','17',1112),(10291,'Kitui','18',1112),(10292,'Kwale','19',1112),(10293,'Laikipia','20',1112),(10294,'Lamu','21',1112),(10295,'Machakos','22',1112),(10296,'Makueni','23',1112),(10297,'Mandera','24',1112),(10298,'Marsabit','25',1112),(10299,'Meru','26',1112),(10300,'Migori','27',1112),(10301,'Mombasa','28',1112),(10302,'Murang\'a','29',1112),(10303,'Nairobi City','30',1112),(10304,'Nakuru','31',1112),(10305,'Nandi','32',1112),(10306,'Narok','33',1112),(10307,'Nyamira','34',1112),(10308,'Nyandarua','35',1112),(10309,'Nyeri','36',1112),(10310,'Samburu','37',1112),(10311,'Siaya','38',1112),(10312,'Taita/Taveta','39',1112),(10313,'Tana River','40',1112),(10314,'Tharaka-Nithi','41',1112),(10315,'Trans Nzoia','42',1112),(10316,'Turkana','43',1112),(10317,'Uasin Gishu','44',1112),(10318,'Vihiga','45',1112),(10319,'Wajir','46',1112),(10320,'West Pokot','47',1112),(10321,'Chandigarh','CH',1101),(10322,'Central','CP',1083),(10323,'Eastern','EP',1083),(10324,'Northern','NP',1083),(10325,'Western','WP',1083),(10326,'Saint Kitts','K',1181),(10327,'Nevis','N',1181),(10328,'Eastern','E',1190),(10329,'Northern','N',1190),(10330,'Southern','S',1190),(10331,'Dushanbe','DU',1209),(10332,'Nohiyahoi Tobei Jumhurí','RA',1209),(10333,'Wallis-et-Futuna','WF',1076),(10334,'Nouvelle-Calédonie','NC',1076),(10335,'Haute-Marne','52',1076),(10336,'Saint George','03',1009),(10337,'Saint John','04',1009),(10338,'Saint Mary','05',1009),(10339,'Saint Paul','06',1009),(10340,'Saint Peter','07',1009),(10341,'Saint Philip','08',1009),(10342,'Barbuda','10',1009),(10343,'Redonda','11',1009),(10344,'Christ Church','01',1018),(10345,'Saint Andrew','02',1018),(10346,'Saint George','03',1018),(10347,'Saint James','04',1018),(10348,'Saint John','05',1018),(10349,'Saint Joseph','06',1018),(10350,'Saint Lucy','07',1018),(10351,'Saint Michael','08',1018),(10352,'Saint Peter','09',1018),(10353,'Saint Philip','10',1018),(10354,'Saint Thomas','11',1018),(10355,'Estuaire','01',1080),(10356,'Haut-Ogooué','02',1080),(10357,'Moyen-Ogooué','03',1080),(10358,'Ngounié','04',1080),(10359,'Nyanga','05',1080),(10360,'Ogooué-Ivindo','06',1080),(10361,'Ogooué-Lolo','07',1080),(10362,'Ogooué-Maritime','08',1080),(10363,'Woleu-Ntem','09',1080),(10364,'Monmouthshire','MON',1226),(10365,'Antrim and Newtownabbey','ANN',1226),(10366,'Ards and North Down','AND',1226),(10367,'Armagh City, Banbridge and Craigavon','ABC',1226),(10368,'Belfast','BFS',1226),(10369,'Causeway Coast and Glens','CCG',1226),(10370,'Derry City and Strabane','DRS',1226),(10371,'Fermanagh and Omagh','FMO',1226),(10372,'Lisburn and Castlereagh','LBC',1226),(10373,'Mid and East Antrim','MEA',1226),(10374,'Mid Ulster','MUL',1226),(10375,'Newry, Mourne and Down','NMD',1226),(10376,'Bridgend','BGE',1226),(10377,'Caerphilly','CAY',1226),(10378,'Cardiff','CRF',1226),(10379,'Carmarthenshire','CRF',1226),(10380,'Ceredigion','CGN',1226),(10381,'Conwy','CWY',1226),(10382,'Denbighshire','DEN',1226),(10383,'Flintshire','FLN',1226),(10384,'Isle of Anglesey','AGY',1226),(10385,'Merthyr Tydfil','MTY',1226),(10386,'Neath Port Talbot','NTL',1226),(10387,'Newport','NWP',1226),(10388,'Pembrokeshire','PEM',1226),(10389,'Rhondda, Cynon, Taff','RCT',1226),(10390,'Swansea','SWA',1226),(10391,'Torfaen','TOF',1226),(10392,'Wrexham','WRX',1226);
 /*!40000 ALTER TABLE `civicrm_state_province` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index 614c34c071c8..a11b5472757c 100644
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -1216,7 +1216,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (2597, 1226, "AGB", "Argyll and Bute"),
 (2598, 1226, "ARM", "Co Armagh"),
 (2606, 1226, "BDF", "Bedfordshire"),
-(2612, 1226, "BGW", "Gwent"),
+(2612, 1226, "BGW", "Blaenau Gwent"),
 (2620, 1226, "BST", "Bristol, City of"),
 (2622, 1226, "BKM", "Buckinghamshire"),
 (2626, 1226, "CAM", "Cambridgeshire"),
@@ -1285,7 +1285,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (2786, 1226, "STG", "Stirling"),
 (2791, 1226, "SFK", "Suffolk"),
 (2793, 1226, "SRY", "Surrey"),
-(2804, 1226, "VGL", "Mid Glamorgan"),
+(2804, 1226, "VGL", "Vale of Glamorgan, The"),
 (2811, 1226, "WAR", "Warwickshire"),
 (2813, 1226, "WDU", "West Dunbartonshire"),
 (2814, 1226, "WLN", "West Lothian"),
@@ -3689,7 +3689,6 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 
 -- new UK provinces (CRM-5224)
 (10013, 1226, "CWD", "Clwyd"),
-(10014, 1226, "DFD", "Dyfed"),
 (10015, 1226, "SGM", "South Glamorgan"),
 
 -- Haiti (CRM-5628)
@@ -4108,4 +4107,35 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (NULL, 1080, "09", "Woleu-Ntem"),
 
 -- dev/Core#131 Missing UK State
-(NULL, 1226, "MON", "Monmouthshire");
+(NULL, 1226, "MON", "Monmouthshire"),
+
+-- dev/core#2027 Missing subdivisions for Northern Ireland and Wales
+(NULL, 1226, "ANN", "Antrim and Newtownabbey"),
+(NULL, 1226, "AND", "Ards and North Down"),
+(NULL, 1226, "ABC", "Armagh City, Banbridge and Craigavon"),
+(NULL, 1226, "BFS", "Belfast"),
+(NULL, 1226, "CCG", "Causeway Coast and Glens"),
+(NULL, 1226, "DRS", "Derry City and Strabane"),
+(NULL, 1226, "FMO", "Fermanagh and Omagh"),
+(NULL, 1226, "LBC", "Lisburn and Castlereagh"),
+(NULL, 1226, "MEA", "Mid and East Antrim"),
+(NULL, 1226, "MUL", "Mid Ulster"),
+(NULL, 1226, "NMD", "Newry, Mourne and Down"),
+
+(NULL, 1226, "BGE", "Bridgend"),
+(NULL, 1226, "CAY", "Caerphilly"),
+(NULL, 1226, "CRF", "Cardiff"),
+(NULL, 1226, "CRF", "Carmarthenshire"),
+(NULL, 1226, "CGN", "Ceredigion"),
+(NULL, 1226, "CWY", "Conwy"),
+(NULL, 1226, "DEN", "Denbighshire"),
+(NULL, 1226, "FLN", "Flintshire"),
+(NULL, 1226, "AGY", "Isle of Anglesey"),
+(NULL, 1226, "MTY", "Merthyr Tydfil"),
+(NULL, 1226, "NTL", "Neath Port Talbot"),
+(NULL, 1226, "NWP", "Newport"),
+(NULL, 1226, "PEM", "Pembrokeshire"),
+(NULL, 1226, "RCT", "Rhondda, Cynon, Taff"),
+(NULL, 1226, "SWA", "Swansea"),
+(NULL, 1226, "TOF", "Torfaen"),
+(NULL, 1226, "WRX", "Wrexham");

From 9ce8301b5cd55b119d69b41920dc434d1096cfc3 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 14:44:40 +1200
Subject: [PATCH 644/834] dev/core#2043 remove pass-by-ref

Also shortening of if clause
---
 CRM/Core/BAO/Block.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 0689b0a495bd..4014dbb17d8b 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -131,20 +131,15 @@ public static function dataExists($blockFields, &$params) {
    * Check if the current block exits.
    *
    * @param string $blockName
-   *   Bloack name.
+   *   Block name.
    * @param array $params
-   *   Associated array of submitted fields.
+   *   Array of submitted fields.
    *
    * @return bool
-   *   true if the block exits, otherwise false
+   *   true if the block is in the params and is an array
    */
-  public static function blockExists($blockName, &$params) {
-    // return if no data present
-    if (empty($params[$blockName]) || !is_array($params[$blockName])) {
-      return FALSE;
-    }
-
-    return TRUE;
+  public static function blockExists($blockName, $params) {
+    return !empty($params[$blockName]) && is_array($params[$blockName]);
   }
 
   /**

From 9d89b14d9daeb7ab2a1b8df02434bc74cfec5938 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 16 Sep 2020 10:57:26 -0400
Subject: [PATCH 645/834] Ensure DAO base class contains functions to be
 removed from generated DAO files.

The functions fieldKeys(), getLog(), and getTableName() are redundant in the generated DAO files,
we don't need 50 copies of each function.

This preliminary commit ensures they are present in the parent class, and in the future we can
regenerate the DAOs without them.
---
 CRM/Core/DAO.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index ee3cfaeebb6d..f29b13cca901 100644
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -147,10 +147,21 @@ public function __destruct() {
   }
 
   /**
-   * Empty definition for virtual function.
+   * Returns the name of this table
+   *
+   * @return string
    */
   public static function getTableName() {
-    return NULL;
+    return self::getLocaleTableName(static::$_tableName ?? NULL);
+  }
+
+  /**
+   * Returns if this table needs to be logged
+   *
+   * @return bool
+   */
+  public function getLog() {
+    return static::$_log ?? FALSE;
   }
 
   /**
@@ -2727,11 +2738,11 @@ public static function buildOptionsContext($context = NULL) {
    */
   public function getFieldSpec($fieldName) {
     $fields = $this->fields();
-    $fieldKeys = $this->fieldKeys();
 
     // Support "unique names" as well as sql names
     $fieldKey = $fieldName;
     if (empty($fields[$fieldKey])) {
+      $fieldKeys = $this->fieldKeys();
       $fieldKey = $fieldKeys[$fieldName] ?? NULL;
     }
     // If neither worked then this field doesn't exist. Return false.
@@ -3130,4 +3141,14 @@ private function clearDbColumnValueCache() {
     }
   }
 
+  /**
+   * Return a mapping from field-name to the corresponding key (as used in fields()).
+   *
+   * @return array
+   *   Array(string $name => string $uniqueName).
+   */
+  public static function fieldKeys() {
+    return array_flip(CRM_Utils_Array::collect('name', static::fields()));
+  }
+
 }

From 4354c90715d2e8a6694c4243640be315a0f50125 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 08:36:34 +1200
Subject: [PATCH 646/834] [NFC] Test cleanup to stop calling Email::add action
 which does not handle primary

Note I feel like we should further
1) move the contents of email add into create
2) make add a deprecated wrapper for create

Whatever the vision of different add vs create functions it didn't turn out in practice and seems to
only generate confusion. We recommend apiv4 as the preferred create methodology
---
 tests/phpunit/CRM/Contact/BAO/ContactTest.php |  2 +-
 tests/phpunit/CRM/Core/DAOTest.php            | 32 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
index 8c6e925b064a..3b4af8c9a317 100644
--- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
@@ -1412,7 +1412,7 @@ public function testTimestampsEmail() {
           'location_type_id' => 1,
           'contact_id' => $contactId,
         ];
-        CRM_Core_BAO_Email::add($params);
+        $this->callAPISuccess('Email', 'create', $params);
         $test->assertDBQuery('ex-1@example.com',
           'SELECT email FROM civicrm_email WHERE contact_id = %1 ORDER BY id DESC LIMIT 1',
           [1 => [$contactId, 'Integer']]
diff --git a/tests/phpunit/CRM/Core/DAOTest.php b/tests/phpunit/CRM/Core/DAOTest.php
index 0523aab7d51e..29ad92515cd0 100644
--- a/tests/phpunit/CRM/Core/DAOTest.php
+++ b/tests/phpunit/CRM/Core/DAOTest.php
@@ -19,7 +19,7 @@ public function testGetReferenceColumns() {
     $contactRef = $refsByTarget['civicrm_contact'];
     $this->assertEquals('contact_id', $contactRef->getReferenceKey());
     $this->assertEquals('id', $contactRef->getTargetKey());
-    $this->assertEquals('CRM_Core_Reference_Basic', get_class($contactRef));
+    $this->assertInstanceOf(\CRM_Core_Reference_Basic::class, $contactRef);
   }
 
   public function testGetReferencesToTable() {
@@ -43,18 +43,19 @@ public function testFindReferences() {
       'contact_type' => 'Individual',
     ];
 
-    $contact = CRM_Contact_BAO_Contact::add($params);
-    $this->assertNotNull($contact->id);
+    $contactID = $this->callAPISuccess('Contact', 'create', $params)['id'];
 
     $params = [
       'email' => 'spam@dev.null',
-      'contact_id' => $contact->id,
+      'contact_id' => $contactID,
       'is_primary' => 0,
       'location_type_id' => 1,
     ];
 
-    $email = CRM_Core_BAO_Email::add($params);
+    $this->callAPISuccess('Email', 'create', $params);
 
+    $contact = new CRM_Contact_BAO_Contact();
+    $contact->id = $contactID;
     $refs = $contact->findReferences();
     $refsByTable = [];
     foreach ($refs as $refObj) {
@@ -64,7 +65,7 @@ public function testFindReferences() {
     $this->assertTrue(array_key_exists('civicrm_email', $refsByTable));
     $refDao = $refsByTable['civicrm_email'];
     $refDao->find(TRUE);
-    $this->assertEquals($contact->id, $refDao->contact_id);
+    $this->assertEquals($contactID, $refDao->contact_id);
   }
 
   /**
@@ -164,7 +165,6 @@ public function composeQueryExamples() {
    * @param $expectSql
    */
   public function testComposeQuery($inputSql, $inputParams, $expectSql) {
-    $scope = CRM_Core_TemporaryErrorScope::useException();
     try {
       $actualSql = CRM_Core_DAO::composeQuery($inputSql, $inputParams);
     }
@@ -244,14 +244,15 @@ public function testShortenSQLName($inputData, $length, $makeRandom, $expectedRe
 
   public function testFindById() {
     $params = $this->sampleContact('Individual', 4);
-    $existing_contact = CRM_Contact_BAO_Contact::add($params);
-    $contact = CRM_Contact_BAO_Contact::findById($existing_contact->id);
-    $this->assertEquals($existing_contact->id, $contact->id);
-    $deleted_contact_id = $existing_contact->id;
+    $existing_contact = $this->callAPISuccess('Contact', 'create', $params);
+    /* @var CRM_Contact_DAO_Contact $contact */
+    $contact = CRM_Contact_BAO_Contact::findById($existing_contact['id']);
+    $this->assertEquals($existing_contact['id'], $contact->id);
+    $deleted_contact_id = $existing_contact['id'];
     $this->contactDelete($contact->id);
     $exception_thrown = FALSE;
     try {
-      $deleted_contact = CRM_Contact_BAO_Contact::findById($deleted_contact_id);
+      CRM_Contact_BAO_Contact::findById($deleted_contact_id);
     }
     catch (Exception $e) {
       $exception_thrown = TRUE;
@@ -317,8 +318,8 @@ public function testDAOtoArray() {
       'contact_type' => 'Individual',
     ];
 
-    $dao = CRM_Contact_BAO_Contact::add($params);
-    $query = "SELECT contact_type, display_name FROM civicrm_contact WHERE id={$dao->id}";
+    $contact = $this->callAPISuccess('Contact', 'create', $params);
+    $query = "SELECT contact_type, display_name FROM civicrm_contact WHERE id={$contact['id']}";
     $toArray = [
       'contact_type' => 'Individual',
       'display_name' => 'Testy McScallion',
@@ -387,6 +388,7 @@ public function testSqlModePresent() {
 
   /**
    * @return array
+   * @throws \ReflectionException
    */
   public function serializationMethods() {
     $constants = [];
@@ -405,7 +407,7 @@ public function serializationMethods() {
     ];
     $daoInfo = new ReflectionClass('CRM_Core_DAO');
     foreach ($daoInfo->getConstants() as $constant => $val) {
-      if ($constant == 'SERIALIZE_JSON' || $constant == 'SERIALIZE_PHP') {
+      if ($constant === 'SERIALIZE_JSON' || $constant === 'SERIALIZE_PHP') {
         $constants[] = [$val, array_merge($simpleData, $complexData)];
       }
       elseif (strpos($constant, 'SERIALIZE_') === 0) {

From ec47f7b4bd016411762668825fb71ec04e9ebec2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 08:51:17 +1200
Subject: [PATCH 647/834] dev/core#2046 Rationalise add vs create on email BAO

This folds the 2 functions into one, deprecating add
---
 CRM/Core/BAO/Email.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index 0dd1bca05a49..5854cdb67985 100644
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -36,21 +36,6 @@ public static function create($params) {
       CRM_Core_BAO_Block::handlePrimary($params, get_class());
     }
 
-    $email = CRM_Core_BAO_Email::add($params);
-
-    return $email;
-  }
-
-  /**
-   * Takes an associative array and adds email.
-   *
-   * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
-   *
-   * @return object
-   *   CRM_Core_BAO_Email object on success, null otherwise
-   */
-  public static function add(&$params) {
     $hook = empty($params['id']) ? 'create' : 'edit';
     CRM_Utils_Hook::pre($hook, 'Email', CRM_Utils_Array::value('id', $params), $params);
 
@@ -98,6 +83,20 @@ public static function add(&$params) {
     return $email;
   }
 
+  /**
+   * Takes an associative array and adds email.
+   *
+   * @param array $params
+   *   (reference ) an assoc array of name/value pairs.
+   *
+   * @return object
+   *   CRM_Core_BAO_Email object on success, null otherwise
+   */
+  public static function add(&$params) {
+    CRM_Core_Error::deprecatedFunctionWarning('apiv4 create');
+    return self::create($params);
+  }
+
   /**
    * Given the list of params in the params array, fetch the object
    * and store the values in the values array

From 82fd72da7572e3e5c7c6683402adbf7003ac4d55 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 11:54:48 +1200
Subject: [PATCH 648/834] [NFC] Minor cleanup in tests

---
 tests/phpunit/api/v3/ACLPermissionTest.php | 118 ++++++++++++++++++---
 1 file changed, 105 insertions(+), 13 deletions(-)

diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index 58626c2767f6..36b2a8aea757 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -30,9 +30,8 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase {
 
   public function setUp() {
     parent::setUp();
-    $baoObj = new CRM_Core_DAO();
-    $baoObj->createTestObject('CRM_Pledge_BAO_Pledge', [], 1, 0);
-    $baoObj->createTestObject('CRM_Core_BAO_Phone', [], 1, 0);
+    CRM_Core_DAO::createTestObject('CRM_Pledge_BAO_Pledge', [], 1, 0);
+    CRM_Core_DAO::createTestObject('CRM_Core_BAO_Phone', [], 1, 0);
     $this->prepareForACLs();
   }
 
@@ -65,8 +64,11 @@ public function tearDown() {
 
   /**
    * Function tests that an empty where hook returns no results.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetNoResultsHook($version) {
     $this->_apiversion = $version;
@@ -85,8 +87,11 @@ public function testContactGetNoResultsHook($version) {
    * Function tests that an empty where hook returns exactly 1 result with "view my contact".
    *
    * CRM-16512 caused contacts with Edit my contact to be able to view all records.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetOneResultHookWithViewMyContact($version) {
     $this->_apiversion = $version;
@@ -108,8 +113,11 @@ public function testContactGetOneResultHookWithViewMyContact($version) {
 
   /**
    * Function tests that a user with "edit my contact" can edit themselves.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactEditHookWithEditMyContact($version) {
     $this->_apiversion = $version;
@@ -131,8 +139,11 @@ public function testContactEditHookWithEditMyContact($version) {
 
   /**
    * Ensure contact permissions do not block contact-less location entities.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testAddressWithoutContactIDAccess($version) {
     $this->_apiversion = $version;
@@ -165,7 +176,11 @@ public function testAddressWithoutContactIDAccess($version) {
 
   /**
    * Ensure contact permissions extend to related entities like email
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    * FIXME: Finish api4 part
    */
@@ -252,8 +267,11 @@ public function testRelatedEntityPermissions($version) {
 
   /**
    * Function tests all results are returned.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetAllResultsHook($version) {
     $this->_apiversion = $version;
@@ -271,8 +289,11 @@ public function testContactGetAllResultsHook($version) {
 
   /**
    * Function tests that deleted contacts are not returned.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetPermissionHookNoDeleted($version) {
     $this->_apiversion = $version;
@@ -290,8 +311,11 @@ public function testContactGetPermissionHookNoDeleted($version) {
 
   /**
    * Test permissions limited by hook.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetHookLimitingHook($version) {
     $this->_apiversion = $version;
@@ -309,8 +333,11 @@ public function testContactGetHookLimitingHook($version) {
 
   /**
    * Confirm that without check permissions we still get 2 contacts returned.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetHookLimitingHookDontCheck($version) {
     $this->_apiversion = $version;
@@ -422,8 +449,11 @@ public function testContactGetPledgeIDNotFiltered() {
 
   /**
    * Check that chaining doesn't bypass permissions
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetPledgeNotChainable($version) {
     $this->_apiversion = $version;
@@ -461,7 +491,10 @@ public function setupCoreACL() {
   /**
    * @dataProvider entities
    * confirm that without check permissions we still get 2 contacts returned
-   * @param $entity
+   *
+   * @param string $entity
+   *
+   * @throws \CRM_Core_Exception
    */
   public function testEntitiesGetHookLimitingHookNoCheck($entity) {
     CRM_Core_Config::singleton()->userPermissionClass->permissions = [];
@@ -500,8 +533,11 @@ public function testEntitiesGetCoreACLLimitingHookNoCheck($entity) {
   /**
    * @dataProvider entities
    * confirm that with check permissions we don't get entities
+   *
    * @param $entity
+   *
    * @throws \PHPUnit\Framework\IncompleteTestError
+   * @throws \CRM_Core_Exception
    */
   public function testEntitiesGetCoreACLLimitingCheck($entity) {
     $this->setupCoreACL();
@@ -516,8 +552,11 @@ public function testEntitiesGetCoreACLLimitingCheck($entity) {
   /**
    * @dataProvider entities
    * Function tests that an empty where hook returns no results
+   *
    * @param string $entity
+   *
    * @throws \PHPUnit\Framework\IncompleteTestError
+   * @throws \CRM_Core_Exception
    */
   public function testEntityGetNoResultsHook($entity) {
     $this->markTestIncomplete('hook acls only work with contacts so far');
@@ -545,12 +584,12 @@ public static function entities() {
   }
 
   /**
-   * Create 2 entities
-   * @param $entity
+   * Create 2 entities.
+   *
+   * @param string $entity
    */
   public function setUpEntities($entity) {
-    $baoObj = new CRM_Core_DAO();
-    $baoObj->createTestObject(_civicrm_api3_get_BAO($entity), [], 2, 0);
+    CRM_Core_DAO::createTestObject(_civicrm_api3_get_BAO($entity), [], 2, 0);
     CRM_Core_Config::singleton()->userPermissionClass->permissions = [
       'access CiviCRM',
       'access CiviContribute',
@@ -560,20 +599,27 @@ public function setUpEntities($entity) {
   }
 
   /**
-   * Basic check that an unpermissioned call keeps working and permissioned call fails.
+   * Basic check that an un-permissioned call keeps working and permissioned call fails.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testGetActivityNoPermissions($version) {
     $this->_apiversion = $version;
     $this->setPermissions([]);
-    $this->callAPISuccess('Activity', 'get', []);
+    $this->callAPISuccess('Activity', 'get');
     $this->callAPIFailure('Activity', 'get', ['check_permissions' => 1]);
   }
 
   /**
    * View all activities is enough regardless of contact ACLs.
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityViewAllActivitiesDoesntCutItAnymore($version) {
@@ -588,8 +634,11 @@ public function testGetActivityViewAllActivitiesDoesntCutItAnymore($version) {
 
   /**
    * View all activities is required unless id is passed in.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testGetActivityViewAllContactsEnoughWithoutID($version) {
     $this->_apiversion = $version;
@@ -599,7 +648,11 @@ public function testGetActivityViewAllContactsEnoughWithoutID($version) {
 
   /**
    * Without view all activities contact level acls are used.
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityViewAllContactsEnoughWIthID($version) {
@@ -614,7 +667,11 @@ public function testGetActivityViewAllContactsEnoughWIthID($version) {
 
   /**
    * Check the error message is not a permission error.
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityAccessCiviCRMEnough($version) {
@@ -639,7 +696,11 @@ public function testGetActivityAccessCiviCRMEnough($version) {
    *
    * (logically the same component limit should apply when they have access to view all too but....
    * adding test for 'how it is at the moment.)
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityCheckPermissionsByComponent($version) {
@@ -664,7 +725,11 @@ public function testGetActivityCheckPermissionsByComponent($version) {
 
   /**
    * Check that component related activity filtering works for CiviCase.
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityCheckPermissionsByCaseComponent($version) {
@@ -696,7 +761,11 @@ public function testGetActivityCheckPermissionsByCaseComponent($version) {
    *
    * The activities api applies ACLs in a very limited circumstance, if id is passed in.
    * Otherwise it sticks with the blunt original permissions.
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityByACL($version) {
@@ -754,7 +823,7 @@ public function testGetActivityByAclCannotViewAllContacts() {
         }
         else {
           $this->assertEquals([$contact_id], (array) $result[$roleKey]);
-          $this->assertTrue(!empty($result[$roleName . '_name']));
+          $this->assertNotEmpty($result[$roleName . '_name']);
         }
       }
     }
@@ -762,7 +831,11 @@ public function testGetActivityByAclCannotViewAllContacts() {
 
   /**
    * To leverage ACL permission to view an activity you must be able to see any of the contacts.
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testGetActivityByAclCannotViewAnyContacts($version) {
@@ -784,9 +857,11 @@ public function testGetActivityByAclCannotViewAnyContacts($version) {
    *
    * CRM-18409.
    *
-   * @throws \CRM_Core_Exception
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CiviCRM_API3_Exception
+   * @throws \CRM_Core_Exception
    */
   public function testGetActivityACLSourceContactDeleted($version) {
     $this->_apiversion = $version;
@@ -807,8 +882,13 @@ public function testGetActivityACLSourceContactDeleted($version) {
 
   /**
    * Test get activities multiple ids with check permissions
+   *
    * @see https://issues.civicrm.org/jira/browse/CRM-20441
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testActivitiesGetMultipleIdsCheckPermissions($version) {
@@ -833,8 +913,13 @@ public function testActivitiesGetMultipleIdsCheckPermissions($version) {
   /**
    * Test get activities multiple ids with check permissions
    * Limit access to One contact
+   *
    * @see https://issues.civicrm.org/jira/browse/CRM-20441
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testActivitiesGetMultipleIdsCheckPermissionsLimitedACL($version) {
@@ -869,8 +954,13 @@ public function testActivitiesGetMultipleIdsCheckPermissionsLimitedACL($version)
 
   /**
    * Test get activities multiple ids with check permissions
+   *
    * @see https://issues.civicrm.org/jira/browse/CRM-20441
+   *
    * @param int $version
+   *
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    * @dataProvider versionThreeAndFour
    */
   public function testActivitiesGetMultipleIdsCheckPermissionsNotIN($version) {
@@ -975,7 +1065,9 @@ public function testGetACLEveryonePermittedEntity() {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testContactGetViaJoin($version) {
     $this->_apiversion = $version;
@@ -986,7 +1078,7 @@ public function testContactGetViaJoin($version) {
     $tag2 = $this->tagCreate(['name' => uniqid('other'), 'created_id' => $other])['id'];
     $this->setPermissions(['access CiviCRM']);
     $this->hookClass->setHook('civicrm_aclWhereClause', [$this, 'aclWhereHookAllResults']);
-    $createdFirstName = $version == 4 ? 'created.first_name' : 'created_id.first_name';
+    $createdFirstName = $version === 4 ? 'created.first_name' : 'created_id.first_name';
     $result = $this->callAPISuccess('Tag', 'get', [
       'check_permissions' => 1,
       'return' => ['id', $createdFirstName],

From ea9d3b6740806bdaa6f45d2d70d78b4c2a3fc867 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 12:28:52 +1200
Subject: [PATCH 649/834] [NFC] Code cleanup in test class

---
 tests/phpunit/api/v3/OpenIDTest.php | 55 +++++++++++++++++------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/tests/phpunit/api/v3/OpenIDTest.php b/tests/phpunit/api/v3/OpenIDTest.php
index 729b948f3e71..a3025e805bcc 100644
--- a/tests/phpunit/api/v3/OpenIDTest.php
+++ b/tests/phpunit/api/v3/OpenIDTest.php
@@ -18,7 +18,6 @@
  */
 class api_v3_OpenIDTest extends CiviUnitTestCase {
 
-  protected $_apiversion = 3;
   protected $_params;
   protected $id;
   protected $_entity;
@@ -27,27 +26,29 @@ class api_v3_OpenIDTest extends CiviUnitTestCase {
 
   public function setUp() {
     parent::setUp();
-    $this->useTransaction(TRUE);
+    $this->useTransaction();
 
     $this->_entity = 'OpenID';
-    $this->_contactID = $this->organizationCreate();
     $this->_params = [
-      'contact_id' => $this->_contactID,
+      'contact_id' => $this->organizationCreate(),
       'openid' => 'My OpenID handle',
       'location_type_id' => 1,
+      'sequential' => 1,
     ];
   }
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreateOpenID($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->_params, __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
-    $this->getAndCheck($this->_params, $result['id'], $this->_entity);
-    $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
+    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->_params, __FUNCTION__, __FILE__)['values'];
+    $this->assertCount(1, $result);
+    unset($this->_params['sequential']);
+    $this->getAndCheck($this->_params, $result[0]['id'], $this->_entity);
   }
 
   /**
@@ -55,54 +56,62 @@ public function testCreateOpenID($version) {
    * the LocationType default
    *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreateOpenIDDefaultLocation($version) {
     $this->_apiversion = $version;
     $params = $this->_params;
     unset($params['location_type_id']);
-    $result = $this->callAPIAndDocument($this->_entity, 'create', $params, __FUNCTION__, __FILE__);
-    $this->assertEquals(CRM_Core_BAO_LocationType::getDefault()->id, $result['values'][$result['id']]['location_type_id']);
-    $this->callAPISuccess($this->_entity, 'delete', ['id' => $result['id']]);
+    $result = $this->callAPIAndDocument($this->_entity, 'create', $params, __FUNCTION__, __FILE__)['values'];
+    $this->assertEquals(CRM_Core_BAO_LocationType::getDefault()->id, $result[0]['location_type_id']);
+    $this->callAPISuccess($this->_entity, 'delete', ['id' => $result[0]['id']]);
   }
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testGetOpenID($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
-    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->_params, __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
-    $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
-    $this->callAPISuccess($this->_entity, 'delete', ['id' => $result['id']]);
+    $this->callAPISuccess($this->_entity, 'create', $this->_params);
+    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->_params, __FUNCTION__, __FILE__)['values'];
+    $this->assertCount(1, $result);
+    $this->assertNotNull($result[0]['id']);
+    $this->callAPISuccess($this->_entity, 'delete', ['id' => $result[0]['id']]);
   }
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testDeleteOpenID($version) {
     $this->_apiversion = $version;
     $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
     $deleteParams = ['id' => $result['id']];
-    $result = $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
-    $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
-    $this->assertEquals(0, $checkDeleted['count'], 'In line ' . __LINE__);
+    $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
+    $checkDeleted = $this->callAPISuccess($this->_entity, 'get');
+    $this->assertEquals(0, $checkDeleted['count']);
   }
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testDeleteOpenIDInvalid($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
+    $this->callAPISuccess($this->_entity, 'create', $this->_params);
     $deleteParams = ['id' => 600];
-    $result = $this->callAPIFailure($this->_entity, 'delete', $deleteParams);
-    $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
-    $this->assertEquals(1, $checkDeleted['count'], 'In line ' . __LINE__);
+    $this->callAPIFailure($this->_entity, 'delete', $deleteParams);
+    $checkDeleted = $this->callAPISuccess($this->_entity, 'get');
+    $this->assertEquals(1, $checkDeleted['count']);
   }
 
 }

From f61fdd6aaba5e05fefd7bf384e23149f06138f85 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 21 Jul 2020 18:21:07 -0700
Subject: [PATCH 650/834] Import skeletal "greenwich"

---
 .gitignore                          |   2 +
 ext/greenwich/LICENSE.txt           | 667 ++++++++++++++++++++++++++++
 ext/greenwich/README.md             |  44 ++
 ext/greenwich/greenwich.civix.php   | 477 ++++++++++++++++++++
 ext/greenwich/greenwich.php         | 172 +++++++
 ext/greenwich/images/screenshot.png | Bin 0 -> 11775 bytes
 ext/greenwich/info.xml              |  29 ++
 7 files changed, 1391 insertions(+)
 create mode 100644 ext/greenwich/LICENSE.txt
 create mode 100644 ext/greenwich/README.md
 create mode 100644 ext/greenwich/greenwich.civix.php
 create mode 100644 ext/greenwich/greenwich.php
 create mode 100644 ext/greenwich/images/screenshot.png
 create mode 100644 ext/greenwich/info.xml

diff --git a/.gitignore b/.gitignore
index 0f5fcd13673b..09471dd838b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 !/ext/flexmailer
 !/ext/eventcart
 !/ext/ewaysingle
+!/ext/greenwich
+/ext/greenwich/extern
 !/ext/search
 !/ext/financialacls
 backdrop/
diff --git a/ext/greenwich/LICENSE.txt b/ext/greenwich/LICENSE.txt
new file mode 100644
index 000000000000..eb71841a860d
--- /dev/null
+++ b/ext/greenwich/LICENSE.txt
@@ -0,0 +1,667 @@
+Package: greenwich
+Copyright (C) 2020, Tim Otten <totten@civicrm.org>
+Licensed under the GNU Affero Public License 3.0 (below).
+
+-------------------------------------------------------------------------------
+
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/ext/greenwich/README.md b/ext/greenwich/README.md
new file mode 100644
index 000000000000..5e92b2e2d93f
--- /dev/null
+++ b/ext/greenwich/README.md
@@ -0,0 +1,44 @@
+# greenwich
+
+![Screenshot](/images/screenshot.png)
+
+(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+
+The extension is licensed under [AGPL-3.0](LICENSE.txt).
+
+## Requirements
+
+* PHP v7.0+
+* CiviCRM (*FIXME: Version number*)
+
+## Installation (Web UI)
+
+This extension has not yet been published for installation via the web UI.
+
+## Installation (CLI, Zip)
+
+Sysadmins and developers may download the `.zip` file for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+cd <extension-dir>
+cv dl greenwich@https://github.com/FIXME/greenwich/archive/master.zip
+```
+
+## Installation (CLI, Git)
+
+Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
+install it with the command-line tool [cv](https://github.com/civicrm/cv).
+
+```bash
+git clone https://github.com/FIXME/greenwich.git
+cv en greenwich
+```
+
+## Usage
+
+(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
+
+## Known Issues
+
+(* FIXME *)
diff --git a/ext/greenwich/greenwich.civix.php b/ext/greenwich/greenwich.civix.php
new file mode 100644
index 000000000000..45a6619d008c
--- /dev/null
+++ b/ext/greenwich/greenwich.civix.php
@@ -0,0 +1,477 @@
+<?php
+
+// AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
+
+/**
+ * The ExtensionUtil class provides small stubs for accessing resources of this
+ * extension.
+ */
+class CRM_Greenwich_ExtensionUtil {
+  const SHORT_NAME = "greenwich";
+  const LONG_NAME = "greenwich";
+  const CLASS_PREFIX = "CRM_Greenwich";
+
+  /**
+   * Translate a string using the extension's domain.
+   *
+   * If the extension doesn't have a specific translation
+   * for the string, fallback to the default translations.
+   *
+   * @param string $text
+   *   Canonical message text (generally en_US).
+   * @param array $params
+   * @return string
+   *   Translated text.
+   * @see ts
+   */
+  public static function ts($text, $params = []) {
+    if (!array_key_exists('domain', $params)) {
+      $params['domain'] = [self::LONG_NAME, NULL];
+    }
+    return ts($text, $params);
+  }
+
+  /**
+   * Get the URL of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo'.
+   *   Ex: 'http://example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function url($file = NULL) {
+    if ($file === NULL) {
+      return rtrim(CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME), '/');
+    }
+    return CRM_Core_Resources::singleton()->getUrl(self::LONG_NAME, $file);
+  }
+
+  /**
+   * Get the path of a resource file (in this extension).
+   *
+   * @param string|NULL $file
+   *   Ex: NULL.
+   *   Ex: 'css/foo.css'.
+   * @return string
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo'.
+   *   Ex: '/var/www/example.org/sites/default/ext/org.example.foo/css/foo.css'.
+   */
+  public static function path($file = NULL) {
+    // return CRM_Core_Resources::singleton()->getPath(self::LONG_NAME, $file);
+    return __DIR__ . ($file === NULL ? '' : (DIRECTORY_SEPARATOR . $file));
+  }
+
+  /**
+   * Get the name of a class within this extension.
+   *
+   * @param string $suffix
+   *   Ex: 'Page_HelloWorld' or 'Page\\HelloWorld'.
+   * @return string
+   *   Ex: 'CRM_Foo_Page_HelloWorld'.
+   */
+  public static function findClass($suffix) {
+    return self::CLASS_PREFIX . '_' . str_replace('\\', '_', $suffix);
+  }
+
+}
+
+use CRM_Greenwich_ExtensionUtil as E;
+
+/**
+ * (Delegated) Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config
+ */
+function _greenwich_civix_civicrm_config(&$config = NULL) {
+  static $configured = FALSE;
+  if ($configured) {
+    return;
+  }
+  $configured = TRUE;
+
+  $template =& CRM_Core_Smarty::singleton();
+
+  $extRoot = dirname(__FILE__) . DIRECTORY_SEPARATOR;
+  $extDir = $extRoot . 'templates';
+
+  if (is_array($template->template_dir)) {
+    array_unshift($template->template_dir, $extDir);
+  }
+  else {
+    $template->template_dir = [$extDir, $template->template_dir];
+  }
+
+  $include_path = $extRoot . PATH_SEPARATOR . get_include_path();
+  set_include_path($include_path);
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_xmlMenu().
+ *
+ * @param $files array(string)
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+ */
+function _greenwich_civix_civicrm_xmlMenu(&$files) {
+  foreach (_greenwich_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) {
+    $files[] = $file;
+  }
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function _greenwich_civix_civicrm_install() {
+  _greenwich_civix_civicrm_config();
+  if ($upgrader = _greenwich_civix_upgrader()) {
+    $upgrader->onInstall();
+  }
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+function _greenwich_civix_civicrm_postInstall() {
+  _greenwich_civix_civicrm_config();
+  if ($upgrader = _greenwich_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onPostInstall'])) {
+      $upgrader->onPostInstall();
+    }
+  }
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+function _greenwich_civix_civicrm_uninstall() {
+  _greenwich_civix_civicrm_config();
+  if ($upgrader = _greenwich_civix_upgrader()) {
+    $upgrader->onUninstall();
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function _greenwich_civix_civicrm_enable() {
+  _greenwich_civix_civicrm_config();
+  if ($upgrader = _greenwich_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onEnable'])) {
+      $upgrader->onEnable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_disable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ * @return mixed
+ */
+function _greenwich_civix_civicrm_disable() {
+  _greenwich_civix_civicrm_config();
+  if ($upgrader = _greenwich_civix_upgrader()) {
+    if (is_callable([$upgrader, 'onDisable'])) {
+      $upgrader->onDisable();
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_upgrade().
+ *
+ * @param $op string, the type of operation being performed; 'check' or 'enqueue'
+ * @param $queue CRM_Queue_Queue, (for 'enqueue') the modifiable list of pending up upgrade tasks
+ *
+ * @return mixed
+ *   based on op. for 'check', returns array(boolean) (TRUE if upgrades are pending)
+ *   for 'enqueue', returns void
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
+ */
+function _greenwich_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  if ($upgrader = _greenwich_civix_upgrader()) {
+    return $upgrader->onUpgrade($op, $queue);
+  }
+}
+
+/**
+ * @return CRM_Greenwich_Upgrader
+ */
+function _greenwich_civix_upgrader() {
+  if (!file_exists(__DIR__ . '/CRM/Greenwich/Upgrader.php')) {
+    return NULL;
+  }
+  else {
+    return CRM_Greenwich_Upgrader_Base::instance();
+  }
+}
+
+/**
+ * Search directory tree for files which match a glob pattern.
+ *
+ * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
+ * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ *
+ * @param string $dir base dir
+ * @param string $pattern , glob pattern, eg "*.txt"
+ *
+ * @return array
+ */
+function _greenwich_civix_find_files($dir, $pattern) {
+  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
+    return CRM_Utils_File::findFiles($dir, $pattern);
+  }
+
+  $todos = [$dir];
+  $result = [];
+  while (!empty($todos)) {
+    $subdir = array_shift($todos);
+    foreach (_greenwich_civix_glob("$subdir/$pattern") as $match) {
+      if (!is_dir($match)) {
+        $result[] = $match;
+      }
+    }
+    if ($dh = opendir($subdir)) {
+      while (FALSE !== ($entry = readdir($dh))) {
+        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
+        if ($entry[0] == '.') {
+        }
+        elseif (is_dir($path)) {
+          $todos[] = $path;
+        }
+      }
+      closedir($dh);
+    }
+  }
+  return $result;
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_managed().
+ *
+ * Find any *.mgd.php files, merge their content, and return.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
+ */
+function _greenwich_civix_civicrm_managed(&$entities) {
+  $mgdFiles = _greenwich_civix_find_files(__DIR__, '*.mgd.php');
+  sort($mgdFiles);
+  foreach ($mgdFiles as $file) {
+    $es = include $file;
+    foreach ($es as $e) {
+      if (empty($e['module'])) {
+        $e['module'] = E::LONG_NAME;
+      }
+      if (empty($e['params']['version'])) {
+        $e['params']['version'] = '3';
+      }
+      $entities[] = $e;
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_caseTypes().
+ *
+ * Find any and return any files matching "xml/case/*.xml"
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
+ */
+function _greenwich_civix_civicrm_caseTypes(&$caseTypes) {
+  if (!is_dir(__DIR__ . '/xml/case')) {
+    return;
+  }
+
+  foreach (_greenwich_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) {
+    $name = preg_replace('/\.xml$/', '', basename($file));
+    if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) {
+      $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name));
+      throw new CRM_Core_Exception($errorMessage);
+    }
+    $caseTypes[$name] = [
+      'module' => E::LONG_NAME,
+      'name' => $name,
+      'file' => $file,
+    ];
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_angularModules().
+ *
+ * Find any and return any files matching "ang/*.ang.php"
+ *
+ * Note: This hook only runs in CiviCRM 4.5+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+ */
+function _greenwich_civix_civicrm_angularModules(&$angularModules) {
+  if (!is_dir(__DIR__ . '/ang')) {
+    return;
+  }
+
+  $files = _greenwich_civix_glob(__DIR__ . '/ang/*.ang.php');
+  foreach ($files as $file) {
+    $name = preg_replace(':\.ang\.php$:', '', basename($file));
+    $module = include $file;
+    if (empty($module['ext'])) {
+      $module['ext'] = E::LONG_NAME;
+    }
+    $angularModules[$name] = $module;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_themes().
+ *
+ * Find any and return any files matching "*.theme.php"
+ */
+function _greenwich_civix_civicrm_themes(&$themes) {
+  $files = _greenwich_civix_glob(__DIR__ . '/*.theme.php');
+  foreach ($files as $file) {
+    $themeMeta = include $file;
+    if (empty($themeMeta['name'])) {
+      $themeMeta['name'] = preg_replace(':\.theme\.php$:', '', basename($file));
+    }
+    if (empty($themeMeta['ext'])) {
+      $themeMeta['ext'] = E::LONG_NAME;
+    }
+    $themes[$themeMeta['name']] = $themeMeta;
+  }
+}
+
+/**
+ * Glob wrapper which is guaranteed to return an array.
+ *
+ * The documentation for glob() says, "On some systems it is impossible to
+ * distinguish between empty match and an error." Anecdotally, the return
+ * result for an empty match is sometimes array() and sometimes FALSE.
+ * This wrapper provides consistency.
+ *
+ * @link http://php.net/glob
+ * @param string $pattern
+ *
+ * @return array
+ */
+function _greenwich_civix_glob($pattern) {
+  $result = glob($pattern);
+  return is_array($result) ? $result : [];
+}
+
+/**
+ * Inserts a navigation menu item at a given place in the hierarchy.
+ *
+ * @param array $menu - menu hierarchy
+ * @param string $path - path to parent of this item, e.g. 'my_extension/submenu'
+ *    'Mailing', or 'Administer/System Settings'
+ * @param array $item - the item to insert (parent/child attributes will be
+ *    filled for you)
+ *
+ * @return bool
+ */
+function _greenwich_civix_insert_navigation_menu(&$menu, $path, $item) {
+  // If we are done going down the path, insert menu
+  if (empty($path)) {
+    $menu[] = [
+      'attributes' => array_merge([
+        'label'      => CRM_Utils_Array::value('name', $item),
+        'active'     => 1,
+      ], $item),
+    ];
+    return TRUE;
+  }
+  else {
+    // Find an recurse into the next level down
+    $found = FALSE;
+    $path = explode('/', $path);
+    $first = array_shift($path);
+    foreach ($menu as $key => &$entry) {
+      if ($entry['attributes']['name'] == $first) {
+        if (!isset($entry['child'])) {
+          $entry['child'] = [];
+        }
+        $found = _greenwich_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item);
+      }
+    }
+    return $found;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_navigationMenu().
+ */
+function _greenwich_civix_navigationMenu(&$nodes) {
+  if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) {
+    _greenwich_civix_fixNavigationMenu($nodes);
+  }
+}
+
+/**
+ * Given a navigation menu, generate navIDs for any items which are
+ * missing them.
+ */
+function _greenwich_civix_fixNavigationMenu(&$nodes) {
+  $maxNavID = 1;
+  array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
+    if ($key === 'navID') {
+      $maxNavID = max($maxNavID, $item);
+    }
+  });
+  _greenwich_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL);
+}
+
+function _greenwich_civix_fixNavigationMenuItems(&$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;
+      $nodes[$newKey] = $nodes[$origKey];
+      unset($nodes[$origKey]);
+      $origKey = $newKey;
+    }
+    if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
+      _greenwich_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
+    }
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
+ */
+function _greenwich_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings';
+  if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) {
+    $metaDataFolders[] = $settingsDir;
+  }
+}
+
+/**
+ * (Delegated) Implements hook_civicrm_entityTypes().
+ *
+ * Find any *.entityType.php files, merge their content, and return.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+ */
+function _greenwich_civix_civicrm_entityTypes(&$entityTypes) {
+  $entityTypes = array_merge($entityTypes, []);
+}
diff --git a/ext/greenwich/greenwich.php b/ext/greenwich/greenwich.php
new file mode 100644
index 000000000000..947e5851e169
--- /dev/null
+++ b/ext/greenwich/greenwich.php
@@ -0,0 +1,172 @@
+<?php
+
+require_once 'greenwich.civix.php';
+// phpcs:disable
+use CRM_Greenwich_ExtensionUtil as E;
+// phpcs:enable
+
+/**
+ * Implements hook_civicrm_config().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config/
+ */
+function greenwich_civicrm_config(&$config) {
+  _greenwich_civix_civicrm_config($config);
+}
+
+/**
+ * Implements hook_civicrm_xmlMenu().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+ */
+function greenwich_civicrm_xmlMenu(&$files) {
+  _greenwich_civix_civicrm_xmlMenu($files);
+}
+
+/**
+ * Implements hook_civicrm_install().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
+ */
+function greenwich_civicrm_install() {
+  _greenwich_civix_civicrm_install();
+}
+
+/**
+ * Implements hook_civicrm_postInstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
+ */
+function greenwich_civicrm_postInstall() {
+  _greenwich_civix_civicrm_postInstall();
+}
+
+/**
+ * Implements hook_civicrm_uninstall().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
+ */
+function greenwich_civicrm_uninstall() {
+  _greenwich_civix_civicrm_uninstall();
+}
+
+/**
+ * Implements hook_civicrm_enable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
+ */
+function greenwich_civicrm_enable() {
+  _greenwich_civix_civicrm_enable();
+}
+
+/**
+ * Implements hook_civicrm_disable().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
+ */
+function greenwich_civicrm_disable() {
+  _greenwich_civix_civicrm_disable();
+}
+
+/**
+ * Implements hook_civicrm_upgrade().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
+ */
+function greenwich_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _greenwich_civix_civicrm_upgrade($op, $queue);
+}
+
+/**
+ * Implements hook_civicrm_managed().
+ *
+ * Generate a list of entities to create/deactivate/delete when this module
+ * is installed, disabled, uninstalled.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
+ */
+function greenwich_civicrm_managed(&$entities) {
+  _greenwich_civix_civicrm_managed($entities);
+}
+
+/**
+ * Implements hook_civicrm_caseTypes().
+ *
+ * Generate a list of case-types.
+ *
+ * Note: This hook only runs in CiviCRM 4.4+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
+ */
+function greenwich_civicrm_caseTypes(&$caseTypes) {
+  _greenwich_civix_civicrm_caseTypes($caseTypes);
+}
+
+/**
+ * Implements hook_civicrm_angularModules().
+ *
+ * Generate a list of Angular modules.
+ *
+ * Note: This hook only runs in CiviCRM 4.5+. It may
+ * use features only available in v4.6+.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
+ */
+function greenwich_civicrm_angularModules(&$angularModules) {
+  _greenwich_civix_civicrm_angularModules($angularModules);
+}
+
+/**
+ * Implements hook_civicrm_alterSettingsFolders().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders
+ */
+function greenwich_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _greenwich_civix_civicrm_alterSettingsFolders($metaDataFolders);
+}
+
+/**
+ * Implements hook_civicrm_entityTypes().
+ *
+ * Declare entity types provided by this module.
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
+ */
+function greenwich_civicrm_entityTypes(&$entityTypes) {
+  _greenwich_civix_civicrm_entityTypes($entityTypes);
+}
+
+/**
+ * Implements hook_civicrm_thems().
+ */
+function greenwich_civicrm_themes(&$themes) {
+  _greenwich_civix_civicrm_themes($themes);
+}
+
+// --- Functions below this ship commented out. Uncomment as required. ---
+
+/**
+ * Implements hook_civicrm_preProcess().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_preProcess
+ */
+//function greenwich_civicrm_preProcess($formName, &$form) {
+//
+//}
+
+/**
+ * Implements hook_civicrm_navigationMenu().
+ *
+ * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_navigationMenu
+ */
+//function greenwich_civicrm_navigationMenu(&$menu) {
+//  _greenwich_civix_insert_navigation_menu($menu, 'Mailings', array(
+//    'label' => E::ts('New subliminal message'),
+//    'name' => 'mailing_subliminal_message',
+//    'url' => 'civicrm/mailing/subliminal',
+//    'permission' => 'access CiviMail',
+//    'operator' => 'OR',
+//    'separator' => 0,
+//  ));
+//  _greenwich_civix_navigationMenu($menu);
+//}
diff --git a/ext/greenwich/images/screenshot.png b/ext/greenwich/images/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..6765b696fa03249ac2cd605d5f0e4aa000ad6dad
GIT binary patch
literal 11775
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
IrTdTn0|#irRsaA1

literal 0
HcmV?d00001

diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml
new file mode 100644
index 000000000000..d9a784753804
--- /dev/null
+++ b/ext/greenwich/info.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<extension key="greenwich" type="module">
+  <file>greenwich</file>
+  <name>Theme: Greenwich</name>
+  <description>Traditional CiviCRM look-and-feel</description>
+  <license>AGPL-3.0</license>
+  <maintainer>
+    <author>CiviCRM</author>
+    <email>info@civicrm.org</email>
+  </maintainer>
+  <urls>
+    <url desc="Main Extension Page">http://civicrm.org</url>
+    <url desc="Documentation">http://civicrm.org</url>
+    <url desc="Support">http://civicrm.org</url>
+    <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
+  </urls>
+  <releaseDate>2020-07-21</releaseDate>
+  <version>1.0</version>
+  <develStage>alpha</develStage>
+  <compatibility>
+    <ver>5.0</ver>
+  </compatibility>
+  <classloader>
+    <psr4 prefix="Civi\" path="Civi"/>
+  </classloader>
+  <civix>
+    <namespace>CRM/Greenwich</namespace>
+  </civix>
+</extension>

From 4ae5652e4e9cdefe8a33fbf6427c876d6e9a461c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 22 Jul 2020 01:22:58 -0700
Subject: [PATCH 651/834] greenwich - Remove unnecessary hook stubs

---
 ext/greenwich/greenwich.php | 148 ++----------------------------------
 1 file changed, 8 insertions(+), 140 deletions(-)

diff --git a/ext/greenwich/greenwich.php b/ext/greenwich/greenwich.php
index 947e5851e169..3d2905f05838 100644
--- a/ext/greenwich/greenwich.php
+++ b/ext/greenwich/greenwich.php
@@ -14,107 +14,14 @@ function greenwich_civicrm_config(&$config) {
   _greenwich_civix_civicrm_config($config);
 }
 
-/**
- * Implements hook_civicrm_xmlMenu().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
- */
-function greenwich_civicrm_xmlMenu(&$files) {
-  _greenwich_civix_civicrm_xmlMenu($files);
-}
-
-/**
- * Implements hook_civicrm_install().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install
- */
-function greenwich_civicrm_install() {
-  _greenwich_civix_civicrm_install();
-}
-
-/**
- * Implements hook_civicrm_postInstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall
- */
-function greenwich_civicrm_postInstall() {
-  _greenwich_civix_civicrm_postInstall();
-}
-
-/**
- * Implements hook_civicrm_uninstall().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall
- */
-function greenwich_civicrm_uninstall() {
-  _greenwich_civix_civicrm_uninstall();
-}
-
-/**
- * Implements hook_civicrm_enable().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable
- */
-function greenwich_civicrm_enable() {
-  _greenwich_civix_civicrm_enable();
-}
-
-/**
- * Implements hook_civicrm_disable().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable
- */
-function greenwich_civicrm_disable() {
-  _greenwich_civix_civicrm_disable();
-}
-
-/**
- * Implements hook_civicrm_upgrade().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade
- */
-function greenwich_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  return _greenwich_civix_civicrm_upgrade($op, $queue);
-}
-
-/**
- * Implements hook_civicrm_managed().
- *
- * Generate a list of entities to create/deactivate/delete when this module
- * is installed, disabled, uninstalled.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed
- */
-function greenwich_civicrm_managed(&$entities) {
-  _greenwich_civix_civicrm_managed($entities);
-}
-
-/**
- * Implements hook_civicrm_caseTypes().
- *
- * Generate a list of case-types.
- *
- * Note: This hook only runs in CiviCRM 4.4+.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes
- */
-function greenwich_civicrm_caseTypes(&$caseTypes) {
-  _greenwich_civix_civicrm_caseTypes($caseTypes);
-}
-
-/**
- * Implements hook_civicrm_angularModules().
- *
- * Generate a list of Angular modules.
- *
- * Note: This hook only runs in CiviCRM 4.5+. It may
- * use features only available in v4.6+.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules
- */
-function greenwich_civicrm_angularModules(&$angularModules) {
-  _greenwich_civix_civicrm_angularModules($angularModules);
-}
+///**
+// * Implements hook_civicrm_xmlMenu().
+// *
+// * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu
+// */
+//function greenwich_civicrm_xmlMenu(&$files) {
+//  _greenwich_civix_civicrm_xmlMenu($files);
+//}
 
 /**
  * Implements hook_civicrm_alterSettingsFolders().
@@ -125,48 +32,9 @@ function greenwich_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
   _greenwich_civix_civicrm_alterSettingsFolders($metaDataFolders);
 }
 
-/**
- * Implements hook_civicrm_entityTypes().
- *
- * Declare entity types provided by this module.
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes
- */
-function greenwich_civicrm_entityTypes(&$entityTypes) {
-  _greenwich_civix_civicrm_entityTypes($entityTypes);
-}
-
 /**
  * Implements hook_civicrm_thems().
  */
 function greenwich_civicrm_themes(&$themes) {
   _greenwich_civix_civicrm_themes($themes);
 }
-
-// --- Functions below this ship commented out. Uncomment as required. ---
-
-/**
- * Implements hook_civicrm_preProcess().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_preProcess
- */
-//function greenwich_civicrm_preProcess($formName, &$form) {
-//
-//}
-
-/**
- * Implements hook_civicrm_navigationMenu().
- *
- * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_navigationMenu
- */
-//function greenwich_civicrm_navigationMenu(&$menu) {
-//  _greenwich_civix_insert_navigation_menu($menu, 'Mailings', array(
-//    'label' => E::ts('New subliminal message'),
-//    'name' => 'mailing_subliminal_message',
-//    'url' => 'civicrm/mailing/subliminal',
-//    'permission' => 'access CiviMail',
-//    'operator' => 'OR',
-//    'separator' => 0,
-//  ));
-//  _greenwich_civix_navigationMenu($menu);
-//}

From 21f97878073f72f99b3dcb875091d803aea7252b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 11 Sep 2020 14:51:02 -0700
Subject: [PATCH 652/834] greenwich - Download bootstrap-sass

---
 composer.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/composer.json b/composer.json
index 9dfefaa375a7..5818b6c6c281 100644
--- a/composer.json
+++ b/composer.json
@@ -195,6 +195,12 @@
       "es6-promise": {
         "url": "https://github.com/components/es6-promise/archive/v4.2.4.zip"
       },
+      "ext-greenwich-bootstrap3": {
+        "url": "https://github.com/twbs/bootstrap-sass/archive/v{$version}.zip",
+        "path": "ext/greenwich/extern/bootstrap3",
+        "version": "3.4.1",
+        "ignore": ["test", "tasks", "lib"]
+      },
       "font-awesome": {
         "url": "https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip",
         "ignore": ["*/.*", "*.json", "src", "*.yml", "Gemfile", "Gemfile.lock", "*.md"]

From 5987fa9b7ac91b5e85475cd8ebdcc0c21be9c780 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:14:58 -0700
Subject: [PATCH 653/834] composer.json - Add scssphp, php-autoprefixer, and
 compile-plugin

---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5818b6c6c281..39299630d479 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,10 @@
     "brick/money": "~0.4",
     "ext-intl": "*",
     "pear/mail_mime": "~1.10",
-    "pear/db": "1.10"
+    "pear/db": "1.10",
+    "scssphp/scssphp": "~1.2",
+    "padaliyajay/php-autoprefixer": "~1.2",
+    "civicrm/composer-compile-plugin": "~0.5"
   },
   "scripts": {
     "post-install-cmd": [

From 763eec6c50d056fa7468daea038f06c693e1b1ec Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:17:55 -0700
Subject: [PATCH 654/834] greenwich - Define compilation task

---
 .gitignore                   |  1 +
 Civi/Compile/Scss.php        | 49 ++++++++++++++++++++++++++++++++++++
 composer.json                | 11 +++++++-
 ext/greenwich/scss/main.scss |  3 +++
 4 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 Civi/Compile/Scss.php
 create mode 100644 ext/greenwich/scss/main.scss

diff --git a/.gitignore b/.gitignore
index 09471dd838b9..4e197028908e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 !/ext/eventcart
 !/ext/ewaysingle
 !/ext/greenwich
+/ext/greenwich/dist
 /ext/greenwich/extern
 !/ext/search
 !/ext/financialacls
diff --git a/Civi/Compile/Scss.php b/Civi/Compile/Scss.php
new file mode 100644
index 000000000000..b695a89ce21a
--- /dev/null
+++ b/Civi/Compile/Scss.php
@@ -0,0 +1,49 @@
+<?php
+namespace Civi\Compile;
+
+class Scss {
+
+  /**
+   * Compile some SCSS file(s).
+   *
+   * NOTE: This function runs during 'composer install', which is a pre-boot
+   * environment. The composer autoloader has been configured, but no other
+   * Civi services are online.
+   *
+   * @param array $task
+   *   With keys:
+   *   - scss-includes: string[], list of paths with SCSS helper files
+   *   - scss-files: array, key-value mapping with input-files and output-files
+   *
+   * @see composer.json
+   * @link https://github.com/civicrm/composer-compile-plugin/blob/master/doc/tasks.md
+   */
+  public static function build(array $task) {
+    $scssCompiler = new \ScssPhp\ScssPhp\Compiler();
+    $includes = $task['scss-includes'] ?? [];
+    foreach ($includes as $include) {
+      $scssCompiler->addImportPath($include);
+    }
+
+    if (empty($task['scss-files'])) {
+      throw new \InvalidArgumentException("Invalid task: required argument 'scss-files' is missing");
+    }
+    foreach ($task['scss-files'] as $inputFile => $outputFile) {
+      if (!file_exists($inputFile)) {
+        throw new \InvalidArgumentException("File does not exist: " . $inputFile);
+      }
+      $inputScss = file_get_contents($inputFile);
+      $css = $scssCompiler->compile($inputScss);
+      $autoprefixer = new \Padaliyajay\PHPAutoprefixer\Autoprefixer($css);
+
+      if (!file_exists(dirname($outputFile))) {
+        mkdir(dirname($outputFile), 0777, TRUE);
+      }
+      $outputCss = $autoprefixer->compile();
+      if (!file_put_contents($outputFile, $outputCss)) {
+        throw new \RuntimeException("Failed to write file: $outputFile");
+      }
+    }
+  }
+
+}
diff --git a/composer.json b/composer.json
index 39299630d479..a8b3d45c1121 100644
--- a/composer.json
+++ b/composer.json
@@ -282,6 +282,15 @@
       "zetacomponents/mail": {
         "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
       }
-    }
+    },
+    "compile": [
+      {
+        "title": "Greenwich SCSS (<comment>ext/greenwich/dist/bootstrap3.css</comment>)",
+        "php-method": "\\Civi\\Compile\\Scss::build",
+        "watch-files": ["ext/greenwich/scss"],
+        "scss-files": {"ext/greenwich/scss/main.scss": "ext/greenwich/dist/bootstrap3.css"},
+        "scss-includes": ["ext/greenwich/scss", "ext/greenwich/extern/bootstrap3/assets/stylesheets"]
+      }
+    ]
   }
 }
diff --git a/ext/greenwich/scss/main.scss b/ext/greenwich/scss/main.scss
new file mode 100644
index 000000000000..6ce355c0fe14
--- /dev/null
+++ b/ext/greenwich/scss/main.scss
@@ -0,0 +1,3 @@
+#bootstrap-theme {
+  @import "bootstrap";
+}
\ No newline at end of file

From 07c0c047c51425a78f9265b2e1da1d58b300aed2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:21:38 -0700
Subject: [PATCH 655/834] greenwich - Declare theme. Use the new bootstrap3.css

---
 ext/greenwich/greenwich.php | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/ext/greenwich/greenwich.php b/ext/greenwich/greenwich.php
index 3d2905f05838..14c312e0a248 100644
--- a/ext/greenwich/greenwich.php
+++ b/ext/greenwich/greenwich.php
@@ -33,8 +33,29 @@ function greenwich_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
 }
 
 /**
- * Implements hook_civicrm_thems().
+ * Implements hook_civicrm_themes().
  */
 function greenwich_civicrm_themes(&$themes) {
-  _greenwich_civix_civicrm_themes($themes);
+  // _greenwich_civix_civicrm_themes($themes);
+  $themes['greenwich'] = [
+    'ext' => 'civicrm',
+    'title' => 'Greenwich',
+    'help' => ts('CiviCRM 4.x look-and-feel'),
+  ];
+}
+
+/**
+ * Implements hook_civicrm_alterBundle().
+ */
+function greenwich_civicrm_alterBundle(CRM_Core_Resources_Bundle $bundle) {
+  $theme = Civi::service('themes')->getActiveThemeKey();
+  switch ($theme . ':' . $bundle->name) {
+    case 'greenwich:bootstrap3':
+      $bundle->clear();
+      $bundle->addStyleFile('greenwich', 'dist/bootstrap3.css');
+      $bundle->addScriptFile('greenwich', 'extern/bootstrap3/assets/javascripts/bootstrap.min.js', [
+        'translate' => FALSE,
+      ]);
+      break;
+  }
 }

From 1f6ab7d411d4a221aa66c5bacc6b3bcea885602c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:23:11 -0700
Subject: [PATCH 656/834] =?UTF-8?q?greenwich=20-=20Quick/weak=20stab=20at?=
 =?UTF-8?q?=20slightly-less=20glaringly-mismatched=20but=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ext/greenwich/scss/_greenwich.scss | 894 +++++++++++++++++++++++++++++
 ext/greenwich/scss/main.scss       |   1 +
 2 files changed, 895 insertions(+)
 create mode 100644 ext/greenwich/scss/_greenwich.scss

diff --git a/ext/greenwich/scss/_greenwich.scss b/ext/greenwich/scss/_greenwich.scss
new file mode 100644
index 000000000000..b639e1204e04
--- /dev/null
+++ b/ext/greenwich/scss/_greenwich.scss
@@ -0,0 +1,894 @@
+/*! Generated by Live LESS Theme Customizer */
+    
+
+//
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+$gray-base: rgb(0, 0, 0);
+$gray-darker: lighten($gray-base, 13.5%); // #222
+$gray-dark: lighten($gray-base, 20%);   // #333
+$gray: lighten($gray-base, 33.5%); // #555
+$gray-light: lighten($gray-base, 60%); // #777
+$gray-lighter: lighten($gray-base, 93.5%); // #eee
+
+$brand-primary: rgb(0, 0, 0); // #337ab7
+$brand-success: rgb(115, 168, 57);
+$brand-info: rgb(205, 232, 254);
+$brand-warning: rgb(221, 86, 0);
+$brand-danger: rgb(199, 28, 34);
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+$body-bg: rgb(255, 255, 255);
+//** Global text color on `<body>`.
+$text-color: $gray;
+
+//** Global textual link color.
+$link-color: $brand-primary;
+//** Link hover color set via `darken()` function.
+$link-hover-color: darken($link-color, 15%);
+//** Link hover decoration.
+$link-hover-decoration: underline;
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif: "Verdana", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-serif: Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+$font-family-base: $font-family-sans-serif;
+
+$font-size-base: 14px;
+$font-size-large: ceil(($font-size-base * 1.25)); // ~18px
+$font-size-small: ceil(($font-size-base * 0.85)); // ~12px
+
+$font-size-h1: floor(($font-size-base * 2.6)); // ~36px
+$font-size-h2: floor(($font-size-base * 2.15)); // ~30px
+$font-size-h3: ceil(($font-size-base * 1.7)); // ~24px
+$font-size-h4: ceil(($font-size-base * 1.25)); // ~18px
+$font-size-h5: $font-size-base;
+$font-size-h6: ceil(($font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+$line-height-base: 1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+$line-height-computed: floor(($font-size-base * $line-height-base)); // ~20px
+
+//** By default, this inherits from the `<body>`.
+$headings-font-family: $font-family-base;
+$headings-font-weight: 500;
+$headings-line-height: 1.2;
+$headings-color: rgb(0, 0, 0);
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+$icon-font-path: "../fonts/";
+//** File name for all font files.
+$icon-font-name: "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+$icon-font-svg-id: "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+$padding-base-vertical: 4px;
+$padding-base-horizontal: 8px;
+
+$padding-large-vertical: 14px;
+$padding-large-horizontal: 16px;
+
+$padding-small-vertical: 5px;
+$padding-small-horizontal: 10px;
+
+$padding-xs-vertical: 1px;
+$padding-xs-horizontal: 5px;
+
+$line-height-large: 1.3333333; // extra decimals for Win 8.1 Chrome
+$line-height-small: 1.5;
+
+$border-radius-base: 4px;
+$border-radius-large: 6px;
+$border-radius-small: 3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+$component-active-color: rgb(255, 255, 255);
+//** Global background color for active items (e.g., navs or dropdowns).
+$component-active-bg: $brand-primary;
+
+//** Width of the `border` for generating carets that indicate dropdowns.
+$caret-width-base: 4px;
+//** Carets increase slightly in size for larger components.
+$caret-width-large: 5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+$table-cell-padding: 8px;
+//** Padding for cells in `.table-condensed`.
+$table-condensed-cell-padding: 5px;
+
+//** Default background color used for all tables.
+$table-bg: transparent;
+//** Background color used for `.table-striped`.
+$table-bg-accent: rgb(249, 249, 249);
+//** Background color used for `.table-hover`.
+$table-bg-hover: rgb(245, 245, 245);
+$table-bg-active: $table-bg-hover;
+
+//** Border color for table and cell borders.
+$table-border-color: rgb(221, 221, 221);
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+$btn-font-weight: normal;
+
+$btn-default-color: rgb(255, 255, 255);
+$btn-default-bg: rgb(112, 113, 107);
+$btn-default-border: rgba(0, 0, 0, 0.1);
+
+$btn-primary-color: rgb(255, 255, 255);
+$btn-primary-bg: $btn-default-bg;
+$btn-primary-border: $btn-primary-bg;
+
+$btn-success-color: rgb(255, 255, 255);
+$btn-success-bg: $brand-success;
+$btn-success-border: $btn-success-bg;
+
+$btn-info-color: rgb(255, 255, 255);
+$btn-info-bg: $brand-info;
+$btn-info-border: $btn-info-bg;
+
+$btn-warning-color: rgb(255, 255, 255);
+$btn-warning-bg: $brand-warning;
+$btn-warning-border: $btn-warning-bg;
+
+$btn-danger-color: rgb(255, 255, 255);
+$btn-danger-bg: $brand-danger;
+$btn-danger-border: $btn-danger-bg;
+
+$btn-link-disabled-color: $gray-light;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius-base: $border-radius-base;
+$btn-border-radius-large: $border-radius-large;
+$btn-border-radius-small: $border-radius-small;
+
+
+//== Forms
+//
+//##
+
+
+//** `<input>` background color
+$input-bg: rgb(255, 255, 255);
+//** `<input disabled>` background color
+$input-bg-disabled: $gray-lighter;
+
+//** Text color for `<input>`s
+$input-color: $text-color;
+//** `<input>` border color
+$input-border: rgb(204, 204, 204);
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+$input-border-radius: $border-radius-base;
+//** Large `.form-control` border radius
+$input-border-radius-large: $border-radius-large;
+//** Small `.form-control` border radius
+$input-border-radius-small: $border-radius-small;
+
+//** Border color for inputs on focus
+$input-border-focus: rgb(102, 175, 233);
+
+//** Placeholder text color
+$input-color-placeholder: $gray-light;
+
+//** Default `.form-control` height
+$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+$input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2);
+
+//** `.form-group` margin
+$form-group-margin-bottom: 15px;
+
+$legend-color: $text-color;
+$legend-border-color: rgb(229, 229, 229);
+
+//** Background color for textual input addons
+$input-group-addon-bg: $gray-lighter;
+//** Border color for textual input addons
+$input-group-addon-border-color: $input-border;
+
+//** Disabled cursor for form controls and buttons.
+$cursor-disabled: not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+$dropdown-bg: rgb(255, 255, 255);
+//** Dropdown menu `border-color`.
+$dropdown-border: rgba(0, 0, 0, 0.15);
+//** Dropdown menu `border-color` **for IE8**.
+$dropdown-fallback-border: rgb(204, 204, 204);
+//** Divider color for between dropdown items.
+$dropdown-divider-bg: rgb(229, 229, 229);
+
+//** Dropdown link text color.
+$dropdown-link-color: $gray-dark;
+//** Hover color for dropdown links.
+$dropdown-link-hover-color: rgb(255, 255, 255);
+//** Hover background for dropdown links.
+$dropdown-link-hover-bg: $component-active-bg;
+
+//** Active dropdown menu item text color.
+$dropdown-link-active-color: rgb(255, 255, 255);
+//** Active dropdown menu item background color.
+$dropdown-link-active-bg: $component-active-bg;
+
+//** Disabled dropdown menu item background color.
+$dropdown-link-disabled-color: $gray-light;
+
+//** Text color for headers within dropdown menus.
+$dropdown-header-color: $gray-light;
+
+//** Deprecated `$dropdown-caret-color` as of v3.1.0
+$dropdown-caret-color: rgb(0, 0, 0);
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+$zindex-navbar: 1000;
+$zindex-dropdown: 1000;
+$zindex-popover: 1060;
+$zindex-tooltip: 1070;
+$zindex-navbar-fixed: 1030;
+$zindex-modal-background: 1040;
+$zindex-modal: 1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `$screen-xs` as of v3.0.1
+$screen-xs: 480px;
+//** Deprecated `$screen-xs-min` as of v3.2.0
+$screen-xs-min: $screen-xs;
+//** Deprecated `$screen-phone` as of v3.0.1
+$screen-phone: $screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `$screen-sm` as of v3.0.1
+$screen-sm: 768px;
+$screen-sm-min: $screen-sm;
+//** Deprecated `$screen-tablet` as of v3.0.1
+$screen-tablet: $screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `$screen-md` as of v3.0.1
+$screen-md: 992px;
+$screen-md-min: $screen-md;
+//** Deprecated `$screen-desktop` as of v3.0.1
+$screen-desktop: $screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `$screen-lg` as of v3.0.1
+$screen-lg: 1200px;
+$screen-lg-min: $screen-lg;
+//** Deprecated `$screen-lg-desktop` as of v3.0.1
+$screen-lg-desktop: $screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+$screen-xs-max: ($screen-sm-min - 1);
+$screen-sm-max: ($screen-md-min - 1);
+$screen-md-max: ($screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+$grid-columns: 12;
+//** Padding between columns. Gets divided in half for the left and right.
+$grid-gutter-width: 30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+$grid-float-breakpoint: $screen-sm-min;
+//** Point at which the navbar begins collapsing.
+$grid-float-breakpoint-max: ($grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+$container-tablet: (720px + $grid-gutter-width);
+//** For `$screen-sm-min` and up.
+$container-sm: $container-tablet;
+
+// Medium screen / desktop
+$container-desktop: (940px + $grid-gutter-width);
+//** For `$screen-md-min` and up.
+$container-md: $container-desktop;
+
+// Large screen / wide desktop
+$container-large-desktop: (1140px + $grid-gutter-width);
+//** For `$screen-lg-min` and up.
+$container-lg: $container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+
+// Basics of a navbar
+$navbar-height: 50px;
+$navbar-margin-bottom: $line-height-computed;
+$navbar-border-radius: $border-radius-base;
+$navbar-padding-horizontal: floor(($grid-gutter-width / 2));
+$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2);
+$navbar-collapse-max-height: 340px;
+
+$navbar-default-color: rgb(221, 221, 221);
+$navbar-default-bg: $brand-primary;
+$navbar-default-border: darken($navbar-default-bg, 6.5%);
+
+// Navbar links
+$navbar-default-link-color: rgb(255, 255, 255);
+$navbar-default-link-hover-color: rgb(255, 255, 255);
+$navbar-default-link-hover-bg: darken($navbar-default-bg, 10%);
+$navbar-default-link-active-color: rgb(255, 255, 255);
+$navbar-default-link-active-bg: darken($navbar-default-bg, 10%);
+$navbar-default-link-disabled-color: rgb(221, 221, 221);
+$navbar-default-link-disabled-bg: transparent;
+
+// Navbar brand label
+$navbar-default-brand-color: $navbar-default-link-color;
+$navbar-default-brand-hover-color: rgb(255, 255, 255);
+$navbar-default-brand-hover-bg: none;
+
+// Navbar toggle
+$navbar-default-toggle-hover-bg: darken($navbar-default-bg, 10%);
+$navbar-default-toggle-icon-bar-bg: rgb(255, 255, 255);
+$navbar-default-toggle-border-color: darken($navbar-default-bg, 10%);
+
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+$navbar-inverse-color: rgb(255, 255, 255);
+$navbar-inverse-bg: $brand-info;
+$navbar-inverse-border: darken($navbar-inverse-bg, 5%);
+
+// Inverted navbar links
+$navbar-inverse-link-color: rgb(255, 255, 255);
+$navbar-inverse-link-hover-color: rgb(255, 255, 255);
+$navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 5%);
+$navbar-inverse-link-active-color: rgb(255, 255, 255);
+$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 5%);
+$navbar-inverse-link-disabled-color: rgb(204, 204, 204);
+$navbar-inverse-link-disabled-bg: transparent;
+
+// Inverted navbar brand label
+$navbar-inverse-brand-color: $navbar-inverse-link-color;
+$navbar-inverse-brand-hover-color: rgb(255, 255, 255);
+$navbar-inverse-brand-hover-bg: none;
+
+// Inverted navbar toggle
+$navbar-inverse-toggle-hover-bg: darken($navbar-inverse-bg, 5%);
+$navbar-inverse-toggle-icon-bar-bg: rgb(255, 255, 255);
+$navbar-inverse-toggle-border-color: darken($navbar-inverse-bg, 5%);
+
+
+//== Navs
+//
+//##
+
+
+//=== Shared nav styles
+$nav-link-padding: 10px 15px;
+$nav-link-hover-bg: $gray-lighter;
+
+$nav-disabled-link-color: $gray-light;
+$nav-disabled-link-hover-color: $gray-light;
+
+//== Tabs
+$nav-tabs-border-color: rgb(221, 221, 221);
+
+$nav-tabs-link-hover-border-color: $gray-lighter;
+
+$nav-tabs-active-link-hover-bg: $body-bg;
+$nav-tabs-active-link-hover-color: $gray;
+$nav-tabs-active-link-hover-border-color: rgb(221, 221, 221);
+
+$nav-tabs-justified-link-border-color: rgb(221, 221, 221);
+$nav-tabs-justified-active-link-border-color: $body-bg;
+
+//== Pills
+$nav-pills-border-radius: $border-radius-base;
+$nav-pills-active-link-hover-bg: $component-active-bg;
+$nav-pills-active-link-hover-color: $component-active-color;
+
+
+//== Pagination
+//
+//##
+
+
+$pagination-color: $link-color;
+$pagination-bg: rgb(255, 255, 255);
+$pagination-border: rgb(221, 221, 221);
+
+$pagination-hover-color: $link-hover-color;
+$pagination-hover-bg: $gray-lighter;
+$pagination-hover-border: rgb(221, 221, 221);
+
+$pagination-active-color: $gray-light;
+$pagination-active-bg: rgb(245, 245, 245);
+$pagination-active-border: $pagination-hover-border;
+
+$pagination-disabled-color: $gray-light;
+$pagination-disabled-bg: rgb(255, 255, 255);
+$pagination-disabled-border: rgb(221, 221, 221);
+
+
+//== Pager
+//
+//##
+
+
+$pager-bg: $pagination-bg;
+$pager-border: $pagination-border;
+$pager-border-radius: 15px;
+
+$pager-hover-bg: $pagination-hover-bg;
+
+$pager-active-bg: $pagination-active-bg;
+$pager-active-color: $pagination-active-color;
+
+$pager-disabled-color: $gray-light;
+
+
+//== Jumbotron
+//
+//##
+
+
+$jumbotron-padding: 30px;
+$jumbotron-color: inherit;
+$jumbotron-bg: $gray-lighter;
+$jumbotron-heading-color: inherit;
+$jumbotron-font-size: ceil(($font-size-base * 1.5));
+$jumbotron-heading-font-size: ceil(($font-size-base * 4.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+$state-success-text: rgb(70, 136, 71);
+$state-success-bg: rgb(223, 240, 216);
+$state-success-border: darken(adjust-hue($state-success-bg, -10), 5%);
+
+$state-info-text: rgb(58, 135, 173);
+$state-info-bg: rgb(217, 237, 247);
+$state-info-border: darken(adjust-hue($state-info-bg, -10), 7%);
+
+$state-warning-text: rgb(192, 152, 83);
+$state-warning-bg: rgb(252, 248, 227);
+$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 3%);
+
+$state-danger-text: rgb(185, 74, 72);
+$state-danger-bg: rgb(242, 222, 222);
+$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 3%);
+
+
+//== Tooltips
+//
+//##
+
+
+//** Tooltip max width
+$tooltip-max-width: 200px;
+//** Tooltip text color
+$tooltip-color: rgb(255, 255, 255);
+//** Tooltip background color
+$tooltip-bg: rgb(0, 0, 0);
+//$tooltip-opacity: @include 9;
+
+//** Tooltip arrow width
+$tooltip-arrow-width: 5px;
+//** Tooltip arrow color
+$tooltip-arrow-color: $tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+
+//** Popover body background color
+$popover-bg: rgb(255, 255, 255);
+//** Popover maximum width
+$popover-max-width: 276px;
+//** Popover border color
+$popover-border-color: rgba(0, 0, 0, 0.2);
+//** Popover fallback border color
+$popover-fallback-border-color: rgb(204, 204, 204);
+
+//** Popover title background color
+$popover-title-bg: darken($popover-bg, 3%);
+
+//** Popover arrow width
+$popover-arrow-width: 10px;
+//** Popover arrow color
+$popover-arrow-color: $popover-bg;
+
+//** Popover outer arrow width
+$popover-arrow-outer-width: ($popover-arrow-width + 1);
+//** Popover outer arrow color
+$popover-arrow-outer-color: fadein($popover-border-color, 5%);
+//** Popover outer arrow fallback color
+$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+
+//** Default label background color
+$label-default-bg: $gray-light;
+//** Primary label background color
+$label-primary-bg: $brand-primary;
+//** Success label background color
+$label-success-bg: $brand-success;
+//** Info label background color
+$label-info-bg: $brand-info;
+//** Warning label background color
+$label-warning-bg: $brand-warning;
+//** Danger label background color
+$label-danger-bg: $brand-danger;
+
+//** Default label text color
+$label-color: rgb(255, 255, 255);
+//** Default text color of a linked label
+$label-link-hover-color: rgb(255, 255, 255);
+
+
+//== Modals
+//
+//##
+
+
+//** Padding applied to the modal body
+$modal-inner-padding: 20px;
+
+//** Padding applied to the modal title
+$modal-title-padding: 15px;
+//** Modal title line-height
+$modal-title-line-height: $line-height-base;
+
+//** Background color of modal content area
+$modal-content-bg: rgb(255, 255, 255);
+//** Modal content border color
+$modal-content-border-color: rgba(0, 0, 0, 0.2);
+//** Modal content border color **for IE8**
+$modal-content-fallback-border-color: rgb(153, 153, 153);
+
+//** Modal backdrop background color
+$modal-backdrop-bg: rgb(0, 0, 0);
+//** Modal backdrop opacity
+//$modal-backdrop-opacity: @include 5;
+//** Modal header border color
+$modal-header-border-color: rgb(229, 229, 229);
+//** Modal footer border color
+$modal-footer-border-color: $modal-header-border-color;
+
+$modal-lg: 900px;
+$modal-md: 600px;
+$modal-sm: 300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+$alert-padding: 15px;
+$alert-border-radius: $border-radius-base;
+$alert-link-font-weight: bold;
+
+$alert-success-bg: $state-success-bg;
+$alert-success-text: $state-success-text;
+$alert-success-border: $state-success-border;
+
+$alert-info-bg: $state-info-bg;
+$alert-info-text: $state-info-text;
+$alert-info-border: $state-info-border;
+
+$alert-warning-bg: $state-warning-bg;
+$alert-warning-text: $state-warning-text;
+$alert-warning-border: $state-warning-border;
+
+$alert-danger-bg: $state-danger-bg;
+$alert-danger-text: $state-danger-text;
+$alert-danger-border: $state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+
+//** Background color of the whole progress component
+$progress-bg: rgb(245, 245, 245);
+//** Progress bar text color
+$progress-bar-color: rgb(255, 255, 255);
+//** Variable for setting rounded corners on progress bar.
+$progress-border-radius: $border-radius-base;
+
+//** Default progress bar color
+$progress-bar-bg: $brand-primary;
+//** Success progress bar color
+$progress-bar-success-bg: $brand-success;
+//** Warning progress bar color
+$progress-bar-warning-bg: $brand-warning;
+//** Danger progress bar color
+$progress-bar-danger-bg: $brand-danger;
+//** Info progress bar color
+$progress-bar-info-bg: $brand-info;
+
+
+//== List group
+//
+//##
+
+
+//** Background color on `.list-group-item`
+$list-group-bg: rgb(255, 255, 255);
+//** `.list-group-item` border color
+$list-group-border: rgb(221, 221, 221);
+//** List group border radius
+$list-group-border-radius: $border-radius-base;
+
+//** Background color of single list items on hover
+$list-group-hover-bg: rgb(245, 245, 245);
+//** Text color of active list items
+$list-group-active-color: $component-active-color;
+//** Background color of active list items
+$list-group-active-bg: $component-active-bg;
+//** Border color of active list elements
+$list-group-active-border: $list-group-active-bg;
+//** Text color for content within active list items
+$list-group-active-text-color: lighten($list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+$list-group-disabled-color: $gray-light;
+//** Background color of disabled list items
+$list-group-disabled-bg: $gray-lighter;
+//** Text color for content within disabled list items
+$list-group-disabled-text-color: $list-group-disabled-color;
+
+$list-group-link-color: rgb(85, 85, 85);
+$list-group-link-hover-color: $list-group-link-color;
+$list-group-link-heading-color: rgb(51, 51, 51);
+
+
+//== Panels
+//
+//##
+
+
+$panel-bg: rgb(255, 255, 255);
+$panel-body-padding: 15px;
+$panel-heading-padding: 10px 15px;
+$panel-footer-padding: $panel-heading-padding;
+$panel-border-radius: $border-radius-base;
+
+//** Border color for elements within panels
+$panel-inner-border: rgb(221, 221, 221);
+$panel-footer-bg: rgb(245, 245, 245);
+
+$panel-default-text: $text-color;
+$panel-default-border: rgb(221, 221, 221);
+$panel-default-heading-bg: rgb(245, 245, 245);
+
+$panel-primary-text: rgb(255, 255, 255);
+$panel-primary-border: $panel-default-border;
+$panel-primary-heading-bg: $brand-primary;
+
+$panel-success-text: $state-success-text;
+$panel-success-border: $panel-default-border;
+$panel-success-heading-bg: $brand-success;
+
+$panel-info-text: $state-info-text;
+$panel-info-border: $panel-default-border;
+$panel-info-heading-bg: $brand-info;
+
+$panel-warning-text: $state-warning-text;
+$panel-warning-border: $panel-default-border;
+$panel-warning-heading-bg: $brand-warning;
+
+$panel-danger-text: $state-danger-text;
+$panel-danger-border: $panel-default-border;
+$panel-danger-heading-bg: $brand-danger;
+
+
+//== Thumbnails
+//
+//##
+
+
+//** Padding around the thumbnail image
+$thumbnail-padding: 4px;
+//** Thumbnail background color
+$thumbnail-bg: $body-bg;
+//** Thumbnail border color
+$thumbnail-border: rgb(221, 221, 221);
+//** Thumbnail border radius
+$thumbnail-border-radius: $border-radius-base;
+
+//** Custom text color for thumbnail captions
+$thumbnail-caption-color: $text-color;
+//** Padding around the thumbnail caption
+$thumbnail-caption-padding: 9px;
+
+
+//== Wells
+//
+//##
+
+
+$well-bg: rgb(245, 245, 245);
+$well-border: darken($well-bg, 7%);
+
+
+//== Badges
+//
+//##
+
+
+$badge-color: rgb(255, 255, 255);
+//** Linked badge text color on hover
+$badge-link-hover-color: rgb(255, 255, 255);
+$badge-bg: $brand-primary;
+
+//** Badge text color in active nav link
+$badge-active-color: $link-color;
+//** Badge background color in active nav link
+$badge-active-bg: rgb(255, 255, 255);
+
+$badge-font-weight: bold;
+$badge-line-height: 1;
+$badge-border-radius: 10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+
+$breadcrumb-padding-vertical: 8px;
+$breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+$breadcrumb-bg: rgb(245, 245, 245);
+//** Breadcrumb text color
+$breadcrumb-color: rgb(204, 204, 204);
+//** Text color of current page in the breadcrumb
+$breadcrumb-active-color: $gray-light;
+//** Textual separator for between breadcrumb elements
+$breadcrumb-separator: "/";
+
+
+//== Carousel
+//
+//##
+
+
+$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
+
+$carousel-control-color: rgb(255, 255, 255);
+$carousel-control-width: 15%;
+//$carousel-control-opacity: @include 5;
+$carousel-control-font-size: 20px;
+
+$carousel-indicator-active-bg: rgb(255, 255, 255);
+$carousel-indicator-border-color: rgb(255, 255, 255);
+
+$carousel-caption-color: rgb(255, 255, 255);
+
+
+//== Close
+//
+//##
+
+
+$close-font-weight: bold;
+$close-color: rgb(0, 0, 0);
+$close-text-shadow: 0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+
+$code-color: rgb(199, 37, 78);
+$code-bg: rgb(249, 242, 244);
+
+$kbd-color: rgb(255, 255, 255);
+$kbd-bg: rgb(51, 51, 51);
+
+$pre-bg: rgb(245, 245, 245);
+$pre-color: $gray-dark;
+$pre-border-color: rgb(204, 204, 204);
+$pre-scrollable-max-height: 340px;
+
+
+//== Type
+//
+//##
+
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px;
+//** Text muted color
+$text-muted: $gray-light;
+//** Abbreviations and acronyms border color
+$abbr-border-color: $gray-light;
+//** Headings small color
+$headings-small-color: $gray-light;
+//** Blockquote small color
+$blockquote-small-color: $gray-light;
+//** Blockquote font size
+$blockquote-font-size: ($font-size-base * 1.25);
+//** Blockquote border color
+$blockquote-border-color: $gray-lighter;
+//** Page header border color
+$page-header-border-color: $gray-lighter;
+//** Width of horizontal description list titles
+$dl-horizontal-offset: $component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+$dl-horizontal-breakpoint: $grid-float-breakpoint;
+//** Horizontal line color.
+$hr-border: $gray-lighter;
+    
\ No newline at end of file
diff --git a/ext/greenwich/scss/main.scss b/ext/greenwich/scss/main.scss
index 6ce355c0fe14..8c8f7c1bbc88 100644
--- a/ext/greenwich/scss/main.scss
+++ b/ext/greenwich/scss/main.scss
@@ -1,3 +1,4 @@
 #bootstrap-theme {
+  @import "greenwich";
   @import "bootstrap";
 }
\ No newline at end of file

From b24eea6a369c6ba2c5907e47cd47c5e93feef4ba Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:24:43 -0700
Subject: [PATCH 657/834] greenwich - Make a more useful readme

---
 ext/greenwich/README.md             |  44 +++++++---------------------
 ext/greenwich/images/screenshot.png | Bin 11775 -> 0 bytes
 2 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 ext/greenwich/images/screenshot.png

diff --git a/ext/greenwich/README.md b/ext/greenwich/README.md
index 5e92b2e2d93f..c72c25d12df6 100644
--- a/ext/greenwich/README.md
+++ b/ext/greenwich/README.md
@@ -1,44 +1,20 @@
 # greenwich
 
-![Screenshot](/images/screenshot.png)
+The `greenwich` theme-extension is bundled into `civicrm-core`.
 
-(*FIXME: In one or two paragraphs, describe what the extension does and why one would download it. *)
+## Development
 
-The extension is licensed under [AGPL-3.0](LICENSE.txt).
+This extension includes compiled (S)CSS content. It is compiled automatically via `composer`.
+Compiled files should *not* be committed to git. They will be generated during `composer install`.
 
-## Requirements
-
-* PHP v7.0+
-* CiviCRM (*FIXME: Version number*)
-
-## Installation (Web UI)
-
-This extension has not yet been published for installation via the web UI.
-
-## Installation (CLI, Zip)
-
-Sysadmins and developers may download the `.zip` file for this extension and
-install it with the command-line tool [cv](https://github.com/civicrm/cv).
+These commands will help during development:
 
 ```bash
-cd <extension-dir>
-cv dl greenwich@https://github.com/FIXME/greenwich/archive/master.zip
-```
+cd /path/to/my/composer/root
 
-## Installation (CLI, Git)
+## Compile (S)CSS - one time
+composer compile
 
-Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) repo for this extension and
-install it with the command-line tool [cv](https://github.com/civicrm/cv).
-
-```bash
-git clone https://github.com/FIXME/greenwich.git
-cv en greenwich
+## Compile (S)CSS - and continue watching for changes
+composer compile:watch
 ```
-
-## Usage
-
-(* FIXME: Where would a new user navigate to get started? What changes would they see? *)
-
-## Known Issues
-
-(* FIXME *)
diff --git a/ext/greenwich/images/screenshot.png b/ext/greenwich/images/screenshot.png
deleted file mode 100644
index 6765b696fa03249ac2cd605d5f0e4aa000ad6dad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11775
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
IrTdTn0|#irRsaA1


From 4034556f206e93b787154840ede7d425782d4d71 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:27:41 -0700
Subject: [PATCH 658/834] composer.lock - Update for Greenwich/SCSS libraries
 and compilation task

---
 composer.lock | 204 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 203 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 44f39034684a..ffdd004acaf0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "46e891da51f0683373d9a6e62fb6f868",
+    "content-hash": "f79e56e87de0eb48bf9336b368a467ab",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -297,6 +297,51 @@
             "description": "RPC library for CiviConnect",
             "time": "2020-02-05T03:24:26+00:00"
         },
+        {
+            "name": "civicrm/composer-compile-plugin",
+            "version": "v0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/civicrm/composer-compile-plugin.git",
+                "reference": "8650ca03bbb094bc88a966651a623fbd09ca19ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/8650ca03bbb094bc88a966651a623fbd09ca19ab",
+                "reference": "8650ca03bbb094bc88a966651a623fbd09ca19ab",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.1 || ^2.0",
+                "php": ">=7.1",
+                "totten/lurkerlite": "^1.3"
+            },
+            "require-dev": {
+                "composer/composer": "~1.0",
+                "totten/process-helper": "^1.0.1"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Civi\\CompilePlugin\\CompilePlugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Civi\\CompilePlugin\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Tim Otten",
+                    "email": "info@civicrm.org"
+                }
+            ],
+            "description": "Define a 'compile' event for all packages in the dependency-graph",
+            "time": "2020-09-14T07:52:16+00:00"
+        },
         {
             "name": "civicrm/composer-downloads-plugin",
             "version": "v2.1.1",
@@ -861,6 +906,41 @@
             ],
             "time": "2016-11-19T14:58:11+00:00"
         },
+        {
+            "name": "padaliyajay/php-autoprefixer",
+            "version": "1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/padaliyajay/php-autoprefixer.git",
+                "reference": "0f36b7cfbd71d25836bcb9f4b58c09252ca4e9ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/padaliyajay/php-autoprefixer/zipball/0f36b7cfbd71d25836bcb9f4b58c09252ca4e9ec",
+                "reference": "0f36b7cfbd71d25836bcb9f4b58c09252ca4e9ec",
+                "shasum": ""
+            },
+            "require": {
+                "sabberworm/php-css-parser": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Padaliyajay\\PHPAutoprefixer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jay padaliya"
+                }
+            ],
+            "description": "CSS Autoprefixer written in pure PHP.",
+            "time": "2019-03-06T12:49:40+00:00"
+        },
         {
             "name": "pclzip/pclzip",
             "version": "2.8.2",
@@ -2159,6 +2239,68 @@
             ],
             "time": "2020-06-01T09:10:00+00:00"
         },
+        {
+            "name": "scssphp/scssphp",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/scssphp/scssphp.git",
+                "reference": "a05ea68160b7286ebbfd6e5fd7ae9e1a946ad6e1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/a05ea68160b7286ebbfd6e5fd7ae9e1a946ad6e1",
+                "reference": "a05ea68160b7286ebbfd6e5fd7ae9e1a946ad6e1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
+                "sass/sass-spec": "2020.08.10",
+                "squizlabs/php_codesniffer": "~3.5",
+                "twbs/bootstrap": "~4.3",
+                "zurb/foundation": "~6.5"
+            },
+            "bin": [
+                "bin/pscss"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ScssPhp\\ScssPhp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anthon Pang",
+                    "email": "apang@softwaredevelopment.ca",
+                    "homepage": "https://github.com/robocoder"
+                },
+                {
+                    "name": "Cédric Morin",
+                    "email": "cedric@yterium.com",
+                    "homepage": "https://github.com/Cerdic"
+                }
+            ],
+            "description": "scssphp is a compiler for SCSS written in PHP.",
+            "homepage": "http://scssphp.github.io/scssphp/",
+            "keywords": [
+                "css",
+                "less",
+                "sass",
+                "scss",
+                "stylesheet"
+            ],
+            "time": "2020-09-07T21:15:42+00:00"
+        },
         {
             "name": "symfony/config",
             "version": "v3.4.40",
@@ -2944,6 +3086,66 @@
             "homepage": "https://github.com/totten/ca_config",
             "time": "2017-05-10T20:08:17+00:00"
         },
+        {
+            "name": "totten/lurkerlite",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/totten/Lurker.git",
+                "reference": "a20c47142b486415b9117c76aa4c2117ff95b49a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/totten/Lurker/zipball/a20c47142b486415b9117c76aa4c2117ff95b49a",
+                "reference": "a20c47142b486415b9117c76aa4c2117ff95b49a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "replace": {
+                "henrikbjorn/lurker": "*"
+            },
+            "suggest": {
+                "ext-inotify": ">=0.1.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Lurker": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com"
+                },
+                {
+                    "name": "Yaroslav Kiliba",
+                    "email": "om.dattaya@gmail.com"
+                },
+                {
+                    "name": "Henrik Bjrnskov",
+                    "email": "henrik@bjrnskov.dk"
+                }
+            ],
+            "description": "Resource Watcher - Lightweight edition of henrikbjorn/lurker with no dependencies",
+            "keywords": [
+                "filesystem",
+                "resource",
+                "watching"
+            ],
+            "time": "2020-09-01T10:01:01+00:00"
+        },
         {
             "name": "tplaner/when",
             "version": "3.0.0+php53",

From 788f1c54c2fd7f26165abc93ce792f05c7da9e6f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:31:41 -0700
Subject: [PATCH 659/834] greenwich - Activate on new builds

---
 bin/regen.sh                   | 2 +-
 ext/greenwich/info.xml         | 3 +++
 xml/templates/civicrm_data.tpl | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/regen.sh b/bin/regen.sh
index 6cf3eb54c643..42cb64cdc35d 100755
--- a/bin/regen.sh
+++ b/bin/regen.sh
@@ -47,7 +47,7 @@ php GenerateData.php
 
 ## Prune local data
 $MYSQLCMD -e "DROP TABLE IF EXISTS civicrm_install_canary; DELETE FROM civicrm_cache; DELETE FROM civicrm_setting;"
-$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'search', 'flexmailer', 'financialacls');"
+$MYSQLCMD -e "DELETE FROM civicrm_extension WHERE full_name NOT IN ('sequentialcreditnotes', 'eventcart', 'greenwich', 'search', 'flexmailer', 'financialacls');"
 TABLENAMES=$( echo "show tables like 'civicrm_%'" | $MYSQLCMD | grep ^civicrm_ | xargs )
 
 cd $CIVISOURCEDIR/sql
diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml
index d9a784753804..edf93149f96a 100644
--- a/ext/greenwich/info.xml
+++ b/ext/greenwich/info.xml
@@ -16,6 +16,9 @@
   </urls>
   <releaseDate>2020-07-21</releaseDate>
   <version>1.0</version>
+  <tags>
+    <tag>mgmt:hidden</tag>
+  </tags>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.0</ver>
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl
index a65d033c71e6..e86bd1e58472 100644
--- a/xml/templates/civicrm_data.tpl
+++ b/xml/templates/civicrm_data.tpl
@@ -1779,5 +1779,6 @@ VALUES
 -- in the setup routine based on their tags & using the standard extension install api.
 -- do not try this at home folks.
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'sequentialcreditnotes', 'Sequential credit notes', 'Sequential credit notes', 'sequentialcreditnotes', 1);
+INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'greenwich', 'Theme: Greenwich', 'Theme: Greenwich', 'greenwich', 1);
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'eventcart', 'Event cart', 'Event cart', 'eventcart', 1);
 INSERT IGNORE INTO civicrm_extension (type, full_name, name, label, file, is_active) VALUES ('module', 'financialacls', 'Financial ACLs', 'Financial ACLs', 'financialacls', 1);

From c14e4888faa2852efb7484da334afd1e51f9ab13 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:34:35 -0700
Subject: [PATCH 660/834] greenwich - Activate during upgrade

---
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 0f4ba135ebcf..2833c33e7670 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -52,19 +52,6 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * (change the x in the function name):
    */
 
-  //  /**
-  //   * Upgrade function.
-  //   *
-  //   * @param string $rev
-  //   */
-  //  public function upgrade_5_0_x($rev) {
-  //    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
-  //    $this->addTask('Do the foo change', 'taskFoo', ...);
-  //    // Additional tasks here...
-  //    // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex.
-  //    // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
-  //  }
-
   /**
    * Upgrade function.
    *
@@ -74,6 +61,7 @@ public function upgrade_5_31_alpha1($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Remove Eway Single Currency Payment Processor type if not used or install the new extension for it', 'enableEwaySingleExtension');
     $this->addTask('dev/core#1486 Remove FKs from ACL Cache tables', 'removeFKsFromACLCacheTables');
+    $this->addTask('Activate core extension "Greenwich"', 'installGreenwich');
   }
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
@@ -114,4 +102,35 @@ public static function removeFKsFromACLCacheTables(CRM_Queue_TaskContext $ctx) {
     return TRUE;
   }
 
+  /**
+   * Install greenwich extensions.
+   *
+   * This feature is restructured as a core extension - which is primarily a code cleanup step.
+   *
+   * @param \CRM_Queue_TaskContext $ctx
+   *
+   * @return bool
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public static function installGreenwich(CRM_Queue_TaskContext $ctx) {
+    // Install via direct SQL manipulation. Note that:
+    // (1) This extension has no activation logic.
+    // (2) On new installs, the extension is activated purely via default SQL INSERT.
+    // (3) Caches are flushed at the end of the upgrade.
+    // ($) Over long term, upgrade steps are more reliable in SQL. API/BAO sometimes don't work mid-upgrade.
+    $insert = CRM_Utils_SQL_Insert::into('civicrm_extension')->row([
+      'type' => 'module',
+      'full_name' => 'greenwich',
+      'name' => 'Theme: Greenwich',
+      'label' => 'Theme: Greenwich',
+      'file' => 'greenwich',
+      'schema_version' => NULL,
+      'is_active' => 1,
+    ]);
+    CRM_Core_DAO::executeQuery($insert->usingReplace()->toSQL());
+
+    return TRUE;
+  }
+
 }

From 086c2acdb26347288da581fb70b6226e923101a0 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 00:40:44 -0700
Subject: [PATCH 661/834] greenwich - Add to civicrm_generated.mysql

---
 sql/civicrm_generated.mysql | 64 ++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index efdf1b78bce0..7ad709d891d7 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.26, for osx10.10 (x86_64)
+-- MySQL dump 10.13  Distrib 5.6.47, for Linux (x86_64)
 --
--- Host: 127.0.0.1    Database: dmastercivi
+-- Host: 127.0.0.1    Database: dmastercivi_ssc8b
 -- ------------------------------------------------------
--- Server version	5.7.26
+-- Server version	5.6.47
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -87,7 +87,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_activity` WRITE;
 /*!40000 ALTER TABLE `civicrm_activity` DISABLE KEYS */;
-INSERT INTO `civicrm_activity` (`id`, `source_record_id`, `activity_type_id`, `subject`, `activity_date_time`, `duration`, `location`, `phone_id`, `phone_number`, `details`, `status_id`, `priority_id`, `parent_id`, `is_test`, `medium_id`, `is_auto`, `relationship_id`, `is_current_revision`, `original_id`, `result`, `is_deleted`, `campaign_id`, `engagement_level`, `weight`, `is_star`, `created_date`, `modified_date`) VALUES (1,NULL,9,'Subject for Tell a Friend','2019-10-16 13:50:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(2,NULL,9,'Subject for Tell a Friend','2020-08-26 00:37:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(3,NULL,9,'Subject for Tell a Friend','2020-07-13 14:58:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(4,NULL,9,'Subject for Tell a Friend','2020-07-12 02:50:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(5,NULL,9,'Subject for Tell a Friend','2020-07-25 09:34:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(6,NULL,9,'Subject for Tell a Friend','2020-07-24 01:55:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(7,NULL,10,'Subject for Pledge Acknowledgment','2019-11-19 17:52:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(8,NULL,9,'Subject for Tell a Friend','2020-03-01 13:28:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(9,NULL,10,'Subject for Pledge Acknowledgment','2019-10-17 21:59:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(10,NULL,9,'Subject for Tell a Friend','2020-07-24 11:46:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(11,NULL,10,'Subject for Pledge Acknowledgment','2020-08-02 04:57:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(12,NULL,9,'Subject for Tell a Friend','2019-11-07 20:00:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(13,NULL,9,'Subject for Tell a Friend','2020-02-07 01:01:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(14,NULL,9,'Subject for Tell a Friend','2019-11-24 05:56:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(15,NULL,10,'Subject for Pledge Acknowledgment','2020-05-05 20:47:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(16,NULL,9,'Subject for Tell a Friend','2020-04-01 22:46:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(17,NULL,10,'Subject for Pledge Acknowledgment','2019-12-02 09:16:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(18,NULL,10,'Subject for Pledge Acknowledgment','2019-11-27 14:24:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(19,NULL,9,'Subject for Tell a Friend','2020-04-20 23:10:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(20,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 08:12:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(21,NULL,9,'Subject for Tell a Friend','2019-10-04 17:38:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(22,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 10:45:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(23,NULL,9,'Subject for Tell a Friend','2020-04-24 11:33:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(24,NULL,9,'Subject for Tell a Friend','2020-07-09 23:04:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(25,NULL,10,'Subject for Pledge Acknowledgment','2019-12-19 16:39:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(26,NULL,10,'Subject for Pledge Acknowledgment','2020-02-12 21:52:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(27,NULL,10,'Subject for Pledge Acknowledgment','2020-02-24 15:16:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(28,NULL,10,'Subject for Pledge Acknowledgment','2020-03-10 05:00:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(29,NULL,10,'Subject for Pledge Acknowledgment','2019-10-15 16:01:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(30,NULL,9,'Subject for Tell a Friend','2020-05-24 05:47:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(31,NULL,10,'Subject for Pledge Acknowledgment','2020-05-11 19:54:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(32,NULL,10,'Subject for Pledge Acknowledgment','2020-03-23 15:30:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(33,NULL,10,'Subject for Pledge Acknowledgment','2019-11-25 02:03:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(34,NULL,9,'Subject for Tell a Friend','2020-04-03 07:02:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(35,NULL,10,'Subject for Pledge Acknowledgment','2020-06-24 20:36:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(36,NULL,10,'Subject for Pledge Acknowledgment','2019-12-22 03:59:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(37,NULL,9,'Subject for Tell a Friend','2020-05-13 02:38:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(38,NULL,10,'Subject for Pledge Acknowledgment','2019-09-21 10:35:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(39,NULL,9,'Subject for Tell a Friend','2020-08-18 11:16:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(40,NULL,9,'Subject for Tell a Friend','2020-02-20 19:49:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(41,NULL,9,'Subject for Tell a Friend','2020-03-03 11:50:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(42,NULL,9,'Subject for Tell a Friend','2020-02-24 09:23:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(43,NULL,9,'Subject for Tell a Friend','2019-11-18 10:49:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(44,NULL,9,'Subject for Tell a Friend','2019-11-07 02:34:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(45,NULL,10,'Subject for Pledge Acknowledgment','2020-07-21 10:01:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(46,NULL,10,'Subject for Pledge Acknowledgment','2020-05-23 18:38:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(47,NULL,9,'Subject for Tell a Friend','2019-12-06 22:52:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(48,NULL,9,'Subject for Tell a Friend','2020-07-31 06:27:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(49,NULL,9,'Subject for Tell a Friend','2019-12-29 21:50:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(50,NULL,9,'Subject for Tell a Friend','2020-02-06 14:57:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(51,NULL,9,'Subject for Tell a Friend','2020-01-21 21:31:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(52,NULL,9,'Subject for Tell a Friend','2020-07-15 10:58:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(53,NULL,9,'Subject for Tell a Friend','2019-09-20 21:01:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(54,NULL,10,'Subject for Pledge Acknowledgment','2020-07-08 17:51:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(55,NULL,10,'Subject for Pledge Acknowledgment','2020-06-20 17:21:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(56,NULL,9,'Subject for Tell a Friend','2019-11-05 04:39:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(57,NULL,9,'Subject for Tell a Friend','2020-09-13 09:26:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(58,NULL,10,'Subject for Pledge Acknowledgment','2019-10-03 00:19:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(59,NULL,9,'Subject for Tell a Friend','2020-05-02 06:51:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(60,NULL,10,'Subject for Pledge Acknowledgment','2020-02-24 09:33:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(61,NULL,10,'Subject for Pledge Acknowledgment','2019-11-05 04:54:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(62,NULL,10,'Subject for Pledge Acknowledgment','2020-04-21 11:56:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(63,NULL,9,'Subject for Tell a Friend','2019-09-17 23:17:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(64,NULL,9,'Subject for Tell a Friend','2020-02-23 14:22:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(65,NULL,9,'Subject for Tell a Friend','2019-12-24 16:19:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(66,NULL,10,'Subject for Pledge Acknowledgment','2020-08-11 17:29:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(67,NULL,9,'Subject for Tell a Friend','2020-05-11 14:17:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(68,NULL,9,'Subject for Tell a Friend','2020-06-10 08:56:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(69,NULL,10,'Subject for Pledge Acknowledgment','2019-09-26 18:39:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(70,NULL,9,'Subject for Tell a Friend','2019-09-20 00:22:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(71,NULL,9,'Subject for Tell a Friend','2020-07-24 19:14:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(72,NULL,9,'Subject for Tell a Friend','2020-03-26 07:22:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(73,NULL,10,'Subject for Pledge Acknowledgment','2020-03-28 12:24:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(74,NULL,9,'Subject for Tell a Friend','2019-11-08 02:49:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(75,NULL,9,'Subject for Tell a Friend','2020-02-17 12:41:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(76,NULL,10,'Subject for Pledge Acknowledgment','2020-03-16 07:45:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(77,NULL,10,'Subject for Pledge Acknowledgment','2019-10-26 17:42:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(78,NULL,9,'Subject for Tell a Friend','2020-05-07 00:59:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(79,NULL,9,'Subject for Tell a Friend','2020-01-02 19:27:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(80,NULL,9,'Subject for Tell a Friend','2020-03-23 06:37:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(81,NULL,9,'Subject for Tell a Friend','2020-03-17 03:56:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(82,NULL,9,'Subject for Tell a Friend','2020-03-11 01:47:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(83,NULL,9,'Subject for Tell a Friend','2020-01-15 12:15:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(84,NULL,10,'Subject for Pledge Acknowledgment','2020-07-01 08:40:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(85,NULL,10,'Subject for Pledge Acknowledgment','2020-03-15 03:29:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(86,NULL,9,'Subject for Tell a Friend','2020-09-03 04:38:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(87,NULL,9,'Subject for Tell a Friend','2020-02-17 20:06:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(88,NULL,10,'Subject for Pledge Acknowledgment','2020-09-02 06:50:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(89,NULL,10,'Subject for Pledge Acknowledgment','2020-03-14 20:13:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(90,NULL,9,'Subject for Tell a Friend','2020-09-13 01:11:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(91,NULL,9,'Subject for Tell a Friend','2020-04-18 01:21:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(92,NULL,10,'Subject for Pledge Acknowledgment','2020-07-27 07:34:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(93,NULL,9,'Subject for Tell a Friend','2020-03-01 10:29:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(94,NULL,9,'Subject for Tell a Friend','2019-10-16 23:54:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(95,NULL,9,'Subject for Tell a Friend','2020-03-09 21:29:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(96,NULL,10,'Subject for Pledge Acknowledgment','2020-01-06 10:43:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(97,NULL,9,'Subject for Tell a Friend','2020-05-16 10:50:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(98,NULL,9,'Subject for Tell a Friend','2020-07-25 18:40:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(99,NULL,9,'Subject for Tell a Friend','2020-07-24 09:31:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(100,NULL,10,'Subject for Pledge Acknowledgment','2020-07-27 06:02:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(101,NULL,10,'Subject for Pledge Acknowledgment','2020-05-08 18:55:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(102,NULL,9,'Subject for Tell a Friend','2020-05-25 00:35:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(103,NULL,9,'Subject for Tell a Friend','2020-01-14 08:27:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(104,NULL,9,'Subject for Tell a Friend','2020-06-15 05:27:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(105,NULL,9,'Subject for Tell a Friend','2019-10-22 03:25:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(106,NULL,9,'Subject for Tell a Friend','2020-02-14 16:40:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(107,NULL,9,'Subject for Tell a Friend','2019-10-31 20:16:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(108,NULL,9,'Subject for Tell a Friend','2019-09-28 03:14:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(109,NULL,9,'Subject for Tell a Friend','2020-09-08 11:09:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(110,NULL,10,'Subject for Pledge Acknowledgment','2020-01-09 01:47:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(111,NULL,9,'Subject for Tell a Friend','2020-04-08 09:29:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(112,NULL,9,'Subject for Tell a Friend','2019-10-04 22:00:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(113,NULL,9,'Subject for Tell a Friend','2020-01-28 08:28:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(114,NULL,9,'Subject for Tell a Friend','2019-12-22 06:33:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(115,NULL,10,'Subject for Pledge Acknowledgment','2020-07-29 23:30:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(116,NULL,9,'Subject for Tell a Friend','2020-03-10 07:20:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(117,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 04:05:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(118,NULL,9,'Subject for Tell a Friend','2020-05-14 14:15:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(119,NULL,10,'Subject for Pledge Acknowledgment','2020-04-19 15:17:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(120,NULL,10,'Subject for Pledge Acknowledgment','2020-01-23 14:35:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(121,NULL,9,'Subject for Tell a Friend','2020-06-11 02:52:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(122,NULL,9,'Subject for Tell a Friend','2020-04-25 17:51:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(123,NULL,10,'Subject for Pledge Acknowledgment','2020-03-30 20:34:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(124,NULL,9,'Subject for Tell a Friend','2019-09-22 08:02:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(125,NULL,9,'Subject for Tell a Friend','2020-05-20 02:30:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(126,NULL,10,'Subject for Pledge Acknowledgment','2020-01-11 19:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(127,NULL,9,'Subject for Tell a Friend','2020-04-23 10:53:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(128,NULL,10,'Subject for Pledge Acknowledgment','2020-07-08 00:14:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(129,NULL,10,'Subject for Pledge Acknowledgment','2020-08-05 03:46:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(130,NULL,9,'Subject for Tell a Friend','2020-04-22 05:02:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(131,NULL,10,'Subject for Pledge Acknowledgment','2019-12-01 22:48:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(132,NULL,10,'Subject for Pledge Acknowledgment','2020-06-04 21:18:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(133,NULL,9,'Subject for Tell a Friend','2020-02-20 21:15:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(134,NULL,9,'Subject for Tell a Friend','2020-02-19 21:54:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(135,NULL,9,'Subject for Tell a Friend','2020-01-02 10:44:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(136,NULL,9,'Subject for Tell a Friend','2020-04-17 06:22:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(137,NULL,9,'Subject for Tell a Friend','2019-10-18 15:10:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(138,NULL,10,'Subject for Pledge Acknowledgment','2020-06-21 20:32:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(139,NULL,9,'Subject for Tell a Friend','2019-11-01 18:24:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(140,NULL,10,'Subject for Pledge Acknowledgment','2020-07-28 08:52:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(141,NULL,10,'Subject for Pledge Acknowledgment','2019-11-24 02:43:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(142,NULL,9,'Subject for Tell a Friend','2019-10-20 13:11:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(143,NULL,10,'Subject for Pledge Acknowledgment','2020-03-01 01:56:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(144,NULL,10,'Subject for Pledge Acknowledgment','2020-03-14 18:06:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(145,NULL,9,'Subject for Tell a Friend','2019-12-24 09:33:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(146,NULL,9,'Subject for Tell a Friend','2020-09-09 06:38:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(147,NULL,9,'Subject for Tell a Friend','2020-07-29 13:10:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(148,NULL,9,'Subject for Tell a Friend','2020-06-15 16:27:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(149,NULL,9,'Subject for Tell a Friend','2019-09-30 15:23:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(150,NULL,9,'Subject for Tell a Friend','2020-06-06 21:19:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(151,NULL,10,'Subject for Pledge Acknowledgment','2020-07-07 04:57:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(152,NULL,9,'Subject for Tell a Friend','2020-07-17 17:49:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(153,NULL,10,'Subject for Pledge Acknowledgment','2019-12-06 12:55:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(154,NULL,10,'Subject for Pledge Acknowledgment','2019-12-04 22:44:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(155,NULL,9,'Subject for Tell a Friend','2020-06-17 19:25:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(156,NULL,10,'Subject for Pledge Acknowledgment','2020-05-29 17:08:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(157,NULL,10,'Subject for Pledge Acknowledgment','2019-10-07 22:18:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(158,NULL,9,'Subject for Tell a Friend','2020-08-13 20:04:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(159,NULL,9,'Subject for Tell a Friend','2020-08-27 22:29:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(160,NULL,10,'Subject for Pledge Acknowledgment','2020-09-01 05:01:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(161,NULL,9,'Subject for Tell a Friend','2020-03-27 11:17:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(162,NULL,10,'Subject for Pledge Acknowledgment','2020-07-15 23:43:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(163,NULL,9,'Subject for Tell a Friend','2019-10-13 04:20:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(164,NULL,9,'Subject for Tell a Friend','2020-04-04 01:06:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(165,NULL,10,'Subject for Pledge Acknowledgment','2020-04-27 01:02:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(166,NULL,9,'Subject for Tell a Friend','2019-11-19 02:08:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(167,NULL,10,'Subject for Pledge Acknowledgment','2020-06-24 22:55:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(168,NULL,9,'Subject for Tell a Friend','2019-11-14 01:42:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(169,NULL,9,'Subject for Tell a Friend','2020-04-13 22:38:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(170,NULL,10,'Subject for Pledge Acknowledgment','2020-07-07 22:16:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(171,NULL,9,'Subject for Tell a Friend','2019-12-13 18:42:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(172,NULL,9,'Subject for Tell a Friend','2020-05-24 12:26:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(173,NULL,10,'Subject for Pledge Acknowledgment','2019-09-25 17:10:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(174,NULL,9,'Subject for Tell a Friend','2020-04-17 21:28:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(175,NULL,10,'Subject for Pledge Acknowledgment','2020-01-18 10:02:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(176,NULL,9,'Subject for Tell a Friend','2020-09-08 18:44:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(177,NULL,10,'Subject for Pledge Acknowledgment','2020-04-08 22:55:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(178,NULL,10,'Subject for Pledge Acknowledgment','2019-12-21 03:22:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(179,NULL,10,'Subject for Pledge Acknowledgment','2020-01-29 08:31:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(180,NULL,9,'Subject for Tell a Friend','2020-05-26 07:35:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(181,NULL,10,'Subject for Pledge Acknowledgment','2020-01-01 05:28:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(182,NULL,10,'Subject for Pledge Acknowledgment','2020-09-02 10:23:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(183,NULL,9,'Subject for Tell a Friend','2020-07-09 16:15:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(184,NULL,9,'Subject for Tell a Friend','2019-09-23 15:53:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(185,NULL,9,'Subject for Tell a Friend','2020-04-20 16:55:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(186,NULL,10,'Subject for Pledge Acknowledgment','2020-01-23 17:35:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(187,NULL,10,'Subject for Pledge Acknowledgment','2020-06-14 16:26:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(188,NULL,10,'Subject for Pledge Acknowledgment','2020-07-17 16:25:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(189,NULL,9,'Subject for Tell a Friend','2020-05-06 14:10:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(190,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 01:23:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(191,NULL,9,'Subject for Tell a Friend','2020-01-22 10:42:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(192,NULL,9,'Subject for Tell a Friend','2020-07-10 09:04:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(193,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 07:19:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(194,NULL,9,'Subject for Tell a Friend','2020-08-14 21:37:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(195,NULL,9,'Subject for Tell a Friend','2020-06-08 09:23:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(196,NULL,10,'Subject for Pledge Acknowledgment','2019-11-16 03:27:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(197,NULL,10,'Subject for Pledge Acknowledgment','2020-02-13 16:59:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(198,NULL,10,'Subject for Pledge Acknowledgment','2020-01-08 05:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(199,NULL,9,'Subject for Tell a Friend','2020-02-18 05:09:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(200,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 14:19:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(201,NULL,9,'Subject for Tell a Friend','2020-09-12 05:05:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(202,NULL,10,'Subject for Pledge Acknowledgment','2019-12-11 07:35:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(203,NULL,9,'Subject for Tell a Friend','2020-07-09 16:55:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(204,NULL,10,'Subject for Pledge Acknowledgment','2020-06-21 08:46:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(205,NULL,10,'Subject for Pledge Acknowledgment','2020-01-15 17:00:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(206,NULL,10,'Subject for Pledge Acknowledgment','2019-11-13 01:26:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(207,NULL,10,'Subject for Pledge Acknowledgment','2020-05-15 10:18:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(208,NULL,10,'Subject for Pledge Acknowledgment','2020-03-31 13:18:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(209,NULL,9,'Subject for Tell a Friend','2019-12-01 20:27:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(210,NULL,9,'Subject for Tell a Friend','2020-07-04 03:20:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(211,NULL,9,'Subject for Tell a Friend','2019-11-03 07:13:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(212,NULL,10,'Subject for Pledge Acknowledgment','2020-06-26 07:36:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(213,NULL,9,'Subject for Tell a Friend','2019-11-21 09:37:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(214,NULL,9,'Subject for Tell a Friend','2020-06-25 16:40:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(215,NULL,9,'Subject for Tell a Friend','2019-10-13 01:46:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(216,NULL,9,'Subject for Tell a Friend','2019-11-23 19:58:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(217,NULL,9,'Subject for Tell a Friend','2020-03-18 05:40:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(218,NULL,9,'Subject for Tell a Friend','2020-02-15 06:56:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(219,NULL,9,'Subject for Tell a Friend','2020-02-05 22:20:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(220,NULL,10,'Subject for Pledge Acknowledgment','2020-07-04 21:54:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(221,NULL,10,'Subject for Pledge Acknowledgment','2020-09-10 20:57:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(222,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 10:50:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(223,NULL,10,'Subject for Pledge Acknowledgment','2020-08-18 07:39:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(224,NULL,9,'Subject for Tell a Friend','2020-05-14 06:48:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(225,NULL,9,'Subject for Tell a Friend','2019-12-17 14:25:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(226,NULL,10,'Subject for Pledge Acknowledgment','2019-11-11 03:32:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(227,NULL,9,'Subject for Tell a Friend','2020-01-29 15:58:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(228,NULL,10,'Subject for Pledge Acknowledgment','2020-01-13 11:36:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(229,NULL,10,'Subject for Pledge Acknowledgment','2020-01-09 07:30:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(230,NULL,9,'Subject for Tell a Friend','2020-01-17 07:26:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(231,NULL,9,'Subject for Tell a Friend','2020-03-26 21:48:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(232,NULL,10,'Subject for Pledge Acknowledgment','2020-07-05 13:02:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(233,NULL,9,'Subject for Tell a Friend','2020-08-16 06:30:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(234,NULL,10,'Subject for Pledge Acknowledgment','2020-08-16 10:17:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(235,NULL,10,'Subject for Pledge Acknowledgment','2019-12-25 01:35:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(236,NULL,10,'Subject for Pledge Acknowledgment','2020-08-13 22:44:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(237,NULL,10,'Subject for Pledge Acknowledgment','2020-07-17 09:46:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(238,NULL,10,'Subject for Pledge Acknowledgment','2019-10-28 19:22:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(239,NULL,10,'Subject for Pledge Acknowledgment','2020-05-12 08:00:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(240,NULL,9,'Subject for Tell a Friend','2020-02-06 02:38:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(241,NULL,10,'Subject for Pledge Acknowledgment','2020-08-28 20:51:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(242,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 05:44:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(243,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 00:09:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(244,NULL,10,'Subject for Pledge Acknowledgment','2020-06-18 08:27:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(245,NULL,10,'Subject for Pledge Acknowledgment','2020-05-27 22:56:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(246,NULL,10,'Subject for Pledge Acknowledgment','2020-06-22 17:21:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(247,NULL,10,'Subject for Pledge Acknowledgment','2020-02-15 14:41:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(248,NULL,9,'Subject for Tell a Friend','2019-09-27 09:04:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(249,NULL,9,'Subject for Tell a Friend','2020-07-22 10:48:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(250,NULL,10,'Subject for Pledge Acknowledgment','2019-11-08 16:20:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(251,NULL,9,'Subject for Tell a Friend','2020-06-26 00:45:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(252,NULL,9,'Subject for Tell a Friend','2019-10-05 02:54:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(253,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 06:33:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(254,NULL,9,'Subject for Tell a Friend','2020-02-11 01:01:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(255,NULL,10,'Subject for Pledge Acknowledgment','2020-01-11 20:03:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(256,NULL,9,'Subject for Tell a Friend','2019-09-26 10:20:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(257,NULL,10,'Subject for Pledge Acknowledgment','2019-12-11 18:26:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(258,NULL,10,'Subject for Pledge Acknowledgment','2020-02-27 02:43:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(259,NULL,10,'Subject for Pledge Acknowledgment','2019-10-25 10:20:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(260,NULL,9,'Subject for Tell a Friend','2020-03-18 06:22:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(261,NULL,9,'Subject for Tell a Friend','2020-01-26 00:17:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(262,NULL,10,'Subject for Pledge Acknowledgment','2020-02-12 04:08:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(263,NULL,9,'Subject for Tell a Friend','2020-04-06 13:30:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(264,NULL,10,'Subject for Pledge Acknowledgment','2020-03-21 10:05:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(265,NULL,10,'Subject for Pledge Acknowledgment','2019-10-02 22:22:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(266,NULL,9,'Subject for Tell a Friend','2020-08-19 07:44:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(267,NULL,9,'Subject for Tell a Friend','2020-06-13 14:37:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(268,NULL,9,'Subject for Tell a Friend','2020-02-12 15:07:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(269,NULL,9,'Subject for Tell a Friend','2019-12-09 05:21:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(270,NULL,9,'Subject for Tell a Friend','2020-08-09 03:47:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(271,NULL,9,'Subject for Tell a Friend','2019-12-25 15:19:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(272,NULL,9,'Subject for Tell a Friend','2019-11-13 00:03:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(273,NULL,10,'Subject for Pledge Acknowledgment','2020-07-13 01:29:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(274,NULL,10,'Subject for Pledge Acknowledgment','2020-04-12 04:53:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(275,NULL,9,'Subject for Tell a Friend','2020-09-11 06:45:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(276,NULL,10,'Subject for Pledge Acknowledgment','2020-06-19 19:44:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(277,NULL,10,'Subject for Pledge Acknowledgment','2020-01-03 13:28:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(278,NULL,10,'Subject for Pledge Acknowledgment','2020-07-23 23:01:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(279,NULL,10,'Subject for Pledge Acknowledgment','2019-11-14 14:57:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(280,NULL,10,'Subject for Pledge Acknowledgment','2020-02-21 17:06:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(281,NULL,9,'Subject for Tell a Friend','2019-11-19 17:16:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(282,NULL,10,'Subject for Pledge Acknowledgment','2020-01-17 22:33:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(283,NULL,9,'Subject for Tell a Friend','2020-03-13 12:03:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(284,NULL,9,'Subject for Tell a Friend','2020-06-27 07:41:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(285,NULL,10,'Subject for Pledge Acknowledgment','2019-11-24 12:03:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(286,NULL,10,'Subject for Pledge Acknowledgment','2020-02-01 16:38:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(287,NULL,9,'Subject for Tell a Friend','2020-06-28 14:48:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(288,NULL,10,'Subject for Pledge Acknowledgment','2020-01-03 13:20:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(289,NULL,10,'Subject for Pledge Acknowledgment','2020-05-09 11:25:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(290,NULL,10,'Subject for Pledge Acknowledgment','2019-12-24 01:16:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(291,NULL,10,'Subject for Pledge Acknowledgment','2019-12-04 21:44:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(292,NULL,10,'Subject for Pledge Acknowledgment','2019-11-26 09:08:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(293,NULL,9,'Subject for Tell a Friend','2020-07-26 12:41:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(294,NULL,9,'Subject for Tell a Friend','2019-10-05 03:58:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(295,NULL,9,'Subject for Tell a Friend','2020-07-12 01:43:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(296,NULL,9,'Subject for Tell a Friend','2020-06-10 02:53:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(297,NULL,9,'Subject for Tell a Friend','2020-02-16 15:44:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(298,NULL,9,'Subject for Tell a Friend','2020-02-10 06:40:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(299,NULL,9,'Subject for Tell a Friend','2019-09-24 02:23:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(300,NULL,9,'Subject for Tell a Friend','2020-09-12 03:00:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(301,NULL,9,'Subject for Tell a Friend','2020-07-23 12:48:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(302,NULL,9,'Subject for Tell a Friend','2020-04-29 10:42:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(303,NULL,9,'Subject for Tell a Friend','2019-10-28 15:05:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(304,NULL,10,'Subject for Pledge Acknowledgment','2020-09-04 19:33:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(305,NULL,10,'Subject for Pledge Acknowledgment','2020-04-21 05:02:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(306,NULL,10,'Subject for Pledge Acknowledgment','2020-06-19 13:58:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(307,NULL,10,'Subject for Pledge Acknowledgment','2020-02-28 19:50:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(308,NULL,10,'Subject for Pledge Acknowledgment','2020-02-15 03:07:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(309,NULL,9,'Subject for Tell a Friend','2020-05-05 09:48:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(310,NULL,9,'Subject for Tell a Friend','2020-05-29 19:33:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(311,NULL,9,'Subject for Tell a Friend','2020-08-19 05:44:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(312,NULL,10,'Subject for Pledge Acknowledgment','2020-05-31 09:35:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(313,NULL,10,'Subject for Pledge Acknowledgment','2020-04-29 13:22:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(314,NULL,9,'Subject for Tell a Friend','2019-10-14 17:41:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(315,NULL,10,'Subject for Pledge Acknowledgment','2020-05-07 19:54:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(316,NULL,10,'Subject for Pledge Acknowledgment','2020-01-30 23:14:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(317,NULL,10,'Subject for Pledge Acknowledgment','2019-09-29 05:05:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(318,NULL,9,'Subject for Tell a Friend','2020-03-10 07:43:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(319,NULL,9,'Subject for Tell a Friend','2020-07-03 13:15:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(320,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 06:53:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(321,NULL,9,'Subject for Tell a Friend','2020-06-03 07:47:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(322,NULL,9,'Subject for Tell a Friend','2020-05-16 23:30:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(323,NULL,9,'Subject for Tell a Friend','2020-06-19 11:44:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(324,NULL,9,'Subject for Tell a Friend','2020-06-03 15:32:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(325,NULL,10,'Subject for Pledge Acknowledgment','2019-12-25 02:56:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(326,NULL,9,'Subject for Tell a Friend','2020-06-30 15:16:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(327,NULL,9,'Subject for Tell a Friend','2020-03-08 06:26:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(328,NULL,10,'Subject for Pledge Acknowledgment','2020-05-20 11:38:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(329,NULL,10,'Subject for Pledge Acknowledgment','2019-10-28 02:53:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(330,NULL,9,'Subject for Tell a Friend','2020-07-08 15:18:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(331,NULL,9,'Subject for Tell a Friend','2020-08-23 00:45:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(332,NULL,10,'Subject for Pledge Acknowledgment','2020-06-17 15:11:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(333,NULL,9,'Subject for Tell a Friend','2020-02-19 06:01:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(334,NULL,10,'Subject for Pledge Acknowledgment','2019-12-30 22:37:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(335,NULL,9,'Subject for Tell a Friend','2019-11-11 15:43:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(336,NULL,9,'Subject for Tell a Friend','2019-10-22 22:37:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(337,NULL,9,'Subject for Tell a Friend','2020-09-07 14:45:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(338,NULL,10,'Subject for Pledge Acknowledgment','2019-10-31 19:20:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(339,NULL,9,'Subject for Tell a Friend','2020-07-04 23:18:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(340,NULL,9,'Subject for Tell a Friend','2019-10-12 01:01:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(341,NULL,10,'Subject for Pledge Acknowledgment','2020-07-01 22:30:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(342,NULL,10,'Subject for Pledge Acknowledgment','2020-04-05 13:53:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(343,NULL,9,'Subject for Tell a Friend','2020-01-23 09:00:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(344,NULL,10,'Subject for Pledge Acknowledgment','2020-08-29 06:23:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(345,NULL,10,'Subject for Pledge Acknowledgment','2020-02-14 04:19:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(346,NULL,9,'Subject for Tell a Friend','2019-12-31 10:18:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(347,NULL,9,'Subject for Tell a Friend','2020-02-09 21:18:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(348,NULL,9,'Subject for Tell a Friend','2019-12-22 10:01:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(349,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 07:54:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(350,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 09:23:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(351,NULL,9,'Subject for Tell a Friend','2020-02-25 15:14:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(352,NULL,10,'Subject for Pledge Acknowledgment','2020-07-19 02:27:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(353,NULL,10,'Subject for Pledge Acknowledgment','2020-04-14 22:08:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(354,NULL,10,'Subject for Pledge Acknowledgment','2019-09-18 20:42:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(355,NULL,9,'Subject for Tell a Friend','2020-05-29 02:48:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(356,NULL,10,'Subject for Pledge Acknowledgment','2020-07-06 20:16:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(357,NULL,9,'Subject for Tell a Friend','2020-04-24 19:52:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(358,NULL,10,'Subject for Pledge Acknowledgment','2020-08-12 02:52:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(359,NULL,10,'Subject for Pledge Acknowledgment','2020-06-18 06:58:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(360,NULL,9,'Subject for Tell a Friend','2020-04-28 15:43:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(361,NULL,10,'Subject for Pledge Acknowledgment','2019-09-27 17:15:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(362,NULL,10,'Subject for Pledge Acknowledgment','2020-03-05 04:43:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(363,NULL,9,'Subject for Tell a Friend','2020-06-13 11:19:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(364,NULL,10,'Subject for Pledge Acknowledgment','2020-05-25 17:53:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(365,NULL,9,'Subject for Tell a Friend','2020-04-11 12:47:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(366,NULL,9,'Subject for Tell a Friend','2020-05-18 14:03:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(367,NULL,10,'Subject for Pledge Acknowledgment','2019-10-06 10:00:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(368,NULL,10,'Subject for Pledge Acknowledgment','2020-05-30 07:40:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(369,NULL,10,'Subject for Pledge Acknowledgment','2019-12-10 00:31:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(370,NULL,10,'Subject for Pledge Acknowledgment','2020-09-13 11:17:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(371,NULL,10,'Subject for Pledge Acknowledgment','2020-07-21 09:00:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(372,NULL,9,'Subject for Tell a Friend','2020-03-13 23:46:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(373,NULL,10,'Subject for Pledge Acknowledgment','2019-11-23 14:02:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(374,NULL,9,'Subject for Tell a Friend','2019-12-04 07:42:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(375,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 07:25:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(376,NULL,10,'Subject for Pledge Acknowledgment','2020-05-07 20:30:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(377,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 08:53:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(378,NULL,9,'Subject for Tell a Friend','2020-05-05 15:50:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(379,NULL,10,'Subject for Pledge Acknowledgment','2020-03-15 11:12:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(380,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 09:11:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(381,NULL,10,'Subject for Pledge Acknowledgment','2019-10-13 03:45:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(382,NULL,10,'Subject for Pledge Acknowledgment','2020-07-19 05:13:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(383,NULL,9,'Subject for Tell a Friend','2020-01-15 06:24:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(384,NULL,9,'Subject for Tell a Friend','2020-08-16 16:49:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(385,NULL,10,'Subject for Pledge Acknowledgment','2020-08-18 13:40:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(386,NULL,9,'Subject for Tell a Friend','2019-12-27 13:55:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(387,NULL,10,'Subject for Pledge Acknowledgment','2020-04-01 02:38:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(388,NULL,10,'Subject for Pledge Acknowledgment','2020-05-11 13:45:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(389,NULL,9,'Subject for Tell a Friend','2020-02-24 17:06:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(390,NULL,9,'Subject for Tell a Friend','2020-01-21 19:47:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(391,NULL,9,'Subject for Tell a Friend','2020-07-07 15:17:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(392,NULL,9,'Subject for Tell a Friend','2020-02-29 20:07:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(393,NULL,9,'Subject for Tell a Friend','2019-10-11 12:38:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(394,NULL,9,'Subject for Tell a Friend','2020-01-01 13:36:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(395,NULL,10,'Subject for Pledge Acknowledgment','2019-12-29 23:54:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(396,NULL,9,'Subject for Tell a Friend','2019-12-26 03:42:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(397,NULL,10,'Subject for Pledge Acknowledgment','2020-05-17 20:49:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(398,NULL,10,'Subject for Pledge Acknowledgment','2020-08-13 14:10:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(399,NULL,10,'Subject for Pledge Acknowledgment','2019-09-26 18:30:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(400,NULL,9,'Subject for Tell a Friend','2020-03-14 23:57:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(401,NULL,9,'Subject for Tell a Friend','2020-01-04 12:54:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(402,NULL,10,'Subject for Pledge Acknowledgment','2020-04-19 03:37:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(403,NULL,9,'Subject for Tell a Friend','2020-01-02 14:13:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(404,NULL,9,'Subject for Tell a Friend','2020-06-28 17:46:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(405,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 16:31:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(406,NULL,10,'Subject for Pledge Acknowledgment','2020-02-23 11:19:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(407,NULL,9,'Subject for Tell a Friend','2020-07-18 04:21:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(408,NULL,10,'Subject for Pledge Acknowledgment','2020-08-15 14:10:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(409,NULL,9,'Subject for Tell a Friend','2020-05-16 22:11:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(410,NULL,10,'Subject for Pledge Acknowledgment','2020-01-07 16:26:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(411,NULL,10,'Subject for Pledge Acknowledgment','2020-07-13 20:54:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(412,NULL,10,'Subject for Pledge Acknowledgment','2020-02-02 12:52:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(413,NULL,9,'Subject for Tell a Friend','2019-12-27 23:18:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(414,NULL,10,'Subject for Pledge Acknowledgment','2020-03-11 17:30:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(415,NULL,9,'Subject for Tell a Friend','2020-02-28 14:05:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(416,NULL,9,'Subject for Tell a Friend','2020-04-04 04:36:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(417,NULL,9,'Subject for Tell a Friend','2020-05-20 22:30:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(418,NULL,10,'Subject for Pledge Acknowledgment','2020-05-29 09:05:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(419,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 01:16:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(420,NULL,10,'Subject for Pledge Acknowledgment','2020-01-08 16:04:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(421,NULL,9,'Subject for Tell a Friend','2020-03-05 04:19:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(422,NULL,9,'Subject for Tell a Friend','2020-01-15 22:03:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(423,NULL,10,'Subject for Pledge Acknowledgment','2019-09-24 07:29:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(424,NULL,10,'Subject for Pledge Acknowledgment','2019-09-25 01:39:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(425,NULL,9,'Subject for Tell a Friend','2020-06-07 12:04:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(426,NULL,9,'Subject for Tell a Friend','2019-12-10 06:28:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(427,NULL,10,'Subject for Pledge Acknowledgment','2020-08-10 21:11:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(428,NULL,9,'Subject for Tell a Friend','2020-08-19 15:34:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(429,NULL,10,'Subject for Pledge Acknowledgment','2020-03-22 22:09:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(430,NULL,9,'Subject for Tell a Friend','2020-05-20 06:08:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(431,NULL,9,'Subject for Tell a Friend','2020-04-17 21:40:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(432,NULL,9,'Subject for Tell a Friend','2020-04-29 13:11:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(433,NULL,10,'Subject for Pledge Acknowledgment','2020-02-29 16:27:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(434,NULL,10,'Subject for Pledge Acknowledgment','2019-10-06 05:03:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(435,NULL,9,'Subject for Tell a Friend','2019-12-31 17:28:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(436,NULL,9,'Subject for Tell a Friend','2020-06-28 15:40:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(437,NULL,10,'Subject for Pledge Acknowledgment','2020-03-11 19:44:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(438,NULL,10,'Subject for Pledge Acknowledgment','2019-12-02 17:58:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(439,NULL,10,'Subject for Pledge Acknowledgment','2019-10-21 22:11:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(440,NULL,9,'Subject for Tell a Friend','2020-07-21 18:34:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(441,NULL,10,'Subject for Pledge Acknowledgment','2020-03-28 19:15:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(442,NULL,9,'Subject for Tell a Friend','2019-11-28 22:19:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(443,NULL,10,'Subject for Pledge Acknowledgment','2020-07-17 04:35:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(444,NULL,9,'Subject for Tell a Friend','2020-01-30 02:27:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(445,NULL,10,'Subject for Pledge Acknowledgment','2019-11-22 13:28:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(446,NULL,10,'Subject for Pledge Acknowledgment','2020-05-14 21:04:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(447,NULL,10,'Subject for Pledge Acknowledgment','2019-11-12 15:02:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(448,NULL,10,'Subject for Pledge Acknowledgment','2019-12-09 17:28:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(449,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 23:34:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(450,NULL,9,'Subject for Tell a Friend','2019-11-08 05:33:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(451,1,6,'$ 125.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(452,2,6,'$ 50.00-Online: Save the Penguins','2010-03-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(453,3,6,'$ 25.00-Apr 2007 Mailer 1','2010-04-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(454,4,6,'$ 50.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(455,5,6,'$ 500.00-Apr 2007 Mailer 1','2010-04-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(456,6,6,'$ 175.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(457,7,6,'$ 50.00-Online: Save the Penguins','2010-03-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(458,8,6,'$ 10.00-Online: Save the Penguins','2010-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(459,9,6,'$ 250.00-Online: Save the Penguins','2010-04-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(460,10,6,NULL,'2009-07-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(461,11,6,NULL,'2009-07-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(462,12,6,NULL,'2009-10-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(463,13,6,NULL,'2009-12-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(464,1,7,'General','2020-09-16 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(465,2,7,'Student','2020-09-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(466,3,7,'General','2020-09-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(467,4,7,'Student','2020-09-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(468,5,7,'Student','2019-09-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(469,6,7,'Student','2020-09-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(470,7,7,'General','2020-09-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(471,8,7,'Student','2020-09-09 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(472,9,7,'General','2020-09-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(473,10,7,'Student','2019-09-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(474,11,7,'Lifetime','2020-09-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(475,12,7,'Student','2020-09-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(476,13,7,'General','2020-09-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(477,14,7,'Student','2020-09-03 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(478,15,7,'Student','2019-09-02 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(479,16,7,'Student','2020-09-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(480,17,7,'General','2020-08-31 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(481,18,7,'Student','2020-08-30 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(482,19,7,'General','2020-08-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(483,20,7,'Student','2019-08-28 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(484,21,7,'General','2020-08-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(485,22,7,'Lifetime','2020-08-26 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(486,23,7,'General','2020-08-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(487,24,7,'Student','2020-08-24 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(488,25,7,'General','2018-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(489,26,7,'Student','2020-08-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(490,27,7,'General','2020-08-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(491,28,7,'Student','2020-08-20 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(492,29,7,'General','2020-08-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(493,30,7,'Student','2019-08-18 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(494,14,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(495,15,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(496,16,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(497,17,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(498,18,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(499,19,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(500,20,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(501,21,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(502,22,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(503,23,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(504,24,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(505,25,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(506,26,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(507,27,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(508,28,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(509,29,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(510,30,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(511,31,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(512,32,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(513,33,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(514,34,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(515,35,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(516,36,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(517,37,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(518,38,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(519,39,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(520,40,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(521,41,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(522,42,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(523,43,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(525,1,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(526,2,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(527,3,5,'NULL','2008-05-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(528,4,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(529,5,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(530,6,5,'NULL','2008-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(531,7,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(532,8,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(533,9,5,'NULL','2008-02-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(534,10,5,'NULL','2008-02-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(535,11,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(536,12,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(537,13,5,'NULL','2008-06-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(538,14,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(539,15,5,'NULL','2008-07-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(540,16,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(541,17,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(542,18,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(543,19,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(544,20,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(545,21,5,'NULL','2008-03-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(546,22,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(547,23,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(548,24,5,'NULL','2008-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(549,25,5,'NULL','2008-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(550,26,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(551,27,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(552,28,5,'NULL','2009-12-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(553,29,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(554,30,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(555,31,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(556,32,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(557,33,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(558,34,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(559,35,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(560,36,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(561,37,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(562,38,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(563,39,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(564,40,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(565,41,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(566,42,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(567,43,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(568,44,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(569,45,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(570,46,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(571,47,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(572,48,5,'NULL','2009-12-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(573,49,5,'NULL','2009-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(574,50,5,'NULL','2009-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(575,45,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(576,46,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(577,47,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(578,48,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(579,49,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(580,50,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(581,51,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(582,52,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(583,53,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(584,54,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(585,55,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(586,56,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(587,57,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(588,58,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(589,59,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(590,60,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(591,61,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(592,62,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(593,63,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(594,64,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(595,65,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(596,66,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(597,67,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(598,68,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(599,69,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(600,70,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(601,71,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(602,72,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(603,73,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(604,74,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(605,75,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(606,76,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(607,77,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(608,78,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(609,79,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(610,80,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(611,81,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(612,82,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(613,83,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(614,84,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(615,85,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(616,86,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(617,87,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(618,88,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(619,89,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(620,90,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(621,91,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(622,92,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(623,93,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32'),(624,94,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 13:29:32',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-16 01:29:32','2020-09-16 01:29:32');
+INSERT INTO `civicrm_activity` (`id`, `source_record_id`, `activity_type_id`, `subject`, `activity_date_time`, `duration`, `location`, `phone_id`, `phone_number`, `details`, `status_id`, `priority_id`, `parent_id`, `is_test`, `medium_id`, `is_auto`, `relationship_id`, `is_current_revision`, `original_id`, `result`, `is_deleted`, `campaign_id`, `engagement_level`, `weight`, `is_star`, `created_date`, `modified_date`) VALUES (1,NULL,9,'Subject for Tell a Friend','2020-01-18 20:58:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(2,NULL,10,'Subject for Pledge Acknowledgment','2020-02-07 10:51:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(3,NULL,9,'Subject for Tell a Friend','2020-05-09 06:08:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(4,NULL,9,'Subject for Tell a Friend','2020-06-07 08:49:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(5,NULL,9,'Subject for Tell a Friend','2019-10-02 08:00:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(6,NULL,10,'Subject for Pledge Acknowledgment','2020-09-07 03:27:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(7,NULL,9,'Subject for Tell a Friend','2020-05-05 09:16:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(8,NULL,9,'Subject for Tell a Friend','2020-07-18 20:16:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(9,NULL,9,'Subject for Tell a Friend','2020-06-11 20:03:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(10,NULL,9,'Subject for Tell a Friend','2020-09-02 14:13:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(11,NULL,9,'Subject for Tell a Friend','2020-08-10 20:51:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(12,NULL,10,'Subject for Pledge Acknowledgment','2020-04-24 11:26:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(13,NULL,9,'Subject for Tell a Friend','2020-07-17 19:42:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(14,NULL,9,'Subject for Tell a Friend','2020-05-11 20:14:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(15,NULL,9,'Subject for Tell a Friend','2019-09-23 18:31:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(16,NULL,9,'Subject for Tell a Friend','2020-01-24 03:15:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(17,NULL,9,'Subject for Tell a Friend','2020-07-02 02:10:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(18,NULL,10,'Subject for Pledge Acknowledgment','2020-01-10 02:32:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(19,NULL,9,'Subject for Tell a Friend','2019-12-06 13:11:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(20,NULL,9,'Subject for Tell a Friend','2020-08-23 05:45:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(21,NULL,9,'Subject for Tell a Friend','2020-04-24 05:28:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(22,NULL,10,'Subject for Pledge Acknowledgment','2019-10-14 12:12:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(23,NULL,10,'Subject for Pledge Acknowledgment','2020-03-24 01:55:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(24,NULL,9,'Subject for Tell a Friend','2020-07-15 00:04:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(25,NULL,9,'Subject for Tell a Friend','2020-06-13 11:12:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(26,NULL,10,'Subject for Pledge Acknowledgment','2020-05-06 20:02:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(27,NULL,9,'Subject for Tell a Friend','2020-02-23 05:07:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(28,NULL,9,'Subject for Tell a Friend','2020-01-31 04:57:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(29,NULL,9,'Subject for Tell a Friend','2020-02-21 20:35:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(30,NULL,10,'Subject for Pledge Acknowledgment','2020-03-23 07:30:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(31,NULL,9,'Subject for Tell a Friend','2019-12-05 13:58:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(32,NULL,9,'Subject for Tell a Friend','2020-04-16 18:00:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(33,NULL,10,'Subject for Pledge Acknowledgment','2020-08-11 18:10:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(34,NULL,9,'Subject for Tell a Friend','2020-01-24 14:08:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(35,NULL,9,'Subject for Tell a Friend','2020-05-29 18:38:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(36,NULL,10,'Subject for Pledge Acknowledgment','2019-12-01 16:51:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(37,NULL,10,'Subject for Pledge Acknowledgment','2020-04-14 13:46:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(38,NULL,10,'Subject for Pledge Acknowledgment','2020-02-11 17:59:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(39,NULL,10,'Subject for Pledge Acknowledgment','2020-08-09 19:24:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(40,NULL,10,'Subject for Pledge Acknowledgment','2020-03-06 11:32:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(41,NULL,10,'Subject for Pledge Acknowledgment','2020-08-28 01:49:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(42,NULL,10,'Subject for Pledge Acknowledgment','2020-05-05 03:59:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(43,NULL,9,'Subject for Tell a Friend','2020-07-28 11:55:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(44,NULL,10,'Subject for Pledge Acknowledgment','2019-10-11 12:53:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(45,NULL,10,'Subject for Pledge Acknowledgment','2020-05-20 19:02:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(46,NULL,9,'Subject for Tell a Friend','2020-07-18 07:50:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(47,NULL,10,'Subject for Pledge Acknowledgment','2020-09-07 01:25:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(48,NULL,9,'Subject for Tell a Friend','2020-07-27 15:38:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(49,NULL,10,'Subject for Pledge Acknowledgment','2019-12-07 07:28:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(50,NULL,9,'Subject for Tell a Friend','2020-09-04 10:36:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(51,NULL,9,'Subject for Tell a Friend','2020-04-09 09:28:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(52,NULL,9,'Subject for Tell a Friend','2019-12-03 00:09:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(53,NULL,9,'Subject for Tell a Friend','2020-02-22 15:10:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(54,NULL,10,'Subject for Pledge Acknowledgment','2020-05-15 15:21:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(55,NULL,9,'Subject for Tell a Friend','2019-10-09 05:58:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(56,NULL,9,'Subject for Tell a Friend','2020-06-13 16:09:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(57,NULL,10,'Subject for Pledge Acknowledgment','2019-12-31 23:19:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(58,NULL,9,'Subject for Tell a Friend','2019-11-01 18:58:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(59,NULL,10,'Subject for Pledge Acknowledgment','2019-09-20 08:29:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(60,NULL,10,'Subject for Pledge Acknowledgment','2019-11-12 08:16:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(61,NULL,10,'Subject for Pledge Acknowledgment','2019-12-03 03:53:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(62,NULL,9,'Subject for Tell a Friend','2019-12-03 03:07:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(63,NULL,9,'Subject for Tell a Friend','2019-10-29 18:16:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(64,NULL,10,'Subject for Pledge Acknowledgment','2019-09-20 15:45:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(65,NULL,9,'Subject for Tell a Friend','2019-10-12 12:25:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(66,NULL,9,'Subject for Tell a Friend','2020-02-03 21:08:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(67,NULL,9,'Subject for Tell a Friend','2020-06-13 15:14:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(68,NULL,9,'Subject for Tell a Friend','2019-10-20 22:54:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(69,NULL,10,'Subject for Pledge Acknowledgment','2019-11-25 01:18:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(70,NULL,10,'Subject for Pledge Acknowledgment','2020-09-07 14:40:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(71,NULL,10,'Subject for Pledge Acknowledgment','2019-12-15 08:31:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(72,NULL,10,'Subject for Pledge Acknowledgment','2020-01-30 21:27:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(73,NULL,9,'Subject for Tell a Friend','2020-06-15 17:47:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(74,NULL,10,'Subject for Pledge Acknowledgment','2020-04-27 04:02:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(75,NULL,9,'Subject for Tell a Friend','2020-02-17 17:08:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(76,NULL,10,'Subject for Pledge Acknowledgment','2020-01-12 11:44:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(77,NULL,10,'Subject for Pledge Acknowledgment','2020-06-04 12:27:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(78,NULL,10,'Subject for Pledge Acknowledgment','2019-11-18 10:47:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(79,NULL,10,'Subject for Pledge Acknowledgment','2020-06-06 18:50:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(80,NULL,10,'Subject for Pledge Acknowledgment','2020-01-27 02:59:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(81,NULL,9,'Subject for Tell a Friend','2019-12-20 17:43:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(82,NULL,9,'Subject for Tell a Friend','2020-01-21 09:10:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(83,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 03:02:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(84,NULL,10,'Subject for Pledge Acknowledgment','2020-07-28 12:58:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(85,NULL,10,'Subject for Pledge Acknowledgment','2019-11-17 04:36:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(86,NULL,10,'Subject for Pledge Acknowledgment','2020-06-26 21:01:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(87,NULL,10,'Subject for Pledge Acknowledgment','2020-04-24 19:24:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(88,NULL,10,'Subject for Pledge Acknowledgment','2019-10-31 20:33:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(89,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 20:05:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(90,NULL,9,'Subject for Tell a Friend','2020-06-22 04:37:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(91,NULL,10,'Subject for Pledge Acknowledgment','2020-08-23 14:42:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(92,NULL,9,'Subject for Tell a Friend','2019-12-15 16:31:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(93,NULL,9,'Subject for Tell a Friend','2020-01-31 03:36:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(94,NULL,9,'Subject for Tell a Friend','2020-02-06 14:15:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(95,NULL,10,'Subject for Pledge Acknowledgment','2020-04-12 08:56:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(96,NULL,9,'Subject for Tell a Friend','2019-11-20 02:43:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(97,NULL,10,'Subject for Pledge Acknowledgment','2020-03-29 16:38:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(98,NULL,9,'Subject for Tell a Friend','2019-12-13 02:19:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(99,NULL,10,'Subject for Pledge Acknowledgment','2019-09-21 14:50:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(100,NULL,9,'Subject for Tell a Friend','2019-10-14 15:34:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(101,NULL,10,'Subject for Pledge Acknowledgment','2020-08-09 21:28:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(102,NULL,10,'Subject for Pledge Acknowledgment','2020-05-17 02:04:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(103,NULL,10,'Subject for Pledge Acknowledgment','2020-09-05 23:58:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(104,NULL,9,'Subject for Tell a Friend','2020-09-15 11:25:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(105,NULL,9,'Subject for Tell a Friend','2020-07-07 06:20:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(106,NULL,10,'Subject for Pledge Acknowledgment','2020-07-06 23:39:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(107,NULL,10,'Subject for Pledge Acknowledgment','2020-02-16 14:45:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(108,NULL,9,'Subject for Tell a Friend','2019-11-17 08:46:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(109,NULL,9,'Subject for Tell a Friend','2019-09-24 21:11:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(110,NULL,10,'Subject for Pledge Acknowledgment','2020-07-26 20:28:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(111,NULL,9,'Subject for Tell a Friend','2020-02-17 06:09:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(112,NULL,10,'Subject for Pledge Acknowledgment','2019-11-24 21:39:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(113,NULL,10,'Subject for Pledge Acknowledgment','2019-12-17 15:10:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(114,NULL,10,'Subject for Pledge Acknowledgment','2019-10-27 20:11:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(115,NULL,10,'Subject for Pledge Acknowledgment','2020-04-19 18:32:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(116,NULL,10,'Subject for Pledge Acknowledgment','2020-05-09 19:47:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(117,NULL,10,'Subject for Pledge Acknowledgment','2020-07-04 09:40:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(118,NULL,9,'Subject for Tell a Friend','2020-04-12 14:47:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(119,NULL,9,'Subject for Tell a Friend','2020-03-14 17:27:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(120,NULL,10,'Subject for Pledge Acknowledgment','2020-02-06 00:38:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(121,NULL,9,'Subject for Tell a Friend','2020-04-25 08:23:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(122,NULL,10,'Subject for Pledge Acknowledgment','2020-04-28 00:23:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(123,NULL,9,'Subject for Tell a Friend','2020-03-27 03:36:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(124,NULL,10,'Subject for Pledge Acknowledgment','2019-10-29 20:21:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(125,NULL,9,'Subject for Tell a Friend','2020-07-25 04:20:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(126,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 15:07:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(127,NULL,10,'Subject for Pledge Acknowledgment','2020-08-22 08:39:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(128,NULL,10,'Subject for Pledge Acknowledgment','2019-12-10 11:09:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(129,NULL,9,'Subject for Tell a Friend','2020-03-27 15:14:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(130,NULL,10,'Subject for Pledge Acknowledgment','2020-01-03 17:12:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(131,NULL,10,'Subject for Pledge Acknowledgment','2019-12-27 06:16:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(132,NULL,10,'Subject for Pledge Acknowledgment','2020-06-02 02:48:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(133,NULL,10,'Subject for Pledge Acknowledgment','2020-05-27 23:00:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(134,NULL,10,'Subject for Pledge Acknowledgment','2020-02-19 16:21:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(135,NULL,9,'Subject for Tell a Friend','2020-01-12 11:04:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(136,NULL,9,'Subject for Tell a Friend','2020-08-27 16:08:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(137,NULL,9,'Subject for Tell a Friend','2019-10-08 15:16:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(138,NULL,10,'Subject for Pledge Acknowledgment','2019-11-23 06:42:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(139,NULL,9,'Subject for Tell a Friend','2019-09-30 13:42:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(140,NULL,9,'Subject for Tell a Friend','2019-11-15 22:58:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(141,NULL,10,'Subject for Pledge Acknowledgment','2020-08-06 06:31:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(142,NULL,10,'Subject for Pledge Acknowledgment','2020-02-10 04:49:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(143,NULL,9,'Subject for Tell a Friend','2020-01-30 18:16:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(144,NULL,9,'Subject for Tell a Friend','2020-09-12 08:27:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(145,NULL,9,'Subject for Tell a Friend','2020-08-01 18:23:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(146,NULL,10,'Subject for Pledge Acknowledgment','2019-10-05 06:00:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(147,NULL,10,'Subject for Pledge Acknowledgment','2020-01-08 23:16:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(148,NULL,9,'Subject for Tell a Friend','2020-04-28 14:45:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(149,NULL,9,'Subject for Tell a Friend','2020-05-03 20:39:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(150,NULL,9,'Subject for Tell a Friend','2020-04-05 16:54:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(151,NULL,10,'Subject for Pledge Acknowledgment','2019-10-23 20:54:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(152,NULL,9,'Subject for Tell a Friend','2019-11-03 06:57:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(153,NULL,9,'Subject for Tell a Friend','2020-05-01 14:36:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(154,NULL,10,'Subject for Pledge Acknowledgment','2020-06-12 10:20:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(155,NULL,9,'Subject for Tell a Friend','2019-09-23 18:37:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(156,NULL,10,'Subject for Pledge Acknowledgment','2020-07-15 20:35:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(157,NULL,9,'Subject for Tell a Friend','2020-08-11 01:48:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(158,NULL,9,'Subject for Tell a Friend','2020-01-14 14:10:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(159,NULL,9,'Subject for Tell a Friend','2019-12-05 18:34:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(160,NULL,10,'Subject for Pledge Acknowledgment','2020-07-07 10:07:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(161,NULL,9,'Subject for Tell a Friend','2020-02-24 09:03:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(162,NULL,9,'Subject for Tell a Friend','2020-07-10 11:09:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(163,NULL,9,'Subject for Tell a Friend','2020-07-23 23:12:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(164,NULL,9,'Subject for Tell a Friend','2020-06-11 00:50:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(165,NULL,10,'Subject for Pledge Acknowledgment','2020-04-20 08:01:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(166,NULL,10,'Subject for Pledge Acknowledgment','2020-04-05 07:25:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(167,NULL,9,'Subject for Tell a Friend','2019-12-19 13:13:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(168,NULL,9,'Subject for Tell a Friend','2019-10-14 02:52:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(169,NULL,10,'Subject for Pledge Acknowledgment','2020-08-19 09:29:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(170,NULL,10,'Subject for Pledge Acknowledgment','2020-05-12 12:40:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(171,NULL,9,'Subject for Tell a Friend','2020-05-12 23:30:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(172,NULL,10,'Subject for Pledge Acknowledgment','2019-10-04 20:46:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(173,NULL,9,'Subject for Tell a Friend','2020-05-14 14:42:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(174,NULL,9,'Subject for Tell a Friend','2020-07-06 17:10:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(175,NULL,10,'Subject for Pledge Acknowledgment','2020-07-11 17:54:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(176,NULL,9,'Subject for Tell a Friend','2020-01-02 21:02:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(177,NULL,10,'Subject for Pledge Acknowledgment','2019-10-11 00:57:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(178,NULL,10,'Subject for Pledge Acknowledgment','2020-04-01 13:44:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(179,NULL,10,'Subject for Pledge Acknowledgment','2020-09-08 21:28:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(180,NULL,10,'Subject for Pledge Acknowledgment','2020-01-19 19:05:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(181,NULL,10,'Subject for Pledge Acknowledgment','2020-09-04 10:45:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(182,NULL,10,'Subject for Pledge Acknowledgment','2019-12-16 23:35:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(183,NULL,10,'Subject for Pledge Acknowledgment','2020-07-05 04:50:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(184,NULL,9,'Subject for Tell a Friend','2020-06-20 21:38:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(185,NULL,10,'Subject for Pledge Acknowledgment','2020-02-09 09:30:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(186,NULL,9,'Subject for Tell a Friend','2020-06-09 15:29:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(187,NULL,10,'Subject for Pledge Acknowledgment','2019-10-25 04:28:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(188,NULL,10,'Subject for Pledge Acknowledgment','2020-05-04 07:06:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(189,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 20:17:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(190,NULL,9,'Subject for Tell a Friend','2019-10-31 22:41:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(191,NULL,10,'Subject for Pledge Acknowledgment','2019-10-04 01:37:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(192,NULL,9,'Subject for Tell a Friend','2020-03-19 06:57:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(193,NULL,10,'Subject for Pledge Acknowledgment','2020-07-03 22:23:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(194,NULL,9,'Subject for Tell a Friend','2020-01-02 22:50:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(195,NULL,10,'Subject for Pledge Acknowledgment','2019-11-22 10:45:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(196,NULL,9,'Subject for Tell a Friend','2019-10-11 09:07:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(197,NULL,10,'Subject for Pledge Acknowledgment','2019-10-08 06:57:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(198,NULL,10,'Subject for Pledge Acknowledgment','2020-05-31 04:18:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(199,NULL,9,'Subject for Tell a Friend','2020-03-24 03:29:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(200,NULL,9,'Subject for Tell a Friend','2020-03-25 13:40:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(201,NULL,10,'Subject for Pledge Acknowledgment','2020-01-24 13:45:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(202,NULL,9,'Subject for Tell a Friend','2020-07-14 09:23:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(203,NULL,9,'Subject for Tell a Friend','2019-10-09 11:26:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(204,NULL,9,'Subject for Tell a Friend','2020-03-03 21:17:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(205,NULL,10,'Subject for Pledge Acknowledgment','2019-11-10 08:09:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(206,NULL,10,'Subject for Pledge Acknowledgment','2020-08-01 03:09:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(207,NULL,9,'Subject for Tell a Friend','2020-04-09 10:13:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:43','2020-09-17 02:54:43'),(208,NULL,10,'Subject for Pledge Acknowledgment','2020-01-21 16:42:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(209,NULL,10,'Subject for Pledge Acknowledgment','2019-12-13 22:31:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(210,NULL,9,'Subject for Tell a Friend','2019-10-09 19:07:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(211,NULL,9,'Subject for Tell a Friend','2019-12-06 16:12:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(212,NULL,9,'Subject for Tell a Friend','2019-12-28 04:02:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(213,NULL,9,'Subject for Tell a Friend','2020-02-28 10:48:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(214,NULL,10,'Subject for Pledge Acknowledgment','2020-08-12 07:48:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(215,NULL,10,'Subject for Pledge Acknowledgment','2019-10-27 07:44:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(216,NULL,10,'Subject for Pledge Acknowledgment','2020-01-29 05:46:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(217,NULL,10,'Subject for Pledge Acknowledgment','2020-08-02 20:38:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(218,NULL,9,'Subject for Tell a Friend','2019-10-19 06:24:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(219,NULL,9,'Subject for Tell a Friend','2020-04-08 21:15:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(220,NULL,10,'Subject for Pledge Acknowledgment','2020-06-15 14:57:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(221,NULL,10,'Subject for Pledge Acknowledgment','2020-07-21 02:49:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(222,NULL,10,'Subject for Pledge Acknowledgment','2020-07-18 16:50:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(223,NULL,10,'Subject for Pledge Acknowledgment','2020-03-29 12:35:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(224,NULL,10,'Subject for Pledge Acknowledgment','2020-04-13 02:19:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(225,NULL,9,'Subject for Tell a Friend','2019-09-24 12:08:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(226,NULL,9,'Subject for Tell a Friend','2020-07-01 10:30:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(227,NULL,9,'Subject for Tell a Friend','2020-06-08 19:14:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(228,NULL,9,'Subject for Tell a Friend','2019-09-18 06:16:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(229,NULL,9,'Subject for Tell a Friend','2020-03-05 13:46:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(230,NULL,10,'Subject for Pledge Acknowledgment','2020-08-21 09:14:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(231,NULL,9,'Subject for Tell a Friend','2020-04-16 12:12:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(232,NULL,10,'Subject for Pledge Acknowledgment','2020-03-07 07:38:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(233,NULL,10,'Subject for Pledge Acknowledgment','2020-03-27 07:35:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(234,NULL,10,'Subject for Pledge Acknowledgment','2020-02-08 20:22:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(235,NULL,9,'Subject for Tell a Friend','2020-09-11 02:48:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(236,NULL,9,'Subject for Tell a Friend','2020-07-13 04:11:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(237,NULL,10,'Subject for Pledge Acknowledgment','2020-05-14 03:00:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(238,NULL,10,'Subject for Pledge Acknowledgment','2019-12-04 15:29:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(239,NULL,9,'Subject for Tell a Friend','2020-03-09 05:16:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(240,NULL,10,'Subject for Pledge Acknowledgment','2019-11-26 08:58:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(241,NULL,10,'Subject for Pledge Acknowledgment','2020-04-15 18:01:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(242,NULL,9,'Subject for Tell a Friend','2019-11-22 19:25:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(243,NULL,9,'Subject for Tell a Friend','2019-12-28 11:40:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(244,NULL,10,'Subject for Pledge Acknowledgment','2020-04-20 08:10:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(245,NULL,10,'Subject for Pledge Acknowledgment','2019-10-18 22:50:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(246,NULL,9,'Subject for Tell a Friend','2020-08-04 11:35:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(247,NULL,9,'Subject for Tell a Friend','2020-08-20 10:14:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(248,NULL,10,'Subject for Pledge Acknowledgment','2020-04-23 21:24:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(249,NULL,9,'Subject for Tell a Friend','2020-01-29 02:53:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(250,NULL,10,'Subject for Pledge Acknowledgment','2020-06-03 23:19:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(251,NULL,10,'Subject for Pledge Acknowledgment','2019-11-01 09:10:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(252,NULL,10,'Subject for Pledge Acknowledgment','2019-11-10 19:24:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(253,NULL,9,'Subject for Tell a Friend','2020-03-18 18:35:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(254,NULL,9,'Subject for Tell a Friend','2019-10-06 14:15:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(255,NULL,9,'Subject for Tell a Friend','2019-11-27 18:43:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(256,NULL,10,'Subject for Pledge Acknowledgment','2020-01-04 05:43:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(257,NULL,10,'Subject for Pledge Acknowledgment','2019-12-13 17:57:46',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(258,NULL,9,'Subject for Tell a Friend','2019-11-29 12:27:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(259,NULL,10,'Subject for Pledge Acknowledgment','2019-11-27 04:44:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(260,NULL,9,'Subject for Tell a Friend','2019-10-01 20:49:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(261,NULL,10,'Subject for Pledge Acknowledgment','2020-03-09 12:02:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(262,NULL,9,'Subject for Tell a Friend','2020-03-01 14:37:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(263,NULL,9,'Subject for Tell a Friend','2020-06-21 23:07:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(264,NULL,10,'Subject for Pledge Acknowledgment','2020-02-07 06:31:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(265,NULL,9,'Subject for Tell a Friend','2020-04-04 21:43:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(266,NULL,10,'Subject for Pledge Acknowledgment','2019-11-19 02:06:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(267,NULL,9,'Subject for Tell a Friend','2020-03-26 16:23:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(268,NULL,10,'Subject for Pledge Acknowledgment','2020-06-02 05:46:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(269,NULL,9,'Subject for Tell a Friend','2020-09-01 06:36:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(270,NULL,9,'Subject for Tell a Friend','2019-11-23 13:56:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(271,NULL,9,'Subject for Tell a Friend','2020-03-05 15:38:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(272,NULL,10,'Subject for Pledge Acknowledgment','2020-06-07 22:54:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(273,NULL,10,'Subject for Pledge Acknowledgment','2019-12-07 06:23:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(274,NULL,9,'Subject for Tell a Friend','2020-05-15 07:00:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(275,NULL,9,'Subject for Tell a Friend','2020-07-18 15:17:34',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(276,NULL,10,'Subject for Pledge Acknowledgment','2020-05-24 00:08:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(277,NULL,9,'Subject for Tell a Friend','2020-04-04 05:41:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(278,NULL,10,'Subject for Pledge Acknowledgment','2020-01-18 20:46:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(279,NULL,9,'Subject for Tell a Friend','2020-06-04 06:10:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(280,NULL,9,'Subject for Tell a Friend','2020-04-20 07:06:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(281,NULL,10,'Subject for Pledge Acknowledgment','2020-06-20 13:59:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(282,NULL,9,'Subject for Tell a Friend','2020-01-25 23:02:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(283,NULL,9,'Subject for Tell a Friend','2019-09-27 19:25:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(284,NULL,9,'Subject for Tell a Friend','2020-09-03 12:33:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(285,NULL,10,'Subject for Pledge Acknowledgment','2020-07-25 13:21:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(286,NULL,9,'Subject for Tell a Friend','2019-09-23 11:03:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(287,NULL,10,'Subject for Pledge Acknowledgment','2019-10-18 18:02:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(288,NULL,10,'Subject for Pledge Acknowledgment','2020-05-07 08:03:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(289,NULL,9,'Subject for Tell a Friend','2019-10-01 06:02:05',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(290,NULL,10,'Subject for Pledge Acknowledgment','2019-10-14 12:25:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(291,NULL,9,'Subject for Tell a Friend','2020-07-23 09:34:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(292,NULL,10,'Subject for Pledge Acknowledgment','2020-03-03 17:13:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(293,NULL,10,'Subject for Pledge Acknowledgment','2020-04-02 07:37:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(294,NULL,9,'Subject for Tell a Friend','2020-08-21 08:05:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(295,NULL,10,'Subject for Pledge Acknowledgment','2019-11-29 06:53:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(296,NULL,9,'Subject for Tell a Friend','2019-11-02 12:39:45',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(297,NULL,9,'Subject for Tell a Friend','2020-04-30 03:41:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(298,NULL,9,'Subject for Tell a Friend','2019-10-29 18:28:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(299,NULL,10,'Subject for Pledge Acknowledgment','2020-01-09 00:16:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(300,NULL,10,'Subject for Pledge Acknowledgment','2019-10-17 22:23:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(301,NULL,9,'Subject for Tell a Friend','2019-09-30 16:18:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(302,NULL,10,'Subject for Pledge Acknowledgment','2020-08-19 06:20:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(303,NULL,10,'Subject for Pledge Acknowledgment','2020-04-23 18:19:09',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(304,NULL,10,'Subject for Pledge Acknowledgment','2019-11-21 12:23:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(305,NULL,9,'Subject for Tell a Friend','2019-10-26 22:23:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(306,NULL,9,'Subject for Tell a Friend','2020-09-06 10:05:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(307,NULL,10,'Subject for Pledge Acknowledgment','2020-05-13 03:09:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(308,NULL,9,'Subject for Tell a Friend','2020-09-09 03:17:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(309,NULL,10,'Subject for Pledge Acknowledgment','2019-10-17 21:42:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(310,NULL,10,'Subject for Pledge Acknowledgment','2019-11-08 19:10:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(311,NULL,9,'Subject for Tell a Friend','2020-03-18 02:43:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(312,NULL,10,'Subject for Pledge Acknowledgment','2020-02-11 16:23:29',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(313,NULL,9,'Subject for Tell a Friend','2020-07-02 03:22:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(314,NULL,9,'Subject for Tell a Friend','2020-01-28 17:11:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(315,NULL,9,'Subject for Tell a Friend','2020-07-25 17:49:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(316,NULL,9,'Subject for Tell a Friend','2020-06-14 13:21:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(317,NULL,9,'Subject for Tell a Friend','2020-08-10 16:35:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(318,NULL,10,'Subject for Pledge Acknowledgment','2019-12-25 19:17:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(319,NULL,10,'Subject for Pledge Acknowledgment','2020-06-14 16:43:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(320,NULL,10,'Subject for Pledge Acknowledgment','2020-01-26 11:35:44',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(321,NULL,9,'Subject for Tell a Friend','2020-08-30 14:49:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(322,NULL,9,'Subject for Tell a Friend','2020-07-11 23:42:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(323,NULL,9,'Subject for Tell a Friend','2019-10-14 13:51:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(324,NULL,10,'Subject for Pledge Acknowledgment','2020-01-27 10:48:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(325,NULL,9,'Subject for Tell a Friend','2019-10-26 21:38:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(326,NULL,10,'Subject for Pledge Acknowledgment','2020-06-19 10:28:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(327,NULL,9,'Subject for Tell a Friend','2019-09-23 16:09:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(328,NULL,9,'Subject for Tell a Friend','2020-03-08 14:26:12',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(329,NULL,10,'Subject for Pledge Acknowledgment','2019-10-05 12:25:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(330,NULL,10,'Subject for Pledge Acknowledgment','2019-10-13 09:35:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(331,NULL,9,'Subject for Tell a Friend','2019-12-27 08:18:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(332,NULL,9,'Subject for Tell a Friend','2020-03-02 05:32:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(333,NULL,10,'Subject for Pledge Acknowledgment','2020-01-24 19:02:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(334,NULL,9,'Subject for Tell a Friend','2020-02-29 01:18:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(335,NULL,10,'Subject for Pledge Acknowledgment','2020-08-26 07:39:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(336,NULL,9,'Subject for Tell a Friend','2020-04-26 21:36:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(337,NULL,10,'Subject for Pledge Acknowledgment','2020-07-12 18:36:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(338,NULL,9,'Subject for Tell a Friend','2020-06-29 17:56:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(339,NULL,9,'Subject for Tell a Friend','2019-10-13 09:32:15',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(340,NULL,10,'Subject for Pledge Acknowledgment','2019-11-07 19:33:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(341,NULL,9,'Subject for Tell a Friend','2020-05-19 02:34:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(342,NULL,10,'Subject for Pledge Acknowledgment','2020-06-16 09:50:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(343,NULL,10,'Subject for Pledge Acknowledgment','2020-02-05 10:22:39',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(344,NULL,9,'Subject for Tell a Friend','2020-06-21 14:54:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(345,NULL,10,'Subject for Pledge Acknowledgment','2020-04-17 22:32:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(346,NULL,10,'Subject for Pledge Acknowledgment','2019-12-31 20:32:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(347,NULL,10,'Subject for Pledge Acknowledgment','2020-08-29 21:31:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(348,NULL,9,'Subject for Tell a Friend','2020-05-12 22:13:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(349,NULL,9,'Subject for Tell a Friend','2020-06-19 04:11:11',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(350,NULL,9,'Subject for Tell a Friend','2020-02-26 10:21:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(351,NULL,9,'Subject for Tell a Friend','2019-12-10 06:27:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(352,NULL,10,'Subject for Pledge Acknowledgment','2020-04-02 05:06:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(353,NULL,10,'Subject for Pledge Acknowledgment','2020-03-20 10:40:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(354,NULL,9,'Subject for Tell a Friend','2020-07-03 13:18:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(355,NULL,9,'Subject for Tell a Friend','2019-11-05 11:08:21',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(356,NULL,9,'Subject for Tell a Friend','2020-03-14 07:02:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(357,NULL,9,'Subject for Tell a Friend','2020-03-25 06:06:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(358,NULL,9,'Subject for Tell a Friend','2020-07-23 20:08:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(359,NULL,9,'Subject for Tell a Friend','2020-05-10 09:25:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(360,NULL,10,'Subject for Pledge Acknowledgment','2020-01-06 14:52:30',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(361,NULL,10,'Subject for Pledge Acknowledgment','2020-03-24 13:49:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(362,NULL,10,'Subject for Pledge Acknowledgment','2020-04-02 09:19:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(363,NULL,9,'Subject for Tell a Friend','2019-10-10 22:23:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(364,NULL,9,'Subject for Tell a Friend','2019-11-06 05:37:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(365,NULL,9,'Subject for Tell a Friend','2020-07-03 23:04:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(366,NULL,10,'Subject for Pledge Acknowledgment','2020-08-01 09:53:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(367,NULL,9,'Subject for Tell a Friend','2020-06-06 13:11:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(368,NULL,9,'Subject for Tell a Friend','2020-07-05 12:18:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(369,NULL,9,'Subject for Tell a Friend','2020-05-15 13:44:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(370,NULL,9,'Subject for Tell a Friend','2019-12-04 12:35:16',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(371,NULL,9,'Subject for Tell a Friend','2020-04-17 18:04:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(372,NULL,9,'Subject for Tell a Friend','2020-07-13 21:48:25',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(373,NULL,10,'Subject for Pledge Acknowledgment','2020-03-20 02:44:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(374,NULL,10,'Subject for Pledge Acknowledgment','2020-07-08 00:34:51',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(375,NULL,10,'Subject for Pledge Acknowledgment','2019-12-03 10:18:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(376,NULL,9,'Subject for Tell a Friend','2020-02-25 07:19:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(377,NULL,9,'Subject for Tell a Friend','2019-09-23 02:54:17',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(378,NULL,10,'Subject for Pledge Acknowledgment','2020-05-16 06:11:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(379,NULL,9,'Subject for Tell a Friend','2020-08-21 16:10:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(380,NULL,10,'Subject for Pledge Acknowledgment','2020-06-05 19:57:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(381,NULL,9,'Subject for Tell a Friend','2020-01-25 17:43:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(382,NULL,10,'Subject for Pledge Acknowledgment','2020-05-04 03:26:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(383,NULL,9,'Subject for Tell a Friend','2020-03-06 15:49:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(384,NULL,9,'Subject for Tell a Friend','2020-07-28 11:04:43',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(385,NULL,10,'Subject for Pledge Acknowledgment','2019-12-18 15:08:28',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(386,NULL,9,'Subject for Tell a Friend','2020-07-27 03:21:33',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(387,NULL,9,'Subject for Tell a Friend','2020-06-02 07:01:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(388,NULL,9,'Subject for Tell a Friend','2020-06-29 20:06:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(389,NULL,9,'Subject for Tell a Friend','2020-06-27 16:27:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(390,NULL,9,'Subject for Tell a Friend','2020-06-30 17:32:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(391,NULL,9,'Subject for Tell a Friend','2020-05-19 11:23:58',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(392,NULL,9,'Subject for Tell a Friend','2019-12-18 07:04:31',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(393,NULL,10,'Subject for Pledge Acknowledgment','2020-04-22 22:00:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(394,NULL,9,'Subject for Tell a Friend','2020-07-24 07:10:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(395,NULL,10,'Subject for Pledge Acknowledgment','2020-06-05 12:06:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(396,NULL,9,'Subject for Tell a Friend','2020-03-15 21:27:47',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(397,NULL,9,'Subject for Tell a Friend','2020-04-29 10:42:10',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(398,NULL,10,'Subject for Pledge Acknowledgment','2020-02-08 09:58:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(399,NULL,10,'Subject for Pledge Acknowledgment','2020-07-28 23:47:54',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(400,NULL,9,'Subject for Tell a Friend','2020-06-11 10:12:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(401,NULL,10,'Subject for Pledge Acknowledgment','2020-03-17 22:07:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(402,NULL,10,'Subject for Pledge Acknowledgment','2020-07-26 19:44:02',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(403,NULL,10,'Subject for Pledge Acknowledgment','2020-01-31 03:05:42',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(404,NULL,9,'Subject for Tell a Friend','2020-09-13 22:48:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(405,NULL,9,'Subject for Tell a Friend','2019-09-27 23:16:57',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(406,NULL,9,'Subject for Tell a Friend','2020-02-01 16:16:26',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(407,NULL,9,'Subject for Tell a Friend','2020-08-24 19:16:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(408,NULL,10,'Subject for Pledge Acknowledgment','2020-09-01 23:10:07',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(409,NULL,9,'Subject for Tell a Friend','2019-11-13 09:09:08',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(410,NULL,10,'Subject for Pledge Acknowledgment','2019-11-09 06:10:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(411,NULL,9,'Subject for Tell a Friend','2020-08-02 12:54:38',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(412,NULL,9,'Subject for Tell a Friend','2020-01-20 01:37:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(413,NULL,10,'Subject for Pledge Acknowledgment','2020-05-13 23:18:03',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(414,NULL,10,'Subject for Pledge Acknowledgment','2020-05-22 13:53:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(415,NULL,10,'Subject for Pledge Acknowledgment','2020-07-25 06:57:52',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(416,NULL,9,'Subject for Tell a Friend','2020-04-11 10:42:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(417,NULL,9,'Subject for Tell a Friend','2020-02-03 09:21:06',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(418,NULL,10,'Subject for Pledge Acknowledgment','2020-01-02 08:10:23',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(419,NULL,9,'Subject for Tell a Friend','2020-04-01 18:39:27',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(420,NULL,10,'Subject for Pledge Acknowledgment','2019-12-14 20:25:32',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(421,NULL,10,'Subject for Pledge Acknowledgment','2020-07-10 15:17:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(422,NULL,9,'Subject for Tell a Friend','2019-09-18 17:08:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(423,NULL,10,'Subject for Pledge Acknowledgment','2020-06-25 08:13:37',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(424,NULL,10,'Subject for Pledge Acknowledgment','2020-01-24 16:09:55',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(425,NULL,9,'Subject for Tell a Friend','2019-11-08 15:49:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(426,NULL,10,'Subject for Pledge Acknowledgment','2020-05-19 09:22:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(427,NULL,10,'Subject for Pledge Acknowledgment','2019-12-01 21:42:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(428,NULL,9,'Subject for Tell a Friend','2020-09-03 11:39:01',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(429,NULL,10,'Subject for Pledge Acknowledgment','2020-07-02 08:43:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(430,NULL,10,'Subject for Pledge Acknowledgment','2020-01-26 16:43:49',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(431,NULL,10,'Subject for Pledge Acknowledgment','2019-11-28 14:08:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(432,NULL,10,'Subject for Pledge Acknowledgment','2020-04-18 09:59:59',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(433,NULL,10,'Subject for Pledge Acknowledgment','2019-12-10 09:28:22',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(434,NULL,10,'Subject for Pledge Acknowledgment','2019-10-19 18:06:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(435,NULL,10,'Subject for Pledge Acknowledgment','2020-06-13 16:39:04',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(436,NULL,9,'Subject for Tell a Friend','2020-03-19 21:00:40',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(437,NULL,10,'Subject for Pledge Acknowledgment','2020-06-07 15:17:20',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(438,NULL,10,'Subject for Pledge Acknowledgment','2020-05-10 15:19:53',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(439,NULL,10,'Subject for Pledge Acknowledgment','2019-09-29 08:01:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(440,NULL,10,'Subject for Pledge Acknowledgment','2019-11-06 07:36:19',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(441,NULL,10,'Subject for Pledge Acknowledgment','2020-05-04 14:10:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(442,NULL,9,'Subject for Tell a Friend','2019-10-25 19:26:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(443,NULL,10,'Subject for Pledge Acknowledgment','2020-07-05 19:19:56',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(444,NULL,9,'Subject for Tell a Friend','2020-01-19 08:39:36',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(445,NULL,9,'Subject for Tell a Friend','2020-02-02 14:02:35',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(446,NULL,10,'Subject for Pledge Acknowledgment','2020-03-03 18:32:13',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(447,NULL,10,'Subject for Pledge Acknowledgment','2020-05-18 18:53:18',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(448,NULL,9,'Subject for Tell a Friend','2020-07-21 14:10:48',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(449,NULL,10,'Subject for Pledge Acknowledgment','2020-07-28 00:29:24',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(450,NULL,10,'Subject for Pledge Acknowledgment','2020-06-05 07:01:14',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(451,1,6,'$ 125.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(452,2,6,'$ 50.00-Online: Save the Penguins','2010-03-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(453,3,6,'$ 25.00-Apr 2007 Mailer 1','2010-04-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(454,4,6,'$ 50.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(455,5,6,'$ 500.00-Apr 2007 Mailer 1','2010-04-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(456,6,6,'$ 175.00-Apr 2007 Mailer 1','2010-04-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(457,7,6,'$ 50.00-Online: Save the Penguins','2010-03-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(458,8,6,'$ 10.00-Online: Save the Penguins','2010-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(459,9,6,'$ 250.00-Online: Save the Penguins','2010-04-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(460,10,6,NULL,'2009-07-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(461,11,6,NULL,'2009-07-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(462,12,6,NULL,'2009-10-01 11:53:50',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(463,13,6,NULL,'2009-12-01 12:55:41',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(464,1,7,'General','2020-09-16 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(465,2,7,'Student','2020-09-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(466,3,7,'General','2020-09-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(467,4,7,'Student','2020-09-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(468,5,7,'General','2018-08-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(469,6,7,'Student','2020-09-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(470,7,7,'General','2020-09-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(471,8,7,'Student','2020-09-09 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(472,9,7,'General','2020-09-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(473,10,7,'Student','2019-09-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(474,11,7,'Lifetime','2020-09-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(475,12,7,'Student','2020-09-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(476,13,7,'General','2020-09-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(477,14,7,'Student','2020-09-03 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(478,15,7,'Student','2019-09-02 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(479,16,7,'Student','2020-09-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(480,17,7,'General','2020-08-31 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(481,18,7,'Student','2020-08-30 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(482,19,7,'General','2020-08-29 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(483,20,7,'General','2018-04-17 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(484,21,7,'General','2020-08-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(485,22,7,'Lifetime','2020-08-26 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(486,23,7,'General','2020-08-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(487,24,7,'Student','2020-08-24 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(488,25,7,'General','2018-03-08 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(489,26,7,'Student','2020-08-22 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(490,27,7,'General','2020-08-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(491,28,7,'Student','2020-08-20 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(492,29,7,'General','2020-08-19 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(493,30,7,'General','2018-01-27 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(494,14,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(495,15,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(496,16,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(497,17,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(498,18,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(499,19,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(500,20,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(501,21,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(502,22,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(503,23,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(504,24,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(505,25,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(506,26,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(507,27,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(508,28,6,'$ 100.00 - General Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(509,29,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(510,30,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(511,31,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(512,32,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(513,33,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(514,34,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(515,35,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(516,36,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(517,37,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(518,38,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(519,39,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(520,40,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(521,41,6,'$ 50.00 - Student Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(522,42,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(523,43,6,'$ 1200.00 - Lifetime Membership: Offline signup','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Membership Payment',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(525,1,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(526,2,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(527,3,5,'NULL','2008-05-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(528,4,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(529,5,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(530,6,5,'NULL','2008-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(531,7,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(532,8,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(533,9,5,'NULL','2008-02-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(534,10,5,'NULL','2008-02-01 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(535,11,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(536,12,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(537,13,5,'NULL','2008-06-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(538,14,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(539,15,5,'NULL','2008-07-04 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(540,16,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(541,17,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(542,18,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(543,19,5,'NULL','2008-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(544,20,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(545,21,5,'NULL','2008-03-25 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(546,22,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(547,23,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(548,24,5,'NULL','2008-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(549,25,5,'NULL','2008-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(550,26,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(551,27,5,'NULL','2008-05-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(552,28,5,'NULL','2009-12-12 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(553,29,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(554,30,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(555,31,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(556,32,5,'NULL','2009-07-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(557,33,5,'NULL','2009-03-07 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(558,34,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(559,35,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(560,36,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(561,37,5,'NULL','2009-03-06 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(562,38,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(563,39,5,'NULL','2008-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(564,40,5,'NULL','2009-12-14 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(565,41,5,'NULL','2009-01-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(566,42,5,'NULL','2009-12-15 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(567,43,5,'NULL','2009-03-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(568,44,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(569,45,5,'NULL','2009-01-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(570,46,5,'NULL','2009-12-13 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(571,47,5,'NULL','2009-10-21 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(572,48,5,'NULL','2009-12-10 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(573,49,5,'NULL','2009-03-11 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(574,50,5,'NULL','2009-04-05 00:00:00',NULL,NULL,NULL,NULL,NULL,2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(575,45,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(576,46,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(577,47,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(578,48,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(579,49,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(580,50,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(581,51,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(582,52,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(583,53,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(584,54,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(585,55,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(586,56,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(587,57,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(588,58,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(589,59,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(590,60,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(591,61,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(592,62,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(593,63,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(594,64,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(595,65,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(596,66,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(597,67,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(598,68,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(599,69,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(600,70,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(601,71,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(602,72,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(603,73,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(604,74,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(605,75,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(606,76,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(607,77,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(608,78,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(609,79,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(610,80,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(611,81,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(612,82,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(613,83,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(614,84,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(615,85,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(616,86,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(617,87,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(618,88,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(619,89,6,'$ 50.00 - Summer Solstice Festival Day Concert : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(620,90,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(621,91,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(622,92,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(623,93,6,'$ 800.00 - Rain-forest Cup Youth Soccer Tournament : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44'),(624,94,6,'$ 50.00 - Fall Fundraiser Dinner : Offline registration','2020-09-16 19:54:44',NULL,NULL,NULL,NULL,'Participant',2,NULL,NULL,0,NULL,0,NULL,1,NULL,NULL,0,NULL,NULL,NULL,0,'2020-09-17 02:54:44','2020-09-17 02:54:44');
 /*!40000 ALTER TABLE `civicrm_activity` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -97,7 +97,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_activity_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_activity_contact` DISABLE KEYS */;
-INSERT INTO `civicrm_activity_contact` (`id`, `activity_id`, `contact_id`, `record_type_id`) VALUES (108,68,1,3),(293,183,1,3),(187,114,2,3),(667,435,2,3),(688,451,2,2),(111,70,3,3),(409,263,3,3),(674,440,3,3),(726,489,3,2),(731,519,3,2),(52,34,4,3),(140,87,4,3),(271,168,4,3),(339,214,4,3),(689,452,4,2),(81,51,5,3),(236,146,5,3),(527,339,5,3),(640,417,5,3),(323,203,6,3),(357,225,6,3),(690,453,6,2),(153,95,7,3),(305,191,7,3),(798,561,7,2),(221,136,8,3),(691,454,8,2),(804,567,8,2),(172,106,9,3),(211,130,9,3),(101,64,10,3),(238,147,10,3),(128,80,11,3),(663,432,11,3),(786,549,11,2),(265,164,12,3),(517,333,12,3),(170,105,13,3),(719,482,13,2),(732,512,13,2),(809,572,13,2),(21,12,14,3),(130,81,14,3),(334,211,15,3),(369,233,15,3),(149,93,16,3),(492,318,16,3),(692,455,16,2),(729,492,16,2),(733,522,16,2),(168,104,17,3),(226,139,17,3),(349,219,17,3),(454,294,17,3),(638,416,18,3),(120,75,19,3),(645,421,19,3),(693,456,19,2),(391,251,20,3),(479,309,20,3),(355,224,21,3),(566,366,21,3),(609,396,21,3),(792,555,21,2),(12,6,22,3),(89,56,22,3),(604,393,22,3),(59,39,23,3),(132,82,23,3),(204,125,23,3),(366,231,23,3),(419,269,23,3),(174,107,24,3),(281,174,24,3),(67,43,25,3),(99,63,25,3),(647,422,25,3),(764,527,26,2),(550,355,27,3),(606,394,27,3),(802,565,27,2),(106,67,28,3),(661,431,28,3),(464,299,29,3),(35,21,30,3),(94,59,30,3),(199,122,30,3),(470,302,31,3),(6,3,32,3),(506,326,32,3),(508,327,32,3),(653,426,32,3),(699,462,32,2),(700,463,32,2),(2,1,33,3),(69,44,33,3),(337,213,33,3),(708,471,33,2),(734,501,33,2),(245,151,34,2),(246,152,34,2),(248,153,34,2),(249,154,34,2),(250,155,34,2),(252,156,34,2),(253,157,34,2),(254,158,34,2),(256,159,34,2),(258,160,34,2),(259,161,34,2),(261,162,34,2),(262,163,34,2),(264,164,34,2),(266,165,34,2),(267,166,34,2),(269,167,34,2),(270,168,34,2),(272,169,34,2),(274,170,34,2),(275,171,34,2),(277,172,34,2),(279,173,34,2),(280,174,34,2),(282,175,34,2),(283,176,34,2),(285,177,34,2),(286,178,34,2),(287,179,34,2),(288,180,34,2),(290,181,34,2),(291,182,34,2),(292,183,34,2),(294,184,34,2),(296,185,34,2),(298,186,34,2),(299,187,34,2),(300,188,34,2),(301,189,34,2),(303,190,34,2),(304,191,34,2),(306,192,34,2),(308,193,34,2),(309,194,34,2),(311,195,34,2),(313,196,34,2),(314,197,34,2),(315,198,34,2),(316,199,34,2),(318,200,34,2),(319,201,34,2),(321,202,34,2),(322,203,34,2),(324,204,34,2),(325,205,34,2),(326,206,34,2),(327,207,34,2),(328,208,34,2),(329,209,34,2),(331,210,34,2),(333,211,34,2),(335,212,34,2),(336,213,34,2),(338,214,34,2),(340,215,34,2),(342,216,34,2),(344,217,34,2),(346,218,34,2),(348,219,34,2),(350,220,34,2),(351,221,34,2),(352,222,34,2),(353,223,34,2),(354,224,34,2),(356,225,34,2),(358,226,34,2),(359,227,34,2),(361,228,34,2),(362,229,34,2),(363,230,34,2),(365,231,34,2),(367,232,34,2),(368,233,34,2),(370,234,34,2),(371,235,34,2),(372,236,34,2),(373,237,34,2),(374,238,34,2),(375,239,34,2),(376,240,34,2),(378,241,34,2),(379,242,34,2),(380,243,34,2),(381,244,34,2),(382,245,34,2),(383,246,34,2),(384,247,34,2),(385,248,34,2),(387,249,34,2),(389,250,34,2),(390,251,34,2),(392,252,34,2),(394,253,34,2),(395,254,34,2),(397,255,34,2),(398,256,34,2),(400,257,34,2),(401,258,34,2),(402,259,34,2),(403,260,34,2),(405,261,34,2),(407,262,34,2),(408,263,34,2),(410,264,34,2),(411,265,34,2),(412,266,34,2),(414,267,34,2),(416,268,34,2),(418,269,34,2),(420,270,34,2),(422,271,34,2),(424,272,34,2),(426,273,34,2),(427,274,34,2),(428,275,34,2),(430,276,34,2),(431,277,34,2),(432,278,34,2),(433,279,34,2),(434,280,34,2),(435,281,34,2),(437,282,34,2),(438,283,34,2),(440,284,34,2),(442,285,34,2),(443,286,34,2),(444,287,34,2),(446,288,34,2),(447,289,34,2),(448,290,34,2),(449,291,34,2),(450,292,34,2),(451,293,34,2),(453,294,34,2),(455,295,34,2),(457,296,34,2),(459,297,34,2),(461,298,34,2),(463,299,34,2),(465,300,34,2),(541,348,34,3),(669,436,34,3),(696,459,34,2),(193,118,35,3),(263,163,35,3),(345,217,35,3),(25,14,36,3),(614,400,36,3),(217,134,37,3),(557,360,37,3),(581,378,37,3),(332,210,39,3),(706,469,40,2),(735,499,40,2),(406,261,41,3),(553,357,41,3),(158,98,42,3),(330,209,42,3),(429,275,42,3),(77,49,43,3),(202,124,43,3),(268,166,43,3),(386,248,43,3),(687,450,43,3),(698,461,43,2),(176,108,45,3),(524,337,45,3),(166,103,46,3),(807,570,46,2),(18,10,47,3),(436,281,47,3),(592,386,47,3),(520,335,48,3),(522,336,48,3),(703,466,48,2),(736,496,48,2),(789,552,48,2),(240,148,49,3),(393,252,49,3),(771,534,50,2),(197,121,51,3),(704,467,51,2),(737,497,51,2),(539,347,52,3),(797,560,52,2),(811,574,53,2),(257,159,54,3),(421,270,54,3),(181,111,55,3),(347,218,55,3),(483,311,55,3),(32,19,56,3),(576,374,56,3),(712,475,56,2),(738,505,56,2),(47,30,57,3),(445,287,57,3),(503,324,57,3),(564,365,57,3),(134,83,58,3),(207,127,58,3),(284,176,59,3),(295,184,59,3),(118,74,60,3),(178,109,60,3),(215,133,60,3),(399,256,60,3),(497,321,60,3),(598,390,60,3),(763,526,60,2),(28,16,61,3),(273,169,61,3),(468,301,62,3),(481,310,62,3),(621,404,62,3),(38,23,63,3),(260,161,63,3),(307,192,63,3),(499,322,63,3),(144,90,64,3),(244,150,64,3),(255,158,64,3),(404,260,64,3),(628,409,64,3),(720,483,64,2),(739,513,64,2),(75,48,66,3),(616,401,66,3),(15,8,67,3),(230,142,67,3),(801,564,67,2),(501,323,68,3),(730,493,68,2),(740,523,68,2),(251,155,69,3),(589,384,69,3),(276,171,70,3),(467,301,70,2),(469,302,70,2),(471,303,70,2),(473,304,70,2),(474,305,70,2),(475,306,70,2),(476,307,70,2),(477,308,70,2),(478,309,70,2),(480,310,70,2),(482,311,70,2),(484,312,70,2),(485,313,70,2),(486,314,70,2),(488,315,70,2),(489,316,70,2),(490,317,70,2),(491,318,70,2),(493,319,70,2),(495,320,70,2),(496,321,70,2),(498,322,70,2),(500,323,70,2),(502,324,70,2),(504,325,70,2),(505,326,70,2),(507,327,70,2),(509,328,70,2),(510,329,70,2),(511,330,70,2),(512,330,70,3),(513,331,70,2),(515,332,70,2),(516,333,70,2),(518,334,70,2),(519,335,70,2),(521,336,70,2),(523,337,70,2),(525,338,70,2),(526,339,70,2),(528,340,70,2),(530,341,70,2),(531,342,70,2),(532,343,70,2),(534,344,70,2),(535,345,70,2),(536,346,70,2),(538,347,70,2),(540,348,70,2),(542,349,70,2),(543,350,70,2),(544,351,70,2),(546,352,70,2),(547,353,70,2),(548,354,70,2),(549,355,70,2),(551,356,70,2),(552,357,70,2),(554,358,70,2),(555,359,70,2),(556,360,70,2),(558,361,70,2),(559,362,70,2),(560,363,70,2),(562,364,70,2),(563,365,70,2),(565,366,70,2),(567,367,70,2),(568,368,70,2),(569,369,70,2),(570,370,70,2),(571,371,70,2),(572,372,70,2),(574,373,70,2),(575,374,70,2),(577,375,70,2),(578,376,70,2),(579,377,70,2),(580,378,70,2),(582,379,70,2),(583,380,70,2),(584,381,70,2),(585,382,70,2),(586,383,70,2),(588,384,70,2),(590,385,70,2),(591,386,70,2),(593,387,70,2),(594,388,70,2),(595,389,70,2),(597,390,70,2),(599,391,70,2),(601,392,70,2),(603,393,70,2),(605,394,70,2),(607,395,70,2),(608,396,70,2),(610,397,70,2),(611,398,70,2),(612,399,70,2),(613,400,70,2),(615,401,70,2),(617,402,70,2),(618,403,70,2),(620,404,70,2),(622,405,70,2),(623,406,70,2),(624,407,70,2),(626,408,70,2),(627,409,70,2),(629,410,70,2),(630,411,70,2),(631,412,70,2),(632,413,70,2),(634,414,70,2),(635,415,70,2),(637,416,70,2),(639,417,70,2),(641,418,70,2),(642,419,70,2),(643,420,70,2),(644,421,70,2),(646,422,70,2),(648,423,70,2),(649,424,70,2),(650,425,70,2),(652,426,70,2),(654,427,70,2),(655,428,70,2),(657,429,70,2),(658,430,70,2),(660,431,70,2),(662,432,70,2),(664,433,70,2),(665,434,70,2),(666,435,70,2),(668,436,70,2),(670,437,70,2),(671,438,70,2),(672,439,70,2),(673,440,70,2),(675,441,70,2),(676,442,70,2),(678,443,70,2),(679,444,70,2),(680,444,70,3),(681,445,70,2),(682,446,70,2),(683,447,70,2),(684,448,70,2),(685,449,70,2),(686,450,70,2),(23,13,71,3),(160,99,71,3),(533,343,71,3),(697,460,71,2),(61,40,73,3),(242,149,73,3),(701,464,73,2),(741,494,73,2),(56,37,74,3),(439,283,74,3),(472,303,74,3),(494,319,74,3),(545,351,74,3),(561,363,74,3),(458,296,75,3),(310,194,76,3),(625,407,76,3),(777,540,76,2),(73,47,77,3),(91,57,77,3),(219,135,77,3),(312,195,77,3),(364,230,77,3),(466,300,77,3),(573,372,77,3),(787,550,77,2),(185,113,78,3),(247,152,78,3),(289,180,78,3),(302,189,78,3),(317,199,78,3),(343,216,78,3),(423,271,78,3),(651,425,78,3),(784,547,78,2),(115,72,79,3),(800,563,79,2),(4,2,80,3),(63,41,80,3),(659,430,80,3),(790,553,80,2),(487,314,81,3),(694,457,82,2),(768,531,82,2),(79,50,83,3),(65,42,84,3),(596,389,84,3),(781,544,84,2),(460,297,85,3),(806,569,85,2),(1,1,86,2),(3,2,86,2),(5,3,86,2),(7,4,86,2),(9,5,86,2),(11,6,86,2),(13,7,86,2),(14,8,86,2),(16,9,86,2),(17,10,86,2),(19,11,86,2),(20,12,86,2),(22,13,86,2),(24,14,86,2),(26,15,86,2),(27,16,86,2),(29,17,86,2),(30,18,86,2),(31,19,86,2),(33,20,86,2),(34,21,86,2),(36,22,86,2),(37,23,86,2),(39,24,86,2),(41,25,86,2),(42,26,86,2),(43,27,86,2),(44,28,86,2),(45,29,86,2),(46,30,86,2),(48,31,86,2),(49,32,86,2),(50,33,86,2),(51,34,86,2),(53,35,86,2),(54,36,86,2),(55,37,86,2),(57,38,86,2),(58,39,86,2),(60,40,86,2),(62,41,86,2),(64,42,86,2),(66,43,86,2),(68,44,86,2),(70,45,86,2),(71,46,86,2),(72,47,86,2),(74,48,86,2),(76,49,86,2),(78,50,86,2),(80,51,86,2),(82,52,86,2),(84,53,86,2),(86,54,86,2),(87,55,86,2),(88,56,86,2),(90,57,86,2),(92,58,86,2),(93,59,86,2),(95,60,86,2),(96,61,86,2),(97,62,86,2),(98,63,86,2),(100,64,86,2),(102,65,86,2),(104,66,86,2),(105,67,86,2),(107,68,86,2),(109,69,86,2),(110,70,86,2),(112,71,86,2),(114,72,86,2),(116,73,86,2),(117,74,86,2),(119,75,86,2),(121,76,86,2),(122,77,86,2),(123,78,86,2),(125,79,86,2),(127,80,86,2),(129,81,86,2),(131,82,86,2),(133,83,86,2),(135,84,86,2),(136,85,86,2),(137,86,86,2),(139,87,86,2),(141,88,86,2),(142,89,86,2),(143,90,86,2),(145,91,86,2),(147,92,86,2),(148,93,86,2),(150,94,86,2),(152,95,86,2),(154,96,86,2),(155,97,86,2),(157,98,86,2),(159,99,86,2),(161,100,86,2),(162,101,86,2),(163,102,86,2),(165,103,86,2),(167,104,86,2),(169,105,86,2),(171,106,86,2),(173,107,86,2),(175,108,86,2),(177,109,86,2),(179,110,86,2),(180,111,86,2),(182,112,86,2),(184,113,86,2),(186,114,86,2),(188,115,86,2),(189,116,86,2),(191,117,86,2),(192,118,86,2),(194,119,86,2),(195,120,86,2),(196,121,86,2),(198,122,86,2),(200,123,86,2),(201,124,86,2),(203,125,86,2),(205,126,86,2),(206,127,86,2),(208,128,86,2),(209,129,86,2),(210,130,86,2),(212,131,86,2),(213,132,86,2),(214,133,86,2),(216,134,86,2),(218,135,86,2),(220,136,86,2),(222,137,86,2),(224,138,86,2),(225,139,86,2),(227,140,86,2),(228,141,86,2),(229,142,86,2),(231,143,86,2),(232,144,86,2),(233,145,86,2),(235,146,86,2),(237,147,86,2),(239,148,86,2),(241,149,86,2),(243,150,86,2),(727,490,86,2),(742,520,86,2),(600,391,87,3),(138,86,88,3),(278,172,88,3),(587,383,88,3),(164,102,89,3),(413,266,90,3),(156,97,91,3),(190,116,91,3),(417,268,91,3),(320,201,92,3),(360,227,92,3),(388,249,92,3),(514,331,92,3),(537,346,92,3),(695,458,92,2),(702,465,92,2),(743,495,92,2),(146,91,93,3),(415,267,93,3),(83,52,94,3),(234,145,94,3),(456,295,94,3),(602,392,94,3),(774,537,94,2),(126,79,95,3),(297,185,95,3),(778,541,95,2),(10,5,96,3),(40,24,96,3),(103,65,96,3),(113,71,96,3),(396,254,96,3),(425,272,96,3),(633,413,96,3),(151,94,97,3),(441,284,97,3),(656,428,97,3),(85,53,98,3),(529,340,98,3),(8,4,99,3),(462,298,99,3),(124,78,100,3),(183,112,100,3),(677,442,100,3),(223,137,101,3),(341,215,101,3),(377,240,101,3),(452,293,101,3),(619,403,101,3),(636,415,101,3),(782,545,101,2),(710,473,103,2),(744,503,103,2),(769,532,103,2),(714,477,105,2),(745,507,105,2),(718,481,106,2),(746,511,106,2),(723,486,111,2),(747,516,111,2),(779,542,111,2),(796,559,114,2),(766,529,115,2),(713,476,120,2),(748,506,120,2),(788,551,128,2),(770,533,129,2),(724,487,132,2),(749,517,132,2),(799,562,135,2),(783,546,137,2),(791,554,140,2),(725,488,141,2),(750,518,141,2),(722,485,142,2),(751,515,142,2),(803,566,146,2),(810,573,147,2),(717,480,153,2),(752,510,153,2),(775,538,153,2),(776,539,155,2),(762,525,157,2),(794,557,160,2),(805,568,161,2),(705,468,163,2),(753,498,163,2),(785,548,167,2),(728,491,168,2),(754,521,168,2),(773,536,169,2),(767,530,172,2),(709,472,175,2),(755,502,175,2),(716,479,177,2),(756,509,177,2),(808,571,181,2),(715,478,184,2),(757,508,184,2),(780,543,187,2),(795,558,188,2),(707,470,190,2),(758,500,190,2),(793,556,191,2),(765,528,193,2),(711,474,194,2),(759,504,194,2),(772,535,196,2),(721,484,200,2),(760,514,200,2);
+INSERT INTO `civicrm_activity_contact` (`id`, `activity_id`, `contact_id`, `record_type_id`) VALUES (31,17,1,3),(182,121,1,3),(61,35,2,3),(253,167,2,3),(535,355,2,3),(679,451,2,2),(164,108,3,3),(518,344,3,3),(606,397,4,3),(680,452,4,2),(94,58,5,3),(267,176,5,3),(552,365,5,3),(89,55,6,3),(153,100,6,3),(681,453,6,2),(119,75,7,3),(693,465,7,2),(737,509,7,2),(262,173,8,3),(570,376,8,3),(682,454,8,2),(793,565,8,2),(399,267,9,3),(627,411,9,3),(142,93,10,3),(430,286,10,3),(223,149,11,3),(230,153,11,3),(533,354,11,3),(713,485,11,2),(751,523,11,2),(800,572,11,2),(18,10,15,3),(34,19,15,3),(116,73,15,3),(420,280,16,3),(514,341,16,3),(541,358,16,3),(683,455,16,2),(12,7,17,3),(444,296,17,3),(215,144,18,3),(404,270,18,3),(452,301,18,3),(621,407,18,3),(801,573,18,2),(150,98,19,3),(363,243,19,3),(379,254,19,3),(437,291,19,3),(684,456,19,2),(106,66,20,3),(213,143,20,3),(471,314,20,3),(761,533,20,2),(543,359,21,3),(310,207,22,3),(339,227,22,3),(425,283,22,3),(498,331,22,3),(351,235,23,3),(36,20,24,3),(410,274,24,3),(20,11,25,3),(44,25,25,3),(293,196,25,3),(760,532,25,2),(236,157,26,3),(204,137,27,3),(492,327,27,3),(527,350,27,3),(2,1,28,3),(328,219,28,3),(367,246,28,3),(703,475,28,2),(742,514,28,2),(756,528,28,2),(583,384,29,3),(99,62,30,3),(193,129,30,3),(5,3,31,3),(104,65,31,3),(200,135,31,3),(537,356,31,3),(276,184,32,3),(361,242,32,3),(690,462,32,2),(691,463,32,2),(704,476,32,2),(727,499,32,2),(687,459,34,2),(705,477,34,2),(743,515,34,2),(91,56,35,3),(393,263,35,3),(207,139,36,3),(302,202,36,3),(16,9,37,3),(525,349,37,3),(754,526,37,2),(572,377,38,3),(592,389,38,3),(774,546,38,2),(77,48,39,3),(245,162,39,3),(264,174,39,3),(523,348,39,3),(559,369,39,3),(596,391,39,3),(647,425,39,3),(1,1,40,2),(3,2,40,2),(4,3,40,2),(6,4,40,2),(8,5,40,2),(10,6,40,2),(11,7,40,2),(13,8,40,2),(15,9,40,2),(17,10,40,2),(19,11,40,2),(21,12,40,2),(22,13,40,2),(24,14,40,2),(26,15,40,2),(28,16,40,2),(30,17,40,2),(32,18,40,2),(33,19,40,2),(35,20,40,2),(37,21,40,2),(39,22,40,2),(40,23,40,2),(41,24,40,2),(43,25,40,2),(45,26,40,2),(46,27,40,2),(48,28,40,2),(50,29,40,2),(52,30,40,2),(53,31,40,2),(55,32,40,2),(57,33,40,2),(58,34,40,2),(60,35,40,2),(62,36,40,2),(63,37,40,2),(64,38,40,2),(65,39,40,2),(66,40,40,2),(67,41,40,2),(68,42,40,2),(69,43,40,2),(71,44,40,2),(72,45,40,2),(73,46,40,2),(74,46,40,3),(75,47,40,2),(76,48,40,2),(78,49,40,2),(79,50,40,2),(81,51,40,2),(83,52,40,2),(85,53,40,2),(87,54,40,2),(88,55,40,2),(90,56,40,2),(92,57,40,2),(93,58,40,2),(95,59,40,2),(96,60,40,2),(97,61,40,2),(98,62,40,2),(100,63,40,2),(102,64,40,2),(103,65,40,2),(105,66,40,2),(107,67,40,2),(109,68,40,2),(110,68,40,3),(111,69,40,2),(112,70,40,2),(113,71,40,2),(114,72,40,2),(115,73,40,2),(117,74,40,2),(118,75,40,2),(120,76,40,2),(121,77,40,2),(122,78,40,2),(123,79,40,2),(124,80,40,2),(125,81,40,2),(127,82,40,2),(129,83,40,2),(130,84,40,2),(131,85,40,2),(132,86,40,2),(133,87,40,2),(134,88,40,2),(135,89,40,2),(136,90,40,2),(138,91,40,2),(139,92,40,2),(141,93,40,2),(143,94,40,2),(145,95,40,2),(146,96,40,2),(148,97,40,2),(149,98,40,2),(151,99,40,2),(152,100,40,2),(154,101,40,2),(155,102,40,2),(156,103,40,2),(157,104,40,2),(159,105,40,2),(161,106,40,2),(162,107,40,2),(163,108,40,2),(165,109,40,2),(167,110,40,2),(168,111,40,2),(170,112,40,2),(171,113,40,2),(172,114,40,2),(173,115,40,2),(174,116,40,2),(175,117,40,2),(176,118,40,2),(178,119,40,2),(180,120,40,2),(181,121,40,2),(183,122,40,2),(184,123,40,2),(186,124,40,2),(187,125,40,2),(189,126,40,2),(190,127,40,2),(191,128,40,2),(192,129,40,2),(194,130,40,2),(195,131,40,2),(196,132,40,2),(197,133,40,2),(198,134,40,2),(199,135,40,2),(201,136,40,2),(203,137,40,2),(205,138,40,2),(206,139,40,2),(208,140,40,2),(210,141,40,2),(211,142,40,2),(212,143,40,2),(214,144,40,2),(216,145,40,2),(218,146,40,2),(219,147,40,2),(220,148,40,2),(222,149,40,2),(224,150,40,2),(459,306,40,3),(578,381,40,3),(770,542,40,2),(423,282,41,3),(217,145,42,3),(415,277,42,3),(469,313,42,3),(689,461,43,2),(753,525,43,2),(249,164,44,3),(402,269,44,3),(604,396,44,3),(765,537,44,2),(335,225,45,3),(500,332,45,3),(9,5,46,3),(23,13,46,3),(446,297,46,3),(466,311,46,3),(287,192,47,3),(557,368,47,3),(782,554,47,2),(475,316,48,3),(784,556,48,2),(209,140,50,3),(247,163,50,3),(634,416,50,3),(326,218,51,3),(412,275,51,3),(434,289,51,3),(451,301,51,2),(453,302,51,2),(454,303,51,2),(455,304,51,2),(456,305,51,2),(457,305,51,3),(458,306,51,2),(460,307,51,2),(461,308,51,2),(463,309,51,2),(464,310,51,2),(465,311,51,2),(467,312,51,2),(468,313,51,2),(470,314,51,2),(472,315,51,2),(474,316,51,2),(476,317,51,2),(478,318,51,2),(479,319,51,2),(480,320,51,2),(481,321,51,2),(483,322,51,2),(485,323,51,2),(487,324,51,2),(488,325,51,2),(490,326,51,2),(491,327,51,2),(493,328,51,2),(495,329,51,2),(496,330,51,2),(497,331,51,2),(499,332,51,2),(501,333,51,2),(502,334,51,2),(504,335,51,2),(505,336,51,2),(507,337,51,2),(508,338,51,2),(509,338,51,3),(510,339,51,2),(512,340,51,2),(513,341,51,2),(515,342,51,2),(516,343,51,2),(517,344,51,2),(519,345,51,2),(520,346,51,2),(521,347,51,2),(522,348,51,2),(524,349,51,2),(526,350,51,2),(528,351,51,2),(530,352,51,2),(531,353,51,2),(532,354,51,2),(534,355,51,2),(536,356,51,2),(538,357,51,2),(540,358,51,2),(542,359,51,2),(544,360,51,2),(545,361,51,2),(546,362,51,2),(547,363,51,2),(549,364,51,2),(551,365,51,2),(553,366,51,2),(554,367,51,2),(556,368,51,2),(558,369,51,2),(560,370,51,2),(562,371,51,2),(564,372,51,2),(566,373,51,2),(567,374,51,2),(568,375,51,2),(569,376,51,2),(571,377,51,2),(573,378,51,2),(574,379,51,2),(576,380,51,2),(577,381,51,2),(579,382,51,2),(580,383,51,2),(582,384,51,2),(584,385,51,2),(585,386,51,2),(587,387,51,2),(589,388,51,2),(591,389,51,2),(593,390,51,2),(595,391,51,2),(597,392,51,2),(599,393,51,2),(600,394,51,2),(602,395,51,2),(603,396,51,2),(605,397,51,2),(607,398,51,2),(608,399,51,2),(609,400,51,2),(611,401,51,2),(612,402,51,2),(613,403,51,2),(614,404,51,2),(616,405,51,2),(618,406,51,2),(620,407,51,2),(622,408,51,2),(623,409,51,2),(625,410,51,2),(626,411,51,2),(628,412,51,2),(630,413,51,2),(631,414,51,2),(632,415,51,2),(633,416,51,2),(635,417,51,2),(637,418,51,2),(638,419,51,2),(640,420,51,2),(641,421,51,2),(642,422,51,2),(644,423,51,2),(645,424,51,2),(646,425,51,2),(648,426,51,2),(649,427,51,2),(650,428,51,2),(652,429,51,2),(653,430,51,2),(654,431,51,2),(655,432,51,2),(656,433,51,2),(657,434,51,2),(658,435,51,2),(659,436,51,2),(661,437,51,2),(662,438,51,2),(663,439,51,2),(664,440,51,2),(665,441,51,2),(666,442,51,2),(668,443,51,2),(669,444,51,2),(671,445,51,2),(673,446,51,2),(674,447,51,2),(675,448,51,2),(677,449,51,2),(678,450,51,2),(80,50,52,3),(477,317,52,3),(797,569,52,2),(314,210,53,3),(337,226,53,3),(575,379,53,3),(670,444,53,3),(381,255,54,3),(177,118,55,3),(709,481,55,2),(746,518,55,2),(773,545,55,2),(284,190,56,3),(306,204,56,3),(778,550,56,2),(619,406,57,3),(51,29,58,3),(539,357,58,3),(14,8,59,3),(238,158,59,3),(369,247,59,3),(427,284,59,3),(448,298,59,3),(484,322,59,3),(511,339,59,3),(698,470,60,2),(725,497,60,2),(166,109,61,3),(617,405,61,3),(721,493,61,2),(736,508,61,2),(788,560,61,2),(38,21,62,3),(86,53,62,3),(137,90,62,3),(128,82,63,3),(185,123,63,3),(259,171,63,3),(279,186,63,3),(777,549,63,2),(179,119,65,3),(396,265,65,3),(629,412,65,3),(377,253,66,3),(667,442,66,3),(676,448,66,3),(720,492,66,2),(735,507,66,2),(27,15,67,3),(188,125,67,3),(385,258,67,3),(565,372,67,3),(696,468,67,2),(724,496,67,2),(82,51,68,3),(140,92,68,3),(169,111,68,3),(243,161,68,3),(357,239,68,3),(221,148,69,3),(320,213,69,3),(529,351,69,3),(555,367,69,3),(711,483,69,2),(730,502,69,2),(353,236,70,3),(639,419,70,3),(787,559,70,2),(563,371,71,3),(688,460,71,2),(769,541,71,2),(49,28,72,3),(550,364,72,3),(701,473,72,2),(741,513,72,2),(29,16,73,3),(59,34,73,3),(643,422,73,3),(489,325,74,3),(108,67,75,3),(147,96,75,3),(406,271,75,3),(441,294,75,3),(598,392,75,3),(615,404,76,3),(697,469,76,2),(739,511,76,2),(316,211,77,3),(341,228,77,3),(561,370,77,3),(47,27,78,3),(126,81,78,3),(144,94,78,3),(372,249,78,3),(391,262,78,3),(586,386,78,3),(590,388,78,3),(624,409,79,3),(767,539,79,2),(56,32,80,3),(101,63,80,3),(482,321,80,3),(70,43,81,3),(594,390,81,3),(7,4,82,3),(54,31,82,3),(685,457,82,2),(158,104,83,3),(240,159,83,3),(494,328,83,3),(651,428,84,3),(717,489,84,2),(748,520,84,2),(388,260,85,3),(601,394,85,3),(299,200,86,3),(473,315,86,3),(581,383,86,3),(84,52,87,3),(228,152,88,3),(506,336,88,3),(763,535,88,2),(225,150,89,3),(610,400,89,3),(755,527,90,2),(202,136,91,3),(290,194,91,3),(719,491,91,2),(749,521,91,2),(462,308,92,3),(672,445,92,3),(686,458,92,2),(42,24,93,3),(486,323,93,3),(346,231,94,3),(660,436,94,3),(160,105,95,3),(418,279,95,3),(304,203,96,3),(548,363,96,3),(25,14,98,3),(343,229,98,3),(588,387,99,3),(771,543,99,2),(233,155,100,3),(255,168,100,3),(297,199,100,3),(318,212,100,3),(503,334,100,3),(636,417,101,3),(783,555,102,2),(786,558,104,2),(702,474,110,2),(750,522,110,2),(772,544,110,2),(708,480,111,2),(728,500,111,2),(692,464,114,2),(722,494,114,2),(759,531,120,2),(757,529,123,2),(796,568,125,2),(776,548,127,2),(710,482,133,2),(729,501,133,2),(802,574,135,2),(706,478,136,2),(744,516,136,2),(712,484,138,2),(731,503,138,2),(714,486,140,2),(732,504,140,2),(766,538,147,2),(695,467,148,2),(738,510,148,2),(775,547,150,2),(785,557,153,2),(707,479,154,2),(745,517,154,2),(781,553,155,2),(794,566,156,2),(718,490,158,2),(734,506,158,2),(791,563,160,2),(768,540,162,2),(798,570,163,2),(780,552,166,2),(716,488,168,2),(733,505,168,2),(758,530,172,2),(699,471,175,2),(740,512,175,2),(789,561,178,2),(700,472,179,2),(726,498,179,2),(226,151,181,2),(227,152,181,2),(229,153,181,2),(231,154,181,2),(232,155,181,2),(234,156,181,2),(235,157,181,2),(237,158,181,2),(239,159,181,2),(241,160,181,2),(242,161,181,2),(244,162,181,2),(246,163,181,2),(248,164,181,2),(250,165,181,2),(251,166,181,2),(252,167,181,2),(254,168,181,2),(256,169,181,2),(257,170,181,2),(258,171,181,2),(260,172,181,2),(261,173,181,2),(263,174,181,2),(265,175,181,2),(266,176,181,2),(268,177,181,2),(269,178,181,2),(270,179,181,2),(271,180,181,2),(272,181,181,2),(273,182,181,2),(274,183,181,2),(275,184,181,2),(277,185,181,2),(278,186,181,2),(280,187,181,2),(281,188,181,2),(282,189,181,2),(283,190,181,2),(285,191,181,2),(286,192,181,2),(288,193,181,2),(289,194,181,2),(291,195,181,2),(292,196,181,2),(294,197,181,2),(295,198,181,2),(296,199,181,2),(298,200,181,2),(300,201,181,2),(301,202,181,2),(303,203,181,2),(305,204,181,2),(307,205,181,2),(308,206,181,2),(309,207,181,2),(311,208,181,2),(312,209,181,2),(313,210,181,2),(315,211,181,2),(317,212,181,2),(319,213,181,2),(321,214,181,2),(322,215,181,2),(323,216,181,2),(324,217,181,2),(325,218,181,2),(327,219,181,2),(329,220,181,2),(330,221,181,2),(331,222,181,2),(332,223,181,2),(333,224,181,2),(334,225,181,2),(336,226,181,2),(338,227,181,2),(340,228,181,2),(342,229,181,2),(344,230,181,2),(345,231,181,2),(347,232,181,2),(348,233,181,2),(349,234,181,2),(350,235,181,2),(352,236,181,2),(354,237,181,2),(355,238,181,2),(356,239,181,2),(358,240,181,2),(359,241,181,2),(360,242,181,2),(362,243,181,2),(364,244,181,2),(365,245,181,2),(366,246,181,2),(368,247,181,2),(370,248,181,2),(371,249,181,2),(373,250,181,2),(374,251,181,2),(375,252,181,2),(376,253,181,2),(378,254,181,2),(380,255,181,2),(382,256,181,2),(383,257,181,2),(384,258,181,2),(386,259,181,2),(387,260,181,2),(389,261,181,2),(390,262,181,2),(392,263,181,2),(394,264,181,2),(395,265,181,2),(397,266,181,2),(398,267,181,2),(400,268,181,2),(401,269,181,2),(403,270,181,2),(405,271,181,2),(407,272,181,2),(408,273,181,2),(409,274,181,2),(411,275,181,2),(413,276,181,2),(414,277,181,2),(416,278,181,2),(417,279,181,2),(419,280,181,2),(421,281,181,2),(422,282,181,2),(424,283,181,2),(426,284,181,2),(428,285,181,2),(429,286,181,2),(431,287,181,2),(432,288,181,2),(433,289,181,2),(435,290,181,2),(436,291,181,2),(438,292,181,2),(439,293,181,2),(440,294,181,2),(442,295,181,2),(443,296,181,2),(445,297,181,2),(447,298,181,2),(449,299,181,2),(450,300,181,2),(799,571,187,2),(694,466,188,2),(723,495,188,2),(715,487,189,2),(747,519,189,2),(779,551,190,2),(795,567,192,2),(762,534,194,2),(792,564,197,2),(764,536,198,2),(790,562,199,2);
 /*!40000 ALTER TABLE `civicrm_activity_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -107,7 +107,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_address` WRITE;
 /*!40000 ALTER TABLE `civicrm_address` DISABLE KEYS */;
-INSERT INTO `civicrm_address` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `street_address`, `street_number`, `street_number_suffix`, `street_number_predirectional`, `street_name`, `street_type`, `street_number_postdirectional`, `street_unit`, `supplemental_address_1`, `supplemental_address_2`, `supplemental_address_3`, `city`, `county_id`, `state_province_id`, `postal_code_suffix`, `postal_code`, `usps_adc`, `country_id`, `geo_code_1`, `geo_code_2`, `manual_geo_code`, `timezone`, `name`, `master_id`) VALUES (1,105,1,1,0,'39F Caulder Path N',39,'F',NULL,'Caulder','Path','N',NULL,NULL,NULL,NULL,'Wausau',1,1048,NULL,'54401',NULL,1228,44.958382,-89.6693,0,NULL,NULL,NULL),(2,25,1,1,0,'291L Bay Ln SW',291,'L',NULL,'Bay','Ln','SW',NULL,NULL,NULL,NULL,'Saxonburg',1,1037,NULL,'16056',NULL,1228,40.732393,-79.83422,0,NULL,NULL,NULL),(3,117,1,1,0,'576R Martin Luther King Rd N',576,'R',NULL,'Martin Luther King','Rd','N',NULL,NULL,NULL,NULL,'Mishawaka',1,1013,NULL,'46546',NULL,1228,41.688432,-86.196485,0,NULL,NULL,NULL),(4,99,1,1,0,'140P Pine Pl SE',140,'P',NULL,'Pine','Pl','SE',NULL,NULL,NULL,NULL,'Tornillo',1,1042,NULL,'79853',NULL,1228,31.447738,-106.09049,0,NULL,NULL,NULL),(5,145,1,1,0,'201L Cadell Ln N',201,'L',NULL,'Cadell','Ln','N',NULL,NULL,NULL,NULL,'Beaver',1,1034,NULL,'45613',NULL,1228,39.015223,-82.84927,0,NULL,NULL,NULL),(6,30,1,1,0,'787F Beech Path E',787,'F',NULL,'Beech','Path','E',NULL,NULL,NULL,NULL,'Sagamore',1,1020,NULL,'02567',NULL,1228,41.79197,-70.530852,0,NULL,NULL,NULL),(7,103,1,1,0,'641B Main St N',641,'B',NULL,'Main','St','N',NULL,NULL,NULL,NULL,'East Hampton',1,1006,NULL,'06424',NULL,1228,41.573008,-72.5078,0,NULL,NULL,NULL),(8,130,1,1,0,'618W States Dr SW',618,'W',NULL,'States','Dr','SW',NULL,NULL,NULL,NULL,'Red Bank',1,1029,NULL,'07701',NULL,1228,40.352953,-74.07703,0,NULL,NULL,NULL),(9,152,1,1,0,'990K Dowlen Pl E',990,'K',NULL,'Dowlen','Pl','E',NULL,NULL,NULL,NULL,'Galva',1,1012,NULL,'61434',NULL,1228,41.172197,-90.03901,0,NULL,NULL,NULL),(10,122,1,1,0,'833J Martin Luther King Blvd W',833,'J',NULL,'Martin Luther King','Blvd','W',NULL,NULL,NULL,NULL,'West New York',1,1029,NULL,'07093',NULL,1228,40.7895,-74.01223,0,NULL,NULL,NULL),(11,65,1,1,0,'848H Van Ness Pl SE',848,'H',NULL,'Van Ness','Pl','SE',NULL,NULL,NULL,NULL,'Frankfort',1,1040,NULL,'57440',NULL,1228,44.857069,-98.27191,0,NULL,NULL,NULL),(12,201,1,1,0,'375O Martin Luther King Blvd NW',375,'O',NULL,'Martin Luther King','Blvd','NW',NULL,NULL,NULL,NULL,'Cresco',1,1014,NULL,'52136',NULL,1228,43.382021,-92.10263,0,NULL,NULL,NULL),(13,86,1,1,0,'409F Cadell St SW',409,'F',NULL,'Cadell','St','SW',NULL,NULL,NULL,NULL,'Charlton',1,1020,NULL,'01507',NULL,1228,42.135142,-71.96961,0,NULL,NULL,NULL),(14,142,1,1,0,'993V Pine Rd SE',993,'V',NULL,'Pine','Rd','SE',NULL,NULL,NULL,NULL,'Bell',1,1004,NULL,'90201',NULL,1228,33.972814,-118.17385,0,NULL,NULL,NULL),(15,141,1,1,0,'60W Northpoint Rd SE',60,'W',NULL,'Northpoint','Rd','SE',NULL,NULL,NULL,NULL,'Villalba',1,1056,NULL,'00766',NULL,1228,18.126023,-66.48208,0,NULL,NULL,NULL),(16,39,1,1,0,'175J Bay St N',175,'J',NULL,'Bay','St','N',NULL,NULL,NULL,NULL,'Bridgewater',1,1031,NULL,'13313',NULL,1228,42.87896,-75.25569,0,NULL,NULL,NULL),(17,170,1,1,0,'324A Northpoint Rd N',324,'A',NULL,'Northpoint','Rd','N',NULL,NULL,NULL,NULL,'Doctors Inlet',1,1008,NULL,'32030',NULL,1228,30.105553,-81.768964,0,NULL,NULL,NULL),(18,169,1,1,0,'411P Van Ness Ave S',411,'P',NULL,'Van Ness','Ave','S',NULL,NULL,NULL,NULL,'Yorba Linda',1,1004,NULL,'92887',NULL,1228,33.883223,-117.73856,0,NULL,NULL,NULL),(19,23,1,1,0,'337H College Rd NW',337,'H',NULL,'College','Rd','NW',NULL,NULL,NULL,NULL,'Esmont',1,1045,NULL,'22937',NULL,1228,37.79922,-78.61263,0,NULL,NULL,NULL),(20,92,1,1,0,'596V Northpoint St N',596,'V',NULL,'Northpoint','St','N',NULL,NULL,NULL,NULL,'Paradise',1,1021,NULL,'49647',NULL,1228,44.515487,-85.527652,0,NULL,NULL,NULL),(21,150,1,1,0,'25J States Pl NW',25,'J',NULL,'States','Pl','NW',NULL,NULL,NULL,NULL,'Troy',1,1045,NULL,'22974',NULL,1228,37.959376,-78.26353,0,NULL,NULL,NULL),(22,104,1,1,0,'243Z Jackson Blvd SE',243,'Z',NULL,'Jackson','Blvd','SE',NULL,NULL,NULL,NULL,'Charleston',1,1047,NULL,'25311',NULL,1228,38.351204,-81.58198,0,NULL,NULL,NULL),(23,43,1,1,0,'294H Second Way E',294,'H',NULL,'Second','Way','E',NULL,NULL,NULL,NULL,'Boston',1,1020,NULL,'02208',NULL,1228,42.338947,-70.919635,0,NULL,NULL,NULL),(24,17,1,1,0,'359K Caulder Rd N',359,'K',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Sumner',1,1014,NULL,'50674',NULL,1228,42.846877,-92.11188,0,NULL,NULL,NULL),(25,127,1,1,0,'150P El Camino Ave NE',150,'P',NULL,'El Camino','Ave','NE',NULL,NULL,NULL,NULL,'Seaside',1,1004,NULL,'93955',NULL,1228,36.615813,-121.83461,0,NULL,NULL,NULL),(26,59,1,1,0,'710K Bay Pl N',710,'K',NULL,'Bay','Pl','N',NULL,NULL,NULL,NULL,'Mobile',1,1000,NULL,'36609',NULL,1228,30.662735,-88.16255,0,NULL,NULL,NULL),(27,118,1,1,0,'60Q Pine Dr W',60,'Q',NULL,'Pine','Dr','W',NULL,NULL,NULL,NULL,'Grapeland',1,1042,NULL,'75844',NULL,1228,31.505916,-95.46315,0,NULL,NULL,NULL),(28,156,1,1,0,'423C Green Way N',423,'C',NULL,'Green','Way','N',NULL,NULL,NULL,NULL,'Conway',1,1039,NULL,'29526',NULL,1228,33.850218,-79.01692,0,NULL,NULL,NULL),(29,111,1,1,0,'656S Woodbridge Path NE',656,'S',NULL,'Woodbridge','Path','NE',NULL,NULL,NULL,NULL,'Monroe',1,1017,NULL,'71210',NULL,1228,32.490777,-92.159354,0,NULL,NULL,NULL),(30,19,1,1,0,'496A Main Way S',496,'A',NULL,'Main','Way','S',NULL,NULL,NULL,NULL,'Harbeson',1,1007,NULL,'19951',NULL,1228,38.682345,-75.23286,0,NULL,NULL,NULL),(31,12,1,1,0,'445V Green Rd W',445,'V',NULL,'Green','Rd','W',NULL,NULL,NULL,NULL,'Lexington',1,1013,NULL,'47138',NULL,1228,38.678365,-85.6097,0,NULL,NULL,NULL),(32,3,1,1,0,'460C Lincoln Ave NE',460,'C',NULL,'Lincoln','Ave','NE',NULL,NULL,NULL,NULL,'Sandy Creek',1,1031,NULL,'13145',NULL,1228,43.653475,-76.13214,0,NULL,NULL,NULL),(33,132,1,1,0,'631B Caulder Way W',631,'B',NULL,'Caulder','Way','W',NULL,NULL,NULL,NULL,'Paradise',1,1043,NULL,'84328',NULL,1228,41.508503,-111.79102,0,NULL,NULL,NULL),(34,57,1,1,0,'188I Maple St NW',188,'I',NULL,'Maple','St','NW',NULL,NULL,NULL,NULL,'Oakland',1,1004,NULL,'94601',NULL,1228,37.776835,-122.21792,0,NULL,NULL,NULL),(35,144,1,1,0,'919I Bay Ave S',919,'I',NULL,'Bay','Ave','S',NULL,NULL,NULL,NULL,'Zanoni',1,1045,NULL,'23191',NULL,1228,37.418242,-76.508402,0,NULL,NULL,NULL),(36,191,1,1,0,'433M Dowlen Way N',433,'M',NULL,'Dowlen','Way','N',NULL,NULL,NULL,NULL,'Arcadia',1,1017,NULL,'71001',NULL,1228,32.57761,-92.9062,0,NULL,NULL,NULL),(37,46,1,1,0,'251D Van Ness Rd S',251,'D',NULL,'Van Ness','Rd','S',NULL,NULL,NULL,NULL,'Mountain Iron',1,1022,NULL,'55768',NULL,1228,47.502878,-92.66548,0,NULL,NULL,NULL),(38,81,1,1,0,'107J Dowlen Ln NW',107,'J',NULL,'Dowlen','Ln','NW',NULL,NULL,NULL,NULL,'Stites',1,1011,NULL,'83552',NULL,1228,46.093893,-115.9769,0,NULL,NULL,NULL),(39,129,1,1,0,'76N College Ln NW',76,'N',NULL,'College','Ln','NW',NULL,NULL,NULL,NULL,'Chesterfield',1,1039,NULL,'29709',NULL,1228,34.720306,-80.09371,0,NULL,NULL,NULL),(40,109,1,1,0,'74G Van Ness Ln W',74,'G',NULL,'Van Ness','Ln','W',NULL,NULL,NULL,NULL,'Chicago',1,1012,NULL,'60660',NULL,1228,41.990631,-87.6667,0,NULL,NULL,NULL),(41,52,1,1,0,'442G Cadell Ln NE',442,'G',NULL,'Cadell','Ln','NE',NULL,NULL,NULL,NULL,'Carrizozo',1,1030,NULL,'88301',NULL,1228,33.710312,-105.88218,0,NULL,NULL,NULL),(42,107,1,1,0,'495J Beech Ave SW',495,'J',NULL,'Beech','Ave','SW',NULL,NULL,NULL,NULL,'Saint Charles',1,1011,NULL,'83272',NULL,1228,42.127915,-111.3922,0,NULL,NULL,NULL),(43,47,1,1,0,'66R El Camino Way S',66,'R',NULL,'El Camino','Way','S',NULL,NULL,NULL,NULL,'Flatwoods',1,1017,NULL,'71427',NULL,1228,31.378139,-92.88735,0,NULL,NULL,NULL),(44,158,1,1,0,'645Q Cadell Path NW',645,'Q',NULL,'Cadell','Path','NW',NULL,NULL,NULL,NULL,'Walthourville',1,1009,NULL,'31333',NULL,1228,31.77789,-81.64534,0,NULL,NULL,NULL),(45,167,1,1,0,'792O Northpoint Dr S',792,'O',NULL,'Northpoint','Dr','S',NULL,NULL,NULL,NULL,'Borup',1,1022,NULL,'56519',NULL,1228,47.158015,-96.51487,0,NULL,NULL,NULL),(46,106,1,1,0,'376F Beech Path N',376,'F',NULL,'Beech','Path','N',NULL,NULL,NULL,NULL,'Alpha',1,1016,NULL,'42603',NULL,1228,36.7703,-85.01043,0,NULL,NULL,NULL),(47,199,1,1,0,'618X Second Ave W',618,'X',NULL,'Second','Ave','W',NULL,NULL,NULL,NULL,'Creedmoor',1,1032,NULL,'27522',NULL,1228,36.111937,-78.69122,0,NULL,NULL,NULL),(48,136,1,1,0,'398F Pine St E',398,'F',NULL,'Pine','St','E',NULL,NULL,NULL,NULL,'Ely',1,1014,NULL,'52227',NULL,1228,41.89239,-91.5666,0,NULL,NULL,NULL),(49,41,1,1,0,'137C Lincoln Blvd N',137,'C',NULL,'Lincoln','Blvd','N',NULL,NULL,NULL,NULL,'Warm Springs',1,1036,NULL,'97761',NULL,1228,44.814466,-121.32302,0,NULL,NULL,NULL),(50,72,1,1,0,'522R Bay Pl N',522,'R',NULL,'Bay','Pl','N',NULL,NULL,NULL,NULL,'Euclid',1,1022,NULL,'56722',NULL,1228,47.970507,-96.66654,0,NULL,NULL,NULL),(51,89,1,1,0,'140Z Maple Ln W',140,'Z',NULL,'Maple','Ln','W',NULL,NULL,NULL,NULL,'Fitchburg',1,1020,NULL,'01420',NULL,1228,42.578689,-71.80338,0,NULL,NULL,NULL),(52,182,1,1,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,NULL),(53,178,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,NULL),(54,171,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,NULL),(55,160,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,NULL),(56,6,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,NULL),(57,123,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,NULL),(58,45,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,NULL),(59,140,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,NULL),(60,78,1,1,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,NULL),(61,133,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,NULL),(62,119,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,NULL),(63,148,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,NULL),(64,137,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,NULL),(65,186,1,1,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,NULL),(66,38,1,1,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,NULL),(67,75,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,NULL),(68,7,1,1,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,NULL),(69,32,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,NULL),(70,154,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,NULL),(71,187,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,NULL),(72,37,3,1,0,'45F Main Ave S',45,'F',NULL,'Main','Ave','S',NULL,'Attn: Development',NULL,NULL,'Erie',1,1037,NULL,'16533',NULL,1228,42.182748,-80.064915,0,NULL,NULL,NULL),(73,69,3,1,0,'870A Caulder Ave SE',870,'A',NULL,'Caulder','Ave','SE',NULL,'c/o OPDC',NULL,NULL,'Starkville',1,1023,NULL,'39760',NULL,1228,33.459924,-88.832163,0,NULL,NULL,NULL),(74,66,3,1,0,'818O Jackson Ave N',818,'O',NULL,'Jackson','Ave','N',NULL,'Payables Dept.',NULL,NULL,'Tamarack',1,1022,NULL,'55787',NULL,1228,46.679313,-93.13241,0,NULL,NULL,NULL),(75,84,3,1,0,'413N Cadell Way E',413,'N',NULL,'Cadell','Way','E',NULL,'Churchgate',NULL,NULL,'Peoria',1,1002,NULL,'85382',NULL,1228,33.689869,-112.24838,0,NULL,NULL,NULL),(76,174,2,1,0,'413N Cadell Way E',413,'N',NULL,'Cadell','Way','E',NULL,'Churchgate',NULL,NULL,'Peoria',1,1002,NULL,'85382',NULL,1228,33.689869,-112.24838,0,NULL,NULL,75),(77,121,3,1,0,'935Q Martin Luther King Path SE',935,'Q',NULL,'Martin Luther King','Path','SE',NULL,'Attn: Accounting',NULL,NULL,'Hadley',1,1016,NULL,'42235',NULL,1228,36.983441,-86.394012,0,NULL,NULL,NULL),(78,198,2,1,0,'935Q Martin Luther King Path SE',935,'Q',NULL,'Martin Luther King','Path','SE',NULL,'Attn: Accounting',NULL,NULL,'Hadley',1,1016,NULL,'42235',NULL,1228,36.983441,-86.394012,0,NULL,NULL,77),(79,9,3,1,0,'604U Second Path NE',604,'U',NULL,'Second','Path','NE',NULL,'Editorial Dept',NULL,NULL,'Falls Church',1,1045,NULL,'22043',NULL,1228,38.901311,-77.19777,0,NULL,NULL,NULL),(80,58,2,1,0,'604U Second Path NE',604,'U',NULL,'Second','Path','NE',NULL,'Editorial Dept',NULL,NULL,'Falls Church',1,1045,NULL,'22043',NULL,1228,38.901311,-77.19777,0,NULL,NULL,79),(81,76,3,1,0,'919V Lincoln Ln N',919,'V',NULL,'Lincoln','Ln','N',NULL,'Mailstop 101',NULL,NULL,'Montpelier',1,1011,NULL,'83254',NULL,1228,42.327996,-111.32637,0,NULL,NULL,NULL),(82,8,3,1,0,'343X Northpoint Rd NW',343,'X',NULL,'Northpoint','Rd','NW',NULL,'Attn: Development',NULL,NULL,'Tombstone',1,1002,NULL,'85638',NULL,1228,31.714525,-110.06684,0,NULL,NULL,NULL),(83,42,2,1,0,'343X Northpoint Rd NW',343,'X',NULL,'Northpoint','Rd','NW',NULL,'Attn: Development',NULL,NULL,'Tombstone',1,1002,NULL,'85638',NULL,1228,31.714525,-110.06684,0,NULL,NULL,82),(84,155,3,1,0,'596G Main Ave S',596,'G',NULL,'Main','Ave','S',NULL,'Urgent',NULL,NULL,'Elmore City',1,1035,NULL,'73433',NULL,1228,34.625144,-97.39901,0,NULL,NULL,NULL),(85,129,2,0,0,'596G Main Ave S',596,'G',NULL,'Main','Ave','S',NULL,'Urgent',NULL,NULL,'Elmore City',1,1035,NULL,'73433',NULL,1228,34.625144,-97.39901,0,NULL,NULL,84),(86,101,3,1,0,'572J Cadell Blvd W',572,'J',NULL,'Cadell','Blvd','W',NULL,'Donor Relations',NULL,NULL,'Leesville',1,1017,NULL,'71459',NULL,1228,31.072209,-93.21762,0,NULL,NULL,NULL),(87,20,3,1,0,'860J Pine Path NE',860,'J',NULL,'Pine','Path','NE',NULL,'Attn: Accounting',NULL,NULL,'McIntyre',1,1037,NULL,'15756',NULL,1228,40.570149,-79.29689,0,NULL,NULL,NULL),(88,73,2,1,0,'860J Pine Path NE',860,'J',NULL,'Pine','Path','NE',NULL,'Attn: Accounting',NULL,NULL,'McIntyre',1,1037,NULL,'15756',NULL,1228,40.570149,-79.29689,0,NULL,NULL,87),(89,114,3,1,0,'321R Bay Pl NW',321,'R',NULL,'Bay','Pl','NW',NULL,'Editorial Dept',NULL,NULL,'Pierceville',1,1015,NULL,'67868',NULL,1228,37.881899,-100.67849,0,NULL,NULL,NULL),(90,60,2,1,0,'321R Bay Pl NW',321,'R',NULL,'Bay','Pl','NW',NULL,'Editorial Dept',NULL,NULL,'Pierceville',1,1015,NULL,'67868',NULL,1228,37.881899,-100.67849,0,NULL,NULL,89),(91,62,3,1,0,'232O Northpoint Path W',232,'O',NULL,'Northpoint','Path','W',NULL,'Community Relations',NULL,NULL,'Battery Park',1,1045,NULL,'23304',NULL,1228,36.99497,-76.56901,0,NULL,NULL,NULL),(92,143,2,1,0,'232O Northpoint Path W',232,'O',NULL,'Northpoint','Path','W',NULL,'Community Relations',NULL,NULL,'Battery Park',1,1045,NULL,'23304',NULL,1228,36.99497,-76.56901,0,NULL,NULL,91),(93,115,3,1,0,'14N Dowlen Blvd E',14,'N',NULL,'Dowlen','Blvd','E',NULL,'Disbursements',NULL,NULL,'Seaboard',1,1032,NULL,'27876',NULL,1228,36.487125,-77.43618,0,NULL,NULL,NULL),(94,134,3,1,0,'303F Cadell Path SE',303,'F',NULL,'Cadell','Path','SE',NULL,'Urgent',NULL,NULL,'Turton',1,1040,NULL,'57477',NULL,1228,45.032244,-98.14355,0,NULL,NULL,NULL),(95,100,2,1,0,'303F Cadell Path SE',303,'F',NULL,'Cadell','Path','SE',NULL,'Urgent',NULL,NULL,'Turton',1,1040,NULL,'57477',NULL,1228,45.032244,-98.14355,0,NULL,NULL,94),(96,10,3,1,0,'291J States Ave SW',291,'J',NULL,'States','Ave','SW',NULL,'Attn: Accounting',NULL,NULL,'Bryans Road',1,1019,NULL,'20616',NULL,1228,38.639117,-77.08301,0,NULL,NULL,NULL),(97,125,2,1,0,'291J States Ave SW',291,'J',NULL,'States','Ave','SW',NULL,'Attn: Accounting',NULL,NULL,'Bryans Road',1,1019,NULL,'20616',NULL,1228,38.639117,-77.08301,0,NULL,NULL,96),(98,98,3,1,0,'141K Cadell Blvd N',141,'K',NULL,'Cadell','Blvd','N',NULL,'Editorial Dept',NULL,NULL,'Dime Box',1,1042,NULL,'77853',NULL,1228,30.3555,-96.85437,0,NULL,NULL,NULL),(99,22,2,1,0,'141K Cadell Blvd N',141,'K',NULL,'Cadell','Blvd','N',NULL,'Editorial Dept',NULL,NULL,'Dime Box',1,1042,NULL,'77853',NULL,1228,30.3555,-96.85437,0,NULL,NULL,98),(100,55,3,1,0,'316I College Rd S',316,'I',NULL,'College','Rd','S',NULL,'Community Relations',NULL,NULL,'Sierra Vista',1,1002,NULL,'85671',NULL,1228,31.880077,-109.754263,0,NULL,NULL,NULL),(101,77,2,1,0,'316I College Rd S',316,'I',NULL,'College','Rd','S',NULL,'Community Relations',NULL,NULL,'Sierra Vista',1,1002,NULL,'85671',NULL,1228,31.880077,-109.754263,0,NULL,NULL,100),(102,149,3,1,0,'908K Main Path S',908,'K',NULL,'Main','Path','S',NULL,'Community Relations',NULL,NULL,'Davis',1,1047,NULL,'26260',NULL,1228,39.101535,-79.43805,0,NULL,NULL,NULL),(103,29,2,1,0,'908K Main Path S',908,'K',NULL,'Main','Path','S',NULL,'Community Relations',NULL,NULL,'Davis',1,1047,NULL,'26260',NULL,1228,39.101535,-79.43805,0,NULL,NULL,102),(104,128,3,1,0,'547V Martin Luther King Blvd SE',547,'V',NULL,'Martin Luther King','Blvd','SE',NULL,'Mailstop 101',NULL,NULL,'San Diego',1,1004,NULL,'92149',NULL,1228,33.016928,-116.846046,0,NULL,NULL,NULL),(105,170,2,0,0,'547V Martin Luther King Blvd SE',547,'V',NULL,'Martin Luther King','Blvd','SE',NULL,'Mailstop 101',NULL,NULL,'San Diego',1,1004,NULL,'92149',NULL,1228,33.016928,-116.846046,0,NULL,NULL,104),(106,153,1,1,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,52),(107,67,1,1,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,52),(108,125,1,0,0,'219D Northpoint Way SW',219,'D',NULL,'Northpoint','Way','SW',NULL,NULL,NULL,NULL,'Wilcox',1,1026,NULL,'68982',NULL,1228,40.338567,-99.18638,0,NULL,NULL,52),(109,22,1,0,0,'762T Van Ness Ave NE',762,'T',NULL,'Van Ness','Ave','NE',NULL,NULL,NULL,NULL,'Washington',1,1050,NULL,'20045',NULL,1228,38.896599,-77.0319,0,NULL,NULL,NULL),(110,13,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(111,184,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(112,56,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(113,162,1,1,0,'228F College Way NE',228,'F',NULL,'College','Way','NE',NULL,NULL,NULL,NULL,'Monument',1,1036,NULL,'97864',NULL,1228,44.811965,-119.41539,0,NULL,NULL,53),(114,33,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(115,196,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(116,24,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(117,61,1,1,0,'615D Northpoint Rd W',615,'D',NULL,'Northpoint','Rd','W',NULL,NULL,NULL,NULL,'Glencoe',1,1016,NULL,'41046',NULL,1228,38.742296,-84.81223,0,NULL,NULL,54),(118,93,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(119,77,1,0,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(120,161,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(121,188,1,1,0,'631X Second Path S',631,'X',NULL,'Second','Path','S',NULL,NULL,NULL,NULL,'Westbrook',1,1018,NULL,'04092',NULL,1228,43.682148,-70.35823,0,NULL,NULL,55),(122,131,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(123,74,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(124,164,1,1,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(125,60,1,0,0,'344M Cadell Ave NE',344,'M',NULL,'Cadell','Ave','NE',NULL,NULL,NULL,NULL,'Bel Alton',1,1019,NULL,'20611',NULL,1228,38.463289,-76.9858,0,NULL,NULL,56),(126,173,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(127,16,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(128,29,1,0,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(129,147,1,1,0,'365P Pine Blvd E',365,'P',NULL,'Pine','Blvd','E',NULL,NULL,NULL,NULL,'Seal Cove',1,1018,NULL,'04674',NULL,1228,44.295719,-68.40092,0,NULL,NULL,57),(130,190,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,58),(131,113,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,58),(132,163,1,1,0,'575U Maple Pl NW',575,'U',NULL,'Maple','Pl','NW',NULL,NULL,NULL,NULL,'Dallas',1,1042,NULL,'75241',NULL,1228,32.669383,-96.77439,0,NULL,NULL,58),(133,50,1,1,0,'667W Caulder Way NE',667,'W',NULL,'Caulder','Way','NE',NULL,NULL,NULL,NULL,'Charleston',1,1047,NULL,'25331',NULL,1228,38.296818,-81.554655,0,NULL,NULL,NULL),(134,151,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,59),(135,183,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,59),(136,189,1,1,0,'648N Second Ln NW',648,'N',NULL,'Second','Ln','NW',NULL,NULL,NULL,NULL,'Orwell',1,1034,NULL,'44076',NULL,1228,41.535437,-80.83514,0,NULL,NULL,59),(137,181,1,1,0,'816X El Camino Dr S',816,'X',NULL,'El Camino','Dr','S',NULL,NULL,NULL,NULL,'Winchester',1,1013,NULL,'47394',NULL,1228,40.173141,-84.97922,0,NULL,NULL,NULL),(138,174,1,0,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,60),(139,79,1,1,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,60),(140,82,1,1,0,'812H States St S',812,'H',NULL,'States','St','S',NULL,NULL,NULL,NULL,'Munday',1,1042,NULL,'76371',NULL,1228,33.463284,-99.63839,0,NULL,NULL,60),(141,5,1,1,0,'492H Main Way SW',492,'H',NULL,'Main','Way','SW',NULL,NULL,NULL,NULL,'Lucerne',1,1005,NULL,'80646',NULL,1228,40.48243,-104.70542,0,NULL,NULL,NULL),(142,15,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,61),(143,11,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,61),(144,108,1,1,0,'758T Dowlen Ln E',758,'T',NULL,'Dowlen','Ln','E',NULL,NULL,NULL,NULL,'Keene',1,1028,NULL,'03431',NULL,1228,42.946418,-72.28616,0,NULL,NULL,61),(145,87,1,1,0,'460Q Dowlen Pl N',460,'Q',NULL,'Dowlen','Pl','N',NULL,NULL,NULL,NULL,'Omaha',1,1009,NULL,'31821',NULL,1228,32.1342,-84.98499,0,NULL,NULL,NULL),(146,40,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(147,96,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(148,36,1,1,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(149,100,1,0,0,'387L Beech St NE',387,'L',NULL,'Beech','St','NE',NULL,NULL,NULL,NULL,'Sears',1,1021,NULL,'49679',NULL,1228,43.878924,-85.15802,0,NULL,NULL,62),(150,64,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(151,135,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(152,48,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(153,138,1,1,0,'422W Second Dr NE',422,'W',NULL,'Second','Dr','NE',NULL,NULL,NULL,NULL,'Big Spring',1,1042,NULL,'79720',NULL,1228,32.21649,-101.4532,0,NULL,NULL,63),(154,195,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(155,80,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(156,4,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(157,168,1,1,0,'532Z Cadell St S',532,'Z',NULL,'Cadell','St','S',NULL,NULL,NULL,NULL,'Belmond',1,1014,NULL,'50421',NULL,1228,42.842616,-93.6187,0,NULL,NULL,64),(158,42,1,0,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,65),(159,63,1,1,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,65),(160,2,1,1,0,'325H Pine Blvd N',325,'H',NULL,'Pine','Blvd','N',NULL,NULL,NULL,NULL,'Fort Lauderdale',1,1008,NULL,'33318',NULL,1228,26.11842,-80.251988,0,NULL,NULL,65),(161,83,1,1,0,'19U Northpoint St NW',19,'U',NULL,'Northpoint','St','NW',NULL,NULL,NULL,NULL,'Nara Visa',1,1030,NULL,'88430',NULL,1228,35.644244,-103.21973,0,NULL,NULL,NULL),(162,143,1,0,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(163,18,1,1,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(164,165,1,1,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(165,73,1,0,0,'269H Jackson Dr N',269,'H',NULL,'Jackson','Dr','N',NULL,NULL,NULL,NULL,'Shady Spring',1,1047,NULL,'25898',NULL,1228,37.698351,-81.081333,0,NULL,NULL,66),(166,192,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,67),(167,175,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,67),(168,14,1,1,0,'327L College St SW',327,'L',NULL,'College','St','SW',NULL,NULL,NULL,NULL,'Burbank',1,1004,NULL,'91505',NULL,1228,34.166906,-118.34366,0,NULL,NULL,67),(169,139,1,1,0,'597D Caulder Blvd W',597,'D',NULL,'Caulder','Blvd','W',NULL,NULL,NULL,NULL,'Providence',1,1038,NULL,'02912',NULL,1228,41.826737,-71.397699,0,NULL,NULL,NULL),(170,58,1,0,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,68),(171,68,1,1,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,68),(172,53,1,1,0,'768E Woodbridge Path W',768,'E',NULL,'Woodbridge','Path','W',NULL,NULL,NULL,NULL,'Geneva',1,1012,NULL,'60134',NULL,1228,41.885728,-88.31957,0,NULL,NULL,68),(173,97,1,1,0,'288P Bay St S',288,'P',NULL,'Bay','St','S',NULL,NULL,NULL,NULL,'Bartley',1,1026,NULL,'69020',NULL,1228,40.241652,-100.3015,0,NULL,NULL,NULL),(174,71,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(175,120,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(176,124,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(177,172,1,1,0,'562X Maple Dr E',562,'X',NULL,'Maple','Dr','E',NULL,NULL,NULL,NULL,'Keyesport',1,1012,NULL,'62253',NULL,1228,38.761214,-89.29128,0,NULL,NULL,69),(178,26,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,70),(179,95,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,70),(180,112,1,1,0,'618V Caulder Path W',618,'V',NULL,'Caulder','Path','W',NULL,NULL,NULL,NULL,'West Camp',1,1031,NULL,'12490',NULL,1228,42.108689,-73.934577,0,NULL,NULL,70),(181,44,1,1,0,'163A Northpoint Way E',163,'A',NULL,'Northpoint','Way','E',NULL,NULL,NULL,NULL,'Fremont Center',1,1031,NULL,'12736',NULL,1228,41.848244,-75.03878,0,NULL,NULL,NULL),(182,34,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(183,35,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(184,159,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(185,31,1,1,0,'389J Maple Ave SE',389,'J',NULL,'Maple','Ave','SE',NULL,NULL,NULL,NULL,'Dublin',1,1037,NULL,'18917',NULL,1228,40.37327,-75.20246,0,NULL,NULL,71),(186,NULL,1,1,1,'14S El Camino Way E',14,'S',NULL,'El Camino','Way',NULL,NULL,NULL,NULL,NULL,'Collinsville',NULL,1006,NULL,'6022',NULL,1228,41.8328,-72.9253,0,NULL,NULL,NULL),(187,NULL,1,1,1,'11B Woodbridge Path SW',11,'B',NULL,'Woodbridge','Path',NULL,NULL,NULL,NULL,NULL,'Dayton',NULL,1034,NULL,'45417',NULL,1228,39.7531,-84.2471,0,NULL,NULL,NULL),(188,NULL,1,1,1,'581O Lincoln Dr SW',581,'O',NULL,'Lincoln','Dr',NULL,NULL,NULL,NULL,NULL,'Santa Fe',NULL,1030,NULL,'87594',NULL,1228,35.5212,-105.982,0,NULL,NULL,NULL);
+INSERT INTO `civicrm_address` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `street_address`, `street_number`, `street_number_suffix`, `street_number_predirectional`, `street_name`, `street_type`, `street_number_postdirectional`, `street_unit`, `supplemental_address_1`, `supplemental_address_2`, `supplemental_address_3`, `city`, `county_id`, `state_province_id`, `postal_code_suffix`, `postal_code`, `usps_adc`, `country_id`, `geo_code_1`, `geo_code_2`, `manual_geo_code`, `timezone`, `name`, `master_id`) VALUES (1,47,1,1,0,'623O Maple Ln N',623,'O',NULL,'Maple','Ln','N',NULL,NULL,NULL,NULL,'Bradenton',1,1008,NULL,'34210',NULL,1228,27.455543,-82.63372,0,NULL,NULL,NULL),(2,34,1,1,0,'886O Woodbridge Pl SW',886,'O',NULL,'Woodbridge','Pl','SW',NULL,NULL,NULL,NULL,'Kearsarge',1,1021,NULL,'49942',NULL,1228,47.269659,-88.41589,0,NULL,NULL,NULL),(3,7,1,1,0,'283J Woodbridge Path S',283,'J',NULL,'Woodbridge','Path','S',NULL,NULL,NULL,NULL,'Fountain City',1,1048,NULL,'54629',NULL,1228,44.13288,-91.67722,0,NULL,NULL,NULL),(4,44,1,1,0,'278L Main Ave S',278,'L',NULL,'Main','Ave','S',NULL,NULL,NULL,NULL,'Lynnville',1,1013,NULL,'47619',NULL,1228,38.199662,-87.31132,0,NULL,NULL,NULL),(5,139,1,1,0,'639Z Northpoint Rd E',639,'Z',NULL,'Northpoint','Rd','E',NULL,NULL,NULL,NULL,'Blissfield',1,1021,NULL,'49228',NULL,1228,41.821595,-83.87435,0,NULL,NULL,NULL),(6,126,1,1,0,'145S Woodbridge Blvd N',145,'S',NULL,'Woodbridge','Blvd','N',NULL,NULL,NULL,NULL,'Saranac Lake',1,1031,NULL,'12983',NULL,1228,44.324736,-74.16843,0,NULL,NULL,NULL),(7,64,1,1,0,'346Z States Path SW',346,'Z',NULL,'States','Path','SW',NULL,NULL,NULL,NULL,'Dennis',1,1042,NULL,'76439',NULL,1228,32.632495,-97.957483,0,NULL,NULL,NULL),(8,87,1,1,0,'897N States Blvd SW',897,'N',NULL,'States','Blvd','SW',NULL,NULL,NULL,NULL,'Lost Hills',1,1004,NULL,'93249',NULL,1228,35.689717,-119.91961,0,NULL,NULL,NULL),(9,88,1,1,0,'653A Green Dr N',653,'A',NULL,'Green','Dr','N',NULL,NULL,NULL,NULL,'Finly',1,1013,NULL,'46129',NULL,1228,39.821516,-85.765169,0,NULL,NULL,NULL),(10,9,1,1,0,'448J Northpoint Way NW',448,'J',NULL,'Northpoint','Way','NW',NULL,NULL,NULL,NULL,'Nashville',1,1041,NULL,'37213',NULL,1228,36.167179,-86.76777,0,NULL,NULL,NULL),(11,55,1,1,0,'804E Dowlen Way SE',804,'E',NULL,'Dowlen','Way','SE',NULL,NULL,NULL,NULL,'Houston',1,1042,NULL,'77073',NULL,1228,30.008745,-95.41273,0,NULL,NULL,NULL),(12,173,1,1,0,'212X States Rd NW',212,'X',NULL,'States','Rd','NW',NULL,NULL,NULL,NULL,'Grafton',1,1048,NULL,'53024',NULL,1228,43.32546,-87.94573,0,NULL,NULL,NULL),(13,104,1,1,0,'812A College Blvd NE',812,'A',NULL,'College','Blvd','NE',NULL,NULL,NULL,NULL,'Humboldt',1,1015,NULL,'66748',NULL,1228,37.802718,-95.43452,0,NULL,NULL,NULL),(14,100,1,1,0,'94O Lincoln Rd E',94,'O',NULL,'Lincoln','Rd','E',NULL,NULL,NULL,NULL,'Dagmar',1,1025,NULL,'59219',NULL,1228,48.519946,-104.25492,0,NULL,NULL,NULL),(15,36,1,1,0,'533E El Camino Rd SW',533,'E',NULL,'El Camino','Rd','SW',NULL,NULL,NULL,NULL,'Benjamin',1,1042,NULL,'79505',NULL,1228,33.565259,-99.84811,0,NULL,NULL,NULL),(16,11,1,1,0,'205S Pine Dr S',205,'S',NULL,'Pine','Dr','S',NULL,NULL,NULL,NULL,'Blue Ridge',1,1042,NULL,'75424',NULL,1228,33.321604,-96.39502,0,NULL,NULL,NULL),(17,201,1,1,0,'58C Bay Dr S',58,'C',NULL,'Bay','Dr','S',NULL,NULL,NULL,NULL,'Lancaster',1,1039,NULL,'29722',NULL,1228,34.767269,-80.658932,0,NULL,NULL,NULL),(18,192,1,1,0,'393B Bay Ln E',393,'B',NULL,'Bay','Ln','E',NULL,NULL,NULL,NULL,'Hardyston',1,1029,NULL,'07819',NULL,1228,41.162053,-74.580886,0,NULL,NULL,NULL),(19,168,1,1,0,'145I College St W',145,'I',NULL,'College','St','W',NULL,NULL,NULL,NULL,'San Diego',1,1004,NULL,'92109',NULL,1228,32.791246,-117.24343,0,NULL,NULL,NULL),(20,92,1,1,0,'645N Martin Luther King Dr NE',645,'N',NULL,'Martin Luther King','Dr','NE',NULL,NULL,NULL,NULL,'Birmingham',1,1000,NULL,'35233',NULL,1228,33.509623,-86.7997,0,NULL,NULL,NULL),(21,94,1,1,0,'238K Martin Luther King Dr N',238,'K',NULL,'Martin Luther King','Dr','N',NULL,NULL,NULL,NULL,'Morgantown',1,1016,NULL,'42261',NULL,1228,37.219254,-86.67988,0,NULL,NULL,NULL),(22,60,1,1,0,'284Y Beech Path NE',284,'Y',NULL,'Beech','Path','NE',NULL,NULL,NULL,NULL,'Kings Mountain',1,1032,NULL,'28086',NULL,1228,35.241188,-81.3614,0,NULL,NULL,NULL),(23,133,1,1,0,'942O El Camino St NW',942,'O',NULL,'El Camino','St','NW',NULL,NULL,NULL,NULL,'Cedar City',1,1043,NULL,'84721',NULL,1228,37.656843,-113.3695,0,NULL,NULL,NULL),(24,125,1,1,0,'249A College St NW',249,'A',NULL,'College','St','NW',NULL,NULL,NULL,NULL,'Brushton',1,1031,NULL,'12916',NULL,1228,44.830736,-74.51434,0,NULL,NULL,NULL),(25,197,1,1,0,'522Y Martin Luther King Path SW',522,'Y',NULL,'Martin Luther King','Path','SW',NULL,NULL,NULL,NULL,'Shade Gap',1,1037,NULL,'17255',NULL,1228,40.152486,-77.8617,0,NULL,NULL,NULL),(26,171,1,1,0,'120E Northpoint Rd SW',120,'E',NULL,'Northpoint','Rd','SW',NULL,NULL,NULL,NULL,'Des Plaines',1,1012,NULL,'60016',NULL,1228,42.047178,-87.89058,0,NULL,NULL,NULL),(27,152,1,1,0,'451F Bay Blvd SW',451,'F',NULL,'Bay','Blvd','SW',NULL,NULL,NULL,NULL,'Irene',1,1042,NULL,'76650',NULL,1228,31.987167,-97.108113,0,NULL,NULL,NULL),(28,108,1,1,0,'396C Northpoint Ave NW',396,'C',NULL,'Northpoint','Ave','NW',NULL,NULL,NULL,NULL,'Eakly',1,1035,NULL,'73033',NULL,1228,35.303547,-98.55543,0,NULL,NULL,NULL),(29,194,1,1,0,'859V Dowlen Way S',859,'V',NULL,'Dowlen','Way','S',NULL,NULL,NULL,NULL,'Peoria',1,1012,NULL,'61603',NULL,1228,40.712887,-89.57904,0,NULL,NULL,NULL),(30,14,1,1,0,'78T Pine Rd NE',78,'T',NULL,'Pine','Rd','NE',NULL,NULL,NULL,NULL,'Hartford',1,1034,NULL,'44424',NULL,1228,41.309096,-80.584681,0,NULL,NULL,NULL),(31,183,1,1,0,'808X States Pl E',808,'X',NULL,'States','Pl','E',NULL,NULL,NULL,NULL,'Mount Aukum',1,1004,NULL,'95656',NULL,1228,38.54723,-120.707891,0,NULL,NULL,NULL),(32,191,1,1,0,'319Y Maple Blvd SW',319,'Y',NULL,'Maple','Blvd','SW',NULL,NULL,NULL,NULL,'Fruitvale',1,1041,NULL,'38336',NULL,1228,35.748414,-89.032672,0,NULL,NULL,NULL),(33,31,1,1,0,'187T Maple Way E',187,'T',NULL,'Maple','Way','E',NULL,NULL,NULL,NULL,'Country Club Hills',1,1012,NULL,'60478',NULL,1228,41.561134,-87.72398,0,NULL,NULL,NULL),(34,184,1,1,0,'423T Jackson Path NW',423,'T',NULL,'Jackson','Path','NW',NULL,NULL,NULL,NULL,'Richmond',1,1045,NULL,'23255',NULL,1228,37.531296,-77.416103,0,NULL,NULL,NULL),(35,46,1,1,0,'56O Bay Way SE',56,'O',NULL,'Bay','Way','SE',NULL,NULL,NULL,NULL,'Eldred',1,1037,NULL,'16731',NULL,1228,41.957479,-78.39317,0,NULL,NULL,NULL),(36,16,1,1,0,'738A Northpoint Ave N',738,'A',NULL,'Northpoint','Ave','N',NULL,NULL,NULL,NULL,'Chauncey',1,1009,NULL,'31011',NULL,1228,32.108676,-83.06006,0,NULL,NULL,NULL),(37,199,1,1,0,'698Z Martin Luther King Way S',698,'Z',NULL,'Martin Luther King','Way','S',NULL,NULL,NULL,NULL,'Moundville',1,1024,NULL,'64771',NULL,1228,37.766787,-94.45313,0,NULL,NULL,NULL),(38,61,1,1,0,'537M Woodbridge Ave S',537,'M',NULL,'Woodbridge','Ave','S',NULL,NULL,NULL,NULL,'Corona',1,1004,NULL,'92882',NULL,1228,33.866555,-117.59167,0,NULL,NULL,NULL),(39,33,1,1,0,'303L Dowlen St W',303,'L',NULL,'Dowlen','St','W',NULL,NULL,NULL,NULL,'Morehead',1,1016,NULL,'40351',NULL,1228,38.19056,-83.4321,0,NULL,NULL,NULL),(40,86,1,1,0,'166I Lincoln Blvd W',166,'I',NULL,'Lincoln','Blvd','W',NULL,NULL,NULL,NULL,'Claremont',1,1022,NULL,'55924',NULL,1228,44.035716,-93.01627,0,NULL,NULL,NULL),(41,182,1,1,0,'816Q Second Blvd SW',816,'Q',NULL,'Second','Blvd','SW',NULL,NULL,NULL,NULL,'Phoenix',1,1002,NULL,'85008',NULL,1228,33.466393,-112.0008,0,NULL,NULL,NULL),(42,137,1,1,0,'268O States Ave W',268,'O',NULL,'States','Ave','W',NULL,NULL,NULL,NULL,'Eureka',1,1043,NULL,'84628',NULL,1228,39.855141,-112.14995,0,NULL,NULL,NULL),(43,35,1,1,0,'781Z States Blvd SE',781,'Z',NULL,'States','Blvd','SE',NULL,NULL,NULL,NULL,'Dermott',1,1003,NULL,'71638',NULL,1228,33.525266,-91.47922,0,NULL,NULL,NULL),(44,117,1,1,0,'561N Green Dr S',561,'N',NULL,'Green','Dr','S',NULL,NULL,NULL,NULL,'Hamburg',1,1017,NULL,'71339',NULL,1228,31.024614,-91.92715,0,NULL,NULL,NULL),(45,147,1,1,0,'352Y Beech Ln SW',352,'Y',NULL,'Beech','Ln','SW',NULL,NULL,NULL,NULL,'Paauilo',1,1010,NULL,'96776',NULL,1228,20.022513,-155.37514,0,NULL,NULL,NULL),(46,28,1,1,0,'951M College Pl NE',951,'M',NULL,'College','Pl','NE',NULL,NULL,NULL,NULL,'Humnoke',1,1003,NULL,'72072',NULL,1228,34.516932,-91.76502,0,NULL,NULL,NULL),(47,176,1,1,0,'255U College Path NW',255,'U',NULL,'College','Path','NW',NULL,NULL,NULL,NULL,'Cairo',1,1012,NULL,'62914',NULL,1228,37.025325,-89.18974,0,NULL,NULL,NULL),(48,185,1,1,0,'763V Lincoln Ave E',763,'V',NULL,'Lincoln','Ave','E',NULL,NULL,NULL,NULL,'Visalia',1,1004,NULL,'93292',NULL,1228,36.358928,-119.24027,0,NULL,NULL,NULL),(49,95,1,1,0,'414Q Martin Luther King Blvd N',414,'Q',NULL,'Martin Luther King','Blvd','N',NULL,NULL,NULL,NULL,'Big Bear City',1,1004,NULL,'92314',NULL,1228,34.255388,-116.85442,0,NULL,NULL,NULL),(50,121,1,1,0,'298B Northpoint Way NE',298,'B',NULL,'Northpoint','Way','NE',NULL,NULL,NULL,NULL,'Copperhill',1,1041,NULL,'37317',NULL,1228,35.008596,-84.3859,0,NULL,NULL,NULL),(51,111,1,1,0,'623W Jackson Ln N',623,'W',NULL,'Jackson','Ln','N',NULL,NULL,NULL,NULL,'McShan',1,1000,NULL,'35471',NULL,1228,33.402134,-88.14732,0,NULL,NULL,NULL),(52,40,1,1,0,'187I Cadell Rd NE',187,'I',NULL,'Cadell','Rd','NE',NULL,NULL,NULL,NULL,'Columbus',1,1034,NULL,'43228',NULL,1228,39.954363,-83.123,0,NULL,NULL,NULL),(53,68,1,1,0,'482B Lincoln Blvd S',482,'B',NULL,'Lincoln','Blvd','S',NULL,NULL,NULL,NULL,'Ogunquit',1,1018,NULL,'03097',NULL,1228,43.269137,-70.598303,0,NULL,NULL,NULL),(54,82,1,1,0,'172G College Dr N',172,'G',NULL,'College','Dr','N',NULL,NULL,NULL,NULL,'Cripple Creek',1,1045,NULL,'24322',NULL,1228,36.820139,-81.11128,0,NULL,NULL,NULL),(55,180,1,1,0,'719Y States Path E',719,'Y',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Villa Park',1,1012,NULL,'60181',NULL,1228,41.880429,-87.97813,0,NULL,NULL,NULL),(56,50,1,1,0,'282K Van Ness Dr N',282,'K',NULL,'Van Ness','Dr','N',NULL,NULL,NULL,NULL,'Cedar Rapids',1,1014,NULL,'52405',NULL,1228,41.980283,-91.70835,0,NULL,NULL,NULL),(57,56,1,1,0,'397A States Blvd SW',397,'A',NULL,'States','Blvd','SW',NULL,NULL,NULL,NULL,'Dacoma',1,1035,NULL,'73731',NULL,1228,36.648048,-98.58222,0,NULL,NULL,NULL),(58,122,1,1,0,'319K Beech Blvd SW',319,'K',NULL,'Beech','Blvd','SW',NULL,NULL,NULL,NULL,'Weippe',1,1011,NULL,'83553',NULL,1228,46.368447,-115.90101,0,NULL,NULL,NULL),(59,144,1,1,0,'31R States St SW',31,'R',NULL,'States','St','SW',NULL,NULL,NULL,NULL,'Baytown',1,1042,NULL,'77522',NULL,1228,29.83399,-95.434241,0,NULL,NULL,NULL),(60,166,1,1,0,'931T States Ln N',931,'T',NULL,'States','Ln','N',NULL,NULL,NULL,NULL,'Monument Valley',1,1002,NULL,'84536',NULL,1228,36.990184,-110.2123,0,NULL,NULL,NULL),(61,81,1,1,0,'721C Pine St SW',721,'C',NULL,'Pine','St','SW',NULL,NULL,NULL,NULL,'Daytona Beach',1,1008,NULL,'32125',NULL,1228,29.022729,-81.172169,0,NULL,NULL,NULL),(62,156,1,1,0,'899K Woodbridge St SE',899,'K',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Latham',1,1015,NULL,'67072',NULL,1228,37.561112,-96.59795,0,NULL,NULL,NULL),(63,37,1,1,0,'753I Pine Pl NW',753,'I',NULL,'Pine','Pl','NW',NULL,NULL,NULL,NULL,'Josephine',1,1042,NULL,'75164',NULL,1228,33.065217,-96.31152,0,NULL,NULL,NULL),(64,141,1,1,0,'104Y Northpoint Dr NE',104,'Y',NULL,'Northpoint','Dr','NE',NULL,NULL,NULL,NULL,'Stevenson',1,1046,NULL,'98648',NULL,1228,45.669604,-121.91332,0,NULL,NULL,NULL),(65,174,1,1,0,'696K Lincoln Rd SE',696,'K',NULL,'Lincoln','Rd','SE',NULL,NULL,NULL,NULL,'Halifax',1,1037,NULL,'17032',NULL,1228,40.48358,-76.8727,0,NULL,NULL,NULL),(66,127,1,1,0,'611F Lincoln Ave E',611,'F',NULL,'Lincoln','Ave','E',NULL,NULL,NULL,NULL,'Graysville',1,1013,NULL,'47852',NULL,1228,39.080474,-87.449558,0,NULL,NULL,NULL),(67,53,1,1,0,'558F Woodbridge Way SE',558,'F',NULL,'Woodbridge','Way','SE',NULL,NULL,NULL,NULL,'Milton',1,1012,NULL,'60127',NULL,1228,41.878878,-88.134469,0,NULL,NULL,NULL),(68,155,1,1,0,'897I Beech Pl SW',897,'I',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Estill',1,1039,NULL,'29918',NULL,1228,32.744565,-81.24794,0,NULL,NULL,NULL),(69,41,1,1,0,'382W Van Ness St SE',382,'W',NULL,'Van Ness','St','SE',NULL,NULL,NULL,NULL,'Sumas',1,1046,NULL,'98295',NULL,1228,48.971298,-122.20146,0,NULL,NULL,NULL),(70,13,1,1,0,'496V States Path SW',496,'V',NULL,'States','Path','SW',NULL,NULL,NULL,NULL,'Salisbury Center',1,1031,NULL,'13454',NULL,1228,43.222171,-74.80223,0,NULL,NULL,NULL),(71,62,1,1,0,'169S Caulder Rd N',169,'S',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Silver Springs',1,1008,NULL,'34489',NULL,1228,29.215153,-82.097163,0,NULL,NULL,NULL),(72,198,1,1,0,'554V Martin Luther King Blvd NE',554,'V',NULL,'Martin Luther King','Blvd','NE',NULL,NULL,NULL,NULL,'Thomson',1,1009,NULL,'30824',NULL,1228,33.490536,-82.5028,0,NULL,NULL,NULL),(73,172,3,1,0,'108Z Cadell Ln NE',108,'Z',NULL,'Cadell','Ln','NE',NULL,'Community Relations',NULL,NULL,'Sassafras',1,1016,NULL,'41759',NULL,1228,37.229381,-83.03409,0,NULL,NULL,NULL),(74,103,3,1,0,'784J College Path SW',784,'J',NULL,'College','Path','SW',NULL,'Cuffe Parade',NULL,NULL,'Dameron',1,1019,NULL,'20628',NULL,1228,38.135718,-76.33865,0,NULL,NULL,NULL),(75,175,2,1,0,'784J College Path SW',784,'J',NULL,'College','Path','SW',NULL,'Cuffe Parade',NULL,NULL,'Dameron',1,1019,NULL,'20628',NULL,1228,38.135718,-76.33865,0,NULL,NULL,74),(76,15,3,1,0,'236I Dowlen Pl NE',236,'I',NULL,'Dowlen','Pl','NE',NULL,'Subscriptions Dept',NULL,NULL,'Sterling',1,1043,NULL,'84665',NULL,1228,39.133489,-111.740853,0,NULL,NULL,NULL),(77,149,3,1,0,'848O Bay Dr W',848,'O',NULL,'Bay','Dr','W',NULL,'Mailstop 101',NULL,NULL,'Tipton',1,1015,NULL,'67485',NULL,1228,39.32071,-98.50294,0,NULL,NULL,NULL),(78,39,3,1,0,'966L Jackson Dr N',966,'L',NULL,'Jackson','Dr','N',NULL,'Attn: Development',NULL,NULL,'Harvard',1,1012,NULL,'60033',NULL,1228,42.424338,-88.61431,0,NULL,NULL,NULL),(79,73,3,1,0,'647R Martin Luther King Path S',647,'R',NULL,'Martin Luther King','Path','S',NULL,'Payables Dept.',NULL,NULL,'Temecula',1,1004,NULL,'92592',NULL,1228,33.495343,-117.07657,0,NULL,NULL,NULL),(80,28,2,0,0,'647R Martin Luther King Path S',647,'R',NULL,'Martin Luther King','Path','S',NULL,'Payables Dept.',NULL,NULL,'Temecula',1,1004,NULL,'92592',NULL,1228,33.495343,-117.07657,0,NULL,NULL,79),(81,21,3,1,0,'418M Bay St N',418,'M',NULL,'Bay','St','N',NULL,'Payables Dept.',NULL,NULL,'Milford',1,1013,NULL,'46542',NULL,1228,41.408621,-85.86531,0,NULL,NULL,NULL),(82,167,3,1,0,'781R Woodbridge Blvd SE',781,'R',NULL,'Woodbridge','Blvd','SE',NULL,'Attn: Accounting',NULL,NULL,'Lawrence',1,1015,NULL,'66044',NULL,1228,38.983551,-95.23202,0,NULL,NULL,NULL),(83,12,2,1,0,'781R Woodbridge Blvd SE',781,'R',NULL,'Woodbridge','Blvd','SE',NULL,'Attn: Accounting',NULL,NULL,'Lawrence',1,1015,NULL,'66044',NULL,1228,38.983551,-95.23202,0,NULL,NULL,82),(84,101,3,1,0,'464W Pine Dr W',464,'W',NULL,'Pine','Dr','W',NULL,'c/o OPDC',NULL,NULL,'Ashville',1,1000,NULL,'35953',NULL,1228,33.825516,-86.24231,0,NULL,NULL,NULL),(85,78,2,1,0,'464W Pine Dr W',464,'W',NULL,'Pine','Dr','W',NULL,'c/o OPDC',NULL,NULL,'Ashville',1,1000,NULL,'35953',NULL,1228,33.825516,-86.24231,0,NULL,NULL,84),(86,102,3,1,0,'329P Northpoint St N',329,'P',NULL,'Northpoint','St','N',NULL,'Churchgate',NULL,NULL,'Fairbanks',1,1001,NULL,'99711',NULL,1228,64.826445,-147.38884,0,NULL,NULL,NULL),(87,23,3,1,0,'894S Second Blvd NE',894,'S',NULL,'Second','Blvd','NE',NULL,'Receiving',NULL,NULL,'Waterville',1,1018,NULL,'04901',NULL,1228,44.554965,-69.61297,0,NULL,NULL,NULL),(88,52,2,1,0,'894S Second Blvd NE',894,'S',NULL,'Second','Blvd','NE',NULL,'Receiving',NULL,NULL,'Waterville',1,1018,NULL,'04901',NULL,1228,44.554965,-69.61297,0,NULL,NULL,87),(89,161,3,1,0,'370Y Beech Dr N',370,'Y',NULL,'Beech','Dr','N',NULL,'Churchgate',NULL,NULL,'Scranton',1,1039,NULL,'29591',NULL,1228,33.927936,-79.76429,0,NULL,NULL,NULL),(90,93,3,1,0,'862E Maple Ave NE',862,'E',NULL,'Maple','Ave','NE',NULL,'Editorial Dept',NULL,NULL,'Washington Depot',1,1006,NULL,'06794',NULL,1228,41.644096,-73.32437,0,NULL,NULL,NULL),(91,87,2,0,0,'862E Maple Ave NE',862,'E',NULL,'Maple','Ave','NE',NULL,'Editorial Dept',NULL,NULL,'Washington Depot',1,1006,NULL,'06794',NULL,1228,41.644096,-73.32437,0,NULL,NULL,90),(92,49,3,1,0,'210T Bay Pl SW',210,'T',NULL,'Bay','Pl','SW',NULL,'c/o PO Plus',NULL,NULL,'Bartow',1,1047,NULL,'24920',NULL,1228,38.552106,-79.7315,0,NULL,NULL,NULL),(93,170,3,1,0,'355K Caulder Rd NE',355,'K',NULL,'Caulder','Rd','NE',NULL,'c/o OPDC',NULL,NULL,'Center Sandwich',1,1028,NULL,'03227',NULL,1228,43.802936,-71.45126,0,NULL,NULL,NULL),(94,70,3,1,0,'15X Main Blvd W',15,'X',NULL,'Main','Blvd','W',NULL,'Churchgate',NULL,NULL,'Thermopolis',1,1049,NULL,'82443',NULL,1228,43.694009,-108.31942,0,NULL,NULL,NULL),(95,129,3,1,0,'22B Maple Way NE',22,'B',NULL,'Maple','Way','NE',NULL,'c/o OPDC',NULL,NULL,'Tennyson',1,1042,NULL,'76953',NULL,1228,31.716571,-100.35906,0,NULL,NULL,NULL),(96,165,3,1,0,'408F Main Path N',408,'F',NULL,'Main','Path','N',NULL,'Subscriptions Dept',NULL,NULL,'Williamsburg',1,1016,NULL,'40769',NULL,1228,36.709853,-84.1508,0,NULL,NULL,NULL),(97,3,2,1,0,'408F Main Path N',408,'F',NULL,'Main','Path','N',NULL,'Subscriptions Dept',NULL,NULL,'Williamsburg',1,1016,NULL,'40769',NULL,1228,36.709853,-84.1508,0,NULL,NULL,96),(98,77,3,1,0,'928H Cadell Pl SE',928,'H',NULL,'Cadell','Pl','SE',NULL,'Mailstop 101',NULL,NULL,'Paragonah',1,1043,NULL,'84760',NULL,1228,37.911834,-112.68799,0,NULL,NULL,NULL),(99,85,2,1,0,'928H Cadell Pl SE',928,'H',NULL,'Cadell','Pl','SE',NULL,'Mailstop 101',NULL,NULL,'Paragonah',1,1043,NULL,'84760',NULL,1228,37.911834,-112.68799,0,NULL,NULL,98),(100,74,3,1,0,'556S Cadell Ln SW',556,'S',NULL,'Cadell','Ln','SW',NULL,'Payables Dept.',NULL,NULL,'Tajique',1,1030,NULL,'87057',NULL,1228,34.650925,-105.880597,0,NULL,NULL,NULL),(101,54,2,1,0,'556S Cadell Ln SW',556,'S',NULL,'Cadell','Ln','SW',NULL,'Payables Dept.',NULL,NULL,'Tajique',1,1030,NULL,'87057',NULL,1228,34.650925,-105.880597,0,NULL,NULL,100),(102,158,1,1,0,'482B Lincoln Blvd S',482,'B',NULL,'Lincoln','Blvd','S',NULL,NULL,NULL,NULL,'Ogunquit',1,1018,NULL,'03097',NULL,1228,43.269137,-70.598303,0,NULL,NULL,53),(103,76,1,1,0,'482B Lincoln Blvd S',482,'B',NULL,'Lincoln','Blvd','S',NULL,NULL,NULL,NULL,'Ogunquit',1,1018,NULL,'03097',NULL,1228,43.269137,-70.598303,0,NULL,NULL,53),(104,75,1,1,0,'482B Lincoln Blvd S',482,'B',NULL,'Lincoln','Blvd','S',NULL,NULL,NULL,NULL,'Ogunquit',1,1018,NULL,'03097',NULL,1228,43.269137,-70.598303,0,NULL,NULL,53),(105,40,1,0,0,'482B Lincoln Blvd S',482,'B',NULL,'Lincoln','Blvd','S',NULL,NULL,NULL,NULL,'Ogunquit',1,1018,NULL,'03097',NULL,1228,43.269137,-70.598303,0,NULL,NULL,53),(106,131,1,1,0,'172G College Dr N',172,'G',NULL,'College','Dr','N',NULL,NULL,NULL,NULL,'Cripple Creek',1,1045,NULL,'24322',NULL,1228,36.820139,-81.11128,0,NULL,NULL,54),(107,97,1,1,0,'172G College Dr N',172,'G',NULL,'College','Dr','N',NULL,NULL,NULL,NULL,'Cripple Creek',1,1045,NULL,'24322',NULL,1228,36.820139,-81.11128,0,NULL,NULL,54),(108,89,1,1,0,'172G College Dr N',172,'G',NULL,'College','Dr','N',NULL,NULL,NULL,NULL,'Cripple Creek',1,1045,NULL,'24322',NULL,1228,36.820139,-81.11128,0,NULL,NULL,54),(109,43,1,1,0,'172G College Dr N',172,'G',NULL,'College','Dr','N',NULL,NULL,NULL,NULL,'Cripple Creek',1,1045,NULL,'24322',NULL,1228,36.820139,-81.11128,0,NULL,NULL,54),(110,26,1,1,0,'719Y States Path E',719,'Y',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Villa Park',1,1012,NULL,'60181',NULL,1228,41.880429,-87.97813,0,NULL,NULL,55),(111,10,1,1,0,'719Y States Path E',719,'Y',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Villa Park',1,1012,NULL,'60181',NULL,1228,41.880429,-87.97813,0,NULL,NULL,55),(112,134,1,1,0,'719Y States Path E',719,'Y',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Villa Park',1,1012,NULL,'60181',NULL,1228,41.880429,-87.97813,0,NULL,NULL,55),(113,124,1,1,0,'719Y States Path E',719,'Y',NULL,'States','Path','E',NULL,NULL,NULL,NULL,'Villa Park',1,1012,NULL,'60181',NULL,1228,41.880429,-87.97813,0,NULL,NULL,55),(114,22,1,1,0,'282K Van Ness Dr N',282,'K',NULL,'Van Ness','Dr','N',NULL,NULL,NULL,NULL,'Cedar Rapids',1,1014,NULL,'52405',NULL,1228,41.980283,-91.70835,0,NULL,NULL,56),(115,178,1,1,0,'282K Van Ness Dr N',282,'K',NULL,'Van Ness','Dr','N',NULL,NULL,NULL,NULL,'Cedar Rapids',1,1014,NULL,'52405',NULL,1228,41.980283,-91.70835,0,NULL,NULL,56),(116,179,1,1,0,'282K Van Ness Dr N',282,'K',NULL,'Van Ness','Dr','N',NULL,NULL,NULL,NULL,'Cedar Rapids',1,1014,NULL,'52405',NULL,1228,41.980283,-91.70835,0,NULL,NULL,56),(117,45,1,1,0,'282K Van Ness Dr N',282,'K',NULL,'Van Ness','Dr','N',NULL,NULL,NULL,NULL,'Cedar Rapids',1,1014,NULL,'52405',NULL,1228,41.980283,-91.70835,0,NULL,NULL,56),(118,138,1,1,0,'397A States Blvd SW',397,'A',NULL,'States','Blvd','SW',NULL,NULL,NULL,NULL,'Dacoma',1,1035,NULL,'73731',NULL,1228,36.648048,-98.58222,0,NULL,NULL,57),(119,57,1,1,0,'397A States Blvd SW',397,'A',NULL,'States','Blvd','SW',NULL,NULL,NULL,NULL,'Dacoma',1,1035,NULL,'73731',NULL,1228,36.648048,-98.58222,0,NULL,NULL,57),(120,157,1,1,0,'397A States Blvd SW',397,'A',NULL,'States','Blvd','SW',NULL,NULL,NULL,NULL,'Dacoma',1,1035,NULL,'73731',NULL,1228,36.648048,-98.58222,0,NULL,NULL,57),(121,66,1,1,0,'587R Northpoint Ln NE',587,'R',NULL,'Northpoint','Ln','NE',NULL,NULL,NULL,NULL,'Russell',1,1015,NULL,'67665',NULL,1228,38.866551,-98.8672,0,NULL,NULL,NULL),(122,196,1,1,0,'319K Beech Blvd SW',319,'K',NULL,'Beech','Blvd','SW',NULL,NULL,NULL,NULL,'Weippe',1,1011,NULL,'83553',NULL,1228,46.368447,-115.90101,0,NULL,NULL,58),(123,159,1,1,0,'319K Beech Blvd SW',319,'K',NULL,'Beech','Blvd','SW',NULL,NULL,NULL,NULL,'Weippe',1,1011,NULL,'83553',NULL,1228,46.368447,-115.90101,0,NULL,NULL,58),(124,145,1,1,0,'319K Beech Blvd SW',319,'K',NULL,'Beech','Blvd','SW',NULL,NULL,NULL,NULL,'Weippe',1,1011,NULL,'83553',NULL,1228,46.368447,-115.90101,0,NULL,NULL,58),(125,142,1,1,0,'319K Beech Blvd SW',319,'K',NULL,'Beech','Blvd','SW',NULL,NULL,NULL,NULL,'Weippe',1,1011,NULL,'83553',NULL,1228,46.368447,-115.90101,0,NULL,NULL,58),(126,106,1,1,0,'31R States St SW',31,'R',NULL,'States','St','SW',NULL,NULL,NULL,NULL,'Baytown',1,1042,NULL,'77522',NULL,1228,29.83399,-95.434241,0,NULL,NULL,59),(127,30,1,1,0,'31R States St SW',31,'R',NULL,'States','St','SW',NULL,NULL,NULL,NULL,'Baytown',1,1042,NULL,'77522',NULL,1228,29.83399,-95.434241,0,NULL,NULL,59),(128,113,1,1,0,'31R States St SW',31,'R',NULL,'States','St','SW',NULL,NULL,NULL,NULL,'Baytown',1,1042,NULL,'77522',NULL,1228,29.83399,-95.434241,0,NULL,NULL,59),(129,163,1,1,0,'31R States St SW',31,'R',NULL,'States','St','SW',NULL,NULL,NULL,NULL,'Baytown',1,1042,NULL,'77522',NULL,1228,29.83399,-95.434241,0,NULL,NULL,59),(130,29,1,1,0,'931T States Ln N',931,'T',NULL,'States','Ln','N',NULL,NULL,NULL,NULL,'Monument Valley',1,1002,NULL,'84536',NULL,1228,36.990184,-110.2123,0,NULL,NULL,60),(131,19,1,1,0,'931T States Ln N',931,'T',NULL,'States','Ln','N',NULL,NULL,NULL,NULL,'Monument Valley',1,1002,NULL,'84536',NULL,1228,36.990184,-110.2123,0,NULL,NULL,60),(132,105,1,1,0,'931T States Ln N',931,'T',NULL,'States','Ln','N',NULL,NULL,NULL,NULL,'Monument Valley',1,1002,NULL,'84536',NULL,1228,36.990184,-110.2123,0,NULL,NULL,60),(133,67,1,1,0,'931T States Ln N',931,'T',NULL,'States','Ln','N',NULL,NULL,NULL,NULL,'Monument Valley',1,1002,NULL,'84536',NULL,1228,36.990184,-110.2123,0,NULL,NULL,60),(134,20,1,1,0,'721C Pine St SW',721,'C',NULL,'Pine','St','SW',NULL,NULL,NULL,NULL,'Daytona Beach',1,1008,NULL,'32125',NULL,1228,29.022729,-81.172169,0,NULL,NULL,61),(135,25,1,1,0,'721C Pine St SW',721,'C',NULL,'Pine','St','SW',NULL,NULL,NULL,NULL,'Daytona Beach',1,1008,NULL,'32125',NULL,1228,29.022729,-81.172169,0,NULL,NULL,61),(136,186,1,1,0,'721C Pine St SW',721,'C',NULL,'Pine','St','SW',NULL,NULL,NULL,NULL,'Daytona Beach',1,1008,NULL,'32125',NULL,1228,29.022729,-81.172169,0,NULL,NULL,61),(137,63,1,1,0,'373T Cadell Ln SW',373,'T',NULL,'Cadell','Ln','SW',NULL,NULL,NULL,NULL,'Minturn',1,1005,NULL,'81645',NULL,1228,39.459323,-106.37859,0,NULL,NULL,NULL),(138,52,1,0,0,'899K Woodbridge St SE',899,'K',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Latham',1,1015,NULL,'67072',NULL,1228,37.561112,-96.59795,0,NULL,NULL,62),(139,136,1,1,0,'899K Woodbridge St SE',899,'K',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Latham',1,1015,NULL,'67072',NULL,1228,37.561112,-96.59795,0,NULL,NULL,62),(140,123,1,1,0,'899K Woodbridge St SE',899,'K',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Latham',1,1015,NULL,'67072',NULL,1228,37.561112,-96.59795,0,NULL,NULL,62),(141,48,1,1,0,'899K Woodbridge St SE',899,'K',NULL,'Woodbridge','St','SE',NULL,NULL,NULL,NULL,'Latham',1,1015,NULL,'67072',NULL,1228,37.561112,-96.59795,0,NULL,NULL,62),(142,153,1,1,0,'753I Pine Pl NW',753,'I',NULL,'Pine','Pl','NW',NULL,NULL,NULL,NULL,'Josephine',1,1042,NULL,'75164',NULL,1228,33.065217,-96.31152,0,NULL,NULL,63),(143,96,1,1,0,'753I Pine Pl NW',753,'I',NULL,'Pine','Pl','NW',NULL,NULL,NULL,NULL,'Josephine',1,1042,NULL,'75164',NULL,1228,33.065217,-96.31152,0,NULL,NULL,63),(144,135,1,1,0,'753I Pine Pl NW',753,'I',NULL,'Pine','Pl','NW',NULL,NULL,NULL,NULL,'Josephine',1,1042,NULL,'75164',NULL,1228,33.065217,-96.31152,0,NULL,NULL,63),(145,150,1,1,0,'753I Pine Pl NW',753,'I',NULL,'Pine','Pl','NW',NULL,NULL,NULL,NULL,'Josephine',1,1042,NULL,'75164',NULL,1228,33.065217,-96.31152,0,NULL,NULL,63),(146,6,1,1,0,'104Y Northpoint Dr NE',104,'Y',NULL,'Northpoint','Dr','NE',NULL,NULL,NULL,NULL,'Stevenson',1,1046,NULL,'98648',NULL,1228,45.669604,-121.91332,0,NULL,NULL,64),(147,175,1,0,0,'104Y Northpoint Dr NE',104,'Y',NULL,'Northpoint','Dr','NE',NULL,NULL,NULL,NULL,'Stevenson',1,1046,NULL,'98648',NULL,1228,45.669604,-121.91332,0,NULL,NULL,64),(148,110,1,1,0,'104Y Northpoint Dr NE',104,'Y',NULL,'Northpoint','Dr','NE',NULL,NULL,NULL,NULL,'Stevenson',1,1046,NULL,'98648',NULL,1228,45.669604,-121.91332,0,NULL,NULL,64),(149,27,1,1,0,'104Y Northpoint Dr NE',104,'Y',NULL,'Northpoint','Dr','NE',NULL,NULL,NULL,NULL,'Stevenson',1,1046,NULL,'98648',NULL,1228,45.669604,-121.91332,0,NULL,NULL,64),(150,200,1,1,0,'696K Lincoln Rd SE',696,'K',NULL,'Lincoln','Rd','SE',NULL,NULL,NULL,NULL,'Halifax',1,1037,NULL,'17032',NULL,1228,40.48358,-76.8727,0,NULL,NULL,65),(151,24,1,1,0,'696K Lincoln Rd SE',696,'K',NULL,'Lincoln','Rd','SE',NULL,NULL,NULL,NULL,'Halifax',1,1037,NULL,'17032',NULL,1228,40.48358,-76.8727,0,NULL,NULL,65),(152,90,1,1,0,'696K Lincoln Rd SE',696,'K',NULL,'Lincoln','Rd','SE',NULL,NULL,NULL,NULL,'Halifax',1,1037,NULL,'17032',NULL,1228,40.48358,-76.8727,0,NULL,NULL,65),(153,84,1,1,0,'696K Lincoln Rd SE',696,'K',NULL,'Lincoln','Rd','SE',NULL,NULL,NULL,NULL,'Halifax',1,1037,NULL,'17032',NULL,1228,40.48358,-76.8727,0,NULL,NULL,65),(154,3,1,0,0,'611F Lincoln Ave E',611,'F',NULL,'Lincoln','Ave','E',NULL,NULL,NULL,NULL,'Graysville',1,1013,NULL,'47852',NULL,1228,39.080474,-87.449558,0,NULL,NULL,66),(155,2,1,1,0,'611F Lincoln Ave E',611,'F',NULL,'Lincoln','Ave','E',NULL,NULL,NULL,NULL,'Graysville',1,1013,NULL,'47852',NULL,1228,39.080474,-87.449558,0,NULL,NULL,66),(156,128,1,1,0,'611F Lincoln Ave E',611,'F',NULL,'Lincoln','Ave','E',NULL,NULL,NULL,NULL,'Graysville',1,1013,NULL,'47852',NULL,1228,39.080474,-87.449558,0,NULL,NULL,66),(157,120,1,1,0,'435B Dowlen Ave N',435,'B',NULL,'Dowlen','Ave','N',NULL,NULL,NULL,NULL,'Adrian',1,1042,NULL,'79001',NULL,1228,35.2195,-102.71795,0,NULL,NULL,NULL),(158,18,1,1,0,'558F Woodbridge Way SE',558,'F',NULL,'Woodbridge','Way','SE',NULL,NULL,NULL,NULL,'Milton',1,1012,NULL,'60127',NULL,1228,41.878878,-88.134469,0,NULL,NULL,67),(159,143,1,1,0,'558F Woodbridge Way SE',558,'F',NULL,'Woodbridge','Way','SE',NULL,NULL,NULL,NULL,'Milton',1,1012,NULL,'60127',NULL,1228,41.878878,-88.134469,0,NULL,NULL,67),(160,195,1,1,0,'558F Woodbridge Way SE',558,'F',NULL,'Woodbridge','Way','SE',NULL,NULL,NULL,NULL,'Milton',1,1012,NULL,'60127',NULL,1228,41.878878,-88.134469,0,NULL,NULL,67),(161,146,1,1,0,'248G Martin Luther King St N',248,'G',NULL,'Martin Luther King','St','N',NULL,NULL,NULL,NULL,'Adrian',1,1012,NULL,'62310',NULL,1228,40.416145,-91.205805,0,NULL,NULL,NULL),(162,177,1,1,0,'897I Beech Pl SW',897,'I',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Estill',1,1039,NULL,'29918',NULL,1228,32.744565,-81.24794,0,NULL,NULL,68),(163,72,1,1,0,'897I Beech Pl SW',897,'I',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Estill',1,1039,NULL,'29918',NULL,1228,32.744565,-81.24794,0,NULL,NULL,68),(164,58,1,1,0,'897I Beech Pl SW',897,'I',NULL,'Beech','Pl','SW',NULL,NULL,NULL,NULL,'Estill',1,1039,NULL,'29918',NULL,1228,32.744565,-81.24794,0,NULL,NULL,68),(165,4,1,1,0,'100L El Camino Blvd SW',100,'L',NULL,'El Camino','Blvd','SW',NULL,NULL,NULL,NULL,'Schaumburg',1,1012,NULL,'60159',NULL,1228,41.811929,-87.68732,0,NULL,NULL,NULL),(166,98,1,1,0,'382W Van Ness St SE',382,'W',NULL,'Van Ness','St','SE',NULL,NULL,NULL,NULL,'Sumas',1,1046,NULL,'98295',NULL,1228,48.971298,-122.20146,0,NULL,NULL,69),(167,148,1,1,0,'382W Van Ness St SE',382,'W',NULL,'Van Ness','St','SE',NULL,NULL,NULL,NULL,'Sumas',1,1046,NULL,'98295',NULL,1228,48.971298,-122.20146,0,NULL,NULL,69),(168,109,1,1,0,'382W Van Ness St SE',382,'W',NULL,'Van Ness','St','SE',NULL,NULL,NULL,NULL,'Sumas',1,1046,NULL,'98295',NULL,1228,48.971298,-122.20146,0,NULL,NULL,69),(169,54,1,0,0,'382W Van Ness St SE',382,'W',NULL,'Van Ness','St','SE',NULL,NULL,NULL,NULL,'Sumas',1,1046,NULL,'98295',NULL,1228,48.971298,-122.20146,0,NULL,NULL,69),(170,188,1,1,0,'496V States Path SW',496,'V',NULL,'States','Path','SW',NULL,NULL,NULL,NULL,'Salisbury Center',1,1031,NULL,'13454',NULL,1228,43.222171,-74.80223,0,NULL,NULL,70),(171,71,1,1,0,'496V States Path SW',496,'V',NULL,'States','Path','SW',NULL,NULL,NULL,NULL,'Salisbury Center',1,1031,NULL,'13454',NULL,1228,43.222171,-74.80223,0,NULL,NULL,70),(172,107,1,1,0,'496V States Path SW',496,'V',NULL,'States','Path','SW',NULL,NULL,NULL,NULL,'Salisbury Center',1,1031,NULL,'13454',NULL,1228,43.222171,-74.80223,0,NULL,NULL,70),(173,69,1,1,0,'192W College St S',192,'W',NULL,'College','St','S',NULL,NULL,NULL,NULL,'Mentone',1,1042,NULL,'79754',NULL,1228,31.72285,-103.57449,0,NULL,NULL,NULL),(174,85,1,0,0,'169S Caulder Rd N',169,'S',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Silver Springs',1,1008,NULL,'34489',NULL,1228,29.215153,-82.097163,0,NULL,NULL,71),(175,80,1,1,0,'169S Caulder Rd N',169,'S',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Silver Springs',1,1008,NULL,'34489',NULL,1228,29.215153,-82.097163,0,NULL,NULL,71),(176,169,1,1,0,'169S Caulder Rd N',169,'S',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Silver Springs',1,1008,NULL,'34489',NULL,1228,29.215153,-82.097163,0,NULL,NULL,71),(177,83,1,1,0,'169S Caulder Rd N',169,'S',NULL,'Caulder','Rd','N',NULL,NULL,NULL,NULL,'Silver Springs',1,1008,NULL,'34489',NULL,1228,29.215153,-82.097163,0,NULL,NULL,71),(178,115,1,1,0,'554V Martin Luther King Blvd NE',554,'V',NULL,'Martin Luther King','Blvd','NE',NULL,NULL,NULL,NULL,'Thomson',1,1009,NULL,'30824',NULL,1228,33.490536,-82.5028,0,NULL,NULL,72),(179,5,1,1,0,'554V Martin Luther King Blvd NE',554,'V',NULL,'Martin Luther King','Blvd','NE',NULL,NULL,NULL,NULL,'Thomson',1,1009,NULL,'30824',NULL,1228,33.490536,-82.5028,0,NULL,NULL,72),(180,140,1,1,0,'554V Martin Luther King Blvd NE',554,'V',NULL,'Martin Luther King','Blvd','NE',NULL,NULL,NULL,NULL,'Thomson',1,1009,NULL,'30824',NULL,1228,33.490536,-82.5028,0,NULL,NULL,72),(181,116,1,1,0,'554V Martin Luther King Blvd NE',554,'V',NULL,'Martin Luther King','Blvd','NE',NULL,NULL,NULL,NULL,'Thomson',1,1009,NULL,'30824',NULL,1228,33.490536,-82.5028,0,NULL,NULL,72),(182,NULL,1,1,1,'14S El Camino Way E',14,'S',NULL,'El Camino','Way',NULL,NULL,NULL,NULL,NULL,'Collinsville',NULL,1006,NULL,'6022',NULL,1228,41.8328,-72.9253,0,NULL,NULL,NULL),(183,NULL,1,1,1,'11B Woodbridge Path SW',11,'B',NULL,'Woodbridge','Path',NULL,NULL,NULL,NULL,NULL,'Dayton',NULL,1034,NULL,'45417',NULL,1228,39.7531,-84.2471,0,NULL,NULL,NULL),(184,NULL,1,1,1,'581O Lincoln Dr SW',581,'O',NULL,'Lincoln','Dr',NULL,NULL,NULL,NULL,NULL,'Santa Fe',NULL,1030,NULL,'87594',NULL,1228,35.5212,-105.982,0,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_address` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -208,7 +208,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_contact` DISABLE KEYS */;
-INSERT INTO `civicrm_contact` (`id`, `contact_type`, `contact_sub_type`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `external_identifier`, `sort_name`, `display_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `preferred_mail_format`, `hash`, `api_key`, `source`, `first_name`, `middle_name`, `last_name`, `prefix_id`, `suffix_id`, `formal_title`, `communication_style_id`, `email_greeting_id`, `email_greeting_custom`, `email_greeting_display`, `postal_greeting_id`, `postal_greeting_custom`, `postal_greeting_display`, `addressee_id`, `addressee_custom`, `addressee_display`, `job_title`, `gender_id`, `birth_date`, `is_deceased`, `deceased_date`, `household_name`, `primary_contact_id`, `organization_name`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`) VALUES (1,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Default Organization','Default Organization',NULL,'Default Organization',NULL,NULL,NULL,'Both',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,'Default Organization',NULL,NULL,NULL,0,NULL,'2020-09-16 01:29:14'),(2,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Norris','Norris Müller',NULL,NULL,NULL,NULL,NULL,'Both','1477289672',NULL,'Sample Data','Norris','V','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Müller',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(3,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Wilson, Alida','Ms. Alida Wilson',NULL,NULL,NULL,NULL,NULL,'Both','2827847668',NULL,'Sample Data','Alida','O','Wilson',2,NULL,NULL,NULL,1,NULL,'Dear Alida',1,NULL,'Dear Alida',1,NULL,'Ms. Alida Wilson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(4,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'cruz.esta22@notmail.co.in','cruz.esta22@notmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','377658032',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear cruz.esta22@notmail.co.in',1,NULL,'Dear cruz.esta22@notmail.co.in',1,NULL,'cruz.esta22@notmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(5,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Lee, Billy','Billy Lee Sr.',NULL,NULL,NULL,'
1
',NULL,'Both','587456357',NULL,'Sample Data','Billy','','Lee',NULL,2,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Billy Lee Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(6,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Łąchowski family','Łąchowski family',NULL,NULL,NULL,'
5
',NULL,'Both','2407077255',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Łąchowski family',5,NULL,'Dear Łąchowski family',2,NULL,'Łąchowski family',NULL,NULL,NULL,0,NULL,'Łąchowski family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(7,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Bachman family','Bachman family',NULL,NULL,NULL,'
5
',NULL,'Both','1714131215',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Bachman family',5,NULL,'Dear Bachman family',2,NULL,'Bachman family',NULL,NULL,NULL,0,NULL,'Bachman family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(8,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Northpoint Arts Initiative','Northpoint Arts Initiative',NULL,NULL,NULL,NULL,NULL,'Both','3244989516',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Northpoint Arts Initiative',NULL,NULL,NULL,0,NULL,NULL,42,'Northpoint Arts Initiative',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(9,'Organization',NULL,1,1,0,0,0,0,NULL,NULL,'Virginia Legal Center','Virginia Legal Center',NULL,NULL,NULL,'
1
',NULL,'Both','2596647343',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Virginia Legal Center',NULL,NULL,NULL,0,NULL,NULL,58,'Virginia Legal Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(10,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Rural Software Partnership','Rural Software Partnership',NULL,NULL,NULL,'
2
',NULL,'Both','365602600',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Rural Software Partnership',NULL,NULL,NULL,0,NULL,NULL,125,'Rural Software Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(11,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Brigette','Brigette Olsen',NULL,NULL,NULL,'
2
',NULL,'Both','2958585175',NULL,'Sample Data','Brigette','','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Olsen',NULL,1,'2017-06-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(12,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Teresa','Teresa Łąchowski',NULL,NULL,NULL,'
2
',NULL,'Both','4252064413',NULL,'Sample Data','Teresa','','Łąchowski',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Łąchowski',NULL,NULL,'1976-04-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(13,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Nielsen, Magan','Ms. Magan Nielsen',NULL,NULL,NULL,'
1
',NULL,'Both','1092078914',NULL,'Sample Data','Magan','','Nielsen',2,NULL,NULL,NULL,1,NULL,'Dear Magan',1,NULL,'Dear Magan',1,NULL,'Ms. Magan Nielsen',NULL,NULL,'1990-04-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(14,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Truman','Truman Wilson',NULL,NULL,NULL,'
5
',NULL,'Both','1537569075',NULL,'Sample Data','Truman','U','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Wilson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(15,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Smith-Olsen, Margaret','Margaret Smith-Olsen',NULL,NULL,NULL,NULL,NULL,'Both','3553586126',NULL,'Sample Data','Margaret','','Smith-Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Margaret Smith-Olsen',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(16,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker-Cruz, Kiara','Kiara Parker-Cruz',NULL,NULL,NULL,NULL,NULL,'Both','2778052009',NULL,'Sample Data','Kiara','','Parker-Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Kiara Parker-Cruz',NULL,1,'2001-05-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(17,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Shauna','Dr. Shauna Blackwell',NULL,NULL,NULL,NULL,NULL,'Both','1849682656',NULL,'Sample Data','Shauna','D','Blackwell',4,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Dr. Shauna Blackwell',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(18,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Megan','Megan Samson',NULL,NULL,NULL,NULL,NULL,'Both','4028113417',NULL,'Sample Data','Megan','','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,'Starkville Poetry Network',NULL,NULL,69,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(19,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jacobs, Jed','Dr. Jed Jacobs Sr.',NULL,NULL,NULL,'
2
',NULL,'Both','396684690',NULL,'Sample Data','Jed','','Jacobs',4,2,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Dr. Jed Jacobs Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(20,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'McIntyre Action School','McIntyre Action School',NULL,NULL,NULL,'
3
',NULL,'Both','64894748',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'McIntyre Action School',NULL,NULL,NULL,0,NULL,NULL,73,'McIntyre Action School',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(21,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Norris','Mr. Norris Samson',NULL,NULL,NULL,'
2
',NULL,'Both','2564827585',NULL,'Sample Data','Norris','','Samson',3,NULL,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Samson',NULL,NULL,'1971-09-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(22,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Craig','Craig Terry',NULL,NULL,NULL,NULL,NULL,'Both','99954809',NULL,'Sample Data','Craig','','Terry',NULL,NULL,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Craig Terry',NULL,2,NULL,0,NULL,NULL,NULL,'Cadell Technology Center',NULL,NULL,98,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(23,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Zope, Maria','Maria Zope',NULL,NULL,NULL,'
3
',NULL,'Both','1281712613',NULL,'Sample Data','Maria','','Zope',NULL,NULL,NULL,NULL,1,NULL,'Dear Maria',1,NULL,'Dear Maria',1,NULL,'Maria Zope',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(24,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Jacobs-Jameson, Nicole','Nicole Jacobs-Jameson',NULL,NULL,NULL,NULL,NULL,'Both','2724496681',NULL,'Sample Data','Nicole','','Jacobs-Jameson',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Jacobs-Jameson',NULL,1,'1988-09-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(25,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Lee, Jed','Jed Lee',NULL,NULL,NULL,'
4
',NULL,'Both','301771502',NULL,'Sample Data','Jed','','Lee',NULL,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Jed Lee',NULL,2,'1968-07-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(26,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Kathleen','Kathleen Wilson',NULL,NULL,NULL,NULL,NULL,'Both','773746752',NULL,'Sample Data','Kathleen','I','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Kathleen Wilson',NULL,NULL,'1973-07-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(27,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Elina','Dr. Elina McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','130391420',NULL,'Sample Data','Elina','','McReynolds',4,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Dr. Elina McReynolds',NULL,1,'1961-10-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(28,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'wattsonb62@example.com','wattsonb62@example.com',NULL,NULL,NULL,'
5
',NULL,'Both','1987133067',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear wattsonb62@example.com',1,NULL,'Dear wattsonb62@example.com',1,NULL,'wattsonb62@example.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(29,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker-Cruz, Teresa','Teresa Parker-Cruz',NULL,NULL,NULL,NULL,NULL,'Both','1398362274',NULL,'Sample Data','Teresa','B','Parker-Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Parker-Cruz',NULL,NULL,'2003-09-10',0,NULL,NULL,NULL,'Main Education Center',NULL,NULL,149,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(30,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Norris','Mr. Norris Jameson Sr.',NULL,NULL,NULL,'
4
',NULL,'Both','3849460374',NULL,'Sample Data','Norris','K','Jameson',3,2,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Jameson Sr.',NULL,2,'1934-11-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(31,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith, Brzęczysław','Mr. Brzęczysław Smith III',NULL,NULL,NULL,NULL,NULL,'Both','3764320726',NULL,'Sample Data','Brzęczysław','','Smith',3,4,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Mr. Brzęczysław Smith III',NULL,2,'1994-10-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(32,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Grant family','Müller-Grant family',NULL,NULL,NULL,NULL,NULL,'Both','1954714724',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Müller-Grant family',5,NULL,'Dear Müller-Grant family',2,NULL,'Müller-Grant family',NULL,NULL,NULL,0,NULL,'Müller-Grant family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(33,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson, Alexia','Dr. Alexia Jameson',NULL,NULL,NULL,NULL,NULL,'Both','1617185067',NULL,'Sample Data','Alexia','','Jameson',4,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Dr. Alexia Jameson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(34,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Damaris','Mrs. Damaris Adams',NULL,NULL,NULL,'
5
',NULL,'Both','3501190131',NULL,'Sample Data','Damaris','X','Adams',1,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Mrs. Damaris Adams',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(35,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Smith-Adams, Carlos','Dr. Carlos Smith-Adams II',NULL,NULL,NULL,'
1
',NULL,'Both','219378051',NULL,'Sample Data','Carlos','W','Smith-Adams',4,3,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Dr. Carlos Smith-Adams II',NULL,2,'1978-11-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(36,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wattson, Bryon','Dr. Bryon Wattson',NULL,NULL,NULL,'
3
',NULL,'Both','2375098324',NULL,'Sample Data','Bryon','','Wattson',4,NULL,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Dr. Bryon Wattson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(37,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Friends Wellness Partnership','Friends Wellness Partnership',NULL,NULL,NULL,'
1
',NULL,'Both','3616449023',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Friends Wellness Partnership',NULL,NULL,NULL,0,NULL,NULL,172,'Friends Wellness Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(38,'Household',NULL,1,1,0,0,0,0,NULL,NULL,'Samson family','Samson family',NULL,NULL,NULL,'
3
',NULL,'Both','333421926',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Samson family',5,NULL,'Dear Samson family',2,NULL,'Samson family',NULL,NULL,NULL,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(39,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'margaretdaz51@sample.biz','margaretdaz51@sample.biz',NULL,NULL,NULL,NULL,NULL,'Both','4257184693',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear margaretdaz51@sample.biz',1,NULL,'Dear margaretdaz51@sample.biz',1,NULL,'margaretdaz51@sample.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(40,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wattson, Esta','Esta Wattson',NULL,NULL,NULL,NULL,NULL,'Both','1484476563',NULL,'Sample Data','Esta','O','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Esta',1,NULL,'Dear Esta',1,NULL,'Esta Wattson',NULL,1,NULL,0,NULL,NULL,NULL,'North Carolina Wellness Association',NULL,NULL,115,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(41,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Zope, Jay','Dr. Jay Zope',NULL,NULL,NULL,'
1
',NULL,'Both','819910080',NULL,'Sample Data','Jay','','Zope',4,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Dr. Jay Zope',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(42,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Shauna','Shauna Müller',NULL,NULL,NULL,'
2
',NULL,'Both','2927518438',NULL,'Sample Data','Shauna','I','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Müller',NULL,1,'1959-05-22',0,NULL,NULL,NULL,'Northpoint Arts Initiative',NULL,NULL,8,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(43,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Damaris','Ms. Damaris McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','2561970052',NULL,'Sample Data','Damaris','','McReynolds',2,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Ms. Damaris McReynolds',NULL,1,'1997-10-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(44,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Errol','Mr. Errol Wilson Sr.',NULL,NULL,NULL,NULL,NULL,'Both','1627252863',NULL,'Sample Data','Errol','','Wilson',3,2,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Mr. Errol Wilson Sr.',NULL,2,'1958-05-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(45,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Ivanov family','Ivanov family',NULL,NULL,NULL,NULL,NULL,'Both','2450779112',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Ivanov family',5,NULL,'Dear Ivanov family',2,NULL,'Ivanov family',NULL,NULL,NULL,0,NULL,'Ivanov family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(46,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Ivey','Ivey Bachman',NULL,NULL,NULL,'
5
',NULL,'Both','908900528',NULL,'Sample Data','Ivey','X','Bachman',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Bachman',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(47,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Brittney','Mrs. Brittney Łąchowski',NULL,NULL,NULL,NULL,NULL,'Both','2238471243',NULL,'Sample Data','Brittney','','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Mrs. Brittney Łąchowski',NULL,1,'1942-02-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(48,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Samson, Josefa','Dr. Josefa Samson',NULL,NULL,NULL,NULL,NULL,'Both','3599094976',NULL,'Sample Data','Josefa','','Samson',4,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Dr. Josefa Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(49,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Reynolds, Elizabeth','Elizabeth Reynolds',NULL,NULL,NULL,NULL,NULL,'Both','3578793204',NULL,'Sample Data','Elizabeth','C','Reynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Elizabeth',1,NULL,'Dear Elizabeth',1,NULL,'Elizabeth Reynolds',NULL,1,'2008-10-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(50,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'ivanov.elbert@fishmail.net','ivanov.elbert@fishmail.net',NULL,NULL,NULL,NULL,NULL,'Both','2060868970',NULL,'Sample Data',NULL,NULL,NULL,NULL,3,NULL,NULL,1,NULL,'Dear ivanov.elbert@fishmail.net',1,NULL,'Dear ivanov.elbert@fishmail.net',1,NULL,'ivanov.elbert@fishmail.net',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(51,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Elina','Ms. Elina Parker',NULL,NULL,NULL,'
1
',NULL,'Both','2858301747',NULL,'Sample Data','Elina','T','Parker',2,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Ms. Elina Parker',NULL,NULL,'1945-05-27',1,'2019-10-25',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(52,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Ivanov, Ashley','Ashley Ivanov Jr.',NULL,NULL,NULL,'
1
',NULL,'Both','2740657237',NULL,'Sample Data','Ashley','','Ivanov',NULL,1,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Ivanov Jr.',NULL,2,'1956-09-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(53,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Laree','Ms. Laree Bachman',NULL,NULL,NULL,NULL,NULL,'Both','3736989072',NULL,'Sample Data','Laree','K','Bachman',2,NULL,NULL,NULL,1,NULL,'Dear Laree',1,NULL,'Dear Laree',1,NULL,'Ms. Laree Bachman',NULL,1,'1991-07-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(54,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Juliann','Juliann Nielsen',NULL,NULL,NULL,NULL,NULL,'Both','3555715796',NULL,'Sample Data','Juliann','L','Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Juliann Nielsen',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(55,'Organization',NULL,1,0,0,0,1,0,NULL,NULL,'Sierra Vista Advocacy Alliance','Sierra Vista Advocacy Alliance',NULL,NULL,NULL,'
4
',NULL,'Both','1779900177',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Sierra Vista Advocacy Alliance',NULL,NULL,NULL,0,NULL,NULL,77,'Sierra Vista Advocacy Alliance',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(56,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest-Nielsen, Teresa','Dr. Teresa Deforest-Nielsen',NULL,NULL,NULL,'
5
',NULL,'Both','4230365965',NULL,'Sample Data','Teresa','','Deforest-Nielsen',4,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Dr. Teresa Deforest-Nielsen',NULL,1,'1980-12-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(57,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Megan','Megan McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','1459926371',NULL,'Sample Data','Megan','','McReynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan McReynolds',NULL,1,'1943-07-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(58,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Rebekah','Mrs. Rebekah Bachman',NULL,NULL,NULL,'
3
',NULL,'Both','396522524',NULL,'Sample Data','Rebekah','G','Bachman',1,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Mrs. Rebekah Bachman',NULL,1,'1985-12-04',0,NULL,NULL,NULL,'Virginia Legal Center',NULL,NULL,9,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(59,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Robertson, Rebekah','Dr. Rebekah Robertson',NULL,NULL,NULL,NULL,NULL,'Both','1199774437',NULL,'Sample Data','Rebekah','D','Robertson',4,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Dr. Rebekah Robertson',NULL,NULL,'1972-09-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(60,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'andrewchowski96@lol.co.uk','andrewchowski96@lol.co.uk',NULL,NULL,NULL,'
1
',NULL,'Both','520849502',NULL,'Sample Data',NULL,NULL,NULL,NULL,3,NULL,NULL,1,NULL,'Dear andrewchowski96@lol.co.uk',1,NULL,'Dear andrewchowski96@lol.co.uk',1,NULL,'andrewchowski96@lol.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,'Community Health Systems',NULL,NULL,114,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(61,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jacobs, Kenny','Mr. Kenny Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','1044730065',NULL,'Sample Data','Kenny','','Jacobs',3,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Mr. Kenny Jacobs',NULL,NULL,'1985-01-27',0,NULL,NULL,NULL,'Community Food Solutions',NULL,NULL,76,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(62,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Northpoint Sports Fellowship','Northpoint Sports Fellowship',NULL,NULL,NULL,'
3
',NULL,'Both','1439445317',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Northpoint Sports Fellowship',NULL,NULL,NULL,0,NULL,NULL,143,'Northpoint Sports Fellowship',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(63,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'mller.elizabeth@example.info','mller.elizabeth@example.info',NULL,NULL,NULL,NULL,NULL,'Both','982384173',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear mller.elizabeth@example.info',1,NULL,'Dear mller.elizabeth@example.info',1,NULL,'mller.elizabeth@example.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(64,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Damaris','Damaris Samson',NULL,NULL,NULL,NULL,NULL,'Both','1775086930',NULL,'Sample Data','Damaris','J','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Damaris',1,NULL,'Dear Damaris',1,NULL,'Damaris Samson',NULL,1,'1961-05-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(65,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'jacobs.sonny@airmail.info','jacobs.sonny@airmail.info',NULL,NULL,NULL,'
3
',NULL,'Both','1247338792',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear jacobs.sonny@airmail.info',1,NULL,'Dear jacobs.sonny@airmail.info',1,NULL,'jacobs.sonny@airmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(66,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Minnesota Culture Partnership','Minnesota Culture Partnership',NULL,NULL,NULL,NULL,NULL,'Both','190706445',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Minnesota Culture Partnership',NULL,NULL,NULL,0,NULL,NULL,156,'Minnesota Culture Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(67,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Ashley','Ashley Parker',NULL,NULL,NULL,NULL,NULL,'Both','3805556080',NULL,'Sample Data','Ashley','C','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Parker',NULL,2,'1993-01-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(68,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Bachman, Kenny','Kenny Bachman Jr.',NULL,NULL,NULL,'
5
',NULL,'Both','20347207',NULL,'Sample Data','Kenny','','Bachman',NULL,1,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Kenny Bachman Jr.',NULL,NULL,'1995-08-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(69,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Starkville Poetry Network','Starkville Poetry Network',NULL,NULL,NULL,'
3
',NULL,'Both','682701657',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Starkville Poetry Network',NULL,NULL,NULL,0,NULL,NULL,18,'Starkville Poetry Network',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(70,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Ivey','Ivey Adams',NULL,NULL,NULL,'
2
',NULL,'Both','1336379028',NULL,'Sample Data','Ivey','T','Adams',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Adams',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(71,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Brigette','Dr. Brigette Grant',NULL,NULL,NULL,NULL,NULL,'Both','996729836',NULL,'Sample Data','Brigette','U','Grant',4,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Dr. Brigette Grant',NULL,NULL,'1982-12-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(72,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts, Bryon','Bryon Roberts',NULL,NULL,NULL,'
1
',NULL,'Both','1499512182',NULL,'Sample Data','Bryon','','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Bryon',1,NULL,'Dear Bryon',1,NULL,'Bryon Roberts',NULL,2,'1943-05-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(73,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Samson, Brzęczysław','Brzęczysław Samson Jr.',NULL,NULL,NULL,NULL,NULL,'Both','2534181528',NULL,'Sample Data','Brzęczysław','I','Samson',NULL,1,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Brzęczysław Samson Jr.',NULL,2,NULL,0,NULL,NULL,NULL,'McIntyre Action School',NULL,NULL,20,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(74,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Łąchowski, Beula','Mrs. Beula Łąchowski',NULL,NULL,NULL,'
2
',NULL,'Both','3562875387',NULL,'Sample Data','Beula','A','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Mrs. Beula Łąchowski',NULL,NULL,'1989-01-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(75,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson family','Wilson family',NULL,NULL,NULL,'
4
',NULL,'Both','350510798',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wilson family',5,NULL,'Dear Wilson family',2,NULL,'Wilson family',NULL,NULL,NULL,0,NULL,'Wilson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(76,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Community Food Solutions','Community Food Solutions',NULL,NULL,NULL,NULL,NULL,'Both','1172089786',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Food Solutions',NULL,NULL,NULL,0,NULL,NULL,61,'Community Food Solutions',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(77,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Grant, Bernadette','Bernadette Grant',NULL,NULL,NULL,NULL,NULL,'Both','2386715823',NULL,'Sample Data','Bernadette','','Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Grant',NULL,1,'2014-12-31',0,NULL,NULL,NULL,'Sierra Vista Advocacy Alliance',NULL,NULL,55,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(78,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Lee-Barkley family','Lee-Barkley family',NULL,NULL,NULL,'
4
',NULL,'Both','208162044',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Lee-Barkley family',5,NULL,'Dear Lee-Barkley family',2,NULL,'Lee-Barkley family',NULL,NULL,NULL,0,NULL,'Lee-Barkley family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(79,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Lee-Barkley, Delana','Delana Lee-Barkley',NULL,NULL,NULL,'
4
',NULL,'Both','1901069703',NULL,'Sample Data','Delana','N','Lee-Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Lee-Barkley',NULL,1,'1991-09-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(80,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Cruz, Margaret','Dr. Margaret Cruz',NULL,NULL,NULL,'
5
',NULL,'Both','680750633',NULL,'Sample Data','Margaret','','Cruz',4,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Dr. Margaret Cruz',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(81,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Nielsen, Claudio','Mr. Claudio Nielsen Jr.',NULL,NULL,NULL,NULL,NULL,'Both','3195843704',NULL,'Sample Data','Claudio','','Nielsen',3,1,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Mr. Claudio Nielsen Jr.',NULL,2,'1944-11-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(82,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Lee-Barkley, Sonny','Dr. Sonny Lee-Barkley Jr.',NULL,NULL,NULL,NULL,NULL,'Both','1415092371',NULL,'Sample Data','Sonny','','Lee-Barkley',4,1,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Dr. Sonny Lee-Barkley Jr.',NULL,NULL,'1990-01-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(83,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Allan','Mr. Allan Müller',NULL,NULL,NULL,NULL,NULL,'Both','324455196',NULL,'Sample Data','Allan','','Müller',3,NULL,NULL,NULL,1,NULL,'Dear Allan',1,NULL,'Dear Allan',1,NULL,'Mr. Allan Müller',NULL,2,'1962-09-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(84,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Arizona Arts Trust','Arizona Arts Trust',NULL,NULL,NULL,'
4
',NULL,'Both','1290588810',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Arizona Arts Trust',NULL,NULL,NULL,0,NULL,NULL,174,'Arizona Arts Trust',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(85,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Roberts, Daren','Daren Roberts',NULL,NULL,NULL,NULL,NULL,'Both','1647753164',NULL,'Sample Data','Daren','Q','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Daren',1,NULL,'Dear Daren',1,NULL,'Daren Roberts',NULL,2,'1982-09-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(86,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Adams, Craig','Mr. Craig Adams Jr.',NULL,NULL,NULL,NULL,NULL,'Both','2128666326',NULL,'Sample Data','Craig','','Adams',3,1,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Mr. Craig Adams Jr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(87,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Rolando','Rolando Olsen',NULL,NULL,NULL,'
5
',NULL,'Both','2121296962',NULL,'Sample Data','Rolando','','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Olsen',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(88,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Scott','Scott Adams',NULL,NULL,NULL,NULL,NULL,'Both','2280225126',NULL,'Sample Data','Scott','','Adams',NULL,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Scott Adams',NULL,2,'1952-07-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(89,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Eleonor','Mrs. Eleonor Müller',NULL,NULL,NULL,NULL,NULL,'Both','4009103845',NULL,'Sample Data','Eleonor','','Müller',1,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Mrs. Eleonor Müller',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(90,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Samuels, Kandace','Kandace Samuels',NULL,NULL,NULL,'
1
',NULL,'Both','757003024',NULL,'Sample Data','Kandace','','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Kandace Samuels',NULL,1,'1971-11-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(91,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts, Landon','Landon Roberts Jr.',NULL,NULL,NULL,NULL,NULL,'Both','83700418',NULL,'Sample Data','Landon','','Roberts',NULL,1,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Roberts Jr.',NULL,NULL,'2009-12-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(92,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Cruz, Betty','Betty Cruz',NULL,NULL,NULL,'
4
',NULL,'Both','1094549317',NULL,'Sample Data','Betty','O','Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Betty Cruz',NULL,1,'1975-11-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(93,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'julianngrant@testing.org','julianngrant@testing.org',NULL,NULL,NULL,'
1
',NULL,'Both','2007973006',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear julianngrant@testing.org',1,NULL,'Dear julianngrant@testing.org',1,NULL,'julianngrant@testing.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(94,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Smith, Kiara','Dr. Kiara Smith',NULL,NULL,NULL,'
4
',NULL,'Both','550960995',NULL,'Sample Data','Kiara','T','Smith',4,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Dr. Kiara Smith',NULL,1,'1977-01-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(95,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Wilson, Lou','Lou Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3757116240',NULL,'Sample Data','Lou','J','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Lou Wilson',NULL,2,'1977-09-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(96,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'wattsone@mymail.biz','wattsone@mymail.biz',NULL,NULL,NULL,'
3
',NULL,'Both','3239090102',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear wattsone@mymail.biz',1,NULL,'Dear wattsone@mymail.biz',1,NULL,'wattsone@mymail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(97,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Erik','Dr. Erik Bachman II',NULL,NULL,NULL,NULL,NULL,'Both','620728720',NULL,'Sample Data','Erik','Y','Bachman',4,3,NULL,NULL,1,NULL,'Dear Erik',1,NULL,'Dear Erik',1,NULL,'Dr. Erik Bachman II',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(98,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Cadell Technology Center','Cadell Technology Center',NULL,NULL,NULL,NULL,NULL,'Both','1796935528',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Cadell Technology Center',NULL,NULL,NULL,0,NULL,NULL,22,'Cadell Technology Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(99,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Roberts, Elbert','Elbert Roberts',NULL,NULL,NULL,'
4
',NULL,'Both','2457403218',NULL,'Sample Data','Elbert','P','Roberts',NULL,NULL,NULL,NULL,1,NULL,'Dear Elbert',1,NULL,'Dear Elbert',1,NULL,'Elbert Roberts',NULL,2,NULL,1,'2020-03-24',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(100,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Bob','Bob Wattson',NULL,NULL,NULL,NULL,NULL,'Both','194645235',NULL,'Sample Data','Bob','','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Wattson',NULL,NULL,'1961-07-09',0,NULL,NULL,NULL,'South Dakota Environmental Partnership',NULL,NULL,134,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(101,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Louisiana Health Fellowship','Louisiana Health Fellowship',NULL,NULL,NULL,'
1
',NULL,'Both','3167811531',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Louisiana Health Fellowship',NULL,NULL,NULL,0,NULL,NULL,NULL,'Louisiana Health Fellowship',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(102,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'teddyr@lol.info','teddyr@lol.info',NULL,NULL,NULL,'
4
',NULL,'Both','241351152',NULL,'Sample Data',NULL,NULL,NULL,3,4,NULL,NULL,1,NULL,'Dear teddyr@lol.info',1,NULL,'Dear teddyr@lol.info',1,NULL,'teddyr@lol.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(103,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Angelika','Angelika McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','3667136043',NULL,'Sample Data','Angelika','A','McReynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Angelika',1,NULL,'Dear Angelika',1,NULL,'Angelika McReynolds',NULL,1,'1950-05-17',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(104,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Errol','Mr. Errol Samuels',NULL,NULL,NULL,NULL,NULL,'Both','1627005743',NULL,'Sample Data','Errol','','Samuels',3,NULL,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Mr. Errol Samuels',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(105,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Lee, Bob','Bob Lee',NULL,NULL,NULL,'
1
',NULL,'Both','207861481',NULL,'Sample Data','Bob','','Lee',NULL,NULL,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Lee',NULL,2,'1946-04-23',1,'2020-04-23',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(106,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'parkerk31@notmail.co.nz','parkerk31@notmail.co.nz',NULL,NULL,NULL,'
3
',NULL,'Both','3054247318',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear parkerk31@notmail.co.nz',1,NULL,'Dear parkerk31@notmail.co.nz',1,NULL,'parkerk31@notmail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(107,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Heidi','Heidi Wattson',NULL,NULL,NULL,'
1
',NULL,'Both','1801029451',NULL,'Sample Data','Heidi','S','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Heidi',1,NULL,'Dear Heidi',1,NULL,'Heidi Wattson',NULL,1,'1934-09-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(108,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Olsen, Kathlyn','Ms. Kathlyn Olsen',NULL,NULL,NULL,'
2
',NULL,'Both','273403650',NULL,'Sample Data','Kathlyn','','Olsen',2,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Ms. Kathlyn Olsen',NULL,1,'1977-01-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(109,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Bachman, Ashlie','Ashlie Bachman',NULL,NULL,NULL,'
5
',NULL,'Both','628441271',NULL,'Sample Data','Ashlie','','Bachman',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Ashlie Bachman',NULL,1,'2009-11-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(110,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Blackwell, Rosario','Rosario Blackwell',NULL,NULL,NULL,'
3
',NULL,'Both','212312556',NULL,'Sample Data','Rosario','','Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Rosario Blackwell',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(111,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'lee.valene@sample.co.nz','lee.valene@sample.co.nz',NULL,NULL,NULL,NULL,NULL,'Both','1914588398',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear lee.valene@sample.co.nz',1,NULL,'Dear lee.valene@sample.co.nz',1,NULL,'lee.valene@sample.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(112,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Shauna','Shauna Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3063545334',NULL,'Sample Data','Shauna','P','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Shauna Wilson',NULL,NULL,'2010-09-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(113,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Kacey','Dr. Kacey Ivanov',NULL,NULL,NULL,'
3
',NULL,'Both','2436947567',NULL,'Sample Data','Kacey','O','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Dr. Kacey Ivanov',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(114,'Organization',NULL,0,1,0,0,1,0,NULL,NULL,'Community Health Systems','Community Health Systems',NULL,NULL,NULL,'
2
',NULL,'Both','348951228',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Health Systems',NULL,NULL,NULL,0,NULL,NULL,60,'Community Health Systems',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(115,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'North Carolina Wellness Association','North Carolina Wellness Association',NULL,NULL,NULL,NULL,NULL,'Both','2792948089',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'North Carolina Wellness Association',NULL,NULL,NULL,0,NULL,NULL,40,'North Carolina Wellness Association',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(116,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'billyb@testmail.co.in','billyb@testmail.co.in',NULL,NULL,NULL,'
1
',NULL,'Both','2905262741',NULL,'Sample Data',NULL,NULL,NULL,4,1,NULL,NULL,1,NULL,'Dear billyb@testmail.co.in',1,NULL,'Dear billyb@testmail.co.in',1,NULL,'billyb@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(117,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen, Winford','Mr. Winford Jensen',NULL,NULL,NULL,NULL,NULL,'Both','1126016522',NULL,'Sample Data','Winford','','Jensen',3,NULL,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Mr. Winford Jensen',NULL,2,'1940-11-07',1,'2019-11-21',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(118,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Princess','Princess Barkley',NULL,NULL,NULL,NULL,NULL,'Both','1098730680',NULL,'Sample Data','Princess','','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Princess Barkley',NULL,1,'1978-07-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(119,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Wattson family','Wattson family',NULL,NULL,NULL,'
1
',NULL,'Both','2851339192',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wattson family',5,NULL,'Dear Wattson family',2,NULL,'Wattson family',NULL,NULL,NULL,0,NULL,'Wattson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(120,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Grant, Iris','Iris Müller-Grant',NULL,NULL,NULL,'
3
',NULL,'Both','1672056103',NULL,'Sample Data','Iris','T','Müller-Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Iris',1,NULL,'Dear Iris',1,NULL,'Iris Müller-Grant',NULL,1,'1986-05-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(121,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Hadley Empowerment Center','Hadley Empowerment Center',NULL,NULL,NULL,NULL,NULL,'Both','4086554855',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Hadley Empowerment Center',NULL,NULL,NULL,0,NULL,NULL,198,'Hadley Empowerment Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(122,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Deforest, Miguel','Mr. Miguel Deforest',NULL,NULL,NULL,'
1
',NULL,'Both','2379734396',NULL,'Sample Data','Miguel','S','Deforest',3,NULL,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Mr. Miguel Deforest',NULL,2,'1962-09-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(123,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Parker-Cruz family','Parker-Cruz family',NULL,NULL,NULL,NULL,NULL,'Both','1981374575',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker-Cruz family',5,NULL,'Dear Parker-Cruz family',2,NULL,'Parker-Cruz family',NULL,NULL,NULL,0,NULL,'Parker-Cruz family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(124,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Grant, Teddy','Teddy Müller-Grant',NULL,NULL,NULL,NULL,NULL,'Both','106369315',NULL,'Sample Data','Teddy','','Müller-Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Teddy Müller-Grant',NULL,NULL,'1996-03-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(125,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Truman','Truman Parker',NULL,NULL,NULL,NULL,NULL,'Both','3366007390',NULL,'Sample Data','Truman','','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Truman Parker',NULL,NULL,NULL,0,NULL,NULL,NULL,'Rural Software Partnership',NULL,NULL,10,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(126,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jones, Lashawnda','Mrs. Lashawnda Jones',NULL,NULL,NULL,'
5
',NULL,'Both','3527587829',NULL,'Sample Data','Lashawnda','W','Jones',1,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Mrs. Lashawnda Jones',NULL,1,'1947-01-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(127,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Brigette','Brigette Barkley',NULL,NULL,NULL,'
2
',NULL,'Both','4058623378',NULL,'Sample Data','Brigette','T','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Barkley',NULL,1,'1985-08-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(128,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Martin Luther King Advocacy Fellowship','Martin Luther King Advocacy Fellowship',NULL,NULL,NULL,'
5
',NULL,'Both','3147635468',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Martin Luther King Advocacy Fellowship',NULL,NULL,NULL,0,NULL,NULL,170,'Martin Luther King Advocacy Fellowship',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(129,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cooper, Kandace','Kandace Cooper',NULL,NULL,NULL,'
4
',NULL,'Both','3097920317',NULL,'Sample Data','Kandace','','Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Kandace Cooper',NULL,NULL,'1933-04-19',0,NULL,NULL,NULL,'Oklahoma Environmental Alliance',NULL,NULL,155,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(130,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'andrewrobertson@mymail.com','andrewrobertson@mymail.com',NULL,NULL,NULL,NULL,NULL,'Both','3750142267',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear andrewrobertson@mymail.com',1,NULL,'Dear andrewrobertson@mymail.com',1,NULL,'andrewrobertson@mymail.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(131,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Brittney','Mrs. Brittney Łąchowski',NULL,NULL,NULL,'
3
',NULL,'Both','2238471243',NULL,'Sample Data','Brittney','','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Mrs. Brittney Łąchowski',NULL,NULL,'1966-08-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(132,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'olsenb@lol.co.uk','olsenb@lol.co.uk',NULL,NULL,NULL,NULL,NULL,'Both','1265111874',NULL,'Sample Data',NULL,NULL,NULL,4,3,NULL,NULL,1,NULL,'Dear olsenb@lol.co.uk',1,NULL,'Dear olsenb@lol.co.uk',1,NULL,'olsenb@lol.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(133,'Household',NULL,0,1,0,0,1,0,NULL,NULL,'Olsen family','Olsen family',NULL,NULL,NULL,'
4
',NULL,'Both','1990073228',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Olsen family',5,NULL,'Dear Olsen family',2,NULL,'Olsen family',NULL,NULL,NULL,0,NULL,'Olsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(134,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'South Dakota Environmental Partnership','South Dakota Environmental Partnership',NULL,NULL,NULL,NULL,NULL,'Both','1043592653',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'South Dakota Environmental Partnership',NULL,NULL,NULL,0,NULL,NULL,100,'South Dakota Environmental Partnership',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(135,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Samson, Allen','Allen Samson II',NULL,NULL,NULL,'
3
',NULL,'Both','551135847',NULL,'Sample Data','Allen','B','Samson',NULL,3,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen Samson II',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(136,'Individual',NULL,1,1,0,0,1,0,NULL,NULL,'Roberts, Irvin','Mr. Irvin Roberts III',NULL,NULL,NULL,'
4
',NULL,'Both','1941335260',NULL,'Sample Data','Irvin','I','Roberts',3,4,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Mr. Irvin Roberts III',NULL,NULL,'1945-05-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(137,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz family','Cruz family',NULL,NULL,NULL,NULL,NULL,'Both','2326538497',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Cruz family',5,NULL,'Dear Cruz family',2,NULL,'Cruz family',NULL,NULL,NULL,0,NULL,'Cruz family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(138,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Samson, Kenny','Mr. Kenny Samson',NULL,NULL,NULL,NULL,NULL,'Both','1958901038',NULL,'Sample Data','Kenny','','Samson',3,NULL,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Mr. Kenny Samson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(139,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Wilson, Landon','Landon Wilson',NULL,NULL,NULL,'
4
',NULL,'Both','2234178056',NULL,'Sample Data','Landon','','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Wilson',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(140,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Jones family','Jones family',NULL,NULL,NULL,'
3
',NULL,'Both','1110516799',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jones family',5,NULL,'Dear Jones family',2,NULL,'Jones family',NULL,NULL,NULL,0,NULL,'Jones family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(141,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'lg.blackwell66@example.org','lg.blackwell66@example.org',NULL,NULL,NULL,NULL,NULL,'Both','198467643',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear lg.blackwell66@example.org',1,NULL,'Dear lg.blackwell66@example.org',1,NULL,'lg.blackwell66@example.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(142,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'eo.daz@fakemail.org','eo.daz@fakemail.org',NULL,NULL,NULL,'
2
',NULL,'Both','3543460293',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear eo.daz@fakemail.org',1,NULL,'Dear eo.daz@fakemail.org',1,NULL,'eo.daz@fakemail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(143,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Nicole','Nicole Samson',NULL,NULL,NULL,NULL,NULL,'Both','1649974700',NULL,'Sample Data','Nicole','S','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Samson',NULL,NULL,'1969-11-05',0,NULL,NULL,NULL,'Northpoint Sports Fellowship',NULL,NULL,62,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(144,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cooper, Ivey','Ivey Cooper',NULL,NULL,NULL,'
1
',NULL,'Both','4197158146',NULL,'Sample Data','Ivey','','Cooper',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Cooper',NULL,NULL,'2007-10-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(145,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Díaz, Lawerence','Mr. Lawerence Díaz III',NULL,NULL,NULL,NULL,NULL,'Both','1331780613',NULL,'Sample Data','Lawerence','','Díaz',3,4,NULL,NULL,1,NULL,'Dear Lawerence',1,NULL,'Dear Lawerence',1,NULL,'Mr. Lawerence Díaz III',NULL,NULL,'1996-11-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(146,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Delana','Ms. Delana Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3114260501',NULL,'Sample Data','Delana','','Wilson',2,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Ms. Delana Wilson',NULL,1,'1961-08-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(147,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker, Troy','Troy Parker',NULL,NULL,NULL,NULL,NULL,'Both','1888190696',NULL,'Sample Data','Troy','A','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Troy Parker',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(148,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Samson family','Samson family',NULL,NULL,NULL,'
2
',NULL,'Both','333421926',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Samson family',5,NULL,'Dear Samson family',2,NULL,'Samson family',NULL,NULL,NULL,0,NULL,'Samson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(149,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Main Education Center','Main Education Center',NULL,NULL,NULL,'
3
',NULL,'Both','3693864473',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Main Education Center',NULL,NULL,NULL,0,NULL,NULL,29,'Main Education Center',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(150,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'kiaram30@testmail.co.in','kiaram30@testmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','1376220391',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear kiaram30@testmail.co.in',1,NULL,'Dear kiaram30@testmail.co.in',1,NULL,'kiaram30@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(151,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jones, Kathlyn','Ms. Kathlyn Jones',NULL,NULL,NULL,'
3
',NULL,'Both','1774529515',NULL,'Sample Data','Kathlyn','','Jones',2,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Ms. Kathlyn Jones',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(152,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen, Troy','Dr. Troy Jensen III',NULL,NULL,NULL,'
4
',NULL,'Both','2894692674',NULL,'Sample Data','Troy','W','Jensen',4,4,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Dr. Troy Jensen III',NULL,NULL,'1975-06-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(153,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Josefa','Dr. Josefa Parker',NULL,NULL,NULL,NULL,NULL,'Both','2643167156',NULL,'Sample Data','Josefa','N','Parker',4,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Dr. Josefa Parker',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(154,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson family','Wilson family',NULL,NULL,NULL,'
2
',NULL,'Both','350510798',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wilson family',5,NULL,'Dear Wilson family',2,NULL,'Wilson family',NULL,NULL,NULL,0,NULL,'Wilson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(155,'Organization',NULL,1,1,0,0,0,0,NULL,NULL,'Oklahoma Environmental Alliance','Oklahoma Environmental Alliance',NULL,NULL,NULL,'
4
',NULL,'Both','1703336804',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Oklahoma Environmental Alliance',NULL,NULL,NULL,0,NULL,NULL,129,'Oklahoma Environmental Alliance',NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(156,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz, Jina','Jina Cruz',NULL,NULL,NULL,'
4
',NULL,'Both','657562191',NULL,'Sample Data','Jina','','Cruz',NULL,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Jina Cruz',NULL,1,'1984-06-26',0,NULL,NULL,NULL,'Minnesota Culture Partnership',NULL,NULL,66,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(157,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Łąchowski, Russell','Dr. Russell Łąchowski',NULL,NULL,NULL,NULL,NULL,'Both','2639588224',NULL,'Sample Data','Russell','','Łąchowski',4,NULL,NULL,NULL,1,NULL,'Dear Russell',1,NULL,'Dear Russell',1,NULL,'Dr. Russell Łąchowski',NULL,2,'1955-01-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(158,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Brigette','Brigette Samuels',NULL,NULL,NULL,NULL,NULL,'Both','609133167',NULL,'Sample Data','Brigette','','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Samuels',NULL,1,'1983-03-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(159,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith-Adams, Delana','Delana Smith-Adams',NULL,NULL,NULL,NULL,NULL,'Both','3072988173',NULL,'Sample Data','Delana','','Smith-Adams',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Smith-Adams',NULL,1,'1987-04-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(160,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Grant family','Grant family',NULL,NULL,NULL,'
3
',NULL,'Both','3228000340',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Grant family',5,NULL,'Dear Grant family',2,NULL,'Grant family',NULL,NULL,NULL,0,NULL,'Grant family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(161,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Norris','Norris Grant III',NULL,NULL,NULL,'
3
',NULL,'Both','1357168828',NULL,'Sample Data','Norris','','Grant',NULL,4,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Grant III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(162,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest, Omar','Mr. Omar Deforest Sr.',NULL,NULL,NULL,NULL,NULL,'Both','2965078228',NULL,'Sample Data','Omar','D','Deforest',3,2,NULL,NULL,1,NULL,'Dear Omar',1,NULL,'Dear Omar',1,NULL,'Mr. Omar Deforest Sr.',NULL,NULL,'1995-08-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(163,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Scott','Dr. Scott Ivanov',NULL,NULL,NULL,NULL,NULL,'Both','1336634478',NULL,'Sample Data','Scott','N','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Dr. Scott Ivanov',NULL,2,'1981-05-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(164,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Łąchowski, Juliann','Juliann Łąchowski',NULL,NULL,NULL,'
5
',NULL,'Both','3477087731',NULL,'Sample Data','Juliann','','Łąchowski',NULL,NULL,NULL,NULL,1,NULL,'Dear Juliann',1,NULL,'Dear Juliann',1,NULL,'Juliann Łąchowski',NULL,1,'1978-04-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(165,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samson, Josefa','Josefa Samson',NULL,NULL,NULL,'
1
',NULL,'Both','3599094976',NULL,'Sample Data','Josefa','F','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Josefa Samson',NULL,1,'1987-09-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(166,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Ivey','Ivey Wattson',NULL,NULL,NULL,'
1
',NULL,'Both','1423152774',NULL,'Sample Data','Ivey','','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Wattson',NULL,NULL,'1963-10-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(167,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Zope, Clint','Mr. Clint Zope',NULL,NULL,NULL,'
1
',NULL,'Both','869284324',NULL,'Sample Data','Clint','B','Zope',3,NULL,NULL,NULL,1,NULL,'Dear Clint',1,NULL,'Dear Clint',1,NULL,'Mr. Clint Zope',NULL,2,'1948-03-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(168,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'ks.cruz@testmail.co.in','ks.cruz@testmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','4065460882',NULL,'Sample Data',NULL,NULL,NULL,4,3,NULL,NULL,1,NULL,'Dear ks.cruz@testmail.co.in',1,NULL,'Dear ks.cruz@testmail.co.in',1,NULL,'ks.cruz@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(169,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'daz.betty57@lol.org','daz.betty57@lol.org',NULL,NULL,NULL,NULL,NULL,'Both','3256939874',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear daz.betty57@lol.org',1,NULL,'Dear daz.betty57@lol.org',1,NULL,'daz.betty57@lol.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(170,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'jensen.kiara@testmail.org','jensen.kiara@testmail.org',NULL,NULL,NULL,NULL,NULL,'Both','3476526601',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear jensen.kiara@testmail.org',1,NULL,'Dear jensen.kiara@testmail.org',1,NULL,'jensen.kiara@testmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,'Martin Luther King Advocacy Fellowship',NULL,NULL,128,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(171,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Jacobs-Jameson family','Jacobs-Jameson family',NULL,NULL,NULL,NULL,NULL,'Both','2511058201',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jacobs-Jameson family',5,NULL,'Dear Jacobs-Jameson family',2,NULL,'Jacobs-Jameson family',NULL,NULL,NULL,0,NULL,'Jacobs-Jameson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(172,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Müller, Andrew','Andrew Müller',NULL,NULL,NULL,'
4
',NULL,'Both','1251065595',NULL,'Sample Data','Andrew','','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Andrew Müller',NULL,NULL,NULL,0,NULL,NULL,NULL,'Friends Wellness Partnership',NULL,NULL,37,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(173,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'cruz.ashlie@fishmail.org','cruz.ashlie@fishmail.org',NULL,NULL,NULL,NULL,NULL,'Both','1501266967',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear cruz.ashlie@fishmail.org',1,NULL,'Dear cruz.ashlie@fishmail.org',1,NULL,'cruz.ashlie@fishmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(174,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Princess','Mrs. Princess Barkley',NULL,NULL,NULL,'
2
',NULL,'Both','1098730680',NULL,'Sample Data','Princess','','Barkley',1,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Mrs. Princess Barkley',NULL,1,'1981-07-24',0,NULL,NULL,NULL,'Arizona Arts Trust',NULL,NULL,84,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(175,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'rodrigow16@airmail.biz','rodrigow16@airmail.biz',NULL,NULL,NULL,'
5
',NULL,'Both','2418346217',NULL,'Sample Data',NULL,NULL,NULL,3,NULL,NULL,NULL,1,NULL,'Dear rodrigow16@airmail.biz',1,NULL,'Dear rodrigow16@airmail.biz',1,NULL,'rodrigow16@airmail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(176,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Elina','Ms. Elina Terry',NULL,NULL,NULL,'
4
',NULL,'Both','2453833535',NULL,'Sample Data','Elina','','Terry',2,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Ms. Elina Terry',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(177,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Bachman, Eleonor','Ms. Eleonor Bachman',NULL,NULL,NULL,NULL,NULL,'Both','711175679',NULL,'Sample Data','Eleonor','','Bachman',2,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Ms. Eleonor Bachman',NULL,NULL,'1954-11-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(178,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Deforest-Nielsen family','Deforest-Nielsen family',NULL,NULL,NULL,NULL,NULL,'Both','51479494',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest-Nielsen family',5,NULL,'Dear Deforest-Nielsen family',2,NULL,'Deforest-Nielsen family',NULL,NULL,NULL,0,NULL,'Deforest-Nielsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(179,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cruz, Norris','Mr. Norris Cruz II',NULL,NULL,NULL,'
3
',NULL,'Both','1269804686',NULL,'Sample Data','Norris','W','Cruz',3,3,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Mr. Norris Cruz II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(180,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jacobs, Kathlyn','Dr. Kathlyn Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','1747055746',NULL,'Sample Data','Kathlyn','L','Jacobs',4,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Dr. Kathlyn Jacobs',NULL,1,'1967-03-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(181,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jones, Jacob','Mr. Jacob Jones Sr.',NULL,NULL,NULL,'
4
',NULL,'Both','210245998',NULL,'Sample Data','Jacob','','Jones',3,2,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Mr. Jacob Jones Sr.',NULL,2,'1985-04-12',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(182,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Parker family','Parker family',NULL,NULL,NULL,'
1
',NULL,'Both','425242179',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker family',5,NULL,'Dear Parker family',2,NULL,'Parker family',NULL,NULL,NULL,0,NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(183,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jones, Jina','Ms. Jina Jones',NULL,NULL,NULL,NULL,NULL,'Both','1835869309',NULL,'Sample Data','Jina','','Jones',2,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Ms. Jina Jones',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(184,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Deforest-Nielsen, Justina','Justina Deforest-Nielsen',NULL,NULL,NULL,NULL,NULL,'Both','3777045142',NULL,'Sample Data','Justina','','Deforest-Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Justina Deforest-Nielsen',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(185,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wagner, Billy','Mr. Billy Wagner III',NULL,NULL,NULL,NULL,NULL,'Both','1288341691',NULL,'Sample Data','Billy','','Wagner',3,4,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Mr. Billy Wagner III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(186,'Household',NULL,1,1,0,0,0,0,NULL,NULL,'Müller family','Müller family',NULL,NULL,NULL,NULL,NULL,'Both','1144797465',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Müller family',5,NULL,'Dear Müller family',2,NULL,'Müller family',NULL,NULL,NULL,0,NULL,'Müller family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(187,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Smith-Adams family','Smith-Adams family',NULL,NULL,NULL,NULL,NULL,'Both','2057336006',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Smith-Adams family',5,NULL,'Dear Smith-Adams family',2,NULL,'Smith-Adams family',NULL,NULL,NULL,0,NULL,'Smith-Adams family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(188,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Ray','Dr. Ray Grant II',NULL,NULL,NULL,NULL,NULL,'Both','2294694701',NULL,'Sample Data','Ray','G','Grant',4,3,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Dr. Ray Grant II',NULL,NULL,'1958-07-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(189,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jones, Brigette','Dr. Brigette Jones',NULL,NULL,NULL,NULL,NULL,'Both','1777842543',NULL,'Sample Data','Brigette','','Jones',4,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Dr. Brigette Jones',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(190,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Princess','Dr. Princess Ivanov',NULL,NULL,NULL,'
4
',NULL,'Both','3366449477',NULL,'Sample Data','Princess','','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Dr. Princess Ivanov',NULL,1,'1984-11-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(191,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'blackwell.elbert@sample.com','blackwell.elbert@sample.com',NULL,NULL,NULL,NULL,NULL,'Both','901779860',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear blackwell.elbert@sample.com',1,NULL,'Dear blackwell.elbert@sample.com',1,NULL,'blackwell.elbert@sample.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(192,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Brittney','Brittney Wilson',NULL,NULL,NULL,'
2
',NULL,'Both','1729401768',NULL,'Sample Data','Brittney','','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Brittney Wilson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(193,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Zope, Betty','Mrs. Betty Zope',NULL,NULL,NULL,NULL,NULL,'Both','2849696155',NULL,'Sample Data','Betty','H','Zope',1,NULL,NULL,NULL,1,NULL,'Dear Betty',1,NULL,'Dear Betty',1,NULL,'Mrs. Betty Zope',NULL,1,'1966-11-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(194,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Jones, Delana','Delana Jones',NULL,NULL,NULL,'
1
',NULL,'Both','1936969701',NULL,'Sample Data','Delana','F','Jones',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Jones',NULL,1,'1940-04-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(195,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts-Cruz, Kacey','Dr. Kacey Roberts-Cruz',NULL,NULL,NULL,'
1
',NULL,'Both','994235273',NULL,'Sample Data','Kacey','','Roberts-Cruz',4,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Dr. Kacey Roberts-Cruz',NULL,1,'1978-09-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:32'),(196,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'kq.jacobs-jameson@testmail.co.uk','kq.jacobs-jameson@testmail.co.uk',NULL,NULL,NULL,'
1
',NULL,'Both','1263031073',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear kq.jacobs-jameson@testmail.co.uk',1,NULL,'Dear kq.jacobs-jameson@testmail.co.uk',1,NULL,'kq.jacobs-jameson@testmail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(197,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Lee, Andrew','Andrew Lee II',NULL,NULL,NULL,NULL,NULL,'Both','542623852',NULL,'Sample Data','Andrew','','Lee',NULL,3,NULL,NULL,1,NULL,'Dear Andrew',1,NULL,'Dear Andrew',1,NULL,'Andrew Lee II',NULL,NULL,'1987-07-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(198,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Samuels, Rosario','Mr. Rosario Samuels',NULL,NULL,NULL,NULL,NULL,'Both','1319564481',NULL,'Sample Data','Rosario','V','Samuels',3,NULL,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Mr. Rosario Samuels',NULL,2,'1945-01-11',0,NULL,NULL,NULL,'Hadley Empowerment Center',NULL,NULL,121,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(199,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Claudio','Claudio Müller Jr.',NULL,NULL,NULL,'
4
',NULL,'Both','2143910765',NULL,'Sample Data','Claudio','C','Müller',NULL,1,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Claudio Müller Jr.',NULL,NULL,'1942-01-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(200,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Lincoln','Mr. Lincoln Müller Jr.',NULL,NULL,NULL,NULL,NULL,'Both','676015767',NULL,'Sample Data','Lincoln','','Müller',3,1,NULL,NULL,1,NULL,'Dear Lincoln',1,NULL,'Dear Lincoln',1,NULL,'Mr. Lincoln Müller Jr.',NULL,2,'1961-05-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31'),(201,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Cruz, Tanya','Mrs. Tanya Cruz',NULL,NULL,NULL,NULL,NULL,'Both','2525776525',NULL,'Sample Data','Tanya','J','Cruz',1,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Mrs. Tanya Cruz',NULL,1,'1955-02-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-16 01:29:31','2020-09-16 01:29:31');
+INSERT INTO `civicrm_contact` (`id`, `contact_type`, `contact_sub_type`, `do_not_email`, `do_not_phone`, `do_not_mail`, `do_not_sms`, `do_not_trade`, `is_opt_out`, `legal_identifier`, `external_identifier`, `sort_name`, `display_name`, `nick_name`, `legal_name`, `image_URL`, `preferred_communication_method`, `preferred_language`, `preferred_mail_format`, `hash`, `api_key`, `source`, `first_name`, `middle_name`, `last_name`, `prefix_id`, `suffix_id`, `formal_title`, `communication_style_id`, `email_greeting_id`, `email_greeting_custom`, `email_greeting_display`, `postal_greeting_id`, `postal_greeting_custom`, `postal_greeting_display`, `addressee_id`, `addressee_custom`, `addressee_display`, `job_title`, `gender_id`, `birth_date`, `is_deceased`, `deceased_date`, `household_name`, `primary_contact_id`, `organization_name`, `sic_code`, `user_unique_id`, `employer_id`, `is_deleted`, `created_date`, `modified_date`) VALUES (1,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Default Organization','Default Organization',NULL,'Default Organization',NULL,NULL,NULL,'Both',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,'Default Organization',NULL,NULL,NULL,0,NULL,'2020-09-17 02:54:40'),(2,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'zope-nielsen.j.daren@airmail.info','zope-nielsen.j.daren@airmail.info',NULL,NULL,NULL,NULL,NULL,'Both','2882893425',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear zope-nielsen.j.daren@airmail.info',1,NULL,'Dear zope-nielsen.j.daren@airmail.info',1,NULL,'zope-nielsen.j.daren@airmail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(3,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Nicole','Dr. Nicole Nielsen',NULL,NULL,NULL,'
3
',NULL,'Both','1986505883',NULL,'Sample Data','Nicole','','Nielsen',4,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Dr. Nicole Nielsen',NULL,1,NULL,0,NULL,NULL,NULL,'Williamsburg Software Fellowship',NULL,NULL,165,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(4,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Jameson, Jay','Jay Jameson',NULL,NULL,NULL,NULL,NULL,'Both','3822627115',NULL,'Sample Data','Jay','','Jameson',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay Jameson',NULL,2,NULL,0,NULL,NULL,NULL,'Dowlen Agriculture Initiative',NULL,NULL,15,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(5,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Deforest, Troy','Troy Deforest',NULL,NULL,NULL,NULL,NULL,'Both','696795137',NULL,'Sample Data','Troy','','Deforest',NULL,NULL,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Troy Deforest',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(6,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Allan','Mr. Allan Wattson III',NULL,NULL,NULL,'
3
',NULL,'Both','4271442365',NULL,'Sample Data','Allan','D','Wattson',3,4,NULL,NULL,1,NULL,'Dear Allan',1,NULL,'Dear Allan',1,NULL,'Mr. Allan Wattson III',NULL,2,'1972-09-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(7,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Troy','Dr. Troy Barkley II',NULL,NULL,NULL,'
3
',NULL,'Both','3703467861',NULL,'Sample Data','Troy','A','Barkley',4,3,NULL,NULL,1,NULL,'Dear Troy',1,NULL,'Dear Troy',1,NULL,'Dr. Troy Barkley II',NULL,2,'1947-09-05',1,'2019-10-02',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(8,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Sherman','Mr. Sherman Terry Sr.',NULL,NULL,NULL,'
1
',NULL,'Both','4119706907',NULL,'Sample Data','Sherman','Y','Terry',3,2,NULL,NULL,1,NULL,'Dear Sherman',1,NULL,'Dear Sherman',1,NULL,'Mr. Sherman Terry Sr.',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(9,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Roberts, Ivey','Dr. Ivey Roberts',NULL,NULL,NULL,'
1
',NULL,'Both','507631333',NULL,'Sample Data','Ivey','S','Roberts',4,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Dr. Ivey Roberts',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(10,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest, Lou','Lou Deforest',NULL,NULL,NULL,NULL,NULL,'Both','1322815112',NULL,'Sample Data','Lou','B','Deforest',NULL,NULL,NULL,NULL,1,NULL,'Dear Lou',1,NULL,'Dear Lou',1,NULL,'Lou Deforest',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(11,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest, Norris','Dr. Norris Deforest Jr.',NULL,NULL,NULL,'
4
',NULL,'Both','3342248355',NULL,'Sample Data','Norris','A','Deforest',4,1,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Dr. Norris Deforest Jr.',NULL,2,'1964-10-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(12,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'robertson.q.truman6@lol.co.pl','robertson.q.truman6@lol.co.pl',NULL,NULL,NULL,NULL,NULL,'Both','1824867384',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear robertson.q.truman6@lol.co.pl',1,NULL,'Dear robertson.q.truman6@lol.co.pl',1,NULL,'robertson.q.truman6@lol.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,'Kansas Education Alliance',NULL,NULL,167,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(13,'Household',NULL,0,1,0,0,1,0,NULL,NULL,'Wilson family','Wilson family',NULL,NULL,NULL,NULL,NULL,'Both','350510798',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wilson family',5,NULL,'Dear Wilson family',2,NULL,'Wilson family',NULL,NULL,NULL,0,NULL,'Wilson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(14,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terrell, Beula','Dr. Beula Terrell',NULL,NULL,NULL,'
3
',NULL,'Both','413084989',NULL,'Sample Data','Beula','D','Terrell',4,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Dr. Beula Terrell',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(15,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Dowlen Agriculture Initiative','Dowlen Agriculture Initiative',NULL,NULL,NULL,'
1
',NULL,'Both','350884752',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Dowlen Agriculture Initiative',NULL,NULL,NULL,0,NULL,NULL,4,'Dowlen Agriculture Initiative',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(16,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'terrell.h.ashlie@mymail.co.nz','terrell.h.ashlie@mymail.co.nz',NULL,NULL,NULL,NULL,NULL,'Both','1270350514',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear terrell.h.ashlie@mymail.co.nz',1,NULL,'Dear terrell.h.ashlie@mymail.co.nz',1,NULL,'terrell.h.ashlie@mymail.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(17,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Rosario','Mr. Rosario Terry Sr.',NULL,NULL,NULL,NULL,NULL,'Both','1264009879',NULL,'Sample Data','Rosario','D','Terry',3,2,NULL,NULL,1,NULL,'Dear Rosario',1,NULL,'Dear Rosario',1,NULL,'Mr. Rosario Terry Sr.',NULL,2,'1986-05-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(18,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terrell-Łąchowski, Ashlie','Ms. Ashlie Terrell-Łąchowski',NULL,NULL,NULL,'
1
',NULL,'Both','1661535329',NULL,'Sample Data','Ashlie','','Terrell-Łąchowski',2,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Ms. Ashlie Terrell-Łąchowski',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(19,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Alexia','Alexia Parker',NULL,NULL,NULL,'
1
',NULL,'Both','1459104008',NULL,'Sample Data','Alexia','T','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Alexia Parker',NULL,NULL,'1975-10-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(20,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'González, Kathlyn','Kathlyn González',NULL,NULL,NULL,NULL,NULL,'Both','2470134483',NULL,'Sample Data','Kathlyn','','González',NULL,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Kathlyn González',NULL,1,'1961-10-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(21,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Indiana Agriculture Partnership','Indiana Agriculture Partnership',NULL,NULL,NULL,NULL,NULL,'Both','45502938',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Indiana Agriculture Partnership',NULL,NULL,NULL,0,NULL,NULL,153,'Indiana Agriculture Partnership',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(22,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Samuels-Deforest, Alexia','Ms. Alexia Samuels-Deforest',NULL,NULL,NULL,NULL,NULL,'Both','358762248',NULL,'Sample Data','Alexia','','Samuels-Deforest',2,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Ms. Alexia Samuels-Deforest',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(23,'Organization',NULL,0,1,0,0,1,0,NULL,NULL,'Waterville Sustainability Association','Waterville Sustainability Association',NULL,NULL,NULL,'
3
',NULL,'Both','1430359695',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Waterville Sustainability Association',NULL,NULL,NULL,0,NULL,NULL,52,'Waterville Sustainability Association',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(24,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Ray','Dr. Ray Prentice II',NULL,NULL,NULL,NULL,NULL,'Both','1051362658',NULL,'Sample Data','Ray','H','Prentice',4,3,NULL,NULL,1,NULL,'Dear Ray',1,NULL,'Dear Ray',1,NULL,'Dr. Ray Prentice II',NULL,2,'1979-11-05',0,NULL,NULL,NULL,'Fairbanks Legal Systems',NULL,NULL,102,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(25,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'González, Kiara','Dr. Kiara González',NULL,NULL,NULL,'
2
',NULL,'Both','285519144',NULL,'Sample Data','Kiara','','González',4,NULL,NULL,NULL,1,NULL,'Dear Kiara',1,NULL,'Dear Kiara',1,NULL,'Dr. Kiara González',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(26,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'deforest.felisha@notmail.co.pl','deforest.felisha@notmail.co.pl',NULL,NULL,NULL,'
4
',NULL,'Both','3231920120',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear deforest.felisha@notmail.co.pl',1,NULL,'Dear deforest.felisha@notmail.co.pl',1,NULL,'deforest.felisha@notmail.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(27,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Wagner, Junko','Junko Wagner',NULL,NULL,NULL,NULL,NULL,'Both','3731152037',NULL,'Sample Data','Junko','','Wagner',NULL,NULL,NULL,NULL,1,NULL,'Dear Junko',1,NULL,'Dear Junko',1,NULL,'Junko Wagner',NULL,1,'1970-10-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(28,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'shado59@testing.co.pl','shado59@testing.co.pl',NULL,NULL,NULL,NULL,NULL,'Both','3317234103',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear shado59@testing.co.pl',1,NULL,'Dear shado59@testing.co.pl',1,NULL,'shado59@testing.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,'Martin Luther King Family Alliance',NULL,NULL,73,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(29,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller-Parker, Esta','Ms. Esta Müller-Parker',NULL,NULL,NULL,'
5
',NULL,'Both','2538831321',NULL,'Sample Data','Esta','','Müller-Parker',2,NULL,NULL,NULL,1,NULL,'Dear Esta',1,NULL,'Dear Esta',1,NULL,'Ms. Esta Müller-Parker',NULL,1,'1987-03-04',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(30,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Megan','Ms. Megan Olsen',NULL,NULL,NULL,NULL,NULL,'Both','2505680099',NULL,'Sample Data','Megan','P','Olsen',2,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Ms. Megan Olsen',NULL,1,'1983-11-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(31,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wattson, Claudio','Claudio Wattson Jr.',NULL,NULL,NULL,NULL,NULL,'Both','3183458454',NULL,'Sample Data','Claudio','','Wattson',NULL,1,NULL,NULL,1,NULL,'Dear Claudio',1,NULL,'Dear Claudio',1,NULL,'Claudio Wattson Jr.',NULL,2,'1939-03-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(32,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Jones, Bernadette','Bernadette Jones',NULL,NULL,NULL,NULL,NULL,'Both','357713234',NULL,'Sample Data','Bernadette','N','Jones',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Jones',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(33,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Bernadette','Ms. Bernadette Nielsen',NULL,NULL,NULL,NULL,NULL,'Both','1252444601',NULL,'Sample Data','Bernadette','U','Nielsen',2,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Ms. Bernadette Nielsen',NULL,1,'1951-12-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(34,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Grant, Kathlyn','Ms. Kathlyn Grant',NULL,NULL,NULL,'
4
',NULL,'Both','2659032664',NULL,'Sample Data','Kathlyn','','Grant',2,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Ms. Kathlyn Grant',NULL,NULL,'1969-07-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(35,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Reynolds, Nicole','Nicole Reynolds',NULL,NULL,NULL,NULL,NULL,'Both','761347684',NULL,'Sample Data','Nicole','','Reynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Reynolds',NULL,1,'1990-04-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(36,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Barkley, Russell','Russell Barkley',NULL,NULL,NULL,'
1
',NULL,'Both','748831488',NULL,'Sample Data','Russell','F','Barkley',NULL,NULL,NULL,NULL,1,NULL,'Dear Russell',1,NULL,'Dear Russell',1,NULL,'Russell Barkley',NULL,2,'1939-10-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(37,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Grant-Blackwell family','Grant-Blackwell family',NULL,NULL,NULL,NULL,NULL,'Both','3550190523',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Grant-Blackwell family',5,NULL,'Dear Grant-Blackwell family',2,NULL,'Grant-Blackwell family',NULL,NULL,NULL,0,NULL,'Grant-Blackwell family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(38,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Blackwell, Arlyne','Arlyne Blackwell',NULL,NULL,NULL,'
3
',NULL,'Both','4134282227',NULL,'Sample Data','Arlyne','','Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Arlyne',1,NULL,'Dear Arlyne',1,NULL,'Arlyne Blackwell',NULL,NULL,'1996-06-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(39,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Jackson Software Systems','Jackson Software Systems',NULL,NULL,NULL,NULL,NULL,'Both','3667523117',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Jackson Software Systems',NULL,NULL,NULL,0,NULL,NULL,169,'Jackson Software Systems',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(40,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'acooper86@testmail.co.pl','acooper86@testmail.co.pl',NULL,NULL,NULL,'
2
',NULL,'Both','329373865',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear acooper86@testmail.co.pl',1,NULL,'Dear acooper86@testmail.co.pl',1,NULL,'acooper86@testmail.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(41,'Household',NULL,0,1,0,0,0,0,NULL,NULL,'Parker family','Parker family',NULL,NULL,NULL,'
2
',NULL,'Both','425242179',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker family',5,NULL,'Dear Parker family',2,NULL,'Parker family',NULL,NULL,NULL,0,NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(42,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel, Kacey','Mrs. Kacey Patel',NULL,NULL,NULL,NULL,NULL,'Both','1613499781',NULL,'Sample Data','Kacey','','Patel',1,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Mrs. Kacey Patel',NULL,1,'1947-05-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(43,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jensen, Jina','Mrs. Jina Jensen',NULL,NULL,NULL,'
2
',NULL,'Both','105596008',NULL,'Sample Data','Jina','','Jensen',1,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Mrs. Jina Jensen',NULL,NULL,'1959-03-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(44,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'McReynolds, Kathlyn','Mrs. Kathlyn McReynolds',NULL,NULL,NULL,'
4
',NULL,'Both','1098429926',NULL,'Sample Data','Kathlyn','','McReynolds',1,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Mrs. Kathlyn McReynolds',NULL,1,NULL,1,'2020-05-08',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(45,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest, Lawerence','Mr. Lawerence Deforest Jr.',NULL,NULL,NULL,NULL,NULL,'Both','2962516652',NULL,'Sample Data','Lawerence','','Deforest',3,1,NULL,NULL,1,NULL,'Dear Lawerence',1,NULL,'Dear Lawerence',1,NULL,'Mr. Lawerence Deforest Jr.',NULL,2,'1970-03-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(46,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'juliannrobertson@testing.biz','juliannrobertson@testing.biz',NULL,NULL,NULL,NULL,NULL,'Both','3077496304',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear juliannrobertson@testing.biz',1,NULL,'Dear juliannrobertson@testing.biz',1,NULL,'juliannrobertson@testing.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(47,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Lashawnda','Lashawnda Parker',NULL,NULL,NULL,'
5
',NULL,'Both','1469017621',NULL,'Sample Data','Lashawnda','','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Lashawnda Parker',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(48,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry, Carlos','Carlos Terry',NULL,NULL,NULL,NULL,NULL,'Both','2569842275',NULL,'Sample Data','Carlos','C','Terry',NULL,NULL,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Carlos Terry',NULL,2,'1986-01-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(49,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Rural Advocacy Solutions','Rural Advocacy Solutions',NULL,NULL,NULL,NULL,NULL,'Both','1244711507',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Rural Advocacy Solutions',NULL,NULL,NULL,0,NULL,NULL,NULL,'Rural Advocacy Solutions',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(50,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest family','Deforest family',NULL,NULL,NULL,'
1
',NULL,'Both','3235379039',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest family',5,NULL,'Dear Deforest family',2,NULL,'Deforest family',NULL,NULL,NULL,0,NULL,'Deforest family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(51,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'am.bachman@testmail.co.pl','am.bachman@testmail.co.pl',NULL,NULL,NULL,'
4
',NULL,'Both','3271988786',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear am.bachman@testmail.co.pl',1,NULL,'Dear am.bachman@testmail.co.pl',1,NULL,'am.bachman@testmail.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(52,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Samuels, Bernadette','Bernadette Samuels',NULL,NULL,NULL,NULL,NULL,'Both','2671231239',NULL,'Sample Data','Bernadette','','Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Bernadette',1,NULL,'Dear Bernadette',1,NULL,'Bernadette Samuels',NULL,NULL,NULL,0,NULL,NULL,NULL,'Waterville Sustainability Association',NULL,NULL,23,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(53,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Łąchowski family','Łąchowski family',NULL,NULL,NULL,NULL,NULL,'Both','2407077255',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Łąchowski family',5,NULL,'Dear Łąchowski family',2,NULL,'Łąchowski family',NULL,NULL,NULL,0,NULL,'Łąchowski family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(54,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Jed','Mr. Jed Parker',NULL,NULL,NULL,NULL,NULL,'Both','1794622526',NULL,'Sample Data','Jed','','Parker',3,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Mr. Jed Parker',NULL,NULL,'1956-03-13',0,NULL,NULL,NULL,'Tajique Sports Association',NULL,NULL,74,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(55,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'erikm20@infomail.co.uk','erikm20@infomail.co.uk',NULL,NULL,NULL,'
2
',NULL,'Both','3172124848',NULL,'Sample Data',NULL,NULL,NULL,4,2,NULL,NULL,1,NULL,'Dear erikm20@infomail.co.uk',1,NULL,'Dear erikm20@infomail.co.uk',1,NULL,'erikm20@infomail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(56,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Lee family','Lee family',NULL,NULL,NULL,NULL,NULL,'Both','845831176',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Lee family',5,NULL,'Dear Lee family',2,NULL,'Lee family',NULL,NULL,NULL,0,NULL,'Lee family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(57,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'lee.margaret@sample.org','lee.margaret@sample.org',NULL,NULL,NULL,'
4
',NULL,'Both','2979225469',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear lee.margaret@sample.org',1,NULL,'Dear lee.margaret@sample.org',1,NULL,'lee.margaret@sample.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(58,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jameson, Truman','Mr. Truman Jameson',NULL,NULL,NULL,NULL,NULL,'Both','4265431677',NULL,'Sample Data','Truman','G','Jameson',3,NULL,NULL,NULL,1,NULL,'Dear Truman',1,NULL,'Dear Truman',1,NULL,'Mr. Truman Jameson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(59,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Billy','Billy Wattson II',NULL,NULL,NULL,NULL,NULL,'Both','3097131221',NULL,'Sample Data','Billy','T','Wattson',NULL,3,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Billy Wattson II',NULL,NULL,'1977-09-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(60,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Ivanov, Brigette','Brigette Ivanov',NULL,NULL,NULL,'
1
',NULL,'Both','2016612463',NULL,'Sample Data','Brigette','','Ivanov',NULL,NULL,NULL,NULL,1,NULL,'Dear Brigette',1,NULL,'Dear Brigette',1,NULL,'Brigette Ivanov',NULL,1,'1941-06-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(61,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Kacey','Kacey Prentice',NULL,NULL,NULL,'
4
',NULL,'Both','3335706608',NULL,'Sample Data','Kacey','B','Prentice',NULL,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Kacey Prentice',NULL,1,'1976-09-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(62,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Olsen family','Olsen family',NULL,NULL,NULL,NULL,NULL,'Both','1990073228',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Olsen family',5,NULL,'Dear Olsen family',2,NULL,'Olsen family',NULL,NULL,NULL,0,NULL,'Olsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(63,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'González, Billy','Billy González III',NULL,NULL,NULL,NULL,NULL,'Both','3554802563',NULL,'Sample Data','Billy','X','González',NULL,4,NULL,NULL,1,NULL,'Dear Billy',1,NULL,'Dear Billy',1,NULL,'Billy González III',NULL,NULL,'1969-02-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(64,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'González, Rodrigo','Rodrigo González',NULL,NULL,NULL,NULL,NULL,'Both','2713589605',NULL,'Sample Data','Rodrigo','S','González',NULL,NULL,NULL,NULL,1,NULL,'Dear Rodrigo',1,NULL,'Dear Rodrigo',1,NULL,'Rodrigo González',NULL,2,'1963-05-22',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(65,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Cruz, Brittney','Mrs. Brittney Cruz',NULL,NULL,NULL,NULL,NULL,'Both','3852362968',NULL,'Sample Data','Brittney','','Cruz',1,NULL,NULL,NULL,1,NULL,'Dear Brittney',1,NULL,'Dear Brittney',1,NULL,'Mrs. Brittney Cruz',NULL,1,'1967-07-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(66,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Lee, Norris','Norris Lee III',NULL,NULL,NULL,'
1
',NULL,'Both','852217951',NULL,'Sample Data','Norris','','Lee',NULL,4,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Lee III',NULL,NULL,'1981-08-05',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(67,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Parker, Teddy','Teddy Parker',NULL,NULL,NULL,NULL,NULL,'Both','1804413700',NULL,'Sample Data','Teddy','','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Teddy Parker',NULL,2,'1976-07-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(68,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Ivanov family','Ivanov family',NULL,NULL,NULL,'
4
',NULL,'Both','2450779112',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Ivanov family',5,NULL,'Dear Ivanov family',2,NULL,'Ivanov family',NULL,NULL,NULL,0,NULL,'Ivanov family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(69,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Jacob','Dr. Jacob Wilson',NULL,NULL,NULL,NULL,NULL,'Both','1516069791',NULL,'Sample Data','Jacob','Z','Wilson',4,NULL,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Dr. Jacob Wilson',NULL,NULL,'1968-07-24',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(70,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Main Technology Solutions','Main Technology Solutions',NULL,NULL,NULL,'
2
',NULL,'Both','3583866107',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Main Technology Solutions',NULL,NULL,NULL,0,NULL,NULL,110,'Main Technology Solutions',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(71,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Delana','Delana Wilson',NULL,NULL,NULL,'
2
',NULL,'Both','3114260501',NULL,'Sample Data','Delana','C','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Wilson',NULL,NULL,'2012-12-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(72,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Jameson, Rolando','Rolando Jameson',NULL,NULL,NULL,NULL,NULL,'Both','726163988',NULL,'Sample Data','Rolando','','Jameson',NULL,NULL,NULL,NULL,1,NULL,'Dear Rolando',1,NULL,'Dear Rolando',1,NULL,'Rolando Jameson',NULL,2,'1995-08-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(73,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Martin Luther King Family Alliance','Martin Luther King Family Alliance',NULL,NULL,NULL,'
2
',NULL,'Both','2630737496',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Martin Luther King Family Alliance',NULL,NULL,NULL,0,NULL,NULL,28,'Martin Luther King Family Alliance',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(74,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Tajique Sports Association','Tajique Sports Association',NULL,NULL,NULL,NULL,NULL,'Both','2389998393',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Tajique Sports Association',NULL,NULL,NULL,0,NULL,NULL,54,'Tajique Sports Association',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(75,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Ashlie','Dr. Ashlie Ivanov',NULL,NULL,NULL,'
4
',NULL,'Both','468651798',NULL,'Sample Data','Ashlie','','Ivanov',4,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Dr. Ashlie Ivanov',NULL,NULL,'1979-01-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(76,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Ivanov, Errol','Mr. Errol Ivanov Sr.',NULL,NULL,NULL,'
1
',NULL,'Both','3859438937',NULL,'Sample Data','Errol','W','Ivanov',3,2,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Mr. Errol Ivanov Sr.',NULL,2,'1984-11-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(77,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'Paragonah Advocacy Services','Paragonah Advocacy Services',NULL,NULL,NULL,'
3
',NULL,'Both','2644340318',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Paragonah Advocacy Services',NULL,NULL,NULL,0,NULL,NULL,85,'Paragonah Advocacy Services',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(78,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Sonny','Sonny Wilson II',NULL,NULL,NULL,'
1
',NULL,'Both','1288997537',NULL,'Sample Data','Sonny','T','Wilson',NULL,3,NULL,NULL,1,NULL,'Dear Sonny',1,NULL,'Dear Sonny',1,NULL,'Sonny Wilson II',NULL,2,'1990-10-06',0,NULL,NULL,NULL,'Community Agriculture Initiative',NULL,NULL,101,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(79,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Deforest, Kathlyn','Dr. Kathlyn Deforest',NULL,NULL,NULL,'
4
',NULL,'Both','333595076',NULL,'Sample Data','Kathlyn','Q','Deforest',4,NULL,NULL,NULL,1,NULL,'Dear Kathlyn',1,NULL,'Dear Kathlyn',1,NULL,'Dr. Kathlyn Deforest',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(80,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Olsen, Rebekah','Ms. Rebekah Olsen',NULL,NULL,NULL,NULL,NULL,'Both','174179615',NULL,'Sample Data','Rebekah','I','Olsen',2,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Ms. Rebekah Olsen',NULL,1,'1982-03-17',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(81,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'González family','González family',NULL,NULL,NULL,'
5
',NULL,'Both','3263723758',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear González family',5,NULL,'Dear González family',2,NULL,'González family',NULL,NULL,NULL,0,NULL,'González family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(82,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen-Olsen family','Jensen-Olsen family',NULL,NULL,NULL,'
3
',NULL,'Both','3803048030',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jensen-Olsen family',5,NULL,'Dear Jensen-Olsen family',2,NULL,'Jensen-Olsen family',NULL,NULL,NULL,0,NULL,'Jensen-Olsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(83,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Olsen, Roland','Roland Olsen III',NULL,NULL,NULL,NULL,NULL,'Both','3464138564',NULL,'Sample Data','Roland','Q','Olsen',NULL,4,NULL,NULL,1,NULL,'Dear Roland',1,NULL,'Dear Roland',1,NULL,'Roland Olsen III',NULL,NULL,'1962-12-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(84,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Jerome','Jerome Prentice Sr.',NULL,NULL,NULL,NULL,NULL,'Both','2816560525',NULL,'Sample Data','Jerome','','Prentice',NULL,2,NULL,NULL,1,NULL,'Dear Jerome',1,NULL,'Dear Jerome',1,NULL,'Jerome Prentice Sr.',NULL,2,'1972-01-12',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(85,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Olsen, Beula','Beula Olsen',NULL,NULL,NULL,NULL,NULL,'Both','767174640',NULL,'Sample Data','Beula','O','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Beula',1,NULL,'Dear Beula',1,NULL,'Beula Olsen',NULL,NULL,'1971-12-10',0,NULL,NULL,NULL,'Paragonah Advocacy Services',NULL,NULL,77,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(86,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'kennyd67@infomail.co.uk','kennyd67@infomail.co.uk',NULL,NULL,NULL,NULL,NULL,'Both','2588373433',NULL,'Sample Data',NULL,NULL,NULL,4,4,NULL,NULL,1,NULL,'Dear kennyd67@infomail.co.uk',1,NULL,'Dear kennyd67@infomail.co.uk',1,NULL,'kennyd67@infomail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(87,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Olsen, Brent','Brent Olsen II',NULL,NULL,NULL,'
2
',NULL,'Both','2746838479',NULL,'Sample Data','Brent','','Olsen',NULL,3,NULL,NULL,1,NULL,'Dear Brent',1,NULL,'Dear Brent',1,NULL,'Brent Olsen II',NULL,NULL,'1974-01-21',0,NULL,NULL,NULL,'Washington Depot Legal Solutions',NULL,NULL,93,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(88,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jacobs, Justina','Dr. Justina Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','1829359712',NULL,'Sample Data','Justina','','Jacobs',4,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Dr. Justina Jacobs',NULL,1,NULL,1,'2020-02-25',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(89,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen-Olsen, Nicole','Nicole Jensen-Olsen',NULL,NULL,NULL,NULL,NULL,'Both','1252742983',NULL,'Sample Data','Nicole','K','Jensen-Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Jensen-Olsen',NULL,1,'2009-09-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(90,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'bryonp@example.com','bryonp@example.com',NULL,NULL,NULL,NULL,NULL,'Both','831252251',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear bryonp@example.com',1,NULL,'Dear bryonp@example.com',1,NULL,'bryonp@example.com',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(91,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jones, Margaret','Dr. Margaret Jones',NULL,NULL,NULL,NULL,NULL,'Both','1031157711',NULL,'Sample Data','Margaret','','Jones',4,NULL,NULL,NULL,1,NULL,'Dear Margaret',1,NULL,'Dear Margaret',1,NULL,'Dr. Margaret Jones',NULL,NULL,'1979-08-02',0,NULL,NULL,NULL,'Caulder Sports Fund',NULL,NULL,170,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(92,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'scooper84@lol.co.pl','scooper84@lol.co.pl',NULL,NULL,NULL,NULL,NULL,'Both','3903106960',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear scooper84@lol.co.pl',1,NULL,'Dear scooper84@lol.co.pl',1,NULL,'scooper84@lol.co.pl',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(93,'Organization',NULL,0,1,0,0,0,0,NULL,NULL,'Washington Depot Legal Solutions','Washington Depot Legal Solutions',NULL,NULL,NULL,NULL,NULL,'Both','3999833051',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Washington Depot Legal Solutions',NULL,NULL,NULL,0,NULL,NULL,87,'Washington Depot Legal Solutions',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(94,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'omarterrell@example.co.uk','omarterrell@example.co.uk',NULL,NULL,NULL,'
5
',NULL,'Both','176545621',NULL,'Sample Data',NULL,NULL,NULL,3,1,NULL,NULL,1,NULL,'Dear omarterrell@example.co.uk',1,NULL,'Dear omarterrell@example.co.uk',1,NULL,'omarterrell@example.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(95,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Yadav, Roland','Dr. Roland Yadav',NULL,NULL,NULL,NULL,NULL,'Both','3708380918',NULL,'Sample Data','Roland','J','Yadav',4,NULL,NULL,NULL,1,NULL,'Dear Roland',1,NULL,'Dear Roland',1,NULL,'Dr. Roland Yadav',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(96,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Grant-Blackwell, Kenny','Mr. Kenny Grant-Blackwell Sr.',NULL,NULL,NULL,NULL,NULL,'Both','3028710387',NULL,'Sample Data','Kenny','','Grant-Blackwell',3,2,NULL,NULL,1,NULL,'Dear Kenny',1,NULL,'Dear Kenny',1,NULL,'Mr. Kenny Grant-Blackwell Sr.',NULL,2,'1986-01-26',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(97,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Jensen-Olsen, Kacey','Kacey Jensen-Olsen',NULL,NULL,NULL,NULL,NULL,'Both','3791576537',NULL,'Sample Data','Kacey','A','Jensen-Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Kacey',1,NULL,'Dear Kacey',1,NULL,'Kacey Jensen-Olsen',NULL,1,'1990-04-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(98,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker, Delana','Delana Parker',NULL,NULL,NULL,'
3
',NULL,'Both','714840952',NULL,'Sample Data','Delana','U','Parker',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Parker',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(99,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wilson, Jackson','Jackson Wilson',NULL,NULL,NULL,NULL,NULL,'Both','3109194674',NULL,'Sample Data','Jackson','E','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Jackson',1,NULL,'Dear Jackson',1,NULL,'Jackson Wilson',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(100,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Samson, Scott','Mr. Scott Samson Jr.',NULL,NULL,NULL,'
4
',NULL,'Both','3462863584',NULL,'Sample Data','Scott','','Samson',3,1,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Mr. Scott Samson Jr.',NULL,NULL,'1993-12-16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(101,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Community Agriculture Initiative','Community Agriculture Initiative',NULL,NULL,NULL,NULL,NULL,'Both','1675779402',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Community Agriculture Initiative',NULL,NULL,NULL,0,NULL,NULL,78,'Community Agriculture Initiative',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(102,'Organization',NULL,0,0,0,0,1,0,NULL,NULL,'Fairbanks Legal Systems','Fairbanks Legal Systems',NULL,NULL,NULL,NULL,NULL,'Both','800753511',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Fairbanks Legal Systems',NULL,NULL,NULL,0,NULL,NULL,24,'Fairbanks Legal Systems',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(103,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Dameron Environmental Services','Dameron Environmental Services',NULL,NULL,NULL,NULL,NULL,'Both','840725547',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Dameron Environmental Services',NULL,NULL,NULL,0,NULL,NULL,175,'Dameron Environmental Services',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(104,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Ivanov, Jay','Jay Ivanov',NULL,NULL,NULL,'
3
',NULL,'Both','2669174964',NULL,'Sample Data','Jay','','Ivanov',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay Ivanov',NULL,NULL,'1986-03-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(105,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'parker.beula@fishmail.biz','parker.beula@fishmail.biz',NULL,NULL,NULL,'
3
',NULL,'Both','4104250858',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear parker.beula@fishmail.biz',1,NULL,'Dear parker.beula@fishmail.biz',1,NULL,'parker.beula@fishmail.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(106,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Olsen, Josefa','Josefa Olsen',NULL,NULL,NULL,NULL,NULL,'Both','2520751648',NULL,'Sample Data','Josefa','','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Josefa',1,NULL,'Dear Josefa',1,NULL,'Josefa Olsen',NULL,1,'1978-07-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(107,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Wilson, Bob','Bob Wilson III',NULL,NULL,NULL,NULL,NULL,'Both','1455203229',NULL,'Sample Data','Bob','F','Wilson',NULL,4,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Wilson III',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(108,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Wagner, Sanford','Mr. Sanford Wagner',NULL,NULL,NULL,NULL,NULL,'Both','3530679728',NULL,'Sample Data','Sanford','T','Wagner',3,NULL,NULL,NULL,1,NULL,'Dear Sanford',1,NULL,'Dear Sanford',1,NULL,'Mr. Sanford Wagner',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(109,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Parker, Toby','Toby Parker III',NULL,NULL,NULL,'
5
',NULL,'Both','3520843398',NULL,'Sample Data','Toby','D','Parker',NULL,4,NULL,NULL,1,NULL,'Dear Toby',1,NULL,'Dear Toby',1,NULL,'Toby Parker III',NULL,2,'2003-11-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(110,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wagner-Wattson, Jay','Jay Wagner-Wattson',NULL,NULL,NULL,NULL,NULL,'Both','1744921491',NULL,'Sample Data','Jay','','Wagner-Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Jay',1,NULL,'Dear Jay',1,NULL,'Jay Wagner-Wattson',NULL,2,'1994-04-01',0,NULL,NULL,NULL,'Main Technology Solutions',NULL,NULL,70,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(111,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'McReynolds, Errol','Errol McReynolds',NULL,NULL,NULL,NULL,NULL,'Both','3235560637',NULL,'Sample Data','Errol','Z','McReynolds',NULL,NULL,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Errol McReynolds',NULL,NULL,'1931-06-28',0,NULL,NULL,NULL,'Maple Literacy Network',NULL,NULL,129,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(112,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'elinawagner@lol.org','elinawagner@lol.org',NULL,NULL,NULL,NULL,NULL,'Both','1645160423',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear elinawagner@lol.org',1,NULL,'Dear elinawagner@lol.org',1,NULL,'elinawagner@lol.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(113,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Olsen, Carlos','Carlos Olsen',NULL,NULL,NULL,NULL,NULL,'Both','2601969506',NULL,'Sample Data','Carlos','B','Olsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Carlos Olsen',NULL,2,'1974-11-10',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(114,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Díaz, Tanya','Tanya Díaz',NULL,NULL,NULL,NULL,NULL,'Both','2641118119',NULL,'Sample Data','Tanya','','Díaz',NULL,NULL,NULL,NULL,1,NULL,'Dear Tanya',1,NULL,'Dear Tanya',1,NULL,'Tanya Díaz',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(115,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'kathlyndeforest@lol.co.nz','kathlyndeforest@lol.co.nz',NULL,NULL,NULL,'
5
',NULL,'Both','1236997559',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear kathlyndeforest@lol.co.nz',1,NULL,'Dear kathlyndeforest@lol.co.nz',1,NULL,'kathlyndeforest@lol.co.nz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(116,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel-Deforest, Roland','Dr. Roland Patel-Deforest',NULL,NULL,NULL,NULL,NULL,'Both','432585239',NULL,'Sample Data','Roland','L','Patel-Deforest',4,NULL,NULL,NULL,1,NULL,'Dear Roland',1,NULL,'Dear Roland',1,NULL,'Dr. Roland Patel-Deforest',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(117,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Scarlet','Mrs. Scarlet Blackwell',NULL,NULL,NULL,NULL,NULL,'Both','3052822058',NULL,'Sample Data','Scarlet','','Blackwell',1,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Mrs. Scarlet Blackwell',NULL,1,'1931-09-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(118,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Wagner, Norris','Norris Wagner III',NULL,NULL,NULL,'
4
',NULL,'Both','1406133979',NULL,'Sample Data','Norris','N','Wagner',NULL,4,NULL,NULL,1,NULL,'Dear Norris',1,NULL,'Dear Norris',1,NULL,'Norris Wagner III',NULL,2,'1953-02-04',1,'2020-07-17',NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(119,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Cooper, Justina','Dr. Justina Cooper',NULL,NULL,NULL,NULL,NULL,'Both','4063176516',NULL,'Sample Data','Justina','','Cooper',4,NULL,NULL,NULL,1,NULL,'Dear Justina',1,NULL,'Dear Justina',1,NULL,'Dr. Justina Cooper',NULL,NULL,'1990-05-29',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(120,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Zope, Mei','Mei Zope',NULL,NULL,NULL,'
4
',NULL,'Both','1279923749',NULL,'Sample Data','Mei','Q','Zope',NULL,NULL,NULL,NULL,1,NULL,'Dear Mei',1,NULL,'Dear Mei',1,NULL,'Mei Zope',NULL,1,'1959-04-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(121,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Patel, Teddy','Teddy Patel',NULL,NULL,NULL,'
3
',NULL,'Both','296402245',NULL,'Sample Data','Teddy','E','Patel',NULL,NULL,NULL,NULL,1,NULL,'Dear Teddy',1,NULL,'Dear Teddy',1,NULL,'Teddy Patel',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(122,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Patel family','Patel family',NULL,NULL,NULL,NULL,NULL,'Both','1669281794',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Patel family',5,NULL,'Dear Patel family',2,NULL,'Patel family',NULL,NULL,NULL,0,NULL,'Patel family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(123,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Terry-Samuels, Carlos','Carlos Terry-Samuels',NULL,NULL,NULL,NULL,NULL,'Both','2363063786',NULL,'Sample Data','Carlos','U','Terry-Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Carlos',1,NULL,'Dear Carlos',1,NULL,'Carlos Terry-Samuels',NULL,2,'1978-12-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(124,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest, Allen','Allen Deforest II',NULL,NULL,NULL,'
2
',NULL,'Both','4090609758',NULL,'Sample Data','Allen','','Deforest',NULL,3,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen Deforest II',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(125,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Blackwell, Princess','Ms. Princess Blackwell',NULL,NULL,NULL,'
4
',NULL,'Both','3511098981',NULL,'Sample Data','Princess','A','Blackwell',2,NULL,NULL,NULL,1,NULL,'Dear Princess',1,NULL,'Dear Princess',1,NULL,'Ms. Princess Blackwell',NULL,NULL,'1995-11-12',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(126,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Blackwell, Eleonor','Eleonor Blackwell',NULL,NULL,NULL,'
1
',NULL,'Both','123073880',NULL,'Sample Data','Eleonor','R','Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Eleonor Blackwell',NULL,1,'1964-12-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(127,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Zope-Nielsen family','Zope-Nielsen family',NULL,NULL,NULL,'
4
',NULL,'Both','1200433100',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Zope-Nielsen family',5,NULL,'Dear Zope-Nielsen family',2,NULL,'Zope-Nielsen family',NULL,NULL,NULL,0,NULL,'Zope-Nielsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(128,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Zope-Nielsen, Errol','Errol Zope-Nielsen',NULL,NULL,NULL,NULL,NULL,'Both','865374589',NULL,'Sample Data','Errol','','Zope-Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Errol',1,NULL,'Dear Errol',1,NULL,'Errol Zope-Nielsen',NULL,2,'2017-08-04',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(129,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Maple Literacy Network','Maple Literacy Network',NULL,NULL,NULL,'
2
',NULL,'Both','2895929269',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Maple Literacy Network',NULL,NULL,NULL,0,NULL,NULL,111,'Maple Literacy Network',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(130,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Grant, Landon','Landon Grant III',NULL,NULL,NULL,'
5
',NULL,'Both','2502173548',NULL,'Sample Data','Landon','Q','Grant',NULL,4,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Grant III',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(131,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'olsen.y.laree@testmail.co.uk','olsen.y.laree@testmail.co.uk',NULL,NULL,NULL,'
2
',NULL,'Both','3557271928',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear olsen.y.laree@testmail.co.uk',1,NULL,'Dear olsen.y.laree@testmail.co.uk',1,NULL,'olsen.y.laree@testmail.co.uk',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(132,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'McReynolds, Landon','Dr. Landon McReynolds',NULL,NULL,NULL,'
5
',NULL,'Both','4041236160',NULL,'Sample Data','Landon','','McReynolds',4,NULL,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Dr. Landon McReynolds',NULL,NULL,'1961-04-04',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(133,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Terrell, Omar','Dr. Omar Terrell',NULL,NULL,NULL,NULL,NULL,'Both','265836995',NULL,'Sample Data','Omar','','Terrell',4,NULL,NULL,NULL,1,NULL,'Dear Omar',1,NULL,'Dear Omar',1,NULL,'Dr. Omar Terrell',NULL,2,'1992-03-31',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(134,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Deforest, Ivey','Mrs. Ivey Deforest',NULL,NULL,NULL,NULL,NULL,'Both','1981648661',NULL,'Sample Data','Ivey','','Deforest',1,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Mrs. Ivey Deforest',NULL,NULL,'1994-03-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(135,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Grant-Blackwell, Megan','Megan Grant-Blackwell',NULL,NULL,NULL,'
4
',NULL,'Both','811345108',NULL,'Sample Data','Megan','Z','Grant-Blackwell',NULL,NULL,NULL,NULL,1,NULL,'Dear Megan',1,NULL,'Dear Megan',1,NULL,'Megan Grant-Blackwell',NULL,1,'1996-02-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(136,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Terry-Samuels, Nicole','Nicole Terry-Samuels',NULL,NULL,NULL,'
3
',NULL,'Both','892161476',NULL,'Sample Data','Nicole','','Terry-Samuels',NULL,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Nicole Terry-Samuels',NULL,NULL,'2005-10-12',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(137,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'msamuels@mymail.co.in','msamuels@mymail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','3462745827',NULL,'Sample Data',NULL,NULL,NULL,1,NULL,NULL,NULL,1,NULL,'Dear msamuels@mymail.co.in',1,NULL,'Dear msamuels@mymail.co.in',1,NULL,'msamuels@mymail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(138,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'trumanb@testmail.co.in','trumanb@testmail.co.in',NULL,NULL,NULL,NULL,NULL,'Both','2552166428',NULL,'Sample Data',NULL,NULL,NULL,NULL,1,NULL,NULL,1,NULL,'Dear trumanb@testmail.co.in',1,NULL,'Dear trumanb@testmail.co.in',1,NULL,'trumanb@testmail.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(139,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Grant, Kandace','Kandace Grant',NULL,NULL,NULL,'
4
',NULL,'Both','3520863939',NULL,'Sample Data','Kandace','K','Grant',NULL,NULL,NULL,NULL,1,NULL,'Dear Kandace',1,NULL,'Dear Kandace',1,NULL,'Kandace Grant',NULL,1,'1983-12-23',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(140,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest, Ashley','Ashley Deforest',NULL,NULL,NULL,'
3
',NULL,'Both','4128046694',NULL,'Sample Data','Ashley','','Deforest',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Deforest',NULL,1,'2000-02-06',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(141,'Household',NULL,0,1,0,0,1,0,NULL,NULL,'Wagner-Wattson family','Wagner-Wattson family',NULL,NULL,NULL,'
5
',NULL,'Both','3521117998',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Wagner-Wattson family',5,NULL,'Dear Wagner-Wattson family',2,NULL,'Wagner-Wattson family',NULL,NULL,NULL,0,NULL,'Wagner-Wattson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(142,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'patels@lol.biz','patels@lol.biz',NULL,NULL,NULL,'
4
',NULL,'Both','590421622',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear patels@lol.biz',1,NULL,'Dear patels@lol.biz',1,NULL,'patels@lol.biz',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(143,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Łąchowski, Lashawnda','Ms. Lashawnda Łąchowski',NULL,NULL,NULL,'
2
',NULL,'Both','4065862951',NULL,'Sample Data','Lashawnda','','Łąchowski',2,NULL,NULL,NULL,1,NULL,'Dear Lashawnda',1,NULL,'Dear Lashawnda',1,NULL,'Ms. Lashawnda Łąchowski',NULL,NULL,'1986-09-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(144,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Olsen family','Olsen family',NULL,NULL,NULL,NULL,NULL,'Both','1990073228',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Olsen family',5,NULL,'Dear Olsen family',2,NULL,'Olsen family',NULL,NULL,NULL,0,NULL,'Olsen family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(145,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Patel, Alexia','Alexia Patel',NULL,NULL,NULL,NULL,NULL,'Both','1465483160',NULL,'Sample Data','Alexia','F','Patel',NULL,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Alexia Patel',NULL,NULL,'1996-10-23',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(146,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Łąchowski, Brzęczysław','Brzęczysław Łąchowski',NULL,NULL,NULL,NULL,NULL,'Both','3090952976',NULL,'Sample Data','Brzęczysław','','Łąchowski',NULL,NULL,NULL,NULL,1,NULL,'Dear Brzęczysław',1,NULL,'Dear Brzęczysław',1,NULL,'Brzęczysław Łąchowski',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(147,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Nielsen, Ashley','Ashley Nielsen',NULL,NULL,NULL,'
5
',NULL,'Both','3185921843',NULL,'Sample Data','Ashley','','Nielsen',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Nielsen',NULL,NULL,'1939-02-20',0,NULL,NULL,NULL,'Cadell Health Solutions',NULL,NULL,172,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(148,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Parker, Iris','Dr. Iris Parker',NULL,NULL,NULL,NULL,NULL,'Both','1685537074',NULL,'Sample Data','Iris','M','Parker',4,NULL,NULL,NULL,1,NULL,'Dear Iris',1,NULL,'Dear Iris',1,NULL,'Dr. Iris Parker',NULL,1,'1984-08-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(149,'Organization',NULL,1,0,0,0,0,0,NULL,NULL,'Bay Peace Partnership','Bay Peace Partnership',NULL,NULL,NULL,'
2
',NULL,'Both','2182087750',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Bay Peace Partnership',NULL,NULL,NULL,0,NULL,NULL,NULL,'Bay Peace Partnership',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(150,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Grant, Winford','Winford Grant III',NULL,NULL,NULL,NULL,NULL,'Both','431528979',NULL,'Sample Data','Winford','S','Grant',NULL,4,NULL,NULL,1,NULL,'Dear Winford',1,NULL,'Dear Winford',1,NULL,'Winford Grant III',NULL,2,'1965-10-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(151,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wattson, Erik','Erik Wattson',NULL,NULL,NULL,'
2
',NULL,'Both','1174454182',NULL,'Sample Data','Erik','K','Wattson',NULL,NULL,NULL,NULL,1,NULL,'Dear Erik',1,NULL,'Dear Erik',1,NULL,'Erik Wattson',NULL,2,'1948-12-08',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(152,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Elina','Elina Müller',NULL,NULL,NULL,'
4
',NULL,'Both','4147818089',NULL,'Sample Data','Elina','','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Elina',1,NULL,'Dear Elina',1,NULL,'Elina Müller',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(153,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Blackwell, Kathleen','Ms. Kathleen Blackwell',NULL,NULL,NULL,NULL,NULL,'Both','2975176950',NULL,'Sample Data','Kathleen','R','Blackwell',2,NULL,NULL,NULL,1,NULL,'Dear Kathleen',1,NULL,'Dear Kathleen',1,NULL,'Ms. Kathleen Blackwell',NULL,1,'1994-05-16',0,NULL,NULL,NULL,'Indiana Agriculture Partnership',NULL,NULL,21,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(154,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Smith, Russell','Russell Smith',NULL,NULL,NULL,NULL,NULL,'Both','2357263550',NULL,'Sample Data','Russell','','Smith',NULL,NULL,NULL,NULL,1,NULL,'Dear Russell',1,NULL,'Dear Russell',1,NULL,'Russell Smith',NULL,2,'1938-11-21',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(155,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Jameson family','Jameson family',NULL,NULL,NULL,'
5
',NULL,'Both','2255649769',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Jameson family',5,NULL,'Dear Jameson family',2,NULL,'Jameson family',NULL,NULL,NULL,0,NULL,'Jameson family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(156,'Household',NULL,1,0,0,0,0,0,NULL,NULL,'Terry-Samuels family','Terry-Samuels family',NULL,NULL,NULL,'
5
',NULL,'Both','247123986',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Terry-Samuels family',5,NULL,'Dear Terry-Samuels family',2,NULL,'Terry-Samuels family',NULL,NULL,NULL,0,NULL,'Terry-Samuels family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(157,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Lee, Ivey','Ivey Lee',NULL,NULL,NULL,'
3
',NULL,'Both','2847315526',NULL,'Sample Data','Ivey','','Lee',NULL,NULL,NULL,NULL,1,NULL,'Dear Ivey',1,NULL,'Dear Ivey',1,NULL,'Ivey Lee',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(158,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Ivanov, Santina','Santina Ivanov',NULL,NULL,NULL,NULL,NULL,'Both','1530829169',NULL,'Sample Data','Santina','C','Ivanov',NULL,NULL,NULL,NULL,1,NULL,'Dear Santina',1,NULL,'Dear Santina',1,NULL,'Santina Ivanov',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(159,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel, Delana','Delana Patel',NULL,NULL,NULL,'
4
',NULL,'Both','725274088',NULL,'Sample Data','Delana','N','Patel',NULL,NULL,NULL,NULL,1,NULL,'Dear Delana',1,NULL,'Dear Delana',1,NULL,'Delana Patel',NULL,1,'2000-02-25',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(160,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'Terry, Ashlie','Dr. Ashlie Terry',NULL,NULL,NULL,NULL,NULL,'Both','1408134822',NULL,'Sample Data','Ashlie','O','Terry',4,NULL,NULL,NULL,1,NULL,'Dear Ashlie',1,NULL,'Dear Ashlie',1,NULL,'Dr. Ashlie Terry',NULL,1,'1935-11-19',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(161,'Organization',NULL,0,1,0,0,1,0,NULL,NULL,'Beech Food Partnership','Beech Food Partnership',NULL,NULL,NULL,NULL,NULL,'Both','3157884288',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Beech Food Partnership',NULL,NULL,NULL,0,NULL,NULL,NULL,'Beech Food Partnership',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(162,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'Dimitrov, Brent','Dr. Brent Dimitrov',NULL,NULL,NULL,NULL,NULL,'Both','317189304',NULL,'Sample Data','Brent','','Dimitrov',4,NULL,NULL,NULL,1,NULL,'Dear Brent',1,NULL,'Dear Brent',1,NULL,'Dr. Brent Dimitrov',NULL,2,'1955-07-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(163,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Olsen, Landon','Landon Olsen III',NULL,NULL,NULL,NULL,NULL,'Both','496664817',NULL,'Sample Data','Landon','','Olsen',NULL,4,NULL,NULL,1,NULL,'Dear Landon',1,NULL,'Dear Landon',1,NULL,'Landon Olsen III',NULL,2,'1967-09-09',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(164,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'González, Junko','Ms. Junko González',NULL,NULL,NULL,'
2
',NULL,'Both','1095741341',NULL,'Sample Data','Junko','A','González',2,NULL,NULL,NULL,1,NULL,'Dear Junko',1,NULL,'Dear Junko',1,NULL,'Ms. Junko González',NULL,1,'1950-08-03',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(165,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Williamsburg Software Fellowship','Williamsburg Software Fellowship',NULL,NULL,NULL,'
5
',NULL,'Both','2129646983',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Williamsburg Software Fellowship',NULL,NULL,NULL,0,NULL,NULL,3,'Williamsburg Software Fellowship',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(166,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Parker family','Parker family',NULL,NULL,NULL,NULL,NULL,'Both','425242179',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Parker family',5,NULL,'Dear Parker family',2,NULL,'Parker family',NULL,NULL,NULL,0,NULL,'Parker family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(167,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Kansas Education Alliance','Kansas Education Alliance',NULL,NULL,NULL,NULL,NULL,'Both','2561283907',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Kansas Education Alliance',NULL,NULL,NULL,0,NULL,NULL,12,'Kansas Education Alliance',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(168,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Jacobs, Ashley','Ashley Jacobs',NULL,NULL,NULL,NULL,NULL,'Both','2224166572',NULL,'Sample Data','Ashley','Y','Jacobs',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Jacobs',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(169,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Olsen, Rodrigo','Rodrigo Olsen Sr.',NULL,NULL,NULL,'
4
',NULL,'Both','583965364',NULL,'Sample Data','Rodrigo','','Olsen',NULL,2,NULL,NULL,1,NULL,'Dear Rodrigo',1,NULL,'Dear Rodrigo',1,NULL,'Rodrigo Olsen Sr.',NULL,NULL,NULL,0,NULL,NULL,NULL,'Jackson Software Systems',NULL,NULL,39,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(170,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Caulder Sports Fund','Caulder Sports Fund',NULL,NULL,NULL,'
5
',NULL,'Both','1126006360',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Caulder Sports Fund',NULL,NULL,NULL,0,NULL,NULL,91,'Caulder Sports Fund',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(171,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Samson, Santina','Santina Samson',NULL,NULL,NULL,NULL,NULL,'Both','1196980593',NULL,'Sample Data','Santina','','Samson',NULL,NULL,NULL,NULL,1,NULL,'Dear Santina',1,NULL,'Dear Santina',1,NULL,'Santina Samson',NULL,1,'1958-04-28',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(172,'Organization',NULL,0,0,0,0,0,0,NULL,NULL,'Cadell Health Solutions','Cadell Health Solutions',NULL,NULL,NULL,NULL,NULL,'Both','987604116',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,'Cadell Health Solutions',NULL,NULL,NULL,0,NULL,NULL,147,'Cadell Health Solutions',NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(173,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Daren','Dr. Daren Müller',NULL,NULL,NULL,'
2
',NULL,'Both','1527306191',NULL,'Sample Data','Daren','B','Müller',4,NULL,NULL,NULL,1,NULL,'Dear Daren',1,NULL,'Dear Daren',1,NULL,'Dr. Daren Müller',NULL,NULL,'1971-07-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(174,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice family','Prentice family',NULL,NULL,NULL,'
1
',NULL,'Both','3313623671',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Prentice family',5,NULL,'Dear Prentice family',2,NULL,'Prentice family',NULL,NULL,NULL,0,NULL,'Prentice family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(175,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wagner-Wattson, Shauna','Mrs. Shauna Wagner-Wattson',NULL,NULL,NULL,'
2
',NULL,'Both','374744111',NULL,'Sample Data','Shauna','','Wagner-Wattson',1,NULL,NULL,NULL,1,NULL,'Dear Shauna',1,NULL,'Dear Shauna',1,NULL,'Mrs. Shauna Wagner-Wattson',NULL,1,'1991-11-18',0,NULL,NULL,NULL,'Dameron Environmental Services',NULL,NULL,103,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(176,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'McReynolds, Scott','Mr. Scott McReynolds II',NULL,NULL,NULL,NULL,NULL,'Both','1769704842',NULL,'Sample Data','Scott','S','McReynolds',3,3,NULL,NULL,1,NULL,'Dear Scott',1,NULL,'Dear Scott',1,NULL,'Mr. Scott McReynolds II',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(177,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Jameson, Nicole','Mrs. Nicole Jameson',NULL,NULL,NULL,NULL,NULL,'Both','533376763',NULL,'Sample Data','Nicole','','Jameson',1,NULL,NULL,NULL,1,NULL,'Dear Nicole',1,NULL,'Dear Nicole',1,NULL,'Mrs. Nicole Jameson',NULL,1,'1958-02-02',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(178,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest, Ashley','Ashley Deforest',NULL,NULL,NULL,NULL,NULL,'Both','4128046694',NULL,'Sample Data','Ashley','I','Deforest',NULL,NULL,NULL,NULL,1,NULL,'Dear Ashley',1,NULL,'Dear Ashley',1,NULL,'Ashley Deforest',NULL,1,'2011-10-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(179,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'jacobd9@airmail.org','jacobd9@airmail.org',NULL,NULL,NULL,NULL,NULL,'Both','650671293',NULL,'Sample Data',NULL,NULL,NULL,NULL,2,NULL,NULL,1,NULL,'Dear jacobd9@airmail.org',1,NULL,'Dear jacobd9@airmail.org',1,NULL,'jacobd9@airmail.org',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(180,'Household',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest family','Deforest family',NULL,NULL,NULL,NULL,NULL,'Both','3235379039',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest family',5,NULL,'Dear Deforest family',2,NULL,'Deforest family',NULL,NULL,NULL,0,NULL,'Deforest family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(181,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Adams, Jina','Ms. Jina Adams',NULL,NULL,NULL,NULL,NULL,'Both','3136326826',NULL,'Sample Data','Jina','G','Adams',2,NULL,NULL,NULL,1,NULL,'Dear Jina',1,NULL,'Dear Jina',1,NULL,'Ms. Jina Adams',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(182,'Individual',NULL,0,1,0,0,0,0,NULL,NULL,'kreynolds@lol.co.in','kreynolds@lol.co.in',NULL,NULL,NULL,NULL,NULL,'Both','854052827',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Dear kreynolds@lol.co.in',1,NULL,'Dear kreynolds@lol.co.in',1,NULL,'kreynolds@lol.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(183,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Díaz, Irvin','Dr. Irvin Díaz',NULL,NULL,NULL,NULL,NULL,'Both','2415400429',NULL,'Sample Data','Irvin','','Díaz',4,NULL,NULL,NULL,1,NULL,'Dear Irvin',1,NULL,'Dear Irvin',1,NULL,'Dr. Irvin Díaz',NULL,2,'1937-06-07',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(184,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Müller, Eleonor','Eleonor Müller',NULL,NULL,NULL,NULL,NULL,'Both','4009103845',NULL,'Sample Data','Eleonor','','Müller',NULL,NULL,NULL,NULL,1,NULL,'Dear Eleonor',1,NULL,'Dear Eleonor',1,NULL,'Eleonor Müller',NULL,1,'1977-06-13',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(185,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Jacobs, Shad','Shad Jacobs',NULL,NULL,NULL,'
5
',NULL,'Both','3732235082',NULL,'Sample Data','Shad','Z','Jacobs',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Jacobs',NULL,2,'1963-11-01',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(186,'Individual',NULL,1,0,0,0,1,0,NULL,NULL,'gonzlez.c.barry@sample.co.in','gonzlez.c.barry@sample.co.in',NULL,NULL,NULL,NULL,NULL,'Both','400528147',NULL,'Sample Data',NULL,NULL,NULL,4,NULL,NULL,NULL,1,NULL,'Dear gonzlez.c.barry@sample.co.in',1,NULL,'Dear gonzlez.c.barry@sample.co.in',1,NULL,'gonzlez.c.barry@sample.co.in',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(187,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'valenep@infomail.info','valenep@infomail.info',NULL,NULL,NULL,NULL,NULL,'Both','4280193954',NULL,'Sample Data',NULL,NULL,NULL,2,NULL,NULL,NULL,1,NULL,'Dear valenep@infomail.info',1,NULL,'Dear valenep@infomail.info',1,NULL,'valenep@infomail.info',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(188,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Wilson, Teresa','Teresa Wilson',NULL,NULL,NULL,NULL,NULL,'Both','4075437794',NULL,'Sample Data','Teresa','I','Wilson',NULL,NULL,NULL,NULL,1,NULL,'Dear Teresa',1,NULL,'Dear Teresa',1,NULL,'Teresa Wilson',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(189,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Ivanov, Scarlet','Mrs. Scarlet Ivanov',NULL,NULL,NULL,'
4
',NULL,'Both','959385532',NULL,'Sample Data','Scarlet','','Ivanov',1,NULL,NULL,NULL,1,NULL,'Dear Scarlet',1,NULL,'Dear Scarlet',1,NULL,'Mrs. Scarlet Ivanov',NULL,NULL,'1950-06-18',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(190,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Wagner, Jacob','Jacob Wagner Sr.',NULL,NULL,NULL,NULL,NULL,'Both','320484999',NULL,'Sample Data','Jacob','M','Wagner',NULL,2,NULL,NULL,1,NULL,'Dear Jacob',1,NULL,'Dear Jacob',1,NULL,'Jacob Wagner Sr.',NULL,2,'1964-07-27',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(191,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Smith, Shad','Shad Smith',NULL,NULL,NULL,'
2
',NULL,'Both','3601530916',NULL,'Sample Data','Shad','E','Smith',NULL,NULL,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Smith',NULL,2,'1951-10-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(192,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Terrell, Jed','Jed Terrell',NULL,NULL,NULL,'
1
',NULL,'Both','1773288305',NULL,'Sample Data','Jed','','Terrell',NULL,NULL,NULL,NULL,1,NULL,'Dear Jed',1,NULL,'Dear Jed',1,NULL,'Jed Terrell',NULL,2,'1990-05-30',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(193,'Individual',NULL,1,0,0,0,0,0,NULL,NULL,'Zope, Shad','Shad Zope Jr.',NULL,NULL,NULL,'
2
',NULL,'Both','2740120938',NULL,'Sample Data','Shad','','Zope',NULL,1,NULL,NULL,1,NULL,'Dear Shad',1,NULL,'Dear Shad',1,NULL,'Shad Zope Jr.',NULL,2,'1945-03-20',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(194,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Robertson, Craig','Craig Robertson',NULL,NULL,NULL,'
3
',NULL,'Both','3925632970',NULL,'Sample Data','Craig','','Robertson',NULL,NULL,NULL,NULL,1,NULL,'Dear Craig',1,NULL,'Dear Craig',1,NULL,'Craig Robertson',NULL,NULL,'1954-11-23',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(195,'Individual',NULL,0,0,0,0,1,0,NULL,NULL,'Łąchowski, Allen','Allen Łąchowski Sr.',NULL,NULL,NULL,NULL,NULL,'Both','3162448518',NULL,'Sample Data','Allen','N','Łąchowski',NULL,2,NULL,NULL,1,NULL,'Dear Allen',1,NULL,'Dear Allen',1,NULL,'Allen Łąchowski Sr.',NULL,2,'1991-06-24',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(196,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Patel, Bob','Bob Patel Jr.',NULL,NULL,NULL,'
3
',NULL,'Both','165677913',NULL,'Sample Data','Bob','K','Patel',NULL,1,NULL,NULL,1,NULL,'Dear Bob',1,NULL,'Dear Bob',1,NULL,'Bob Patel Jr.',NULL,2,'1961-12-11',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(197,'Individual',NULL,1,1,0,0,0,0,NULL,NULL,'Ivanov, Alexia','Ms. Alexia Ivanov',NULL,NULL,NULL,'
5
',NULL,'Both','393680941',NULL,'Sample Data','Alexia','','Ivanov',2,NULL,NULL,NULL,1,NULL,'Dear Alexia',1,NULL,'Dear Alexia',1,NULL,'Ms. Alexia Ivanov',NULL,NULL,'1932-08-15',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(198,'Household',NULL,0,0,0,0,1,0,NULL,NULL,'Deforest family','Deforest family',NULL,NULL,NULL,NULL,NULL,'Both','3235379039',NULL,'Sample Data',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5,NULL,'Dear Deforest family',5,NULL,'Dear Deforest family',2,NULL,'Deforest family',NULL,NULL,NULL,0,NULL,'Deforest family',NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(199,'Individual',NULL,0,1,0,0,1,0,NULL,NULL,'Łąchowski, Rebekah','Mrs. Rebekah Łąchowski',NULL,NULL,NULL,'
3
',NULL,'Both','237881396',NULL,'Sample Data','Rebekah','D','Łąchowski',1,NULL,NULL,NULL,1,NULL,'Dear Rebekah',1,NULL,'Dear Rebekah',1,NULL,'Mrs. Rebekah Łąchowski',NULL,1,'1973-08-14',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42'),(200,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Prentice, Angelika','Angelika Prentice',NULL,NULL,NULL,'
1
',NULL,'Both','2353385651',NULL,'Sample Data','Angelika','','Prentice',NULL,NULL,NULL,NULL,1,NULL,'Dear Angelika',1,NULL,'Dear Angelika',1,NULL,'Angelika Prentice',NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:43'),(201,'Individual',NULL,0,0,0,0,0,0,NULL,NULL,'Deforest, Miguel','Dr. Miguel Deforest III',NULL,NULL,NULL,NULL,NULL,'Both','2379734396',NULL,'Sample Data','Miguel','G','Deforest',4,4,NULL,NULL,1,NULL,'Dear Miguel',1,NULL,'Dear Miguel',1,NULL,'Dr. Miguel Deforest III',NULL,2,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'2020-09-17 02:54:42','2020-09-17 02:54:42');
 /*!40000 ALTER TABLE `civicrm_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -228,7 +228,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_contribution` WRITE;
 /*!40000 ALTER TABLE `civicrm_contribution` DISABLE KEYS */;
-INSERT INTO `civicrm_contribution` (`id`, `contact_id`, `financial_type_id`, `contribution_page_id`, `payment_instrument_id`, `receive_date`, `non_deductible_amount`, `total_amount`, `fee_amount`, `net_amount`, `trxn_id`, `invoice_id`, `invoice_number`, `currency`, `cancel_date`, `cancel_reason`, `receipt_date`, `thankyou_date`, `source`, `amount_level`, `contribution_recur_id`, `is_test`, `is_pay_later`, `contribution_status_id`, `address_id`, `check_number`, `campaign_id`, `creditnote_id`, `tax_amount`, `revenue_recognition_date`, `is_template`) VALUES (1,2,1,NULL,4,'2010-04-11 00:00:00',0.00,125.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'1041',NULL,NULL,NULL,NULL,0),(2,4,1,NULL,1,'2010-03-21 00:00:00',0.00,50.00,NULL,NULL,'P20901X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,6,1,NULL,4,'2010-04-29 00:00:00',0.00,25.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'2095',NULL,NULL,NULL,NULL,0),(4,8,1,NULL,4,'2010-04-11 00:00:00',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'10552',NULL,NULL,NULL,NULL,0),(5,16,1,NULL,4,'2010-04-15 00:00:00',0.00,500.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'509',NULL,NULL,NULL,NULL,0),(6,19,1,NULL,4,'2010-04-11 00:00:00',0.00,175.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'102',NULL,NULL,NULL,NULL,0),(7,82,1,NULL,1,'2010-03-27 00:00:00',0.00,50.00,NULL,NULL,'P20193L2',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(8,92,1,NULL,1,'2010-03-08 00:00:00',0.00,10.00,NULL,NULL,'P40232Y3',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(9,34,1,NULL,1,'2010-04-22 00:00:00',0.00,250.00,NULL,NULL,'P20193L6',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(10,71,1,NULL,1,'2009-07-01 11:53:50',0.00,500.00,NULL,NULL,'PL71',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(11,43,1,NULL,1,'2009-07-01 12:55:41',0.00,200.00,NULL,NULL,'PL43II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(12,32,1,NULL,1,'2009-10-01 11:53:50',0.00,200.00,NULL,NULL,'PL32I',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(13,32,1,NULL,1,'2009-12-01 12:55:41',0.00,200.00,NULL,NULL,'PL32II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(14,73,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(15,92,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(16,48,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(17,51,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(18,163,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(19,40,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(20,190,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(21,33,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(22,175,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(23,103,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(24,194,2,NULL,1,'2020-09-16 13:29:32',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(25,56,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(26,120,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(27,105,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(28,184,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(29,177,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(30,153,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(31,106,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(32,13,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(33,64,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(34,200,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(35,142,2,NULL,1,'2020-09-16 13:29:32',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(36,111,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(37,132,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(38,141,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(39,3,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(40,86,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(41,168,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(42,16,2,NULL,1,'2020-09-16 13:29:32',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(43,68,2,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(45,7,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(46,8,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(47,11,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(48,13,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(49,21,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(50,26,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(51,27,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(52,46,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(53,48,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(54,50,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(55,52,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(56,53,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(57,60,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(58,67,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(59,76,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(60,77,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(61,78,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(62,79,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(63,80,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(64,82,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(65,84,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(66,85,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(67,94,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(68,95,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(69,101,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(70,103,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(71,111,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(72,114,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(73,115,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(74,128,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(75,129,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(76,135,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(77,137,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(78,140,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(79,146,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(80,147,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(81,153,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(82,155,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(83,157,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(84,160,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(85,161,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(86,167,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(87,169,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(88,172,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(89,181,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(90,187,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(91,188,4,NULL,1,'2020-09-16 13:29:32',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(92,191,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(93,193,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(94,196,4,NULL,1,'2020-09-16 13:29:32',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 13:29:32',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0);
+INSERT INTO `civicrm_contribution` (`id`, `contact_id`, `financial_type_id`, `contribution_page_id`, `payment_instrument_id`, `receive_date`, `non_deductible_amount`, `total_amount`, `fee_amount`, `net_amount`, `trxn_id`, `invoice_id`, `invoice_number`, `currency`, `cancel_date`, `cancel_reason`, `receipt_date`, `thankyou_date`, `source`, `amount_level`, `contribution_recur_id`, `is_test`, `is_pay_later`, `contribution_status_id`, `address_id`, `check_number`, `campaign_id`, `creditnote_id`, `tax_amount`, `revenue_recognition_date`, `is_template`) VALUES (1,2,1,NULL,4,'2010-04-11 00:00:00',0.00,125.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'1041',NULL,NULL,NULL,NULL,0),(2,4,1,NULL,1,'2010-03-21 00:00:00',0.00,50.00,NULL,NULL,'P20901X1',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,6,1,NULL,4,'2010-04-29 00:00:00',0.00,25.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'2095',NULL,NULL,NULL,NULL,0),(4,8,1,NULL,4,'2010-04-11 00:00:00',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'10552',NULL,NULL,NULL,NULL,0),(5,16,1,NULL,4,'2010-04-15 00:00:00',0.00,500.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'509',NULL,NULL,NULL,NULL,0),(6,19,1,NULL,4,'2010-04-11 00:00:00',0.00,175.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Apr 2007 Mailer 1',NULL,NULL,0,0,1,NULL,'102',NULL,NULL,NULL,NULL,0),(7,82,1,NULL,1,'2010-03-27 00:00:00',0.00,50.00,NULL,NULL,'P20193L2',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Save the Penguins',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(8,92,1,NULL,1,'2010-03-08 00:00:00',0.00,10.00,NULL,NULL,'P40232Y3',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(9,34,1,NULL,1,'2010-04-22 00:00:00',0.00,250.00,NULL,NULL,'P20193L6',NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Online: Help CiviCRM',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(10,71,1,NULL,1,'2009-07-01 11:53:50',0.00,500.00,NULL,NULL,'PL71',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(11,43,1,NULL,1,'2009-07-01 12:55:41',0.00,200.00,NULL,NULL,'PL43II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(12,32,1,NULL,1,'2009-10-01 11:53:50',0.00,200.00,NULL,NULL,'PL32I',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(13,32,1,NULL,1,'2009-12-01 12:55:41',0.00,200.00,NULL,NULL,'PL32II',NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(14,114,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(15,188,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(16,67,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(17,60,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(18,179,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(19,32,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(20,111,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(21,133,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(22,69,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(23,138,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(24,140,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(25,168,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(26,158,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(27,66,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(28,61,2,NULL,1,'2020-09-16 19:54:44',0.00,100.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'General Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(29,7,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(30,148,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(31,76,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(32,175,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(33,72,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(34,28,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(35,34,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(36,136,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(37,154,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(38,55,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(39,189,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(40,84,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(41,91,2,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Student Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(42,110,2,NULL,1,'2020-09-16 19:54:44',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(43,11,2,NULL,1,'2020-09-16 19:54:44',0.00,1200.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,NULL,NULL,'Lifetime Membership: Offline signup',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(45,8,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(46,11,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(47,18,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(48,20,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(49,25,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(50,28,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(51,37,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(52,38,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(53,40,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(54,43,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(55,44,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(56,47,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(57,48,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(58,52,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(59,55,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(60,56,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(61,61,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(62,63,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(63,70,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(64,71,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(65,79,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(66,88,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(67,90,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(68,99,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(69,102,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(70,104,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(71,110,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(72,120,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(73,123,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(74,125,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(75,127,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(76,135,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(77,147,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(78,150,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(79,153,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(80,155,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(81,156,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(82,160,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(83,162,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(84,163,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(85,166,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(86,172,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(87,178,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(88,187,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(89,190,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Summer Solstice Festival Day Concert : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(90,192,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(91,194,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(92,197,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(93,198,4,NULL,1,'2020-09-16 19:54:44',0.00,800.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Rain-forest Cup Youth Soccer Tournament : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0),(94,199,4,NULL,1,'2020-09-16 19:54:44',0.00,50.00,NULL,NULL,NULL,NULL,NULL,'USD',NULL,NULL,'2020-09-16 19:54:44',NULL,'Fall Fundraiser Dinner : Offline registration',NULL,NULL,0,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0);
 /*!40000 ALTER TABLE `civicrm_contribution` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -266,7 +266,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_contribution_soft` WRITE;
 /*!40000 ALTER TABLE `civicrm_contribution_soft` DISABLE KEYS */;
-INSERT INTO `civicrm_contribution_soft` (`id`, `contribution_id`, `contact_id`, `amount`, `currency`, `pcp_id`, `pcp_display_in_roll`, `pcp_roll_nickname`, `pcp_personal_note`, `soft_credit_type_id`) VALUES (1,8,117,10.00,'USD',1,1,'Jones Family','Helping Hands',10),(2,9,117,250.00,'USD',1,1,'Annie and the kids','Annie Helps',10);
+INSERT INTO `civicrm_contribution_soft` (`id`, `contribution_id`, `contact_id`, `amount`, `currency`, `pcp_id`, `pcp_display_in_roll`, `pcp_roll_nickname`, `pcp_personal_note`, `soft_credit_type_id`) VALUES (1,8,118,10.00,'USD',1,1,'Jones Family','Helping Hands',10),(2,9,118,250.00,'USD',1,1,'Annie and the kids','Annie Helps',10);
 /*!40000 ALTER TABLE `civicrm_contribution_soft` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -409,7 +409,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_email` WRITE;
 /*!40000 ALTER TABLE `civicrm_email` DISABLE KEYS */;
-INSERT INTO `civicrm_email` (`id`, `contact_id`, `location_type_id`, `email`, `is_primary`, `is_billing`, `on_hold`, `is_bulkmail`, `hold_date`, `reset_date`, `signature_text`, `signature_html`) VALUES (1,1,1,'fixme.domainemail@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(2,94,1,'kiaras@sample.net',1,0,0,0,NULL,NULL,NULL,NULL),(3,145,1,'lawerenced@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),(4,145,1,'lawerenced60@fishmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(5,194,1,'jones.delana30@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),(6,103,1,'mcreynolds.angelika55@fakemail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(7,54,1,'nielsenj25@notmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(8,185,1,'bwagner51@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(9,130,1,'andrewrobertson@mymail.com',1,0,0,0,NULL,NULL,NULL,NULL),(10,102,1,'teddyrobertson@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(11,102,1,'teddyr@lol.info',0,0,0,0,NULL,NULL,NULL,NULL),(12,122,1,'migueld@notmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(13,65,1,'jacobs.o.sonny27@infomail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(14,65,1,'jacobs.sonny@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(15,86,1,'craigadams41@airmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(16,142,1,'eo.daz34@sample.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(17,142,1,'eo.daz@fakemail.org',0,0,0,0,NULL,NULL,NULL,NULL),(18,70,1,'iveyadams@notmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(19,70,1,'adams.ivey22@fishmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(20,141,1,'lg.blackwell66@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(21,126,1,'lw.jones@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),(22,126,1,'jones.w.lashawnda@fakemail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(23,39,1,'daz.z.margaret@notmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(24,39,1,'margaretdaz51@sample.biz',0,0,0,0,NULL,NULL,NULL,NULL),(25,110,1,'blackwell.rosario@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(26,170,1,'kiarajensen@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(27,170,1,'jensen.kiara@testmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(28,169,1,'daz.betty57@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(29,200,1,'lincolnm@spamalot.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(30,23,1,'mariazope1@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(31,91,1,'landonr@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(32,91,1,'landonroberts@airmail.com',0,0,0,0,NULL,NULL,NULL,NULL),(33,92,1,'cruzb26@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(34,150,1,'kj.mller60@infomail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(35,150,1,'kiaram30@testmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(36,43,1,'mcreynolds.damaris@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(37,198,1,'samuelsr@fishmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(38,17,1,'shaunablackwell22@fishmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(39,179,1,'cruz.norris88@airmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(40,197,1,'alee53@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),(41,88,1,'sadams17@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(42,88,1,'scotta@example.com',0,0,0,0,NULL,NULL,NULL,NULL),(43,21,1,'norrissamson@sample.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(44,59,1,'rebekahr@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(45,118,1,'barkley.princess31@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(46,111,1,'valenel@fakemail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(47,111,1,'lee.valene@sample.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(48,19,1,'jacobsj@example.info',1,0,0,0,NULL,NULL,NULL,NULL),(49,180,1,'jacobs.kathlyn11@example.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(50,132,1,'olsenb@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(51,191,1,'blackwell.elbert9@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(52,191,1,'blackwell.elbert@sample.com',0,0,0,0,NULL,NULL,NULL,NULL),(53,157,1,'chowski.russell98@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(54,157,1,'russellchowski17@example.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(55,46,1,'iveybachman11@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(56,81,1,'cnielsen81@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(57,129,1,'cooper.kandace@example.net',1,0,0,0,NULL,NULL,NULL,NULL),(58,129,1,'cooper.kandace@fishmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(59,109,1,'bachmana6@fishmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(60,52,1,'ashleyi21@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(61,52,1,'aivanov@lol.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(62,28,1,'wattsonb62@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(63,146,1,'wilsond@fishmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(64,107,1,'wattson.heidi@lol.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(65,27,1,'mcreynolds.elina36@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),(66,47,1,'chowskib@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(67,47,1,'chowski.brittney@notmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(68,167,1,'zope.clint37@mymail.net',1,0,0,0,NULL,NULL,NULL,NULL),(69,167,1,'cb.zope@mymail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(70,106,1,'parkerk31@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(71,136,1,'irvinroberts19@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),(72,116,1,'billyb@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(73,116,1,'billyb@testmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(74,90,1,'samuels.kandace64@lol.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(75,90,1,'kandacesamuels40@airmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(76,72,1,'robertsb@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),(77,72,1,'bryonr@fishmail.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(78,89,1,'mller.eleonor99@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(79,22,1,'craigt@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(80,22,1,'craigterry@mymail.org',0,0,0,0,NULL,NULL,NULL,NULL),(81,67,1,'ashleyp@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(82,67,1,'ashleyp34@example.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(83,125,1,'parkert@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(84,125,1,'tparker23@lol.biz',0,0,0,0,NULL,NULL,NULL,NULL),(85,162,1,'omard36@mymail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(86,13,1,'nielsen.magan37@mymail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(87,13,1,'mnielsen94@testmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(88,184,1,'jdeforest-nielsen62@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(89,196,1,'kq.jacobs-jameson@notmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(90,196,1,'kq.jacobs-jameson@testmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(91,24,1,'njacobs-jameson@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(92,93,1,'jgrant@notmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(93,93,1,'julianngrant@testing.org',0,0,0,0,NULL,NULL,NULL,NULL),(94,77,1,'grant.bernadette@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(95,77,1,'bgrant@sample.biz',0,0,0,0,NULL,NULL,NULL,NULL),(96,161,1,'grantn@fishmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(97,60,1,'ak.chowski@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(98,60,1,'andrewchowski96@lol.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(99,131,1,'bchowski80@example.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(100,74,1,'chowskib51@testing.com',1,0,0,0,NULL,NULL,NULL,NULL),(101,74,1,'chowski.a.beula@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(102,164,1,'juliannchowski@spamalot.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(103,147,1,'parker.a.troy@lol.info',1,0,0,0,NULL,NULL,NULL,NULL),(104,147,1,'parker.troy@testmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(105,173,1,'ashliecruz@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(106,173,1,'cruz.ashlie@fishmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(107,16,1,'parker-cruz.kiara34@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(108,29,1,'parker-cruzt@airmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(109,29,1,'parker-cruzt@spamalot.com',0,0,0,0,NULL,NULL,NULL,NULL),(110,50,1,'ivanove@fakemail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(111,50,1,'ivanov.elbert@fishmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(112,190,1,'ivanovp@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(113,113,1,'ko.ivanov5@testmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(114,113,1,'kaceyivanov@example.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(115,189,1,'brigettej96@fakemail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(116,174,1,'princessb@example.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(117,174,1,'barkley.princess@mymail.net',0,0,0,0,NULL,NULL,NULL,NULL),(118,82,1,'sonnylee-barkley@infomail.org',1,0,0,0,NULL,NULL,NULL,NULL),(119,82,1,'sonnyl@lol.net',0,0,0,0,NULL,NULL,NULL,NULL),(120,11,1,'olsen.brigette@fishmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(121,11,1,'olsen.brigette@airmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(122,108,1,'kolsen73@spamalot.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(123,108,1,'kathlyno@sample.org',0,0,0,0,NULL,NULL,NULL,NULL),(124,96,1,'wattsone@mymail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(125,36,1,'wattson.bryon@notmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(126,36,1,'wattson.bryon@lol.com',0,0,0,0,NULL,NULL,NULL,NULL),(127,48,1,'josefasamson40@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),(128,168,1,'ks.cruz@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(129,4,1,'cruz.esta@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(130,4,1,'cruz.esta22@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(131,83,1,'mller.allan@infomail.com',1,0,0,0,NULL,NULL,NULL,NULL),(132,42,1,'shaunam24@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(133,63,1,'mller.elizabeth@fakemail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(134,63,1,'mller.elizabeth@example.info',0,0,0,0,NULL,NULL,NULL,NULL),(135,2,1,'mller.v.norris82@testing.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(136,2,1,'norrismller@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(137,73,1,'brzczysaws@infomail.info',1,0,0,0,NULL,NULL,NULL,NULL),(138,165,1,'josefas83@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(139,139,1,'landonwilson@lol.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(140,192,1,'bwilson47@example.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(141,175,1,'wilsonr@fishmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(142,175,1,'rodrigow16@airmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),(143,58,1,'rebekahb26@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(144,53,1,'bachman.laree9@notmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(145,53,1,'bachman.k.laree5@testmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(146,172,1,'mller.andrew54@sample.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(147,120,1,'irismller-grant@spamalot.org',1,0,0,0,NULL,NULL,NULL,NULL),(148,120,1,'irismller-grant66@testmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(149,124,1,'teddymller-grant@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(150,44,1,'wilsone@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(151,44,1,'wilsone@fakemail.org',0,0,0,0,NULL,NULL,NULL,NULL),(152,112,1,'shaunawilson25@infomail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(153,112,1,'shaunawilson87@testing.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(154,31,1,'brzczysaws@sample.info',1,0,0,0,NULL,NULL,NULL,NULL),(155,35,1,'cw.smith-adams57@fishmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(156,35,1,'smith-adams.w.carlos@notmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(157,69,3,'sales@starkvillepoetrynetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),(158,18,2,'samson.megan28@starkvillepoetrynetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),(159,66,3,'service@minnesotaculturepartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(160,156,2,'jinacruz56@minnesotaculturepartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(161,84,3,'service@arizonatrust.org',1,0,0,0,NULL,NULL,NULL,NULL),(162,174,2,'princessb@arizonatrust.org',0,0,0,0,NULL,NULL,NULL,NULL),(163,121,3,'contact@hadleyempowermentcenter.org',1,0,0,0,NULL,NULL,NULL,NULL),(164,198,2,'samuels.v.rosario@hadleyempowermentcenter.org',0,0,0,0,NULL,NULL,NULL,NULL),(165,9,3,'info@virginiacenter.org',1,0,0,0,NULL,NULL,NULL,NULL),(166,58,2,'rebekahb@virginiacenter.org',0,0,0,0,NULL,NULL,NULL,NULL),(167,8,3,'feedback@northpointartsinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(168,42,2,'mllers98@northpointartsinitiative.org',0,0,0,0,NULL,NULL,NULL,NULL),(169,155,3,'sales@oklahomaenvironmental.org',1,0,0,0,NULL,NULL,NULL,NULL),(170,129,2,'cooper.kandace22@oklahomaenvironmental.org',0,0,0,0,NULL,NULL,NULL,NULL),(171,101,3,'contact@louisianahealthfellowship.org',1,0,0,0,NULL,NULL,NULL,NULL),(172,20,3,'info@mcintyreschool.org',1,0,0,0,NULL,NULL,NULL,NULL),(173,73,2,'samsonb61@mcintyreschool.org',0,0,0,0,NULL,NULL,NULL,NULL),(174,114,3,'sales@communityhealth.org',1,0,0,0,NULL,NULL,NULL,NULL),(175,60,2,'.9@communityhealth.org',0,0,0,0,NULL,NULL,NULL,NULL),(176,134,3,'info@sdenvironmentalpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(177,100,2,'bobw@sdenvironmentalpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(178,10,3,'feedback@ruralpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(179,125,2,'parkert@ruralpartnership.org',0,0,0,0,NULL,NULL,NULL,NULL),(180,55,3,'service@svadvocacyalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),(181,77,2,'grant.bernadette41@svadvocacyalliance.org',0,0,0,0,NULL,NULL,NULL,NULL),(182,149,3,'service@maineducation.org',1,0,0,0,NULL,NULL,NULL,NULL),(183,29,2,'parker-cruzt@maineducation.org',0,0,0,0,NULL,NULL,NULL,NULL),(184,128,3,'service@mlkingadvocacy.org',1,0,0,0,NULL,NULL,NULL,NULL),(185,170,2,'.49@mlkingadvocacy.org',0,0,0,0,NULL,NULL,NULL,NULL),(186,NULL,1,'development@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(187,NULL,1,'tournaments@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(188,NULL,1,'celebration@example.org',0,0,0,0,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_email` (`id`, `contact_id`, `location_type_id`, `email`, `is_primary`, `is_billing`, `on_hold`, `is_bulkmail`, `hold_date`, `reset_date`, `signature_text`, `signature_html`) VALUES (1,1,1,'fixme.domainemail@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(2,47,1,'parkerl94@mymail.org',1,0,0,0,NULL,NULL,NULL,NULL),(3,47,1,'parkerl@lol.com',0,0,0,0,NULL,NULL,NULL,NULL),(4,51,1,'am.bachman@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(5,118,1,'norrisw@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(6,118,1,'norrisw@lol.biz',0,0,0,0,NULL,NULL,NULL,NULL),(7,34,1,'kathlyng@infomail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(8,7,1,'barkleyt81@lol.biz',1,0,0,0,NULL,NULL,NULL,NULL),(9,7,1,'troybarkley@testing.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(10,44,1,'kmcreynolds68@airmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(11,139,1,'kk.grant@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),(12,99,1,'wilson.jackson37@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(13,126,1,'blackwelle82@fishmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(14,17,1,'terry.d.rosario@mymail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(15,17,1,'terry.rosario@fakemail.info',0,0,0,0,NULL,NULL,NULL,NULL),(16,12,1,'robertsont@fakemail.com',1,0,0,0,NULL,NULL,NULL,NULL),(17,12,1,'robertson.q.truman6@lol.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(18,88,1,'justinajacobs@spamalot.net',1,0,0,0,NULL,NULL,NULL,NULL),(19,9,1,'roberts.s.ivey@airmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(20,55,1,'mller.c.erik@fakemail.org',1,0,0,0,NULL,NULL,NULL,NULL),(21,55,1,'erikm20@infomail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(22,100,1,'ssamson@fakemail.info',1,0,0,0,NULL,NULL,NULL,NULL),(23,100,1,'samson.scott50@fishmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(24,65,1,'bcruz@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(25,65,1,'bcruz@fishmail.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(26,11,1,'deforest.norris@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),(27,192,1,'terrellj58@testmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(28,192,1,'terrell.jed@fakemail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(29,32,1,'bn.jones@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(30,32,1,'jonesb@spamalot.net',0,0,0,0,NULL,NULL,NULL,NULL),(31,168,1,'jacobs.ashley@infomail.info',1,0,0,0,NULL,NULL,NULL,NULL),(32,164,1,'gonzlez.junko@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),(33,92,1,'coopers@sample.org',1,0,0,0,NULL,NULL,NULL,NULL),(34,92,1,'scooper84@lol.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(35,94,1,'omarterrell@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(36,60,1,'ivanov.brigette@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(37,60,1,'ivanov.brigette@spamalot.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(38,133,1,'terrell.omar@example.info',1,0,0,0,NULL,NULL,NULL,NULL),(39,133,1,'omart38@testing.info',0,0,0,0,NULL,NULL,NULL,NULL),(40,42,1,'patel.kacey@infomail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(41,154,1,'russellsmith@testing.org',1,0,0,0,NULL,NULL,NULL,NULL),(42,197,1,'alexiai@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(43,197,1,'ivanova@spamalot.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(44,171,1,'samson.santina54@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(45,112,1,'elinawagner@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(46,108,1,'sanfordwagner@infomail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(47,108,1,'st.wagner@sample.net',0,0,0,0,NULL,NULL,NULL,NULL),(48,162,1,'bdimitrov46@mymail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(49,187,1,'valenep@infomail.info',1,0,0,0,NULL,NULL,NULL,NULL),(50,191,1,'smiths65@spamalot.com',1,0,0,0,NULL,NULL,NULL,NULL),(51,130,1,'grantl90@spamalot.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(52,59,1,'billywattson81@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(53,46,1,'juliannrobertson@testing.biz',1,0,0,0,NULL,NULL,NULL,NULL),(54,16,1,'terrell.h.ashlie@mymail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(55,199,1,'chowski.d.rebekah@testmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(56,199,1,'chowski.d.rebekah@fishmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(57,114,1,'dazt@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(58,114,1,'dazt@fishmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),(59,86,1,'kennyd67@infomail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(60,182,1,'kreynolds@lol.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(61,137,1,'samuels.megan@airmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(62,137,1,'msamuels@mymail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(63,189,1,'ivanov.scarlet@spamalot.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(64,189,1,'ivanovs@infomail.info',0,0,0,0,NULL,NULL,NULL,NULL),(65,35,1,'nicoler@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),(66,147,1,'nielsen.ashley33@notmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(67,28,1,'shadolsen@sample.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(68,28,1,'shado59@testing.co.pl',0,0,0,0,NULL,NULL,NULL,NULL),(69,176,1,'scottm@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),(70,185,1,'shadjacobs@notmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(71,185,1,'sz.jacobs@lol.org',0,0,0,0,NULL,NULL,NULL,NULL),(72,95,1,'yadav.j.roland36@airmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(73,40,1,'acooper86@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(74,75,1,'ivanova@infomail.com',1,0,0,0,NULL,NULL,NULL,NULL),(75,75,1,'ivanova@mymail.info',0,0,0,0,NULL,NULL,NULL,NULL),(76,131,1,'olsen.y.laree@testmail.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(77,26,1,'deforest.felisha@notmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(78,10,1,'deforest.b.lou57@fakemail.net',1,0,0,0,NULL,NULL,NULL,NULL),(79,45,1,'deforestl@mymail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(80,179,1,'deforest.jacob@notmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(81,179,1,'jacobd9@airmail.org',0,0,0,0,NULL,NULL,NULL,NULL),(82,66,1,'nlee71@fishmail.info',1,0,0,0,NULL,NULL,NULL,NULL),(83,66,1,'lee.norris@example.net',0,0,0,0,NULL,NULL,NULL,NULL),(84,138,1,'trumanb@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(85,57,1,'mlee20@sample.biz',1,0,0,0,NULL,NULL,NULL,NULL),(86,57,1,'lee.margaret@sample.org',0,0,0,0,NULL,NULL,NULL,NULL),(87,157,1,'lee.ivey49@mymail.info',1,0,0,0,NULL,NULL,NULL,NULL),(88,157,1,'iveylee66@notmail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(89,142,1,'shermanp37@sample.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(90,142,1,'patels@lol.biz',0,0,0,0,NULL,NULL,NULL,NULL),(91,196,1,'bobp35@testing.info',1,0,0,0,NULL,NULL,NULL,NULL),(92,196,1,'patel.k.bob@mymail.net',0,0,0,0,NULL,NULL,NULL,NULL),(93,159,1,'pateld@testmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(94,145,1,'af.patel@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(95,163,1,'lolsen@airmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(96,106,1,'josefao55@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(97,30,1,'olsen.megan@spamalot.biz',1,0,0,0,NULL,NULL,NULL,NULL),(98,113,1,'olsen.carlos@notmail.com',1,0,0,0,NULL,NULL,NULL,NULL),(99,67,1,'parker.teddy69@lol.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(100,67,1,'teddyparker@testmail.net',0,0,0,0,NULL,NULL,NULL,NULL),(101,29,1,'mller-parkere@sample.com',1,0,0,0,NULL,NULL,NULL,NULL),(102,19,1,'alexiap94@airmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(103,19,1,'at.parker96@lol.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(104,105,1,'parker.beula@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(105,20,1,'kgonzlez@fakemail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(106,25,1,'kgonzlez@fishmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(107,186,1,'gonzlezb@fishmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(108,186,1,'gonzlez.c.barry@sample.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(109,48,1,'terry.c.carlos@testing.biz',1,0,0,0,NULL,NULL,NULL,NULL),(110,48,1,'terryc@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(111,52,1,'samuels.bernadette15@infomail.com',1,0,0,0,NULL,NULL,NULL,NULL),(112,52,1,'bernadettesamuels@fakemail.org',0,0,0,0,NULL,NULL,NULL,NULL),(113,150,1,'grantw@infomail.com',1,0,0,0,NULL,NULL,NULL,NULL),(114,96,1,'grant-blackwellk@infomail.net',1,0,0,0,NULL,NULL,NULL,NULL),(115,135,1,'megang96@testing.biz',1,0,0,0,NULL,NULL,NULL,NULL),(116,135,1,'grant-blackwell.megan@spamalot.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(117,27,1,'jwagner96@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(118,6,1,'wattson.d.allan@testmail.net',1,0,0,0,NULL,NULL,NULL,NULL),(119,84,1,'jeromeprentice@spamalot.info',1,0,0,0,NULL,NULL,NULL,NULL),(120,200,1,'prentice.angelika@example.co.uk',1,0,0,0,NULL,NULL,NULL,NULL),(121,200,1,'angelikap@spamalot.com',0,0,0,0,NULL,NULL,NULL,NULL),(122,90,1,'bryonp@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(123,120,1,'mq.zope@sample.com',1,0,0,0,NULL,NULL,NULL,NULL),(124,3,1,'nielsenn@example.com',1,0,0,0,NULL,NULL,NULL,NULL),(125,2,1,'darenzope-nielsen@lol.net',1,0,0,0,NULL,NULL,NULL,NULL),(126,2,1,'zope-nielsen.j.daren@airmail.info',0,0,0,0,NULL,NULL,NULL,NULL),(127,128,1,'errolzope-nielsen50@airmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(128,146,1,'chowskib75@airmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(129,146,1,'brzczysaw7@fishmail.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(130,18,1,'terrell-chowski.ashlie@testing.com',1,0,0,0,NULL,NULL,NULL,NULL),(131,18,1,'aterrell-chowski10@infomail.net',0,0,0,0,NULL,NULL,NULL,NULL),(132,143,1,'chowskil@example.org',1,0,0,0,NULL,NULL,NULL,NULL),(133,143,1,'chowskil7@spamalot.co.uk',0,0,0,0,NULL,NULL,NULL,NULL),(134,195,1,'allen92@testmail.org',1,0,0,0,NULL,NULL,NULL,NULL),(135,72,1,'rolandoj57@airmail.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(136,148,1,'parkeri48@fishmail.biz',1,0,0,0,NULL,NULL,NULL,NULL),(137,188,1,'wilson.i.teresa3@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(138,188,1,'wilsont@airmail.biz',0,0,0,0,NULL,NULL,NULL,NULL),(139,71,1,'wilson.c.delana20@sample.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(140,71,1,'dc.wilson67@example.com',0,0,0,0,NULL,NULL,NULL,NULL),(141,107,1,'wilsonb24@testing.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(142,107,1,'wilsonb@infomail.org',0,0,0,0,NULL,NULL,NULL,NULL),(143,83,1,'rolandolsen@testmail.co.pl',1,0,0,0,NULL,NULL,NULL,NULL),(144,83,1,'olsen.roland@fakemail.co.in',0,0,0,0,NULL,NULL,NULL,NULL),(145,85,1,'beulaolsen@infomail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(146,85,1,'beulao@lol.net',0,0,0,0,NULL,NULL,NULL,NULL),(147,80,1,'rebekaho@lol.org',1,0,0,0,NULL,NULL,NULL,NULL),(148,169,1,'olsen.rodrigo45@example.co.in',1,0,0,0,NULL,NULL,NULL,NULL),(149,115,1,'kathlynd@example.biz',1,0,0,0,NULL,NULL,NULL,NULL),(150,115,1,'kathlyndeforest@lol.co.nz',0,0,0,0,NULL,NULL,NULL,NULL),(151,5,1,'deforest.troy@testmail.co.nz',1,0,0,0,NULL,NULL,NULL,NULL),(152,172,3,'contact@cadellhealth.org',1,0,0,0,NULL,NULL,NULL,NULL),(153,147,2,'ashleynielsen19@cadellhealth.org',0,0,0,0,NULL,NULL,NULL,NULL),(154,103,3,'info@dameronenvironmentalservices.org',1,0,0,0,NULL,NULL,NULL,NULL),(155,175,2,'wagner-wattson.shauna@dameronenvironmentalservices.org',1,0,0,0,NULL,NULL,NULL,NULL),(156,15,3,'contact@dowlenagricultureinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(157,4,2,'jjameson63@dowlenagricultureinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(158,149,3,'info@baypartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(159,39,3,'contact@jacksonsystems.org',1,0,0,0,NULL,NULL,NULL,NULL),(160,169,2,'rodrigoo@jacksonsystems.org',0,0,0,0,NULL,NULL,NULL,NULL),(161,21,3,'feedback@indianapartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(162,153,2,'blackwell.r.kathleen@indianapartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(163,167,3,'sales@kansasalliance.org',1,0,0,0,NULL,NULL,NULL,NULL),(164,12,2,'49@kansasalliance.org',0,0,0,0,NULL,NULL,NULL,NULL),(165,101,3,'info@communityinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(166,78,2,'sonnywilson38@communityinitiative.org',1,0,0,0,NULL,NULL,NULL,NULL),(167,102,3,'contact@fairbankslegalsystems.org',1,0,0,0,NULL,NULL,NULL,NULL),(168,24,2,'prenticer@fairbankslegalsystems.org',1,0,0,0,NULL,NULL,NULL,NULL),(169,23,3,'feedback@watervilleassociation.org',1,0,0,0,NULL,NULL,NULL,NULL),(170,52,2,'bernadettesamuels@watervilleassociation.org',0,0,0,0,NULL,NULL,NULL,NULL),(171,161,3,'info@beechfoodpartnership.org',1,0,0,0,NULL,NULL,NULL,NULL),(172,93,3,'sales@wdlegalsolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),(173,87,2,'olsenb@wdlegalsolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),(174,49,3,'feedback@ruraladvocacysolutions.org',1,0,0,0,NULL,NULL,NULL,NULL),(175,170,3,'sales@caulderfund.org',1,0,0,0,NULL,NULL,NULL,NULL),(176,91,2,'jonesm77@caulderfund.org',1,0,0,0,NULL,NULL,NULL,NULL),(177,129,3,'contact@maplenetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),(178,111,2,'errolmcreynolds77@maplenetwork.org',1,0,0,0,NULL,NULL,NULL,NULL),(179,165,3,'info@williamsburgsoftware.org',1,0,0,0,NULL,NULL,NULL,NULL),(180,3,2,'nielsen.nicole@williamsburgsoftware.org',0,0,0,0,NULL,NULL,NULL,NULL),(181,77,3,'feedback@paragonahservices.org',1,0,0,0,NULL,NULL,NULL,NULL),(182,85,2,'olsenb@paragonahservices.org',0,0,0,0,NULL,NULL,NULL,NULL),(183,NULL,1,'development@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(184,NULL,1,'tournaments@example.org',0,0,0,0,NULL,NULL,NULL,NULL),(185,NULL,1,'celebration@example.org',0,0,0,0,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_email` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -447,7 +447,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_entity_financial_trxn` WRITE;
 /*!40000 ALTER TABLE `civicrm_entity_financial_trxn` DISABLE KEYS */;
-INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`, `financial_trxn_id`, `amount`) VALUES (1,'civicrm_contribution',1,1,125.00),(2,'civicrm_financial_item',1,1,125.00),(3,'civicrm_contribution',2,2,50.00),(4,'civicrm_financial_item',2,2,50.00),(5,'civicrm_contribution',3,3,25.00),(6,'civicrm_financial_item',3,3,25.00),(7,'civicrm_contribution',4,4,50.00),(8,'civicrm_financial_item',4,4,50.00),(9,'civicrm_contribution',5,5,500.00),(10,'civicrm_financial_item',5,5,500.00),(11,'civicrm_contribution',6,6,175.00),(12,'civicrm_financial_item',6,6,175.00),(13,'civicrm_contribution',7,7,50.00),(14,'civicrm_financial_item',7,7,50.00),(15,'civicrm_contribution',8,8,10.00),(16,'civicrm_financial_item',8,8,10.00),(17,'civicrm_contribution',9,9,250.00),(18,'civicrm_financial_item',9,9,250.00),(19,'civicrm_contribution',10,10,500.00),(20,'civicrm_financial_item',10,10,500.00),(21,'civicrm_contribution',11,11,200.00),(22,'civicrm_financial_item',11,11,200.00),(23,'civicrm_contribution',12,12,200.00),(24,'civicrm_financial_item',12,12,200.00),(25,'civicrm_contribution',13,13,200.00),(26,'civicrm_financial_item',13,13,200.00),(27,'civicrm_contribution',14,14,100.00),(28,'civicrm_financial_item',14,14,100.00),(29,'civicrm_contribution',15,15,50.00),(30,'civicrm_financial_item',15,15,50.00),(31,'civicrm_contribution',16,16,100.00),(32,'civicrm_financial_item',16,16,100.00),(33,'civicrm_contribution',17,17,50.00),(34,'civicrm_financial_item',17,17,50.00),(35,'civicrm_contribution',18,18,50.00),(36,'civicrm_financial_item',18,18,50.00),(37,'civicrm_contribution',19,19,50.00),(38,'civicrm_financial_item',19,19,50.00),(39,'civicrm_contribution',20,20,100.00),(40,'civicrm_financial_item',20,20,100.00),(41,'civicrm_contribution',21,21,50.00),(42,'civicrm_financial_item',21,21,50.00),(43,'civicrm_contribution',22,22,100.00),(44,'civicrm_financial_item',22,22,100.00),(45,'civicrm_contribution',23,23,50.00),(46,'civicrm_financial_item',23,23,50.00),(47,'civicrm_contribution',24,24,1200.00),(48,'civicrm_financial_item',24,24,1200.00),(49,'civicrm_contribution',25,25,50.00),(50,'civicrm_financial_item',25,25,50.00),(51,'civicrm_contribution',26,26,100.00),(52,'civicrm_financial_item',26,26,100.00),(53,'civicrm_contribution',27,27,50.00),(54,'civicrm_financial_item',27,27,50.00),(55,'civicrm_contribution',28,28,50.00),(56,'civicrm_financial_item',28,28,50.00),(57,'civicrm_contribution',29,29,50.00),(58,'civicrm_financial_item',29,29,50.00),(59,'civicrm_contribution',30,30,100.00),(60,'civicrm_financial_item',30,30,100.00),(61,'civicrm_contribution',31,31,50.00),(62,'civicrm_financial_item',31,31,50.00),(63,'civicrm_contribution',32,32,100.00),(64,'civicrm_financial_item',32,32,100.00),(65,'civicrm_contribution',33,33,50.00),(66,'civicrm_financial_item',33,33,50.00),(67,'civicrm_contribution',34,34,100.00),(68,'civicrm_financial_item',34,34,100.00),(69,'civicrm_contribution',35,35,1200.00),(70,'civicrm_financial_item',35,35,1200.00),(71,'civicrm_contribution',36,36,100.00),(72,'civicrm_financial_item',36,36,100.00),(73,'civicrm_contribution',37,37,50.00),(74,'civicrm_financial_item',37,37,50.00),(75,'civicrm_contribution',38,38,100.00),(76,'civicrm_financial_item',38,38,100.00),(77,'civicrm_contribution',39,39,50.00),(78,'civicrm_financial_item',39,39,50.00),(79,'civicrm_contribution',40,40,100.00),(80,'civicrm_financial_item',40,40,100.00),(81,'civicrm_contribution',41,41,50.00),(82,'civicrm_financial_item',41,41,50.00),(83,'civicrm_contribution',42,42,100.00),(84,'civicrm_financial_item',42,42,100.00),(85,'civicrm_contribution',43,43,50.00),(86,'civicrm_financial_item',43,43,50.00),(87,'civicrm_contribution',83,44,50.00),(88,'civicrm_financial_item',44,44,50.00),(89,'civicrm_contribution',73,45,50.00),(90,'civicrm_financial_item',45,45,50.00),(91,'civicrm_contribution',75,46,800.00),(92,'civicrm_financial_item',46,46,800.00),(93,'civicrm_contribution',67,47,50.00),(94,'civicrm_financial_item',47,47,50.00),(95,'civicrm_contribution',69,48,800.00),(96,'civicrm_financial_item',48,48,800.00),(97,'civicrm_contribution',60,49,50.00),(98,'civicrm_financial_item',49,49,50.00),(99,'civicrm_contribution',78,50,50.00),(100,'civicrm_financial_item',50,50,50.00),(101,'civicrm_contribution',91,51,800.00),(102,'civicrm_financial_item',51,51,800.00),(103,'civicrm_contribution',76,52,50.00),(104,'civicrm_financial_item',52,52,50.00),(105,'civicrm_contribution',52,53,800.00),(106,'civicrm_financial_item',53,53,800.00),(107,'civicrm_contribution',57,54,50.00),(108,'civicrm_financial_item',54,54,50.00),(109,'civicrm_contribution',88,55,800.00),(110,'civicrm_financial_item',55,55,800.00),(111,'civicrm_contribution',54,56,50.00),(112,'civicrm_financial_item',56,56,50.00),(113,'civicrm_contribution',81,57,50.00),(114,'civicrm_financial_item',57,57,50.00),(115,'civicrm_contribution',68,58,50.00),(116,'civicrm_financial_item',58,58,50.00),(117,'civicrm_contribution',90,59,50.00),(118,'civicrm_financial_item',59,59,50.00),(119,'civicrm_contribution',77,60,50.00),(120,'civicrm_financial_item',60,60,50.00),(121,'civicrm_contribution',47,61,800.00),(122,'civicrm_financial_item',61,61,800.00),(123,'civicrm_contribution',74,62,50.00),(124,'civicrm_financial_item',62,62,50.00),(125,'civicrm_contribution',49,63,800.00),(126,'civicrm_financial_item',63,63,800.00),(127,'civicrm_contribution',72,64,50.00),(128,'civicrm_financial_item',64,64,50.00),(129,'civicrm_contribution',62,65,50.00),(130,'civicrm_financial_item',65,65,50.00),(131,'civicrm_contribution',79,66,50.00),(132,'civicrm_financial_item',66,66,50.00),(133,'civicrm_contribution',85,67,50.00),(134,'civicrm_financial_item',67,67,50.00),(135,'civicrm_contribution',89,68,50.00),(136,'civicrm_financial_item',68,68,50.00),(137,'civicrm_contribution',56,69,800.00),(138,'civicrm_financial_item',69,69,800.00),(139,'civicrm_contribution',50,70,800.00),(140,'civicrm_financial_item',70,70,800.00),(141,'civicrm_contribution',64,71,50.00),(142,'civicrm_financial_item',71,71,50.00),(143,'civicrm_contribution',94,72,50.00),(144,'civicrm_financial_item',72,72,50.00),(145,'civicrm_contribution',71,73,800.00),(146,'civicrm_financial_item',73,73,800.00),(147,'civicrm_contribution',86,74,800.00),(148,'civicrm_financial_item',74,74,800.00),(149,'civicrm_contribution',53,75,800.00),(150,'civicrm_financial_item',75,75,800.00),(151,'civicrm_contribution',92,76,50.00),(152,'civicrm_financial_item',76,76,50.00),(153,'civicrm_contribution',55,77,50.00),(154,'civicrm_financial_item',77,77,50.00),(155,'civicrm_contribution',46,78,800.00),(156,'civicrm_financial_item',78,78,800.00),(157,'civicrm_contribution',80,79,800.00),(158,'civicrm_financial_item',79,79,800.00),(159,'civicrm_contribution',93,80,50.00),(160,'civicrm_financial_item',80,80,50.00),(161,'civicrm_contribution',70,81,50.00),(162,'civicrm_financial_item',81,81,50.00),(163,'civicrm_contribution',87,82,800.00),(164,'civicrm_financial_item',82,82,800.00),(165,'civicrm_contribution',82,83,800.00),(166,'civicrm_financial_item',83,83,800.00),(167,'civicrm_contribution',59,84,50.00),(168,'civicrm_financial_item',84,84,50.00),(169,'civicrm_contribution',65,85,50.00),(170,'civicrm_financial_item',85,85,50.00),(171,'civicrm_contribution',61,86,50.00),(172,'civicrm_financial_item',86,86,50.00),(173,'civicrm_contribution',63,87,50.00),(174,'civicrm_financial_item',87,87,50.00),(175,'civicrm_contribution',84,88,50.00),(176,'civicrm_financial_item',88,88,50.00),(177,'civicrm_contribution',45,89,800.00),(178,'civicrm_financial_item',89,89,800.00),(179,'civicrm_contribution',58,90,800.00),(180,'civicrm_financial_item',90,90,800.00),(181,'civicrm_contribution',51,91,50.00),(182,'civicrm_financial_item',91,91,50.00),(183,'civicrm_contribution',66,92,50.00),(184,'civicrm_financial_item',92,92,50.00),(185,'civicrm_contribution',48,93,50.00),(186,'civicrm_financial_item',93,93,50.00);
+INSERT INTO `civicrm_entity_financial_trxn` (`id`, `entity_table`, `entity_id`, `financial_trxn_id`, `amount`) VALUES (1,'civicrm_contribution',1,1,125.00),(2,'civicrm_financial_item',1,1,125.00),(3,'civicrm_contribution',2,2,50.00),(4,'civicrm_financial_item',2,2,50.00),(5,'civicrm_contribution',3,3,25.00),(6,'civicrm_financial_item',3,3,25.00),(7,'civicrm_contribution',4,4,50.00),(8,'civicrm_financial_item',4,4,50.00),(9,'civicrm_contribution',5,5,500.00),(10,'civicrm_financial_item',5,5,500.00),(11,'civicrm_contribution',6,6,175.00),(12,'civicrm_financial_item',6,6,175.00),(13,'civicrm_contribution',7,7,50.00),(14,'civicrm_financial_item',7,7,50.00),(15,'civicrm_contribution',8,8,10.00),(16,'civicrm_financial_item',8,8,10.00),(17,'civicrm_contribution',9,9,250.00),(18,'civicrm_financial_item',9,9,250.00),(19,'civicrm_contribution',10,10,500.00),(20,'civicrm_financial_item',10,10,500.00),(21,'civicrm_contribution',11,11,200.00),(22,'civicrm_financial_item',11,11,200.00),(23,'civicrm_contribution',12,12,200.00),(24,'civicrm_financial_item',12,12,200.00),(25,'civicrm_contribution',13,13,200.00),(26,'civicrm_financial_item',13,13,200.00),(27,'civicrm_contribution',14,14,100.00),(28,'civicrm_financial_item',14,14,100.00),(29,'civicrm_contribution',15,15,100.00),(30,'civicrm_financial_item',15,15,100.00),(31,'civicrm_contribution',16,16,100.00),(32,'civicrm_financial_item',16,16,100.00),(33,'civicrm_contribution',17,17,100.00),(34,'civicrm_financial_item',17,17,100.00),(35,'civicrm_contribution',18,18,100.00),(36,'civicrm_financial_item',18,18,100.00),(37,'civicrm_contribution',19,19,100.00),(38,'civicrm_financial_item',19,19,100.00),(39,'civicrm_contribution',20,20,100.00),(40,'civicrm_financial_item',20,20,100.00),(41,'civicrm_contribution',21,21,100.00),(42,'civicrm_financial_item',21,21,100.00),(43,'civicrm_contribution',22,22,100.00),(44,'civicrm_financial_item',22,22,100.00),(45,'civicrm_contribution',23,23,100.00),(46,'civicrm_financial_item',23,23,100.00),(47,'civicrm_contribution',24,24,100.00),(48,'civicrm_financial_item',24,24,100.00),(49,'civicrm_contribution',25,25,100.00),(50,'civicrm_financial_item',25,25,100.00),(51,'civicrm_contribution',26,26,100.00),(52,'civicrm_financial_item',26,26,100.00),(53,'civicrm_contribution',27,27,100.00),(54,'civicrm_financial_item',27,27,100.00),(55,'civicrm_contribution',28,28,100.00),(56,'civicrm_financial_item',28,28,100.00),(57,'civicrm_contribution',29,29,50.00),(58,'civicrm_financial_item',29,29,50.00),(59,'civicrm_contribution',30,30,50.00),(60,'civicrm_financial_item',30,30,50.00),(61,'civicrm_contribution',31,31,50.00),(62,'civicrm_financial_item',31,31,50.00),(63,'civicrm_contribution',32,32,50.00),(64,'civicrm_financial_item',32,32,50.00),(65,'civicrm_contribution',33,33,50.00),(66,'civicrm_financial_item',33,33,50.00),(67,'civicrm_contribution',34,34,50.00),(68,'civicrm_financial_item',34,34,50.00),(69,'civicrm_contribution',35,35,50.00),(70,'civicrm_financial_item',35,35,50.00),(71,'civicrm_contribution',36,36,50.00),(72,'civicrm_financial_item',36,36,50.00),(73,'civicrm_contribution',37,37,50.00),(74,'civicrm_financial_item',37,37,50.00),(75,'civicrm_contribution',38,38,50.00),(76,'civicrm_financial_item',38,38,50.00),(77,'civicrm_contribution',39,39,50.00),(78,'civicrm_financial_item',39,39,50.00),(79,'civicrm_contribution',40,40,50.00),(80,'civicrm_financial_item',40,40,50.00),(81,'civicrm_contribution',41,41,50.00),(82,'civicrm_financial_item',41,41,50.00),(83,'civicrm_contribution',42,42,1200.00),(84,'civicrm_financial_item',42,42,1200.00),(85,'civicrm_contribution',43,43,1200.00),(86,'civicrm_financial_item',43,43,1200.00),(87,'civicrm_contribution',51,44,50.00),(88,'civicrm_financial_item',44,44,50.00),(89,'civicrm_contribution',73,45,50.00),(90,'civicrm_financial_item',45,45,50.00),(91,'civicrm_contribution',49,46,50.00),(92,'civicrm_financial_item',46,46,50.00),(93,'civicrm_contribution',66,47,50.00),(94,'civicrm_financial_item',47,47,50.00),(95,'civicrm_contribution',77,48,50.00),(96,'civicrm_financial_item',48,48,50.00),(97,'civicrm_contribution',64,49,50.00),(98,'civicrm_financial_item',49,49,50.00),(99,'civicrm_contribution',71,50,50.00),(100,'civicrm_financial_item',50,50,50.00),(101,'civicrm_contribution',78,51,50.00),(102,'civicrm_financial_item',51,51,50.00),(103,'civicrm_contribution',89,52,50.00),(104,'civicrm_financial_item',52,52,50.00),(105,'civicrm_contribution',56,53,50.00),(106,'civicrm_financial_item',53,53,50.00),(107,'civicrm_contribution',79,54,50.00),(108,'civicrm_financial_item',54,54,50.00),(109,'civicrm_contribution',61,55,50.00),(110,'civicrm_financial_item',55,55,50.00),(111,'civicrm_contribution',82,56,50.00),(112,'civicrm_financial_item',56,56,50.00),(113,'civicrm_contribution',81,57,50.00),(114,'civicrm_financial_item',57,57,50.00),(115,'civicrm_contribution',58,58,50.00),(116,'civicrm_financial_item',58,58,50.00),(117,'civicrm_contribution',46,59,50.00),(118,'civicrm_financial_item',59,59,50.00),(119,'civicrm_contribution',67,60,800.00),(120,'civicrm_financial_item',60,60,800.00),(121,'civicrm_contribution',86,61,800.00),(122,'civicrm_financial_item',61,61,800.00),(123,'civicrm_contribution',48,62,800.00),(124,'civicrm_financial_item',62,62,800.00),(125,'civicrm_contribution',93,63,800.00),(126,'civicrm_financial_item',63,63,800.00),(127,'civicrm_contribution',65,64,800.00),(128,'civicrm_financial_item',64,64,800.00),(129,'civicrm_contribution',53,65,800.00),(130,'civicrm_financial_item',65,65,800.00),(131,'civicrm_contribution',59,66,800.00),(132,'civicrm_financial_item',66,66,800.00),(133,'civicrm_contribution',75,67,800.00),(134,'civicrm_financial_item',67,67,800.00),(135,'civicrm_contribution',62,68,800.00),(136,'civicrm_financial_item',68,68,800.00),(137,'civicrm_contribution',85,69,800.00),(138,'civicrm_financial_item',69,69,800.00),(139,'civicrm_contribution',69,70,800.00),(140,'civicrm_financial_item',70,70,800.00),(141,'civicrm_contribution',70,71,800.00),(142,'civicrm_financial_item',71,71,800.00),(143,'civicrm_contribution',87,72,800.00),(144,'civicrm_financial_item',72,72,800.00),(145,'civicrm_contribution',92,73,800.00),(146,'civicrm_financial_item',73,73,800.00),(147,'civicrm_contribution',90,74,800.00),(148,'civicrm_financial_item',74,74,800.00),(149,'civicrm_contribution',84,75,800.00),(150,'civicrm_financial_item',75,75,800.00),(151,'civicrm_contribution',47,76,800.00),(152,'civicrm_financial_item',76,76,800.00),(153,'civicrm_contribution',76,77,800.00),(154,'civicrm_financial_item',77,77,800.00),(155,'civicrm_contribution',54,78,50.00),(156,'civicrm_financial_item',78,78,50.00),(157,'civicrm_contribution',50,79,50.00),(158,'civicrm_financial_item',79,79,50.00),(159,'civicrm_contribution',72,80,50.00),(160,'civicrm_financial_item',80,80,50.00),(161,'civicrm_contribution',91,81,50.00),(162,'civicrm_financial_item',81,81,50.00),(163,'civicrm_contribution',55,82,50.00),(164,'civicrm_financial_item',82,82,50.00),(165,'civicrm_contribution',83,83,50.00),(166,'civicrm_financial_item',83,83,50.00),(167,'civicrm_contribution',68,84,50.00),(168,'civicrm_financial_item',84,84,50.00),(169,'civicrm_contribution',52,85,50.00),(170,'civicrm_financial_item',85,85,50.00),(171,'civicrm_contribution',60,86,50.00),(172,'civicrm_financial_item',86,86,50.00),(173,'civicrm_contribution',80,87,50.00),(174,'civicrm_financial_item',87,87,50.00),(175,'civicrm_contribution',57,88,50.00),(176,'civicrm_financial_item',88,88,50.00),(177,'civicrm_contribution',63,89,50.00),(178,'civicrm_financial_item',89,89,50.00),(179,'civicrm_contribution',94,90,50.00),(180,'civicrm_financial_item',90,90,50.00),(181,'civicrm_contribution',45,91,50.00),(182,'civicrm_financial_item',91,91,50.00),(183,'civicrm_contribution',74,92,50.00),(184,'civicrm_financial_item',92,92,50.00),(185,'civicrm_contribution',88,93,50.00),(186,'civicrm_financial_item',93,93,50.00);
 /*!40000 ALTER TABLE `civicrm_entity_financial_trxn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -457,7 +457,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_entity_tag` WRITE;
 /*!40000 ALTER TABLE `civicrm_entity_tag` DISABLE KEYS */;
-INSERT INTO `civicrm_entity_tag` (`id`, `entity_table`, `entity_id`, `tag_id`) VALUES (83,'civicrm_contact',5,5),(87,'civicrm_contact',11,4),(77,'civicrm_contact',16,4),(102,'civicrm_contact',18,4),(103,'civicrm_contact',18,5),(42,'civicrm_contact',19,5),(6,'civicrm_contact',20,3),(63,'civicrm_contact',22,4),(12,'civicrm_contact',25,4),(54,'civicrm_contact',28,4),(15,'civicrm_contact',30,4),(16,'civicrm_contact',30,5),(113,'civicrm_contact',31,5),(114,'civicrm_contact',35,5),(1,'civicrm_contact',37,1),(27,'civicrm_contact',39,4),(28,'civicrm_contact',39,5),(59,'civicrm_contact',41,5),(111,'civicrm_contact',44,5),(56,'civicrm_contact',47,4),(78,'civicrm_contact',50,5),(72,'civicrm_contact',60,4),(73,'civicrm_contact',60,5),(68,'civicrm_contact',61,5),(7,'civicrm_contact',62,1),(99,'civicrm_contact',63,4),(100,'civicrm_contact',63,5),(2,'civicrm_contact',66,1),(64,'civicrm_contact',67,5),(107,'civicrm_contact',68,4),(101,'civicrm_contact',73,5),(74,'civicrm_contact',74,5),(4,'civicrm_contact',76,3),(71,'civicrm_contact',77,4),(84,'civicrm_contact',79,5),(97,'civicrm_contact',80,5),(51,'civicrm_contact',81,4),(52,'civicrm_contact',81,5),(98,'civicrm_contact',83,5),(18,'civicrm_contact',85,4),(85,'civicrm_contact',87,4),(86,'civicrm_contact',87,5),(37,'civicrm_contact',88,5),(62,'civicrm_contact',89,4),(60,'civicrm_contact',90,4),(61,'civicrm_contact',90,5),(31,'civicrm_contact',91,5),(32,'civicrm_contact',92,5),(11,'civicrm_contact',94,5),(112,'civicrm_contact',95,4),(89,'civicrm_contact',96,4),(90,'civicrm_contact',96,5),(106,'civicrm_contact',97,4),(9,'civicrm_contact',98,3),(13,'civicrm_contact',99,4),(14,'civicrm_contact',99,5),(88,'civicrm_contact',100,5),(17,'civicrm_contact',103,5),(33,'civicrm_contact',104,4),(55,'civicrm_contact',107,4),(53,'civicrm_contact',109,4),(79,'civicrm_contact',113,4),(109,'civicrm_contact',120,4),(110,'civicrm_contact',120,5),(3,'civicrm_contact',121,1),(21,'civicrm_contact',122,5),(38,'civicrm_contact',127,5),(46,'civicrm_contact',132,4),(47,'civicrm_contact',132,5),(8,'civicrm_contact',134,2),(93,'civicrm_contact',135,4),(94,'civicrm_contact',135,5),(91,'civicrm_contact',138,4),(92,'civicrm_contact',138,5),(104,'civicrm_contact',139,4),(25,'civicrm_contact',141,4),(26,'civicrm_contact',141,5),(24,'civicrm_contact',142,4),(48,'civicrm_contact',144,4),(49,'civicrm_contact',144,5),(75,'civicrm_contact',147,4),(76,'civicrm_contact',147,5),(10,'civicrm_contact',149,1),(20,'civicrm_contact',152,4),(5,'civicrm_contact',155,1),(40,'civicrm_contact',156,4),(41,'civicrm_contact',156,5),(50,'civicrm_contact',157,5),(65,'civicrm_contact',162,4),(66,'civicrm_contact',162,5),(57,'civicrm_contact',167,4),(95,'civicrm_contact',168,4),(96,'civicrm_contact',168,5),(29,'civicrm_contact',170,4),(108,'civicrm_contact',172,4),(105,'civicrm_contact',175,5),(39,'civicrm_contact',176,5),(36,'civicrm_contact',179,4),(43,'civicrm_contact',180,4),(44,'civicrm_contact',180,5),(80,'civicrm_contact',181,5),(81,'civicrm_contact',183,4),(82,'civicrm_contact',183,5),(67,'civicrm_contact',184,5),(19,'civicrm_contact',185,4),(70,'civicrm_contact',188,4),(45,'civicrm_contact',193,5),(69,'civicrm_contact',196,5),(34,'civicrm_contact',198,4),(35,'civicrm_contact',198,5),(58,'civicrm_contact',199,4),(30,'civicrm_contact',200,5),(22,'civicrm_contact',201,4),(23,'civicrm_contact',201,5);
+INSERT INTO `civicrm_entity_tag` (`id`, `entity_table`, `entity_id`, `tag_id`) VALUES (102,'civicrm_contact',2,4),(105,'civicrm_contact',4,4),(117,'civicrm_contact',5,4),(22,'civicrm_contact',9,4),(23,'civicrm_contact',9,5),(67,'civicrm_contact',10,5),(29,'civicrm_contact',11,4),(2,'civicrm_contact',15,2),(18,'civicrm_contact',17,5),(82,'civicrm_contact',19,4),(4,'civicrm_contact',21,2),(6,'civicrm_contact',23,1),(98,'civicrm_contact',24,4),(99,'civicrm_contact',24,5),(85,'civicrm_contact',25,5),(93,'civicrm_contact',27,4),(94,'civicrm_contact',27,5),(59,'civicrm_contact',28,5),(79,'civicrm_contact',30,4),(80,'civicrm_contact',30,5),(31,'civicrm_contact',32,5),(14,'civicrm_contact',34,4),(28,'civicrm_contact',38,4),(3,'civicrm_contact',39,1),(62,'civicrm_contact',40,5),(37,'civicrm_contact',42,4),(38,'civicrm_contact',42,5),(64,'civicrm_contact',43,4),(15,'civicrm_contact',44,4),(68,'civicrm_contact',45,4),(69,'civicrm_contact',45,5),(86,'civicrm_contact',48,4),(87,'civicrm_contact',48,5),(12,'civicrm_contact',51,4),(13,'civicrm_contact',51,5),(108,'civicrm_contact',54,4),(109,'civicrm_contact',54,5),(73,'civicrm_contact',57,4),(74,'civicrm_contact',57,5),(49,'civicrm_contact',59,4),(35,'civicrm_contact',60,4),(36,'civicrm_contact',60,5),(52,'civicrm_contact',61,4),(83,'civicrm_contact',63,4),(84,'civicrm_contact',63,5),(19,'civicrm_contact',64,4),(71,'civicrm_contact',66,4),(72,'civicrm_contact',66,5),(81,'civicrm_contact',67,5),(111,'civicrm_contact',69,4),(112,'civicrm_contact',69,5),(113,'civicrm_contact',71,5),(106,'civicrm_contact',72,4),(107,'civicrm_contact',72,5),(63,'civicrm_contact',76,5),(10,'civicrm_contact',77,2),(11,'civicrm_contact',79,4),(115,'civicrm_contact',80,5),(114,'civicrm_contact',83,5),(96,'civicrm_contact',84,4),(97,'civicrm_contact',84,5),(53,'civicrm_contact',86,5),(20,'civicrm_contact',87,4),(21,'civicrm_contact',87,5),(33,'civicrm_contact',92,5),(7,'civicrm_contact',93,3),(91,'civicrm_contact',96,4),(92,'civicrm_contact',96,5),(65,'civicrm_contact',97,4),(16,'civicrm_contact',99,4),(17,'civicrm_contact',99,5),(27,'civicrm_contact',100,4),(5,'civicrm_contact',101,2),(26,'civicrm_contact',104,5),(42,'civicrm_contact',112,4),(116,'civicrm_contact',116,5),(57,'civicrm_contact',117,4),(58,'civicrm_contact',117,5),(34,'civicrm_contact',119,4),(100,'civicrm_contact',120,4),(101,'civicrm_contact',120,5),(61,'civicrm_contact',121,4),(66,'civicrm_contact',124,5),(39,'civicrm_contact',125,4),(9,'civicrm_contact',129,2),(48,'civicrm_contact',130,5),(24,'civicrm_contact',132,4),(25,'civicrm_contact',132,5),(88,'civicrm_contact',136,4),(75,'civicrm_contact',142,4),(104,'civicrm_contact',143,4),(103,'civicrm_contact',146,5),(110,'civicrm_contact',148,5),(89,'civicrm_contact',150,4),(90,'civicrm_contact',150,5),(54,'civicrm_contact',151,5),(76,'civicrm_contact',159,4),(77,'civicrm_contact',159,5),(44,'civicrm_contact',162,4),(45,'civicrm_contact',162,5),(78,'civicrm_contact',163,4),(32,'civicrm_contact',164,4),(8,'civicrm_contact',170,2),(40,'civicrm_contact',171,4),(41,'civicrm_contact',171,5),(1,'civicrm_contact',172,3),(95,'civicrm_contact',175,4),(70,'civicrm_contact',178,4),(30,'civicrm_contact',181,5),(60,'civicrm_contact',185,4),(46,'civicrm_contact',187,5),(55,'civicrm_contact',189,4),(56,'civicrm_contact',189,5),(47,'civicrm_contact',191,4),(50,'civicrm_contact',193,5),(43,'civicrm_contact',194,4),(51,'civicrm_contact',199,4);
 /*!40000 ALTER TABLE `civicrm_entity_tag` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -495,7 +495,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_extension` WRITE;
 /*!40000 ALTER TABLE `civicrm_extension` DISABLE KEYS */;
-INSERT INTO `civicrm_extension` (`id`, `type`, `full_name`, `name`, `label`, `file`, `schema_version`, `is_active`) VALUES (1,'module','sequentialcreditnotes','Sequential credit notes','Sequential credit notes','sequentialcreditnotes',NULL,1),(2,'module','eventcart','Event cart','Event cart','eventcart',NULL,1),(3,'module','financialacls','Financial ACLs','Financial ACLs','financialacls',NULL,1);
+INSERT INTO `civicrm_extension` (`id`, `type`, `full_name`, `name`, `label`, `file`, `schema_version`, `is_active`) VALUES (1,'module','sequentialcreditnotes','Sequential credit notes','Sequential credit notes','sequentialcreditnotes',NULL,1),(2,'module','greenwich','Theme: Greenwich','Theme: Greenwich','greenwich',NULL,1),(3,'module','eventcart','Event cart','Event cart','eventcart',NULL,1),(4,'module','financialacls','Financial ACLs','Financial ACLs','financialacls',NULL,1);
 /*!40000 ALTER TABLE `civicrm_extension` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -524,7 +524,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_financial_item` WRITE;
 /*!40000 ALTER TABLE `civicrm_financial_item` DISABLE KEYS */;
-INSERT INTO `civicrm_financial_item` (`id`, `created_date`, `transaction_date`, `contact_id`, `description`, `amount`, `currency`, `financial_account_id`, `status_id`, `entity_table`, `entity_id`) VALUES (1,'2020-09-16 01:29:33','2010-04-11 00:00:00',2,'Contribution Amount',125.00,'USD',1,1,'civicrm_line_item',1),(2,'2020-09-16 01:29:33','2010-03-21 00:00:00',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',2),(3,'2020-09-16 01:29:33','2010-04-29 00:00:00',6,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',3),(4,'2020-09-16 01:29:33','2010-04-11 00:00:00',8,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',4),(5,'2020-09-16 01:29:33','2010-04-15 00:00:00',16,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',5),(6,'2020-09-16 01:29:33','2010-04-11 00:00:00',19,'Contribution Amount',175.00,'USD',1,1,'civicrm_line_item',6),(7,'2020-09-16 01:29:33','2010-03-27 00:00:00',82,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',7),(8,'2020-09-16 01:29:33','2010-03-08 00:00:00',92,'Contribution Amount',10.00,'USD',1,1,'civicrm_line_item',8),(9,'2020-09-16 01:29:33','2010-04-22 00:00:00',34,'Contribution Amount',250.00,'USD',1,1,'civicrm_line_item',9),(10,'2020-09-16 01:29:33','2009-07-01 11:53:50',71,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',10),(11,'2020-09-16 01:29:33','2009-07-01 12:55:41',43,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',11),(12,'2020-09-16 01:29:33','2009-10-01 11:53:50',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',12),(13,'2020-09-16 01:29:33','2009-12-01 12:55:41',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',13),(14,'2020-09-16 01:29:33','2020-09-16 13:29:32',73,'General',100.00,'USD',2,1,'civicrm_line_item',16),(15,'2020-09-16 01:29:33','2020-09-16 13:29:32',92,'Student',50.00,'USD',2,1,'civicrm_line_item',28),(16,'2020-09-16 01:29:33','2020-09-16 13:29:32',48,'General',100.00,'USD',2,1,'civicrm_line_item',17),(17,'2020-09-16 01:29:33','2020-09-16 13:29:32',51,'Student',50.00,'USD',2,1,'civicrm_line_item',29),(18,'2020-09-16 01:29:33','2020-09-16 13:29:32',163,'Student',50.00,'USD',2,1,'civicrm_line_item',30),(19,'2020-09-16 01:29:33','2020-09-16 13:29:32',40,'Student',50.00,'USD',2,1,'civicrm_line_item',31),(20,'2020-09-16 01:29:33','2020-09-16 13:29:32',190,'General',100.00,'USD',2,1,'civicrm_line_item',18),(21,'2020-09-16 01:29:33','2020-09-16 13:29:32',33,'Student',50.00,'USD',2,1,'civicrm_line_item',32),(22,'2020-09-16 01:29:33','2020-09-16 13:29:32',175,'General',100.00,'USD',2,1,'civicrm_line_item',19),(23,'2020-09-16 01:29:33','2020-09-16 13:29:32',103,'Student',50.00,'USD',2,1,'civicrm_line_item',33),(24,'2020-09-16 01:29:33','2020-09-16 13:29:32',194,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',44),(25,'2020-09-16 01:29:33','2020-09-16 13:29:32',56,'Student',50.00,'USD',2,1,'civicrm_line_item',34),(26,'2020-09-16 01:29:33','2020-09-16 13:29:32',120,'General',100.00,'USD',2,1,'civicrm_line_item',20),(27,'2020-09-16 01:29:33','2020-09-16 13:29:32',105,'Student',50.00,'USD',2,1,'civicrm_line_item',35),(28,'2020-09-16 01:29:33','2020-09-16 13:29:32',184,'Student',50.00,'USD',2,1,'civicrm_line_item',36),(29,'2020-09-16 01:29:33','2020-09-16 13:29:32',177,'Student',50.00,'USD',2,1,'civicrm_line_item',37),(30,'2020-09-16 01:29:33','2020-09-16 13:29:32',153,'General',100.00,'USD',2,1,'civicrm_line_item',21),(31,'2020-09-16 01:29:33','2020-09-16 13:29:32',106,'Student',50.00,'USD',2,1,'civicrm_line_item',38),(32,'2020-09-16 01:29:33','2020-09-16 13:29:32',13,'General',100.00,'USD',2,1,'civicrm_line_item',22),(33,'2020-09-16 01:29:33','2020-09-16 13:29:32',64,'Student',50.00,'USD',2,1,'civicrm_line_item',39),(34,'2020-09-16 01:29:33','2020-09-16 13:29:32',200,'General',100.00,'USD',2,1,'civicrm_line_item',23),(35,'2020-09-16 01:29:33','2020-09-16 13:29:32',142,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',45),(36,'2020-09-16 01:29:33','2020-09-16 13:29:32',111,'General',100.00,'USD',2,1,'civicrm_line_item',24),(37,'2020-09-16 01:29:33','2020-09-16 13:29:32',132,'Student',50.00,'USD',2,1,'civicrm_line_item',40),(38,'2020-09-16 01:29:33','2020-09-16 13:29:32',141,'General',100.00,'USD',2,1,'civicrm_line_item',25),(39,'2020-09-16 01:29:33','2020-09-16 13:29:32',3,'Student',50.00,'USD',2,1,'civicrm_line_item',41),(40,'2020-09-16 01:29:33','2020-09-16 13:29:32',86,'General',100.00,'USD',2,1,'civicrm_line_item',26),(41,'2020-09-16 01:29:33','2020-09-16 13:29:32',168,'Student',50.00,'USD',2,1,'civicrm_line_item',42),(42,'2020-09-16 01:29:33','2020-09-16 13:29:32',16,'General',100.00,'USD',2,1,'civicrm_line_item',27),(43,'2020-09-16 01:29:33','2020-09-16 13:29:32',68,'Student',50.00,'USD',2,1,'civicrm_line_item',43),(44,'2020-09-16 01:29:33','2020-09-16 13:29:32',157,'Single',50.00,'USD',4,1,'civicrm_line_item',65),(45,'2020-09-16 01:29:33','2020-09-16 13:29:32',115,'Soprano',50.00,'USD',2,1,'civicrm_line_item',82),(46,'2020-09-16 01:29:33','2020-09-16 13:29:32',129,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',49),(47,'2020-09-16 01:29:33','2020-09-16 13:29:32',94,'Single',50.00,'USD',4,1,'civicrm_line_item',69),(48,'2020-09-16 01:29:33','2020-09-16 13:29:32',101,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',53),(49,'2020-09-16 01:29:33','2020-09-16 13:29:32',77,'Single',50.00,'USD',4,1,'civicrm_line_item',73),(50,'2020-09-16 01:29:33','2020-09-16 13:29:32',140,'Soprano',50.00,'USD',2,1,'civicrm_line_item',90),(51,'2020-09-16 01:29:33','2020-09-16 13:29:32',188,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',58),(52,'2020-09-16 01:29:33','2020-09-16 13:29:32',135,'Single',50.00,'USD',4,1,'civicrm_line_item',77),(53,'2020-09-16 01:29:33','2020-09-16 13:29:32',46,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',62),(54,'2020-09-16 01:29:33','2020-09-16 13:29:32',60,'Soprano',50.00,'USD',2,1,'civicrm_line_item',81),(55,'2020-09-16 01:29:33','2020-09-16 13:29:32',172,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',48),(56,'2020-09-16 01:29:33','2020-09-16 13:29:32',50,'Single',50.00,'USD',4,1,'civicrm_line_item',68),(57,'2020-09-16 01:29:33','2020-09-16 13:29:32',153,'Soprano',50.00,'USD',2,1,'civicrm_line_item',85),(58,'2020-09-16 01:29:33','2020-09-16 13:29:32',95,'Soprano',50.00,'USD',2,1,'civicrm_line_item',86),(59,'2020-09-16 01:29:33','2020-09-16 13:29:32',187,'Single',50.00,'USD',4,1,'civicrm_line_item',71),(60,'2020-09-16 01:29:33','2020-09-16 13:29:32',137,'Single',50.00,'USD',4,1,'civicrm_line_item',72),(61,'2020-09-16 01:29:33','2020-09-16 13:29:32',11,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',55),(62,'2020-09-16 01:29:33','2020-09-16 13:29:32',128,'Soprano',50.00,'USD',2,1,'civicrm_line_item',89),(63,'2020-09-16 01:29:33','2020-09-16 13:29:32',21,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',57),(64,'2020-09-16 01:29:33','2020-09-16 13:29:32',114,'Single',50.00,'USD',4,1,'civicrm_line_item',76),(65,'2020-09-16 01:29:33','2020-09-16 13:29:32',79,'Soprano',50.00,'USD',2,1,'civicrm_line_item',93),(66,'2020-09-16 01:29:33','2020-09-16 13:29:32',146,'Soprano',50.00,'USD',2,1,'civicrm_line_item',94),(67,'2020-09-16 01:29:33','2020-09-16 13:29:32',161,'Single',50.00,'USD',4,1,'civicrm_line_item',79),(68,'2020-09-16 01:29:33','2020-09-16 13:29:32',181,'Single',50.00,'USD',4,1,'civicrm_line_item',80),(69,'2020-09-16 01:29:33','2020-09-16 13:29:32',53,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',64),(70,'2020-09-16 01:29:33','2020-09-16 13:29:32',26,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',47),(71,'2020-09-16 01:29:33','2020-09-16 13:29:32',82,'Single',50.00,'USD',4,1,'civicrm_line_item',67),(72,'2020-09-16 01:29:33','2020-09-16 13:29:32',196,'Soprano',50.00,'USD',2,1,'civicrm_line_item',84),(73,'2020-09-16 01:29:33','2020-09-16 13:29:32',111,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',52),(74,'2020-09-16 01:29:33','2020-09-16 13:29:32',167,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',54),(75,'2020-09-16 01:29:33','2020-09-16 13:29:32',48,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',56),(76,'2020-09-16 01:29:33','2020-09-16 13:29:32',191,'Single',50.00,'USD',4,1,'civicrm_line_item',75),(77,'2020-09-16 01:29:33','2020-09-16 13:29:32',52,'Soprano',50.00,'USD',2,1,'civicrm_line_item',92),(78,'2020-09-16 01:29:33','2020-09-16 13:29:32',8,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',61),(79,'2020-09-16 01:29:33','2020-09-16 13:29:32',147,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',63),(80,'2020-09-16 01:29:33','2020-09-16 13:29:32',193,'Single',50.00,'USD',4,1,'civicrm_line_item',66),(81,'2020-09-16 01:29:33','2020-09-16 13:29:32',103,'Soprano',50.00,'USD',2,1,'civicrm_line_item',83),(82,'2020-09-16 01:29:33','2020-09-16 13:29:32',169,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',50),(83,'2020-09-16 01:29:33','2020-09-16 13:29:32',155,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',51),(84,'2020-09-16 01:29:33','2020-09-16 13:29:32',76,'Single',50.00,'USD',4,1,'civicrm_line_item',70),(85,'2020-09-16 01:29:33','2020-09-16 13:29:32',84,'Soprano',50.00,'USD',2,1,'civicrm_line_item',87),(86,'2020-09-16 01:29:33','2020-09-16 13:29:32',78,'Soprano',50.00,'USD',2,1,'civicrm_line_item',88),(87,'2020-09-16 01:29:33','2020-09-16 13:29:32',80,'Single',50.00,'USD',4,1,'civicrm_line_item',74),(88,'2020-09-16 01:29:33','2020-09-16 13:29:32',160,'Soprano',50.00,'USD',2,1,'civicrm_line_item',91),(89,'2020-09-16 01:29:33','2020-09-16 13:29:32',7,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',59),(90,'2020-09-16 01:29:33','2020-09-16 13:29:32',67,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',60),(91,'2020-09-16 01:29:33','2020-09-16 13:29:32',27,'Single',50.00,'USD',4,1,'civicrm_line_item',78),(92,'2020-09-16 01:29:33','2020-09-16 13:29:32',85,'Soprano',50.00,'USD',2,1,'civicrm_line_item',95),(93,'2020-09-16 01:29:33','2020-09-16 13:29:32',13,'Soprano',50.00,'USD',2,1,'civicrm_line_item',96);
+INSERT INTO `civicrm_financial_item` (`id`, `created_date`, `transaction_date`, `contact_id`, `description`, `amount`, `currency`, `financial_account_id`, `status_id`, `entity_table`, `entity_id`) VALUES (1,'2020-09-17 02:54:44','2010-04-11 00:00:00',2,'Contribution Amount',125.00,'USD',1,1,'civicrm_line_item',1),(2,'2020-09-17 02:54:44','2010-03-21 00:00:00',4,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',2),(3,'2020-09-17 02:54:44','2010-04-29 00:00:00',6,'Contribution Amount',25.00,'USD',1,1,'civicrm_line_item',3),(4,'2020-09-17 02:54:44','2010-04-11 00:00:00',8,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',4),(5,'2020-09-17 02:54:44','2010-04-15 00:00:00',16,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',5),(6,'2020-09-17 02:54:44','2010-04-11 00:00:00',19,'Contribution Amount',175.00,'USD',1,1,'civicrm_line_item',6),(7,'2020-09-17 02:54:44','2010-03-27 00:00:00',82,'Contribution Amount',50.00,'USD',1,1,'civicrm_line_item',7),(8,'2020-09-17 02:54:44','2010-03-08 00:00:00',92,'Contribution Amount',10.00,'USD',1,1,'civicrm_line_item',8),(9,'2020-09-17 02:54:44','2010-04-22 00:00:00',34,'Contribution Amount',250.00,'USD',1,1,'civicrm_line_item',9),(10,'2020-09-17 02:54:44','2009-07-01 11:53:50',71,'Contribution Amount',500.00,'USD',1,1,'civicrm_line_item',10),(11,'2020-09-17 02:54:44','2009-07-01 12:55:41',43,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',11),(12,'2020-09-17 02:54:44','2009-10-01 11:53:50',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',12),(13,'2020-09-17 02:54:44','2009-12-01 12:55:41',32,'Contribution Amount',200.00,'USD',1,1,'civicrm_line_item',13),(14,'2020-09-17 02:54:44','2020-09-16 19:54:44',114,'General',100.00,'USD',2,1,'civicrm_line_item',16),(15,'2020-09-17 02:54:44','2020-09-16 19:54:44',188,'General',100.00,'USD',2,1,'civicrm_line_item',17),(16,'2020-09-17 02:54:44','2020-09-16 19:54:44',67,'General',100.00,'USD',2,1,'civicrm_line_item',18),(17,'2020-09-17 02:54:44','2020-09-16 19:54:44',60,'General',100.00,'USD',2,1,'civicrm_line_item',19),(18,'2020-09-17 02:54:44','2020-09-16 19:54:44',179,'General',100.00,'USD',2,1,'civicrm_line_item',20),(19,'2020-09-17 02:54:44','2020-09-16 19:54:44',32,'General',100.00,'USD',2,1,'civicrm_line_item',21),(20,'2020-09-17 02:54:44','2020-09-16 19:54:44',111,'General',100.00,'USD',2,1,'civicrm_line_item',22),(21,'2020-09-17 02:54:44','2020-09-16 19:54:44',133,'General',100.00,'USD',2,1,'civicrm_line_item',23),(22,'2020-09-17 02:54:44','2020-09-16 19:54:44',69,'General',100.00,'USD',2,1,'civicrm_line_item',24),(23,'2020-09-17 02:54:44','2020-09-16 19:54:44',138,'General',100.00,'USD',2,1,'civicrm_line_item',25),(24,'2020-09-17 02:54:44','2020-09-16 19:54:44',140,'General',100.00,'USD',2,1,'civicrm_line_item',26),(25,'2020-09-17 02:54:44','2020-09-16 19:54:44',168,'General',100.00,'USD',2,1,'civicrm_line_item',27),(26,'2020-09-17 02:54:44','2020-09-16 19:54:44',158,'General',100.00,'USD',2,1,'civicrm_line_item',28),(27,'2020-09-17 02:54:44','2020-09-16 19:54:44',66,'General',100.00,'USD',2,1,'civicrm_line_item',29),(28,'2020-09-17 02:54:44','2020-09-16 19:54:44',61,'General',100.00,'USD',2,1,'civicrm_line_item',30),(29,'2020-09-17 02:54:44','2020-09-16 19:54:44',7,'Student',50.00,'USD',2,1,'civicrm_line_item',31),(30,'2020-09-17 02:54:44','2020-09-16 19:54:44',148,'Student',50.00,'USD',2,1,'civicrm_line_item',32),(31,'2020-09-17 02:54:44','2020-09-16 19:54:44',76,'Student',50.00,'USD',2,1,'civicrm_line_item',33),(32,'2020-09-17 02:54:44','2020-09-16 19:54:44',175,'Student',50.00,'USD',2,1,'civicrm_line_item',34),(33,'2020-09-17 02:54:44','2020-09-16 19:54:44',72,'Student',50.00,'USD',2,1,'civicrm_line_item',35),(34,'2020-09-17 02:54:44','2020-09-16 19:54:44',28,'Student',50.00,'USD',2,1,'civicrm_line_item',36),(35,'2020-09-17 02:54:44','2020-09-16 19:54:44',34,'Student',50.00,'USD',2,1,'civicrm_line_item',37),(36,'2020-09-17 02:54:44','2020-09-16 19:54:44',136,'Student',50.00,'USD',2,1,'civicrm_line_item',38),(37,'2020-09-17 02:54:44','2020-09-16 19:54:44',154,'Student',50.00,'USD',2,1,'civicrm_line_item',39),(38,'2020-09-17 02:54:44','2020-09-16 19:54:44',55,'Student',50.00,'USD',2,1,'civicrm_line_item',40),(39,'2020-09-17 02:54:44','2020-09-16 19:54:44',189,'Student',50.00,'USD',2,1,'civicrm_line_item',41),(40,'2020-09-17 02:54:44','2020-09-16 19:54:44',84,'Student',50.00,'USD',2,1,'civicrm_line_item',42),(41,'2020-09-17 02:54:44','2020-09-16 19:54:44',91,'Student',50.00,'USD',2,1,'civicrm_line_item',43),(42,'2020-09-17 02:54:44','2020-09-16 19:54:44',110,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',44),(43,'2020-09-17 02:54:44','2020-09-16 19:54:44',11,'Lifetime',1200.00,'USD',2,1,'civicrm_line_item',45),(44,'2020-09-17 02:54:44','2020-09-16 19:54:44',37,'Soprano',50.00,'USD',2,1,'civicrm_line_item',81),(45,'2020-09-17 02:54:44','2020-09-16 19:54:44',123,'Soprano',50.00,'USD',2,1,'civicrm_line_item',82),(46,'2020-09-17 02:54:44','2020-09-16 19:54:44',25,'Soprano',50.00,'USD',2,1,'civicrm_line_item',83),(47,'2020-09-17 02:54:44','2020-09-16 19:54:44',88,'Soprano',50.00,'USD',2,1,'civicrm_line_item',84),(48,'2020-09-17 02:54:44','2020-09-16 19:54:44',147,'Soprano',50.00,'USD',2,1,'civicrm_line_item',85),(49,'2020-09-17 02:54:44','2020-09-16 19:54:44',71,'Soprano',50.00,'USD',2,1,'civicrm_line_item',86),(50,'2020-09-17 02:54:44','2020-09-16 19:54:44',110,'Soprano',50.00,'USD',2,1,'civicrm_line_item',87),(51,'2020-09-17 02:54:44','2020-09-16 19:54:44',150,'Soprano',50.00,'USD',2,1,'civicrm_line_item',88),(52,'2020-09-17 02:54:44','2020-09-16 19:54:44',190,'Soprano',50.00,'USD',2,1,'civicrm_line_item',89),(53,'2020-09-17 02:54:44','2020-09-16 19:54:44',47,'Soprano',50.00,'USD',2,1,'civicrm_line_item',90),(54,'2020-09-17 02:54:44','2020-09-16 19:54:44',153,'Soprano',50.00,'USD',2,1,'civicrm_line_item',91),(55,'2020-09-17 02:54:44','2020-09-16 19:54:44',61,'Soprano',50.00,'USD',2,1,'civicrm_line_item',92),(56,'2020-09-17 02:54:44','2020-09-16 19:54:44',160,'Soprano',50.00,'USD',2,1,'civicrm_line_item',93),(57,'2020-09-17 02:54:44','2020-09-16 19:54:44',156,'Soprano',50.00,'USD',2,1,'civicrm_line_item',94),(58,'2020-09-17 02:54:44','2020-09-16 19:54:44',52,'Soprano',50.00,'USD',2,1,'civicrm_line_item',95),(59,'2020-09-17 02:54:44','2020-09-16 19:54:44',11,'Soprano',50.00,'USD',2,1,'civicrm_line_item',96),(60,'2020-09-17 02:54:44','2020-09-16 19:54:44',90,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',47),(61,'2020-09-17 02:54:44','2020-09-16 19:54:44',172,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',48),(62,'2020-09-17 02:54:44','2020-09-16 19:54:44',20,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',49),(63,'2020-09-17 02:54:44','2020-09-16 19:54:44',198,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',50),(64,'2020-09-17 02:54:44','2020-09-16 19:54:44',79,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',51),(65,'2020-09-17 02:54:44','2020-09-16 19:54:44',40,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',52),(66,'2020-09-17 02:54:44','2020-09-16 19:54:44',55,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',53),(67,'2020-09-17 02:54:44','2020-09-16 19:54:44',127,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',54),(68,'2020-09-17 02:54:44','2020-09-16 19:54:44',63,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',55),(69,'2020-09-17 02:54:44','2020-09-16 19:54:44',166,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',56),(70,'2020-09-17 02:54:44','2020-09-16 19:54:44',102,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',57),(71,'2020-09-17 02:54:44','2020-09-16 19:54:44',104,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',58),(72,'2020-09-17 02:54:44','2020-09-16 19:54:44',178,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',59),(73,'2020-09-17 02:54:44','2020-09-16 19:54:44',197,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',60),(74,'2020-09-17 02:54:44','2020-09-16 19:54:44',192,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',61),(75,'2020-09-17 02:54:44','2020-09-16 19:54:44',163,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',62),(76,'2020-09-17 02:54:44','2020-09-16 19:54:44',18,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',63),(77,'2020-09-17 02:54:44','2020-09-16 19:54:44',135,'Tiny-tots (ages 5-8)',800.00,'USD',4,1,'civicrm_line_item',64),(78,'2020-09-17 02:54:44','2020-09-16 19:54:44',43,'Single',50.00,'USD',4,1,'civicrm_line_item',65),(79,'2020-09-17 02:54:44','2020-09-16 19:54:44',28,'Single',50.00,'USD',4,1,'civicrm_line_item',66),(80,'2020-09-17 02:54:44','2020-09-16 19:54:44',120,'Single',50.00,'USD',4,1,'civicrm_line_item',67),(81,'2020-09-17 02:54:44','2020-09-16 19:54:44',194,'Single',50.00,'USD',4,1,'civicrm_line_item',68),(82,'2020-09-17 02:54:44','2020-09-16 19:54:44',44,'Single',50.00,'USD',4,1,'civicrm_line_item',69),(83,'2020-09-17 02:54:44','2020-09-16 19:54:44',162,'Single',50.00,'USD',4,1,'civicrm_line_item',70),(84,'2020-09-17 02:54:44','2020-09-16 19:54:44',99,'Single',50.00,'USD',4,1,'civicrm_line_item',71),(85,'2020-09-17 02:54:44','2020-09-16 19:54:44',38,'Single',50.00,'USD',4,1,'civicrm_line_item',72),(86,'2020-09-17 02:54:44','2020-09-16 19:54:44',56,'Single',50.00,'USD',4,1,'civicrm_line_item',73),(87,'2020-09-17 02:54:44','2020-09-16 19:54:44',155,'Single',50.00,'USD',4,1,'civicrm_line_item',74),(88,'2020-09-17 02:54:44','2020-09-16 19:54:44',48,'Single',50.00,'USD',4,1,'civicrm_line_item',75),(89,'2020-09-17 02:54:44','2020-09-16 19:54:44',70,'Single',50.00,'USD',4,1,'civicrm_line_item',76),(90,'2020-09-17 02:54:44','2020-09-16 19:54:44',199,'Single',50.00,'USD',4,1,'civicrm_line_item',77),(91,'2020-09-17 02:54:44','2020-09-16 19:54:44',8,'Single',50.00,'USD',4,1,'civicrm_line_item',78),(92,'2020-09-17 02:54:44','2020-09-16 19:54:44',125,'Single',50.00,'USD',4,1,'civicrm_line_item',79),(93,'2020-09-17 02:54:44','2020-09-16 19:54:44',187,'Single',50.00,'USD',4,1,'civicrm_line_item',80);
 /*!40000 ALTER TABLE `civicrm_financial_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -534,7 +534,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_financial_trxn` WRITE;
 /*!40000 ALTER TABLE `civicrm_financial_trxn` DISABLE KEYS */;
-INSERT INTO `civicrm_financial_trxn` (`id`, `from_financial_account_id`, `to_financial_account_id`, `trxn_date`, `total_amount`, `fee_amount`, `net_amount`, `currency`, `is_payment`, `trxn_id`, `trxn_result_code`, `status_id`, `payment_processor_id`, `payment_instrument_id`, `card_type_id`, `check_number`, `pan_truncation`, `order_reference`) VALUES (1,NULL,6,'2010-04-11 00:00:00',125.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'1041',NULL,NULL),(2,NULL,6,'2010-03-21 00:00:00',50.00,NULL,NULL,'USD',1,'P20901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(3,NULL,6,'2010-04-29 00:00:00',25.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'2095',NULL,NULL),(4,NULL,6,'2010-04-11 00:00:00',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'10552',NULL,NULL),(5,NULL,6,'2010-04-15 00:00:00',500.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'509',NULL,NULL),(6,NULL,6,'2010-04-11 00:00:00',175.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'102',NULL,NULL),(7,NULL,6,'2010-03-27 00:00:00',50.00,NULL,NULL,'USD',1,'P20193L2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(8,NULL,6,'2010-03-08 00:00:00',10.00,NULL,NULL,'USD',1,'P40232Y3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(9,NULL,6,'2010-04-22 00:00:00',250.00,NULL,NULL,'USD',1,'P20193L6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(10,NULL,6,'2009-07-01 11:53:50',500.00,NULL,NULL,'USD',1,'PL71',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(11,NULL,6,'2009-07-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL43II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(12,NULL,6,'2009-10-01 11:53:50',200.00,NULL,NULL,'USD',1,'PL32I',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(13,NULL,6,'2009-12-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL32II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(14,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(15,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(16,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(17,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(18,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(19,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(20,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(21,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(22,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(23,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(24,NULL,6,'2020-09-16 13:29:32',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(25,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(26,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(27,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(28,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(29,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(30,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(31,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(32,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(33,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(34,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(35,NULL,6,'2020-09-16 13:29:32',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(36,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(37,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(38,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(39,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(40,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(41,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(42,NULL,6,'2020-09-16 13:29:32',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(43,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(44,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(45,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(46,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(47,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(48,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(49,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(50,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(51,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(52,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(53,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(54,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(55,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(56,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(57,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(58,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(59,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(60,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(61,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(62,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(63,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(64,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(65,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(66,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(67,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(68,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(69,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(70,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(71,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(72,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(73,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(74,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(75,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(76,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(77,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(78,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(79,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(80,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(81,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(82,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(83,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(84,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(85,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(86,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(87,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(88,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(89,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(90,NULL,6,'2020-09-16 13:29:32',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(91,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(92,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(93,NULL,6,'2020-09-16 13:29:32',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_financial_trxn` (`id`, `from_financial_account_id`, `to_financial_account_id`, `trxn_date`, `total_amount`, `fee_amount`, `net_amount`, `currency`, `is_payment`, `trxn_id`, `trxn_result_code`, `status_id`, `payment_processor_id`, `payment_instrument_id`, `card_type_id`, `check_number`, `pan_truncation`, `order_reference`) VALUES (1,NULL,6,'2010-04-11 00:00:00',125.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'1041',NULL,NULL),(2,NULL,6,'2010-03-21 00:00:00',50.00,NULL,NULL,'USD',1,'P20901X1',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(3,NULL,6,'2010-04-29 00:00:00',25.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'2095',NULL,NULL),(4,NULL,6,'2010-04-11 00:00:00',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'10552',NULL,NULL),(5,NULL,6,'2010-04-15 00:00:00',500.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'509',NULL,NULL),(6,NULL,6,'2010-04-11 00:00:00',175.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,4,NULL,'102',NULL,NULL),(7,NULL,6,'2010-03-27 00:00:00',50.00,NULL,NULL,'USD',1,'P20193L2',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(8,NULL,6,'2010-03-08 00:00:00',10.00,NULL,NULL,'USD',1,'P40232Y3',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(9,NULL,6,'2010-04-22 00:00:00',250.00,NULL,NULL,'USD',1,'P20193L6',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(10,NULL,6,'2009-07-01 11:53:50',500.00,NULL,NULL,'USD',1,'PL71',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(11,NULL,6,'2009-07-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL43II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(12,NULL,6,'2009-10-01 11:53:50',200.00,NULL,NULL,'USD',1,'PL32I',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(13,NULL,6,'2009-12-01 12:55:41',200.00,NULL,NULL,'USD',1,'PL32II',NULL,1,NULL,1,NULL,NULL,NULL,NULL),(14,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(15,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(16,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(17,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(18,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(19,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(20,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(21,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(22,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(23,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(24,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(25,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(26,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(27,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(28,NULL,6,'2020-09-16 19:54:44',100.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(29,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(30,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(31,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(32,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(33,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(34,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(35,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(36,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(37,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(38,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(39,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(40,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(41,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(42,NULL,6,'2020-09-16 19:54:44',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(43,NULL,6,'2020-09-16 19:54:44',1200.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(44,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(45,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(46,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(47,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(48,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(49,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(50,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(51,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(52,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(53,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(54,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(55,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(56,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(57,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(58,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(59,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(60,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(61,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(62,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(63,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(64,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(65,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(66,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(67,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(68,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(69,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(70,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(71,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(72,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(73,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(74,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(75,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(76,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(77,NULL,6,'2020-09-16 19:54:44',800.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(78,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(79,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(80,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(81,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(82,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(83,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(84,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(85,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(86,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(87,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(88,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(89,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(90,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(91,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(92,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL),(93,NULL,6,'2020-09-16 19:54:44',50.00,NULL,NULL,'USD',1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_financial_trxn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -573,7 +573,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_group_contact` WRITE;
 /*!40000 ALTER TABLE `civicrm_group_contact` DISABLE KEYS */;
-INSERT INTO `civicrm_group_contact` (`id`, `group_id`, `contact_id`, `status`, `location_id`, `email_id`) VALUES (1,2,94,'Added',NULL,NULL),(2,2,105,'Added',NULL,NULL),(3,2,25,'Added',NULL,NULL),(4,2,117,'Added',NULL,NULL),(5,2,99,'Added',NULL,NULL),(6,2,145,'Added',NULL,NULL),(7,2,30,'Added',NULL,NULL),(8,2,194,'Added',NULL,NULL),(9,2,103,'Added',NULL,NULL),(10,2,177,'Added',NULL,NULL),(11,2,85,'Added',NULL,NULL),(12,2,54,'Added',NULL,NULL),(13,2,185,'Added',NULL,NULL),(14,2,130,'Added',NULL,NULL),(15,2,152,'Added',NULL,NULL),(16,2,102,'Added',NULL,NULL),(17,2,122,'Added',NULL,NULL),(18,2,65,'Added',NULL,NULL),(19,2,201,'Added',NULL,NULL),(20,2,86,'Added',NULL,NULL),(21,2,142,'Added',NULL,NULL),(22,2,70,'Added',NULL,NULL),(23,2,141,'Added',NULL,NULL),(24,2,126,'Added',NULL,NULL),(25,2,39,'Added',NULL,NULL),(26,2,110,'Added',NULL,NULL),(27,2,170,'Added',NULL,NULL),(28,2,169,'Added',NULL,NULL),(29,2,200,'Added',NULL,NULL),(30,2,23,'Added',NULL,NULL),(31,2,91,'Added',NULL,NULL),(32,2,51,'Added',NULL,NULL),(33,2,92,'Added',NULL,NULL),(34,2,150,'Added',NULL,NULL),(35,2,104,'Added',NULL,NULL),(36,2,43,'Added',NULL,NULL),(37,2,198,'Added',NULL,NULL),(38,2,17,'Added',NULL,NULL),(39,2,179,'Added',NULL,NULL),(40,2,197,'Added',NULL,NULL),(41,2,88,'Added',NULL,NULL),(42,2,21,'Added',NULL,NULL),(43,2,127,'Added',NULL,NULL),(44,2,59,'Added',NULL,NULL),(45,2,176,'Added',NULL,NULL),(46,2,118,'Added',NULL,NULL),(47,2,156,'Added',NULL,NULL),(48,2,111,'Added',NULL,NULL),(49,2,19,'Added',NULL,NULL),(50,2,166,'Added',NULL,NULL),(51,2,180,'Added',NULL,NULL),(52,2,12,'Added',NULL,NULL),(53,2,193,'Added',NULL,NULL),(54,2,3,'Added',NULL,NULL),(55,2,132,'Added',NULL,NULL),(56,2,57,'Added',NULL,NULL),(57,2,144,'Added',NULL,NULL),(58,2,191,'Added',NULL,NULL),(59,2,157,'Added',NULL,NULL),(60,2,46,'Added',NULL,NULL),(61,3,81,'Added',NULL,NULL),(62,3,129,'Added',NULL,NULL),(63,3,109,'Added',NULL,NULL),(64,3,52,'Added',NULL,NULL),(65,3,28,'Added',NULL,NULL),(66,3,146,'Added',NULL,NULL),(67,3,107,'Added',NULL,NULL),(68,3,27,'Added',NULL,NULL),(69,3,47,'Added',NULL,NULL),(70,3,158,'Added',NULL,NULL),(71,3,167,'Added',NULL,NULL),(72,3,106,'Added',NULL,NULL),(73,3,199,'Added',NULL,NULL),(74,3,136,'Added',NULL,NULL),(75,3,41,'Added',NULL,NULL),(76,4,94,'Added',NULL,NULL),(77,4,194,'Added',NULL,NULL),(78,4,152,'Added',NULL,NULL),(79,4,70,'Added',NULL,NULL),(80,4,200,'Added',NULL,NULL),(81,4,43,'Added',NULL,NULL),(82,4,127,'Added',NULL,NULL),(83,4,166,'Added',NULL,NULL);
+INSERT INTO `civicrm_group_contact` (`id`, `group_id`, `contact_id`, `status`, `location_id`, `email_id`) VALUES (1,2,79,'Added',NULL,NULL),(2,2,47,'Added',NULL,NULL),(3,2,51,'Added',NULL,NULL),(4,2,118,'Added',NULL,NULL),(5,2,34,'Added',NULL,NULL),(6,2,7,'Added',NULL,NULL),(7,2,44,'Added',NULL,NULL),(8,2,139,'Added',NULL,NULL),(9,2,99,'Added',NULL,NULL),(10,2,126,'Added',NULL,NULL),(11,2,17,'Added',NULL,NULL),(12,2,78,'Added',NULL,NULL),(13,2,64,'Added',NULL,NULL),(14,2,12,'Added',NULL,NULL),(15,2,87,'Added',NULL,NULL),(16,2,88,'Added',NULL,NULL),(17,2,9,'Added',NULL,NULL),(18,2,55,'Added',NULL,NULL),(19,2,132,'Added',NULL,NULL),(20,2,173,'Added',NULL,NULL),(21,2,104,'Added',NULL,NULL),(22,2,91,'Added',NULL,NULL),(23,2,100,'Added',NULL,NULL),(24,2,65,'Added',NULL,NULL),(25,2,38,'Added',NULL,NULL),(26,2,36,'Added',NULL,NULL),(27,2,11,'Added',NULL,NULL),(28,2,201,'Added',NULL,NULL),(29,2,181,'Added',NULL,NULL),(30,2,192,'Added',NULL,NULL),(31,2,32,'Added',NULL,NULL),(32,2,168,'Added',NULL,NULL),(33,2,164,'Added',NULL,NULL),(34,2,160,'Added',NULL,NULL),(35,2,92,'Added',NULL,NULL),(36,2,94,'Added',NULL,NULL),(37,2,119,'Added',NULL,NULL),(38,2,8,'Added',NULL,NULL),(39,2,60,'Added',NULL,NULL),(40,2,133,'Added',NULL,NULL),(41,2,42,'Added',NULL,NULL),(42,2,154,'Added',NULL,NULL),(43,2,125,'Added',NULL,NULL),(44,2,197,'Added',NULL,NULL),(45,2,171,'Added',NULL,NULL),(46,2,152,'Added',NULL,NULL),(47,2,112,'Added',NULL,NULL),(48,2,108,'Added',NULL,NULL),(49,2,194,'Added',NULL,NULL),(50,2,190,'Added',NULL,NULL),(51,2,162,'Added',NULL,NULL),(52,2,14,'Added',NULL,NULL),(53,2,187,'Added',NULL,NULL),(54,2,183,'Added',NULL,NULL),(55,2,191,'Added',NULL,NULL),(56,2,31,'Added',NULL,NULL),(57,2,130,'Added',NULL,NULL),(58,2,184,'Added',NULL,NULL),(59,2,59,'Added',NULL,NULL),(60,2,46,'Added',NULL,NULL),(61,3,193,'Added',NULL,NULL),(62,3,16,'Added',NULL,NULL),(63,3,199,'Added',NULL,NULL),(64,3,114,'Added',NULL,NULL),(65,3,61,'Added',NULL,NULL),(66,3,33,'Added',NULL,NULL),(67,3,86,'Added',NULL,NULL),(68,3,182,'Added',NULL,NULL),(69,3,151,'Added',NULL,NULL),(70,3,137,'Added',NULL,NULL),(71,3,189,'Added',NULL,NULL),(72,3,35,'Added',NULL,NULL),(73,3,117,'Added',NULL,NULL),(74,3,147,'Added',NULL,NULL),(75,3,28,'Added',NULL,NULL),(76,4,79,'Added',NULL,NULL),(77,4,139,'Added',NULL,NULL),(78,4,87,'Added',NULL,NULL),(79,4,91,'Added',NULL,NULL),(80,4,181,'Added',NULL,NULL),(81,4,94,'Added',NULL,NULL),(82,4,125,'Added',NULL,NULL),(83,4,190,'Added',NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_group_contact` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -638,7 +638,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_line_item` WRITE;
 /*!40000 ALTER TABLE `civicrm_line_item` DISABLE KEYS */;
-INSERT INTO `civicrm_line_item` (`id`, `entity_table`, `entity_id`, `contribution_id`, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`, `non_deductible_amount`, `tax_amount`) VALUES (1,'civicrm_contribution',1,1,1,'Contribution Amount',1.00,125.00,125.00,0,1,1,0.00,NULL),(2,'civicrm_contribution',2,2,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(3,'civicrm_contribution',3,3,1,'Contribution Amount',1.00,25.00,25.00,0,1,1,0.00,NULL),(4,'civicrm_contribution',4,4,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(5,'civicrm_contribution',5,5,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(6,'civicrm_contribution',6,6,1,'Contribution Amount',1.00,175.00,175.00,0,1,1,0.00,NULL),(7,'civicrm_contribution',7,7,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(8,'civicrm_contribution',8,8,1,'Contribution Amount',1.00,10.00,10.00,0,1,1,0.00,NULL),(9,'civicrm_contribution',9,9,1,'Contribution Amount',1.00,250.00,250.00,0,1,1,0.00,NULL),(10,'civicrm_contribution',10,10,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(11,'civicrm_contribution',11,11,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(12,'civicrm_contribution',12,12,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(13,'civicrm_contribution',13,13,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(16,'civicrm_membership',1,14,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(17,'civicrm_membership',3,16,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(18,'civicrm_membership',7,20,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(19,'civicrm_membership',9,22,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(20,'civicrm_membership',13,26,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(21,'civicrm_membership',17,30,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(22,'civicrm_membership',19,32,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(23,'civicrm_membership',21,34,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(24,'civicrm_membership',23,36,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(25,'civicrm_membership',25,38,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(26,'civicrm_membership',27,40,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(27,'civicrm_membership',29,42,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(28,'civicrm_membership',2,15,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(29,'civicrm_membership',4,17,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(30,'civicrm_membership',5,18,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(31,'civicrm_membership',6,19,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(32,'civicrm_membership',8,21,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(33,'civicrm_membership',10,23,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(34,'civicrm_membership',12,25,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(35,'civicrm_membership',14,27,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(36,'civicrm_membership',15,28,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(37,'civicrm_membership',16,29,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(38,'civicrm_membership',18,31,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(39,'civicrm_membership',20,33,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(40,'civicrm_membership',24,37,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(41,'civicrm_membership',26,39,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(42,'civicrm_membership',28,41,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(43,'civicrm_membership',30,43,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(44,'civicrm_membership',11,24,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(45,'civicrm_membership',22,35,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(47,'civicrm_participant',3,50,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(48,'civicrm_participant',6,88,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(49,'civicrm_participant',9,75,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(50,'civicrm_participant',12,87,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(51,'civicrm_participant',15,82,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(52,'civicrm_participant',18,71,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(53,'civicrm_participant',21,69,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(54,'civicrm_participant',24,86,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(55,'civicrm_participant',25,47,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(56,'civicrm_participant',28,53,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(57,'civicrm_participant',31,49,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(58,'civicrm_participant',34,91,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(59,'civicrm_participant',37,45,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(60,'civicrm_participant',40,58,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(61,'civicrm_participant',43,46,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(62,'civicrm_participant',46,52,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(63,'civicrm_participant',49,80,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(64,'civicrm_participant',50,56,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(65,'civicrm_participant',1,83,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(66,'civicrm_participant',4,93,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(67,'civicrm_participant',7,64,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(68,'civicrm_participant',10,54,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(69,'civicrm_participant',13,67,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(70,'civicrm_participant',16,59,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(71,'civicrm_participant',19,90,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(72,'civicrm_participant',22,77,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(73,'civicrm_participant',26,60,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(74,'civicrm_participant',29,63,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(75,'civicrm_participant',32,92,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(76,'civicrm_participant',35,72,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(77,'civicrm_participant',38,76,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(78,'civicrm_participant',41,51,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(79,'civicrm_participant',44,85,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(80,'civicrm_participant',47,89,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(81,'civicrm_participant',2,57,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(82,'civicrm_participant',5,73,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(83,'civicrm_participant',8,70,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(84,'civicrm_participant',11,94,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(85,'civicrm_participant',14,81,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(86,'civicrm_participant',17,68,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(87,'civicrm_participant',20,65,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(88,'civicrm_participant',23,61,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(89,'civicrm_participant',27,74,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(90,'civicrm_participant',30,78,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(91,'civicrm_participant',33,84,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(92,'civicrm_participant',36,55,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(93,'civicrm_participant',39,62,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(94,'civicrm_participant',42,79,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(95,'civicrm_participant',45,66,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(96,'civicrm_participant',48,48,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL);
+INSERT INTO `civicrm_line_item` (`id`, `entity_table`, `entity_id`, `contribution_id`, `price_field_id`, `label`, `qty`, `unit_price`, `line_total`, `participant_count`, `price_field_value_id`, `financial_type_id`, `non_deductible_amount`, `tax_amount`) VALUES (1,'civicrm_contribution',1,1,1,'Contribution Amount',1.00,125.00,125.00,0,1,1,0.00,NULL),(2,'civicrm_contribution',2,2,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(3,'civicrm_contribution',3,3,1,'Contribution Amount',1.00,25.00,25.00,0,1,1,0.00,NULL),(4,'civicrm_contribution',4,4,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(5,'civicrm_contribution',5,5,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(6,'civicrm_contribution',6,6,1,'Contribution Amount',1.00,175.00,175.00,0,1,1,0.00,NULL),(7,'civicrm_contribution',7,7,1,'Contribution Amount',1.00,50.00,50.00,0,1,1,0.00,NULL),(8,'civicrm_contribution',8,8,1,'Contribution Amount',1.00,10.00,10.00,0,1,1,0.00,NULL),(9,'civicrm_contribution',9,9,1,'Contribution Amount',1.00,250.00,250.00,0,1,1,0.00,NULL),(10,'civicrm_contribution',10,10,1,'Contribution Amount',1.00,500.00,500.00,0,1,1,0.00,NULL),(11,'civicrm_contribution',11,11,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(12,'civicrm_contribution',12,12,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(13,'civicrm_contribution',13,13,1,'Contribution Amount',1.00,200.00,200.00,0,1,1,0.00,NULL),(16,'civicrm_membership',1,14,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(17,'civicrm_membership',3,15,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(18,'civicrm_membership',5,16,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(19,'civicrm_membership',7,17,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(20,'civicrm_membership',9,18,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(21,'civicrm_membership',13,19,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(22,'civicrm_membership',17,20,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(23,'civicrm_membership',19,21,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(24,'civicrm_membership',20,22,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(25,'civicrm_membership',21,23,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(26,'civicrm_membership',23,24,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(27,'civicrm_membership',25,25,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(28,'civicrm_membership',27,26,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(29,'civicrm_membership',29,27,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(30,'civicrm_membership',30,28,4,'General',1.00,100.00,100.00,NULL,7,2,0.00,NULL),(31,'civicrm_membership',2,29,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(32,'civicrm_membership',4,30,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(33,'civicrm_membership',6,31,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(34,'civicrm_membership',8,32,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(35,'civicrm_membership',10,33,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(36,'civicrm_membership',12,34,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(37,'civicrm_membership',14,35,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(38,'civicrm_membership',15,36,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(39,'civicrm_membership',16,37,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(40,'civicrm_membership',18,38,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(41,'civicrm_membership',24,39,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(42,'civicrm_membership',26,40,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(43,'civicrm_membership',28,41,4,'Student',1.00,50.00,50.00,NULL,8,2,0.00,NULL),(44,'civicrm_membership',11,42,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(45,'civicrm_membership',22,43,4,'Lifetime',1.00,1200.00,1200.00,NULL,9,2,0.00,NULL),(47,'civicrm_participant',3,67,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(48,'civicrm_participant',6,86,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(49,'civicrm_participant',9,48,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(50,'civicrm_participant',12,93,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(51,'civicrm_participant',15,65,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(52,'civicrm_participant',18,53,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(53,'civicrm_participant',21,59,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(54,'civicrm_participant',24,75,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(55,'civicrm_participant',25,62,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(56,'civicrm_participant',28,85,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(57,'civicrm_participant',31,69,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(58,'civicrm_participant',34,70,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(59,'civicrm_participant',37,87,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(60,'civicrm_participant',40,92,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(61,'civicrm_participant',43,90,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(62,'civicrm_participant',46,84,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(63,'civicrm_participant',49,47,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(64,'civicrm_participant',50,76,7,'Tiny-tots (ages 5-8)',1.00,800.00,800.00,0,13,4,0.00,NULL),(65,'civicrm_participant',1,54,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(66,'civicrm_participant',4,50,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(67,'civicrm_participant',7,72,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(68,'civicrm_participant',10,91,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(69,'civicrm_participant',13,55,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(70,'civicrm_participant',16,83,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(71,'civicrm_participant',19,68,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(72,'civicrm_participant',22,52,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(73,'civicrm_participant',26,60,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(74,'civicrm_participant',29,80,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(75,'civicrm_participant',32,57,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(76,'civicrm_participant',35,63,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(77,'civicrm_participant',38,94,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(78,'civicrm_participant',41,45,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(79,'civicrm_participant',44,74,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(80,'civicrm_participant',47,88,8,'Single',1.00,50.00,50.00,0,16,4,0.00,NULL),(81,'civicrm_participant',2,51,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(82,'civicrm_participant',5,73,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(83,'civicrm_participant',8,49,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(84,'civicrm_participant',11,66,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(85,'civicrm_participant',14,77,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(86,'civicrm_participant',17,64,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(87,'civicrm_participant',20,71,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(88,'civicrm_participant',23,78,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(89,'civicrm_participant',27,89,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(90,'civicrm_participant',30,56,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(91,'civicrm_participant',33,79,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(92,'civicrm_participant',36,61,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(93,'civicrm_participant',39,82,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(94,'civicrm_participant',42,81,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(95,'civicrm_participant',45,58,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL),(96,'civicrm_participant',48,46,9,'Soprano',1.00,50.00,50.00,0,21,2,0.00,NULL);
 /*!40000 ALTER TABLE `civicrm_line_item` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -648,7 +648,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_loc_block` WRITE;
 /*!40000 ALTER TABLE `civicrm_loc_block` DISABLE KEYS */;
-INSERT INTO `civicrm_loc_block` (`id`, `address_id`, `email_id`, `phone_id`, `im_id`, `address_2_id`, `email_2_id`, `phone_2_id`, `im_2_id`) VALUES (1,186,186,150,NULL,NULL,NULL,NULL,NULL),(2,187,187,151,NULL,NULL,NULL,NULL,NULL),(3,188,188,152,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_loc_block` (`id`, `address_id`, `email_id`, `phone_id`, `im_id`, `address_2_id`, `email_2_id`, `phone_2_id`, `im_2_id`) VALUES (1,182,183,139,NULL,NULL,NULL,NULL,NULL),(2,183,184,140,NULL,NULL,NULL,NULL,NULL),(3,184,185,141,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_loc_block` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -897,7 +897,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership` DISABLE KEYS */;
-INSERT INTO `civicrm_membership` (`id`, `contact_id`, `membership_type_id`, `join_date`, `start_date`, `end_date`, `source`, `status_id`, `is_override`, `status_override_end_date`, `owner_membership_id`, `max_related`, `is_test`, `is_pay_later`, `contribution_recur_id`, `campaign_id`) VALUES (1,73,1,'2020-09-16','2020-09-16','2022-09-15','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,92,2,'2020-09-15','2020-09-15','2021-09-14','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,48,1,'2020-09-14','2020-09-14','2022-09-13','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(4,51,2,'2020-09-13','2020-09-13','2021-09-12','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(5,163,2,'2019-09-12','2019-09-12','2020-09-11','Check',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,40,2,'2020-09-11','2020-09-11','2021-09-10','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,190,1,'2020-09-10','2020-09-10','2022-09-09','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(8,33,2,'2020-09-09','2020-09-09','2021-09-08','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,175,1,'2020-09-08','2020-09-08','2022-09-07','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(10,103,2,'2019-09-07','2019-09-07','2020-09-06','Donation',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(11,194,3,'2020-09-06','2020-09-06',NULL,'Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(12,56,2,'2020-09-05','2020-09-05','2021-09-04','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(13,120,1,'2020-09-04','2020-09-04','2022-09-03','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(14,105,2,'2020-09-03','2020-09-03','2021-09-02','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(15,184,2,'2019-09-02','2019-09-02','2020-09-01','Donation',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(16,177,2,'2020-09-01','2020-09-01','2021-08-31','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(17,153,1,'2020-08-31','2020-08-31','2022-08-30','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(18,106,2,'2020-08-30','2020-08-30','2021-08-29','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(19,13,1,'2020-08-29','2020-08-29','2022-08-28','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(20,64,2,'2019-08-28','2019-08-28','2020-08-27','Payment',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(21,200,1,'2020-08-27','2020-08-27','2022-08-26','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(22,142,3,'2020-08-26','2020-08-26',NULL,'Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(23,111,1,'2020-08-25','2020-08-25','2022-08-24','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(24,132,2,'2020-08-24','2020-08-24','2021-08-23','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(25,141,1,'2018-03-08','2018-03-08','2020-03-07','Payment',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(26,3,2,'2020-08-22','2020-08-22','2021-08-21','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(27,86,1,'2020-08-21','2020-08-21','2022-08-20','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(28,168,2,'2020-08-20','2020-08-20','2021-08-19','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(29,16,1,'2020-08-19','2020-08-19','2022-08-18','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(30,68,2,'2019-08-18','2019-08-18','2020-08-17','Payment',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL);
+INSERT INTO `civicrm_membership` (`id`, `contact_id`, `membership_type_id`, `join_date`, `start_date`, `end_date`, `source`, `status_id`, `is_override`, `status_override_end_date`, `owner_membership_id`, `max_related`, `is_test`, `is_pay_later`, `contribution_recur_id`, `campaign_id`) VALUES (1,114,1,'2020-09-16','2020-09-16','2022-09-15','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(2,7,2,'2020-09-15','2020-09-15','2021-09-14','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(3,188,1,'2020-09-14','2020-09-14','2022-09-13','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(4,148,2,'2020-09-13','2020-09-13','2021-09-12','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(5,67,1,'2018-08-15','2018-08-15','2020-08-14','Donation',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(6,76,2,'2020-09-11','2020-09-11','2021-09-10','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(7,60,1,'2020-09-10','2020-09-10','2022-09-09','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(8,175,2,'2020-09-09','2020-09-09','2021-09-08','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(9,179,1,'2020-09-08','2020-09-08','2022-09-07','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(10,72,2,'2019-09-07','2019-09-07','2020-09-06','Payment',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(11,110,3,'2020-09-06','2020-09-06',NULL,'Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(12,28,2,'2020-09-05','2020-09-05','2021-09-04','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(13,32,1,'2020-09-04','2020-09-04','2022-09-03','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(14,34,2,'2020-09-03','2020-09-03','2021-09-02','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(15,136,2,'2019-09-02','2019-09-02','2020-09-01','Donation',4,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(16,154,2,'2020-09-01','2020-09-01','2021-08-31','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(17,111,1,'2020-08-31','2020-08-31','2022-08-30','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(18,55,2,'2020-08-30','2020-08-30','2021-08-29','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(19,133,1,'2020-08-29','2020-08-29','2022-08-28','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(20,69,1,'2018-04-17','2018-04-17','2020-04-16','Donation',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(21,138,1,'2020-08-27','2020-08-27','2022-08-26','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(22,11,3,'2020-08-26','2020-08-26',NULL,'Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(23,140,1,'2020-08-25','2020-08-25','2022-08-24','Check',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(24,189,2,'2020-08-24','2020-08-24','2021-08-23','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(25,168,1,'2018-03-08','2018-03-08','2020-03-07','Payment',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(26,84,2,'2020-08-22','2020-08-22','2021-08-21','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(27,158,1,'2020-08-21','2020-08-21','2022-08-20','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(28,91,2,'2020-08-20','2020-08-20','2021-08-19','Payment',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(29,66,1,'2020-08-19','2020-08-19','2022-08-18','Donation',1,NULL,NULL,NULL,NULL,0,0,NULL,NULL),(30,61,1,'2018-01-27','2018-01-27','2020-01-26','Payment',3,NULL,NULL,NULL,NULL,0,0,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_membership` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -917,7 +917,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership_log` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership_log` DISABLE KEYS */;
-INSERT INTO `civicrm_membership_log` (`id`, `membership_id`, `status_id`, `start_date`, `end_date`, `modified_id`, `modified_date`, `membership_type_id`, `max_related`) VALUES (1,26,1,'2020-08-22','2021-08-21',3,'2020-09-16',2,NULL),(2,19,1,'2020-08-29','2022-08-28',13,'2020-09-16',1,NULL),(3,29,1,'2020-08-19','2022-08-18',16,'2020-09-16',1,NULL),(4,8,1,'2020-09-09','2021-09-08',33,'2020-09-16',2,NULL),(5,6,1,'2020-09-11','2021-09-10',40,'2020-09-16',2,NULL),(6,3,1,'2020-09-14','2022-09-13',48,'2020-09-16',1,NULL),(7,4,1,'2020-09-13','2021-09-12',51,'2020-09-16',2,NULL),(8,12,1,'2020-09-05','2021-09-04',56,'2020-09-16',2,NULL),(9,20,4,'2019-08-28','2020-08-27',64,'2020-09-16',2,NULL),(10,30,4,'2019-08-18','2020-08-17',68,'2020-09-16',2,NULL),(11,1,1,'2020-09-16','2022-09-15',73,'2020-09-16',1,NULL),(12,27,1,'2020-08-21','2022-08-20',86,'2020-09-16',1,NULL),(13,2,1,'2020-09-15','2021-09-14',92,'2020-09-16',2,NULL),(14,10,4,'2019-09-07','2020-09-06',103,'2020-09-16',2,NULL),(15,14,1,'2020-09-03','2021-09-02',105,'2020-09-16',2,NULL),(16,18,1,'2020-08-30','2021-08-29',106,'2020-09-16',2,NULL),(17,23,1,'2020-08-25','2022-08-24',111,'2020-09-16',1,NULL),(18,13,1,'2020-09-04','2022-09-03',120,'2020-09-16',1,NULL),(19,24,1,'2020-08-24','2021-08-23',132,'2020-09-16',2,NULL),(20,25,3,'2018-03-08','2020-03-07',141,'2020-09-16',1,NULL),(21,22,1,'2020-08-26',NULL,142,'2020-09-16',3,NULL),(22,17,1,'2020-08-31','2022-08-30',153,'2020-09-16',1,NULL),(23,5,4,'2019-09-12','2020-09-11',163,'2020-09-16',2,NULL),(24,28,1,'2020-08-20','2021-08-19',168,'2020-09-16',2,NULL),(25,9,1,'2020-09-08','2022-09-07',175,'2020-09-16',1,NULL),(26,16,1,'2020-09-01','2021-08-31',177,'2020-09-16',2,NULL),(27,15,4,'2019-09-02','2020-09-01',184,'2020-09-16',2,NULL),(28,7,1,'2020-09-10','2022-09-09',190,'2020-09-16',1,NULL),(29,11,1,'2020-09-06',NULL,194,'2020-09-16',3,NULL),(30,21,1,'2020-08-27','2022-08-26',200,'2020-09-16',1,NULL);
+INSERT INTO `civicrm_membership_log` (`id`, `membership_id`, `status_id`, `start_date`, `end_date`, `modified_id`, `modified_date`, `membership_type_id`, `max_related`) VALUES (1,2,1,'2020-09-15','2021-09-14',7,'2020-09-16',2,NULL),(2,22,1,'2020-08-26',NULL,11,'2020-09-16',3,NULL),(3,12,1,'2020-09-05','2021-09-04',28,'2020-09-16',2,NULL),(4,13,1,'2020-09-04','2022-09-03',32,'2020-09-16',1,NULL),(5,14,1,'2020-09-03','2021-09-02',34,'2020-09-16',2,NULL),(6,18,1,'2020-08-30','2021-08-29',55,'2020-09-16',2,NULL),(7,7,1,'2020-09-10','2022-09-09',60,'2020-09-16',1,NULL),(8,30,3,'2018-01-27','2020-01-26',61,'2020-09-16',1,NULL),(9,29,1,'2020-08-19','2022-08-18',66,'2020-09-16',1,NULL),(10,5,3,'2018-08-15','2020-08-14',67,'2020-09-16',1,NULL),(11,20,3,'2018-04-17','2020-04-16',69,'2020-09-16',1,NULL),(12,10,4,'2019-09-07','2020-09-06',72,'2020-09-16',2,NULL),(13,6,1,'2020-09-11','2021-09-10',76,'2020-09-16',2,NULL),(14,26,1,'2020-08-22','2021-08-21',84,'2020-09-16',2,NULL),(15,28,1,'2020-08-20','2021-08-19',91,'2020-09-16',2,NULL),(16,11,1,'2020-09-06',NULL,110,'2020-09-16',3,NULL),(17,17,1,'2020-08-31','2022-08-30',111,'2020-09-16',1,NULL),(18,1,1,'2020-09-16','2022-09-15',114,'2020-09-16',1,NULL),(19,19,1,'2020-08-29','2022-08-28',133,'2020-09-16',1,NULL),(20,15,4,'2019-09-02','2020-09-01',136,'2020-09-16',2,NULL),(21,21,1,'2020-08-27','2022-08-26',138,'2020-09-16',1,NULL),(22,23,1,'2020-08-25','2022-08-24',140,'2020-09-16',1,NULL),(23,4,1,'2020-09-13','2021-09-12',148,'2020-09-16',2,NULL),(24,16,1,'2020-09-01','2021-08-31',154,'2020-09-16',2,NULL),(25,27,1,'2020-08-21','2022-08-20',158,'2020-09-16',1,NULL),(26,25,3,'2018-03-08','2020-03-07',168,'2020-09-16',1,NULL),(27,8,1,'2020-09-09','2021-09-08',175,'2020-09-16',2,NULL),(28,9,1,'2020-09-08','2022-09-07',179,'2020-09-16',1,NULL),(29,3,1,'2020-09-14','2022-09-13',188,'2020-09-16',1,NULL),(30,24,1,'2020-08-24','2021-08-23',189,'2020-09-16',2,NULL);
 /*!40000 ALTER TABLE `civicrm_membership_log` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -927,7 +927,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership_payment` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership_payment` DISABLE KEYS */;
-INSERT INTO `civicrm_membership_payment` (`id`, `membership_id`, `contribution_id`) VALUES (1,1,14),(2,2,15),(3,3,16),(4,4,17),(5,5,18),(6,6,19),(7,7,20),(8,8,21),(9,9,22),(10,10,23),(11,11,24),(12,12,25),(13,13,26),(14,14,27),(15,15,28),(16,16,29),(17,17,30),(18,18,31),(19,19,32),(20,20,33),(21,21,34),(22,22,35),(23,23,36),(24,24,37),(25,25,38),(26,26,39),(27,27,40),(28,28,41),(29,29,42),(30,30,43);
+INSERT INTO `civicrm_membership_payment` (`id`, `membership_id`, `contribution_id`) VALUES (1,1,14),(2,3,15),(3,5,16),(4,7,17),(5,9,18),(6,13,19),(7,17,20),(8,19,21),(9,20,22),(10,21,23),(11,23,24),(12,25,25),(13,27,26),(14,29,27),(15,30,28),(16,2,29),(17,4,30),(18,6,31),(19,8,32),(20,10,33),(21,12,34),(22,14,35),(23,15,36),(24,16,37),(25,18,38),(26,24,39),(27,26,40),(28,28,41),(29,11,42),(30,22,43);
 /*!40000 ALTER TABLE `civicrm_membership_payment` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -957,7 +957,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_menu` WRITE;
 /*!40000 ALTER TABLE `civicrm_menu` DISABLE KEYS */;
-INSERT INTO `civicrm_menu` (`id`, `domain_id`, `path`, `path_arguments`, `title`, `access_callback`, `access_arguments`, `page_callback`, `page_arguments`, `breadcrumb`, `return_url`, `return_url_args`, `component_id`, `is_active`, `is_public`, `is_exposed`, `is_ssl`, `weight`, `type`, `page_type`, `skipBreadcrumb`, `module_data`) VALUES (1,1,'civicrm/ajax/api4',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','s:18:\"CRM_Api4_Page_AJAX\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(2,1,'civicrm/api4',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Api4_Page_Api4Explorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(3,1,'civicrm/import',NULL,'Import','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,400,1,1,NULL,'a:0:{}'),(4,1,'civicrm/import/contact',NULL,'Import Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,410,1,1,NULL,'a:0:{}'),(5,1,'civicrm/import/activity',NULL,'Import Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(6,1,'civicrm/import/custom','id=%%id%%','Import Multi-value Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Custom_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(7,1,'civicrm/ajax/status',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Contact_Import_Page_AJAX\";i:1;s:6:\"status\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(8,1,'civicrm/custom/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Custom_Form_CustomData\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(9,1,'civicrm/ajax/optionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:13:\"getOptionList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(10,1,'civicrm/ajax/reorder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:11:\"fixOrdering\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(11,1,'civicrm/ajax/multirecordfieldlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:23:\"getMultiRecordFieldList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(12,1,'civicrm/group',NULL,'Manage Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Page_Group\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,30,1,1,NULL,'a:0:{}'),(13,1,'civicrm/group/search',NULL,'Group Members','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:7:\"comment\";s:164:\"Note: group search already respect ACL, so a strict permission at url level is not required. A simple/basic permission like \'access CiviCRM\' could be used. CRM-5417\";}'),(14,1,'civicrm/group/add',NULL,'New Group','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:11:\"edit groups\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(15,1,'civicrm/ajax/grouplist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Group_Page_AJAX\";i:1;s:12:\"getGroupList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(16,1,'civicrm/tag',NULL,'Tags (Categories)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:16:\"CRM_Tag_Page_Tag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,25,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(17,1,'civicrm/tag/edit','action=add','New Tag','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:17:\"CRM_Tag_Form_Edit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(18,1,'civicrm/tag/merge',NULL,'Merge Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:18:\"CRM_Tag_Form_Merge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(19,1,'civicrm/ajax/tagTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:10:\"getTagTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(20,1,'civicrm/payment/form',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:26:\"CRM_Financial_Form_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(21,1,'civicrm/payment/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:30:\"CRM_Financial_Form_PaymentEdit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(22,1,'civicrm',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:0:{}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(23,1,'civicrm/dashboard',NULL,'CiviCRM Home','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,NULL,'a:0:{}'),(24,1,'civicrm/dashlet',NULL,'CiviCRM Dashlets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Page_Dashlet\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,1,NULL,'a:0:{}'),(25,1,'civicrm/contact/search',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,10,1,1,NULL,'a:0:{}'),(26,1,'civicrm/contact/image',NULL,'Process Uploaded Images','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"CRM_Contact_BAO_Contact\";i:1;s:12:\"processImage\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(27,1,'civicrm/contact/imagefile',NULL,'Get Image File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_ImageFile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(28,1,'civicrm/contact/search/basic',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(29,1,'civicrm/contact/search/advanced',NULL,'Advanced Search','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=512\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,12,1,1,NULL,'a:0:{}'),(30,1,'civicrm/contact/search/builder',NULL,'Search Builder','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:9:\"mode=8192\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,14,1,1,NULL,'a:0:{}'),(31,1,'civicrm/contact/search/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(32,1,'civicrm/contact/search/custom/list',NULL,'Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Page_CustomSearch\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,16,1,1,NULL,'a:0:{}'),(33,1,'civicrm/contact/add',NULL,'New Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(34,1,'civicrm/contact/add/individual','ct=Individual','New Individual','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(35,1,'civicrm/contact/add/household','ct=Household','New Household','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(36,1,'civicrm/contact/add/organization','ct=Organization','New Organization','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(37,1,'civicrm/contact/relatedcontact',NULL,'Edit Related Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_RelatedContact\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(38,1,'civicrm/contact/merge',NULL,'Merge Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:22:\"CRM_Contact_Form_Merge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(39,1,'civicrm/contact/email',NULL,'Email a Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(40,1,'civicrm/contact/map',NULL,'Map Location(s)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_Map\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(41,1,'civicrm/contact/map/event',NULL,'Map Event Location','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_Task_Map_Event\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Map Location(s)\";s:3:\"url\";s:28:\"/civicrm/contact/map?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(42,1,'civicrm/contact/view','cid=%%cid%%','Contact Summary','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Summary\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(43,1,'civicrm/contact/view/delete',NULL,'Delete Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(44,1,'civicrm/contact/view/activity','show=1,cid=%%cid%%','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:21:\"CRM_Activity_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(45,1,'civicrm/activity/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(46,1,'civicrm/activity/email/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(47,1,'civicrm/activity/pdf/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(48,1,'civicrm/contact/view/rel','cid=%%cid%%','Relationships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_Relationship\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(49,1,'civicrm/contact/view/group','cid=%%cid%%','Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_GroupContact\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(50,1,'civicrm/contact/view/smartgroup','cid=%%cid%%','Smart Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:39:\"CRM_Contact_Page_View_ContactSmartGroup\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(51,1,'civicrm/contact/view/note','cid=%%cid%%','Notes','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:26:\"CRM_Contact_Page_View_Note\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(52,1,'civicrm/contact/view/tag','cid=%%cid%%','Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Tag\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(53,1,'civicrm/contact/view/cd',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:32:\"CRM_Contact_Page_View_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(54,1,'civicrm/contact/view/cd/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Form_CustomData\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(55,1,'civicrm/contact/view/vcard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Vcard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(56,1,'civicrm/contact/view/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Print\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(57,1,'civicrm/contact/view/log',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Log\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(58,1,'civicrm/user',NULL,'Contact Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Page_View_UserDashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(59,1,'civicrm/dashlet/activity',NULL,'Activity Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(60,1,'civicrm/dashlet/blog',NULL,'CiviCRM Blog','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Dashlet_Page_Blog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(61,1,'civicrm/dashlet/getting-started',NULL,'CiviCRM Resources','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Dashlet_Page_GettingStarted\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(62,1,'civicrm/ajax/relation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"relationship\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(63,1,'civicrm/ajax/groupTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"groupTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(64,1,'civicrm/ajax/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:11:\"customField\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(65,1,'civicrm/ajax/customvalue',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:17:\"deleteCustomValue\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(66,1,'civicrm/ajax/cmsuser',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"checkUserName\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(67,1,'civicrm/ajax/checkemail',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactEmail\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(68,1,'civicrm/ajax/checkphone',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactPhone\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(69,1,'civicrm/ajax/subtype',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"buildSubTypes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(70,1,'civicrm/ajax/dashboard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"dashboard\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(71,1,'civicrm/ajax/signature',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"getSignature\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(72,1,'civicrm/ajax/pdfFormat',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"pdfFormat\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(73,1,'civicrm/ajax/paperSize',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"paperSize\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(74,1,'civicrm/ajax/contactref',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:31:\"access contact reference fields\";i:1;s:15:\" access CiviCRM\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"contactReference\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(75,1,'civicrm/dashlet/myCases',NULL,'Case Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Dashlet_Page_MyCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(76,1,'civicrm/dashlet/allCases',NULL,'All Cases Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_AllCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(77,1,'civicrm/dashlet/casedashboard',NULL,'Case Dashboard Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Dashlet_Page_CaseDashboard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(78,1,'civicrm/contact/deduperules',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer dedupe rules\";i:1;s:24:\"merge duplicate contacts\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Page_DedupeRules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,105,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(79,1,'civicrm/contact/dedupefind',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Page_DedupeFind\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(80,1,'civicrm/ajax/dedupefind',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:10:\"getDedupes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(81,1,'civicrm/contact/dedupemerge',NULL,'Batch Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Page_DedupeMerge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(82,1,'civicrm/dedupe/exception',NULL,'Dedupe Exceptions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Page_DedupeException\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,110,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:6:\"Manage\";}'),(83,1,'civicrm/ajax/dedupeRules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"buildDedupeRules\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(84,1,'civicrm/contact/view/useradd','cid=%%cid%%','Add User','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Useradd\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(85,1,'civicrm/ajax/markSelection',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:22:\"selectUnselectContacts\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(86,1,'civicrm/ajax/toggleDedupeSelect',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:18:\"toggleDedupeSelect\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(87,1,'civicrm/ajax/flipDupePairs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"flipDupePairs\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(88,1,'civicrm/activity/sms/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_SMS\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(89,1,'civicrm/ajax/contactrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"view my contact\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:23:\"getContactRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(90,1,'civicrm/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(91,1,'civicrm/pcp/campaign',NULL,'Setup a Personal Campaign Page - Account Information','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(92,1,'civicrm/pcp/info',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_PCP_Page_PCPInfo\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(93,1,'civicrm/admin/pcp','context=contribute','Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Page_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,362,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(94,1,'civicrm/activity','action=add&context=standalone','New Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(95,1,'civicrm/activity/view',NULL,'View Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Form_ActivityView\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(96,1,'civicrm/ajax/activity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:15:\"getCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(97,1,'civicrm/ajax/globalrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseGlobalRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(98,1,'civicrm/ajax/clientrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseClientRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(99,1,'civicrm/ajax/caseroles',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:12:\"getCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(100,1,'civicrm/ajax/contactactivity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:18:\"getContactActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(101,1,'civicrm/ajax/activity/convert',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:21:\"convertToCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(102,1,'civicrm/activity/search',NULL,'Find Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Controller_Search\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(103,1,'civicrm/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Custom_Form_CustomDataByType\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(104,1,'civicrm/profile',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(105,1,'civicrm/profile/create',NULL,'CiviCRM Profile Create','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(106,1,'civicrm/profile/view',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Profile_Page_View\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(107,1,'civicrm/ajax/jqState',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:7:\"jqState\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(108,1,'civicrm/ajax/jqCounty',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:8:\"jqCounty\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(109,1,'civicrm/admin/custom/group',NULL,'Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(110,1,'civicrm/admin/custom/group/field',NULL,'Custom Data Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,11,1,0,0,'a:0:{}'),(111,1,'civicrm/admin/custom/group/field/option',NULL,'Custom Field - Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Custom_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(112,1,'civicrm/admin/custom/group/field/add',NULL,'Custom Field - Add','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(113,1,'civicrm/admin/custom/group/field/update',NULL,'Custom Field - Edit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(114,1,'civicrm/admin/custom/group/field/move',NULL,'Custom Field - Move','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Custom_Form_MoveField\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(115,1,'civicrm/admin/uf/group',NULL,'Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(116,1,'civicrm/admin/uf/group/field',NULL,'CiviCRM Profile Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,21,1,0,0,'a:0:{}'),(117,1,'civicrm/admin/uf/group/field/add',NULL,'Add Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,22,1,0,NULL,'a:0:{}'),(118,1,'civicrm/admin/uf/group/field/update',NULL,'Edit Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,23,1,0,NULL,'a:0:{}'),(119,1,'civicrm/admin/uf/group/add',NULL,'New CiviCRM Profile','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,24,1,0,NULL,'a:0:{}'),(120,1,'civicrm/admin/uf/group/update',NULL,'Profile Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,25,1,0,NULL,'a:0:{}'),(121,1,'civicrm/admin/uf/group/setting',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_UF_Form_AdvanceSetting\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,0,NULL,'a:0:{}'),(122,1,'civicrm/admin/options/activity_type',NULL,'Activity Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(123,1,'civicrm/admin/reltype',NULL,'Relationship Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_RelationshipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,35,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(124,1,'civicrm/admin/options/subtype',NULL,'Contact Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_ContactType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(125,1,'civicrm/admin/options/gender',NULL,'Gender Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,45,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(126,1,'civicrm/admin/options/individual_prefix',NULL,'Individual Prefixes (Ms, Mr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(127,1,'civicrm/admin/options/individual_suffix',NULL,'Individual Suffixes (Jr, Sr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,55,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(128,1,'civicrm/admin/locationType',NULL,'Location Types (Home, Work...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LocationType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(129,1,'civicrm/admin/options/website_type',NULL,'Website Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,65,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(130,1,'civicrm/admin/options/instant_messenger_service',NULL,'Instant Messenger Services','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(131,1,'civicrm/admin/options/mobile_provider',NULL,'Mobile Phone Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(132,1,'civicrm/admin/options/phone_type',NULL,'Phone Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(133,1,'civicrm/admin/setting/preferences/display',NULL,'Display Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Display\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(134,1,'civicrm/admin/setting/search',NULL,'Search Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_Setting_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,95,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(135,1,'civicrm/admin/setting/preferences/date',NULL,'View Date Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Page_PreferencesDate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(136,1,'civicrm/admin/menu',NULL,'Navigation Menu','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Navigation\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(137,1,'civicrm/admin/options/wordreplacements',NULL,'Word Replacements','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Form_WordReplacements\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:18:\"Word Replacements.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(138,1,'civicrm/admin/options/custom_search',NULL,'Manage Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(139,1,'civicrm/admin/domain','action=update','Organization Address and Contact Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contact_Form_Domain\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(140,1,'civicrm/admin/options/from_email_address',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(141,1,'civicrm/admin/messageTemplates',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Page_MessageTemplates\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(142,1,'civicrm/admin/messageTemplates/add',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Form_MessageTemplates\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Message Templates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,262,1,0,NULL,'a:1:{s:4:\"desc\";s:26:\"Add/Edit Message Templates\";}'),(143,1,'civicrm/admin/scheduleReminders',NULL,'Schedule Reminders','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCRM data\";i:1;s:15:\"edit all events\";}i:1;s:2:\"or\";}','s:32:\"CRM_Admin_Page_ScheduleReminders\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:19:\"Schedule Reminders.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(144,1,'civicrm/admin/weight',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_Weight\";i:1;s:8:\"fixOrder\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(145,1,'civicrm/admin/options/preferred_communication_method',NULL,'Preferred Communication Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(146,1,'civicrm/admin/labelFormats',NULL,'Label Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LabelFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(147,1,'civicrm/admin/pdfFormats',NULL,'Print Page (PDF) Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_PdfFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(148,1,'civicrm/admin/options/communication_style',NULL,'Communication Style Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(149,1,'civicrm/admin/options/email_greeting',NULL,'Email Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(150,1,'civicrm/admin/options/postal_greeting',NULL,'Postal Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:2:{s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(151,1,'civicrm/admin/options/addressee',NULL,'Addressee Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(152,1,'civicrm/admin/setting/localization',NULL,'Languages, Currency, Locations','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Form_Setting_Localization\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(153,1,'civicrm/admin/setting/preferences/address',NULL,'Address Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Address\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(154,1,'civicrm/admin/setting/date',NULL,'Date Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Date\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(155,1,'civicrm/admin/options/languages',NULL,'Preferred Languages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:30:\"Options for contact languages.\";s:10:\"adminGroup\";s:12:\"Localization\";}'),(156,1,'civicrm/admin/access',NULL,'Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_Access\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(157,1,'civicrm/admin/access/wp-permissions',NULL,'WordPress Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_ACL_Form_WordPress_Permissions\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Access Control\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:4:\"desc\";s:65:\"Grant access to CiviCRM components and other CiviCRM permissions.\";}'),(158,1,'civicrm/admin/synchUser',NULL,'Synchronize Users to Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_CMSUser\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(159,1,'civicrm/admin/configtask',NULL,'Configuration Checklist','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Page_ConfigTaskList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}','civicrm/admin/configtask',NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(160,1,'civicrm/admin/setting/component',NULL,'Enable CiviCRM Components','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(161,1,'civicrm/admin/extensions',NULL,'Manage Extensions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Extensions\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:2:{s:4:\"desc\";s:0:\"\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(162,1,'civicrm/admin/extensions/upgrade',NULL,'Database Upgrades','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Page_ExtensionsUpgrade\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Manage Extensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(163,1,'civicrm/admin/setting/smtp',NULL,'Outbound Email Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Smtp\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(164,1,'civicrm/admin/paymentProcessor',NULL,'Settings - Payment Processor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:29:\"administer payment processors\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_PaymentProcessor\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(165,1,'civicrm/admin/setting/mapping',NULL,'Mapping and Geocoding','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Form_Setting_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(166,1,'civicrm/admin/setting/misc',NULL,'Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Form_Setting_Miscellaneous\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(167,1,'civicrm/admin/setting/path',NULL,'Directories','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Path\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(168,1,'civicrm/admin/setting/url',NULL,'Resource URLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Form_Setting_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(169,1,'civicrm/admin/setting/updateConfigBackend',NULL,'Cleanup Caches and Update Paths','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Admin_Form_Setting_UpdateConfigBackend\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(170,1,'civicrm/admin/setting/uf',NULL,'CMS Database Integration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Form_Setting_UF\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(171,1,'civicrm/admin/options/safe_file_extension',NULL,'Safe File Extension Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(172,1,'civicrm/admin/options',NULL,'Option Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(173,1,'civicrm/admin/mapping',NULL,'Import/Export Mappings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(174,1,'civicrm/admin/setting/debug',NULL,'Debugging','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Debugging\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(175,1,'civicrm/admin/setting/preferences/multisite',NULL,'Multi Site Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,130,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(176,1,'civicrm/admin/setting/preferences/campaign',NULL,'CiviCampaign Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:3:{s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(177,1,'civicrm/admin/setting/preferences/event',NULL,'CiviEvent Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(178,1,'civicrm/admin/setting/preferences/mailing',NULL,'CiviMail Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Mailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:2:{s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(179,1,'civicrm/admin/setting/preferences/member',NULL,'CiviMember Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Admin_Form_Preferences_Member\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(180,1,'civicrm/admin/runjobs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:20:\"executeScheduledJobs\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:36:\"URL used for running scheduled jobs.\";}'),(181,1,'civicrm/admin/job',NULL,'Scheduled Jobs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:18:\"CRM_Admin_Page_Job\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1370,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(182,1,'civicrm/admin/joblog',NULL,'Scheduled Jobs Log','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_JobLog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1380,1,0,NULL,'a:2:{s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(183,1,'civicrm/admin/options/grant_type',NULL,'Grant Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:10:\"adminGroup\";s:12:\"Option Lists\";}'),(184,1,'civicrm/admin/paymentProcessorType',NULL,'Payment Processor Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Page_PaymentProcessorType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:1:{s:4:\"desc\";s:34:\"Payment Processor type information\";}'),(185,1,'civicrm/admin',NULL,'Administer CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Admin_Page_Admin\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,9000,1,1,NULL,'a:0:{}'),(186,1,'civicrm/ajax/navmenu',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:7:\"navMenu\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(187,1,'civicrm/ajax/menutree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:8:\"menuTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(188,1,'civicrm/ajax/statusmsg',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:12:\"getStatusMsg\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(189,1,'civicrm/admin/price',NULL,'Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:10:\"adminGroup\";s:9:\"Customize\";}'),(190,1,'civicrm/admin/price/add','action=add','New Price Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";}'),(191,1,'civicrm/admin/price/field',NULL,'Price Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:20:\"CRM_Price_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,0,'a:0:{}'),(192,1,'civicrm/admin/price/field/option',NULL,'Price Field Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Price_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(193,1,'civicrm/ajax/mapping',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:11:\"mappingList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(194,1,'civicrm/ajax/recipientListing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:16:\"recipientListing\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(195,1,'civicrm/admin/sms/provider',NULL,'Sms Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Provider\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,500,1,0,NULL,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(196,1,'civicrm/sms/send',NULL,'New Mass SMS','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:23:\"CRM_SMS_Controller_Send\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(197,1,'civicrm/sms/callback',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Callback\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(198,1,'civicrm/admin/badgelayout','action=browse','Event Name Badge Layouts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Page_Layout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,399,1,0,NULL,'a:2:{s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(199,1,'civicrm/admin/badgelayout/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Form_Layout\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?reset=1&amp;action=browse\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(200,1,'civicrm/admin/ckeditor',NULL,'Configure CKEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_CKEditorConfig\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(201,1,'civicrm/upgrade',NULL,'Upgrade CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Upgrade_Page_Upgrade\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(202,1,'civicrm/export',NULL,'Download Errors','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(203,1,'civicrm/export/contact',NULL,'Export Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(204,1,'civicrm/export/standalone',NULL,'Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Export_Controller_Standalone\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(205,1,'civicrm/admin/options/acl_role',NULL,'ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(206,1,'civicrm/acl',NULL,'Manage ACLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_ACL_Page_ACL\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(207,1,'civicrm/acl/entityrole',NULL,'Assign Users to ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_ACL_Page_EntityRole\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(208,1,'civicrm/acl/basic',NULL,'ACL','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_ACL_Page_ACLBasic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(209,1,'civicrm/file',NULL,'Browse Uploaded files','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_Page_File\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(210,1,'civicrm/file/delete',NULL,'Delete File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:17:\"CRM_Core_BAO_File\";i:1;s:16:\"deleteAttachment\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:21:\"Browse Uploaded files\";s:3:\"url\";s:21:\"/civicrm/file?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(211,1,'civicrm/friend',NULL,'Tell a Friend','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:15:\"CRM_Friend_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(212,1,'civicrm/logout',NULL,'Log out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:6:\"logout\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,9999,1,1,NULL,'a:0:{}'),(213,1,'civicrm/i18n',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"translate CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_I18n_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(214,1,'civicrm/ajax/attachment',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:29:\"CRM_Core_Page_AJAX_Attachment\";i:1;s:10:\"attachFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(215,1,'civicrm/api',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(216,1,'civicrm/api3',NULL,'CiviCRM API v3','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_APIExplorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(217,1,'civicrm/ajax/apiexample',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:14:\"getExampleFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(218,1,'civicrm/ajax/apidoc',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:6:\"getDoc\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(219,1,'civicrm/ajax/rest',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:4:\"ajax\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(220,1,'civicrm/api/json',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:8:\"ajaxJson\";}','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(221,1,'civicrm/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:12:\"loadTemplate\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(222,1,'civicrm/ajax/chart',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(223,1,'civicrm/asset/builder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"\\Civi\\Core\\AssetBuilder\";i:1;s:7:\"pageRun\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(224,1,'civicrm/contribute/ajax/tableview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(225,1,'civicrm/payment/ipn',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Core_Payment\";i:1;s:9:\"handleIPN\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(226,1,'civicrm/batch',NULL,'Batch Data Entry','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(227,1,'civicrm/batch/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Batch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(228,1,'civicrm/batch/entry',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Entry\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(229,1,'civicrm/ajax/batch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:9:\"batchSave\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(230,1,'civicrm/ajax/batchlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:12:\"getBatchList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(231,1,'civicrm/ajax/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Page_AJAX\";i:1;s:3:\"run\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(232,1,'civicrm/dev/qunit',NULL,'QUnit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:19:\"CRM_Core_Page_QUnit\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(233,1,'civicrm/profile-editor/schema',NULL,'ProfileEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:25:\"CRM_UF_Page_ProfileEditor\";i:1;s:13:\"getSchemaJSON\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(234,1,'civicrm/a',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"\\Civi\\Angular\\Page\\Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(235,1,'civicrm/ajax/angular-modules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"\\Civi\\Angular\\Page\\Modules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(236,1,'civicrm/ajax/recurringentity/update-mode',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:34:\"CRM_Core_Page_AJAX_RecurringEntity\";i:1;s:10:\"updateMode\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(237,1,'civicrm/recurringentity/preview',NULL,'Confirm dates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Core_Page_RecurringEntityPreview\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(238,1,'civicrm/ajax/l10n-js',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Resources\";i:1;s:20:\"outputLocalizationJS\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(239,1,'civicrm/shortcode',NULL,'Insert CiviCRM Content','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Core_Form_ShortCode\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(240,1,'civicrm/task/add-to-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Form_Task_AddToGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(241,1,'civicrm/task/remove-from-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contact_Form_Task_RemoveFromGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(242,1,'civicrm/task/add-to-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Contact_Form_Task_AddToTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(243,1,'civicrm/task/remove-from-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Form_Task_RemoveFromTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(244,1,'civicrm/task/send-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(245,1,'civicrm/task/make-mailing-label',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Label\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(246,1,'civicrm/task/pick-profile',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contact_Form_Task_PickProfile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(247,1,'civicrm/task/print-document',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(248,1,'civicrm/task/unhold-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Unhold\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(249,1,'civicrm/task/alter-contact-preference',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contact_Form_Task_AlterPreferences\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(250,1,'civicrm/task/delete-contact',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(251,1,'civicrm/event',NULL,'CiviEvent Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,800,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(252,1,'civicrm/participant/add','action=add','Register New Participant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(253,1,'civicrm/event/info',NULL,'Event Information','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(254,1,'civicrm/event/register',NULL,'Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Controller_Registration\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(255,1,'civicrm/event/confirm',NULL,'Confirm Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:46:\"CRM_Event_Form_Registration_ParticipantConfirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(256,1,'civicrm/event/ical',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_ICalendar\";i:1;s:3:\"run\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(257,1,'civicrm/event/list',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','s:19:\"CRM_Event_Page_List\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(258,1,'civicrm/event/participant',NULL,'Event Participants List','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"view event participants\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Page_ParticipantListing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(259,1,'civicrm/admin/event',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(260,1,'civicrm/admin/eventTemplate',NULL,'Event Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Admin_Page_EventTemplate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,375,1,0,NULL,'a:2:{s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(261,1,'civicrm/admin/options/event_type',NULL,'Event Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(262,1,'civicrm/admin/participant_status',NULL,'Participant Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Page_ParticipantStatusType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(263,1,'civicrm/admin/options/participant_role',NULL,'Participant Role','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(264,1,'civicrm/admin/options/participant_listing',NULL,'Participant Listing Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,398,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(265,1,'civicrm/admin/options/conference_slot',NULL,'Conference Slot Labels','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(266,1,'civicrm/event/search',NULL,'Find Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,810,1,1,NULL,'a:0:{}'),(267,1,'civicrm/event/manage',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,820,1,1,NULL,'a:0:{}'),(268,1,'civicrm/event/badge',NULL,'Print Event Name Badge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:25:\"CRM_Event_Form_Task_Badge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(269,1,'civicrm/event/manage/settings',NULL,'Event Info and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,910,1,0,NULL,'a:0:{}'),(270,1,'civicrm/event/manage/location',NULL,'Event Location','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:35:\"CRM_Event_Form_ManageEvent_Location\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(271,1,'civicrm/event/manage/fee',NULL,'Event Fees','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_ManageEvent_Fee\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,920,1,0,NULL,'a:0:{}'),(272,1,'civicrm/event/manage/registration',NULL,'Event Online Registration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:39:\"CRM_Event_Form_ManageEvent_Registration\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(273,1,'civicrm/event/manage/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Friend_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,940,1,0,NULL,'a:0:{}'),(274,1,'civicrm/event/manage/reminder',NULL,'Schedule Reminders','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:44:\"CRM_Event_Form_ManageEvent_ScheduleReminders\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(275,1,'civicrm/event/manage/repeat',NULL,'Repeat Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Form_ManageEvent_Repeat\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,960,1,0,NULL,'a:0:{}'),(276,1,'civicrm/event/manage/conference',NULL,'Conference Slots','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:37:\"CRM_Event_Form_ManageEvent_Conference\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(277,1,'civicrm/event/add','action=add','New Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,830,1,0,NULL,'a:0:{}'),(278,1,'civicrm/event/import',NULL,'Import Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:23:\"edit event participants\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,840,1,1,NULL,'a:0:{}'),(279,1,'civicrm/event/price',NULL,'Manage Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,850,1,1,NULL,'a:0:{}'),(280,1,'civicrm/event/selfsvcupdate',NULL,'Self-service Registration Update','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Form_SelfSvcUpdate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,880,1,1,NULL,'a:0:{}'),(281,1,'civicrm/event/selfsvctransfer',NULL,'Self-service Registration Transfer','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_SelfSvcTransfer\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,890,1,1,NULL,'a:0:{}'),(282,1,'civicrm/contact/view/participant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,4,1,0,NULL,'a:0:{}'),(283,1,'civicrm/ajax/eventFee',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_Page_AJAX\";i:1;s:8:\"eventFee\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(284,1,'civicrm/ajax/locBlock',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:11:\"getLocBlock\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(285,1,'civicrm/event/participant/feeselection',NULL,'Change Registration Selections','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:38:\"CRM_Event_Form_ParticipantFeeSelection\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:23:\"Event Participants List\";s:3:\"url\";s:34:\"/civicrm/event/participant?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(286,1,'civicrm/event/manage/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_PCP_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,540,1,1,NULL,'a:0:{}'),(287,1,'civicrm/event/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(288,1,'civicrm/event/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(289,1,'civicrm/contribute',NULL,'CiviContribute Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,500,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(290,1,'civicrm/contribute/add','action=add','New Contribution','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(291,1,'civicrm/contribute/chart',NULL,'Contribution Summary - Chart View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(292,1,'civicrm/contribute/transact',NULL,'CiviContribute','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Controller_Contribution\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,1,0,1,0,NULL,'a:0:{}'),(293,1,'civicrm/admin/contribute',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,360,1,0,NULL,'a:2:{s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(294,1,'civicrm/admin/contribute/settings',NULL,'Title and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_Settings\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:0:{}'),(295,1,'civicrm/admin/contribute/amount',NULL,'Contribution Amounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Amount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:0:{}'),(296,1,'civicrm/admin/contribute/membership',NULL,'Membership Section','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Member_Form_MembershipBlock\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:0:{}'),(297,1,'civicrm/admin/contribute/custom',NULL,'Include Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Custom\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(298,1,'civicrm/admin/contribute/thankyou',NULL,'Thank-you and Receipting','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_ThankYou\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(299,1,'civicrm/admin/contribute/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Friend_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,440,1,0,NULL,'a:0:{}'),(300,1,'civicrm/admin/contribute/widget',NULL,'Configure Widget','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Widget\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,460,1,0,NULL,'a:0:{}'),(301,1,'civicrm/admin/contribute/premium',NULL,'Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:44:\"CRM_Contribute_Form_ContributionPage_Premium\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,470,1,0,NULL,'a:0:{}'),(302,1,'civicrm/admin/contribute/addProductToPage',NULL,'Add Products to This Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:47:\"CRM_Contribute_Form_ContributionPage_AddProduct\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,480,1,0,NULL,'a:0:{}'),(303,1,'civicrm/admin/contribute/add','action=add','New Contribution Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Contribute_Controller_ContributionPage\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(304,1,'civicrm/admin/contribute/managePremiums',NULL,'Manage Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Page_ManagePremiums\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,365,1,0,NULL,'a:2:{s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(305,1,'civicrm/admin/financial/financialType',NULL,'Financial Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Financial_Page_FinancialType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,580,1,0,NULL,'a:2:{s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(306,1,'civicrm/payment','action=add','New Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Form_AdditionalPayment\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(307,1,'civicrm/admin/financial/financialAccount',NULL,'Financial Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_FinancialAccount\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(308,1,'civicrm/admin/options/payment_instrument',NULL,'Payment Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(309,1,'civicrm/admin/options/accept_creditcard',NULL,'Accepted Credit Cards','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(310,1,'civicrm/admin/options/soft_credit_type',NULL,'Soft Credit Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(311,1,'civicrm/contact/view/contribution',NULL,'Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(312,1,'civicrm/contact/view/contributionrecur',NULL,'Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:37:\"CRM_Contribute_Page_ContributionRecur\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(313,1,'civicrm/contact/view/contribution/additionalinfo',NULL,'Additional Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:13:\"Contributions\";s:3:\"url\";s:42:\"/civicrm/contact/view/contribution?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(314,1,'civicrm/contribute/search',NULL,'Find Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,510,1,1,NULL,'a:0:{}'),(315,1,'civicrm/contribute/searchBatch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Controller_SearchBatch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,588,1,1,NULL,'a:0:{}'),(316,1,'civicrm/contribute/import',NULL,'Import Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"edit contributions\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,520,1,1,NULL,'a:0:{}'),(317,1,'civicrm/contribute/manage',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,530,1,1,NULL,'a:0:{}'),(318,1,'civicrm/contribute/additionalinfo',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(319,1,'civicrm/ajax/permlocation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:23:\"getPermissionedLocation\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(320,1,'civicrm/contribute/unsubscribe',NULL,'Cancel Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_CancelSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(321,1,'civicrm/contribute/onbehalf',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_Contribution_OnBehalfOf\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(322,1,'civicrm/contribute/updatebilling',NULL,'Update Billing Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contribute_Form_UpdateBilling\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(323,1,'civicrm/contribute/updaterecur',NULL,'Update Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_UpdateSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(324,1,'civicrm/contribute/subscriptionstatus',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Page_SubscriptionStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(325,1,'civicrm/admin/financial/financialType/accounts',NULL,'Financial Type Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:39:\"CRM_Financial_Page_FinancialTypeAccount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:15:\"Financial Types\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,581,1,0,NULL,'a:0:{}'),(326,1,'civicrm/financial/batch',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:33:\"CRM_Financial_Page_FinancialBatch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,585,1,0,NULL,'a:0:{}'),(327,1,'civicrm/financial/financialbatches',NULL,'Accounting Batches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Financial_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,586,1,0,NULL,'a:0:{}'),(328,1,'civicrm/batchtransaction',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_BatchTransaction\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,600,1,0,NULL,'a:0:{}'),(329,1,'civicrm/financial/batch/export',NULL,'Accounting Batch Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:25:\"CRM_Financial_Form_Export\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Accounting Batch\";s:3:\"url\";s:32:\"/civicrm/financial/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,0,NULL,'a:0:{}'),(330,1,'civicrm/payment/view','action=view','View Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contribute_Page_PaymentInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(331,1,'civicrm/admin/setting/preferences/contribute',NULL,'CiviContribute Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Admin_Form_Preferences_Contribute\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(332,1,'civicrm/contribute/invoice',NULL,'PDF Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Contribute_Form_Task_Invoice\";i:1;s:11:\"getPrintPDF\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,620,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(333,1,'civicrm/contribute/invoice/email',NULL,'Email Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Form_Task_Invoice\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"PDF Invoice\";s:3:\"url\";s:35:\"/civicrm/contribute/invoice?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,630,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(334,1,'civicrm/ajax/softcontributionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:24:\"CRM_Contribute_Page_AJAX\";i:1;s:23:\"getSoftContributionRows\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(335,1,'civicrm/contribute/contributionrecur-payments',NULL,'Recurring Contribution\'s Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Page_ContributionRecurPayments\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(336,1,'civicrm/membership/recurring-contributions',NULL,'Membership Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Member_Page_RecurringContributions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(337,1,'civicrm/admin/contribute/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_PCP_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,450,1,0,NULL,'a:0:{}'),(338,1,'civicrm/contribute/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(339,1,'civicrm/member',NULL,'CiviMember Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:25:\"CRM_Member_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,700,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(340,1,'civicrm/member/add','action=add','New Membership','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(341,1,'civicrm/admin/member/membershipType',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Page_MembershipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(342,1,'civicrm/admin/member/membershipStatus',NULL,'Membership Status Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Member_Page_MembershipStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(343,1,'civicrm/contact/view/membership','force=1,cid=%%cid%%','Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,2,1,0,NULL,'a:0:{}'),(344,1,'civicrm/membership/view',NULL,'Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipView\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,390,1,0,NULL,'a:0:{}'),(345,1,'civicrm/member/search',NULL,'Find Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,710,1,1,NULL,'a:0:{}'),(346,1,'civicrm/member/import',NULL,'Import Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:16:\"edit memberships\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,720,1,1,NULL,'a:0:{}'),(347,1,'civicrm/ajax/memType',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Member_Page_AJAX\";i:1;s:21:\"getMemberTypeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(348,1,'civicrm/admin/member/membershipType/add',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:16:\"Membership Types\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(349,1,'civicrm/mailing',NULL,'CiviMail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,600,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviMail\";}'),(350,1,'civicrm/admin/mail',NULL,'Mailer Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Mail\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(351,1,'civicrm/admin/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(352,1,'civicrm/admin/options/from_email_address/civimail',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:4:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}i:3;a:2:{s:5:\"title\";s:20:\"From Email Addresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(353,1,'civicrm/admin/mailSettings',NULL,'Mail Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_MailSettings\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:32:\"Configure email account setting.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(354,1,'civicrm/mailing/send',NULL,'New Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:27:\"CRM_Mailing_Controller_Send\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(355,1,'civicrm/mailing/browse/scheduled','scheduled=true','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:5:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";i:4;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(356,1,'civicrm/mailing/browse/unscheduled','scheduled=false','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(357,1,'civicrm/mailing/browse/archived',NULL,'Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,625,1,1,NULL,'a:0:{}'),(358,1,'civicrm/mailing/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,630,1,1,NULL,'a:0:{}'),(359,1,'civicrm/mailing/unsubscribe',NULL,'Unsubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Form_Unsubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,640,1,0,NULL,'a:0:{}'),(360,1,'civicrm/mailing/resubscribe',NULL,'Resubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Page_Resubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,645,1,0,NULL,'a:0:{}'),(361,1,'civicrm/mailing/optout',NULL,'Opt-out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Form_Optout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,650,1,0,NULL,'a:0:{}'),(362,1,'civicrm/mailing/confirm',NULL,'Confirm','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:24:\"CRM_Mailing_Page_Confirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(363,1,'civicrm/mailing/subscribe',NULL,'Subscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Form_Subscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(364,1,'civicrm/mailing/preview',NULL,'Preview Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Page_Preview\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,670,1,0,NULL,'a:0:{}'),(365,1,'civicrm/mailing/report','mid=%%mid%%','Mailing Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,680,1,0,NULL,'a:0:{}'),(366,1,'civicrm/mailing/forward',NULL,'Forward Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:31:\"CRM_Mailing_Form_ForwardMailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,685,1,0,NULL,'a:0:{}'),(367,1,'civicrm/mailing/queue',NULL,'Sending Mail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,690,1,0,NULL,'a:0:{}'),(368,1,'civicrm/mailing/report/event',NULL,'Mailing Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:22:\"CRM_Mailing_Page_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Mailing Report\";s:3:\"url\";s:47:\"/civicrm/mailing/report?reset=1&amp;mid=%%mid%%\";}}',NULL,NULL,4,NULL,NULL,NULL,0,695,1,0,NULL,'a:0:{}'),(369,1,'civicrm/ajax/template',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:8:\"template\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(370,1,'civicrm/mailing/view',NULL,'View Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:28:\"view public CiviMail content\";i:1;s:15:\"access CiviMail\";i:2;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:21:\"CRM_Mailing_Page_View\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,800,1,0,NULL,'a:0:{}'),(371,1,'civicrm/mailing/approve',NULL,'Approve Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Form_Approve\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,850,1,0,NULL,'a:0:{}'),(372,1,'civicrm/contact/view/mailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:20:\"CRM_Mailing_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(373,1,'civicrm/ajax/contactmailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:18:\"getContactMailings\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(374,1,'civicrm/mailing/url',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:20:\"CRM_Mailing_Page_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(375,1,'civicrm/mailing/open',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:21:\"CRM_Mailing_Page_Open\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(376,1,'civicrm/grant',NULL,'CiviGrant Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1000,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(377,1,'civicrm/grant/info',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(378,1,'civicrm/grant/search',NULL,'Find Grants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:27:\"CRM_Grant_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1010,1,1,NULL,'a:0:{}'),(379,1,'civicrm/grant/add','action=add','New Grant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(380,1,'civicrm/contact/view/grant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(381,1,'civicrm/pledge',NULL,'CiviPledge Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:25:\"CRM_Pledge_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,550,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(382,1,'civicrm/pledge/search',NULL,'Find Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:28:\"CRM_Pledge_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,560,1,1,NULL,'a:0:{}'),(383,1,'civicrm/contact/view/pledge','force=1,cid=%%cid%%','Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,570,1,0,NULL,'a:0:{}'),(384,1,'civicrm/pledge/add','action=add','New Pledge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(385,1,'civicrm/pledge/payment',NULL,'Pledge Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:23:\"CRM_Pledge_Page_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,580,1,0,NULL,'a:0:{}'),(386,1,'civicrm/ajax/pledgeAmount',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviPledge\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Pledge_Page_AJAX\";i:1;s:17:\"getPledgeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(387,1,'civicrm/case',NULL,'CiviCase Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Case_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,900,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(388,1,'civicrm/case/add',NULL,'Open Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Case_Form_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(389,1,'civicrm/case/search',NULL,'Find Cases','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,910,1,1,NULL,'a:0:{}'),(390,1,'civicrm/case/activity',NULL,'Case Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Case_Form_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(391,1,'civicrm/case/report',NULL,'Case Activity Audit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:20:\"CRM_Case_Form_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(392,1,'civicrm/case/cd/edit',NULL,'Case Custom Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Case_Form_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(393,1,'civicrm/contact/view/case',NULL,'Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:17:\"CRM_Case_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(394,1,'civicrm/case/activity/view',NULL,'Activity View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Form_ActivityView\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Case Activity\";s:3:\"url\";s:30:\"/civicrm/case/activity?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(395,1,'civicrm/contact/view/case/editClient',NULL,'Assign to Another Client','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Case_Form_EditClient\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:4:\"Case\";s:3:\"url\";s:34:\"/civicrm/contact/view/case?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(396,1,'civicrm/case/addToCase',NULL,'File on Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Case_Form_ActivityToCase\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(397,1,'civicrm/case/details',NULL,'Case Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Case_Page_CaseDetails\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(398,1,'civicrm/admin/setting/case',NULL,'CiviCase Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(399,1,'civicrm/admin/options/case_type',NULL,'Case Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:24:\"url=civicrm/a/#/caseType\";','a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(400,1,'civicrm/admin/options/redaction_rule',NULL,'Redaction Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(401,1,'civicrm/admin/options/case_status',NULL,'Case Statuses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(402,1,'civicrm/admin/options/encounter_medium',NULL,'Encounter Mediums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:26:\"List of encounter mediums.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(403,1,'civicrm/case/report/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Case_XMLProcessor_Report\";i:1;s:15:\"printCaseReport\";}',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:19:\"Case Activity Audit\";s:3:\"url\";s:28:\"/civicrm/case/report?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(404,1,'civicrm/case/ajax/addclient',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:9:\"addClient\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(405,1,'civicrm/case/ajax/processtags',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"processCaseTags\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(406,1,'civicrm/case/ajax/details',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:11:\"CaseDetails\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(407,1,'civicrm/ajax/delcaserole',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"deleteCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(408,1,'civicrm/ajax/get-cases',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:8:\"getCases\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(409,1,'civicrm/report',NULL,'CiviReport','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:22:\"CRM_Report_Page_Report\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1200,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviReport\";}'),(410,1,'civicrm/report/list',NULL,'CiviCRM Reports','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(411,1,'civicrm/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1220,1,1,NULL,'a:0:{}'),(412,1,'civicrm/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1241,1,1,NULL,'a:0:{}'),(413,1,'civicrm/admin/report/register',NULL,'Register Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Form_Register\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:30:\"Register the Report templates.\";}'),(414,1,'civicrm/report/instance',NULL,'Report','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Page_Instance\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(415,1,'civicrm/admin/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(416,1,'civicrm/admin/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(417,1,'civicrm/admin/report/list',NULL,'Reports Listing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(418,1,'civicrm/campaign',NULL,'Campaign Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:27:\"CRM_Campaign_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(419,1,'civicrm/campaign/add',NULL,'New Campaign','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Campaign\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(420,1,'civicrm/survey/add',NULL,'New Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(421,1,'civicrm/campaign/vote',NULL,'Conduct Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"reserve campaign contacts\";i:3;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Page_Vote\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(422,1,'civicrm/admin/campaign/surveyType',NULL,'Survey Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"administer CiviCampaign\";}i:1;s:3:\"and\";}','s:28:\"CRM_Campaign_Page_SurveyType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(423,1,'civicrm/admin/options/campaign_type',NULL,'Campaign Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,2,1,0,NULL,'a:3:{s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(424,1,'civicrm/admin/options/campaign_status',NULL,'Campaign Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,3,1,0,NULL,'a:3:{s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(425,1,'civicrm/admin/options/engagement_index',NULL,'Engagement Index','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,4,1,0,NULL,'a:3:{s:4:\"desc\";s:18:\"Engagement levels.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(426,1,'civicrm/survey/search','op=interview','Record Respondents Interview','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:30:\"CRM_Campaign_Controller_Search\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(427,1,'civicrm/campaign/gotv',NULL,'GOTV (Track Voters)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"release campaign contacts\";i:3;s:22:\"gotv campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Form_Gotv\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(428,1,'civicrm/petition/add',NULL,'New Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(429,1,'civicrm/petition/sign',NULL,'Sign Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:36:\"CRM_Campaign_Form_Petition_Signature\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(430,1,'civicrm/petition/browse',NULL,'View Petition Signatures','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Campaign_Page_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(431,1,'civicrm/petition/confirm',NULL,'Email address verified','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:34:\"CRM_Campaign_Page_Petition_Confirm\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(432,1,'civicrm/petition/thankyou',NULL,'Thank You','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:35:\"CRM_Campaign_Page_Petition_ThankYou\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(433,1,'civicrm/campaign/registerInterview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','a:2:{i:0;s:22:\"CRM_Campaign_Page_AJAX\";i:1;s:17:\"registerInterview\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(434,1,'civicrm/survey/configure/main',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(435,1,'civicrm/survey/configure/questions',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:34:\"CRM_Campaign_Form_Survey_Questions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(436,1,'civicrm/survey/configure/results',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:32:\"CRM_Campaign_Form_Survey_Results\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(437,1,'civicrm/survey/delete',NULL,'Delete Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:31:\"CRM_Campaign_Form_Survey_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(438,1,'civicrm/ajax/event/add_participant_to_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:23:\"add_participant_to_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(439,1,'civicrm/ajax/event/remove_participant_from_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:28:\"remove_participant_from_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(440,1,'civicrm/event/add_to_cart',NULL,'Add Event To Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:29:\"CRM_Event_Cart_Page_AddToCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(441,1,'civicrm/event/cart_checkout',NULL,'Cart Checkout','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Controller_Checkout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(442,1,'civicrm/event/remove_from_cart',NULL,'Remove From Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Page_RemoveFromCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(443,1,'civicrm/event/view_cart',NULL,'View Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Cart_Page_ViewCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(444,1,'admin',NULL,NULL,NULL,NULL,NULL,NULL,'a:15:{s:26:\"Customize Data and Screens\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:19:{s:26:\"{weight}.Tags (Categories)\";a:6:{s:5:\"title\";s:17:\"Tags (Categories)\";s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:2:\"id\";s:15:\"Tags_Categories\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Custom Data\";a:6:{s:5:\"title\";s:11:\"Custom Data\";s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:2:\"id\";s:10:\"CustomData\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:17:\"{weight}.Profiles\";a:6:{s:5:\"title\";s:8:\"Profiles\";s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:2:\"id\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Activity Types\";a:6:{s:5:\"title\";s:14:\"Activity Types\";s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:2:\"id\";s:13:\"ActivityTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/activity_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Relationship Types\";a:6:{s:5:\"title\";s:18:\"Relationship Types\";s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:2:\"id\";s:17:\"RelationshipTypes\";s:3:\"url\";s:30:\"/civicrm/admin/reltype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Contact Types\";a:6:{s:5:\"title\";s:13:\"Contact Types\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ContactTypes\";s:3:\"url\";s:38:\"/civicrm/admin/options/subtype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Gender Options\";a:6:{s:5:\"title\";s:14:\"Gender Options\";s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:2:\"id\";s:13:\"GenderOptions\";s:3:\"url\";s:37:\"/civicrm/admin/options/gender?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Prefixes (Ms, Mr...)\";a:6:{s:5:\"title\";s:31:\"Individual Prefixes (Ms, Mr...)\";s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:2:\"id\";s:27:\"IndividualPrefixes_Ms_Mr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_prefix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Suffixes (Jr, Sr...)\";a:6:{s:5:\"title\";s:31:\"Individual Suffixes (Jr, Sr...)\";s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:2:\"id\";s:27:\"IndividualSuffixes_Jr_Sr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_suffix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:39:\"{weight}.Location Types (Home, Work...)\";a:6:{s:5:\"title\";s:30:\"Location Types (Home, Work...)\";s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:2:\"id\";s:26:\"LocationTypes_Home_Work...\";s:3:\"url\";s:35:\"/civicrm/admin/locationType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Website Types\";a:6:{s:5:\"title\";s:13:\"Website Types\";s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:2:\"id\";s:12:\"WebsiteTypes\";s:3:\"url\";s:43:\"/civicrm/admin/options/website_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:35:\"{weight}.Instant Messenger Services\";a:6:{s:5:\"title\";s:26:\"Instant Messenger Services\";s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:2:\"id\";s:24:\"InstantMessengerServices\";s:3:\"url\";s:56:\"/civicrm/admin/options/instant_messenger_service?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Mobile Phone Providers\";a:6:{s:5:\"title\";s:22:\"Mobile Phone Providers\";s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:2:\"id\";s:20:\"MobilePhoneProviders\";s:3:\"url\";s:46:\"/civicrm/admin/options/mobile_provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Phone Type\";a:6:{s:5:\"title\";s:10:\"Phone Type\";s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:2:\"id\";s:9:\"PhoneType\";s:3:\"url\";s:41:\"/civicrm/admin/options/phone_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Display Preferences\";a:6:{s:5:\"title\";s:19:\"Display Preferences\";s:4:\"desc\";N;s:2:\"id\";s:18:\"DisplayPreferences\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/display?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Search Preferences\";a:6:{s:5:\"title\";s:18:\"Search Preferences\";s:4:\"desc\";N;s:2:\"id\";s:17:\"SearchPreferences\";s:3:\"url\";s:37:\"/civicrm/admin/setting/search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Navigation Menu\";a:6:{s:5:\"title\";s:15:\"Navigation Menu\";s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:2:\"id\";s:14:\"NavigationMenu\";s:3:\"url\";s:27:\"/civicrm/admin/menu?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Word Replacements\";a:6:{s:5:\"title\";s:17:\"Word Replacements\";s:4:\"desc\";s:18:\"Word Replacements.\";s:2:\"id\";s:16:\"WordReplacements\";s:3:\"url\";s:47:\"/civicrm/admin/options/wordreplacements?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Manage Custom Searches\";a:6:{s:5:\"title\";s:22:\"Manage Custom Searches\";s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:2:\"id\";s:20:\"ManageCustomSearches\";s:3:\"url\";s:44:\"/civicrm/admin/options/custom_search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:6:\"Manage\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:42:\"{weight}.Find and Merge Duplicate Contacts\";a:6:{s:5:\"title\";s:33:\"Find and Merge Duplicate Contacts\";s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:2:\"id\";s:29:\"FindandMergeDuplicateContacts\";s:3:\"url\";s:36:\"/civicrm/contact/deduperules?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Dedupe Exceptions\";a:6:{s:5:\"title\";s:17:\"Dedupe Exceptions\";s:4:\"desc\";N;s:2:\"id\";s:16:\"DedupeExceptions\";s:3:\"url\";s:33:\"/civicrm/dedupe/exception?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Scheduled Jobs Log\";a:6:{s:5:\"title\";s:18:\"Scheduled Jobs Log\";s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:2:\"id\";s:16:\"ScheduledJobsLog\";s:3:\"url\";s:29:\"/civicrm/admin/joblog?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"CiviContribute\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:32:\"{weight}.Personal Campaign Pages\";a:6:{s:5:\"title\";s:23:\"Personal Campaign Pages\";s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:2:\"id\";s:21:\"PersonalCampaignPages\";s:3:\"url\";s:49:\"/civicrm/admin/pcp?context=contribute&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Manage Contribution Pages\";a:6:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:2:\"id\";s:23:\"ManageContributionPages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Manage Premiums\";a:6:{s:5:\"title\";s:15:\"Manage Premiums\";s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:2:\"id\";s:14:\"ManagePremiums\";s:3:\"url\";s:48:\"/civicrm/admin/contribute/managePremiums?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Financial Types\";a:6:{s:5:\"title\";s:15:\"Financial Types\";s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:2:\"id\";s:14:\"FinancialTypes\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Financial Accounts\";a:6:{s:5:\"title\";s:18:\"Financial Accounts\";s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:2:\"id\";s:17:\"FinancialAccounts\";s:3:\"url\";s:49:\"/civicrm/admin/financial/financialAccount?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Payment Methods\";a:6:{s:5:\"title\";s:15:\"Payment Methods\";s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:2:\"id\";s:14:\"PaymentMethods\";s:3:\"url\";s:49:\"/civicrm/admin/options/payment_instrument?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Accepted Credit Cards\";a:6:{s:5:\"title\";s:21:\"Accepted Credit Cards\";s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:2:\"id\";s:19:\"AcceptedCreditCards\";s:3:\"url\";s:48:\"/civicrm/admin/options/accept_creditcard?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Soft Credit Types\";a:6:{s:5:\"title\";s:17:\"Soft Credit Types\";s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:2:\"id\";s:15:\"SoftCreditTypes\";s:3:\"url\";s:47:\"/civicrm/admin/options/soft_credit_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:42:\"{weight}.CiviContribute Component Settings\";a:6:{s:5:\"title\";s:33:\"CiviContribute Component Settings\";s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:2:\"id\";s:31:\"CiviContributeComponentSettings\";s:3:\"url\";s:53:\"/civicrm/admin/setting/preferences/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"Communications\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:11:{s:46:\"{weight}.Organization Address and Contact Info\";a:6:{s:5:\"title\";s:37:\"Organization Address and Contact Info\";s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:2:\"id\";s:33:\"OrganizationAddressandContactInfo\";s:3:\"url\";s:47:\"/civicrm/admin/domain?action=update&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Message Templates\";a:6:{s:5:\"title\";s:17:\"Message Templates\";s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:2:\"id\";s:16:\"MessageTemplates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Schedule Reminders\";a:6:{s:5:\"title\";s:18:\"Schedule Reminders\";s:4:\"desc\";s:19:\"Schedule Reminders.\";s:2:\"id\";s:17:\"ScheduleReminders\";s:3:\"url\";s:40:\"/civicrm/admin/scheduleReminders?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Preferred Communication Methods\";a:6:{s:5:\"title\";s:31:\"Preferred Communication Methods\";s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:2:\"id\";s:29:\"PreferredCommunicationMethods\";s:3:\"url\";s:61:\"/civicrm/admin/options/preferred_communication_method?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Label Formats\";a:6:{s:5:\"title\";s:13:\"Label Formats\";s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:2:\"id\";s:12:\"LabelFormats\";s:3:\"url\";s:35:\"/civicrm/admin/labelFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Print Page (PDF) Formats\";a:6:{s:5:\"title\";s:24:\"Print Page (PDF) Formats\";s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:2:\"id\";s:20:\"PrintPage_PDFFormats\";s:3:\"url\";s:33:\"/civicrm/admin/pdfFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Communication Style Options\";a:6:{s:5:\"title\";s:27:\"Communication Style Options\";s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:2:\"id\";s:25:\"CommunicationStyleOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/communication_style?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Email Greeting Formats\";a:6:{s:5:\"title\";s:22:\"Email Greeting Formats\";s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:2:\"id\";s:20:\"EmailGreetingFormats\";s:3:\"url\";s:45:\"/civicrm/admin/options/email_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Postal Greeting Formats\";a:6:{s:5:\"title\";s:23:\"Postal Greeting Formats\";s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:2:\"id\";s:21:\"PostalGreetingFormats\";s:3:\"url\";s:46:\"/civicrm/admin/options/postal_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Addressee Formats\";a:6:{s:5:\"title\";s:17:\"Addressee Formats\";s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:2:\"id\";s:16:\"AddresseeFormats\";s:3:\"url\";s:40:\"/civicrm/admin/options/addressee?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Localization\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:4:{s:39:\"{weight}.Languages, Currency, Locations\";a:6:{s:5:\"title\";s:30:\"Languages, Currency, Locations\";s:4:\"desc\";N;s:2:\"id\";s:28:\"Languages_Currency_Locations\";s:3:\"url\";s:43:\"/civicrm/admin/setting/localization?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Address Settings\";a:6:{s:5:\"title\";s:16:\"Address Settings\";s:4:\"desc\";N;s:2:\"id\";s:15:\"AddressSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Date Formats\";a:6:{s:5:\"title\";s:12:\"Date Formats\";s:4:\"desc\";N;s:2:\"id\";s:11:\"DateFormats\";s:3:\"url\";s:35:\"/civicrm/admin/setting/date?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Preferred Languages\";a:6:{s:5:\"title\";s:19:\"Preferred Languages\";s:4:\"desc\";s:30:\"Options for contact languages.\";s:2:\"id\";s:18:\"PreferredLanguages\";s:3:\"url\";s:40:\"/civicrm/admin/options/languages?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:21:\"Users and Permissions\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:2:{s:23:\"{weight}.Access Control\";a:6:{s:5:\"title\";s:14:\"Access Control\";s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:2:\"id\";s:13:\"AccessControl\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Synchronize Users to Contacts\";a:6:{s:5:\"title\";s:29:\"Synchronize Users to Contacts\";s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:2:\"id\";s:26:\"SynchronizeUserstoContacts\";s:3:\"url\";s:32:\"/civicrm/admin/synchUser?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:15:\"System Settings\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:18:{s:32:\"{weight}.Configuration Checklist\";a:6:{s:5:\"title\";s:23:\"Configuration Checklist\";s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:2:\"id\";s:22:\"ConfigurationChecklist\";s:3:\"url\";s:33:\"/civicrm/admin/configtask?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Enable CiviCRM Components\";a:6:{s:5:\"title\";s:25:\"Enable CiviCRM Components\";s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:2:\"id\";s:23:\"EnableCiviCRMComponents\";s:3:\"url\";s:40:\"/civicrm/admin/setting/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Manage Extensions\";a:6:{s:5:\"title\";s:17:\"Manage Extensions\";s:4:\"desc\";s:0:\"\";s:2:\"id\";s:16:\"ManageExtensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Outbound Email Settings\";a:6:{s:5:\"title\";s:23:\"Outbound Email Settings\";s:4:\"desc\";N;s:2:\"id\";s:21:\"OutboundEmailSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/smtp?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:37:\"{weight}.Settings - Payment Processor\";a:6:{s:5:\"title\";s:28:\"Settings - Payment Processor\";s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:2:\"id\";s:25:\"Settings-PaymentProcessor\";s:3:\"url\";s:39:\"/civicrm/admin/paymentProcessor?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Mapping and Geocoding\";a:6:{s:5:\"title\";s:21:\"Mapping and Geocoding\";s:4:\"desc\";N;s:2:\"id\";s:19:\"MappingandGeocoding\";s:3:\"url\";s:38:\"/civicrm/admin/setting/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:62:\"{weight}.Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";a:6:{s:5:\"title\";s:53:\"Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:2:\"id\";s:46:\"Misc_Undelete_PDFs_Limits_Logging_Captcha_etc.\";s:3:\"url\";s:35:\"/civicrm/admin/setting/misc?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Directories\";a:6:{s:5:\"title\";s:11:\"Directories\";s:4:\"desc\";N;s:2:\"id\";s:11:\"Directories\";s:3:\"url\";s:35:\"/civicrm/admin/setting/path?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Resource URLs\";a:6:{s:5:\"title\";s:13:\"Resource URLs\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ResourceURLs\";s:3:\"url\";s:34:\"/civicrm/admin/setting/url?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Cleanup Caches and Update Paths\";a:6:{s:5:\"title\";s:31:\"Cleanup Caches and Update Paths\";s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:2:\"id\";s:27:\"CleanupCachesandUpdatePaths\";s:3:\"url\";s:50:\"/civicrm/admin/setting/updateConfigBackend?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.CMS Database Integration\";a:6:{s:5:\"title\";s:24:\"CMS Database Integration\";s:4:\"desc\";N;s:2:\"id\";s:22:\"CMSDatabaseIntegration\";s:3:\"url\";s:33:\"/civicrm/admin/setting/uf?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Safe File Extension Options\";a:6:{s:5:\"title\";s:27:\"Safe File Extension Options\";s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:2:\"id\";s:24:\"SafeFileExtensionOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/safe_file_extension?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Option Groups\";a:6:{s:5:\"title\";s:13:\"Option Groups\";s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:2:\"id\";s:12:\"OptionGroups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Import/Export Mappings\";a:6:{s:5:\"title\";s:22:\"Import/Export Mappings\";s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:2:\"id\";s:21:\"Import_ExportMappings\";s:3:\"url\";s:30:\"/civicrm/admin/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:18:\"{weight}.Debugging\";a:6:{s:5:\"title\";s:9:\"Debugging\";s:4:\"desc\";N;s:2:\"id\";s:9:\"Debugging\";s:3:\"url\";s:36:\"/civicrm/admin/setting/debug?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Multi Site Settings\";a:6:{s:5:\"title\";s:19:\"Multi Site Settings\";s:4:\"desc\";N;s:2:\"id\";s:17:\"MultiSiteSettings\";s:3:\"url\";s:52:\"/civicrm/admin/setting/preferences/multisite?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Scheduled Jobs\";a:6:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:2:\"id\";s:13:\"ScheduledJobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Sms Providers\";a:6:{s:5:\"title\";s:13:\"Sms Providers\";s:4:\"desc\";s:27:\"To configure a sms provider\";s:2:\"id\";s:12:\"SmsProviders\";s:3:\"url\";s:35:\"/civicrm/admin/sms/provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"CiviCampaign\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:40:\"{weight}.CiviCampaign Component Settings\";a:6:{s:5:\"title\";s:31:\"CiviCampaign Component Settings\";s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:2:\"id\";s:29:\"CiviCampaignComponentSettings\";s:3:\"url\";s:51:\"/civicrm/admin/setting/preferences/campaign?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Survey Types\";a:6:{s:5:\"title\";s:12:\"Survey Types\";s:4:\"desc\";N;s:2:\"id\";s:11:\"SurveyTypes\";s:3:\"url\";s:42:\"/civicrm/admin/campaign/surveyType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Campaign Types\";a:6:{s:5:\"title\";s:14:\"Campaign Types\";s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:2:\"id\";s:13:\"CampaignTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/campaign_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Campaign Status\";a:6:{s:5:\"title\";s:15:\"Campaign Status\";s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:2:\"id\";s:14:\"CampaignStatus\";s:3:\"url\";s:46:\"/civicrm/admin/options/campaign_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Engagement Index\";a:6:{s:5:\"title\";s:16:\"Engagement Index\";s:4:\"desc\";s:18:\"Engagement levels.\";s:2:\"id\";s:15:\"EngagementIndex\";s:3:\"url\";s:47:\"/civicrm/admin/options/engagement_index?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"CiviEvent\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:37:\"{weight}.CiviEvent Component Settings\";a:6:{s:5:\"title\";s:28:\"CiviEvent Component Settings\";s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:2:\"id\";s:26:\"CiviEventComponentSettings\";s:3:\"url\";s:48:\"/civicrm/admin/setting/preferences/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Event Name Badge Layouts\";a:6:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:2:\"id\";s:21:\"EventNameBadgeLayouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?action=browse&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Manage Events\";a:6:{s:5:\"title\";s:13:\"Manage Events\";s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:2:\"id\";s:12:\"ManageEvents\";s:3:\"url\";s:28:\"/civicrm/admin/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Event Templates\";a:6:{s:5:\"title\";s:15:\"Event Templates\";s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:2:\"id\";s:14:\"EventTemplates\";s:3:\"url\";s:36:\"/civicrm/admin/eventTemplate?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Event Types\";a:6:{s:5:\"title\";s:11:\"Event Types\";s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:2:\"id\";s:10:\"EventTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/event_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Participant Status\";a:6:{s:5:\"title\";s:18:\"Participant Status\";s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:2:\"id\";s:17:\"ParticipantStatus\";s:3:\"url\";s:41:\"/civicrm/admin/participant_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Participant Role\";a:6:{s:5:\"title\";s:16:\"Participant Role\";s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:2:\"id\";s:15:\"ParticipantRole\";s:3:\"url\";s:47:\"/civicrm/admin/options/participant_role?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Participant Listing Templates\";a:6:{s:5:\"title\";s:29:\"Participant Listing Templates\";s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:2:\"id\";s:27:\"ParticipantListingTemplates\";s:3:\"url\";s:50:\"/civicrm/admin/options/participant_listing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Conference Slot Labels\";a:6:{s:5:\"title\";s:22:\"Conference Slot Labels\";s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:2:\"id\";s:20:\"ConferenceSlotLabels\";s:3:\"url\";s:46:\"/civicrm/admin/options/conference_slot?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviMail\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:36:\"{weight}.CiviMail Component Settings\";a:6:{s:5:\"title\";s:27:\"CiviMail Component Settings\";s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:2:\"id\";s:25:\"CiviMailComponentSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/mailing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Mailer Settings\";a:6:{s:5:\"title\";s:15:\"Mailer Settings\";s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:2:\"id\";s:14:\"MailerSettings\";s:3:\"url\";s:27:\"/civicrm/admin/mail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:49:\"{weight}.Headers, Footers, and Automated Messages\";a:6:{s:5:\"title\";s:40:\"Headers, Footers, and Automated Messages\";s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:2:\"id\";s:36:\"Headers_Footers_andAutomatedMessages\";s:3:\"url\";s:32:\"/civicrm/admin/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:58:\"/civicrm/admin/options/from_email_address/civimail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Mail Accounts\";a:6:{s:5:\"title\";s:13:\"Mail Accounts\";s:4:\"desc\";s:32:\"Configure email account setting.\";s:2:\"id\";s:12:\"MailAccounts\";s:3:\"url\";s:35:\"/civicrm/admin/mailSettings?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviMember\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:38:\"{weight}.CiviMember Component Settings\";a:6:{s:5:\"title\";s:29:\"CiviMember Component Settings\";s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:2:\"id\";s:27:\"CiviMemberComponentSettings\";s:3:\"url\";s:49:\"/civicrm/admin/setting/preferences/member?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Membership Types\";a:6:{s:5:\"title\";s:16:\"Membership Types\";s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:2:\"id\";s:15:\"MembershipTypes\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Membership Status Rules\";a:6:{s:5:\"title\";s:23:\"Membership Status Rules\";s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:2:\"id\";s:21:\"MembershipStatusRules\";s:3:\"url\";s:46:\"/civicrm/admin/member/membershipStatus?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Option Lists\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:20:\"{weight}.Grant Types\";a:6:{s:5:\"title\";s:11:\"Grant Types\";s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:2:\"id\";s:10:\"GrantTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/grant_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"Customize\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:19:\"{weight}.Price Sets\";a:6:{s:5:\"title\";s:10:\"Price Sets\";s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:2:\"id\";s:9:\"PriceSets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviCase\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:26:\"{weight}.CiviCase Settings\";a:6:{s:5:\"title\";s:17:\"CiviCase Settings\";s:4:\"desc\";N;s:2:\"id\";s:16:\"CiviCaseSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/case?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Case Types\";a:6:{s:5:\"title\";s:10:\"Case Types\";s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:2:\"id\";s:9:\"CaseTypes\";s:3:\"url\";s:40:\"/civicrm/admin/options/case_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Redaction Rules\";a:6:{s:5:\"title\";s:15:\"Redaction Rules\";s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:2:\"id\";s:14:\"RedactionRules\";s:3:\"url\";s:45:\"/civicrm/admin/options/redaction_rule?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Case Statuses\";a:6:{s:5:\"title\";s:13:\"Case Statuses\";s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:2:\"id\";s:12:\"CaseStatuses\";s:3:\"url\";s:42:\"/civicrm/admin/options/case_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Encounter Mediums\";a:6:{s:5:\"title\";s:17:\"Encounter Mediums\";s:4:\"desc\";s:26:\"List of encounter mediums.\";s:2:\"id\";s:16:\"EncounterMediums\";s:3:\"url\";s:47:\"/civicrm/admin/options/encounter_medium?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviReport\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:40:\"{weight}.Create New Report from Template\";a:6:{s:5:\"title\";s:31:\"Create New Report from Template\";s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:2:\"id\";s:27:\"CreateNewReportfromTemplate\";s:3:\"url\";s:43:\"/civicrm/admin/report/template/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Manage Templates\";a:6:{s:5:\"title\";s:16:\"Manage Templates\";s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:2:\"id\";s:15:\"ManageTemplates\";s:3:\"url\";s:53:\"/civicrm/admin/report/options/report_template?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Reports Listing\";a:6:{s:5:\"title\";s:15:\"Reports Listing\";s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:2:\"id\";s:14:\"ReportsListing\";s:3:\"url\";s:34:\"/civicrm/admin/report/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,NULL,'a:0:{}');
+INSERT INTO `civicrm_menu` (`id`, `domain_id`, `path`, `path_arguments`, `title`, `access_callback`, `access_arguments`, `page_callback`, `page_arguments`, `breadcrumb`, `return_url`, `return_url_args`, `component_id`, `is_active`, `is_public`, `is_exposed`, `is_ssl`, `weight`, `type`, `page_type`, `skipBreadcrumb`, `module_data`) VALUES (1,1,'civicrm/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Custom_Form_CustomDataByType\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(2,1,'civicrm/payment/form',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:26:\"CRM_Financial_Form_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(3,1,'civicrm/payment/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:30:\"CRM_Financial_Form_PaymentEdit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(4,1,'civicrm/custom/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Custom_Form_CustomData\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(5,1,'civicrm/ajax/optionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:13:\"getOptionList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(6,1,'civicrm/ajax/reorder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:11:\"fixOrdering\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(7,1,'civicrm/ajax/multirecordfieldlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Custom_Page_AJAX\";i:1;s:23:\"getMultiRecordFieldList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(8,1,'civicrm/ajax/api4',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','s:18:\"CRM_Api4_Page_AJAX\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(9,1,'civicrm/api4',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Api4_Page_Api4Explorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(10,1,'civicrm/import',NULL,'Import','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,400,1,1,NULL,'a:0:{}'),(11,1,'civicrm/import/contact',NULL,'Import Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,410,1,1,NULL,'a:0:{}'),(12,1,'civicrm/import/activity',NULL,'Import Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(13,1,'civicrm/import/custom','id=%%id%%','Import Multi-value Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Custom_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:6:\"Import\";s:3:\"url\";s:23:\"/civicrm/import?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,420,1,1,NULL,'a:0:{}'),(14,1,'civicrm/ajax/status',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"import contacts\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Contact_Import_Page_AJAX\";i:1;s:6:\"status\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(15,1,'civicrm',NULL,'CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:0:{}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(16,1,'civicrm/dashboard',NULL,'CiviCRM Home','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,1,NULL,'a:0:{}'),(17,1,'civicrm/dashlet',NULL,'CiviCRM Dashlets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Page_Dashlet\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,1,NULL,'a:0:{}'),(18,1,'civicrm/contact/search',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,10,1,1,NULL,'a:0:{}'),(19,1,'civicrm/contact/image',NULL,'Process Uploaded Images','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"CRM_Contact_BAO_Contact\";i:1;s:12:\"processImage\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(20,1,'civicrm/contact/imagefile',NULL,'Get Image File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"CRM_Contact_Page_ImageFile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(21,1,'civicrm/contact/search/basic',NULL,'Find Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(22,1,'civicrm/contact/search/advanced',NULL,'Advanced Search','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=512\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,12,1,1,NULL,'a:0:{}'),(23,1,'civicrm/contact/search/builder',NULL,'Search Builder','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:9:\"mode=8192\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,14,1,1,NULL,'a:0:{}'),(24,1,'civicrm/contact/search/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(25,1,'civicrm/contact/search/custom/list',NULL,'Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Page_CustomSearch\";','s:10:\"mode=16384\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Find Contacts\";s:3:\"url\";s:31:\"/civicrm/contact/search?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,16,1,1,NULL,'a:0:{}'),(26,1,'civicrm/contact/add',NULL,'New Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(27,1,'civicrm/contact/add/individual','ct=Individual','New Individual','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(28,1,'civicrm/contact/add/household','ct=Household','New Household','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(29,1,'civicrm/contact/add/organization','ct=Organization','New Organization','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:12:\"add contacts\";}i:1;s:3:\"and\";}','s:24:\"CRM_Contact_Form_Contact\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Contact\";s:3:\"url\";s:28:\"/civicrm/contact/add?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(30,1,'civicrm/contact/relatedcontact',NULL,'Edit Related Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_RelatedContact\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(31,1,'civicrm/contact/merge',NULL,'Merge Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:22:\"CRM_Contact_Form_Merge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(32,1,'civicrm/contact/email',NULL,'Email a Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(33,1,'civicrm/contact/map',NULL,'Map Location(s)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_Map\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(34,1,'civicrm/contact/map/event',NULL,'Map Event Location','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contact_Form_Task_Map_Event\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Map Location(s)\";s:3:\"url\";s:28:\"/civicrm/contact/map?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(35,1,'civicrm/contact/view','cid=%%cid%%','Contact Summary','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Summary\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(36,1,'civicrm/contact/view/delete',NULL,'Delete Contact','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(37,1,'civicrm/contact/view/activity','show=1,cid=%%cid%%','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:21:\"CRM_Activity_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(38,1,'civicrm/activity/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(39,1,'civicrm/activity/email/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(40,1,'civicrm/activity/pdf/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(41,1,'civicrm/contact/view/rel','cid=%%cid%%','Relationships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_Relationship\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(42,1,'civicrm/contact/view/group','cid=%%cid%%','Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contact_Page_View_GroupContact\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(43,1,'civicrm/contact/view/smartgroup','cid=%%cid%%','Smart Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:39:\"CRM_Contact_Page_View_ContactSmartGroup\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(44,1,'civicrm/contact/view/note','cid=%%cid%%','Notes','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:26:\"CRM_Contact_Page_View_Note\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(45,1,'civicrm/contact/view/tag','cid=%%cid%%','Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Tag\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(46,1,'civicrm/contact/view/cd',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:32:\"CRM_Contact_Page_View_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(47,1,'civicrm/contact/view/cd/edit',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Form_CustomData\";','s:13:\"addSequence=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(48,1,'civicrm/contact/view/vcard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Vcard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(49,1,'civicrm/contact/view/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:27:\"CRM_Contact_Page_View_Print\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(50,1,'civicrm/contact/view/log',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:25:\"CRM_Contact_Page_View_Log\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(51,1,'civicrm/user',NULL,'Contact Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"access Contact Dashboard\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Page_View_UserDashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(52,1,'civicrm/dashlet/activity',NULL,'Activity Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(53,1,'civicrm/dashlet/blog',NULL,'CiviCRM Blog','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Dashlet_Page_Blog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(54,1,'civicrm/dashlet/getting-started',NULL,'CiviCRM Resources','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Dashlet_Page_GettingStarted\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(55,1,'civicrm/ajax/relation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"relationship\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(56,1,'civicrm/ajax/groupTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"groupTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(57,1,'civicrm/ajax/custom',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:11:\"customField\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(58,1,'civicrm/ajax/customvalue',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:17:\"deleteCustomValue\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(59,1,'civicrm/ajax/cmsuser',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"checkUserName\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(60,1,'civicrm/ajax/checkemail',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactEmail\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(61,1,'civicrm/ajax/checkphone',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:15:\"getContactPhone\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(62,1,'civicrm/ajax/subtype',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"buildSubTypes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(63,1,'civicrm/ajax/dashboard',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"dashboard\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(64,1,'civicrm/ajax/signature',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:12:\"getSignature\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(65,1,'civicrm/ajax/pdfFormat',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"pdfFormat\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(66,1,'civicrm/ajax/paperSize',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:9:\"paperSize\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(67,1,'civicrm/ajax/contactref',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:31:\"access contact reference fields\";i:1;s:15:\" access CiviCRM\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"contactReference\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(68,1,'civicrm/dashlet/myCases',NULL,'Case Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Dashlet_Page_MyCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(69,1,'civicrm/dashlet/allCases',NULL,'All Cases Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:25:\"CRM_Dashlet_Page_AllCases\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(70,1,'civicrm/dashlet/casedashboard',NULL,'Case Dashboard Dashlet','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Dashlet_Page_CaseDashboard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"CiviCRM Dashlets\";s:3:\"url\";s:24:\"/civicrm/dashlet?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(71,1,'civicrm/contact/deduperules',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer dedupe rules\";i:1;s:24:\"merge duplicate contacts\";}i:1;s:2:\"or\";}','s:28:\"CRM_Contact_Page_DedupeRules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,105,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(72,1,'civicrm/contact/dedupefind',NULL,'Find and Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Page_DedupeFind\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(73,1,'civicrm/ajax/dedupefind',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:10:\"getDedupes\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(74,1,'civicrm/contact/dedupemerge',NULL,'Batch Merge Duplicate Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Page_DedupeMerge\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(75,1,'civicrm/dedupe/exception',NULL,'Dedupe Exceptions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Page_DedupeException\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,110,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:6:\"Manage\";}'),(76,1,'civicrm/ajax/dedupeRules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:16:\"buildDedupeRules\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(77,1,'civicrm/contact/view/useradd','cid=%%cid%%','Add User','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:29:\"CRM_Contact_Page_View_Useradd\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(78,1,'civicrm/ajax/markSelection',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:22:\"selectUnselectContacts\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(79,1,'civicrm/ajax/toggleDedupeSelect',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:18:\"toggleDedupeSelect\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(80,1,'civicrm/ajax/flipDupePairs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:24:\"merge duplicate contacts\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:13:\"flipDupePairs\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(81,1,'civicrm/activity/sms/add','action=add','Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_SMS\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(82,1,'civicrm/ajax/contactrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"view my contact\";}i:1;s:2:\"or\";}','a:2:{i:0;s:21:\"CRM_Contact_Page_AJAX\";i:1;s:23:\"getContactRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(83,1,'civicrm/activity','action=add&context=standalone','New Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Activity_Form_Activity\";','s:14:\"attachUpload=1\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(84,1,'civicrm/activity/view',NULL,'View Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Form_ActivityView\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(85,1,'civicrm/ajax/activity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:15:\"getCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(86,1,'civicrm/ajax/globalrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseGlobalRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(87,1,'civicrm/ajax/clientrelationships',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:26:\"getCaseClientRelationships\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(88,1,'civicrm/ajax/caseroles',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:12:\"getCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(89,1,'civicrm/ajax/contactactivity',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:18:\"getContactActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(90,1,'civicrm/ajax/activity/convert',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:22:\"CRM_Activity_Page_AJAX\";i:1;s:21:\"convertToCaseActivity\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(91,1,'civicrm/activity/search',NULL,'Find Activities','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Activity_Controller_Search\";','s:14:\"attachUpload=1\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:12:\"New Activity\";s:3:\"url\";s:63:\"/civicrm/activity?reset=1&amp;action=add&amp;context=standalone\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(92,1,'civicrm/tag',NULL,'Tags (Categories)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:16:\"CRM_Tag_Page_Tag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,25,1,0,NULL,'a:2:{s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(93,1,'civicrm/tag/edit','action=add','New Tag','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:17:\"CRM_Tag_Form_Edit\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(94,1,'civicrm/tag/merge',NULL,'Merge Tags','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','s:18:\"CRM_Tag_Form_Merge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:17:\"Tags (Categories)\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(95,1,'civicrm/ajax/tagTree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:11:\"manage tags\";}i:1;s:2:\"or\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:10:\"getTagTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(96,1,'civicrm/group',NULL,'Manage Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Page_Group\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,30,1,1,NULL,'a:0:{}'),(97,1,'civicrm/group/search',NULL,'Group Members','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contact_Controller_Search\";','s:8:\"mode=256\";','a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:7:\"comment\";s:164:\"Note: group search already respect ACL, so a strict permission at url level is not required. A simple/basic permission like \'access CiviCRM\' could be used. CRM-5417\";}'),(98,1,'civicrm/group/add',NULL,'New Group','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:11:\"edit groups\";}i:1;s:3:\"and\";}','s:20:\"CRM_Group_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:13:\"Manage Groups\";s:3:\"url\";s:22:\"/civicrm/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(99,1,'civicrm/ajax/grouplist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Group_Page_AJAX\";i:1;s:12:\"getGroupList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(100,1,'civicrm/upgrade',NULL,'Upgrade CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Upgrade_Page_Upgrade\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(101,1,'civicrm/export',NULL,'Download Errors','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(102,1,'civicrm/export/contact',NULL,'Export Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Export_BAO_Export\";i:1;s:6:\"invoke\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(103,1,'civicrm/export/standalone',NULL,'Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Export_Controller_Standalone\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Download Errors\";s:3:\"url\";s:23:\"/civicrm/export?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(104,1,'civicrm/admin/options/acl_role',NULL,'ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(105,1,'civicrm/acl',NULL,'Manage ACLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_ACL_Page_ACL\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(106,1,'civicrm/acl/entityrole',NULL,'Assign Users to ACL Roles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_ACL_Page_EntityRole\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(107,1,'civicrm/acl/basic',NULL,'ACL','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_ACL_Page_ACLBasic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"Manage ACLs\";s:3:\"url\";s:20:\"/civicrm/acl?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(108,1,'civicrm/file',NULL,'Browse Uploaded files','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access uploaded files\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_Page_File\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(109,1,'civicrm/file/delete',NULL,'Delete File','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:17:\"CRM_Core_BAO_File\";i:1;s:16:\"deleteAttachment\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:21:\"Browse Uploaded files\";s:3:\"url\";s:21:\"/civicrm/file?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(110,1,'civicrm/friend',NULL,'Tell a Friend','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:15:\"CRM_Friend_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(111,1,'civicrm/logout',NULL,'Log out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:6:\"logout\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,9999,1,1,NULL,'a:0:{}'),(112,1,'civicrm/i18n',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"translate CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Core_I18n_Form\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(113,1,'civicrm/ajax/attachment',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:29:\"CRM_Core_Page_AJAX_Attachment\";i:1;s:10:\"attachFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(114,1,'civicrm/api',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(115,1,'civicrm/api3',NULL,'CiviCRM API v3','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_APIExplorer\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(116,1,'civicrm/ajax/apiexample',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:14:\"getExampleFile\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(117,1,'civicrm/ajax/apidoc',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:26:\"CRM_Admin_Page_APIExplorer\";i:1;s:6:\"getDoc\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(118,1,'civicrm/ajax/rest',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access AJAX API\";}i:1;s:2:\"or\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:4:\"ajax\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(119,1,'civicrm/api/json',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:8:\"ajaxJson\";}','s:16:\"url=civicrm/api3\";','a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(120,1,'civicrm/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:14:\"CRM_Utils_REST\";i:1;s:12:\"loadTemplate\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(121,1,'civicrm/ajax/chart',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(122,1,'civicrm/asset/builder',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','a:2:{i:0;s:23:\"\\Civi\\Core\\AssetBuilder\";i:1;s:7:\"pageRun\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(123,1,'civicrm/contribute/ajax/tableview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(124,1,'civicrm/payment/ipn',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Core_Payment\";i:1;s:9:\"handleIPN\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(125,1,'civicrm/batch',NULL,'Batch Data Entry','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(126,1,'civicrm/batch/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Batch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(127,1,'civicrm/batch/entry',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:20:\"CRM_Batch_Form_Entry\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Batch Data Entry\";s:3:\"url\";s:22:\"/civicrm/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(128,1,'civicrm/ajax/batch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:9:\"batchSave\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(129,1,'civicrm/ajax/batchlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Batch_Page_AJAX\";i:1;s:12:\"getBatchList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(130,1,'civicrm/ajax/inline',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Page_AJAX\";i:1;s:3:\"run\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(131,1,'civicrm/dev/qunit',NULL,'QUnit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:19:\"CRM_Core_Page_QUnit\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(132,1,'civicrm/profile-editor/schema',NULL,'ProfileEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:25:\"CRM_UF_Page_ProfileEditor\";i:1;s:13:\"getSchemaJSON\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(133,1,'civicrm/a',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"\\Civi\\Angular\\Page\\Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(134,1,'civicrm/ajax/angular-modules',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:26:\"\\Civi\\Angular\\Page\\Modules\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(135,1,'civicrm/ajax/recurringentity/update-mode',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:34:\"CRM_Core_Page_AJAX_RecurringEntity\";i:1;s:10:\"updateMode\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(136,1,'civicrm/recurringentity/preview',NULL,'Confirm dates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Core_Page_RecurringEntityPreview\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(137,1,'civicrm/ajax/l10n-js',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Core_Resources\";i:1;s:20:\"outputLocalizationJS\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(138,1,'civicrm/shortcode',NULL,'Insert CiviCRM Content','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Core_Form_ShortCode\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(139,1,'civicrm/task/add-to-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contact_Form_Task_AddToGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(140,1,'civicrm/task/remove-from-group',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contact_Form_Task_RemoveFromGroup\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(141,1,'civicrm/task/add-to-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Contact_Form_Task_AddToTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(142,1,'civicrm/task/remove-from-tag',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Contact_Form_Task_RemoveFromTag\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(143,1,'civicrm/task/send-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Email\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(144,1,'civicrm/task/make-mailing-label',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Contact_Form_Task_Label\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(145,1,'civicrm/task/pick-profile',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contact_Form_Task_PickProfile\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(146,1,'civicrm/task/print-document',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Contact_Form_Task_PDF\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(147,1,'civicrm/task/unhold-email',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Unhold\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(148,1,'civicrm/task/alter-contact-preference',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contact_Form_Task_AlterPreferences\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(149,1,'civicrm/task/delete-contact',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Contact_Form_Task_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(150,1,'civicrm/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(151,1,'civicrm/pcp/campaign',NULL,'Setup a Personal Campaign Page - Account Information','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(152,1,'civicrm/pcp/info',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_PCP_Page_PCPInfo\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(153,1,'civicrm/admin/pcp','context=contribute','Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Page_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,362,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(154,1,'civicrm/admin/custom/group',NULL,'Custom Data','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(155,1,'civicrm/admin/custom/group/field',NULL,'Custom Data Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,11,1,0,0,'a:0:{}'),(156,1,'civicrm/admin/custom/group/field/option',NULL,'Custom Field - Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Custom_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(157,1,'civicrm/admin/custom/group/field/add',NULL,'Custom Field - Add','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(158,1,'civicrm/admin/custom/group/field/update',NULL,'Custom Field - Edit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Custom_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(159,1,'civicrm/admin/custom/group/field/move',NULL,'Custom Field - Move','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Custom_Form_MoveField\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"Custom Data\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(160,1,'civicrm/admin/uf/group',NULL,'Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Group\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(161,1,'civicrm/admin/uf/group/field',NULL,'CiviCRM Profile Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,21,1,0,0,'a:0:{}'),(162,1,'civicrm/admin/uf/group/field/add',NULL,'Add Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,22,1,0,NULL,'a:0:{}'),(163,1,'civicrm/admin/uf/group/field/update',NULL,'Edit Field','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,23,1,0,NULL,'a:0:{}'),(164,1,'civicrm/admin/uf/group/add',NULL,'New CiviCRM Profile','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,24,1,0,NULL,'a:0:{}'),(165,1,'civicrm/admin/uf/group/update',NULL,'Profile Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:17:\"CRM_UF_Form_Group\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,25,1,0,NULL,'a:0:{}'),(166,1,'civicrm/admin/uf/group/setting',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_UF_Form_AdvanceSetting\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,0,1,0,NULL,'a:0:{}'),(167,1,'civicrm/admin/options/activity_type',NULL,'Activity Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(168,1,'civicrm/admin/reltype',NULL,'Relationship Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_RelationshipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,35,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(169,1,'civicrm/admin/options/subtype',NULL,'Contact Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Page_ContactType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(170,1,'civicrm/admin/options/gender',NULL,'Gender Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,45,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(171,1,'civicrm/admin/options/individual_prefix',NULL,'Individual Prefixes (Ms, Mr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(172,1,'civicrm/admin/options/individual_suffix',NULL,'Individual Suffixes (Jr, Sr...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,55,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(173,1,'civicrm/admin/locationType',NULL,'Location Types (Home, Work...)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LocationType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(174,1,'civicrm/admin/options/website_type',NULL,'Website Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,65,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(175,1,'civicrm/admin/options/instant_messenger_service',NULL,'Instant Messenger Services','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(176,1,'civicrm/admin/options/mobile_provider',NULL,'Mobile Phone Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(177,1,'civicrm/admin/options/phone_type',NULL,'Phone Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(178,1,'civicrm/admin/setting/preferences/display',NULL,'Display Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Display\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(179,1,'civicrm/admin/setting/search',NULL,'Search Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_Setting_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,95,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(180,1,'civicrm/admin/setting/preferences/date',NULL,'View Date Preferences','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Page_PreferencesDate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(181,1,'civicrm/admin/menu',NULL,'Navigation Menu','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Navigation\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(182,1,'civicrm/admin/options/wordreplacements',NULL,'Word Replacements','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Form_WordReplacements\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:18:\"Word Replacements.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(183,1,'civicrm/admin/options/custom_search',NULL,'Manage Custom Searches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:10:\"adminGroup\";s:26:\"Customize Data and Screens\";}'),(184,1,'civicrm/admin/domain','action=update','Organization Address and Contact Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contact_Form_Domain\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(185,1,'civicrm/admin/options/from_email_address',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(186,1,'civicrm/admin/messageTemplates',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Page_MessageTemplates\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(187,1,'civicrm/admin/messageTemplates/add',NULL,'Message Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:22:\"edit message templates\";i:1;s:34:\"edit user-driven message templates\";i:2;s:38:\"edit system workflow message templates\";}i:1;s:2:\"or\";}','s:31:\"CRM_Admin_Form_MessageTemplates\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Message Templates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,262,1,0,NULL,'a:1:{s:4:\"desc\";s:26:\"Add/Edit Message Templates\";}'),(188,1,'civicrm/admin/scheduleReminders',NULL,'Schedule Reminders','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCRM data\";i:1;s:15:\"edit all events\";}i:1;s:2:\"or\";}','s:32:\"CRM_Admin_Page_ScheduleReminders\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:19:\"Schedule Reminders.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(189,1,'civicrm/admin/weight',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_Weight\";i:1;s:8:\"fixOrder\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(190,1,'civicrm/admin/options/preferred_communication_method',NULL,'Preferred Communication Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(191,1,'civicrm/admin/labelFormats',NULL,'Label Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_LabelFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:2:{s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(192,1,'civicrm/admin/pdfFormats',NULL,'Print Page (PDF) Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_PdfFormats\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:2:{s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(193,1,'civicrm/admin/options/communication_style',NULL,'Communication Style Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,75,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(194,1,'civicrm/admin/options/email_greeting',NULL,'Email Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(195,1,'civicrm/admin/options/postal_greeting',NULL,'Postal Greeting Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:2:{s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(196,1,'civicrm/admin/options/addressee',NULL,'Addressee Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:10:\"adminGroup\";s:14:\"Communications\";}'),(197,1,'civicrm/admin/setting/localization',NULL,'Languages, Currency, Locations','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Form_Setting_Localization\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(198,1,'civicrm/admin/setting/preferences/address',NULL,'Address Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Address\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(199,1,'civicrm/admin/setting/date',NULL,'Date Formats','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Date\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:12:\"Localization\";}'),(200,1,'civicrm/admin/options/languages',NULL,'Preferred Languages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:2:{s:4:\"desc\";s:30:\"Options for contact languages.\";s:10:\"adminGroup\";s:12:\"Localization\";}'),(201,1,'civicrm/admin/access',NULL,'Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_Access\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(202,1,'civicrm/admin/access/wp-permissions',NULL,'WordPress Access Control','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_ACL_Form_WordPress_Permissions\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Access Control\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:1:{s:4:\"desc\";s:65:\"Grant access to CiviCRM components and other CiviCRM permissions.\";}'),(203,1,'civicrm/admin/synchUser',NULL,'Synchronize Users to Contacts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_CMSUser\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:2:{s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:10:\"adminGroup\";s:21:\"Users and Permissions\";}'),(204,1,'civicrm/admin/configtask',NULL,'Configuration Checklist','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Page_ConfigTaskList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}','civicrm/admin/configtask',NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(205,1,'civicrm/admin/setting/component',NULL,'Enable CiviCRM Components','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:2:{s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(206,1,'civicrm/admin/extensions',NULL,'Manage Extensions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Page_Extensions\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:2:{s:4:\"desc\";s:0:\"\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(207,1,'civicrm/admin/extensions/upgrade',NULL,'Database Upgrades','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Page_ExtensionsUpgrade\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:17:\"Manage Extensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(208,1,'civicrm/admin/setting/smtp',NULL,'Outbound Email Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Smtp\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,20,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(209,1,'civicrm/admin/paymentProcessor',NULL,'Settings - Payment Processor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:29:\"administer payment processors\";}i:1;s:3:\"and\";}','s:31:\"CRM_Admin_Page_PaymentProcessor\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,30,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(210,1,'civicrm/admin/setting/mapping',NULL,'Mapping and Geocoding','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Admin_Form_Setting_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,40,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(211,1,'civicrm/admin/setting/misc',NULL,'Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Form_Setting_Miscellaneous\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,50,1,0,NULL,'a:2:{s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(212,1,'civicrm/admin/setting/path',NULL,'Directories','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Path\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,60,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(213,1,'civicrm/admin/setting/url',NULL,'Resource URLs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Admin_Form_Setting_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,70,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(214,1,'civicrm/admin/setting/updateConfigBackend',NULL,'Cleanup Caches and Update Paths','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Admin_Form_Setting_UpdateConfigBackend\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,80,1,0,NULL,'a:2:{s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(215,1,'civicrm/admin/setting/uf',NULL,'CMS Database Integration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Admin_Form_Setting_UF\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,90,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(216,1,'civicrm/admin/options/safe_file_extension',NULL,'Safe File Extension Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,100,1,0,NULL,'a:2:{s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(217,1,'civicrm/admin/options',NULL,'Option Groups','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,105,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(218,1,'civicrm/admin/mapping',NULL,'Import/Export Mappings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Mapping\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,110,1,0,NULL,'a:2:{s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(219,1,'civicrm/admin/setting/debug',NULL,'Debugging','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Admin_Form_Setting_Debugging\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,120,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(220,1,'civicrm/admin/setting/preferences/multisite',NULL,'Multi Site Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,130,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:15:\"System Settings\";}'),(221,1,'civicrm/admin/setting/preferences/campaign',NULL,'CiviCampaign Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,10,1,0,NULL,'a:3:{s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(222,1,'civicrm/admin/setting/preferences/event',NULL,'CiviEvent Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Form_Generic\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(223,1,'civicrm/admin/setting/preferences/mailing',NULL,'CiviMail Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Admin_Form_Preferences_Mailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:2:{s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(224,1,'civicrm/admin/setting/preferences/member',NULL,'CiviMember Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:33:\"CRM_Admin_Form_Preferences_Member\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(225,1,'civicrm/admin/runjobs',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','a:2:{i:0;s:16:\"CRM_Utils_System\";i:1;s:20:\"executeScheduledJobs\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:36:\"URL used for running scheduled jobs.\";}'),(226,1,'civicrm/admin/job',NULL,'Scheduled Jobs','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:18:\"CRM_Admin_Page_Job\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1370,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(227,1,'civicrm/admin/joblog',NULL,'Scheduled Jobs Log','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:25:\"administer CiviCRM system\";}i:1;s:3:\"and\";}','s:21:\"CRM_Admin_Page_JobLog\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1380,1,0,NULL,'a:2:{s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:10:\"adminGroup\";s:6:\"Manage\";}'),(228,1,'civicrm/admin/options/grant_type',NULL,'Grant Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:10:\"adminGroup\";s:12:\"Option Lists\";}'),(229,1,'civicrm/admin/paymentProcessorType',NULL,'Payment Processor Type','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Admin_Page_PaymentProcessorType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:1:{s:4:\"desc\";s:34:\"Payment Processor type information\";}'),(230,1,'civicrm/admin',NULL,'Administer CiviCRM','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:20:\"CRM_Admin_Page_Admin\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,9000,1,1,NULL,'a:0:{}'),(231,1,'civicrm/ajax/navmenu',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:7:\"navMenu\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(232,1,'civicrm/ajax/menutree',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:8:\"menuTree\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(233,1,'civicrm/ajax/statusmsg',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:12:\"getStatusMsg\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(234,1,'civicrm/admin/price',NULL,'Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:10:\"adminGroup\";s:9:\"Customize\";}'),(235,1,'civicrm/admin/price/add','action=add','New Price Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";}'),(236,1,'civicrm/admin/price/field',NULL,'Price Fields','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:20:\"CRM_Price_Page_Field\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,0,'a:0:{}'),(237,1,'civicrm/admin/price/field/option',NULL,'Price Field Options','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Price_Page_Option\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:10:\"Price Sets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(238,1,'civicrm/ajax/mapping',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:11:\"mappingList\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(239,1,'civicrm/ajax/recipientListing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Admin_Page_AJAX\";i:1;s:16:\"recipientListing\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(240,1,'civicrm/admin/sms/provider',NULL,'Sms Providers','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Provider\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,500,1,0,NULL,'a:2:{s:4:\"desc\";s:27:\"To configure a sms provider\";s:10:\"adminGroup\";s:15:\"System Settings\";}'),(241,1,'civicrm/sms/send',NULL,'New Mass SMS','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:8:\"send SMS\";}i:1;s:3:\"and\";}','s:23:\"CRM_SMS_Controller_Send\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(242,1,'civicrm/sms/callback',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_SMS_Page_Callback\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(243,1,'civicrm/admin/badgelayout','action=browse','Event Name Badge Layouts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Page_Layout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,399,1,0,NULL,'a:2:{s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(244,1,'civicrm/admin/badgelayout/add',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Badge_Form_Layout\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?reset=1&amp;action=browse\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(245,1,'civicrm/admin/ckeditor',NULL,'Configure CKEditor','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:29:\"CRM_Admin_Form_CKEditorConfig\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(246,1,'civicrm/ajax/jqState',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:7:\"jqState\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(247,1,'civicrm/ajax/jqCounty',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:8:\"jqCounty\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(248,1,'civicrm/profile',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(249,1,'civicrm/profile/create',NULL,'CiviCRM Profile Create','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Profile_Page_Router\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(250,1,'civicrm/profile/view',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:21:\"CRM_Profile_Page_View\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(251,1,'civicrm/event/manage/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_PCP_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,540,1,1,NULL,'a:0:{}'),(252,1,'civicrm/event/pcp',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:16:\"CRM_PCP_Form_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(253,1,'civicrm/event/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(254,1,'civicrm/event',NULL,'CiviEvent Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,800,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(255,1,'civicrm/participant/add','action=add','Register New Participant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:9:\"CiviEvent\";}'),(256,1,'civicrm/event/info',NULL,'Event Information','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:24:\"CRM_Event_Page_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(257,1,'civicrm/event/register',NULL,'Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Controller_Registration\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(258,1,'civicrm/event/confirm',NULL,'Confirm Event Registration','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:46:\"CRM_Event_Form_Registration_ParticipantConfirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(259,1,'civicrm/event/ical',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_ICalendar\";i:1;s:3:\"run\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(260,1,'civicrm/event/list',NULL,'Current and Upcoming Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"view event info\";}i:1;s:3:\"and\";}','s:19:\"CRM_Event_Page_List\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(261,1,'civicrm/event/participant',NULL,'Event Participants List','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"view event participants\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Page_ParticipantListing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(262,1,'civicrm/admin/event',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(263,1,'civicrm/admin/eventTemplate',NULL,'Event Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Admin_Page_EventTemplate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,375,1,0,NULL,'a:2:{s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(264,1,'civicrm/admin/options/event_type',NULL,'Event Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,385,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(265,1,'civicrm/admin/participant_status',NULL,'Participant Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Admin_Page_ParticipantStatusType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(266,1,'civicrm/admin/options/participant_role',NULL,'Participant Role','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(267,1,'civicrm/admin/options/participant_listing',NULL,'Participant Listing Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,398,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(268,1,'civicrm/admin/options/conference_slot',NULL,'Conference Slot Labels','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:10:\"adminGroup\";s:9:\"CiviEvent\";}'),(269,1,'civicrm/event/search',NULL,'Find Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,810,1,1,NULL,'a:0:{}'),(270,1,'civicrm/event/manage',NULL,'Manage Events','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:26:\"CRM_Event_Page_ManageEvent\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,820,1,1,NULL,'a:0:{}'),(271,1,'civicrm/event/badge',NULL,'Print Event Name Badge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:25:\"CRM_Event_Form_Task_Badge\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(272,1,'civicrm/event/manage/settings',NULL,'Event Info and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,910,1,0,NULL,'a:0:{}'),(273,1,'civicrm/event/manage/location',NULL,'Event Location','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:35:\"CRM_Event_Form_ManageEvent_Location\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(274,1,'civicrm/event/manage/fee',NULL,'Event Fees','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_ManageEvent_Fee\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,920,1,0,NULL,'a:0:{}'),(275,1,'civicrm/event/manage/registration',NULL,'Event Online Registration','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:39:\"CRM_Event_Form_ManageEvent_Registration\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,930,1,0,NULL,'a:0:{}'),(276,1,'civicrm/event/manage/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:21:\"CRM_Friend_Form_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,940,1,0,NULL,'a:0:{}'),(277,1,'civicrm/event/manage/reminder',NULL,'Schedule Reminders','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:44:\"CRM_Event_Form_ManageEvent_ScheduleReminders\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(278,1,'civicrm/event/manage/repeat',NULL,'Repeat Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:33:\"CRM_Event_Form_ManageEvent_Repeat\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,960,1,0,NULL,'a:0:{}'),(279,1,'civicrm/event/manage/conference',NULL,'Conference Slots','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:37:\"CRM_Event_Form_ManageEvent_Conference\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Manage Events\";s:3:\"url\";s:29:\"/civicrm/event/manage?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,1,950,1,0,NULL,'a:0:{}'),(280,1,'civicrm/event/add','action=add','New Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:36:\"CRM_Event_Form_ManageEvent_EventInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,830,1,0,NULL,'a:0:{}'),(281,1,'civicrm/event/import',NULL,'Import Participants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:16:\"access CiviEvent\";i:1;s:23:\"edit event participants\";}i:1;s:3:\"and\";}','s:27:\"CRM_Event_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,840,1,1,NULL,'a:0:{}'),(282,1,'civicrm/event/price',NULL,'Manage Price Sets','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:18:\"CRM_Price_Page_Set\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,850,1,1,NULL,'a:0:{}'),(283,1,'civicrm/event/selfsvcupdate',NULL,'Self-service Registration Update','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Form_SelfSvcUpdate\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,880,1,1,NULL,'a:0:{}'),(284,1,'civicrm/event/selfsvctransfer',NULL,'Self-service Registration Transfer','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:30:\"CRM_Event_Form_SelfSvcTransfer\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,890,1,1,NULL,'a:0:{}'),(285,1,'civicrm/contact/view/participant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:18:\"CRM_Event_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,4,1,0,NULL,'a:0:{}'),(286,1,'civicrm/ajax/eventFee',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:19:\"CRM_Event_Page_AJAX\";i:1;s:8:\"eventFee\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(287,1,'civicrm/ajax/locBlock',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:11:\"getLocBlock\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(288,1,'civicrm/event/participant/feeselection',NULL,'Change Registration Selections','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:38:\"CRM_Event_Form_ParticipantFeeSelection\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}i:2;a:2:{s:5:\"title\";s:23:\"Event Participants List\";s:3:\"url\";s:34:\"/civicrm/event/participant?reset=1\";}}',NULL,NULL,1,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(289,1,'civicrm/admin/contribute/pcp',NULL,'Personal Campaign Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_PCP_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,450,1,0,NULL,'a:0:{}'),(290,1,'civicrm/contribute/campaign',NULL,'Setup a Personal Campaign Page - Account Information','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:22:\"CRM_PCP_Controller_PCP\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,0,0,1,0,NULL,'a:0:{}'),(291,1,'civicrm/contribute',NULL,'CiviContribute Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:29:\"CRM_Contribute_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,500,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(292,1,'civicrm/contribute/add','action=add','New Contribution','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(293,1,'civicrm/contribute/chart',NULL,'Contribution Summary - Chart View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_ContributionCharts\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(294,1,'civicrm/contribute/transact',NULL,'CiviContribute','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Controller_Contribution\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,1,NULL,1,0,1,0,NULL,'a:0:{}'),(295,1,'civicrm/admin/contribute',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,360,1,0,NULL,'a:2:{s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(296,1,'civicrm/admin/contribute/settings',NULL,'Title and Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_Settings\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:0:{}'),(297,1,'civicrm/admin/contribute/amount',NULL,'Contribution Amounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Amount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:0:{}'),(298,1,'civicrm/admin/contribute/membership',NULL,'Membership Section','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:31:\"CRM_Member_Form_MembershipBlock\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:0:{}'),(299,1,'civicrm/admin/contribute/custom',NULL,'Include Profiles','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Custom\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(300,1,'civicrm/admin/contribute/thankyou',NULL,'Thank-you and Receipting','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Form_ContributionPage_ThankYou\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,430,1,0,NULL,'a:0:{}'),(301,1,'civicrm/admin/contribute/friend',NULL,'Tell a Friend','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Friend_Form_Contribute\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,440,1,0,NULL,'a:0:{}'),(302,1,'civicrm/admin/contribute/widget',NULL,'Configure Widget','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_ContributionPage_Widget\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,460,1,0,NULL,'a:0:{}'),(303,1,'civicrm/admin/contribute/premium',NULL,'Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:44:\"CRM_Contribute_Form_ContributionPage_Premium\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,470,1,0,NULL,'a:0:{}'),(304,1,'civicrm/admin/contribute/addProductToPage',NULL,'Add Products to This Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:47:\"CRM_Contribute_Form_ContributionPage_AddProduct\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,480,1,0,NULL,'a:0:{}'),(305,1,'civicrm/admin/contribute/add','action=add','New Contribution Page','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:42:\"CRM_Contribute_Controller_ContributionPage\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(306,1,'civicrm/admin/contribute/managePremiums',NULL,'Manage Premiums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Page_ManagePremiums\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,365,1,0,NULL,'a:2:{s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(307,1,'civicrm/admin/financial/financialType',NULL,'Financial Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Financial_Page_FinancialType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,580,1,0,NULL,'a:2:{s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(308,1,'civicrm/payment','action=add','New Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Form_AdditionalPayment\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(309,1,'civicrm/admin/financial/financialAccount',NULL,'Financial Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_FinancialAccount\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(310,1,'civicrm/admin/options/payment_instrument',NULL,'Payment Methods','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(311,1,'civicrm/admin/options/accept_creditcard',NULL,'Accepted Credit Cards','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,395,1,0,NULL,'a:2:{s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(312,1,'civicrm/admin/options/soft_credit_type',NULL,'Soft Credit Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(313,1,'civicrm/contact/view/contribution',NULL,'Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:23:\"CRM_Contribute_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(314,1,'civicrm/contact/view/contributionrecur',NULL,'Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:37:\"CRM_Contribute_Page_ContributionRecur\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(315,1,'civicrm/contact/view/contribution/additionalinfo',NULL,'Additional Info','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:13:\"Contributions\";s:3:\"url\";s:42:\"/civicrm/contact/view/contribution?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(316,1,'civicrm/contribute/search',NULL,'Find Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,510,1,1,NULL,'a:0:{}'),(317,1,'civicrm/contribute/searchBatch',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:37:\"CRM_Contribute_Controller_SearchBatch\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,588,1,1,NULL,'a:0:{}'),(318,1,'civicrm/contribute/import',NULL,'Import Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"edit contributions\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,520,1,1,NULL,'a:0:{}'),(319,1,'civicrm/contribute/manage',NULL,'Manage Contribution Pages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:18:\"administer CiviCRM\";i:1;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:36:\"CRM_Contribute_Page_ContributionPage\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,530,1,1,NULL,'a:0:{}'),(320,1,'civicrm/contribute/additionalinfo',NULL,'AdditionalInfo Form','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:34:\"CRM_Contribute_Form_AdditionalInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(321,1,'civicrm/ajax/permlocation',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','a:2:{i:0;s:27:\"CRM_Core_Page_AJAX_Location\";i:1;s:23:\"getPermissionedLocation\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(322,1,'civicrm/contribute/unsubscribe',NULL,'Cancel Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_CancelSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(323,1,'civicrm/contribute/onbehalf',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:43:\"CRM_Contribute_Form_Contribution_OnBehalfOf\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(324,1,'civicrm/contribute/updatebilling',NULL,'Update Billing Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:33:\"CRM_Contribute_Form_UpdateBilling\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(325,1,'civicrm/contribute/updaterecur',NULL,'Update Subscription','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Form_UpdateSubscription\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(326,1,'civicrm/contribute/subscriptionstatus',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:25:\"make online contributions\";}i:1;s:3:\"and\";}','s:38:\"CRM_Contribute_Page_SubscriptionStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(327,1,'civicrm/admin/financial/financialType/accounts',NULL,'Financial Type Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:39:\"CRM_Financial_Page_FinancialTypeAccount\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:15:\"Financial Types\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,581,1,0,NULL,'a:0:{}'),(328,1,'civicrm/financial/batch',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:33:\"CRM_Financial_Page_FinancialBatch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,585,1,0,NULL,'a:0:{}'),(329,1,'civicrm/financial/financialbatches',NULL,'Accounting Batches','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Financial_Page_Batch\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,586,1,0,NULL,'a:0:{}'),(330,1,'civicrm/batchtransaction',NULL,'Accounting Batch','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:35:\"CRM_Financial_Page_BatchTransaction\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,600,1,0,NULL,'a:0:{}'),(331,1,'civicrm/financial/batch/export',NULL,'Accounting Batch Export','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"create manual batch\";}i:1;s:3:\"and\";}','s:25:\"CRM_Financial_Form_Export\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:16:\"Accounting Batch\";s:3:\"url\";s:32:\"/civicrm/financial/batch?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,610,1,0,NULL,'a:0:{}'),(332,1,'civicrm/payment/view','action=view','View Payment','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:31:\"CRM_Contribute_Page_PaymentInfo\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:11:\"New Payment\";s:3:\"url\";s:39:\"/civicrm/payment?reset=1&amp;action=add\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(333,1,'civicrm/admin/setting/preferences/contribute',NULL,'CiviContribute Component Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:21:\"access CiviContribute\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:37:\"CRM_Admin_Form_Preferences_Contribute\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:10:\"adminGroup\";s:14:\"CiviContribute\";}'),(334,1,'civicrm/contribute/invoice',NULL,'PDF Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Contribute_Form_Task_Invoice\";i:1;s:11:\"getPrintPDF\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,620,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(335,1,'civicrm/contribute/invoice/email',NULL,'Email Invoice','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:20:\"checkDownloadInvoice\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:32:\"CRM_Contribute_Form_Task_Invoice\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}i:2;a:2:{s:5:\"title\";s:11:\"PDF Invoice\";s:3:\"url\";s:35:\"/civicrm/contribute/invoice?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,630,1,1,NULL,'a:1:{s:9:\"component\";s:14:\"CiviContribute\";}'),(336,1,'civicrm/ajax/softcontributionlist',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:24:\"CRM_Contribute_Page_AJAX\";i:1;s:23:\"getSoftContributionRows\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(337,1,'civicrm/contribute/contributionrecur-payments',NULL,'Recurring Contribution\'s Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:45:\"CRM_Contribute_Page_ContributionRecurPayments\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:24:\"CiviContribute Dashboard\";s:3:\"url\";s:27:\"/civicrm/contribute?reset=1\";}}',NULL,NULL,2,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(338,1,'civicrm/membership/recurring-contributions',NULL,'Membership Recurring Contributions','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"access CiviContribute\";}i:1;s:3:\"and\";}','s:38:\"CRM_Member_Page_RecurringContributions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(339,1,'civicrm/member',NULL,'CiviMember Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:25:\"CRM_Member_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,700,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(340,1,'civicrm/member/add','action=add','New Membership','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:10:\"CiviMember\";}'),(341,1,'civicrm/admin/member/membershipType',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Page_MembershipType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,370,1,0,NULL,'a:2:{s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(342,1,'civicrm/admin/member/membershipStatus',NULL,'Membership Status Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:32:\"CRM_Member_Page_MembershipStatus\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:2:{s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:10:\"adminGroup\";s:10:\"CiviMember\";}'),(343,1,'civicrm/contact/view/membership','force=1,cid=%%cid%%','Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:19:\"CRM_Member_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,2,1,0,NULL,'a:0:{}'),(344,1,'civicrm/membership/view',NULL,'Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipView\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,390,1,0,NULL,'a:0:{}'),(345,1,'civicrm/member/search',NULL,'Find Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,710,1,1,NULL,'a:0:{}'),(346,1,'civicrm/member/import',NULL,'Import Memberships','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:16:\"edit memberships\";}i:1;s:3:\"and\";}','s:28:\"CRM_Member_Import_Controller\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviMember Dashboard\";s:3:\"url\";s:23:\"/civicrm/member?reset=1\";}}',NULL,NULL,3,NULL,NULL,NULL,0,720,1,1,NULL,'a:0:{}'),(347,1,'civicrm/ajax/memType',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviMember\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Member_Page_AJAX\";i:1;s:21:\"getMemberTypeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(348,1,'civicrm/admin/member/membershipType/add',NULL,'Membership Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviMember\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:30:\"CRM_Member_Form_MembershipType\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:16:\"Membership Types\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:0:{}'),(349,1,'civicrm/mailing',NULL,'CiviMail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,600,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviMail\";}'),(350,1,'civicrm/admin/mail',NULL,'Mailer Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Mail\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(351,1,'civicrm/admin/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,410,1,0,NULL,'a:2:{s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(352,1,'civicrm/admin/options/from_email_address/civimail',NULL,'From Email Addresses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:4:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}i:3;a:2:{s:5:\"title\";s:20:\"From Email Addresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,415,1,0,NULL,'a:2:{s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(353,1,'civicrm/admin/mailSettings',NULL,'Mail Accounts','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Page_MailSettings\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,420,1,0,NULL,'a:2:{s:4:\"desc\";s:32:\"Configure email account setting.\";s:10:\"adminGroup\";s:8:\"CiviMail\";}'),(354,1,'civicrm/mailing/send',NULL,'New Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:27:\"CRM_Mailing_Controller_Send\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,610,1,1,NULL,'a:0:{}'),(355,1,'civicrm/mailing/browse/scheduled','scheduled=true','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:5:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";i:4;s:8:\"send SMS\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(356,1,'civicrm/mailing/browse/unscheduled','scheduled=false','Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";i:2;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,620,1,1,NULL,'a:0:{}'),(357,1,'civicrm/mailing/browse/archived',NULL,'Find Mailings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,625,1,1,NULL,'a:0:{}'),(358,1,'civicrm/mailing/component',NULL,'Headers, Footers, and Automated Messages','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Page_Component\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,630,1,1,NULL,'a:0:{}'),(359,1,'civicrm/mailing/unsubscribe',NULL,'Unsubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Form_Unsubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,640,1,0,NULL,'a:0:{}'),(360,1,'civicrm/mailing/resubscribe',NULL,'Resubscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:28:\"CRM_Mailing_Page_Resubscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,645,1,0,NULL,'a:0:{}'),(361,1,'civicrm/mailing/optout',NULL,'Opt-out','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Form_Optout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,650,1,0,NULL,'a:0:{}'),(362,1,'civicrm/mailing/confirm',NULL,'Confirm','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:24:\"CRM_Mailing_Page_Confirm\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(363,1,'civicrm/mailing/subscribe',NULL,'Subscribe','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:26:\"CRM_Mailing_Form_Subscribe\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,660,1,0,NULL,'a:0:{}'),(364,1,'civicrm/mailing/preview',NULL,'Preview Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";i:2;s:15:\"create mailings\";i:3;s:17:\"schedule mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Page_Preview\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,670,1,0,NULL,'a:0:{}'),(365,1,'civicrm/mailing/report','mid=%%mid%%','Mailing Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:15:\"create mailings\";}i:1;s:2:\"or\";}','s:23:\"CRM_Mailing_Page_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,680,1,0,NULL,'a:0:{}'),(366,1,'civicrm/mailing/forward',NULL,'Forward Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:43:\"access CiviMail subscribe/unsubscribe pages\";}i:1;s:3:\"and\";}','s:31:\"CRM_Mailing_Form_ForwardMailing\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,685,1,0,NULL,'a:0:{}'),(367,1,'civicrm/mailing/queue',NULL,'Sending Mail','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:23:\"CRM_Mailing_Page_Browse\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,690,1,0,NULL,'a:0:{}'),(368,1,'civicrm/mailing/report/event',NULL,'Mailing Event','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:15:\"access CiviMail\";}i:1;s:3:\"and\";}','s:22:\"CRM_Mailing_Page_Event\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}i:2;a:2:{s:5:\"title\";s:14:\"Mailing Report\";s:3:\"url\";s:47:\"/civicrm/mailing/report?reset=1&amp;mid=%%mid%%\";}}',NULL,NULL,4,NULL,NULL,NULL,0,695,1,0,NULL,'a:0:{}'),(369,1,'civicrm/ajax/template',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:8:\"template\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(370,1,'civicrm/mailing/view',NULL,'View Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:28:\"view public CiviMail content\";i:1;s:15:\"access CiviMail\";i:2;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:21:\"CRM_Mailing_Page_View\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,800,1,0,NULL,'a:0:{}'),(371,1,'civicrm/mailing/approve',NULL,'Approve Mailing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:15:\"access CiviMail\";i:1;s:16:\"approve mailings\";}i:1;s:2:\"or\";}','s:24:\"CRM_Mailing_Form_Approve\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,NULL,NULL,0,850,1,0,NULL,'a:0:{}'),(372,1,'civicrm/contact/view/mailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:20:\"CRM_Mailing_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(373,1,'civicrm/ajax/contactmailing',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:21:\"CRM_Mailing_Page_AJAX\";i:1;s:18:\"getContactMailings\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(374,1,'civicrm/mailing/url',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:20:\"CRM_Mailing_Page_Url\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(375,1,'civicrm/mailing/open',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"*always allow*\";}i:1;s:3:\"and\";}','s:21:\"CRM_Mailing_Page_Open\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:8:\"CiviMail\";s:3:\"url\";s:24:\"/civicrm/mailing?reset=1\";}}',NULL,NULL,4,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(376,1,'civicrm/grant',NULL,'CiviGrant Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1000,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(377,1,'civicrm/grant/info',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:24:\"CRM_Grant_Page_DashBoard\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,0,1,0,NULL,'a:0:{}'),(378,1,'civicrm/grant/search',NULL,'Find Grants','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:27:\"CRM_Grant_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1010,1,1,NULL,'a:0:{}'),(379,1,'civicrm/grant/add','action=add','New Grant','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviGrant Dashboard\";s:3:\"url\";s:22:\"/civicrm/grant?reset=1\";}}',NULL,NULL,5,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:9:\"CiviGrant\";}'),(380,1,'civicrm/contact/view/grant',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:16:\"access CiviGrant\";}i:1;s:3:\"and\";}','s:18:\"CRM_Grant_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(381,1,'civicrm/pledge',NULL,'CiviPledge Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:25:\"CRM_Pledge_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,550,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(382,1,'civicrm/pledge/search',NULL,'Find Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:28:\"CRM_Pledge_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,560,1,1,NULL,'a:0:{}'),(383,1,'civicrm/contact/view/pledge','force=1,cid=%%cid%%','Pledges','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,570,1,0,NULL,'a:0:{}'),(384,1,'civicrm/pledge/add','action=add','New Pledge','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:19:\"CRM_Pledge_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviPledge\";}'),(385,1,'civicrm/pledge/payment',NULL,'Pledge Payments','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviPledge\";}i:1;s:3:\"and\";}','s:23:\"CRM_Pledge_Page_Payment\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:20:\"CiviPledge Dashboard\";s:3:\"url\";s:23:\"/civicrm/pledge?reset=1\";}}',NULL,NULL,6,NULL,NULL,NULL,0,580,1,0,NULL,'a:0:{}'),(386,1,'civicrm/ajax/pledgeAmount',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:17:\"access CiviPledge\";i:1;s:18:\"administer CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:20:\"CRM_Pledge_Page_AJAX\";i:1;s:17:\"getPledgeDefaults\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(387,1,'civicrm/case',NULL,'CiviCase Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:23:\"CRM_Case_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,900,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(388,1,'civicrm/case/add',NULL,'Open Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:18:\"CRM_Case_Form_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,1,NULL,'a:1:{s:9:\"component\";s:8:\"CiviCase\";}'),(389,1,'civicrm/case/search',NULL,'Find Cases','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Controller_Search\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,910,1,1,NULL,'a:0:{}'),(390,1,'civicrm/case/activity',NULL,'Case Activity','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Case_Form_Activity\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(391,1,'civicrm/case/report',NULL,'Case Activity Audit','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','s:20:\"CRM_Case_Form_Report\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(392,1,'civicrm/case/cd/edit',NULL,'Case Custom Set','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:24:\"CRM_Case_Form_CustomData\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(393,1,'civicrm/contact/view/case',NULL,'Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:17:\"CRM_Case_Page_Tab\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(394,1,'civicrm/case/activity/view',NULL,'Activity View','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Case_Form_ActivityView\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Case Activity\";s:3:\"url\";s:30:\"/civicrm/case/activity?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(395,1,'civicrm/contact/view/case/editClient',NULL,'Assign to Another Client','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:14:\"access CiviCRM\";i:1;s:15:\"edit my contact\";i:2;s:15:\"view my contact\";}i:1;s:2:\"or\";}','s:24:\"CRM_Case_Form_EditClient\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:15:\"Contact Summary\";s:3:\"url\";s:45:\"/civicrm/contact/view?reset=1&amp;cid=%%cid%%\";}i:2;a:2:{s:5:\"title\";s:4:\"Case\";s:3:\"url\";s:34:\"/civicrm/contact/view/case?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(396,1,'civicrm/case/addToCase',NULL,'File on Case','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Case_Form_ActivityToCase\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(397,1,'civicrm/case/details',NULL,'Case Details','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:25:\"CRM_Case_Page_CaseDetails\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(398,1,'civicrm/admin/setting/case',NULL,'CiviCase Settings','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:27:\"CRM_Admin_Form_Setting_Case\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,380,1,0,NULL,'a:1:{s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(399,1,'civicrm/admin/options/case_type',NULL,'Case Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Core_Page_Redirect\";','s:24:\"url=civicrm/a/#/caseType\";','a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,390,1,0,NULL,'a:2:{s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(400,1,'civicrm/admin/options/redaction_rule',NULL,'Redaction Rules','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(401,1,'civicrm/admin/options/case_status',NULL,'Case Statuses','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(402,1,'civicrm/admin/options/encounter_medium',NULL,'Encounter Mediums','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:19:\"administer CiviCase\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,400,1,0,NULL,'a:2:{s:4:\"desc\";s:26:\"List of encounter mediums.\";s:10:\"adminGroup\";s:8:\"CiviCase\";}'),(403,1,'civicrm/case/report/print',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:31:\"access all cases and activities\";}i:1;s:3:\"and\";}','a:2:{i:0;s:28:\"CRM_Case_XMLProcessor_Report\";i:1;s:15:\"printCaseReport\";}',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}i:2;a:2:{s:5:\"title\";s:19:\"Case Activity Audit\";s:3:\"url\";s:28:\"/civicrm/case/report?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(404,1,'civicrm/case/ajax/addclient',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:9:\"addClient\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(405,1,'civicrm/case/ajax/processtags',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"processCaseTags\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,3,NULL,'a:0:{}'),(406,1,'civicrm/case/ajax/details',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:11:\"CaseDetails\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"CiviCase Dashboard\";s:3:\"url\";s:21:\"/civicrm/case?reset=1\";}}',NULL,NULL,7,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(407,1,'civicrm/ajax/delcaserole',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:15:\"deleteCaseRoles\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(408,1,'civicrm/ajax/get-cases',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:18:\"CRM_Case_Page_AJAX\";i:1;s:8:\"getCases\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(409,1,'civicrm/report',NULL,'CiviReport','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:22:\"CRM_Report_Page_Report\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1200,1,1,NULL,'a:1:{s:9:\"component\";s:10:\"CiviReport\";}'),(410,1,'civicrm/report/list',NULL,'CiviCRM Reports','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(411,1,'civicrm/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1220,1,1,NULL,'a:0:{}'),(412,1,'civicrm/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1241,1,1,NULL,'a:0:{}'),(413,1,'civicrm/admin/report/register',NULL,'Register Report','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:18:\"administer Reports\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Form_Register\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:1:{s:4:\"desc\";s:30:\"Register the Report templates.\";}'),(414,1,'civicrm/report/instance',NULL,'Report','s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:24:\"CRM_Report_Page_Instance\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:10:\"CiviReport\";s:3:\"url\";s:23:\"/civicrm/report?reset=1\";}}',NULL,NULL,8,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(415,1,'civicrm/admin/report/template/list',NULL,'Create New Report from Template','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_TemplateList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(416,1,'civicrm/admin/report/options/report_template',NULL,'Manage Templates','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:17:\"access CiviReport\";}i:1;s:3:\"and\";}','s:23:\"CRM_Report_Page_Options\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(417,1,'civicrm/admin/report/list',NULL,'Reports Listing','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:28:\"CRM_Report_Page_InstanceList\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:10:\"adminGroup\";s:10:\"CiviReport\";}'),(418,1,'civicrm/campaign',NULL,'Campaign Dashboard','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:27:\"CRM_Campaign_Page_DashBoard\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(419,1,'civicrm/campaign/add',NULL,'New Campaign','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Campaign\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(420,1,'civicrm/survey/add',NULL,'New Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(421,1,'civicrm/campaign/vote',NULL,'Conduct Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"reserve campaign contacts\";i:3;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Page_Vote\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(422,1,'civicrm/admin/campaign/surveyType',NULL,'Survey Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:23:\"administer CiviCampaign\";}i:1;s:3:\"and\";}','s:28:\"CRM_Campaign_Page_SurveyType\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,0,NULL,'a:2:{s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(423,1,'civicrm/admin/options/campaign_type',NULL,'Campaign Types','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,2,1,0,NULL,'a:3:{s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(424,1,'civicrm/admin/options/campaign_status',NULL,'Campaign Status','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,3,1,0,NULL,'a:3:{s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(425,1,'civicrm/admin/options/engagement_index',NULL,'Engagement Index','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:25:\"administer CiviCRM system\";i:1;s:23:\"administer CiviCRM data\";i:2;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:22:\"CRM_Admin_Page_Options\";',NULL,'a:3:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Administer CiviCRM\";s:3:\"url\";s:22:\"/civicrm/admin?reset=1\";}i:2;a:2:{s:5:\"title\";s:13:\"Option Groups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,1,4,1,0,NULL,'a:3:{s:4:\"desc\";s:18:\"Engagement levels.\";s:10:\"adminGroup\";s:12:\"CiviCampaign\";s:9:\"component\";s:12:\"CiviCampaign\";}'),(426,1,'civicrm/survey/search','op=interview','Record Respondents Interview','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','s:30:\"CRM_Campaign_Controller_Search\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(427,1,'civicrm/campaign/gotv',NULL,'GOTV (Track Voters)','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:4:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:25:\"release campaign contacts\";i:3;s:22:\"gotv campaign contacts\";}i:1;s:2:\"or\";}','s:22:\"CRM_Campaign_Form_Gotv\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:1:{s:9:\"component\";s:12:\"CiviCampaign\";}'),(428,1,'civicrm/petition/add',NULL,'New Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:26:\"CRM_Campaign_Form_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(429,1,'civicrm/petition/sign',NULL,'Sign Petition','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:36:\"CRM_Campaign_Form_Petition_Signature\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(430,1,'civicrm/petition/browse',NULL,'View Petition Signatures','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','s:26:\"CRM_Campaign_Page_Petition\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(431,1,'civicrm/petition/confirm',NULL,'Email address verified','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:34:\"CRM_Campaign_Page_Petition_Confirm\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(432,1,'civicrm/petition/thankyou',NULL,'Thank You','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:1:{i:0;s:21:\"sign CiviCRM Petition\";}i:1;s:3:\"and\";}','s:35:\"CRM_Campaign_Page_Petition_ThankYou\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(433,1,'civicrm/campaign/registerInterview',NULL,NULL,'a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:3:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";i:2;s:27:\"interview campaign contacts\";}i:1;s:2:\"or\";}','a:2:{i:0;s:22:\"CRM_Campaign_Page_AJAX\";i:1;s:17:\"registerInterview\";}',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:18:\"Campaign Dashboard\";s:3:\"url\";s:25:\"/civicrm/campaign?reset=1\";}}',NULL,NULL,9,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(434,1,'civicrm/survey/configure/main',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:29:\"CRM_Campaign_Form_Survey_Main\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(435,1,'civicrm/survey/configure/questions',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:34:\"CRM_Campaign_Form_Survey_Questions\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(436,1,'civicrm/survey/configure/results',NULL,'Configure Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:32:\"CRM_Campaign_Form_Survey_Results\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(437,1,'civicrm/survey/delete',NULL,'Delete Survey','a:2:{i:0;s:19:\"CRM_Core_Permission\";i:1;s:9:\"checkMenu\";}','a:2:{i:0;a:2:{i:0;s:23:\"administer CiviCampaign\";i:1;s:15:\"manage campaign\";}i:1;s:2:\"or\";}','s:31:\"CRM_Campaign_Form_Survey_Delete\";',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,NULL,NULL,0,1,1,0,NULL,'a:0:{}'),(438,1,'civicrm/ajax/event/add_participant_to_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:23:\"add_participant_to_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(439,1,'civicrm/ajax/event/remove_participant_from_cart',NULL,NULL,'s:1:\"1\";','a:2:{i:0;a:1:{i:0;s:14:\"access CiviCRM\";}i:1;s:3:\"and\";}','a:2:{i:0;s:32:\"CRM_Event_Cart_Page_CheckoutAJAX\";i:1;s:28:\"remove_participant_from_cart\";}',NULL,'a:1:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}}',NULL,NULL,NULL,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(440,1,'civicrm/event/add_to_cart',NULL,'Add Event To Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:29:\"CRM_Event_Cart_Page_AddToCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(441,1,'civicrm/event/cart_checkout',NULL,'Cart Checkout','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Controller_Checkout\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,1,1,1,0,NULL,'a:0:{}'),(442,1,'civicrm/event/remove_from_cart',NULL,'Remove From Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:34:\"CRM_Event_Cart_Page_RemoveFromCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(443,1,'civicrm/event/view_cart',NULL,'View Cart','s:1:\"1\";','a:2:{i:0;a:2:{i:0;s:14:\"access CiviCRM\";i:1;s:16:\"access CiviEvent\";}i:1;s:3:\"and\";}','s:28:\"CRM_Event_Cart_Page_ViewCart\";',NULL,'a:2:{i:0;a:2:{s:5:\"title\";s:7:\"CiviCRM\";s:3:\"url\";s:16:\"/civicrm?reset=1\";}i:1;a:2:{s:5:\"title\";s:19:\"CiviEvent Dashboard\";s:3:\"url\";s:22:\"/civicrm/event?reset=1\";}}',NULL,NULL,1,NULL,1,NULL,0,1,1,0,NULL,'a:0:{}'),(444,1,'admin',NULL,NULL,NULL,NULL,NULL,NULL,'a:15:{s:6:\"Manage\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:42:\"{weight}.Find and Merge Duplicate Contacts\";a:6:{s:5:\"title\";s:33:\"Find and Merge Duplicate Contacts\";s:4:\"desc\";s:158:\"Manage the rules used to identify potentially duplicate contact records. Scan for duplicates using a selected rule and merge duplicate contact data as needed.\";s:2:\"id\";s:29:\"FindandMergeDuplicateContacts\";s:3:\"url\";s:36:\"/civicrm/contact/deduperules?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Dedupe Exceptions\";a:6:{s:5:\"title\";s:17:\"Dedupe Exceptions\";s:4:\"desc\";N;s:2:\"id\";s:16:\"DedupeExceptions\";s:3:\"url\";s:33:\"/civicrm/dedupe/exception?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Scheduled Jobs Log\";a:6:{s:5:\"title\";s:18:\"Scheduled Jobs Log\";s:4:\"desc\";s:46:\"Browsing the log of periodially running tasks.\";s:2:\"id\";s:16:\"ScheduledJobsLog\";s:3:\"url\";s:29:\"/civicrm/admin/joblog?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:26:\"Customize Data and Screens\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:19:{s:26:\"{weight}.Tags (Categories)\";a:6:{s:5:\"title\";s:17:\"Tags (Categories)\";s:4:\"desc\";s:158:\"Tags are useful for segmenting the contacts in your database into categories (e.g. Staff Member, Donor, Volunteer, etc.). Create and edit available tags here.\";s:2:\"id\";s:15:\"Tags_Categories\";s:3:\"url\";s:20:\"/civicrm/tag?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Custom Data\";a:6:{s:5:\"title\";s:11:\"Custom Data\";s:4:\"desc\";s:109:\"Configure custom fields to collect and store custom data which is not included in the standard CiviCRM forms.\";s:2:\"id\";s:10:\"CustomData\";s:3:\"url\";s:35:\"/civicrm/admin/custom/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:17:\"{weight}.Profiles\";a:6:{s:5:\"title\";s:8:\"Profiles\";s:4:\"desc\";s:151:\"Profiles allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features.\";s:2:\"id\";s:8:\"Profiles\";s:3:\"url\";s:31:\"/civicrm/admin/uf/group?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Activity Types\";a:6:{s:5:\"title\";s:14:\"Activity Types\";s:4:\"desc\";s:155:\"CiviCRM has several built-in activity types (meetings, phone calls, emails sent). Track other types of interactions by creating custom activity types here.\";s:2:\"id\";s:13:\"ActivityTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/activity_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Relationship Types\";a:6:{s:5:\"title\";s:18:\"Relationship Types\";s:4:\"desc\";s:148:\"Contacts can be linked to each other through Relationships (e.g. Spouse, Employer, etc.). Define the types of relationships you want to record here.\";s:2:\"id\";s:17:\"RelationshipTypes\";s:3:\"url\";s:30:\"/civicrm/admin/reltype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Contact Types\";a:6:{s:5:\"title\";s:13:\"Contact Types\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ContactTypes\";s:3:\"url\";s:38:\"/civicrm/admin/options/subtype?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Gender Options\";a:6:{s:5:\"title\";s:14:\"Gender Options\";s:4:\"desc\";s:79:\"Options for assigning gender to individual contacts (e.g. Male, Female, Other).\";s:2:\"id\";s:13:\"GenderOptions\";s:3:\"url\";s:37:\"/civicrm/admin/options/gender?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Prefixes (Ms, Mr...)\";a:6:{s:5:\"title\";s:31:\"Individual Prefixes (Ms, Mr...)\";s:4:\"desc\";s:66:\"Options for individual contact prefixes (e.g. Ms., Mr., Dr. etc.).\";s:2:\"id\";s:27:\"IndividualPrefixes_Ms_Mr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_prefix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Individual Suffixes (Jr, Sr...)\";a:6:{s:5:\"title\";s:31:\"Individual Suffixes (Jr, Sr...)\";s:4:\"desc\";s:61:\"Options for individual contact suffixes (e.g. Jr., Sr. etc.).\";s:2:\"id\";s:27:\"IndividualSuffixes_Jr_Sr...\";s:3:\"url\";s:48:\"/civicrm/admin/options/individual_suffix?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:39:\"{weight}.Location Types (Home, Work...)\";a:6:{s:5:\"title\";s:30:\"Location Types (Home, Work...)\";s:4:\"desc\";s:94:\"Options for categorizing contact addresses and phone numbers (e.g. Home, Work, Billing, etc.).\";s:2:\"id\";s:26:\"LocationTypes_Home_Work...\";s:3:\"url\";s:35:\"/civicrm/admin/locationType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Website Types\";a:6:{s:5:\"title\";s:13:\"Website Types\";s:4:\"desc\";s:48:\"Options for assigning website types to contacts.\";s:2:\"id\";s:12:\"WebsiteTypes\";s:3:\"url\";s:43:\"/civicrm/admin/options/website_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:35:\"{weight}.Instant Messenger Services\";a:6:{s:5:\"title\";s:26:\"Instant Messenger Services\";s:4:\"desc\";s:79:\"List of IM services which can be used when recording screen-names for contacts.\";s:2:\"id\";s:24:\"InstantMessengerServices\";s:3:\"url\";s:56:\"/civicrm/admin/options/instant_messenger_service?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Mobile Phone Providers\";a:6:{s:5:\"title\";s:22:\"Mobile Phone Providers\";s:4:\"desc\";s:90:\"List of mobile phone providers which can be assigned when recording contact phone numbers.\";s:2:\"id\";s:20:\"MobilePhoneProviders\";s:3:\"url\";s:46:\"/civicrm/admin/options/mobile_provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Phone Type\";a:6:{s:5:\"title\";s:10:\"Phone Type\";s:4:\"desc\";s:80:\"Options for assigning phone type to contacts (e.g Phone,\n    Mobile, Fax, Pager)\";s:2:\"id\";s:9:\"PhoneType\";s:3:\"url\";s:41:\"/civicrm/admin/options/phone_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Display Preferences\";a:6:{s:5:\"title\";s:19:\"Display Preferences\";s:4:\"desc\";N;s:2:\"id\";s:18:\"DisplayPreferences\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/display?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Search Preferences\";a:6:{s:5:\"title\";s:18:\"Search Preferences\";s:4:\"desc\";N;s:2:\"id\";s:17:\"SearchPreferences\";s:3:\"url\";s:37:\"/civicrm/admin/setting/search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Navigation Menu\";a:6:{s:5:\"title\";s:15:\"Navigation Menu\";s:4:\"desc\";s:79:\"Add or remove menu items, and modify the order of items on the navigation menu.\";s:2:\"id\";s:14:\"NavigationMenu\";s:3:\"url\";s:27:\"/civicrm/admin/menu?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Word Replacements\";a:6:{s:5:\"title\";s:17:\"Word Replacements\";s:4:\"desc\";s:18:\"Word Replacements.\";s:2:\"id\";s:16:\"WordReplacements\";s:3:\"url\";s:47:\"/civicrm/admin/options/wordreplacements?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Manage Custom Searches\";a:6:{s:5:\"title\";s:22:\"Manage Custom Searches\";s:4:\"desc\";s:225:\"Developers and accidental techies with a bit of PHP and SQL knowledge can create new search forms to handle specific search and reporting needs which aren\'t covered by the built-in Advanced Search and Search Builder features.\";s:2:\"id\";s:20:\"ManageCustomSearches\";s:3:\"url\";s:44:\"/civicrm/admin/options/custom_search?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"CiviContribute\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:32:\"{weight}.Personal Campaign Pages\";a:6:{s:5:\"title\";s:23:\"Personal Campaign Pages\";s:4:\"desc\";s:49:\"View and manage existing personal campaign pages.\";s:2:\"id\";s:21:\"PersonalCampaignPages\";s:3:\"url\";s:49:\"/civicrm/admin/pcp?context=contribute&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Manage Contribution Pages\";a:6:{s:5:\"title\";s:25:\"Manage Contribution Pages\";s:4:\"desc\";s:242:\"CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns - and customize text, amounts, types of information collected from contributors, etc.\";s:2:\"id\";s:23:\"ManageContributionPages\";s:3:\"url\";s:33:\"/civicrm/admin/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Manage Premiums\";a:6:{s:5:\"title\";s:15:\"Manage Premiums\";s:4:\"desc\";s:175:\"CiviContribute allows you to configure any number of Premiums which can be offered to contributors as incentives / thank-you gifts. Define the premiums you want to offer here.\";s:2:\"id\";s:14:\"ManagePremiums\";s:3:\"url\";s:48:\"/civicrm/admin/contribute/managePremiums?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Financial Types\";a:6:{s:5:\"title\";s:15:\"Financial Types\";s:4:\"desc\";s:64:\"Formerly civicrm_contribution_type merged into this table in 4.1\";s:2:\"id\";s:14:\"FinancialTypes\";s:3:\"url\";s:46:\"/civicrm/admin/financial/financialType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Financial Accounts\";a:6:{s:5:\"title\";s:18:\"Financial Accounts\";s:4:\"desc\";s:128:\"Financial types are used to categorize contributions for reporting and accounting purposes. These are also referred to as Funds.\";s:2:\"id\";s:17:\"FinancialAccounts\";s:3:\"url\";s:49:\"/civicrm/admin/financial/financialAccount?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Payment Methods\";a:6:{s:5:\"title\";s:15:\"Payment Methods\";s:4:\"desc\";s:224:\"You may choose to record the payment instrument used for each contribution. Common payment methods are installed by default (e.g. Check, Cash, Credit Card...). If your site requires additional payment methods, add them here.\";s:2:\"id\";s:14:\"PaymentMethods\";s:3:\"url\";s:49:\"/civicrm/admin/options/payment_instrument?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Accepted Credit Cards\";a:6:{s:5:\"title\";s:21:\"Accepted Credit Cards\";s:4:\"desc\";s:94:\"Credit card options that will be offered to contributors using your Online Contribution pages.\";s:2:\"id\";s:19:\"AcceptedCreditCards\";s:3:\"url\";s:48:\"/civicrm/admin/options/accept_creditcard?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Soft Credit Types\";a:6:{s:5:\"title\";s:17:\"Soft Credit Types\";s:4:\"desc\";s:86:\"Soft Credit Types that will be offered to contributors during soft credit contribution\";s:2:\"id\";s:15:\"SoftCreditTypes\";s:3:\"url\";s:47:\"/civicrm/admin/options/soft_credit_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:42:\"{weight}.CiviContribute Component Settings\";a:6:{s:5:\"title\";s:33:\"CiviContribute Component Settings\";s:4:\"desc\";s:42:\"Configure global CiviContribute behaviors.\";s:2:\"id\";s:31:\"CiviContributeComponentSettings\";s:3:\"url\";s:53:\"/civicrm/admin/setting/preferences/contribute?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:14:\"Communications\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:11:{s:46:\"{weight}.Organization Address and Contact Info\";a:6:{s:5:\"title\";s:37:\"Organization Address and Contact Info\";s:4:\"desc\";s:150:\"Configure primary contact name, email, return-path and address information. This information is used by CiviMail to identify the sending organization.\";s:2:\"id\";s:33:\"OrganizationAddressandContactInfo\";s:3:\"url\";s:47:\"/civicrm/admin/domain?action=update&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:49:\"/civicrm/admin/options/from_email_address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Message Templates\";a:6:{s:5:\"title\";s:17:\"Message Templates\";s:4:\"desc\";s:130:\"Message templates allow you to save and re-use messages with layouts which you can use when sending email to one or more contacts.\";s:2:\"id\";s:16:\"MessageTemplates\";s:3:\"url\";s:39:\"/civicrm/admin/messageTemplates?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Schedule Reminders\";a:6:{s:5:\"title\";s:18:\"Schedule Reminders\";s:4:\"desc\";s:19:\"Schedule Reminders.\";s:2:\"id\";s:17:\"ScheduleReminders\";s:3:\"url\";s:40:\"/civicrm/admin/scheduleReminders?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Preferred Communication Methods\";a:6:{s:5:\"title\";s:31:\"Preferred Communication Methods\";s:4:\"desc\";s:117:\"One or more preferred methods of communication can be assigned to each contact. Customize the available options here.\";s:2:\"id\";s:29:\"PreferredCommunicationMethods\";s:3:\"url\";s:61:\"/civicrm/admin/options/preferred_communication_method?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Label Formats\";a:6:{s:5:\"title\";s:13:\"Label Formats\";s:4:\"desc\";s:67:\"Configure Label Formats that are used when creating mailing labels.\";s:2:\"id\";s:12:\"LabelFormats\";s:3:\"url\";s:35:\"/civicrm/admin/labelFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Print Page (PDF) Formats\";a:6:{s:5:\"title\";s:24:\"Print Page (PDF) Formats\";s:4:\"desc\";s:95:\"Configure PDF Page Formats that can be assigned to Message Templates when creating PDF letters.\";s:2:\"id\";s:20:\"PrintPage_PDFFormats\";s:3:\"url\";s:33:\"/civicrm/admin/pdfFormats?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Communication Style Options\";a:6:{s:5:\"title\";s:27:\"Communication Style Options\";s:4:\"desc\";s:42:\"Options for Communication Style selection.\";s:2:\"id\";s:25:\"CommunicationStyleOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/communication_style?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Email Greeting Formats\";a:6:{s:5:\"title\";s:22:\"Email Greeting Formats\";s:4:\"desc\";s:75:\"Options for assigning email greetings to individual and household contacts.\";s:2:\"id\";s:20:\"EmailGreetingFormats\";s:3:\"url\";s:45:\"/civicrm/admin/options/email_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Postal Greeting Formats\";a:6:{s:5:\"title\";s:23:\"Postal Greeting Formats\";s:4:\"desc\";s:76:\"Options for assigning postal greetings to individual and household contacts.\";s:2:\"id\";s:21:\"PostalGreetingFormats\";s:3:\"url\";s:46:\"/civicrm/admin/options/postal_greeting?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Addressee Formats\";a:6:{s:5:\"title\";s:17:\"Addressee Formats\";s:4:\"desc\";s:83:\"Options for assigning addressee to individual, household and organization contacts.\";s:2:\"id\";s:16:\"AddresseeFormats\";s:3:\"url\";s:40:\"/civicrm/admin/options/addressee?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Localization\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:4:{s:39:\"{weight}.Languages, Currency, Locations\";a:6:{s:5:\"title\";s:30:\"Languages, Currency, Locations\";s:4:\"desc\";N;s:2:\"id\";s:28:\"Languages_Currency_Locations\";s:3:\"url\";s:43:\"/civicrm/admin/setting/localization?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Address Settings\";a:6:{s:5:\"title\";s:16:\"Address Settings\";s:4:\"desc\";N;s:2:\"id\";s:15:\"AddressSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/address?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Date Formats\";a:6:{s:5:\"title\";s:12:\"Date Formats\";s:4:\"desc\";N;s:2:\"id\";s:11:\"DateFormats\";s:3:\"url\";s:35:\"/civicrm/admin/setting/date?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Preferred Languages\";a:6:{s:5:\"title\";s:19:\"Preferred Languages\";s:4:\"desc\";s:30:\"Options for contact languages.\";s:2:\"id\";s:18:\"PreferredLanguages\";s:3:\"url\";s:40:\"/civicrm/admin/options/languages?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:21:\"Users and Permissions\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:2:{s:23:\"{weight}.Access Control\";a:6:{s:5:\"title\";s:14:\"Access Control\";s:4:\"desc\";s:73:\"Grant or deny access to actions (view, edit...), features and components.\";s:2:\"id\";s:13:\"AccessControl\";s:3:\"url\";s:29:\"/civicrm/admin/access?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Synchronize Users to Contacts\";a:6:{s:5:\"title\";s:29:\"Synchronize Users to Contacts\";s:4:\"desc\";s:71:\"Automatically create a CiviCRM contact record for each CMS user record.\";s:2:\"id\";s:26:\"SynchronizeUserstoContacts\";s:3:\"url\";s:32:\"/civicrm/admin/synchUser?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:15:\"System Settings\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:18:{s:32:\"{weight}.Configuration Checklist\";a:6:{s:5:\"title\";s:23:\"Configuration Checklist\";s:4:\"desc\";s:55:\"List of configuration tasks with links to each setting.\";s:2:\"id\";s:22:\"ConfigurationChecklist\";s:3:\"url\";s:33:\"/civicrm/admin/configtask?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:34:\"{weight}.Enable CiviCRM Components\";a:6:{s:5:\"title\";s:25:\"Enable CiviCRM Components\";s:4:\"desc\";s:269:\"Enable or disable components (e.g. CiviEvent, CiviMember, etc.) for your site based on the features you need. We recommend disabling any components not being used in order to simplify the user interface. You can easily re-enable components at any time from this screen.\";s:2:\"id\";s:23:\"EnableCiviCRMComponents\";s:3:\"url\";s:40:\"/civicrm/admin/setting/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Manage Extensions\";a:6:{s:5:\"title\";s:17:\"Manage Extensions\";s:4:\"desc\";s:0:\"\";s:2:\"id\";s:16:\"ManageExtensions\";s:3:\"url\";s:33:\"/civicrm/admin/extensions?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Outbound Email Settings\";a:6:{s:5:\"title\";s:23:\"Outbound Email Settings\";s:4:\"desc\";N;s:2:\"id\";s:21:\"OutboundEmailSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/smtp?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:37:\"{weight}.Settings - Payment Processor\";a:6:{s:5:\"title\";s:28:\"Settings - Payment Processor\";s:4:\"desc\";s:48:\"Payment Processor setup for CiviCRM transactions\";s:2:\"id\";s:25:\"Settings-PaymentProcessor\";s:3:\"url\";s:39:\"/civicrm/admin/paymentProcessor?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:30:\"{weight}.Mapping and Geocoding\";a:6:{s:5:\"title\";s:21:\"Mapping and Geocoding\";s:4:\"desc\";N;s:2:\"id\";s:19:\"MappingandGeocoding\";s:3:\"url\";s:38:\"/civicrm/admin/setting/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:62:\"{weight}.Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";a:6:{s:5:\"title\";s:53:\"Misc (Undelete, PDFs, Limits, Logging, Captcha, etc.)\";s:4:\"desc\";s:91:\"Enable undelete/move to trash feature, detailed change logging, ReCAPTCHA to protect forms.\";s:2:\"id\";s:46:\"Misc_Undelete_PDFs_Limits_Logging_Captcha_etc.\";s:3:\"url\";s:35:\"/civicrm/admin/setting/misc?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Directories\";a:6:{s:5:\"title\";s:11:\"Directories\";s:4:\"desc\";N;s:2:\"id\";s:11:\"Directories\";s:3:\"url\";s:35:\"/civicrm/admin/setting/path?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Resource URLs\";a:6:{s:5:\"title\";s:13:\"Resource URLs\";s:4:\"desc\";N;s:2:\"id\";s:12:\"ResourceURLs\";s:3:\"url\";s:34:\"/civicrm/admin/setting/url?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:40:\"{weight}.Cleanup Caches and Update Paths\";a:6:{s:5:\"title\";s:31:\"Cleanup Caches and Update Paths\";s:4:\"desc\";s:157:\"Reset the Base Directory Path and Base URL settings - generally when a CiviCRM site is moved to another location in the file system and/or to another domain.\";s:2:\"id\";s:27:\"CleanupCachesandUpdatePaths\";s:3:\"url\";s:50:\"/civicrm/admin/setting/updateConfigBackend?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.CMS Database Integration\";a:6:{s:5:\"title\";s:24:\"CMS Database Integration\";s:4:\"desc\";N;s:2:\"id\";s:22:\"CMSDatabaseIntegration\";s:3:\"url\";s:33:\"/civicrm/admin/setting/uf?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:36:\"{weight}.Safe File Extension Options\";a:6:{s:5:\"title\";s:27:\"Safe File Extension Options\";s:4:\"desc\";s:44:\"File Extensions that can be considered safe.\";s:2:\"id\";s:24:\"SafeFileExtensionOptions\";s:3:\"url\";s:50:\"/civicrm/admin/options/safe_file_extension?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Option Groups\";a:6:{s:5:\"title\";s:13:\"Option Groups\";s:4:\"desc\";s:35:\"Access all meta-data option groups.\";s:2:\"id\";s:12:\"OptionGroups\";s:3:\"url\";s:30:\"/civicrm/admin/options?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Import/Export Mappings\";a:6:{s:5:\"title\";s:22:\"Import/Export Mappings\";s:4:\"desc\";s:141:\"Import and Export mappings allow you to easily run the same job multiple times. This option allows you to rename or delete existing mappings.\";s:2:\"id\";s:21:\"Import_ExportMappings\";s:3:\"url\";s:30:\"/civicrm/admin/mapping?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:18:\"{weight}.Debugging\";a:6:{s:5:\"title\";s:9:\"Debugging\";s:4:\"desc\";N;s:2:\"id\";s:9:\"Debugging\";s:3:\"url\";s:36:\"/civicrm/admin/setting/debug?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:28:\"{weight}.Multi Site Settings\";a:6:{s:5:\"title\";s:19:\"Multi Site Settings\";s:4:\"desc\";N;s:2:\"id\";s:17:\"MultiSiteSettings\";s:3:\"url\";s:52:\"/civicrm/admin/setting/preferences/multisite?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Scheduled Jobs\";a:6:{s:5:\"title\";s:14:\"Scheduled Jobs\";s:4:\"desc\";s:35:\"Managing periodially running tasks.\";s:2:\"id\";s:13:\"ScheduledJobs\";s:3:\"url\";s:26:\"/civicrm/admin/job?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Sms Providers\";a:6:{s:5:\"title\";s:13:\"Sms Providers\";s:4:\"desc\";s:27:\"To configure a sms provider\";s:2:\"id\";s:12:\"SmsProviders\";s:3:\"url\";s:35:\"/civicrm/admin/sms/provider?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"CiviCampaign\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:40:\"{weight}.CiviCampaign Component Settings\";a:6:{s:5:\"title\";s:31:\"CiviCampaign Component Settings\";s:4:\"desc\";s:40:\"Configure global CiviCampaign behaviors.\";s:2:\"id\";s:29:\"CiviCampaignComponentSettings\";s:3:\"url\";s:51:\"/civicrm/admin/setting/preferences/campaign?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:21:\"{weight}.Survey Types\";a:6:{s:5:\"title\";s:12:\"Survey Types\";s:4:\"desc\";N;s:2:\"id\";s:11:\"SurveyTypes\";s:3:\"url\";s:42:\"/civicrm/admin/campaign/surveyType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:23:\"{weight}.Campaign Types\";a:6:{s:5:\"title\";s:14:\"Campaign Types\";s:4:\"desc\";s:47:\"categorize your campaigns using campaign types.\";s:2:\"id\";s:13:\"CampaignTypes\";s:3:\"url\";s:44:\"/civicrm/admin/options/campaign_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Campaign Status\";a:6:{s:5:\"title\";s:15:\"Campaign Status\";s:4:\"desc\";s:34:\"Define statuses for campaign here.\";s:2:\"id\";s:14:\"CampaignStatus\";s:3:\"url\";s:46:\"/civicrm/admin/options/campaign_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Engagement Index\";a:6:{s:5:\"title\";s:16:\"Engagement Index\";s:4:\"desc\";s:18:\"Engagement levels.\";s:2:\"id\";s:15:\"EngagementIndex\";s:3:\"url\";s:47:\"/civicrm/admin/options/engagement_index?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"CiviEvent\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:9:{s:37:\"{weight}.CiviEvent Component Settings\";a:6:{s:5:\"title\";s:28:\"CiviEvent Component Settings\";s:4:\"desc\";s:37:\"Configure global CiviEvent behaviors.\";s:2:\"id\";s:26:\"CiviEventComponentSettings\";s:3:\"url\";s:48:\"/civicrm/admin/setting/preferences/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:33:\"{weight}.Event Name Badge Layouts\";a:6:{s:5:\"title\";s:24:\"Event Name Badge Layouts\";s:4:\"desc\";s:107:\"Configure name badge layouts for event participants, including logos and what data to include on the badge.\";s:2:\"id\";s:21:\"EventNameBadgeLayouts\";s:3:\"url\";s:52:\"/civicrm/admin/badgelayout?action=browse&amp;reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Manage Events\";a:6:{s:5:\"title\";s:13:\"Manage Events\";s:4:\"desc\";s:136:\"Create and edit event configuration including times, locations, online registration forms, and fees. Links for iCal and RSS syndication.\";s:2:\"id\";s:12:\"ManageEvents\";s:3:\"url\";s:28:\"/civicrm/admin/event?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Event Templates\";a:6:{s:5:\"title\";s:15:\"Event Templates\";s:4:\"desc\";s:115:\"Administrators can create Event Templates - which are basically master event records pre-filled with default values\";s:2:\"id\";s:14:\"EventTemplates\";s:3:\"url\";s:36:\"/civicrm/admin/eventTemplate?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:20:\"{weight}.Event Types\";a:6:{s:5:\"title\";s:11:\"Event Types\";s:4:\"desc\";s:143:\"Use Event Types to categorize your events. Event feeds can be filtered by Event Type and participant searches can use Event Type as a criteria.\";s:2:\"id\";s:10:\"EventTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/event_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:27:\"{weight}.Participant Status\";a:6:{s:5:\"title\";s:18:\"Participant Status\";s:4:\"desc\";s:154:\"Define statuses for event participants here (e.g. Registered, Attended, Cancelled...). You can then assign statuses and search for participants by status.\";s:2:\"id\";s:17:\"ParticipantStatus\";s:3:\"url\";s:41:\"/civicrm/admin/participant_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Participant Role\";a:6:{s:5:\"title\";s:16:\"Participant Role\";s:4:\"desc\";s:138:\"Define participant roles for events here (e.g. Attendee, Host, Speaker...). You can then assign roles and search for participants by role.\";s:2:\"id\";s:15:\"ParticipantRole\";s:3:\"url\";s:47:\"/civicrm/admin/options/participant_role?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:38:\"{weight}.Participant Listing Templates\";a:6:{s:5:\"title\";s:29:\"Participant Listing Templates\";s:4:\"desc\";s:48:\"Template to control participant listing display.\";s:2:\"id\";s:27:\"ParticipantListingTemplates\";s:3:\"url\";s:50:\"/civicrm/admin/options/participant_listing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:31:\"{weight}.Conference Slot Labels\";a:6:{s:5:\"title\";s:22:\"Conference Slot Labels\";s:4:\"desc\";s:35:\"Define conference slots and labels.\";s:2:\"id\";s:20:\"ConferenceSlotLabels\";s:3:\"url\";s:46:\"/civicrm/admin/options/conference_slot?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviMail\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:36:\"{weight}.CiviMail Component Settings\";a:6:{s:5:\"title\";s:27:\"CiviMail Component Settings\";s:4:\"desc\";s:36:\"Configure global CiviMail behaviors.\";s:2:\"id\";s:25:\"CiviMailComponentSettings\";s:3:\"url\";s:50:\"/civicrm/admin/setting/preferences/mailing?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Mailer Settings\";a:6:{s:5:\"title\";s:15:\"Mailer Settings\";s:4:\"desc\";s:61:\"Configure spool period, throttling and other mailer settings.\";s:2:\"id\";s:14:\"MailerSettings\";s:3:\"url\";s:27:\"/civicrm/admin/mail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:49:\"{weight}.Headers, Footers, and Automated Messages\";a:6:{s:5:\"title\";s:40:\"Headers, Footers, and Automated Messages\";s:4:\"desc\";s:143:\"Configure the header and footer used for mailings. Customize the content of automated Subscribe, Unsubscribe, Resubscribe and Opt-out messages.\";s:2:\"id\";s:36:\"Headers_Footers_andAutomatedMessages\";s:3:\"url\";s:32:\"/civicrm/admin/component?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:29:\"{weight}.From Email Addresses\";a:6:{s:5:\"title\";s:20:\"From Email Addresses\";s:4:\"desc\";s:74:\"List of Email Addresses which can be used when sending emails to contacts.\";s:2:\"id\";s:18:\"FromEmailAddresses\";s:3:\"url\";s:58:\"/civicrm/admin/options/from_email_address/civimail?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Mail Accounts\";a:6:{s:5:\"title\";s:13:\"Mail Accounts\";s:4:\"desc\";s:32:\"Configure email account setting.\";s:2:\"id\";s:12:\"MailAccounts\";s:3:\"url\";s:35:\"/civicrm/admin/mailSettings?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviMember\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:38:\"{weight}.CiviMember Component Settings\";a:6:{s:5:\"title\";s:29:\"CiviMember Component Settings\";s:4:\"desc\";s:38:\"Configure global CiviMember behaviors.\";s:2:\"id\";s:27:\"CiviMemberComponentSettings\";s:3:\"url\";s:49:\"/civicrm/admin/setting/preferences/member?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Membership Types\";a:6:{s:5:\"title\";s:16:\"Membership Types\";s:4:\"desc\";s:174:\"Define the types of memberships you want to offer. For each type, you can specify a \'name\' (Gold Member, Honor Society Member...), a description, duration, and a minimum fee.\";s:2:\"id\";s:15:\"MembershipTypes\";s:3:\"url\";s:44:\"/civicrm/admin/member/membershipType?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:32:\"{weight}.Membership Status Rules\";a:6:{s:5:\"title\";s:23:\"Membership Status Rules\";s:4:\"desc\";s:187:\"Status \'rules\' define the current status for a membership based on that membership\'s start and end dates. You can adjust the default status options and rules as needed to meet your needs.\";s:2:\"id\";s:21:\"MembershipStatusRules\";s:3:\"url\";s:46:\"/civicrm/admin/member/membershipStatus?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:12:\"Option Lists\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:20:\"{weight}.Grant Types\";a:6:{s:5:\"title\";s:11:\"Grant Types\";s:4:\"desc\";s:148:\"List of types which can be assigned to Grants. (Enable CiviGrant from Administer > Systme Settings > Enable Components if you want to track grants.)\";s:2:\"id\";s:10:\"GrantTypes\";s:3:\"url\";s:41:\"/civicrm/admin/options/grant_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:9:\"Customize\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:1:{s:19:\"{weight}.Price Sets\";a:6:{s:5:\"title\";s:10:\"Price Sets\";s:4:\"desc\";s:205:\"Price sets allow you to offer multiple options with associated fees (e.g. pre-conference workshops, additional meals, etc.). Configure Price Sets for events which need more than a single set of fee levels.\";s:2:\"id\";s:9:\"PriceSets\";s:3:\"url\";s:28:\"/civicrm/admin/price?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:8:\"CiviCase\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:5:{s:26:\"{weight}.CiviCase Settings\";a:6:{s:5:\"title\";s:17:\"CiviCase Settings\";s:4:\"desc\";N;s:2:\"id\";s:16:\"CiviCaseSettings\";s:3:\"url\";s:35:\"/civicrm/admin/setting/case?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:19:\"{weight}.Case Types\";a:6:{s:5:\"title\";s:10:\"Case Types\";s:4:\"desc\";s:137:\"List of types which can be assigned to Cases. (Enable the Cases tab from System Settings - Enable Components if you want to track cases.)\";s:2:\"id\";s:9:\"CaseTypes\";s:3:\"url\";s:40:\"/civicrm/admin/options/case_type?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Redaction Rules\";a:6:{s:5:\"title\";s:15:\"Redaction Rules\";s:4:\"desc\";s:223:\"List of rules which can be applied to user input strings so that the redacted output can be recognized as repeated instances of the same string or can be identified as a \"semantic type of the data element\" within case data.\";s:2:\"id\";s:14:\"RedactionRules\";s:3:\"url\";s:45:\"/civicrm/admin/options/redaction_rule?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:22:\"{weight}.Case Statuses\";a:6:{s:5:\"title\";s:13:\"Case Statuses\";s:4:\"desc\";s:48:\"List of statuses that can be assigned to a case.\";s:2:\"id\";s:12:\"CaseStatuses\";s:3:\"url\";s:42:\"/civicrm/admin/options/case_status?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:26:\"{weight}.Encounter Mediums\";a:6:{s:5:\"title\";s:17:\"Encounter Mediums\";s:4:\"desc\";s:26:\"List of encounter mediums.\";s:2:\"id\";s:16:\"EncounterMediums\";s:3:\"url\";s:47:\"/civicrm/admin/options/encounter_medium?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}s:10:\"CiviReport\";a:2:{s:12:\"component_id\";N;s:6:\"fields\";a:3:{s:40:\"{weight}.Create New Report from Template\";a:6:{s:5:\"title\";s:31:\"Create New Report from Template\";s:4:\"desc\";s:49:\"Component wise listing of all available templates\";s:2:\"id\";s:27:\"CreateNewReportfromTemplate\";s:3:\"url\";s:43:\"/civicrm/admin/report/template/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:25:\"{weight}.Manage Templates\";a:6:{s:5:\"title\";s:16:\"Manage Templates\";s:4:\"desc\";s:45:\"Browse, Edit and Delete the Report templates.\";s:2:\"id\";s:15:\"ManageTemplates\";s:3:\"url\";s:53:\"/civicrm/admin/report/options/report_template?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}s:24:\"{weight}.Reports Listing\";a:6:{s:5:\"title\";s:15:\"Reports Listing\";s:4:\"desc\";s:60:\"Browse existing report, change report criteria and settings.\";s:2:\"id\";s:14:\"ReportsListing\";s:3:\"url\";s:34:\"/civicrm/admin/report/list?reset=1\";s:4:\"icon\";N;s:5:\"extra\";N;}}}}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,1,NULL,'a:0:{}');
 /*!40000 ALTER TABLE `civicrm_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -987,7 +987,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_note` WRITE;
 /*!40000 ALTER TABLE `civicrm_note` DISABLE KEYS */;
-INSERT INTO `civicrm_note` (`id`, `entity_table`, `entity_id`, `note`, `contact_id`, `modified_date`, `subject`, `privacy`) VALUES (1,'civicrm_contact',20,'Organize the Terry Fox run',1,'2019-12-21 02:15:52',NULL,'0'),(2,'civicrm_contact',51,'Send reminder for annual dinner',1,'2020-08-01 10:04:18',NULL,'0'),(3,'civicrm_contact',11,'Contact the Commissioner of Charities',1,'2020-05-09 14:15:03',NULL,'0'),(4,'civicrm_contact',35,'Arrange for cricket match with Sunil Gavaskar',1,'2020-03-15 01:38:34',NULL,'0'),(5,'civicrm_contact',85,'Chart out route map for next 10k run',1,'2020-08-14 22:16:52',NULL,'0'),(6,'civicrm_contact',128,'Arrange for cricket match with Sunil Gavaskar',1,'2020-09-09 22:46:13',NULL,'0'),(7,'civicrm_contact',141,'Arrange collection of funds from members',1,'2019-10-13 22:38:34',NULL,'0'),(8,'civicrm_contact',180,'Contact the Commissioner of Charities',1,'2019-12-29 20:12:34',NULL,'0'),(9,'civicrm_contact',174,'Organize the Terry Fox run',1,'2020-04-21 20:42:15',NULL,'0'),(10,'civicrm_contact',122,'Arrange collection of funds from members',1,'2020-02-15 00:32:40',NULL,'0'),(11,'civicrm_contact',22,'Get the registration done for NGO status',1,'2020-02-12 12:15:25',NULL,'0'),(12,'civicrm_contact',48,'Send reminder for annual dinner',1,'2019-10-23 00:53:28',NULL,'0'),(13,'civicrm_contact',43,'Get the registration done for NGO status',1,'2020-09-04 06:45:51',NULL,'0'),(14,'civicrm_contact',141,'Contact the Commissioner of Charities',1,'2019-11-11 21:42:48',NULL,'0'),(15,'civicrm_contact',61,'Organize the Terry Fox run',1,'2020-03-04 06:38:26',NULL,'0'),(16,'civicrm_contact',187,'Connect for presentation',1,'2020-04-26 23:01:13',NULL,'0'),(17,'civicrm_contact',196,'Chart out route map for next 10k run',1,'2020-08-10 07:41:18',NULL,'0'),(18,'civicrm_contact',50,'Organize the Terry Fox run',1,'2020-04-24 15:23:31',NULL,'0'),(19,'civicrm_contact',111,'Arrange collection of funds from members',1,'2020-08-04 04:30:50',NULL,'0'),(20,'civicrm_contact',95,'Connect for presentation',1,'2019-10-06 13:25:50',NULL,'0');
+INSERT INTO `civicrm_note` (`id`, `entity_table`, `entity_id`, `note`, `contact_id`, `modified_date`, `subject`, `privacy`) VALUES (1,'civicrm_contact',7,'Get the registration done for NGO status',1,'2020-03-12 17:03:58',NULL,'0'),(2,'civicrm_contact',194,'Get the registration done for NGO status',1,'2020-08-25 10:25:28',NULL,'0'),(3,'civicrm_contact',200,'Arrange for cricket match with Sunil Gavaskar',1,'2020-07-06 19:35:48',NULL,'0'),(4,'civicrm_contact',35,'Reminder screening of \"Black\" on next Friday',1,'2019-10-25 22:06:42',NULL,'0'),(5,'civicrm_contact',29,'Arrange collection of funds from members',1,'2019-10-29 00:26:00',NULL,'0'),(6,'civicrm_contact',143,'Arrange collection of funds from members',1,'2020-03-27 16:19:15',NULL,'0'),(7,'civicrm_contact',192,'Contact the Commissioner of Charities',1,'2020-01-22 18:28:44',NULL,'0'),(8,'civicrm_contact',67,'Arrange for cricket match with Sunil Gavaskar',1,'2020-02-16 19:33:23',NULL,'0'),(9,'civicrm_contact',38,'Send reminder for annual dinner',1,'2020-06-07 14:57:32',NULL,'0'),(10,'civicrm_contact',8,'Organize the Terry Fox run',1,'2020-09-04 13:04:38',NULL,'0'),(11,'civicrm_contact',42,'Connect for presentation',1,'2020-08-28 16:22:01',NULL,'0'),(12,'civicrm_contact',111,'Reminder screening of \"Black\" on next Friday',1,'2020-03-11 12:07:52',NULL,'0'),(13,'civicrm_contact',126,'Reminder screening of \"Black\" on next Friday',1,'2020-04-25 22:44:11',NULL,'0'),(14,'civicrm_contact',33,'Chart out route map for next 10k run',1,'2020-09-07 08:01:31',NULL,'0'),(15,'civicrm_contact',109,'Get the registration done for NGO status',1,'2019-12-13 11:23:16',NULL,'0'),(16,'civicrm_contact',161,'Organize the Terry Fox run',1,'2020-08-18 21:00:33',NULL,'0'),(17,'civicrm_contact',39,'Send newsletter for April 2005',1,'2019-10-20 13:01:58',NULL,'0'),(18,'civicrm_contact',55,'Send reminder for annual dinner',1,'2019-10-24 15:32:23',NULL,'0'),(19,'civicrm_contact',73,'Invite members for the Steve Prefontaine 10k dream run',1,'2019-11-04 22:23:17',NULL,'0'),(20,'civicrm_contact',137,'Chart out route map for next 10k run',1,'2019-11-11 00:37:00',NULL,'0');
 /*!40000 ALTER TABLE `civicrm_note` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1026,7 +1026,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_participant` WRITE;
 /*!40000 ALTER TABLE `civicrm_participant` DISABLE KEYS */;
-INSERT INTO `civicrm_participant` (`id`, `contact_id`, `event_id`, `status_id`, `role_id`, `register_date`, `source`, `fee_level`, `is_test`, `is_pay_later`, `fee_amount`, `registered_by_id`, `discount_id`, `fee_currency`, `campaign_id`, `discount_amount`, `cart_id`, `must_wait`, `transferred_to_contact_id`) VALUES (1,157,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(2,60,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(3,26,3,3,'3','2008-05-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(4,193,1,4,'4','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(5,115,2,1,'1','2008-01-10 00:00:00','Check','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(6,172,3,2,'2','2008-03-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(7,82,1,3,'3','2009-07-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(8,103,2,4,'4','2009-03-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(9,129,3,1,'1','2008-02-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(10,50,1,2,'2','2008-02-01 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(11,196,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(12,169,3,4,'4','2009-03-06 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(13,94,1,1,'2','2008-06-04 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(14,153,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(15,155,3,4,'1','2008-07-04 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(16,76,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(17,95,2,2,'3','2008-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(18,111,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(19,187,1,2,'1','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(20,84,2,4,'1','2009-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(21,101,3,1,'4','2008-03-25 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(22,137,1,2,'3','2009-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(23,78,2,4,'1','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(24,167,3,3,'1','2008-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(25,11,3,2,'2','2008-04-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(26,77,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(27,128,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(28,48,3,3,'3','2009-12-12 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(29,80,1,4,'4','2009-12-13 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(30,140,2,1,'1','2009-12-14 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(31,21,3,2,'2','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(32,191,1,3,'3','2009-07-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(33,160,2,4,'4','2009-03-07 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(34,188,3,1,'1','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(35,114,1,2,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(36,52,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(37,7,3,4,'4','2009-03-06 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(38,135,1,1,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(39,79,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(40,67,3,4,'1','2009-12-14 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(41,27,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(42,146,2,2,'3','2009-12-15 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(43,8,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(44,161,1,2,'1','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(45,85,2,4,'1','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(46,46,3,1,'4','2009-12-13 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(47,181,1,2,'3','2009-10-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(48,13,2,4,'1','2009-12-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(49,147,3,3,'1','2009-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(50,53,3,2,'2','2009-04-05 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `civicrm_participant` (`id`, `contact_id`, `event_id`, `status_id`, `role_id`, `register_date`, `source`, `fee_level`, `is_test`, `is_pay_later`, `fee_amount`, `registered_by_id`, `discount_id`, `fee_currency`, `campaign_id`, `discount_amount`, `cart_id`, `must_wait`, `transferred_to_contact_id`) VALUES (1,43,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(2,37,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(3,90,3,3,'3','2008-05-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(4,28,1,4,'4','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(5,123,2,1,'1','2008-01-10 00:00:00','Check','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(6,172,3,2,'2','2008-03-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(7,120,1,3,'3','2009-07-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(8,25,2,4,'4','2009-03-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(9,20,3,1,'1','2008-02-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(10,194,1,2,'2','2008-02-01 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(11,88,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(12,198,3,4,'4','2009-03-06 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(13,44,1,1,'2','2008-06-04 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(14,147,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(15,79,3,4,'1','2008-07-04 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(16,162,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(17,71,2,2,'3','2008-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(18,40,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(19,99,1,2,'1','2008-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(20,110,2,4,'1','2009-01-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(21,55,3,1,'4','2008-03-25 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(22,38,1,2,'3','2009-10-21 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(23,150,2,4,'1','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(24,127,3,3,'1','2008-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(25,63,3,2,'2','2008-04-05 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(26,56,1,1,'1','2009-01-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(27,190,2,2,'2','2008-05-07 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(28,166,3,3,'3','2009-12-12 00:00:00','Direct Transfer','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(29,155,1,4,'4','2009-12-13 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(30,47,2,1,'1','2009-12-14 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(31,102,3,2,'2','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(32,48,1,3,'3','2009-07-21 00:00:00','Check','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(33,153,2,4,'4','2009-03-07 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(34,104,3,1,'1','2009-12-15 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(35,70,1,2,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(36,61,2,3,'3','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(37,178,3,4,'4','2009-03-06 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(38,199,1,1,'2','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(39,160,2,2,'3','2008-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(40,197,3,4,'1','2009-12-14 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(41,8,1,4,'2','2009-01-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(42,156,2,2,'3','2009-12-15 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(43,192,3,3,'1','2009-03-05 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(44,125,1,2,'1','2009-12-13 00:00:00','Direct Transfer','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(45,52,2,4,'1','2009-01-10 00:00:00','Direct Transfer','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(46,163,3,1,'4','2009-12-13 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(47,187,1,2,'3','2009-10-21 00:00:00','Credit Card','Single',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(48,11,2,4,'1','2009-12-10 00:00:00','Credit Card','Soprano',0,0,50.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(49,18,3,3,'1','2009-03-11 00:00:00','Credit Card','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL),(50,135,3,2,'2','2009-04-05 00:00:00','Check','Tiny-tots (ages 5-8)',0,0,800.00,NULL,NULL,'USD',NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_participant` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1036,7 +1036,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_participant_payment` WRITE;
 /*!40000 ALTER TABLE `civicrm_participant_payment` DISABLE KEYS */;
-INSERT INTO `civicrm_participant_payment` (`id`, `participant_id`, `contribution_id`) VALUES (1,37,45),(2,43,46),(3,25,47),(4,48,48),(5,31,49),(6,3,50),(7,41,51),(8,46,52),(9,28,53),(10,10,54),(11,36,55),(12,50,56),(13,2,57),(14,40,58),(15,16,59),(16,26,60),(17,23,61),(18,39,62),(19,29,63),(20,7,64),(21,20,65),(22,45,66),(23,13,67),(24,17,68),(25,21,69),(26,8,70),(27,18,71),(28,35,72),(29,5,73),(30,27,74),(31,9,75),(32,38,76),(33,22,77),(34,30,78),(35,42,79),(36,49,80),(37,14,81),(38,15,82),(39,1,83),(40,33,84),(41,44,85),(42,24,86),(43,12,87),(44,6,88),(45,47,89),(46,19,90),(47,34,91),(48,32,92),(49,4,93),(50,11,94);
+INSERT INTO `civicrm_participant_payment` (`id`, `participant_id`, `contribution_id`) VALUES (1,41,45),(2,48,46),(3,49,47),(4,9,48),(5,8,49),(6,4,50),(7,2,51),(8,22,52),(9,18,53),(10,1,54),(11,13,55),(12,30,56),(13,32,57),(14,45,58),(15,21,59),(16,26,60),(17,36,61),(18,25,62),(19,35,63),(20,17,64),(21,15,65),(22,11,66),(23,3,67),(24,19,68),(25,31,69),(26,34,70),(27,20,71),(28,7,72),(29,5,73),(30,44,74),(31,24,75),(32,50,76),(33,14,77),(34,23,78),(35,33,79),(36,29,80),(37,42,81),(38,39,82),(39,16,83),(40,46,84),(41,28,85),(42,6,86),(43,37,87),(44,47,88),(45,27,89),(46,43,90),(47,10,91),(48,40,92),(49,12,93),(50,38,94);
 /*!40000 ALTER TABLE `civicrm_participant_payment` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1084,7 +1084,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_pcp` WRITE;
 /*!40000 ALTER TABLE `civicrm_pcp` DISABLE KEYS */;
-INSERT INTO `civicrm_pcp` (`id`, `contact_id`, `status_id`, `title`, `intro_text`, `page_text`, `donate_link_text`, `page_id`, `page_type`, `pcp_block_id`, `is_thermometer`, `is_honor_roll`, `goal_amount`, `currency`, `is_active`, `is_notify`) VALUES (1,117,2,'My Personal Civi Fundraiser','I\'m on a mission to get all my friends and family to help support my favorite open-source civic sector CRM.','<p>Friends and family - please help build much needed infrastructure for the civic sector by supporting my personal campaign!</p>\r\n<p><a href=\"https://civicrm.org\">You can learn more about CiviCRM here</a>.</p>\r\n<p>Then click the <strong>Contribute Now</strong> button to go to our easy-to-use online contribution form.</p>','Contribute Now',1,'contribute',1,1,1,5000.00,'USD',1,1);
+INSERT INTO `civicrm_pcp` (`id`, `contact_id`, `status_id`, `title`, `intro_text`, `page_text`, `donate_link_text`, `page_id`, `page_type`, `pcp_block_id`, `is_thermometer`, `is_honor_roll`, `goal_amount`, `currency`, `is_active`, `is_notify`) VALUES (1,118,2,'My Personal Civi Fundraiser','I\'m on a mission to get all my friends and family to help support my favorite open-source civic sector CRM.','<p>Friends and family - please help build much needed infrastructure for the civic sector by supporting my personal campaign!</p>\r\n<p><a href=\"https://civicrm.org\">You can learn more about CiviCRM here</a>.</p>\r\n<p>Then click the <strong>Contribute Now</strong> button to go to our easy-to-use online contribution form.</p>','Contribute Now',1,'contribute',1,1,1,5000.00,'USD',1,1);
 /*!40000 ALTER TABLE `civicrm_pcp` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1104,7 +1104,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_phone` WRITE;
 /*!40000 ALTER TABLE `civicrm_phone` DISABLE KEYS */;
-INSERT INTO `civicrm_phone` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `mobile_provider_id`, `phone`, `phone_ext`, `phone_numeric`, `phone_type_id`) VALUES (1,94,1,1,0,NULL,'407-4490',NULL,'4074490',1),(2,105,1,1,0,NULL,'(845) 293-7533',NULL,'8452937533',2),(3,105,1,0,0,NULL,'(389) 833-5963',NULL,'3898335963',2),(4,25,1,1,0,NULL,'588-1096',NULL,'5881096',2),(5,117,1,1,0,NULL,'(370) 204-2603',NULL,'3702042603',1),(6,145,1,1,0,NULL,'(463) 742-8478',NULL,'4637428478',2),(7,145,1,0,0,NULL,'207-8061',NULL,'2078061',2),(8,194,1,1,0,NULL,'(719) 439-3592',NULL,'7194393592',1),(9,103,1,1,0,NULL,'(300) 893-2392',NULL,'3008932392',2),(10,177,1,1,0,NULL,'(511) 715-1541',NULL,'5117151541',1),(11,185,1,1,0,NULL,'413-9520',NULL,'4139520',1),(12,185,1,0,0,NULL,'699-1910',NULL,'6991910',2),(13,130,1,1,0,NULL,'(443) 890-9733',NULL,'4438909733',1),(14,152,1,1,0,NULL,'370-4838',NULL,'3704838',2),(15,152,1,0,0,NULL,'(822) 784-5370',NULL,'8227845370',1),(16,102,1,1,0,NULL,'(710) 667-2627',NULL,'7106672627',2),(17,65,1,1,0,NULL,'819-3401',NULL,'8193401',1),(18,201,1,1,0,NULL,'(334) 830-3482',NULL,'3348303482',1),(19,201,1,0,0,NULL,'882-6903',NULL,'8826903',1),(20,86,1,1,0,NULL,'847-3586',NULL,'8473586',1),(21,142,1,1,0,NULL,'807-6213',NULL,'8076213',1),(22,70,1,1,0,NULL,'(744) 748-7789',NULL,'7447487789',1),(23,70,1,0,0,NULL,'308-6097',NULL,'3086097',1),(24,126,1,1,0,NULL,'809-7358',NULL,'8097358',1),(25,170,1,1,0,NULL,'(580) 468-7159',NULL,'5804687159',1),(26,200,1,1,0,NULL,'(524) 419-2849',NULL,'5244192849',2),(27,200,1,0,0,NULL,'872-4356',NULL,'8724356',2),(28,51,1,1,0,NULL,'(743) 315-7045',NULL,'7433157045',2),(29,150,1,1,0,NULL,'887-5105',NULL,'8875105',1),(30,150,1,0,0,NULL,'(747) 437-3966',NULL,'7474373966',1),(31,43,1,1,0,NULL,'519-4567',NULL,'5194567',1),(32,43,1,0,0,NULL,'774-3321',NULL,'7743321',1),(33,17,1,1,0,NULL,'(489) 898-5178',NULL,'4898985178',2),(34,17,1,0,0,NULL,'(874) 445-3093',NULL,'8744453093',1),(35,197,1,1,0,NULL,'595-5547',NULL,'5955547',2),(36,197,1,0,0,NULL,'255-7656',NULL,'2557656',2),(37,88,1,1,0,NULL,'(445) 452-6746',NULL,'4454526746',1),(38,88,1,0,0,NULL,'(872) 375-1249',NULL,'8723751249',1),(39,21,1,1,0,NULL,'(416) 423-9427',NULL,'4164239427',1),(40,127,1,1,0,NULL,'215-8558',NULL,'2158558',2),(41,59,1,1,0,NULL,'(459) 503-6007',NULL,'4595036007',2),(42,176,1,1,0,NULL,'(628) 809-6147',NULL,'6288096147',1),(43,118,1,1,0,NULL,'693-1625',NULL,'6931625',1),(44,118,1,0,0,NULL,'893-8754',NULL,'8938754',1),(45,156,1,1,0,NULL,'350-9058',NULL,'3509058',1),(46,111,1,1,0,NULL,'(427) 777-8863',NULL,'4277778863',1),(47,19,1,1,0,NULL,'(363) 306-2082',NULL,'3633062082',2),(48,19,1,0,0,NULL,'317-1598',NULL,'3171598',2),(49,166,1,1,0,NULL,'742-7890',NULL,'7427890',1),(50,180,1,1,0,NULL,'634-9898',NULL,'6349898',1),(51,180,1,0,0,NULL,'(805) 299-8983',NULL,'8052998983',1),(52,12,1,1,0,NULL,'(218) 542-1734',NULL,'2185421734',2),(53,12,1,0,0,NULL,'703-3192',NULL,'7033192',1),(54,132,1,1,0,NULL,'832-9698',NULL,'8329698',1),(55,57,1,1,0,NULL,'(828) 380-7875',NULL,'8283807875',2),(56,144,1,1,0,NULL,'(609) 289-9417',NULL,'6092899417',2),(57,191,1,1,0,NULL,'236-2095',NULL,'2362095',1),(58,157,1,1,0,NULL,'693-9591',NULL,'6939591',2),(59,46,1,1,0,NULL,'824-3608',NULL,'8243608',2),(60,129,1,1,0,NULL,'421-7315',NULL,'4217315',1),(61,52,1,1,0,NULL,'291-2610',NULL,'2912610',2),(62,52,1,0,0,NULL,'(694) 288-8032',NULL,'6942888032',1),(63,28,1,1,0,NULL,'218-2857',NULL,'2182857',1),(64,107,1,1,0,NULL,'(607) 207-1590',NULL,'6072071590',1),(65,136,1,1,0,NULL,'(792) 688-9352',NULL,'7926889352',1),(66,41,1,1,0,NULL,'(387) 441-7759',NULL,'3874417759',1),(67,72,1,1,0,NULL,'(691) 801-1142',NULL,'6918011142',2),(68,72,1,0,0,NULL,'489-2410',NULL,'4892410',2),(69,89,1,1,0,NULL,'407-2208',NULL,'4072208',2),(70,89,1,0,0,NULL,'439-3945',NULL,'4393945',2),(71,49,1,1,0,NULL,'808-4164',NULL,'8084164',2),(72,49,1,0,0,NULL,'627-4100',NULL,'6274100',1),(73,153,1,1,0,NULL,'682-8516',NULL,'6828516',1),(74,125,1,1,0,NULL,'397-8548',NULL,'3978548',2),(75,125,1,0,0,NULL,'375-6875',NULL,'3756875',2),(76,162,1,1,0,NULL,'738-2268',NULL,'7382268',1),(77,162,1,0,0,NULL,'759-5422',NULL,'7595422',1),(78,13,1,1,0,NULL,'(805) 697-2759',NULL,'8056972759',2),(79,56,1,1,0,NULL,'736-9711',NULL,'7369711',1),(80,56,1,0,0,NULL,'395-4444',NULL,'3954444',2),(81,33,1,1,0,NULL,'483-5196',NULL,'4835196',2),(82,24,1,1,0,NULL,'469-2466',NULL,'4692466',1),(83,188,1,1,0,NULL,'292-4061',NULL,'2924061',1),(84,77,1,1,0,NULL,'(497) 324-6618',NULL,'4973246618',1),(85,161,1,1,0,NULL,'691-4077',NULL,'6914077',1),(86,161,1,0,0,NULL,'(396) 409-5228',NULL,'3964095228',2),(87,60,1,1,0,NULL,'664-7881',NULL,'6647881',1),(88,164,1,1,0,NULL,'(756) 534-8706',NULL,'7565348706',2),(89,164,1,0,0,NULL,'416-6210',NULL,'4166210',2),(90,147,1,1,0,NULL,'281-2011',NULL,'2812011',2),(91,147,1,0,0,NULL,'586-5666',NULL,'5865666',1),(92,173,1,1,0,NULL,'(836) 553-8707',NULL,'8365538707',2),(93,173,1,0,0,NULL,'(618) 534-5092',NULL,'6185345092',1),(94,16,1,1,0,NULL,'(610) 432-6289',NULL,'6104326289',2),(95,16,1,0,0,NULL,'254-9515',NULL,'2549515',1),(96,29,1,1,0,NULL,'685-3908',NULL,'6853908',2),(97,29,1,0,0,NULL,'(278) 268-2884',NULL,'2782682884',1),(98,50,1,1,0,NULL,'(654) 398-5725',NULL,'6543985725',2),(99,190,1,1,0,NULL,'436-1619',NULL,'4361619',1),(100,190,1,0,0,NULL,'423-1355',NULL,'4231355',2),(101,163,1,1,0,NULL,'380-8587',NULL,'3808587',1),(102,181,1,1,0,NULL,'356-9736',NULL,'3569736',2),(103,181,1,0,0,NULL,'(670) 430-4196',NULL,'6704304196',2),(104,189,1,1,0,NULL,'(718) 357-6624',NULL,'7183576624',2),(105,5,1,1,0,NULL,'(391) 604-8751',NULL,'3916048751',1),(106,5,1,0,0,NULL,'702-7052',NULL,'7027052',2),(107,79,1,1,0,NULL,'856-1393',NULL,'8561393',2),(108,82,1,1,0,NULL,'697-6303',NULL,'6976303',2),(109,87,1,1,0,NULL,'269-5529',NULL,'2695529',1),(110,87,1,0,0,NULL,'844-2742',NULL,'8442742',1),(111,15,1,1,0,NULL,'(331) 444-3306',NULL,'3314443306',1),(112,108,1,1,0,NULL,'(621) 236-8085',NULL,'6212368085',1),(113,40,1,1,0,NULL,'248-6404',NULL,'2486404',2),(114,40,1,0,0,NULL,'845-7925',NULL,'8457925',1),(115,138,1,1,0,NULL,'321-3606',NULL,'3213606',2),(116,135,1,1,0,NULL,'(526) 260-4435',NULL,'5262604435',2),(117,135,1,0,0,NULL,'217-8226',NULL,'2178226',2),(118,168,1,1,0,NULL,'(637) 777-8653',NULL,'6377778653',1),(119,168,1,0,0,NULL,'(234) 558-1055',NULL,'2345581055',1),(120,80,1,1,0,NULL,'(320) 638-3388',NULL,'3206383388',2),(121,80,1,0,0,NULL,'231-1175',NULL,'2311175',1),(122,4,1,1,0,NULL,'658-3244',NULL,'6583244',1),(123,4,1,0,0,NULL,'505-3054',NULL,'5053054',2),(124,83,1,1,0,NULL,'553-1937',NULL,'5531937',2),(125,83,1,0,0,NULL,'327-9761',NULL,'3279761',1),(126,42,1,1,0,NULL,'(895) 861-2526',NULL,'8958612526',1),(127,42,1,0,0,NULL,'(423) 271-2934',NULL,'4232712934',1),(128,2,1,1,0,NULL,'(377) 889-9607',NULL,'3778899607',1),(129,139,1,1,0,NULL,'(690) 457-8377',NULL,'6904578377',1),(130,175,1,1,0,NULL,'(881) 293-8411',NULL,'8812938411',1),(131,14,1,1,0,NULL,'231-8009',NULL,'2318009',1),(132,14,1,0,0,NULL,'(467) 442-6144',NULL,'4674426144',2),(133,97,1,1,0,NULL,'777-2979',NULL,'7772979',2),(134,97,1,0,0,NULL,'(495) 729-9394',NULL,'4957299394',1),(135,58,1,1,0,NULL,'743-3904',NULL,'7433904',2),(136,68,1,1,0,NULL,'804-6037',NULL,'8046037',1),(137,68,1,0,0,NULL,'(676) 396-3406',NULL,'6763963406',1),(138,53,1,1,0,NULL,'776-5432',NULL,'7765432',2),(139,172,1,1,0,NULL,'(385) 376-6702',NULL,'3853766702',1),(140,172,1,0,0,NULL,'(472) 686-6524',NULL,'4726866524',2),(141,71,1,1,0,NULL,'876-1844',NULL,'8761844',2),(142,71,1,0,0,NULL,'415-1520',NULL,'4151520',1),(143,120,1,1,0,NULL,'561-7861',NULL,'5617861',2),(144,120,1,0,0,NULL,'(584) 262-9787',NULL,'5842629787',1),(145,26,1,1,0,NULL,'222-8898',NULL,'2228898',1),(146,95,1,1,0,NULL,'(553) 771-4049',NULL,'5537714049',1),(147,31,1,1,0,NULL,'(887) 219-9808',NULL,'8872199808',1),(148,34,1,1,0,NULL,'879-9563',NULL,'8799563',2),(149,159,1,1,0,NULL,'(898) 288-8559',NULL,'8982888559',2),(150,NULL,1,0,0,NULL,'204 222-1000',NULL,'2042221000',1),(151,NULL,1,0,0,NULL,'204 223-1000',NULL,'2042231000',1),(152,NULL,1,0,0,NULL,'303 323-1000',NULL,'3033231000',1);
+INSERT INTO `civicrm_phone` (`id`, `contact_id`, `location_type_id`, `is_primary`, `is_billing`, `mobile_provider_id`, `phone`, `phone_ext`, `phone_numeric`, `phone_type_id`) VALUES (1,79,1,1,0,NULL,'(523) 815-5146',NULL,'5238155146',2),(2,79,1,0,0,NULL,'721-6350',NULL,'7216350',2),(3,47,1,1,0,NULL,'889-3713',NULL,'8893713',2),(4,47,1,0,0,NULL,'562-6370',NULL,'5626370',2),(5,34,1,1,0,NULL,'790-2316',NULL,'7902316',1),(6,44,1,1,0,NULL,'503-8140',NULL,'5038140',1),(7,139,1,1,0,NULL,'(830) 472-1368',NULL,'8304721368',2),(8,126,1,1,0,NULL,'456-8960',NULL,'4568960',2),(9,17,1,1,0,NULL,'(685) 670-6506',NULL,'6856706506',1),(10,12,1,1,0,NULL,'(481) 832-1118',NULL,'4818321118',1),(11,12,1,0,0,NULL,'(773) 881-5266',NULL,'7738815266',1),(12,9,1,1,0,NULL,'(315) 699-7156',NULL,'3156997156',2),(13,9,1,0,0,NULL,'(463) 336-9961',NULL,'4633369961',2),(14,55,1,1,0,NULL,'694-8990',NULL,'6948990',1),(15,132,1,1,0,NULL,'(222) 396-9157',NULL,'2223969157',2),(16,91,1,1,0,NULL,'729-1012',NULL,'7291012',2),(17,65,1,1,0,NULL,'314-7104',NULL,'3147104',2),(18,65,1,0,0,NULL,'(370) 898-8405',NULL,'3708988405',1),(19,38,1,1,0,NULL,'(214) 622-6050',NULL,'2146226050',2),(20,38,1,0,0,NULL,'(851) 566-9796',NULL,'8515669796',1),(21,11,1,1,0,NULL,'202-9668',NULL,'2029668',2),(22,11,1,0,0,NULL,'(281) 705-5947',NULL,'2817055947',1),(23,201,1,1,0,NULL,'671-6560',NULL,'6716560',1),(24,181,1,1,0,NULL,'(450) 351-2143',NULL,'4503512143',1),(25,32,1,1,0,NULL,'673-7694',NULL,'6737694',1),(26,168,1,1,0,NULL,'(274) 337-7368',NULL,'2743377368',2),(27,164,1,1,0,NULL,'726-4472',NULL,'7264472',1),(28,92,1,1,0,NULL,'(700) 387-8405',NULL,'7003878405',2),(29,92,1,0,0,NULL,'(264) 351-7016',NULL,'2643517016',2),(30,94,1,1,0,NULL,'719-4685',NULL,'7194685',1),(31,94,1,0,0,NULL,'(216) 647-4858',NULL,'2166474858',1),(32,8,1,1,0,NULL,'274-7810',NULL,'2747810',2),(33,60,1,1,0,NULL,'(385) 587-1748',NULL,'3855871748',2),(34,60,1,0,0,NULL,'641-7208',NULL,'6417208',2),(35,133,1,1,0,NULL,'378-8835',NULL,'3788835',1),(36,133,1,0,0,NULL,'(586) 566-7162',NULL,'5865667162',2),(37,42,1,1,0,NULL,'(356) 308-4372',NULL,'3563084372',1),(38,154,1,1,0,NULL,'844-9406',NULL,'8449406',2),(39,154,1,0,0,NULL,'(245) 484-7252',NULL,'2454847252',1),(40,112,1,1,0,NULL,'415-9536',NULL,'4159536',2),(41,112,1,0,0,NULL,'(331) 311-6801',NULL,'3313116801',2),(42,162,1,1,0,NULL,'(385) 528-9111',NULL,'3855289111',1),(43,183,1,1,0,NULL,'(497) 530-9731',NULL,'4975309731',2),(44,31,1,1,0,NULL,'214-4224',NULL,'2144224',1),(45,184,1,1,0,NULL,'(338) 788-3106',NULL,'3387883106',1),(46,59,1,1,0,NULL,'269-8908',NULL,'2698908',2),(47,59,1,0,0,NULL,'(269) 787-4490',NULL,'2697874490',2),(48,46,1,1,0,NULL,'(587) 463-9165',NULL,'5874639165',1),(49,193,1,1,0,NULL,'881-3194',NULL,'8813194',2),(50,193,1,0,0,NULL,'473-4558',NULL,'4734558',1),(51,199,1,1,0,NULL,'(292) 359-9271',NULL,'2923599271',2),(52,199,1,0,0,NULL,'431-2634',NULL,'4312634',2),(53,86,1,1,0,NULL,'479-2381',NULL,'4792381',2),(54,182,1,1,0,NULL,'(795) 496-6724',NULL,'7954966724',2),(55,182,1,0,0,NULL,'207-3852',NULL,'2073852',2),(56,151,1,1,0,NULL,'307-4949',NULL,'3074949',2),(57,137,1,1,0,NULL,'519-9579',NULL,'5199579',2),(58,137,1,0,0,NULL,'377-3591',NULL,'3773591',1),(59,189,1,1,0,NULL,'(623) 488-2405',NULL,'6234882405',1),(60,189,1,0,0,NULL,'(461) 806-5134',NULL,'4618065134',2),(61,35,1,1,0,NULL,'837-8708',NULL,'8378708',1),(62,117,1,1,0,NULL,'(584) 883-7595',NULL,'5848837595',1),(63,176,1,1,0,NULL,'716-9883',NULL,'7169883',1),(64,185,1,1,0,NULL,'(312) 773-6857',NULL,'3127736857',1),(65,185,1,0,0,NULL,'614-9027',NULL,'6149027',1),(66,95,1,1,0,NULL,'649-6641',NULL,'6496641',1),(67,95,1,0,0,NULL,'425-1806',NULL,'4251806',1),(68,121,1,1,0,NULL,'(531) 572-1850',NULL,'5315721850',1),(69,121,1,0,0,NULL,'(263) 519-9625',NULL,'2635199625',1),(70,158,1,1,0,NULL,'239-8950',NULL,'2398950',1),(71,43,1,1,0,NULL,'(703) 617-1898',NULL,'7036171898',1),(72,43,1,0,0,NULL,'(899) 673-2608',NULL,'8996732608',1),(73,131,1,1,0,NULL,'(618) 337-1277',NULL,'6183371277',2),(74,97,1,1,0,NULL,'(895) 726-7800',NULL,'8957267800',1),(75,97,1,0,0,NULL,'649-5990',NULL,'6495990',2),(76,124,1,1,0,NULL,'(313) 267-4581',NULL,'3132674581',1),(77,124,1,0,0,NULL,'(654) 218-9583',NULL,'6542189583',1),(78,26,1,1,0,NULL,'(205) 879-4845',NULL,'2058794845',1),(79,26,1,0,0,NULL,'342-8026',NULL,'3428026',1),(80,10,1,1,0,NULL,'457-6673',NULL,'4576673',2),(81,10,1,0,0,NULL,'(498) 652-8931',NULL,'4986528931',1),(82,45,1,1,0,NULL,'469-9857',NULL,'4699857',2),(83,66,1,1,0,NULL,'(745) 470-7998',NULL,'7454707998',1),(84,66,1,0,0,NULL,'(602) 298-4166',NULL,'6022984166',1),(85,138,1,1,0,NULL,'(317) 607-4473',NULL,'3176074473',2),(86,138,1,0,0,NULL,'(395) 485-4462',NULL,'3954854462',2),(87,57,1,1,0,NULL,'619-5216',NULL,'6195216',2),(88,157,1,1,0,NULL,'(620) 882-3318',NULL,'6208823318',2),(89,159,1,1,0,NULL,'658-7722',NULL,'6587722',2),(90,159,1,0,0,NULL,'370-7965',NULL,'3707965',2),(91,145,1,1,0,NULL,'(542) 706-4403',NULL,'5427064403',1),(92,106,1,1,0,NULL,'475-5485',NULL,'4755485',2),(93,106,1,0,0,NULL,'(259) 729-3126',NULL,'2597293126',2),(94,113,1,1,0,NULL,'(566) 694-6898',NULL,'5666946898',1),(95,113,1,0,0,NULL,'(887) 227-7343',NULL,'8872277343',2),(96,29,1,1,0,NULL,'(757) 332-8803',NULL,'7573328803',1),(97,29,1,0,0,NULL,'408-1363',NULL,'4081363',1),(98,19,1,1,0,NULL,'(564) 389-3716',NULL,'5643893716',2),(99,19,1,0,0,NULL,'560-2969',NULL,'5602969',1),(100,105,1,1,0,NULL,'(368) 532-5416',NULL,'3685325416',2),(101,105,1,0,0,NULL,'449-2655',NULL,'4492655',2),(102,20,1,1,0,NULL,'(659) 283-2058',NULL,'6592832058',2),(103,25,1,1,0,NULL,'633-5898',NULL,'6335898',1),(104,25,1,0,0,NULL,'(475) 555-3494',NULL,'4755553494',2),(105,123,1,1,0,NULL,'(494) 215-1586',NULL,'4942151586',2),(106,150,1,1,0,NULL,'(607) 583-9806',NULL,'6075839806',2),(107,150,1,0,0,NULL,'(752) 453-9521',NULL,'7524539521',1),(108,96,1,1,0,NULL,'762-1999',NULL,'7621999',1),(109,96,1,0,0,NULL,'(310) 560-1322',NULL,'3105601322',2),(110,27,1,1,0,NULL,'(623) 531-9647',NULL,'6235319647',2),(111,27,1,0,0,NULL,'458-1481',NULL,'4581481',2),(112,6,1,1,0,NULL,'(416) 234-4200',NULL,'4162344200',1),(113,175,1,1,0,NULL,'(763) 611-3522',NULL,'7636113522',2),(114,84,1,1,0,NULL,'(412) 419-8273',NULL,'4124198273',1),(115,84,1,0,0,NULL,'595-5626',NULL,'5955626',2),(116,200,1,1,0,NULL,'818-6064',NULL,'8186064',2),(117,200,1,0,0,NULL,'266-1010',NULL,'2661010',2),(118,24,1,1,0,NULL,'526-7330',NULL,'5267330',2),(119,90,1,1,0,NULL,'535-7443',NULL,'5357443',2),(120,90,1,0,0,NULL,'714-1998',NULL,'7141998',1),(121,2,1,1,0,NULL,'(533) 521-1609',NULL,'5335211609',1),(122,128,1,1,0,NULL,'401-6629',NULL,'4016629',2),(123,128,1,0,0,NULL,'891-5074',NULL,'8915074',2),(124,143,1,1,0,NULL,'302-8885',NULL,'3028885',2),(125,143,1,0,0,NULL,'728-5679',NULL,'7285679',1),(126,4,1,1,0,NULL,'(228) 606-4974',NULL,'2286064974',2),(127,4,1,0,0,NULL,'599-3182',NULL,'5993182',2),(128,177,1,1,0,NULL,'(767) 211-9430',NULL,'7672119430',1),(129,72,1,1,0,NULL,'(831) 432-4586',NULL,'8314324586',1),(130,58,1,1,0,NULL,'(527) 652-8674',NULL,'5276528674',1),(131,54,1,1,0,NULL,'(653) 382-9078',NULL,'6533829078',1),(132,109,1,1,0,NULL,'577-5018',NULL,'5775018',2),(133,71,1,1,0,NULL,'514-1324',NULL,'5141324',1),(134,107,1,1,0,NULL,'(437) 709-6479',NULL,'4377096479',1),(135,83,1,1,0,NULL,'668-5429',NULL,'6685429',1),(136,85,1,1,0,NULL,'(794) 230-6483',NULL,'7942306483',2),(137,116,1,1,0,NULL,'(332) 668-9866',NULL,'3326689866',2),(138,5,1,1,0,NULL,'(682) 610-3879',NULL,'6826103879',2),(139,NULL,1,0,0,NULL,'204 222-1000',NULL,'2042221000',1),(140,NULL,1,0,0,NULL,'204 223-1000',NULL,'2042231000',1),(141,NULL,1,0,0,NULL,'303 323-1000',NULL,'3033231000',1);
 /*!40000 ALTER TABLE `civicrm_phone` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1261,7 +1261,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_relationship` WRITE;
 /*!40000 ALTER TABLE `civicrm_relationship` DISABLE KEYS */;
-INSERT INTO `civicrm_relationship` (`id`, `contact_id_a`, `contact_id_b`, `relationship_type_id`, `start_date`, `end_date`, `is_active`, `description`, `is_permission_a_b`, `is_permission_b_a`, `case_id`) VALUES (1,67,22,1,NULL,NULL,1,NULL,0,0,NULL),(2,125,22,1,NULL,NULL,1,NULL,0,0,NULL),(3,67,153,1,NULL,NULL,1,NULL,0,0,NULL),(4,125,153,1,NULL,NULL,1,NULL,0,0,NULL),(5,125,67,4,NULL,NULL,1,NULL,0,0,NULL),(6,153,182,8,NULL,NULL,1,NULL,0,0,NULL),(7,67,182,8,NULL,NULL,1,NULL,0,0,NULL),(8,125,182,8,NULL,NULL,1,NULL,0,0,NULL),(9,22,182,7,NULL,NULL,0,NULL,0,0,NULL),(10,153,22,2,NULL,NULL,0,NULL,0,0,NULL),(11,184,162,1,NULL,NULL,1,NULL,0,0,NULL),(12,56,162,1,NULL,NULL,1,NULL,0,0,NULL),(13,184,13,1,NULL,NULL,1,NULL,0,0,NULL),(14,56,13,1,NULL,NULL,1,NULL,0,0,NULL),(15,56,184,4,NULL,NULL,1,NULL,0,0,NULL),(16,13,178,8,NULL,NULL,1,NULL,0,0,NULL),(17,184,178,8,NULL,NULL,1,NULL,0,0,NULL),(18,56,178,8,NULL,NULL,1,NULL,0,0,NULL),(19,162,178,7,NULL,NULL,1,NULL,0,0,NULL),(20,13,162,2,NULL,NULL,1,NULL,0,0,NULL),(21,196,61,1,NULL,NULL,1,NULL,0,0,NULL),(22,24,61,1,NULL,NULL,1,NULL,0,0,NULL),(23,196,33,1,NULL,NULL,1,NULL,0,0,NULL),(24,24,33,1,NULL,NULL,1,NULL,0,0,NULL),(25,24,196,4,NULL,NULL,1,NULL,0,0,NULL),(26,33,171,8,NULL,NULL,1,NULL,0,0,NULL),(27,196,171,8,NULL,NULL,1,NULL,0,0,NULL),(28,24,171,8,NULL,NULL,1,NULL,0,0,NULL),(29,61,171,7,NULL,NULL,1,NULL,0,0,NULL),(30,33,61,2,NULL,NULL,1,NULL,0,0,NULL),(31,77,188,1,NULL,NULL,1,NULL,0,0,NULL),(32,161,188,1,NULL,NULL,1,NULL,0,0,NULL),(33,77,93,1,NULL,NULL,1,NULL,0,0,NULL),(34,161,93,1,NULL,NULL,1,NULL,0,0,NULL),(35,161,77,4,NULL,NULL,1,NULL,0,0,NULL),(36,93,160,8,NULL,NULL,1,NULL,0,0,NULL),(37,77,160,8,NULL,NULL,1,NULL,0,0,NULL),(38,161,160,8,NULL,NULL,1,NULL,0,0,NULL),(39,188,160,7,NULL,NULL,1,NULL,0,0,NULL),(40,93,188,2,NULL,NULL,1,NULL,0,0,NULL),(41,74,60,1,NULL,NULL,1,NULL,0,0,NULL),(42,164,60,1,NULL,NULL,1,NULL,0,0,NULL),(43,74,131,1,NULL,NULL,1,NULL,0,0,NULL),(44,164,131,1,NULL,NULL,1,NULL,0,0,NULL),(45,164,74,4,NULL,NULL,1,NULL,0,0,NULL),(46,131,6,8,NULL,NULL,1,NULL,0,0,NULL),(47,74,6,8,NULL,NULL,1,NULL,0,0,NULL),(48,164,6,8,NULL,NULL,1,NULL,0,0,NULL),(49,60,6,7,NULL,NULL,1,NULL,0,0,NULL),(50,131,60,2,NULL,NULL,1,NULL,0,0,NULL),(51,16,147,1,NULL,NULL,1,NULL,0,0,NULL),(52,29,147,1,NULL,NULL,1,NULL,0,0,NULL),(53,16,173,1,NULL,NULL,1,NULL,0,0,NULL),(54,29,173,1,NULL,NULL,1,NULL,0,0,NULL),(55,29,16,4,NULL,NULL,1,NULL,0,0,NULL),(56,173,123,8,NULL,NULL,1,NULL,0,0,NULL),(57,16,123,8,NULL,NULL,1,NULL,0,0,NULL),(58,29,123,8,NULL,NULL,1,NULL,0,0,NULL),(59,147,123,7,NULL,NULL,1,NULL,0,0,NULL),(60,173,147,2,NULL,NULL,1,NULL,0,0,NULL),(61,113,50,1,NULL,NULL,1,NULL,0,0,NULL),(62,163,50,1,NULL,NULL,1,NULL,0,0,NULL),(63,113,190,1,NULL,NULL,1,NULL,0,0,NULL),(64,163,190,1,NULL,NULL,1,NULL,0,0,NULL),(65,163,113,4,NULL,NULL,1,NULL,0,0,NULL),(66,190,45,8,NULL,NULL,1,NULL,0,0,NULL),(67,113,45,8,NULL,NULL,1,NULL,0,0,NULL),(68,163,45,8,NULL,NULL,1,NULL,0,0,NULL),(69,50,45,7,NULL,NULL,0,NULL,0,0,NULL),(70,190,50,2,NULL,NULL,0,NULL,0,0,NULL),(71,183,181,1,NULL,NULL,1,NULL,0,0,NULL),(72,189,181,1,NULL,NULL,1,NULL,0,0,NULL),(73,183,151,1,NULL,NULL,1,NULL,0,0,NULL),(74,189,151,1,NULL,NULL,1,NULL,0,0,NULL),(75,189,183,4,NULL,NULL,1,NULL,0,0,NULL),(76,151,140,8,NULL,NULL,1,NULL,0,0,NULL),(77,183,140,8,NULL,NULL,1,NULL,0,0,NULL),(78,189,140,8,NULL,NULL,1,NULL,0,0,NULL),(79,181,140,7,NULL,NULL,0,NULL,0,0,NULL),(80,151,181,2,NULL,NULL,0,NULL,0,0,NULL),(81,79,5,1,NULL,NULL,1,NULL,0,0,NULL),(82,82,5,1,NULL,NULL,1,NULL,0,0,NULL),(83,79,174,1,NULL,NULL,1,NULL,0,0,NULL),(84,82,174,1,NULL,NULL,1,NULL,0,0,NULL),(85,82,79,4,NULL,NULL,1,NULL,0,0,NULL),(86,174,78,8,NULL,NULL,1,NULL,0,0,NULL),(87,79,78,8,NULL,NULL,1,NULL,0,0,NULL),(88,82,78,8,NULL,NULL,1,NULL,0,0,NULL),(89,5,78,7,NULL,NULL,0,NULL,0,0,NULL),(90,174,5,2,NULL,NULL,0,NULL,0,0,NULL),(91,11,87,1,NULL,NULL,1,NULL,0,0,NULL),(92,108,87,1,NULL,NULL,1,NULL,0,0,NULL),(93,11,15,1,NULL,NULL,1,NULL,0,0,NULL),(94,108,15,1,NULL,NULL,1,NULL,0,0,NULL),(95,108,11,4,NULL,NULL,1,NULL,0,0,NULL),(96,15,133,8,NULL,NULL,1,NULL,0,0,NULL),(97,11,133,8,NULL,NULL,1,NULL,0,0,NULL),(98,108,133,8,NULL,NULL,1,NULL,0,0,NULL),(99,87,133,7,NULL,NULL,0,NULL,0,0,NULL),(100,15,87,2,NULL,NULL,0,NULL,0,0,NULL),(101,96,100,1,NULL,NULL,1,NULL,0,0,NULL),(102,36,100,1,NULL,NULL,1,NULL,0,0,NULL),(103,96,40,1,NULL,NULL,1,NULL,0,0,NULL),(104,36,40,1,NULL,NULL,1,NULL,0,0,NULL),(105,36,96,4,NULL,NULL,1,NULL,0,0,NULL),(106,40,119,8,NULL,NULL,1,NULL,0,0,NULL),(107,96,119,8,NULL,NULL,1,NULL,0,0,NULL),(108,36,119,8,NULL,NULL,1,NULL,0,0,NULL),(109,100,119,7,NULL,NULL,1,NULL,0,0,NULL),(110,40,100,2,NULL,NULL,1,NULL,0,0,NULL),(111,135,138,1,NULL,NULL,1,NULL,0,0,NULL),(112,48,138,1,NULL,NULL,1,NULL,0,0,NULL),(113,135,64,1,NULL,NULL,1,NULL,0,0,NULL),(114,48,64,1,NULL,NULL,1,NULL,0,0,NULL),(115,48,135,4,NULL,NULL,1,NULL,0,0,NULL),(116,64,148,8,NULL,NULL,1,NULL,0,0,NULL),(117,135,148,8,NULL,NULL,1,NULL,0,0,NULL),(118,48,148,8,NULL,NULL,1,NULL,0,0,NULL),(119,138,148,7,NULL,NULL,1,NULL,0,0,NULL),(120,64,138,2,NULL,NULL,1,NULL,0,0,NULL),(121,80,168,1,NULL,NULL,1,NULL,0,0,NULL),(122,4,168,1,NULL,NULL,1,NULL,0,0,NULL),(123,80,195,1,NULL,NULL,1,NULL,0,0,NULL),(124,4,195,1,NULL,NULL,1,NULL,0,0,NULL),(125,4,80,4,NULL,NULL,1,NULL,0,0,NULL),(126,195,137,8,NULL,NULL,1,NULL,0,0,NULL),(127,80,137,8,NULL,NULL,1,NULL,0,0,NULL),(128,4,137,8,NULL,NULL,1,NULL,0,0,NULL),(129,168,137,7,NULL,NULL,1,NULL,0,0,NULL),(130,195,168,2,NULL,NULL,1,NULL,0,0,NULL),(131,63,83,1,NULL,NULL,1,NULL,0,0,NULL),(132,2,83,1,NULL,NULL,1,NULL,0,0,NULL),(133,63,42,1,NULL,NULL,1,NULL,0,0,NULL),(134,2,42,1,NULL,NULL,1,NULL,0,0,NULL),(135,2,63,4,NULL,NULL,1,NULL,0,0,NULL),(136,42,186,8,NULL,NULL,1,NULL,0,0,NULL),(137,63,186,8,NULL,NULL,1,NULL,0,0,NULL),(138,2,186,8,NULL,NULL,1,NULL,0,0,NULL),(139,83,186,7,NULL,NULL,0,NULL,0,0,NULL),(140,42,83,2,NULL,NULL,0,NULL,0,0,NULL),(141,18,73,1,NULL,NULL,1,NULL,0,0,NULL),(142,165,73,1,NULL,NULL,1,NULL,0,0,NULL),(143,18,143,1,NULL,NULL,1,NULL,0,0,NULL),(144,165,143,1,NULL,NULL,1,NULL,0,0,NULL),(145,165,18,4,NULL,NULL,1,NULL,0,0,NULL),(146,143,38,8,NULL,NULL,1,NULL,0,0,NULL),(147,18,38,8,NULL,NULL,1,NULL,0,0,NULL),(148,165,38,8,NULL,NULL,1,NULL,0,0,NULL),(149,73,38,7,NULL,NULL,1,NULL,0,0,NULL),(150,143,73,2,NULL,NULL,1,NULL,0,0,NULL),(151,175,139,1,NULL,NULL,1,NULL,0,0,NULL),(152,14,139,1,NULL,NULL,1,NULL,0,0,NULL),(153,175,192,1,NULL,NULL,1,NULL,0,0,NULL),(154,14,192,1,NULL,NULL,1,NULL,0,0,NULL),(155,14,175,4,NULL,NULL,1,NULL,0,0,NULL),(156,192,75,8,NULL,NULL,1,NULL,0,0,NULL),(157,175,75,8,NULL,NULL,1,NULL,0,0,NULL),(158,14,75,8,NULL,NULL,1,NULL,0,0,NULL),(159,139,75,7,NULL,NULL,0,NULL,0,0,NULL),(160,192,139,2,NULL,NULL,0,NULL,0,0,NULL),(161,68,97,1,NULL,NULL,1,NULL,0,0,NULL),(162,53,97,1,NULL,NULL,1,NULL,0,0,NULL),(163,68,58,1,NULL,NULL,1,NULL,0,0,NULL),(164,53,58,1,NULL,NULL,1,NULL,0,0,NULL),(165,53,68,4,NULL,NULL,1,NULL,0,0,NULL),(166,58,7,8,NULL,NULL,1,NULL,0,0,NULL),(167,68,7,8,NULL,NULL,1,NULL,0,0,NULL),(168,53,7,8,NULL,NULL,1,NULL,0,0,NULL),(169,97,7,7,NULL,NULL,0,NULL,0,0,NULL),(170,58,97,2,NULL,NULL,0,NULL,0,0,NULL),(171,120,172,1,NULL,NULL,1,NULL,0,0,NULL),(172,124,172,1,NULL,NULL,1,NULL,0,0,NULL),(173,120,71,1,NULL,NULL,1,NULL,0,0,NULL),(174,124,71,1,NULL,NULL,1,NULL,0,0,NULL),(175,124,120,4,NULL,NULL,1,NULL,0,0,NULL),(176,71,32,8,NULL,NULL,1,NULL,0,0,NULL),(177,120,32,8,NULL,NULL,1,NULL,0,0,NULL),(178,124,32,8,NULL,NULL,1,NULL,0,0,NULL),(179,172,32,7,NULL,NULL,1,NULL,0,0,NULL),(180,71,172,2,NULL,NULL,1,NULL,0,0,NULL),(181,95,44,1,NULL,NULL,1,NULL,0,0,NULL),(182,112,44,1,NULL,NULL,1,NULL,0,0,NULL),(183,95,26,1,NULL,NULL,1,NULL,0,0,NULL),(184,112,26,1,NULL,NULL,1,NULL,0,0,NULL),(185,112,95,4,NULL,NULL,1,NULL,0,0,NULL),(186,26,154,8,NULL,NULL,1,NULL,0,0,NULL),(187,95,154,8,NULL,NULL,1,NULL,0,0,NULL),(188,112,154,8,NULL,NULL,1,NULL,0,0,NULL),(189,44,154,7,NULL,NULL,0,NULL,0,0,NULL),(190,26,44,2,NULL,NULL,0,NULL,0,0,NULL),(191,35,31,1,NULL,NULL,1,NULL,0,0,NULL),(192,159,31,1,NULL,NULL,1,NULL,0,0,NULL),(193,35,34,1,NULL,NULL,1,NULL,0,0,NULL),(194,159,34,1,NULL,NULL,1,NULL,0,0,NULL),(195,159,35,4,NULL,NULL,1,NULL,0,0,NULL),(196,34,187,8,NULL,NULL,1,NULL,0,0,NULL),(197,35,187,8,NULL,NULL,1,NULL,0,0,NULL),(198,159,187,8,NULL,NULL,1,NULL,0,0,NULL),(199,31,187,7,NULL,NULL,1,NULL,0,0,NULL),(200,34,31,2,NULL,NULL,1,NULL,0,0,NULL),(201,42,8,5,NULL,NULL,1,NULL,0,0,NULL),(202,58,9,5,NULL,NULL,1,NULL,0,0,NULL),(203,125,10,5,NULL,NULL,1,NULL,0,0,NULL),(204,73,20,5,NULL,NULL,1,NULL,0,0,NULL),(205,172,37,5,NULL,NULL,1,NULL,0,0,NULL),(206,77,55,5,NULL,NULL,1,NULL,0,0,NULL),(207,143,62,5,NULL,NULL,1,NULL,0,0,NULL),(208,156,66,5,NULL,NULL,1,NULL,0,0,NULL),(209,18,69,5,NULL,NULL,1,NULL,0,0,NULL),(210,61,76,5,NULL,NULL,1,NULL,0,0,NULL),(211,174,84,5,NULL,NULL,1,NULL,0,0,NULL),(212,22,98,5,NULL,NULL,1,NULL,0,0,NULL),(213,60,114,5,NULL,NULL,1,NULL,0,0,NULL),(214,40,115,5,NULL,NULL,1,NULL,0,0,NULL),(215,198,121,5,NULL,NULL,1,NULL,0,0,NULL),(216,170,128,5,NULL,NULL,1,NULL,0,0,NULL),(217,100,134,5,NULL,NULL,1,NULL,0,0,NULL),(218,29,149,5,NULL,NULL,1,NULL,0,0,NULL),(219,129,155,5,NULL,NULL,1,NULL,0,0,NULL);
+INSERT INTO `civicrm_relationship` (`id`, `contact_id_a`, `contact_id_b`, `relationship_type_id`, `start_date`, `end_date`, `is_active`, `description`, `is_permission_a_b`, `is_permission_b_a`, `case_id`) VALUES (1,76,40,1,NULL,NULL,1,NULL,0,0,NULL),(2,75,40,1,NULL,NULL,1,NULL,0,0,NULL),(3,76,158,1,NULL,NULL,1,NULL,0,0,NULL),(4,75,158,1,NULL,NULL,1,NULL,0,0,NULL),(5,75,76,4,NULL,NULL,1,NULL,0,0,NULL),(6,158,68,8,NULL,NULL,1,NULL,0,0,NULL),(7,76,68,8,NULL,NULL,1,NULL,0,0,NULL),(8,75,68,8,NULL,NULL,1,NULL,0,0,NULL),(9,40,68,7,NULL,NULL,1,NULL,0,0,NULL),(10,158,40,2,NULL,NULL,1,NULL,0,0,NULL),(11,97,43,1,NULL,NULL,1,NULL,0,0,NULL),(12,89,43,1,NULL,NULL,1,NULL,0,0,NULL),(13,97,131,1,NULL,NULL,1,NULL,0,0,NULL),(14,89,131,1,NULL,NULL,1,NULL,0,0,NULL),(15,89,97,4,NULL,NULL,1,NULL,0,0,NULL),(16,131,82,8,NULL,NULL,1,NULL,0,0,NULL),(17,97,82,8,NULL,NULL,1,NULL,0,0,NULL),(18,89,82,8,NULL,NULL,1,NULL,0,0,NULL),(19,43,82,7,NULL,NULL,1,NULL,0,0,NULL),(20,131,43,2,NULL,NULL,1,NULL,0,0,NULL),(21,10,124,1,NULL,NULL,1,NULL,0,0,NULL),(22,134,124,1,NULL,NULL,1,NULL,0,0,NULL),(23,10,26,1,NULL,NULL,1,NULL,0,0,NULL),(24,134,26,1,NULL,NULL,1,NULL,0,0,NULL),(25,134,10,4,NULL,NULL,1,NULL,0,0,NULL),(26,26,180,8,NULL,NULL,1,NULL,0,0,NULL),(27,10,180,8,NULL,NULL,1,NULL,0,0,NULL),(28,134,180,8,NULL,NULL,1,NULL,0,0,NULL),(29,124,180,7,NULL,NULL,1,NULL,0,0,NULL),(30,26,124,2,NULL,NULL,1,NULL,0,0,NULL),(31,178,45,1,NULL,NULL,1,NULL,0,0,NULL),(32,179,45,1,NULL,NULL,1,NULL,0,0,NULL),(33,178,22,1,NULL,NULL,1,NULL,0,0,NULL),(34,179,22,1,NULL,NULL,1,NULL,0,0,NULL),(35,179,178,4,NULL,NULL,1,NULL,0,0,NULL),(36,22,50,8,NULL,NULL,1,NULL,0,0,NULL),(37,178,50,8,NULL,NULL,1,NULL,0,0,NULL),(38,179,50,8,NULL,NULL,1,NULL,0,0,NULL),(39,45,50,7,NULL,NULL,1,NULL,0,0,NULL),(40,22,45,2,NULL,NULL,1,NULL,0,0,NULL),(41,57,66,1,NULL,NULL,1,NULL,0,0,NULL),(42,157,66,1,NULL,NULL,1,NULL,0,0,NULL),(43,57,138,1,NULL,NULL,1,NULL,0,0,NULL),(44,157,138,1,NULL,NULL,1,NULL,0,0,NULL),(45,157,57,4,NULL,NULL,1,NULL,0,0,NULL),(46,138,56,8,NULL,NULL,1,NULL,0,0,NULL),(47,57,56,8,NULL,NULL,1,NULL,0,0,NULL),(48,157,56,8,NULL,NULL,1,NULL,0,0,NULL),(49,66,56,7,NULL,NULL,0,NULL,0,0,NULL),(50,138,66,2,NULL,NULL,0,NULL,0,0,NULL),(51,159,142,1,NULL,NULL,1,NULL,0,0,NULL),(52,145,142,1,NULL,NULL,1,NULL,0,0,NULL),(53,159,196,1,NULL,NULL,1,NULL,0,0,NULL),(54,145,196,1,NULL,NULL,1,NULL,0,0,NULL),(55,145,159,4,NULL,NULL,1,NULL,0,0,NULL),(56,196,122,8,NULL,NULL,1,NULL,0,0,NULL),(57,159,122,8,NULL,NULL,1,NULL,0,0,NULL),(58,145,122,8,NULL,NULL,1,NULL,0,0,NULL),(59,142,122,7,NULL,NULL,1,NULL,0,0,NULL),(60,196,142,2,NULL,NULL,1,NULL,0,0,NULL),(61,30,163,1,NULL,NULL,1,NULL,0,0,NULL),(62,113,163,1,NULL,NULL,1,NULL,0,0,NULL),(63,30,106,1,NULL,NULL,1,NULL,0,0,NULL),(64,113,106,1,NULL,NULL,1,NULL,0,0,NULL),(65,113,30,4,NULL,NULL,1,NULL,0,0,NULL),(66,106,144,8,NULL,NULL,1,NULL,0,0,NULL),(67,30,144,8,NULL,NULL,1,NULL,0,0,NULL),(68,113,144,8,NULL,NULL,1,NULL,0,0,NULL),(69,163,144,7,NULL,NULL,1,NULL,0,0,NULL),(70,106,163,2,NULL,NULL,1,NULL,0,0,NULL),(71,19,67,1,NULL,NULL,1,NULL,0,0,NULL),(72,105,67,1,NULL,NULL,1,NULL,0,0,NULL),(73,19,29,1,NULL,NULL,1,NULL,0,0,NULL),(74,105,29,1,NULL,NULL,1,NULL,0,0,NULL),(75,105,19,4,NULL,NULL,1,NULL,0,0,NULL),(76,29,166,8,NULL,NULL,1,NULL,0,0,NULL),(77,19,166,8,NULL,NULL,1,NULL,0,0,NULL),(78,105,166,8,NULL,NULL,1,NULL,0,0,NULL),(79,67,166,7,NULL,NULL,1,NULL,0,0,NULL),(80,29,67,2,NULL,NULL,1,NULL,0,0,NULL),(81,25,63,1,NULL,NULL,1,NULL,0,0,NULL),(82,186,63,1,NULL,NULL,1,NULL,0,0,NULL),(83,25,20,1,NULL,NULL,1,NULL,0,0,NULL),(84,186,20,1,NULL,NULL,1,NULL,0,0,NULL),(85,186,25,4,NULL,NULL,1,NULL,0,0,NULL),(86,20,81,8,NULL,NULL,1,NULL,0,0,NULL),(87,25,81,8,NULL,NULL,1,NULL,0,0,NULL),(88,186,81,8,NULL,NULL,1,NULL,0,0,NULL),(89,63,81,7,NULL,NULL,0,NULL,0,0,NULL),(90,20,63,2,NULL,NULL,0,NULL,0,0,NULL),(91,136,48,1,NULL,NULL,1,NULL,0,0,NULL),(92,123,48,1,NULL,NULL,1,NULL,0,0,NULL),(93,136,52,1,NULL,NULL,1,NULL,0,0,NULL),(94,123,52,1,NULL,NULL,1,NULL,0,0,NULL),(95,123,136,4,NULL,NULL,1,NULL,0,0,NULL),(96,52,156,8,NULL,NULL,1,NULL,0,0,NULL),(97,136,156,8,NULL,NULL,1,NULL,0,0,NULL),(98,123,156,8,NULL,NULL,1,NULL,0,0,NULL),(99,48,156,7,NULL,NULL,1,NULL,0,0,NULL),(100,52,48,2,NULL,NULL,1,NULL,0,0,NULL),(101,96,150,1,NULL,NULL,1,NULL,0,0,NULL),(102,135,150,1,NULL,NULL,1,NULL,0,0,NULL),(103,96,153,1,NULL,NULL,1,NULL,0,0,NULL),(104,135,153,1,NULL,NULL,1,NULL,0,0,NULL),(105,135,96,4,NULL,NULL,1,NULL,0,0,NULL),(106,153,37,8,NULL,NULL,1,NULL,0,0,NULL),(107,96,37,8,NULL,NULL,1,NULL,0,0,NULL),(108,135,37,8,NULL,NULL,1,NULL,0,0,NULL),(109,150,37,7,NULL,NULL,1,NULL,0,0,NULL),(110,153,150,2,NULL,NULL,1,NULL,0,0,NULL),(111,175,27,1,NULL,NULL,1,NULL,0,0,NULL),(112,110,27,1,NULL,NULL,1,NULL,0,0,NULL),(113,175,6,1,NULL,NULL,1,NULL,0,0,NULL),(114,110,6,1,NULL,NULL,1,NULL,0,0,NULL),(115,110,175,4,NULL,NULL,1,NULL,0,0,NULL),(116,6,141,8,NULL,NULL,1,NULL,0,0,NULL),(117,175,141,8,NULL,NULL,1,NULL,0,0,NULL),(118,110,141,8,NULL,NULL,1,NULL,0,0,NULL),(119,27,141,7,NULL,NULL,1,NULL,0,0,NULL),(120,6,27,2,NULL,NULL,1,NULL,0,0,NULL),(121,24,84,1,NULL,NULL,1,NULL,0,0,NULL),(122,90,84,1,NULL,NULL,1,NULL,0,0,NULL),(123,24,200,1,NULL,NULL,1,NULL,0,0,NULL),(124,90,200,1,NULL,NULL,1,NULL,0,0,NULL),(125,90,24,4,NULL,NULL,1,NULL,0,0,NULL),(126,200,174,8,NULL,NULL,1,NULL,0,0,NULL),(127,24,174,8,NULL,NULL,1,NULL,0,0,NULL),(128,90,174,8,NULL,NULL,1,NULL,0,0,NULL),(129,84,174,7,NULL,NULL,1,NULL,0,0,NULL),(130,200,84,2,NULL,NULL,1,NULL,0,0,NULL),(131,2,120,1,NULL,NULL,1,NULL,0,0,NULL),(132,128,120,1,NULL,NULL,1,NULL,0,0,NULL),(133,2,3,1,NULL,NULL,1,NULL,0,0,NULL),(134,128,3,1,NULL,NULL,1,NULL,0,0,NULL),(135,128,2,4,NULL,NULL,1,NULL,0,0,NULL),(136,3,127,8,NULL,NULL,1,NULL,0,0,NULL),(137,2,127,8,NULL,NULL,1,NULL,0,0,NULL),(138,128,127,8,NULL,NULL,1,NULL,0,0,NULL),(139,120,127,7,NULL,NULL,0,NULL,0,0,NULL),(140,3,120,2,NULL,NULL,0,NULL,0,0,NULL),(141,143,146,1,NULL,NULL,1,NULL,0,0,NULL),(142,195,146,1,NULL,NULL,1,NULL,0,0,NULL),(143,143,18,1,NULL,NULL,1,NULL,0,0,NULL),(144,195,18,1,NULL,NULL,1,NULL,0,0,NULL),(145,195,143,4,NULL,NULL,1,NULL,0,0,NULL),(146,18,53,8,NULL,NULL,1,NULL,0,0,NULL),(147,143,53,8,NULL,NULL,1,NULL,0,0,NULL),(148,195,53,8,NULL,NULL,1,NULL,0,0,NULL),(149,146,53,7,NULL,NULL,0,NULL,0,0,NULL),(150,18,146,2,NULL,NULL,0,NULL,0,0,NULL),(151,72,4,1,NULL,NULL,1,NULL,0,0,NULL),(152,58,4,1,NULL,NULL,1,NULL,0,0,NULL),(153,72,177,1,NULL,NULL,1,NULL,0,0,NULL),(154,58,177,1,NULL,NULL,1,NULL,0,0,NULL),(155,58,72,4,NULL,NULL,1,NULL,0,0,NULL),(156,177,155,8,NULL,NULL,1,NULL,0,0,NULL),(157,72,155,8,NULL,NULL,1,NULL,0,0,NULL),(158,58,155,8,NULL,NULL,1,NULL,0,0,NULL),(159,4,155,7,NULL,NULL,0,NULL,0,0,NULL),(160,177,4,2,NULL,NULL,0,NULL,0,0,NULL),(161,148,54,1,NULL,NULL,1,NULL,0,0,NULL),(162,109,54,1,NULL,NULL,1,NULL,0,0,NULL),(163,148,98,1,NULL,NULL,1,NULL,0,0,NULL),(164,109,98,1,NULL,NULL,1,NULL,0,0,NULL),(165,109,148,4,NULL,NULL,1,NULL,0,0,NULL),(166,98,41,8,NULL,NULL,1,NULL,0,0,NULL),(167,148,41,8,NULL,NULL,1,NULL,0,0,NULL),(168,109,41,8,NULL,NULL,1,NULL,0,0,NULL),(169,54,41,7,NULL,NULL,1,NULL,0,0,NULL),(170,98,54,2,NULL,NULL,1,NULL,0,0,NULL),(171,71,69,1,NULL,NULL,1,NULL,0,0,NULL),(172,107,69,1,NULL,NULL,1,NULL,0,0,NULL),(173,71,188,1,NULL,NULL,1,NULL,0,0,NULL),(174,107,188,1,NULL,NULL,1,NULL,0,0,NULL),(175,107,71,4,NULL,NULL,1,NULL,0,0,NULL),(176,188,13,8,NULL,NULL,1,NULL,0,0,NULL),(177,71,13,8,NULL,NULL,1,NULL,0,0,NULL),(178,107,13,8,NULL,NULL,1,NULL,0,0,NULL),(179,69,13,7,NULL,NULL,0,NULL,0,0,NULL),(180,188,69,2,NULL,NULL,0,NULL,0,0,NULL),(181,80,83,1,NULL,NULL,1,NULL,0,0,NULL),(182,169,83,1,NULL,NULL,1,NULL,0,0,NULL),(183,80,85,1,NULL,NULL,1,NULL,0,0,NULL),(184,169,85,1,NULL,NULL,1,NULL,0,0,NULL),(185,169,80,4,NULL,NULL,1,NULL,0,0,NULL),(186,85,62,8,NULL,NULL,1,NULL,0,0,NULL),(187,80,62,8,NULL,NULL,1,NULL,0,0,NULL),(188,169,62,8,NULL,NULL,1,NULL,0,0,NULL),(189,83,62,7,NULL,NULL,1,NULL,0,0,NULL),(190,85,83,2,NULL,NULL,1,NULL,0,0,NULL),(191,5,116,1,NULL,NULL,1,NULL,0,0,NULL),(192,140,116,1,NULL,NULL,1,NULL,0,0,NULL),(193,5,115,1,NULL,NULL,1,NULL,0,0,NULL),(194,140,115,1,NULL,NULL,1,NULL,0,0,NULL),(195,140,5,4,NULL,NULL,1,NULL,0,0,NULL),(196,115,198,8,NULL,NULL,1,NULL,0,0,NULL),(197,5,198,8,NULL,NULL,1,NULL,0,0,NULL),(198,140,198,8,NULL,NULL,1,NULL,0,0,NULL),(199,116,198,7,NULL,NULL,1,NULL,0,0,NULL),(200,115,116,2,NULL,NULL,1,NULL,0,0,NULL),(201,4,15,5,NULL,NULL,1,NULL,0,0,NULL),(202,153,21,5,NULL,NULL,1,NULL,0,0,NULL),(203,52,23,5,NULL,NULL,1,NULL,0,0,NULL),(204,169,39,5,NULL,NULL,1,NULL,0,0,NULL),(205,110,70,5,NULL,NULL,1,NULL,0,0,NULL),(206,28,73,5,NULL,NULL,1,NULL,0,0,NULL),(207,54,74,5,NULL,NULL,1,NULL,0,0,NULL),(208,85,77,5,NULL,NULL,1,NULL,0,0,NULL),(209,87,93,5,NULL,NULL,1,NULL,0,0,NULL),(210,78,101,5,NULL,NULL,1,NULL,0,0,NULL),(211,24,102,5,NULL,NULL,1,NULL,0,0,NULL),(212,175,103,5,NULL,NULL,1,NULL,0,0,NULL),(213,111,129,5,NULL,NULL,1,NULL,0,0,NULL),(214,3,165,5,NULL,NULL,1,NULL,0,0,NULL),(215,12,167,5,NULL,NULL,1,NULL,0,0,NULL),(216,91,170,5,NULL,NULL,1,NULL,0,0,NULL),(217,147,172,5,NULL,NULL,1,NULL,0,0,NULL);
 /*!40000 ALTER TABLE `civicrm_relationship` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1271,7 +1271,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_relationship_cache` WRITE;
 /*!40000 ALTER TABLE `civicrm_relationship_cache` DISABLE KEYS */;
-INSERT INTO `civicrm_relationship_cache` (`id`, `relationship_id`, `relationship_type_id`, `orientation`, `near_contact_id`, `near_relation`, `far_contact_id`, `far_relation`, `is_active`, `start_date`, `end_date`) VALUES (1,1,1,'a_b',67,'Child of',22,'Parent of',1,NULL,NULL),(2,1,1,'b_a',22,'Parent of',67,'Child of',1,NULL,NULL),(3,2,1,'a_b',125,'Child of',22,'Parent of',1,NULL,NULL),(4,2,1,'b_a',22,'Parent of',125,'Child of',1,NULL,NULL),(5,3,1,'a_b',67,'Child of',153,'Parent of',1,NULL,NULL),(6,3,1,'b_a',153,'Parent of',67,'Child of',1,NULL,NULL),(7,4,1,'a_b',125,'Child of',153,'Parent of',1,NULL,NULL),(8,4,1,'b_a',153,'Parent of',125,'Child of',1,NULL,NULL),(9,5,4,'a_b',125,'Sibling of',67,'Sibling of',1,NULL,NULL),(10,5,4,'b_a',67,'Sibling of',125,'Sibling of',1,NULL,NULL),(11,6,8,'a_b',153,'Household Member of',182,'Household Member is',1,NULL,NULL),(12,6,8,'b_a',182,'Household Member is',153,'Household Member of',1,NULL,NULL),(13,7,8,'a_b',67,'Household Member of',182,'Household Member is',1,NULL,NULL),(14,7,8,'b_a',182,'Household Member is',67,'Household Member of',1,NULL,NULL),(15,8,8,'a_b',125,'Household Member of',182,'Household Member is',1,NULL,NULL),(16,8,8,'b_a',182,'Household Member is',125,'Household Member of',1,NULL,NULL),(17,9,7,'a_b',22,'Head of Household for',182,'Head of Household is',0,NULL,NULL),(18,9,7,'b_a',182,'Head of Household is',22,'Head of Household for',0,NULL,NULL),(19,10,2,'a_b',153,'Spouse of',22,'Spouse of',0,NULL,NULL),(20,10,2,'b_a',22,'Spouse of',153,'Spouse of',0,NULL,NULL),(21,11,1,'a_b',184,'Child of',162,'Parent of',1,NULL,NULL),(22,11,1,'b_a',162,'Parent of',184,'Child of',1,NULL,NULL),(23,12,1,'a_b',56,'Child of',162,'Parent of',1,NULL,NULL),(24,12,1,'b_a',162,'Parent of',56,'Child of',1,NULL,NULL),(25,13,1,'a_b',184,'Child of',13,'Parent of',1,NULL,NULL),(26,13,1,'b_a',13,'Parent of',184,'Child of',1,NULL,NULL),(27,14,1,'a_b',56,'Child of',13,'Parent of',1,NULL,NULL),(28,14,1,'b_a',13,'Parent of',56,'Child of',1,NULL,NULL),(29,15,4,'a_b',56,'Sibling of',184,'Sibling of',1,NULL,NULL),(30,15,4,'b_a',184,'Sibling of',56,'Sibling of',1,NULL,NULL),(31,16,8,'a_b',13,'Household Member of',178,'Household Member is',1,NULL,NULL),(32,16,8,'b_a',178,'Household Member is',13,'Household Member of',1,NULL,NULL),(33,17,8,'a_b',184,'Household Member of',178,'Household Member is',1,NULL,NULL),(34,17,8,'b_a',178,'Household Member is',184,'Household Member of',1,NULL,NULL),(35,18,8,'a_b',56,'Household Member of',178,'Household Member is',1,NULL,NULL),(36,18,8,'b_a',178,'Household Member is',56,'Household Member of',1,NULL,NULL),(37,19,7,'a_b',162,'Head of Household for',178,'Head of Household is',1,NULL,NULL),(38,19,7,'b_a',178,'Head of Household is',162,'Head of Household for',1,NULL,NULL),(39,20,2,'a_b',13,'Spouse of',162,'Spouse of',1,NULL,NULL),(40,20,2,'b_a',162,'Spouse of',13,'Spouse of',1,NULL,NULL),(41,21,1,'a_b',196,'Child of',61,'Parent of',1,NULL,NULL),(42,21,1,'b_a',61,'Parent of',196,'Child of',1,NULL,NULL),(43,22,1,'a_b',24,'Child of',61,'Parent of',1,NULL,NULL),(44,22,1,'b_a',61,'Parent of',24,'Child of',1,NULL,NULL),(45,23,1,'a_b',196,'Child of',33,'Parent of',1,NULL,NULL),(46,23,1,'b_a',33,'Parent of',196,'Child of',1,NULL,NULL),(47,24,1,'a_b',24,'Child of',33,'Parent of',1,NULL,NULL),(48,24,1,'b_a',33,'Parent of',24,'Child of',1,NULL,NULL),(49,25,4,'a_b',24,'Sibling of',196,'Sibling of',1,NULL,NULL),(50,25,4,'b_a',196,'Sibling of',24,'Sibling of',1,NULL,NULL),(51,26,8,'a_b',33,'Household Member of',171,'Household Member is',1,NULL,NULL),(52,26,8,'b_a',171,'Household Member is',33,'Household Member of',1,NULL,NULL),(53,27,8,'a_b',196,'Household Member of',171,'Household Member is',1,NULL,NULL),(54,27,8,'b_a',171,'Household Member is',196,'Household Member of',1,NULL,NULL),(55,28,8,'a_b',24,'Household Member of',171,'Household Member is',1,NULL,NULL),(56,28,8,'b_a',171,'Household Member is',24,'Household Member of',1,NULL,NULL),(57,29,7,'a_b',61,'Head of Household for',171,'Head of Household is',1,NULL,NULL),(58,29,7,'b_a',171,'Head of Household is',61,'Head of Household for',1,NULL,NULL),(59,30,2,'a_b',33,'Spouse of',61,'Spouse of',1,NULL,NULL),(60,30,2,'b_a',61,'Spouse of',33,'Spouse of',1,NULL,NULL),(61,31,1,'a_b',77,'Child of',188,'Parent of',1,NULL,NULL),(62,31,1,'b_a',188,'Parent of',77,'Child of',1,NULL,NULL),(63,32,1,'a_b',161,'Child of',188,'Parent of',1,NULL,NULL),(64,32,1,'b_a',188,'Parent of',161,'Child of',1,NULL,NULL),(65,33,1,'a_b',77,'Child of',93,'Parent of',1,NULL,NULL),(66,33,1,'b_a',93,'Parent of',77,'Child of',1,NULL,NULL),(67,34,1,'a_b',161,'Child of',93,'Parent of',1,NULL,NULL),(68,34,1,'b_a',93,'Parent of',161,'Child of',1,NULL,NULL),(69,35,4,'a_b',161,'Sibling of',77,'Sibling of',1,NULL,NULL),(70,35,4,'b_a',77,'Sibling of',161,'Sibling of',1,NULL,NULL),(71,36,8,'a_b',93,'Household Member of',160,'Household Member is',1,NULL,NULL),(72,36,8,'b_a',160,'Household Member is',93,'Household Member of',1,NULL,NULL),(73,37,8,'a_b',77,'Household Member of',160,'Household Member is',1,NULL,NULL),(74,37,8,'b_a',160,'Household Member is',77,'Household Member of',1,NULL,NULL),(75,38,8,'a_b',161,'Household Member of',160,'Household Member is',1,NULL,NULL),(76,38,8,'b_a',160,'Household Member is',161,'Household Member of',1,NULL,NULL),(77,39,7,'a_b',188,'Head of Household for',160,'Head of Household is',1,NULL,NULL),(78,39,7,'b_a',160,'Head of Household is',188,'Head of Household for',1,NULL,NULL),(79,40,2,'a_b',93,'Spouse of',188,'Spouse of',1,NULL,NULL),(80,40,2,'b_a',188,'Spouse of',93,'Spouse of',1,NULL,NULL),(81,41,1,'a_b',74,'Child of',60,'Parent of',1,NULL,NULL),(82,41,1,'b_a',60,'Parent of',74,'Child of',1,NULL,NULL),(83,42,1,'a_b',164,'Child of',60,'Parent of',1,NULL,NULL),(84,42,1,'b_a',60,'Parent of',164,'Child of',1,NULL,NULL),(85,43,1,'a_b',74,'Child of',131,'Parent of',1,NULL,NULL),(86,43,1,'b_a',131,'Parent of',74,'Child of',1,NULL,NULL),(87,44,1,'a_b',164,'Child of',131,'Parent of',1,NULL,NULL),(88,44,1,'b_a',131,'Parent of',164,'Child of',1,NULL,NULL),(89,45,4,'a_b',164,'Sibling of',74,'Sibling of',1,NULL,NULL),(90,45,4,'b_a',74,'Sibling of',164,'Sibling of',1,NULL,NULL),(91,46,8,'a_b',131,'Household Member of',6,'Household Member is',1,NULL,NULL),(92,46,8,'b_a',6,'Household Member is',131,'Household Member of',1,NULL,NULL),(93,47,8,'a_b',74,'Household Member of',6,'Household Member is',1,NULL,NULL),(94,47,8,'b_a',6,'Household Member is',74,'Household Member of',1,NULL,NULL),(95,48,8,'a_b',164,'Household Member of',6,'Household Member is',1,NULL,NULL),(96,48,8,'b_a',6,'Household Member is',164,'Household Member of',1,NULL,NULL),(97,49,7,'a_b',60,'Head of Household for',6,'Head of Household is',1,NULL,NULL),(98,49,7,'b_a',6,'Head of Household is',60,'Head of Household for',1,NULL,NULL),(99,50,2,'a_b',131,'Spouse of',60,'Spouse of',1,NULL,NULL),(100,50,2,'b_a',60,'Spouse of',131,'Spouse of',1,NULL,NULL),(101,51,1,'a_b',16,'Child of',147,'Parent of',1,NULL,NULL),(102,51,1,'b_a',147,'Parent of',16,'Child of',1,NULL,NULL),(103,52,1,'a_b',29,'Child of',147,'Parent of',1,NULL,NULL),(104,52,1,'b_a',147,'Parent of',29,'Child of',1,NULL,NULL),(105,53,1,'a_b',16,'Child of',173,'Parent of',1,NULL,NULL),(106,53,1,'b_a',173,'Parent of',16,'Child of',1,NULL,NULL),(107,54,1,'a_b',29,'Child of',173,'Parent of',1,NULL,NULL),(108,54,1,'b_a',173,'Parent of',29,'Child of',1,NULL,NULL),(109,55,4,'a_b',29,'Sibling of',16,'Sibling of',1,NULL,NULL),(110,55,4,'b_a',16,'Sibling of',29,'Sibling of',1,NULL,NULL),(111,56,8,'a_b',173,'Household Member of',123,'Household Member is',1,NULL,NULL),(112,56,8,'b_a',123,'Household Member is',173,'Household Member of',1,NULL,NULL),(113,57,8,'a_b',16,'Household Member of',123,'Household Member is',1,NULL,NULL),(114,57,8,'b_a',123,'Household Member is',16,'Household Member of',1,NULL,NULL),(115,58,8,'a_b',29,'Household Member of',123,'Household Member is',1,NULL,NULL),(116,58,8,'b_a',123,'Household Member is',29,'Household Member of',1,NULL,NULL),(117,59,7,'a_b',147,'Head of Household for',123,'Head of Household is',1,NULL,NULL),(118,59,7,'b_a',123,'Head of Household is',147,'Head of Household for',1,NULL,NULL),(119,60,2,'a_b',173,'Spouse of',147,'Spouse of',1,NULL,NULL),(120,60,2,'b_a',147,'Spouse of',173,'Spouse of',1,NULL,NULL),(121,61,1,'a_b',113,'Child of',50,'Parent of',1,NULL,NULL),(122,61,1,'b_a',50,'Parent of',113,'Child of',1,NULL,NULL),(123,62,1,'a_b',163,'Child of',50,'Parent of',1,NULL,NULL),(124,62,1,'b_a',50,'Parent of',163,'Child of',1,NULL,NULL),(125,63,1,'a_b',113,'Child of',190,'Parent of',1,NULL,NULL),(126,63,1,'b_a',190,'Parent of',113,'Child of',1,NULL,NULL),(127,64,1,'a_b',163,'Child of',190,'Parent of',1,NULL,NULL),(128,64,1,'b_a',190,'Parent of',163,'Child of',1,NULL,NULL),(129,65,4,'a_b',163,'Sibling of',113,'Sibling of',1,NULL,NULL),(130,65,4,'b_a',113,'Sibling of',163,'Sibling of',1,NULL,NULL),(131,66,8,'a_b',190,'Household Member of',45,'Household Member is',1,NULL,NULL),(132,66,8,'b_a',45,'Household Member is',190,'Household Member of',1,NULL,NULL),(133,67,8,'a_b',113,'Household Member of',45,'Household Member is',1,NULL,NULL),(134,67,8,'b_a',45,'Household Member is',113,'Household Member of',1,NULL,NULL),(135,68,8,'a_b',163,'Household Member of',45,'Household Member is',1,NULL,NULL),(136,68,8,'b_a',45,'Household Member is',163,'Household Member of',1,NULL,NULL),(137,69,7,'a_b',50,'Head of Household for',45,'Head of Household is',0,NULL,NULL),(138,69,7,'b_a',45,'Head of Household is',50,'Head of Household for',0,NULL,NULL),(139,70,2,'a_b',190,'Spouse of',50,'Spouse of',0,NULL,NULL),(140,70,2,'b_a',50,'Spouse of',190,'Spouse of',0,NULL,NULL),(141,71,1,'a_b',183,'Child of',181,'Parent of',1,NULL,NULL),(142,71,1,'b_a',181,'Parent of',183,'Child of',1,NULL,NULL),(143,72,1,'a_b',189,'Child of',181,'Parent of',1,NULL,NULL),(144,72,1,'b_a',181,'Parent of',189,'Child of',1,NULL,NULL),(145,73,1,'a_b',183,'Child of',151,'Parent of',1,NULL,NULL),(146,73,1,'b_a',151,'Parent of',183,'Child of',1,NULL,NULL),(147,74,1,'a_b',189,'Child of',151,'Parent of',1,NULL,NULL),(148,74,1,'b_a',151,'Parent of',189,'Child of',1,NULL,NULL),(149,75,4,'a_b',189,'Sibling of',183,'Sibling of',1,NULL,NULL),(150,75,4,'b_a',183,'Sibling of',189,'Sibling of',1,NULL,NULL),(151,76,8,'a_b',151,'Household Member of',140,'Household Member is',1,NULL,NULL),(152,76,8,'b_a',140,'Household Member is',151,'Household Member of',1,NULL,NULL),(153,77,8,'a_b',183,'Household Member of',140,'Household Member is',1,NULL,NULL),(154,77,8,'b_a',140,'Household Member is',183,'Household Member of',1,NULL,NULL),(155,78,8,'a_b',189,'Household Member of',140,'Household Member is',1,NULL,NULL),(156,78,8,'b_a',140,'Household Member is',189,'Household Member of',1,NULL,NULL),(157,79,7,'a_b',181,'Head of Household for',140,'Head of Household is',0,NULL,NULL),(158,79,7,'b_a',140,'Head of Household is',181,'Head of Household for',0,NULL,NULL),(159,80,2,'a_b',151,'Spouse of',181,'Spouse of',0,NULL,NULL),(160,80,2,'b_a',181,'Spouse of',151,'Spouse of',0,NULL,NULL),(161,81,1,'a_b',79,'Child of',5,'Parent of',1,NULL,NULL),(162,81,1,'b_a',5,'Parent of',79,'Child of',1,NULL,NULL),(163,82,1,'a_b',82,'Child of',5,'Parent of',1,NULL,NULL),(164,82,1,'b_a',5,'Parent of',82,'Child of',1,NULL,NULL),(165,83,1,'a_b',79,'Child of',174,'Parent of',1,NULL,NULL),(166,83,1,'b_a',174,'Parent of',79,'Child of',1,NULL,NULL),(167,84,1,'a_b',82,'Child of',174,'Parent of',1,NULL,NULL),(168,84,1,'b_a',174,'Parent of',82,'Child of',1,NULL,NULL),(169,85,4,'a_b',82,'Sibling of',79,'Sibling of',1,NULL,NULL),(170,85,4,'b_a',79,'Sibling of',82,'Sibling of',1,NULL,NULL),(171,86,8,'a_b',174,'Household Member of',78,'Household Member is',1,NULL,NULL),(172,86,8,'b_a',78,'Household Member is',174,'Household Member of',1,NULL,NULL),(173,87,8,'a_b',79,'Household Member of',78,'Household Member is',1,NULL,NULL),(174,87,8,'b_a',78,'Household Member is',79,'Household Member of',1,NULL,NULL),(175,88,8,'a_b',82,'Household Member of',78,'Household Member is',1,NULL,NULL),(176,88,8,'b_a',78,'Household Member is',82,'Household Member of',1,NULL,NULL),(177,89,7,'a_b',5,'Head of Household for',78,'Head of Household is',0,NULL,NULL),(178,89,7,'b_a',78,'Head of Household is',5,'Head of Household for',0,NULL,NULL),(179,90,2,'a_b',174,'Spouse of',5,'Spouse of',0,NULL,NULL),(180,90,2,'b_a',5,'Spouse of',174,'Spouse of',0,NULL,NULL),(181,91,1,'a_b',11,'Child of',87,'Parent of',1,NULL,NULL),(182,91,1,'b_a',87,'Parent of',11,'Child of',1,NULL,NULL),(183,92,1,'a_b',108,'Child of',87,'Parent of',1,NULL,NULL),(184,92,1,'b_a',87,'Parent of',108,'Child of',1,NULL,NULL),(185,93,1,'a_b',11,'Child of',15,'Parent of',1,NULL,NULL),(186,93,1,'b_a',15,'Parent of',11,'Child of',1,NULL,NULL),(187,94,1,'a_b',108,'Child of',15,'Parent of',1,NULL,NULL),(188,94,1,'b_a',15,'Parent of',108,'Child of',1,NULL,NULL),(189,95,4,'a_b',108,'Sibling of',11,'Sibling of',1,NULL,NULL),(190,95,4,'b_a',11,'Sibling of',108,'Sibling of',1,NULL,NULL),(191,96,8,'a_b',15,'Household Member of',133,'Household Member is',1,NULL,NULL),(192,96,8,'b_a',133,'Household Member is',15,'Household Member of',1,NULL,NULL),(193,97,8,'a_b',11,'Household Member of',133,'Household Member is',1,NULL,NULL),(194,97,8,'b_a',133,'Household Member is',11,'Household Member of',1,NULL,NULL),(195,98,8,'a_b',108,'Household Member of',133,'Household Member is',1,NULL,NULL),(196,98,8,'b_a',133,'Household Member is',108,'Household Member of',1,NULL,NULL),(197,99,7,'a_b',87,'Head of Household for',133,'Head of Household is',0,NULL,NULL),(198,99,7,'b_a',133,'Head of Household is',87,'Head of Household for',0,NULL,NULL),(199,100,2,'a_b',15,'Spouse of',87,'Spouse of',0,NULL,NULL),(200,100,2,'b_a',87,'Spouse of',15,'Spouse of',0,NULL,NULL),(201,101,1,'a_b',96,'Child of',100,'Parent of',1,NULL,NULL),(202,101,1,'b_a',100,'Parent of',96,'Child of',1,NULL,NULL),(203,102,1,'a_b',36,'Child of',100,'Parent of',1,NULL,NULL),(204,102,1,'b_a',100,'Parent of',36,'Child of',1,NULL,NULL),(205,103,1,'a_b',96,'Child of',40,'Parent of',1,NULL,NULL),(206,103,1,'b_a',40,'Parent of',96,'Child of',1,NULL,NULL),(207,104,1,'a_b',36,'Child of',40,'Parent of',1,NULL,NULL),(208,104,1,'b_a',40,'Parent of',36,'Child of',1,NULL,NULL),(209,105,4,'a_b',36,'Sibling of',96,'Sibling of',1,NULL,NULL),(210,105,4,'b_a',96,'Sibling of',36,'Sibling of',1,NULL,NULL),(211,106,8,'a_b',40,'Household Member of',119,'Household Member is',1,NULL,NULL),(212,106,8,'b_a',119,'Household Member is',40,'Household Member of',1,NULL,NULL),(213,107,8,'a_b',96,'Household Member of',119,'Household Member is',1,NULL,NULL),(214,107,8,'b_a',119,'Household Member is',96,'Household Member of',1,NULL,NULL),(215,108,8,'a_b',36,'Household Member of',119,'Household Member is',1,NULL,NULL),(216,108,8,'b_a',119,'Household Member is',36,'Household Member of',1,NULL,NULL),(217,109,7,'a_b',100,'Head of Household for',119,'Head of Household is',1,NULL,NULL),(218,109,7,'b_a',119,'Head of Household is',100,'Head of Household for',1,NULL,NULL),(219,110,2,'a_b',40,'Spouse of',100,'Spouse of',1,NULL,NULL),(220,110,2,'b_a',100,'Spouse of',40,'Spouse of',1,NULL,NULL),(221,111,1,'a_b',135,'Child of',138,'Parent of',1,NULL,NULL),(222,111,1,'b_a',138,'Parent of',135,'Child of',1,NULL,NULL),(223,112,1,'a_b',48,'Child of',138,'Parent of',1,NULL,NULL),(224,112,1,'b_a',138,'Parent of',48,'Child of',1,NULL,NULL),(225,113,1,'a_b',135,'Child of',64,'Parent of',1,NULL,NULL),(226,113,1,'b_a',64,'Parent of',135,'Child of',1,NULL,NULL),(227,114,1,'a_b',48,'Child of',64,'Parent of',1,NULL,NULL),(228,114,1,'b_a',64,'Parent of',48,'Child of',1,NULL,NULL),(229,115,4,'a_b',48,'Sibling of',135,'Sibling of',1,NULL,NULL),(230,115,4,'b_a',135,'Sibling of',48,'Sibling of',1,NULL,NULL),(231,116,8,'a_b',64,'Household Member of',148,'Household Member is',1,NULL,NULL),(232,116,8,'b_a',148,'Household Member is',64,'Household Member of',1,NULL,NULL),(233,117,8,'a_b',135,'Household Member of',148,'Household Member is',1,NULL,NULL),(234,117,8,'b_a',148,'Household Member is',135,'Household Member of',1,NULL,NULL),(235,118,8,'a_b',48,'Household Member of',148,'Household Member is',1,NULL,NULL),(236,118,8,'b_a',148,'Household Member is',48,'Household Member of',1,NULL,NULL),(237,119,7,'a_b',138,'Head of Household for',148,'Head of Household is',1,NULL,NULL),(238,119,7,'b_a',148,'Head of Household is',138,'Head of Household for',1,NULL,NULL),(239,120,2,'a_b',64,'Spouse of',138,'Spouse of',1,NULL,NULL),(240,120,2,'b_a',138,'Spouse of',64,'Spouse of',1,NULL,NULL),(241,121,1,'a_b',80,'Child of',168,'Parent of',1,NULL,NULL),(242,121,1,'b_a',168,'Parent of',80,'Child of',1,NULL,NULL),(243,122,1,'a_b',4,'Child of',168,'Parent of',1,NULL,NULL),(244,122,1,'b_a',168,'Parent of',4,'Child of',1,NULL,NULL),(245,123,1,'a_b',80,'Child of',195,'Parent of',1,NULL,NULL),(246,123,1,'b_a',195,'Parent of',80,'Child of',1,NULL,NULL),(247,124,1,'a_b',4,'Child of',195,'Parent of',1,NULL,NULL),(248,124,1,'b_a',195,'Parent of',4,'Child of',1,NULL,NULL),(249,125,4,'a_b',4,'Sibling of',80,'Sibling of',1,NULL,NULL),(250,125,4,'b_a',80,'Sibling of',4,'Sibling of',1,NULL,NULL),(251,126,8,'a_b',195,'Household Member of',137,'Household Member is',1,NULL,NULL),(252,126,8,'b_a',137,'Household Member is',195,'Household Member of',1,NULL,NULL),(253,127,8,'a_b',80,'Household Member of',137,'Household Member is',1,NULL,NULL),(254,127,8,'b_a',137,'Household Member is',80,'Household Member of',1,NULL,NULL),(255,128,8,'a_b',4,'Household Member of',137,'Household Member is',1,NULL,NULL),(256,128,8,'b_a',137,'Household Member is',4,'Household Member of',1,NULL,NULL),(257,129,7,'a_b',168,'Head of Household for',137,'Head of Household is',1,NULL,NULL),(258,129,7,'b_a',137,'Head of Household is',168,'Head of Household for',1,NULL,NULL),(259,130,2,'a_b',195,'Spouse of',168,'Spouse of',1,NULL,NULL),(260,130,2,'b_a',168,'Spouse of',195,'Spouse of',1,NULL,NULL),(261,131,1,'a_b',63,'Child of',83,'Parent of',1,NULL,NULL),(262,131,1,'b_a',83,'Parent of',63,'Child of',1,NULL,NULL),(263,132,1,'a_b',2,'Child of',83,'Parent of',1,NULL,NULL),(264,132,1,'b_a',83,'Parent of',2,'Child of',1,NULL,NULL),(265,133,1,'a_b',63,'Child of',42,'Parent of',1,NULL,NULL),(266,133,1,'b_a',42,'Parent of',63,'Child of',1,NULL,NULL),(267,134,1,'a_b',2,'Child of',42,'Parent of',1,NULL,NULL),(268,134,1,'b_a',42,'Parent of',2,'Child of',1,NULL,NULL),(269,135,4,'a_b',2,'Sibling of',63,'Sibling of',1,NULL,NULL),(270,135,4,'b_a',63,'Sibling of',2,'Sibling of',1,NULL,NULL),(271,136,8,'a_b',42,'Household Member of',186,'Household Member is',1,NULL,NULL),(272,136,8,'b_a',186,'Household Member is',42,'Household Member of',1,NULL,NULL),(273,137,8,'a_b',63,'Household Member of',186,'Household Member is',1,NULL,NULL),(274,137,8,'b_a',186,'Household Member is',63,'Household Member of',1,NULL,NULL),(275,138,8,'a_b',2,'Household Member of',186,'Household Member is',1,NULL,NULL),(276,138,8,'b_a',186,'Household Member is',2,'Household Member of',1,NULL,NULL),(277,139,7,'a_b',83,'Head of Household for',186,'Head of Household is',0,NULL,NULL),(278,139,7,'b_a',186,'Head of Household is',83,'Head of Household for',0,NULL,NULL),(279,140,2,'a_b',42,'Spouse of',83,'Spouse of',0,NULL,NULL),(280,140,2,'b_a',83,'Spouse of',42,'Spouse of',0,NULL,NULL),(281,141,1,'a_b',18,'Child of',73,'Parent of',1,NULL,NULL),(282,141,1,'b_a',73,'Parent of',18,'Child of',1,NULL,NULL),(283,142,1,'a_b',165,'Child of',73,'Parent of',1,NULL,NULL),(284,142,1,'b_a',73,'Parent of',165,'Child of',1,NULL,NULL),(285,143,1,'a_b',18,'Child of',143,'Parent of',1,NULL,NULL),(286,143,1,'b_a',143,'Parent of',18,'Child of',1,NULL,NULL),(287,144,1,'a_b',165,'Child of',143,'Parent of',1,NULL,NULL),(288,144,1,'b_a',143,'Parent of',165,'Child of',1,NULL,NULL),(289,145,4,'a_b',165,'Sibling of',18,'Sibling of',1,NULL,NULL),(290,145,4,'b_a',18,'Sibling of',165,'Sibling of',1,NULL,NULL),(291,146,8,'a_b',143,'Household Member of',38,'Household Member is',1,NULL,NULL),(292,146,8,'b_a',38,'Household Member is',143,'Household Member of',1,NULL,NULL),(293,147,8,'a_b',18,'Household Member of',38,'Household Member is',1,NULL,NULL),(294,147,8,'b_a',38,'Household Member is',18,'Household Member of',1,NULL,NULL),(295,148,8,'a_b',165,'Household Member of',38,'Household Member is',1,NULL,NULL),(296,148,8,'b_a',38,'Household Member is',165,'Household Member of',1,NULL,NULL),(297,149,7,'a_b',73,'Head of Household for',38,'Head of Household is',1,NULL,NULL),(298,149,7,'b_a',38,'Head of Household is',73,'Head of Household for',1,NULL,NULL),(299,150,2,'a_b',143,'Spouse of',73,'Spouse of',1,NULL,NULL),(300,150,2,'b_a',73,'Spouse of',143,'Spouse of',1,NULL,NULL),(301,151,1,'a_b',175,'Child of',139,'Parent of',1,NULL,NULL),(302,151,1,'b_a',139,'Parent of',175,'Child of',1,NULL,NULL),(303,152,1,'a_b',14,'Child of',139,'Parent of',1,NULL,NULL),(304,152,1,'b_a',139,'Parent of',14,'Child of',1,NULL,NULL),(305,153,1,'a_b',175,'Child of',192,'Parent of',1,NULL,NULL),(306,153,1,'b_a',192,'Parent of',175,'Child of',1,NULL,NULL),(307,154,1,'a_b',14,'Child of',192,'Parent of',1,NULL,NULL),(308,154,1,'b_a',192,'Parent of',14,'Child of',1,NULL,NULL),(309,155,4,'a_b',14,'Sibling of',175,'Sibling of',1,NULL,NULL),(310,155,4,'b_a',175,'Sibling of',14,'Sibling of',1,NULL,NULL),(311,156,8,'a_b',192,'Household Member of',75,'Household Member is',1,NULL,NULL),(312,156,8,'b_a',75,'Household Member is',192,'Household Member of',1,NULL,NULL),(313,157,8,'a_b',175,'Household Member of',75,'Household Member is',1,NULL,NULL),(314,157,8,'b_a',75,'Household Member is',175,'Household Member of',1,NULL,NULL),(315,158,8,'a_b',14,'Household Member of',75,'Household Member is',1,NULL,NULL),(316,158,8,'b_a',75,'Household Member is',14,'Household Member of',1,NULL,NULL),(317,159,7,'a_b',139,'Head of Household for',75,'Head of Household is',0,NULL,NULL),(318,159,7,'b_a',75,'Head of Household is',139,'Head of Household for',0,NULL,NULL),(319,160,2,'a_b',192,'Spouse of',139,'Spouse of',0,NULL,NULL),(320,160,2,'b_a',139,'Spouse of',192,'Spouse of',0,NULL,NULL),(321,161,1,'a_b',68,'Child of',97,'Parent of',1,NULL,NULL),(322,161,1,'b_a',97,'Parent of',68,'Child of',1,NULL,NULL),(323,162,1,'a_b',53,'Child of',97,'Parent of',1,NULL,NULL),(324,162,1,'b_a',97,'Parent of',53,'Child of',1,NULL,NULL),(325,163,1,'a_b',68,'Child of',58,'Parent of',1,NULL,NULL),(326,163,1,'b_a',58,'Parent of',68,'Child of',1,NULL,NULL),(327,164,1,'a_b',53,'Child of',58,'Parent of',1,NULL,NULL),(328,164,1,'b_a',58,'Parent of',53,'Child of',1,NULL,NULL),(329,165,4,'a_b',53,'Sibling of',68,'Sibling of',1,NULL,NULL),(330,165,4,'b_a',68,'Sibling of',53,'Sibling of',1,NULL,NULL),(331,166,8,'a_b',58,'Household Member of',7,'Household Member is',1,NULL,NULL),(332,166,8,'b_a',7,'Household Member is',58,'Household Member of',1,NULL,NULL),(333,167,8,'a_b',68,'Household Member of',7,'Household Member is',1,NULL,NULL),(334,167,8,'b_a',7,'Household Member is',68,'Household Member of',1,NULL,NULL),(335,168,8,'a_b',53,'Household Member of',7,'Household Member is',1,NULL,NULL),(336,168,8,'b_a',7,'Household Member is',53,'Household Member of',1,NULL,NULL),(337,169,7,'a_b',97,'Head of Household for',7,'Head of Household is',0,NULL,NULL),(338,169,7,'b_a',7,'Head of Household is',97,'Head of Household for',0,NULL,NULL),(339,170,2,'a_b',58,'Spouse of',97,'Spouse of',0,NULL,NULL),(340,170,2,'b_a',97,'Spouse of',58,'Spouse of',0,NULL,NULL),(341,171,1,'a_b',120,'Child of',172,'Parent of',1,NULL,NULL),(342,171,1,'b_a',172,'Parent of',120,'Child of',1,NULL,NULL),(343,172,1,'a_b',124,'Child of',172,'Parent of',1,NULL,NULL),(344,172,1,'b_a',172,'Parent of',124,'Child of',1,NULL,NULL),(345,173,1,'a_b',120,'Child of',71,'Parent of',1,NULL,NULL),(346,173,1,'b_a',71,'Parent of',120,'Child of',1,NULL,NULL),(347,174,1,'a_b',124,'Child of',71,'Parent of',1,NULL,NULL),(348,174,1,'b_a',71,'Parent of',124,'Child of',1,NULL,NULL),(349,175,4,'a_b',124,'Sibling of',120,'Sibling of',1,NULL,NULL),(350,175,4,'b_a',120,'Sibling of',124,'Sibling of',1,NULL,NULL),(351,176,8,'a_b',71,'Household Member of',32,'Household Member is',1,NULL,NULL),(352,176,8,'b_a',32,'Household Member is',71,'Household Member of',1,NULL,NULL),(353,177,8,'a_b',120,'Household Member of',32,'Household Member is',1,NULL,NULL),(354,177,8,'b_a',32,'Household Member is',120,'Household Member of',1,NULL,NULL),(355,178,8,'a_b',124,'Household Member of',32,'Household Member is',1,NULL,NULL),(356,178,8,'b_a',32,'Household Member is',124,'Household Member of',1,NULL,NULL),(357,179,7,'a_b',172,'Head of Household for',32,'Head of Household is',1,NULL,NULL),(358,179,7,'b_a',32,'Head of Household is',172,'Head of Household for',1,NULL,NULL),(359,180,2,'a_b',71,'Spouse of',172,'Spouse of',1,NULL,NULL),(360,180,2,'b_a',172,'Spouse of',71,'Spouse of',1,NULL,NULL),(361,181,1,'a_b',95,'Child of',44,'Parent of',1,NULL,NULL),(362,181,1,'b_a',44,'Parent of',95,'Child of',1,NULL,NULL),(363,182,1,'a_b',112,'Child of',44,'Parent of',1,NULL,NULL),(364,182,1,'b_a',44,'Parent of',112,'Child of',1,NULL,NULL),(365,183,1,'a_b',95,'Child of',26,'Parent of',1,NULL,NULL),(366,183,1,'b_a',26,'Parent of',95,'Child of',1,NULL,NULL),(367,184,1,'a_b',112,'Child of',26,'Parent of',1,NULL,NULL),(368,184,1,'b_a',26,'Parent of',112,'Child of',1,NULL,NULL),(369,185,4,'a_b',112,'Sibling of',95,'Sibling of',1,NULL,NULL),(370,185,4,'b_a',95,'Sibling of',112,'Sibling of',1,NULL,NULL),(371,186,8,'a_b',26,'Household Member of',154,'Household Member is',1,NULL,NULL),(372,186,8,'b_a',154,'Household Member is',26,'Household Member of',1,NULL,NULL),(373,187,8,'a_b',95,'Household Member of',154,'Household Member is',1,NULL,NULL),(374,187,8,'b_a',154,'Household Member is',95,'Household Member of',1,NULL,NULL),(375,188,8,'a_b',112,'Household Member of',154,'Household Member is',1,NULL,NULL),(376,188,8,'b_a',154,'Household Member is',112,'Household Member of',1,NULL,NULL),(377,189,7,'a_b',44,'Head of Household for',154,'Head of Household is',0,NULL,NULL),(378,189,7,'b_a',154,'Head of Household is',44,'Head of Household for',0,NULL,NULL),(379,190,2,'a_b',26,'Spouse of',44,'Spouse of',0,NULL,NULL),(380,190,2,'b_a',44,'Spouse of',26,'Spouse of',0,NULL,NULL),(381,191,1,'a_b',35,'Child of',31,'Parent of',1,NULL,NULL),(382,191,1,'b_a',31,'Parent of',35,'Child of',1,NULL,NULL),(383,192,1,'a_b',159,'Child of',31,'Parent of',1,NULL,NULL),(384,192,1,'b_a',31,'Parent of',159,'Child of',1,NULL,NULL),(385,193,1,'a_b',35,'Child of',34,'Parent of',1,NULL,NULL),(386,193,1,'b_a',34,'Parent of',35,'Child of',1,NULL,NULL),(387,194,1,'a_b',159,'Child of',34,'Parent of',1,NULL,NULL),(388,194,1,'b_a',34,'Parent of',159,'Child of',1,NULL,NULL),(389,195,4,'a_b',159,'Sibling of',35,'Sibling of',1,NULL,NULL),(390,195,4,'b_a',35,'Sibling of',159,'Sibling of',1,NULL,NULL),(391,196,8,'a_b',34,'Household Member of',187,'Household Member is',1,NULL,NULL),(392,196,8,'b_a',187,'Household Member is',34,'Household Member of',1,NULL,NULL),(393,197,8,'a_b',35,'Household Member of',187,'Household Member is',1,NULL,NULL),(394,197,8,'b_a',187,'Household Member is',35,'Household Member of',1,NULL,NULL),(395,198,8,'a_b',159,'Household Member of',187,'Household Member is',1,NULL,NULL),(396,198,8,'b_a',187,'Household Member is',159,'Household Member of',1,NULL,NULL),(397,199,7,'a_b',31,'Head of Household for',187,'Head of Household is',1,NULL,NULL),(398,199,7,'b_a',187,'Head of Household is',31,'Head of Household for',1,NULL,NULL),(399,200,2,'a_b',34,'Spouse of',31,'Spouse of',1,NULL,NULL),(400,200,2,'b_a',31,'Spouse of',34,'Spouse of',1,NULL,NULL),(401,201,5,'a_b',42,'Employee of',8,'Employer of',1,NULL,NULL),(402,201,5,'b_a',8,'Employer of',42,'Employee of',1,NULL,NULL),(403,202,5,'a_b',58,'Employee of',9,'Employer of',1,NULL,NULL),(404,202,5,'b_a',9,'Employer of',58,'Employee of',1,NULL,NULL),(405,203,5,'a_b',125,'Employee of',10,'Employer of',1,NULL,NULL),(406,203,5,'b_a',10,'Employer of',125,'Employee of',1,NULL,NULL),(407,204,5,'a_b',73,'Employee of',20,'Employer of',1,NULL,NULL),(408,204,5,'b_a',20,'Employer of',73,'Employee of',1,NULL,NULL),(409,205,5,'a_b',172,'Employee of',37,'Employer of',1,NULL,NULL),(410,205,5,'b_a',37,'Employer of',172,'Employee of',1,NULL,NULL),(411,206,5,'a_b',77,'Employee of',55,'Employer of',1,NULL,NULL),(412,206,5,'b_a',55,'Employer of',77,'Employee of',1,NULL,NULL),(413,207,5,'a_b',143,'Employee of',62,'Employer of',1,NULL,NULL),(414,207,5,'b_a',62,'Employer of',143,'Employee of',1,NULL,NULL),(415,208,5,'a_b',156,'Employee of',66,'Employer of',1,NULL,NULL),(416,208,5,'b_a',66,'Employer of',156,'Employee of',1,NULL,NULL),(417,209,5,'a_b',18,'Employee of',69,'Employer of',1,NULL,NULL),(418,209,5,'b_a',69,'Employer of',18,'Employee of',1,NULL,NULL),(419,210,5,'a_b',61,'Employee of',76,'Employer of',1,NULL,NULL),(420,210,5,'b_a',76,'Employer of',61,'Employee of',1,NULL,NULL),(421,211,5,'a_b',174,'Employee of',84,'Employer of',1,NULL,NULL),(422,211,5,'b_a',84,'Employer of',174,'Employee of',1,NULL,NULL),(423,212,5,'a_b',22,'Employee of',98,'Employer of',1,NULL,NULL),(424,212,5,'b_a',98,'Employer of',22,'Employee of',1,NULL,NULL),(425,213,5,'a_b',60,'Employee of',114,'Employer of',1,NULL,NULL),(426,213,5,'b_a',114,'Employer of',60,'Employee of',1,NULL,NULL),(427,214,5,'a_b',40,'Employee of',115,'Employer of',1,NULL,NULL),(428,214,5,'b_a',115,'Employer of',40,'Employee of',1,NULL,NULL),(429,215,5,'a_b',198,'Employee of',121,'Employer of',1,NULL,NULL),(430,215,5,'b_a',121,'Employer of',198,'Employee of',1,NULL,NULL),(431,216,5,'a_b',170,'Employee of',128,'Employer of',1,NULL,NULL),(432,216,5,'b_a',128,'Employer of',170,'Employee of',1,NULL,NULL),(433,217,5,'a_b',100,'Employee of',134,'Employer of',1,NULL,NULL),(434,217,5,'b_a',134,'Employer of',100,'Employee of',1,NULL,NULL),(435,218,5,'a_b',29,'Employee of',149,'Employer of',1,NULL,NULL),(436,218,5,'b_a',149,'Employer of',29,'Employee of',1,NULL,NULL),(437,219,5,'a_b',129,'Employee of',155,'Employer of',1,NULL,NULL),(438,219,5,'b_a',155,'Employer of',129,'Employee of',1,NULL,NULL);
+INSERT INTO `civicrm_relationship_cache` (`id`, `relationship_id`, `relationship_type_id`, `orientation`, `near_contact_id`, `near_relation`, `far_contact_id`, `far_relation`, `is_active`, `start_date`, `end_date`) VALUES (1,1,1,'a_b',76,'Child of',40,'Parent of',1,NULL,NULL),(2,1,1,'b_a',40,'Parent of',76,'Child of',1,NULL,NULL),(3,2,1,'a_b',75,'Child of',40,'Parent of',1,NULL,NULL),(4,2,1,'b_a',40,'Parent of',75,'Child of',1,NULL,NULL),(5,3,1,'a_b',76,'Child of',158,'Parent of',1,NULL,NULL),(6,3,1,'b_a',158,'Parent of',76,'Child of',1,NULL,NULL),(7,4,1,'a_b',75,'Child of',158,'Parent of',1,NULL,NULL),(8,4,1,'b_a',158,'Parent of',75,'Child of',1,NULL,NULL),(9,5,4,'a_b',75,'Sibling of',76,'Sibling of',1,NULL,NULL),(10,5,4,'b_a',76,'Sibling of',75,'Sibling of',1,NULL,NULL),(11,6,8,'a_b',158,'Household Member of',68,'Household Member is',1,NULL,NULL),(12,6,8,'b_a',68,'Household Member is',158,'Household Member of',1,NULL,NULL),(13,7,8,'a_b',76,'Household Member of',68,'Household Member is',1,NULL,NULL),(14,7,8,'b_a',68,'Household Member is',76,'Household Member of',1,NULL,NULL),(15,8,8,'a_b',75,'Household Member of',68,'Household Member is',1,NULL,NULL),(16,8,8,'b_a',68,'Household Member is',75,'Household Member of',1,NULL,NULL),(17,9,7,'a_b',40,'Head of Household for',68,'Head of Household is',1,NULL,NULL),(18,9,7,'b_a',68,'Head of Household is',40,'Head of Household for',1,NULL,NULL),(19,10,2,'a_b',158,'Spouse of',40,'Spouse of',1,NULL,NULL),(20,10,2,'b_a',40,'Spouse of',158,'Spouse of',1,NULL,NULL),(21,11,1,'a_b',97,'Child of',43,'Parent of',1,NULL,NULL),(22,11,1,'b_a',43,'Parent of',97,'Child of',1,NULL,NULL),(23,12,1,'a_b',89,'Child of',43,'Parent of',1,NULL,NULL),(24,12,1,'b_a',43,'Parent of',89,'Child of',1,NULL,NULL),(25,13,1,'a_b',97,'Child of',131,'Parent of',1,NULL,NULL),(26,13,1,'b_a',131,'Parent of',97,'Child of',1,NULL,NULL),(27,14,1,'a_b',89,'Child of',131,'Parent of',1,NULL,NULL),(28,14,1,'b_a',131,'Parent of',89,'Child of',1,NULL,NULL),(29,15,4,'a_b',89,'Sibling of',97,'Sibling of',1,NULL,NULL),(30,15,4,'b_a',97,'Sibling of',89,'Sibling of',1,NULL,NULL),(31,16,8,'a_b',131,'Household Member of',82,'Household Member is',1,NULL,NULL),(32,16,8,'b_a',82,'Household Member is',131,'Household Member of',1,NULL,NULL),(33,17,8,'a_b',97,'Household Member of',82,'Household Member is',1,NULL,NULL),(34,17,8,'b_a',82,'Household Member is',97,'Household Member of',1,NULL,NULL),(35,18,8,'a_b',89,'Household Member of',82,'Household Member is',1,NULL,NULL),(36,18,8,'b_a',82,'Household Member is',89,'Household Member of',1,NULL,NULL),(37,19,7,'a_b',43,'Head of Household for',82,'Head of Household is',1,NULL,NULL),(38,19,7,'b_a',82,'Head of Household is',43,'Head of Household for',1,NULL,NULL),(39,20,2,'a_b',131,'Spouse of',43,'Spouse of',1,NULL,NULL),(40,20,2,'b_a',43,'Spouse of',131,'Spouse of',1,NULL,NULL),(41,21,1,'a_b',10,'Child of',124,'Parent of',1,NULL,NULL),(42,21,1,'b_a',124,'Parent of',10,'Child of',1,NULL,NULL),(43,22,1,'a_b',134,'Child of',124,'Parent of',1,NULL,NULL),(44,22,1,'b_a',124,'Parent of',134,'Child of',1,NULL,NULL),(45,23,1,'a_b',10,'Child of',26,'Parent of',1,NULL,NULL),(46,23,1,'b_a',26,'Parent of',10,'Child of',1,NULL,NULL),(47,24,1,'a_b',134,'Child of',26,'Parent of',1,NULL,NULL),(48,24,1,'b_a',26,'Parent of',134,'Child of',1,NULL,NULL),(49,25,4,'a_b',134,'Sibling of',10,'Sibling of',1,NULL,NULL),(50,25,4,'b_a',10,'Sibling of',134,'Sibling of',1,NULL,NULL),(51,26,8,'a_b',26,'Household Member of',180,'Household Member is',1,NULL,NULL),(52,26,8,'b_a',180,'Household Member is',26,'Household Member of',1,NULL,NULL),(53,27,8,'a_b',10,'Household Member of',180,'Household Member is',1,NULL,NULL),(54,27,8,'b_a',180,'Household Member is',10,'Household Member of',1,NULL,NULL),(55,28,8,'a_b',134,'Household Member of',180,'Household Member is',1,NULL,NULL),(56,28,8,'b_a',180,'Household Member is',134,'Household Member of',1,NULL,NULL),(57,29,7,'a_b',124,'Head of Household for',180,'Head of Household is',1,NULL,NULL),(58,29,7,'b_a',180,'Head of Household is',124,'Head of Household for',1,NULL,NULL),(59,30,2,'a_b',26,'Spouse of',124,'Spouse of',1,NULL,NULL),(60,30,2,'b_a',124,'Spouse of',26,'Spouse of',1,NULL,NULL),(61,31,1,'a_b',178,'Child of',45,'Parent of',1,NULL,NULL),(62,31,1,'b_a',45,'Parent of',178,'Child of',1,NULL,NULL),(63,32,1,'a_b',179,'Child of',45,'Parent of',1,NULL,NULL),(64,32,1,'b_a',45,'Parent of',179,'Child of',1,NULL,NULL),(65,33,1,'a_b',178,'Child of',22,'Parent of',1,NULL,NULL),(66,33,1,'b_a',22,'Parent of',178,'Child of',1,NULL,NULL),(67,34,1,'a_b',179,'Child of',22,'Parent of',1,NULL,NULL),(68,34,1,'b_a',22,'Parent of',179,'Child of',1,NULL,NULL),(69,35,4,'a_b',179,'Sibling of',178,'Sibling of',1,NULL,NULL),(70,35,4,'b_a',178,'Sibling of',179,'Sibling of',1,NULL,NULL),(71,36,8,'a_b',22,'Household Member of',50,'Household Member is',1,NULL,NULL),(72,36,8,'b_a',50,'Household Member is',22,'Household Member of',1,NULL,NULL),(73,37,8,'a_b',178,'Household Member of',50,'Household Member is',1,NULL,NULL),(74,37,8,'b_a',50,'Household Member is',178,'Household Member of',1,NULL,NULL),(75,38,8,'a_b',179,'Household Member of',50,'Household Member is',1,NULL,NULL),(76,38,8,'b_a',50,'Household Member is',179,'Household Member of',1,NULL,NULL),(77,39,7,'a_b',45,'Head of Household for',50,'Head of Household is',1,NULL,NULL),(78,39,7,'b_a',50,'Head of Household is',45,'Head of Household for',1,NULL,NULL),(79,40,2,'a_b',22,'Spouse of',45,'Spouse of',1,NULL,NULL),(80,40,2,'b_a',45,'Spouse of',22,'Spouse of',1,NULL,NULL),(81,41,1,'a_b',57,'Child of',66,'Parent of',1,NULL,NULL),(82,41,1,'b_a',66,'Parent of',57,'Child of',1,NULL,NULL),(83,42,1,'a_b',157,'Child of',66,'Parent of',1,NULL,NULL),(84,42,1,'b_a',66,'Parent of',157,'Child of',1,NULL,NULL),(85,43,1,'a_b',57,'Child of',138,'Parent of',1,NULL,NULL),(86,43,1,'b_a',138,'Parent of',57,'Child of',1,NULL,NULL),(87,44,1,'a_b',157,'Child of',138,'Parent of',1,NULL,NULL),(88,44,1,'b_a',138,'Parent of',157,'Child of',1,NULL,NULL),(89,45,4,'a_b',157,'Sibling of',57,'Sibling of',1,NULL,NULL),(90,45,4,'b_a',57,'Sibling of',157,'Sibling of',1,NULL,NULL),(91,46,8,'a_b',138,'Household Member of',56,'Household Member is',1,NULL,NULL),(92,46,8,'b_a',56,'Household Member is',138,'Household Member of',1,NULL,NULL),(93,47,8,'a_b',57,'Household Member of',56,'Household Member is',1,NULL,NULL),(94,47,8,'b_a',56,'Household Member is',57,'Household Member of',1,NULL,NULL),(95,48,8,'a_b',157,'Household Member of',56,'Household Member is',1,NULL,NULL),(96,48,8,'b_a',56,'Household Member is',157,'Household Member of',1,NULL,NULL),(97,49,7,'a_b',66,'Head of Household for',56,'Head of Household is',0,NULL,NULL),(98,49,7,'b_a',56,'Head of Household is',66,'Head of Household for',0,NULL,NULL),(99,50,2,'a_b',138,'Spouse of',66,'Spouse of',0,NULL,NULL),(100,50,2,'b_a',66,'Spouse of',138,'Spouse of',0,NULL,NULL),(101,51,1,'a_b',159,'Child of',142,'Parent of',1,NULL,NULL),(102,51,1,'b_a',142,'Parent of',159,'Child of',1,NULL,NULL),(103,52,1,'a_b',145,'Child of',142,'Parent of',1,NULL,NULL),(104,52,1,'b_a',142,'Parent of',145,'Child of',1,NULL,NULL),(105,53,1,'a_b',159,'Child of',196,'Parent of',1,NULL,NULL),(106,53,1,'b_a',196,'Parent of',159,'Child of',1,NULL,NULL),(107,54,1,'a_b',145,'Child of',196,'Parent of',1,NULL,NULL),(108,54,1,'b_a',196,'Parent of',145,'Child of',1,NULL,NULL),(109,55,4,'a_b',145,'Sibling of',159,'Sibling of',1,NULL,NULL),(110,55,4,'b_a',159,'Sibling of',145,'Sibling of',1,NULL,NULL),(111,56,8,'a_b',196,'Household Member of',122,'Household Member is',1,NULL,NULL),(112,56,8,'b_a',122,'Household Member is',196,'Household Member of',1,NULL,NULL),(113,57,8,'a_b',159,'Household Member of',122,'Household Member is',1,NULL,NULL),(114,57,8,'b_a',122,'Household Member is',159,'Household Member of',1,NULL,NULL),(115,58,8,'a_b',145,'Household Member of',122,'Household Member is',1,NULL,NULL),(116,58,8,'b_a',122,'Household Member is',145,'Household Member of',1,NULL,NULL),(117,59,7,'a_b',142,'Head of Household for',122,'Head of Household is',1,NULL,NULL),(118,59,7,'b_a',122,'Head of Household is',142,'Head of Household for',1,NULL,NULL),(119,60,2,'a_b',196,'Spouse of',142,'Spouse of',1,NULL,NULL),(120,60,2,'b_a',142,'Spouse of',196,'Spouse of',1,NULL,NULL),(121,61,1,'a_b',30,'Child of',163,'Parent of',1,NULL,NULL),(122,61,1,'b_a',163,'Parent of',30,'Child of',1,NULL,NULL),(123,62,1,'a_b',113,'Child of',163,'Parent of',1,NULL,NULL),(124,62,1,'b_a',163,'Parent of',113,'Child of',1,NULL,NULL),(125,63,1,'a_b',30,'Child of',106,'Parent of',1,NULL,NULL),(126,63,1,'b_a',106,'Parent of',30,'Child of',1,NULL,NULL),(127,64,1,'a_b',113,'Child of',106,'Parent of',1,NULL,NULL),(128,64,1,'b_a',106,'Parent of',113,'Child of',1,NULL,NULL),(129,65,4,'a_b',113,'Sibling of',30,'Sibling of',1,NULL,NULL),(130,65,4,'b_a',30,'Sibling of',113,'Sibling of',1,NULL,NULL),(131,66,8,'a_b',106,'Household Member of',144,'Household Member is',1,NULL,NULL),(132,66,8,'b_a',144,'Household Member is',106,'Household Member of',1,NULL,NULL),(133,67,8,'a_b',30,'Household Member of',144,'Household Member is',1,NULL,NULL),(134,67,8,'b_a',144,'Household Member is',30,'Household Member of',1,NULL,NULL),(135,68,8,'a_b',113,'Household Member of',144,'Household Member is',1,NULL,NULL),(136,68,8,'b_a',144,'Household Member is',113,'Household Member of',1,NULL,NULL),(137,69,7,'a_b',163,'Head of Household for',144,'Head of Household is',1,NULL,NULL),(138,69,7,'b_a',144,'Head of Household is',163,'Head of Household for',1,NULL,NULL),(139,70,2,'a_b',106,'Spouse of',163,'Spouse of',1,NULL,NULL),(140,70,2,'b_a',163,'Spouse of',106,'Spouse of',1,NULL,NULL),(141,71,1,'a_b',19,'Child of',67,'Parent of',1,NULL,NULL),(142,71,1,'b_a',67,'Parent of',19,'Child of',1,NULL,NULL),(143,72,1,'a_b',105,'Child of',67,'Parent of',1,NULL,NULL),(144,72,1,'b_a',67,'Parent of',105,'Child of',1,NULL,NULL),(145,73,1,'a_b',19,'Child of',29,'Parent of',1,NULL,NULL),(146,73,1,'b_a',29,'Parent of',19,'Child of',1,NULL,NULL),(147,74,1,'a_b',105,'Child of',29,'Parent of',1,NULL,NULL),(148,74,1,'b_a',29,'Parent of',105,'Child of',1,NULL,NULL),(149,75,4,'a_b',105,'Sibling of',19,'Sibling of',1,NULL,NULL),(150,75,4,'b_a',19,'Sibling of',105,'Sibling of',1,NULL,NULL),(151,76,8,'a_b',29,'Household Member of',166,'Household Member is',1,NULL,NULL),(152,76,8,'b_a',166,'Household Member is',29,'Household Member of',1,NULL,NULL),(153,77,8,'a_b',19,'Household Member of',166,'Household Member is',1,NULL,NULL),(154,77,8,'b_a',166,'Household Member is',19,'Household Member of',1,NULL,NULL),(155,78,8,'a_b',105,'Household Member of',166,'Household Member is',1,NULL,NULL),(156,78,8,'b_a',166,'Household Member is',105,'Household Member of',1,NULL,NULL),(157,79,7,'a_b',67,'Head of Household for',166,'Head of Household is',1,NULL,NULL),(158,79,7,'b_a',166,'Head of Household is',67,'Head of Household for',1,NULL,NULL),(159,80,2,'a_b',29,'Spouse of',67,'Spouse of',1,NULL,NULL),(160,80,2,'b_a',67,'Spouse of',29,'Spouse of',1,NULL,NULL),(161,81,1,'a_b',25,'Child of',63,'Parent of',1,NULL,NULL),(162,81,1,'b_a',63,'Parent of',25,'Child of',1,NULL,NULL),(163,82,1,'a_b',186,'Child of',63,'Parent of',1,NULL,NULL),(164,82,1,'b_a',63,'Parent of',186,'Child of',1,NULL,NULL),(165,83,1,'a_b',25,'Child of',20,'Parent of',1,NULL,NULL),(166,83,1,'b_a',20,'Parent of',25,'Child of',1,NULL,NULL),(167,84,1,'a_b',186,'Child of',20,'Parent of',1,NULL,NULL),(168,84,1,'b_a',20,'Parent of',186,'Child of',1,NULL,NULL),(169,85,4,'a_b',186,'Sibling of',25,'Sibling of',1,NULL,NULL),(170,85,4,'b_a',25,'Sibling of',186,'Sibling of',1,NULL,NULL),(171,86,8,'a_b',20,'Household Member of',81,'Household Member is',1,NULL,NULL),(172,86,8,'b_a',81,'Household Member is',20,'Household Member of',1,NULL,NULL),(173,87,8,'a_b',25,'Household Member of',81,'Household Member is',1,NULL,NULL),(174,87,8,'b_a',81,'Household Member is',25,'Household Member of',1,NULL,NULL),(175,88,8,'a_b',186,'Household Member of',81,'Household Member is',1,NULL,NULL),(176,88,8,'b_a',81,'Household Member is',186,'Household Member of',1,NULL,NULL),(177,89,7,'a_b',63,'Head of Household for',81,'Head of Household is',0,NULL,NULL),(178,89,7,'b_a',81,'Head of Household is',63,'Head of Household for',0,NULL,NULL),(179,90,2,'a_b',20,'Spouse of',63,'Spouse of',0,NULL,NULL),(180,90,2,'b_a',63,'Spouse of',20,'Spouse of',0,NULL,NULL),(181,91,1,'a_b',136,'Child of',48,'Parent of',1,NULL,NULL),(182,91,1,'b_a',48,'Parent of',136,'Child of',1,NULL,NULL),(183,92,1,'a_b',123,'Child of',48,'Parent of',1,NULL,NULL),(184,92,1,'b_a',48,'Parent of',123,'Child of',1,NULL,NULL),(185,93,1,'a_b',136,'Child of',52,'Parent of',1,NULL,NULL),(186,93,1,'b_a',52,'Parent of',136,'Child of',1,NULL,NULL),(187,94,1,'a_b',123,'Child of',52,'Parent of',1,NULL,NULL),(188,94,1,'b_a',52,'Parent of',123,'Child of',1,NULL,NULL),(189,95,4,'a_b',123,'Sibling of',136,'Sibling of',1,NULL,NULL),(190,95,4,'b_a',136,'Sibling of',123,'Sibling of',1,NULL,NULL),(191,96,8,'a_b',52,'Household Member of',156,'Household Member is',1,NULL,NULL),(192,96,8,'b_a',156,'Household Member is',52,'Household Member of',1,NULL,NULL),(193,97,8,'a_b',136,'Household Member of',156,'Household Member is',1,NULL,NULL),(194,97,8,'b_a',156,'Household Member is',136,'Household Member of',1,NULL,NULL),(195,98,8,'a_b',123,'Household Member of',156,'Household Member is',1,NULL,NULL),(196,98,8,'b_a',156,'Household Member is',123,'Household Member of',1,NULL,NULL),(197,99,7,'a_b',48,'Head of Household for',156,'Head of Household is',1,NULL,NULL),(198,99,7,'b_a',156,'Head of Household is',48,'Head of Household for',1,NULL,NULL),(199,100,2,'a_b',52,'Spouse of',48,'Spouse of',1,NULL,NULL),(200,100,2,'b_a',48,'Spouse of',52,'Spouse of',1,NULL,NULL),(201,101,1,'a_b',96,'Child of',150,'Parent of',1,NULL,NULL),(202,101,1,'b_a',150,'Parent of',96,'Child of',1,NULL,NULL),(203,102,1,'a_b',135,'Child of',150,'Parent of',1,NULL,NULL),(204,102,1,'b_a',150,'Parent of',135,'Child of',1,NULL,NULL),(205,103,1,'a_b',96,'Child of',153,'Parent of',1,NULL,NULL),(206,103,1,'b_a',153,'Parent of',96,'Child of',1,NULL,NULL),(207,104,1,'a_b',135,'Child of',153,'Parent of',1,NULL,NULL),(208,104,1,'b_a',153,'Parent of',135,'Child of',1,NULL,NULL),(209,105,4,'a_b',135,'Sibling of',96,'Sibling of',1,NULL,NULL),(210,105,4,'b_a',96,'Sibling of',135,'Sibling of',1,NULL,NULL),(211,106,8,'a_b',153,'Household Member of',37,'Household Member is',1,NULL,NULL),(212,106,8,'b_a',37,'Household Member is',153,'Household Member of',1,NULL,NULL),(213,107,8,'a_b',96,'Household Member of',37,'Household Member is',1,NULL,NULL),(214,107,8,'b_a',37,'Household Member is',96,'Household Member of',1,NULL,NULL),(215,108,8,'a_b',135,'Household Member of',37,'Household Member is',1,NULL,NULL),(216,108,8,'b_a',37,'Household Member is',135,'Household Member of',1,NULL,NULL),(217,109,7,'a_b',150,'Head of Household for',37,'Head of Household is',1,NULL,NULL),(218,109,7,'b_a',37,'Head of Household is',150,'Head of Household for',1,NULL,NULL),(219,110,2,'a_b',153,'Spouse of',150,'Spouse of',1,NULL,NULL),(220,110,2,'b_a',150,'Spouse of',153,'Spouse of',1,NULL,NULL),(221,111,1,'a_b',175,'Child of',27,'Parent of',1,NULL,NULL),(222,111,1,'b_a',27,'Parent of',175,'Child of',1,NULL,NULL),(223,112,1,'a_b',110,'Child of',27,'Parent of',1,NULL,NULL),(224,112,1,'b_a',27,'Parent of',110,'Child of',1,NULL,NULL),(225,113,1,'a_b',175,'Child of',6,'Parent of',1,NULL,NULL),(226,113,1,'b_a',6,'Parent of',175,'Child of',1,NULL,NULL),(227,114,1,'a_b',110,'Child of',6,'Parent of',1,NULL,NULL),(228,114,1,'b_a',6,'Parent of',110,'Child of',1,NULL,NULL),(229,115,4,'a_b',110,'Sibling of',175,'Sibling of',1,NULL,NULL),(230,115,4,'b_a',175,'Sibling of',110,'Sibling of',1,NULL,NULL),(231,116,8,'a_b',6,'Household Member of',141,'Household Member is',1,NULL,NULL),(232,116,8,'b_a',141,'Household Member is',6,'Household Member of',1,NULL,NULL),(233,117,8,'a_b',175,'Household Member of',141,'Household Member is',1,NULL,NULL),(234,117,8,'b_a',141,'Household Member is',175,'Household Member of',1,NULL,NULL),(235,118,8,'a_b',110,'Household Member of',141,'Household Member is',1,NULL,NULL),(236,118,8,'b_a',141,'Household Member is',110,'Household Member of',1,NULL,NULL),(237,119,7,'a_b',27,'Head of Household for',141,'Head of Household is',1,NULL,NULL),(238,119,7,'b_a',141,'Head of Household is',27,'Head of Household for',1,NULL,NULL),(239,120,2,'a_b',6,'Spouse of',27,'Spouse of',1,NULL,NULL),(240,120,2,'b_a',27,'Spouse of',6,'Spouse of',1,NULL,NULL),(241,121,1,'a_b',24,'Child of',84,'Parent of',1,NULL,NULL),(242,121,1,'b_a',84,'Parent of',24,'Child of',1,NULL,NULL),(243,122,1,'a_b',90,'Child of',84,'Parent of',1,NULL,NULL),(244,122,1,'b_a',84,'Parent of',90,'Child of',1,NULL,NULL),(245,123,1,'a_b',24,'Child of',200,'Parent of',1,NULL,NULL),(246,123,1,'b_a',200,'Parent of',24,'Child of',1,NULL,NULL),(247,124,1,'a_b',90,'Child of',200,'Parent of',1,NULL,NULL),(248,124,1,'b_a',200,'Parent of',90,'Child of',1,NULL,NULL),(249,125,4,'a_b',90,'Sibling of',24,'Sibling of',1,NULL,NULL),(250,125,4,'b_a',24,'Sibling of',90,'Sibling of',1,NULL,NULL),(251,126,8,'a_b',200,'Household Member of',174,'Household Member is',1,NULL,NULL),(252,126,8,'b_a',174,'Household Member is',200,'Household Member of',1,NULL,NULL),(253,127,8,'a_b',24,'Household Member of',174,'Household Member is',1,NULL,NULL),(254,127,8,'b_a',174,'Household Member is',24,'Household Member of',1,NULL,NULL),(255,128,8,'a_b',90,'Household Member of',174,'Household Member is',1,NULL,NULL),(256,128,8,'b_a',174,'Household Member is',90,'Household Member of',1,NULL,NULL),(257,129,7,'a_b',84,'Head of Household for',174,'Head of Household is',1,NULL,NULL),(258,129,7,'b_a',174,'Head of Household is',84,'Head of Household for',1,NULL,NULL),(259,130,2,'a_b',200,'Spouse of',84,'Spouse of',1,NULL,NULL),(260,130,2,'b_a',84,'Spouse of',200,'Spouse of',1,NULL,NULL),(261,131,1,'a_b',2,'Child of',120,'Parent of',1,NULL,NULL),(262,131,1,'b_a',120,'Parent of',2,'Child of',1,NULL,NULL),(263,132,1,'a_b',128,'Child of',120,'Parent of',1,NULL,NULL),(264,132,1,'b_a',120,'Parent of',128,'Child of',1,NULL,NULL),(265,133,1,'a_b',2,'Child of',3,'Parent of',1,NULL,NULL),(266,133,1,'b_a',3,'Parent of',2,'Child of',1,NULL,NULL),(267,134,1,'a_b',128,'Child of',3,'Parent of',1,NULL,NULL),(268,134,1,'b_a',3,'Parent of',128,'Child of',1,NULL,NULL),(269,135,4,'a_b',128,'Sibling of',2,'Sibling of',1,NULL,NULL),(270,135,4,'b_a',2,'Sibling of',128,'Sibling of',1,NULL,NULL),(271,136,8,'a_b',3,'Household Member of',127,'Household Member is',1,NULL,NULL),(272,136,8,'b_a',127,'Household Member is',3,'Household Member of',1,NULL,NULL),(273,137,8,'a_b',2,'Household Member of',127,'Household Member is',1,NULL,NULL),(274,137,8,'b_a',127,'Household Member is',2,'Household Member of',1,NULL,NULL),(275,138,8,'a_b',128,'Household Member of',127,'Household Member is',1,NULL,NULL),(276,138,8,'b_a',127,'Household Member is',128,'Household Member of',1,NULL,NULL),(277,139,7,'a_b',120,'Head of Household for',127,'Head of Household is',0,NULL,NULL),(278,139,7,'b_a',127,'Head of Household is',120,'Head of Household for',0,NULL,NULL),(279,140,2,'a_b',3,'Spouse of',120,'Spouse of',0,NULL,NULL),(280,140,2,'b_a',120,'Spouse of',3,'Spouse of',0,NULL,NULL),(281,141,1,'a_b',143,'Child of',146,'Parent of',1,NULL,NULL),(282,141,1,'b_a',146,'Parent of',143,'Child of',1,NULL,NULL),(283,142,1,'a_b',195,'Child of',146,'Parent of',1,NULL,NULL),(284,142,1,'b_a',146,'Parent of',195,'Child of',1,NULL,NULL),(285,143,1,'a_b',143,'Child of',18,'Parent of',1,NULL,NULL),(286,143,1,'b_a',18,'Parent of',143,'Child of',1,NULL,NULL),(287,144,1,'a_b',195,'Child of',18,'Parent of',1,NULL,NULL),(288,144,1,'b_a',18,'Parent of',195,'Child of',1,NULL,NULL),(289,145,4,'a_b',195,'Sibling of',143,'Sibling of',1,NULL,NULL),(290,145,4,'b_a',143,'Sibling of',195,'Sibling of',1,NULL,NULL),(291,146,8,'a_b',18,'Household Member of',53,'Household Member is',1,NULL,NULL),(292,146,8,'b_a',53,'Household Member is',18,'Household Member of',1,NULL,NULL),(293,147,8,'a_b',143,'Household Member of',53,'Household Member is',1,NULL,NULL),(294,147,8,'b_a',53,'Household Member is',143,'Household Member of',1,NULL,NULL),(295,148,8,'a_b',195,'Household Member of',53,'Household Member is',1,NULL,NULL),(296,148,8,'b_a',53,'Household Member is',195,'Household Member of',1,NULL,NULL),(297,149,7,'a_b',146,'Head of Household for',53,'Head of Household is',0,NULL,NULL),(298,149,7,'b_a',53,'Head of Household is',146,'Head of Household for',0,NULL,NULL),(299,150,2,'a_b',18,'Spouse of',146,'Spouse of',0,NULL,NULL),(300,150,2,'b_a',146,'Spouse of',18,'Spouse of',0,NULL,NULL),(301,151,1,'a_b',72,'Child of',4,'Parent of',1,NULL,NULL),(302,151,1,'b_a',4,'Parent of',72,'Child of',1,NULL,NULL),(303,152,1,'a_b',58,'Child of',4,'Parent of',1,NULL,NULL),(304,152,1,'b_a',4,'Parent of',58,'Child of',1,NULL,NULL),(305,153,1,'a_b',72,'Child of',177,'Parent of',1,NULL,NULL),(306,153,1,'b_a',177,'Parent of',72,'Child of',1,NULL,NULL),(307,154,1,'a_b',58,'Child of',177,'Parent of',1,NULL,NULL),(308,154,1,'b_a',177,'Parent of',58,'Child of',1,NULL,NULL),(309,155,4,'a_b',58,'Sibling of',72,'Sibling of',1,NULL,NULL),(310,155,4,'b_a',72,'Sibling of',58,'Sibling of',1,NULL,NULL),(311,156,8,'a_b',177,'Household Member of',155,'Household Member is',1,NULL,NULL),(312,156,8,'b_a',155,'Household Member is',177,'Household Member of',1,NULL,NULL),(313,157,8,'a_b',72,'Household Member of',155,'Household Member is',1,NULL,NULL),(314,157,8,'b_a',155,'Household Member is',72,'Household Member of',1,NULL,NULL),(315,158,8,'a_b',58,'Household Member of',155,'Household Member is',1,NULL,NULL),(316,158,8,'b_a',155,'Household Member is',58,'Household Member of',1,NULL,NULL),(317,159,7,'a_b',4,'Head of Household for',155,'Head of Household is',0,NULL,NULL),(318,159,7,'b_a',155,'Head of Household is',4,'Head of Household for',0,NULL,NULL),(319,160,2,'a_b',177,'Spouse of',4,'Spouse of',0,NULL,NULL),(320,160,2,'b_a',4,'Spouse of',177,'Spouse of',0,NULL,NULL),(321,161,1,'a_b',148,'Child of',54,'Parent of',1,NULL,NULL),(322,161,1,'b_a',54,'Parent of',148,'Child of',1,NULL,NULL),(323,162,1,'a_b',109,'Child of',54,'Parent of',1,NULL,NULL),(324,162,1,'b_a',54,'Parent of',109,'Child of',1,NULL,NULL),(325,163,1,'a_b',148,'Child of',98,'Parent of',1,NULL,NULL),(326,163,1,'b_a',98,'Parent of',148,'Child of',1,NULL,NULL),(327,164,1,'a_b',109,'Child of',98,'Parent of',1,NULL,NULL),(328,164,1,'b_a',98,'Parent of',109,'Child of',1,NULL,NULL),(329,165,4,'a_b',109,'Sibling of',148,'Sibling of',1,NULL,NULL),(330,165,4,'b_a',148,'Sibling of',109,'Sibling of',1,NULL,NULL),(331,166,8,'a_b',98,'Household Member of',41,'Household Member is',1,NULL,NULL),(332,166,8,'b_a',41,'Household Member is',98,'Household Member of',1,NULL,NULL),(333,167,8,'a_b',148,'Household Member of',41,'Household Member is',1,NULL,NULL),(334,167,8,'b_a',41,'Household Member is',148,'Household Member of',1,NULL,NULL),(335,168,8,'a_b',109,'Household Member of',41,'Household Member is',1,NULL,NULL),(336,168,8,'b_a',41,'Household Member is',109,'Household Member of',1,NULL,NULL),(337,169,7,'a_b',54,'Head of Household for',41,'Head of Household is',1,NULL,NULL),(338,169,7,'b_a',41,'Head of Household is',54,'Head of Household for',1,NULL,NULL),(339,170,2,'a_b',98,'Spouse of',54,'Spouse of',1,NULL,NULL),(340,170,2,'b_a',54,'Spouse of',98,'Spouse of',1,NULL,NULL),(341,171,1,'a_b',71,'Child of',69,'Parent of',1,NULL,NULL),(342,171,1,'b_a',69,'Parent of',71,'Child of',1,NULL,NULL),(343,172,1,'a_b',107,'Child of',69,'Parent of',1,NULL,NULL),(344,172,1,'b_a',69,'Parent of',107,'Child of',1,NULL,NULL),(345,173,1,'a_b',71,'Child of',188,'Parent of',1,NULL,NULL),(346,173,1,'b_a',188,'Parent of',71,'Child of',1,NULL,NULL),(347,174,1,'a_b',107,'Child of',188,'Parent of',1,NULL,NULL),(348,174,1,'b_a',188,'Parent of',107,'Child of',1,NULL,NULL),(349,175,4,'a_b',107,'Sibling of',71,'Sibling of',1,NULL,NULL),(350,175,4,'b_a',71,'Sibling of',107,'Sibling of',1,NULL,NULL),(351,176,8,'a_b',188,'Household Member of',13,'Household Member is',1,NULL,NULL),(352,176,8,'b_a',13,'Household Member is',188,'Household Member of',1,NULL,NULL),(353,177,8,'a_b',71,'Household Member of',13,'Household Member is',1,NULL,NULL),(354,177,8,'b_a',13,'Household Member is',71,'Household Member of',1,NULL,NULL),(355,178,8,'a_b',107,'Household Member of',13,'Household Member is',1,NULL,NULL),(356,178,8,'b_a',13,'Household Member is',107,'Household Member of',1,NULL,NULL),(357,179,7,'a_b',69,'Head of Household for',13,'Head of Household is',0,NULL,NULL),(358,179,7,'b_a',13,'Head of Household is',69,'Head of Household for',0,NULL,NULL),(359,180,2,'a_b',188,'Spouse of',69,'Spouse of',0,NULL,NULL),(360,180,2,'b_a',69,'Spouse of',188,'Spouse of',0,NULL,NULL),(361,181,1,'a_b',80,'Child of',83,'Parent of',1,NULL,NULL),(362,181,1,'b_a',83,'Parent of',80,'Child of',1,NULL,NULL),(363,182,1,'a_b',169,'Child of',83,'Parent of',1,NULL,NULL),(364,182,1,'b_a',83,'Parent of',169,'Child of',1,NULL,NULL),(365,183,1,'a_b',80,'Child of',85,'Parent of',1,NULL,NULL),(366,183,1,'b_a',85,'Parent of',80,'Child of',1,NULL,NULL),(367,184,1,'a_b',169,'Child of',85,'Parent of',1,NULL,NULL),(368,184,1,'b_a',85,'Parent of',169,'Child of',1,NULL,NULL),(369,185,4,'a_b',169,'Sibling of',80,'Sibling of',1,NULL,NULL),(370,185,4,'b_a',80,'Sibling of',169,'Sibling of',1,NULL,NULL),(371,186,8,'a_b',85,'Household Member of',62,'Household Member is',1,NULL,NULL),(372,186,8,'b_a',62,'Household Member is',85,'Household Member of',1,NULL,NULL),(373,187,8,'a_b',80,'Household Member of',62,'Household Member is',1,NULL,NULL),(374,187,8,'b_a',62,'Household Member is',80,'Household Member of',1,NULL,NULL),(375,188,8,'a_b',169,'Household Member of',62,'Household Member is',1,NULL,NULL),(376,188,8,'b_a',62,'Household Member is',169,'Household Member of',1,NULL,NULL),(377,189,7,'a_b',83,'Head of Household for',62,'Head of Household is',1,NULL,NULL),(378,189,7,'b_a',62,'Head of Household is',83,'Head of Household for',1,NULL,NULL),(379,190,2,'a_b',85,'Spouse of',83,'Spouse of',1,NULL,NULL),(380,190,2,'b_a',83,'Spouse of',85,'Spouse of',1,NULL,NULL),(381,191,1,'a_b',5,'Child of',116,'Parent of',1,NULL,NULL),(382,191,1,'b_a',116,'Parent of',5,'Child of',1,NULL,NULL),(383,192,1,'a_b',140,'Child of',116,'Parent of',1,NULL,NULL),(384,192,1,'b_a',116,'Parent of',140,'Child of',1,NULL,NULL),(385,193,1,'a_b',5,'Child of',115,'Parent of',1,NULL,NULL),(386,193,1,'b_a',115,'Parent of',5,'Child of',1,NULL,NULL),(387,194,1,'a_b',140,'Child of',115,'Parent of',1,NULL,NULL),(388,194,1,'b_a',115,'Parent of',140,'Child of',1,NULL,NULL),(389,195,4,'a_b',140,'Sibling of',5,'Sibling of',1,NULL,NULL),(390,195,4,'b_a',5,'Sibling of',140,'Sibling of',1,NULL,NULL),(391,196,8,'a_b',115,'Household Member of',198,'Household Member is',1,NULL,NULL),(392,196,8,'b_a',198,'Household Member is',115,'Household Member of',1,NULL,NULL),(393,197,8,'a_b',5,'Household Member of',198,'Household Member is',1,NULL,NULL),(394,197,8,'b_a',198,'Household Member is',5,'Household Member of',1,NULL,NULL),(395,198,8,'a_b',140,'Household Member of',198,'Household Member is',1,NULL,NULL),(396,198,8,'b_a',198,'Household Member is',140,'Household Member of',1,NULL,NULL),(397,199,7,'a_b',116,'Head of Household for',198,'Head of Household is',1,NULL,NULL),(398,199,7,'b_a',198,'Head of Household is',116,'Head of Household for',1,NULL,NULL),(399,200,2,'a_b',115,'Spouse of',116,'Spouse of',1,NULL,NULL),(400,200,2,'b_a',116,'Spouse of',115,'Spouse of',1,NULL,NULL),(401,201,5,'a_b',4,'Employee of',15,'Employer of',1,NULL,NULL),(402,201,5,'b_a',15,'Employer of',4,'Employee of',1,NULL,NULL),(403,202,5,'a_b',153,'Employee of',21,'Employer of',1,NULL,NULL),(404,202,5,'b_a',21,'Employer of',153,'Employee of',1,NULL,NULL),(405,203,5,'a_b',52,'Employee of',23,'Employer of',1,NULL,NULL),(406,203,5,'b_a',23,'Employer of',52,'Employee of',1,NULL,NULL),(407,204,5,'a_b',169,'Employee of',39,'Employer of',1,NULL,NULL),(408,204,5,'b_a',39,'Employer of',169,'Employee of',1,NULL,NULL),(409,205,5,'a_b',110,'Employee of',70,'Employer of',1,NULL,NULL),(410,205,5,'b_a',70,'Employer of',110,'Employee of',1,NULL,NULL),(411,206,5,'a_b',28,'Employee of',73,'Employer of',1,NULL,NULL),(412,206,5,'b_a',73,'Employer of',28,'Employee of',1,NULL,NULL),(413,207,5,'a_b',54,'Employee of',74,'Employer of',1,NULL,NULL),(414,207,5,'b_a',74,'Employer of',54,'Employee of',1,NULL,NULL),(415,208,5,'a_b',85,'Employee of',77,'Employer of',1,NULL,NULL),(416,208,5,'b_a',77,'Employer of',85,'Employee of',1,NULL,NULL),(417,209,5,'a_b',87,'Employee of',93,'Employer of',1,NULL,NULL),(418,209,5,'b_a',93,'Employer of',87,'Employee of',1,NULL,NULL),(419,210,5,'a_b',78,'Employee of',101,'Employer of',1,NULL,NULL),(420,210,5,'b_a',101,'Employer of',78,'Employee of',1,NULL,NULL),(421,211,5,'a_b',24,'Employee of',102,'Employer of',1,NULL,NULL),(422,211,5,'b_a',102,'Employer of',24,'Employee of',1,NULL,NULL),(423,212,5,'a_b',175,'Employee of',103,'Employer of',1,NULL,NULL),(424,212,5,'b_a',103,'Employer of',175,'Employee of',1,NULL,NULL),(425,213,5,'a_b',111,'Employee of',129,'Employer of',1,NULL,NULL),(426,213,5,'b_a',129,'Employer of',111,'Employee of',1,NULL,NULL),(427,214,5,'a_b',3,'Employee of',165,'Employer of',1,NULL,NULL),(428,214,5,'b_a',165,'Employer of',3,'Employee of',1,NULL,NULL),(429,215,5,'a_b',12,'Employee of',167,'Employer of',1,NULL,NULL),(430,215,5,'b_a',167,'Employer of',12,'Employee of',1,NULL,NULL),(431,216,5,'a_b',91,'Employee of',170,'Employer of',1,NULL,NULL),(432,216,5,'b_a',170,'Employer of',91,'Employee of',1,NULL,NULL),(433,217,5,'a_b',147,'Employee of',172,'Employer of',1,NULL,NULL),(434,217,5,'b_a',172,'Employer of',147,'Employee of',1,NULL,NULL);
 /*!40000 ALTER TABLE `civicrm_relationship_cache` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1347,7 +1347,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_subscription_history` WRITE;
 /*!40000 ALTER TABLE `civicrm_subscription_history` DISABLE KEYS */;
-INSERT INTO `civicrm_subscription_history` (`id`, `contact_id`, `group_id`, `date`, `method`, `status`, `tracking`) VALUES (1,94,2,'2020-02-24 21:34:18','Email','Added',NULL),(2,105,2,'2020-08-11 05:04:20','Email','Added',NULL),(3,25,2,'2019-11-04 22:08:34','Email','Added',NULL),(4,117,2,'2020-05-23 21:35:14','Admin','Added',NULL),(5,99,2,'2020-07-28 00:56:26','Email','Added',NULL),(6,145,2,'2020-02-05 20:35:11','Email','Added',NULL),(7,30,2,'2020-01-06 16:35:10','Admin','Added',NULL),(8,194,2,'2020-06-20 05:18:39','Admin','Added',NULL),(9,103,2,'2020-02-29 04:54:27','Email','Added',NULL),(10,177,2,'2019-12-31 13:59:56','Email','Added',NULL),(11,85,2,'2020-07-01 15:02:48','Admin','Added',NULL),(12,54,2,'2020-07-21 17:15:05','Email','Added',NULL),(13,185,2,'2020-05-10 15:26:42','Email','Added',NULL),(14,130,2,'2020-04-06 17:52:01','Email','Added',NULL),(15,152,2,'2020-02-25 08:46:39','Email','Added',NULL),(16,102,2,'2019-09-24 19:09:22','Admin','Added',NULL),(17,122,2,'2020-06-04 06:50:22','Email','Added',NULL),(18,65,2,'2019-09-29 16:20:16','Admin','Added',NULL),(19,201,2,'2020-02-19 04:12:33','Admin','Added',NULL),(20,86,2,'2020-01-13 16:10:10','Admin','Added',NULL),(21,142,2,'2020-07-08 17:00:37','Admin','Added',NULL),(22,70,2,'2019-09-21 02:11:21','Email','Added',NULL),(23,141,2,'2020-02-15 21:32:32','Admin','Added',NULL),(24,126,2,'2020-06-19 11:28:07','Email','Added',NULL),(25,39,2,'2020-05-22 12:12:10','Email','Added',NULL),(26,110,2,'2019-11-14 06:48:44','Email','Added',NULL),(27,170,2,'2019-12-21 12:13:05','Admin','Added',NULL),(28,169,2,'2020-03-04 17:43:21','Email','Added',NULL),(29,200,2,'2020-09-15 04:02:51','Admin','Added',NULL),(30,23,2,'2020-08-30 07:55:26','Email','Added',NULL),(31,91,2,'2020-01-13 00:53:36','Email','Added',NULL),(32,51,2,'2020-07-21 12:31:06','Email','Added',NULL),(33,92,2,'2020-04-09 20:36:58','Email','Added',NULL),(34,150,2,'2019-09-29 02:51:16','Admin','Added',NULL),(35,104,2,'2020-05-02 10:11:59','Admin','Added',NULL),(36,43,2,'2020-04-08 14:26:27','Admin','Added',NULL),(37,198,2,'2019-12-29 07:31:09','Email','Added',NULL),(38,17,2,'2020-01-23 21:29:19','Email','Added',NULL),(39,179,2,'2019-12-14 02:31:00','Email','Added',NULL),(40,197,2,'2020-01-24 11:05:55','Email','Added',NULL),(41,88,2,'2020-02-23 03:08:37','Admin','Added',NULL),(42,21,2,'2020-04-28 20:40:32','Email','Added',NULL),(43,127,2,'2020-05-13 22:00:47','Email','Added',NULL),(44,59,2,'2020-03-01 06:39:03','Admin','Added',NULL),(45,176,2,'2020-04-24 16:58:38','Email','Added',NULL),(46,118,2,'2020-04-24 01:25:34','Admin','Added',NULL),(47,156,2,'2020-01-27 11:43:34','Email','Added',NULL),(48,111,2,'2020-02-08 11:22:02','Admin','Added',NULL),(49,19,2,'2020-05-01 19:14:19','Email','Added',NULL),(50,166,2,'2020-02-03 10:31:08','Admin','Added',NULL),(51,180,2,'2020-03-16 19:38:07','Admin','Added',NULL),(52,12,2,'2020-01-22 08:27:03','Admin','Added',NULL),(53,193,2,'2020-08-22 00:15:05','Admin','Added',NULL),(54,3,2,'2020-01-15 10:22:11','Email','Added',NULL),(55,132,2,'2019-10-02 03:47:25','Email','Added',NULL),(56,57,2,'2019-12-30 03:38:04','Email','Added',NULL),(57,144,2,'2020-05-27 18:23:32','Admin','Added',NULL),(58,191,2,'2020-07-21 19:58:58','Admin','Added',NULL),(59,157,2,'2020-03-31 12:07:31','Admin','Added',NULL),(60,46,2,'2020-01-29 17:18:27','Admin','Added',NULL),(61,81,3,'2020-02-16 23:57:48','Email','Added',NULL),(62,129,3,'2020-08-26 12:56:28','Admin','Added',NULL),(63,109,3,'2019-11-14 10:36:15','Email','Added',NULL),(64,52,3,'2020-03-12 23:02:56','Email','Added',NULL),(65,28,3,'2020-03-20 23:53:01','Email','Added',NULL),(66,146,3,'2020-08-10 23:36:49','Email','Added',NULL),(67,107,3,'2020-07-21 21:17:56','Admin','Added',NULL),(68,27,3,'2019-09-26 05:59:46','Email','Added',NULL),(69,47,3,'2020-03-13 22:06:15','Email','Added',NULL),(70,158,3,'2020-06-06 08:27:20','Admin','Added',NULL),(71,167,3,'2020-01-10 07:50:32','Email','Added',NULL),(72,106,3,'2020-07-28 15:28:51','Admin','Added',NULL),(73,199,3,'2020-01-07 18:37:07','Admin','Added',NULL),(74,136,3,'2020-06-17 12:12:18','Email','Added',NULL),(75,41,3,'2020-08-04 13:01:10','Email','Added',NULL),(76,94,4,'2020-08-28 08:06:19','Email','Added',NULL),(77,194,4,'2020-05-03 11:20:03','Email','Added',NULL),(78,152,4,'2020-09-07 18:45:04','Admin','Added',NULL),(79,70,4,'2019-10-18 17:30:08','Email','Added',NULL),(80,200,4,'2019-12-07 10:13:20','Admin','Added',NULL),(81,43,4,'2020-01-30 08:39:01','Admin','Added',NULL),(82,127,4,'2020-05-05 06:29:00','Email','Added',NULL),(83,166,4,'2019-11-10 23:48:58','Email','Added',NULL);
+INSERT INTO `civicrm_subscription_history` (`id`, `contact_id`, `group_id`, `date`, `method`, `status`, `tracking`) VALUES (1,79,2,'2020-01-22 13:31:46','Admin','Added',NULL),(2,47,2,'2019-12-13 18:51:02','Admin','Added',NULL),(3,51,2,'2020-05-23 23:30:41','Admin','Added',NULL),(4,118,2,'2020-03-26 14:17:12','Admin','Added',NULL),(5,34,2,'2020-02-27 11:33:43','Admin','Added',NULL),(6,7,2,'2020-06-19 17:25:43','Admin','Added',NULL),(7,44,2,'2020-08-27 08:50:27','Admin','Added',NULL),(8,139,2,'2020-01-14 04:47:50','Email','Added',NULL),(9,99,2,'2020-06-13 04:50:54','Email','Added',NULL),(10,126,2,'2020-01-22 00:26:10','Admin','Added',NULL),(11,17,2,'2020-02-03 11:02:29','Admin','Added',NULL),(12,78,2,'2020-05-04 01:43:48','Admin','Added',NULL),(13,64,2,'2020-01-31 02:56:19','Admin','Added',NULL),(14,12,2,'2019-09-26 09:00:38','Admin','Added',NULL),(15,87,2,'2019-12-23 08:43:59','Email','Added',NULL),(16,88,2,'2020-02-04 10:50:45','Email','Added',NULL),(17,9,2,'2020-07-01 08:26:48','Admin','Added',NULL),(18,55,2,'2020-04-01 21:43:28','Admin','Added',NULL),(19,132,2,'2020-03-25 10:56:29','Admin','Added',NULL),(20,173,2,'2020-08-07 02:07:47','Email','Added',NULL),(21,104,2,'2019-09-23 10:04:58','Admin','Added',NULL),(22,91,2,'2020-05-20 23:44:42','Email','Added',NULL),(23,100,2,'2020-05-12 03:57:07','Email','Added',NULL),(24,65,2,'2019-10-29 15:18:03','Admin','Added',NULL),(25,38,2,'2020-08-13 00:41:18','Email','Added',NULL),(26,36,2,'2020-04-29 15:42:35','Admin','Added',NULL),(27,11,2,'2020-01-23 10:13:54','Admin','Added',NULL),(28,201,2,'2020-07-01 16:40:40','Admin','Added',NULL),(29,181,2,'2019-10-13 23:55:12','Admin','Added',NULL),(30,192,2,'2020-08-31 02:44:31','Email','Added',NULL),(31,32,2,'2019-11-30 00:12:09','Email','Added',NULL),(32,168,2,'2020-04-30 07:51:14','Email','Added',NULL),(33,164,2,'2019-12-06 07:30:34','Email','Added',NULL),(34,160,2,'2019-10-15 21:24:04','Email','Added',NULL),(35,92,2,'2020-05-19 10:04:53','Admin','Added',NULL),(36,94,2,'2020-04-26 02:19:16','Email','Added',NULL),(37,119,2,'2019-09-18 04:55:47','Admin','Added',NULL),(38,8,2,'2020-08-02 05:50:02','Email','Added',NULL),(39,60,2,'2020-01-17 10:46:13','Email','Added',NULL),(40,133,2,'2020-07-17 18:32:07','Email','Added',NULL),(41,42,2,'2020-07-30 14:40:53','Email','Added',NULL),(42,154,2,'2020-07-29 11:28:43','Admin','Added',NULL),(43,125,2,'2020-06-21 01:09:47','Admin','Added',NULL),(44,197,2,'2020-03-28 10:38:21','Email','Added',NULL),(45,171,2,'2020-05-19 01:57:03','Email','Added',NULL),(46,152,2,'2020-03-17 15:28:59','Email','Added',NULL),(47,112,2,'2020-04-11 09:21:31','Email','Added',NULL),(48,108,2,'2019-10-09 18:38:57','Admin','Added',NULL),(49,194,2,'2019-09-29 15:39:45','Email','Added',NULL),(50,190,2,'2020-03-06 10:41:12','Admin','Added',NULL),(51,162,2,'2019-10-06 09:20:01','Email','Added',NULL),(52,14,2,'2019-10-24 09:47:30','Email','Added',NULL),(53,187,2,'2020-06-04 10:38:11','Email','Added',NULL),(54,183,2,'2020-02-18 08:41:20','Admin','Added',NULL),(55,191,2,'2020-09-11 19:39:03','Admin','Added',NULL),(56,31,2,'2020-04-06 06:55:05','Admin','Added',NULL),(57,130,2,'2019-10-27 03:53:29','Email','Added',NULL),(58,184,2,'2020-02-20 00:31:02','Admin','Added',NULL),(59,59,2,'2020-02-17 07:30:42','Email','Added',NULL),(60,46,2,'2020-02-09 08:13:38','Email','Added',NULL),(61,193,3,'2020-06-06 16:15:04','Admin','Added',NULL),(62,16,3,'2020-05-02 10:49:41','Admin','Added',NULL),(63,199,3,'2020-06-05 17:22:07','Admin','Added',NULL),(64,114,3,'2020-02-26 06:40:38','Email','Added',NULL),(65,61,3,'2019-12-16 10:52:05','Email','Added',NULL),(66,33,3,'2019-09-30 02:27:58','Admin','Added',NULL),(67,86,3,'2019-12-04 06:19:11','Admin','Added',NULL),(68,182,3,'2020-08-19 17:11:21','Email','Added',NULL),(69,151,3,'2020-01-28 14:29:31','Email','Added',NULL),(70,137,3,'2020-05-17 06:12:26','Email','Added',NULL),(71,189,3,'2020-08-26 17:54:20','Admin','Added',NULL),(72,35,3,'2020-08-28 04:52:00','Admin','Added',NULL),(73,117,3,'2020-01-27 16:51:48','Admin','Added',NULL),(74,147,3,'2020-08-27 19:30:21','Email','Added',NULL),(75,28,3,'2020-05-20 09:52:21','Admin','Added',NULL),(76,79,4,'2020-05-07 21:30:06','Admin','Added',NULL),(77,139,4,'2020-03-22 23:56:36','Admin','Added',NULL),(78,87,4,'2020-04-05 03:56:25','Email','Added',NULL),(79,91,4,'2020-08-29 17:30:44','Email','Added',NULL),(80,181,4,'2020-08-25 00:37:37','Email','Added',NULL),(81,94,4,'2020-07-25 20:01:49','Admin','Added',NULL),(82,125,4,'2020-03-09 02:04:45','Admin','Added',NULL),(83,190,4,'2020-07-14 23:39:38','Admin','Added',NULL);
 /*!40000 ALTER TABLE `civicrm_subscription_history` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1443,7 +1443,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_website` WRITE;
 /*!40000 ALTER TABLE `civicrm_website` DISABLE KEYS */;
-INSERT INTO `civicrm_website` (`id`, `contact_id`, `url`, `website_type_id`) VALUES (1,69,'http://starkvillepoetrynetwork.org',1),(2,66,'http://minnesotaculturepartnership.org',1),(3,84,'http://arizonatrust.org',1),(4,121,'http://hadleyempowermentcenter.org',1),(5,9,'http://virginiacenter.org',1),(6,8,'http://northpointartsinitiative.org',1),(7,155,'http://oklahomaenvironmental.org',1),(8,101,'http://louisianahealthfellowship.org',1),(9,20,'http://mcintyreschool.org',1),(10,114,'http://communityhealth.org',1),(11,134,'http://sdenvironmentalpartnership.org',1),(12,10,'http://ruralpartnership.org',1),(13,55,'http://svadvocacyalliance.org',1),(14,149,'http://maineducation.org',1),(15,128,'http://mlkingadvocacy.org',1);
+INSERT INTO `civicrm_website` (`id`, `contact_id`, `url`, `website_type_id`) VALUES (1,172,'http://cadellhealth.org',1),(2,103,'http://dameronenvironmentalservices.org',1),(3,15,'http://dowlenagricultureinitiative.org',1),(4,149,'http://baypartnership.org',1),(5,39,'http://jacksonsystems.org',1),(6,21,'http://indianapartnership.org',1),(7,167,'http://kansasalliance.org',1),(8,101,'http://communityinitiative.org',1),(9,102,'http://fairbankslegalsystems.org',1),(10,23,'http://watervilleassociation.org',1),(11,161,'http://beechfoodpartnership.org',1),(12,93,'http://wdlegalsolutions.org',1),(13,49,'http://ruraladvocacysolutions.org',1),(14,170,'http://caulderfund.org',1),(15,129,'http://maplenetwork.org',1),(16,165,'http://williamsburgsoftware.org',1),(17,77,'http://paragonahservices.org',1);
 /*!40000 ALTER TABLE `civicrm_website` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1475,7 +1475,7 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-09-16 13:29:33
+-- Dump completed on 2020-09-16 19:54:44
 -- +--------------------------------------------------------------------+
 -- | Copyright CiviCRM LLC. All rights reserved.                        |
 -- |                                                                    |

From 94912cc341b33b08265f1d39dd892b213a5ed73f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 03:36:12 -0700
Subject: [PATCH 662/834] composer.json - Update composer-compile-plugin

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a8b3d45c1121..94a752d62483 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,7 @@
     "pear/db": "1.10",
     "scssphp/scssphp": "~1.2",
     "padaliyajay/php-autoprefixer": "~1.2",
-    "civicrm/composer-compile-plugin": "~0.5"
+    "civicrm/composer-compile-plugin": "~0.6"
   },
   "scripts": {
     "post-install-cmd": [

From 266691fdd23a6679b6700c5558f2ef51a9daa50e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 03:37:05 -0700
Subject: [PATCH 663/834] composer.json - Move greenwich-specific rules into
 the greenwich folder

---
 composer.json                       | 10 +---------
 ext/greenwich/composer.compile.json | 11 +++++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 ext/greenwich/composer.compile.json

diff --git a/composer.json b/composer.json
index 94a752d62483..da8da1a5244a 100644
--- a/composer.json
+++ b/composer.json
@@ -283,14 +283,6 @@
         "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
       }
     },
-    "compile": [
-      {
-        "title": "Greenwich SCSS (<comment>ext/greenwich/dist/bootstrap3.css</comment>)",
-        "php-method": "\\Civi\\Compile\\Scss::build",
-        "watch-files": ["ext/greenwich/scss"],
-        "scss-files": {"ext/greenwich/scss/main.scss": "ext/greenwich/dist/bootstrap3.css"},
-        "scss-includes": ["ext/greenwich/scss", "ext/greenwich/extern/bootstrap3/assets/stylesheets"]
-      }
-    ]
+    "compile-includes": ["ext/greenwich/composer.compile.json"]
   }
 }
diff --git a/ext/greenwich/composer.compile.json b/ext/greenwich/composer.compile.json
new file mode 100644
index 000000000000..a731b607fb22
--- /dev/null
+++ b/ext/greenwich/composer.compile.json
@@ -0,0 +1,11 @@
+{
+  "compile": [
+    {
+      "title": "Greenwich CSS (<comment>dist/bootstrap3.css</comment>)",
+      "php-method": "\\Civi\\Compile\\Scss::build",
+      "watch-files": ["scss"],
+      "scss-files": {"scss/main.scss": "dist/bootstrap3.css"},
+      "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets"]
+    }
+  ]
+}

From 2a805b27da7a2cc6323b58c26bb44c1f27de220d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Sep 2020 03:38:06 -0700
Subject: [PATCH 664/834] composer.lock - Update composer-compile-plugin

---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index ffdd004acaf0..66e59d5c7616 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f79e56e87de0eb48bf9336b368a467ab",
+    "content-hash": "0a66565129698ff5013c06514c11c6a5",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -299,16 +299,16 @@
         },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.5",
+            "version": "v0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "8650ca03bbb094bc88a966651a623fbd09ca19ab"
+                "reference": "2f6925745d9d4b3857cc23b2842a2c3db6d66c57"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/8650ca03bbb094bc88a966651a623fbd09ca19ab",
-                "reference": "8650ca03bbb094bc88a966651a623fbd09ca19ab",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/2f6925745d9d4b3857cc23b2842a2c3db6d66c57",
+                "reference": "2f6925745d9d4b3857cc23b2842a2c3db6d66c57",
                 "shasum": ""
             },
             "require": {
@@ -340,7 +340,7 @@
                 }
             ],
             "description": "Define a 'compile' event for all packages in the dependency-graph",
-            "time": "2020-09-14T07:52:16+00:00"
+            "time": "2020-09-14T10:26:03+00:00"
         },
         {
             "name": "civicrm/composer-downloads-plugin",

From a725865da460020ddb9cd1ce82974a5b985702a6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 12:41:59 +1200
Subject: [PATCH 665/834] dev/core#2039 Fix OpenID::add to ensure is_primary is
 set

In my efforts to determine the the non-performant line of code that makes sure IM is set is
not required I edited tests to track down when is_primary is not correct & determined it
is missing from the add function - same as https://github.com/civicrm/civicrm-core/pull/18489 for IM
---
 CRM/Core/BAO/OpenID.php             | 8 ++++++++
 tests/phpunit/api/v3/OpenIDTest.php | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/CRM/Core/BAO/OpenID.php b/CRM/Core/BAO/OpenID.php
index 34326a756257..db14b57eec42 100644
--- a/CRM/Core/BAO/OpenID.php
+++ b/CRM/Core/BAO/OpenID.php
@@ -24,9 +24,16 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID {
    * Create or update OpenID record.
    *
    * @param array $params
+   *
    * @return CRM_Core_DAO_OpenID
+   *
+   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
    */
   public static function add($params) {
+    if (empty($params['id']) || is_numeric($params['is_primary'] ?? NULL)) {
+      CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
+    }
     return self::writeRecord($params);
   }
 
@@ -38,6 +45,7 @@ public static function add($params) {
    *   Input parameters to find object.
    *
    * @return mixed
+   * @throws \CRM_Core_Exception
    */
   public static function &getValues($entityBlock) {
     return CRM_Core_BAO_Block::getValues('openid', $entityBlock);
diff --git a/tests/phpunit/api/v3/OpenIDTest.php b/tests/phpunit/api/v3/OpenIDTest.php
index a3025e805bcc..5c554ab006d7 100644
--- a/tests/phpunit/api/v3/OpenIDTest.php
+++ b/tests/phpunit/api/v3/OpenIDTest.php
@@ -18,6 +18,13 @@
  */
 class api_v3_OpenIDTest extends CiviUnitTestCase {
 
+  /**
+   * Should location types be checked to ensure primary addresses are correctly assigned after each test.
+   *
+   * @var bool
+   */
+  protected $isLocationTypesOnPostAssert = TRUE;
+
   protected $_params;
   protected $id;
   protected $_entity;

From 1e809f0e627d099b41f47195e6e4ff39500e2429 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 15:01:21 +1200
Subject: [PATCH 666/834] [REF] Minor code extraction

This extracts code to the MergeHandler class for deduping locations. We have a LOT of
test cover here with all the scenarios in jobTest::testBatchMergesAddresses & other functions
using that same data provider.

The goal is to refactor the code onto the MergeHandler class, with a view to
doing less variable passing & more property-using to help clean it up -
in this case it's already visible that 2 variables can be derived in the mergeHandler:
---
 CRM/Dedupe/MergeHandler.php | 35 +++++++++++++++++++++++++++++++++++
 CRM/Dedupe/Merger.php       | 18 +-----------------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/CRM/Dedupe/MergeHandler.php b/CRM/Dedupe/MergeHandler.php
index 6b86b2f9b91d..f67371d6e081 100644
--- a/CRM/Dedupe/MergeHandler.php
+++ b/CRM/Dedupe/MergeHandler.php
@@ -190,4 +190,39 @@ public function getLocationBlocksToMerge(): array {
     return $locBlocks;
   }
 
+  /**
+   * Copy the data to be moved to a new DAO object.
+   *
+   * This is intended as a refactoring step - not the long term function. Do not
+   * call from any function other than the one it is taken from (Merger::mergeLocations).
+   *
+   * @param string $daoName
+   * @param int $otherBlockId
+   * @param string $name
+   * @param int $blkCount
+   *
+   * @return mixed
+   */
+  public function copyDataToNewBlockDAO(string $daoName, $otherBlockId, $name, $blkCount) {
+    $locationBlocks = CRM_Dedupe_Merger::getLocationBlockInfo();
+    $migrationInfo = $this->getMigrationInfo();
+    // For the block which belongs to other-contact, link the location block to main-contact
+    $otherBlockDAO = new $daoName();
+    $otherBlockDAO->contact_id = $this->getToKeepID();
+
+    // Get the ID of this block on the 'other' contact, otherwise skip
+    $otherBlockDAO->id = $otherBlockId;
+
+    // Add/update location and type information from the form, if applicable
+    if ($locationBlocks[$name]['hasLocation']) {
+      $locTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['locTypeId'] ?? NULL;
+      $otherBlockDAO->location_type_id = $locTypeId;
+    }
+    if ($locationBlocks[$name]['hasType']) {
+      $typeTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['typeTypeId'] ?? NULL;
+      $otherBlockDAO->{$locationBlocks[$name]['hasType']} = $typeTypeId;
+    }
+    return $otherBlockDAO;
+  }
+
 }
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 69827f16192f..d72c62414586 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1820,23 +1820,7 @@ public static function mergeLocations($mergeHandler) {
           if (!$otherBlockId) {
             continue;
           }
-
-          // For the block which belongs to other-contact, link the location block to main-contact
-          $otherBlockDAO = new $daoName();
-          $otherBlockDAO->contact_id = $mergeHandler->getToKeepID();
-
-          // Get the ID of this block on the 'other' contact, otherwise skip
-          $otherBlockDAO->id = $otherBlockId;
-
-          // Add/update location and type information from the form, if applicable
-          if ($locationBlocks[$name]['hasLocation']) {
-            $locTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['locTypeId'] ?? NULL;
-            $otherBlockDAO->location_type_id = $locTypeId;
-          }
-          if ($locationBlocks[$name]['hasType']) {
-            $typeTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['typeTypeId'] ?? NULL;
-            $otherBlockDAO->{$locationBlocks[$name]['hasType']} = $typeTypeId;
-          }
+          $otherBlockDAO = $mergeHandler->copyDataToNewBlockDAO($daoName, $otherBlockId, $name, $blkCount);
 
           // If we're deliberately setting this as primary then add the flag
           // and remove it from the current primary location (if there is one).

From b19b754f068630aec094d6b0e031b3640a35cdb8 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 16:22:20 +1200
Subject: [PATCH 667/834] dev/core#2039 Fix test to use set up method with more
 data integrity

Using the api rather than CRM_Core_DAO::createTestObject to create the phone ensures it is created with is_primary.

We might need to fix CRM_Core_DAO::createTestObject but for this case simply using the api suffices
---
 tests/phpunit/api/v3/ACLPermissionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index 36b2a8aea757..fdbdabea1c3c 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -31,7 +31,7 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase {
   public function setUp() {
     parent::setUp();
     CRM_Core_DAO::createTestObject('CRM_Pledge_BAO_Pledge', [], 1, 0);
-    CRM_Core_DAO::createTestObject('CRM_Core_BAO_Phone', [], 1, 0);
+    $this->callAPISuccess('Phone', 'create', ['id' => $this->individualCreate(['email' => '']), 'phone' => '911', 'location_type_id' => 'Home']);
     $this->prepareForACLs();
   }
 

From 3420384b5407ce87803320ddcb3a0bb8979ada00 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Thu, 17 Sep 2020 15:09:42 -0400
Subject: [PATCH 668/834] names shouldn't be squished together in activity
 details field

---
 CRM/Contact/Form/Task/EmailTrait.php                    | 8 ++++----
 templates/CRM/Activity/Form/ActivityView.tpl            | 2 +-
 tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
index fb5e6ff51289..c426d8d4bb19 100644
--- a/CRM/Contact/Form/Task/EmailTrait.php
+++ b/CRM/Contact/Form/Task/EmailTrait.php
@@ -558,12 +558,12 @@ protected function getEmailString(array $emailIDs): string {
    *   e.g. <a href='{$contactURL}'>Bob Smith</a>'
    */
   protected function getEmailUrlString(array $emailIDs): string {
-    $urlString = '';
+    $urls = [];
     foreach ($emailIDs as $email) {
-      $contactURL = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'force' => 1, 'cid' => $this->contactEmails[$email]['contact_id']], TRUE);
-      $urlString .= "<a href='{$contactURL}'>" . $this->contactEmails[$email]['contact.display_name'] . '</a>';
+      $contactURL = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'cid' => $this->contactEmails[$email]['contact_id']], TRUE);
+      $urls[] = "<a href='{$contactURL}'>" . $this->contactEmails[$email]['contact.display_name'] . '</a>';
     }
-    return $urlString;
+    return implode(', ', $urls);
   }
 
   /**
diff --git a/templates/CRM/Activity/Form/ActivityView.tpl b/templates/CRM/Activity/Form/ActivityView.tpl
index 4f68416e217b..b0a02df612d4 100644
--- a/templates/CRM/Activity/Form/ActivityView.tpl
+++ b/templates/CRM/Activity/Form/ActivityView.tpl
@@ -119,7 +119,7 @@
             </tr>
         {else}
              <tr>
-                 <td class="label">{ts}Details{/ts}</td><td class="view-value report">{$values.details|crmStripAlternatives|nl2br}</td>
+                 <td class="label">{ts}Details{/ts}</td><td class="view-value report">{$values.details|crmStripAlternatives|purify|nl2br}</td>
              </tr>
         {/if}
 {if $values.attachment}
diff --git a/tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php b/tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php
index b13676101089..f717c39cb961 100644
--- a/tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php
+++ b/tests/phpunit/CRM/Contact/Form/Task/EmailCommonTest.php
@@ -120,9 +120,9 @@ public function testPostProcessWithSignature() {
     ]);
     $mut->stop();
     $activity = Activity::get(FALSE)->setSelect(['details'])->execute()->first();
-    $bccUrl1 = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'force' => 1, 'cid' => $bcc1], TRUE);
-    $bccUrl2 = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'force' => 1, 'cid' => $bcc2], TRUE);
-    $this->assertContains("bcc : <a href='" . $bccUrl1 . "'>Mr. Anthony Anderson II</a><a href='" . $bccUrl2 . "'>Mr. Anthony Anderson II</a>", $activity['details']);
+    $bccUrl1 = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'cid' => $bcc1], TRUE);
+    $bccUrl2 = CRM_Utils_System::url('civicrm/contact/view', ['reset' => 1, 'cid' => $bcc2], TRUE);
+    $this->assertContains("bcc : <a href='" . $bccUrl1 . "'>Mr. Anthony Anderson II</a>, <a href='" . $bccUrl2 . "'>Mr. Anthony Anderson II</a>", $activity['details']);
     $this->assertEquals([
       [
         'text' => '27 messages were sent successfully. ',

From 988725035b0f82e76ff23e330253c021dd226950 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 17 Sep 2020 14:40:38 -0400
Subject: [PATCH 669/834] Remove deprecated hook_civicrm_tabs

This hook has been deprecated for 5 years. Time to remove it.
---
 CRM/Contact/Page/View/Summary.php |  3 +--
 CRM/Utils/Hook.php                | 17 -----------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php
index a9f61ee85c27..e173a8df5487 100644
--- a/CRM/Contact/Page/View/Summary.php
+++ b/CRM/Contact/Page/View/Summary.php
@@ -425,9 +425,8 @@ public function getTabs() {
       $weight += 10;
     }
 
+    // Allow other modules to add or remove tabs
     $context = ['contact_id' => $this->_contactId];
-    // see if any other modules want to add any tabs
-    CRM_Utils_Hook::tabs($allTabs, $this->_contactId);
     CRM_Utils_Hook::tabset('civicrm/contact/view', $allTabs, $context);
 
     // now sort the tabs based on weight
diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php
index 17532b2bb8b8..7a79fdbf0b9b 100644
--- a/CRM/Utils/Hook.php
+++ b/CRM/Utils/Hook.php
@@ -825,23 +825,6 @@ public static function buildStateProvinceForCountry($countryID, &$states) {
     );
   }
 
-  /**
-   * This hook is called when rendering the tabs for a contact (q=civicrm/contact/view)c
-   *
-   * @param array $tabs
-   *   The array of tabs that will be displayed.
-   * @param int $contactID
-   *   The contactID for whom the dashboard is being rendered.
-   *
-   * @return null
-   * @deprecated Use tabset() instead.
-   */
-  public static function tabs(&$tabs, $contactID) {
-    return self::singleton()->invoke(['tabs', 'contactID'], $tabs, $contactID,
-      self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_tabs'
-    );
-  }
-
   /**
    * This hook is called when rendering the tabs used for events and potentially
    * contribution pages, etc.

From 9b9335ede7d43aa29156082c64f5a96ebba8cc90 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 16 Sep 2020 15:45:47 +1200
Subject: [PATCH 670/834] dev/core#1973 Fix Email & Phone storage issues in
 event location

---
 CRM/Event/Form/ManageEvent/Location.php       |  44 ++++---
 .../Contact/Import/Form/DataSourceTest.php    |   2 +-
 .../Event/Form/ManageEvent/LocationTest.php   | 123 ++++++++++++++++++
 tests/phpunit/CiviTest/CiviUnitTestCase.php   |   4 +-
 4 files changed, 151 insertions(+), 22 deletions(-)
 create mode 100644 tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php

diff --git a/CRM/Event/Form/ManageEvent/Location.php b/CRM/Event/Form/ManageEvent/Location.php
index 61145c3d560b..12d6c73862e4 100644
--- a/CRM/Event/Form/ManageEvent/Location.php
+++ b/CRM/Event/Form/ManageEvent/Location.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Event;
+
 /**
  *
  *
@@ -22,6 +24,11 @@
  */
 class CRM_Event_Form_ManageEvent_Location extends CRM_Event_Form_ManageEvent {
 
+  /**
+   * @var \Civi\Api4\Generic\Result
+   */
+  protected $locationBlock;
+
   /**
    * How many locationBlocks should we display?
    *
@@ -143,9 +150,11 @@ public function buildQuickForm() {
     $this->assign('action', $this->_action);
 
     if ($this->_id) {
-      $this->_oldLocBlockId = CRM_Core_DAO::getFieldValue('CRM_Event_DAO_Event',
-        $this->_id, 'loc_block_id'
-      );
+      $this->locationBlock = Event::get()
+        ->addWhere('id', '=', $this->_id)
+        ->setSelect(['loc_block.*', 'loc_block_id'])
+        ->execute()->first();
+      $this->_oldLocBlockId = $this->locationBlock['loc_block_id'];
     }
 
     // get the list of location blocks being used by other events
@@ -211,7 +220,6 @@ public function postProcess() {
       );
     }
 
-    $this->_values['address'] = $this->_values['phone'] = $this->_values['email'] = [];
     // if 'create new loc' option is selected OR selected new loc is different
     // from old one, go ahead and delete the old loc provided thats not being
     // used by any other event
@@ -223,22 +231,20 @@ public function postProcess() {
     $params['entity_table'] = 'civicrm_event';
     $params['entity_id'] = $this->_id;
 
-    $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
+    $isUpdateToExistingLocationBlock = !empty($params['loc_event_id']) && (int) $params['loc_event_id'] === $this->locationBlock['loc_block_id'];
+    // It should be impossible for there to be no default location type. Consider removing this handling
+    $defaultLocationTypeID = CRM_Core_BAO_LocationType::getDefault()->id ?? 1;
     foreach ([
-      'address',
-      'phone',
-      'email',
-    ] as $block) {
-      if (empty($params[$block]) || !is_array($params[$block])) {
-        continue;
-      }
-      foreach ($params[$block] as $count => & $values) {
-        if ($count == 1) {
-          $values['is_primary'] = 1;
-        }
-        $values['location_type_id'] = ($defaultLocationType->id) ? $defaultLocationType->id : 1;
-        if (isset($this->_values[$block][$count])) {
-          $values['id'] = $this->_values[$block][$count]['id'];
+      'address' => $params['address'],
+      'phone' => $params['phone'],
+      'email' => $params['email'],
+    ] as $block => $locationEntities) {
+      $params[$block][1]['is_primary'] = 1;
+      foreach ($locationEntities as $index => $locationEntity) {
+        $params[$block][$index]['location_type_id'] = $defaultLocationTypeID;
+        $fieldKey = (int) $index === 1 ? '_id' : '_2_id';
+        if ($isUpdateToExistingLocationBlock && !empty($this->locationBlock['loc_block.' . $block . $fieldKey])) {
+          $params[$block][$index]['id'] = $this->locationBlock['loc_block.' . $block . $fieldKey];
         }
       }
     }
diff --git a/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php b/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php
index 4fe0097e160c..68056c7e2d97 100644
--- a/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Form/DataSourceTest.php
@@ -40,7 +40,7 @@ public function testBuildForm() {
   public function testSQLSource() {
     $this->callAPISuccess('Mapping', 'create', ['name' => 'Well dressed ducks', 'mapping_type_id' => 'Import Contact']);
     /** @var CRM_Import_DataSource_SQL $form */
-    $form = $this->getFormObject('CRM_Import_DataSource_SQL');
+    $form = $this->getFormObject('CRM_Import_DataSource_SQL', [], 'SQL');
     $coreForm = $this->getFormObject('CRM_Core_Form');
     $db = NULL;
     $params = ['sqlQuery' => 'SELECT 1 as id'];
diff --git a/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php b/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
new file mode 100644
index 000000000000..1767a26c815e
--- /dev/null
+++ b/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
@@ -0,0 +1,123 @@
+<?php
+
+use Civi\Api4\Event;
+use Civi\Api4\Email;
+
+/**
+ *  Test CRM_Event_Form_Registration functions.
+ *
+ * @package   CiviCRM
+ * @group headless
+ */
+class CRM_Event_Form_ManageEvent_LocationTest extends CiviUnitTestCase {
+
+  /**
+   * Test the right emails exist after submitting the location form twice.
+   *
+   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  public function testSubmit() {
+    $eventID = (int) $this->eventCreate()['id'];
+    $form = $this->getFormObject('CRM_Event_Form_ManageEvent_Location', $this->getFormValues());
+    $form->set('id', $eventID);
+    $form->preProcess();
+    $form->buildQuickForm();
+    $form->postProcess();
+    $this->assertCorrectEmails($eventID);
+
+    // Now do it again to see if it gets messed with.
+    $form = $this->getFormObject('CRM_Event_Form_ManageEvent_Location', array_merge($this->getFormValues(), ['loc_event_id' => $this->ids['LocBlock'][0]]));
+    $form->set('id', $eventID);
+    $form->preProcess();
+    $form->buildQuickForm();
+    $form->postProcess();
+    $this->assertCorrectEmails($eventID);
+  }
+
+  /**
+   * Get the values to submit for the form.
+   *
+   * @return array
+   */
+  protected function getFormValues() {
+    return [
+      'address' =>
+        [
+          1 =>
+            [
+              'master_id' => '',
+              'street_address' => '581O Lincoln Dr SW',
+              'supplemental_address_1' => '',
+              'supplemental_address_2' => '',
+              'supplemental_address_3' => '',
+              'city' => 'Santa Fe',
+              'postal_code' => '87594',
+              'country_id' => '1228',
+              'state_province_id' => '1030',
+              'county_id' => '',
+              'geo_code_1' => '35.5212',
+              'geo_code_2' => '-105.982',
+            ],
+        ],
+      'email' =>
+        [
+          1 =>
+            [
+              'email' => 'celebration@example.org',
+            ],
+          2 =>
+            [
+              'email' => 'bigger_party@example.org',
+            ],
+        ],
+      'phone' =>
+        [
+          1 =>
+            [
+              'phone_type_id' => '1',
+              'phone' => '303 323-1000',
+              'phone_ext' => '',
+            ],
+          2 =>
+            [
+              'phone_type_id' => '1',
+              'phone' => '44',
+              'phone_ext' => '',
+            ],
+        ],
+      'location_option' => '2',
+      'loc_event_id' => '3',
+      'is_show_location' => '1',
+      'is_template' => '0',
+    ];
+  }
+
+  /**
+   * @param int $eventID
+   *
+   * @return \Civi\Api4\Generic\Result
+   * @throws \API_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  protected function assertCorrectEmails($eventID) {
+    $emails = Email::get()
+      ->addWhere('email', 'IN', ['bigger_party@example.org', 'celebration@example.org'])
+      ->addOrderBy('email', 'DESC')
+      ->execute();
+
+    $this->assertCount(2, $emails);
+    $firstEmail = $emails->first();
+    $locationBlock = Event::get()
+      ->addWhere('id', '=', $eventID)
+      ->setSelect(['loc_block.*', 'loc_block_id'])
+      ->execute()->first();
+    $this->ids['LocBlock'][0] = $locationBlock['loc_block_id'];
+    $this->assertEquals($firstEmail['id'], $locationBlock['loc_block.email_id']);
+    $secondEmail = $emails->last();
+    $this->assertEquals($secondEmail['id'], $locationBlock['loc_block.email_2_id']);
+    return $emails;
+  }
+
+}
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index e2b1b4d65ea3..434cdaade827 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -3268,6 +3268,7 @@ public function onPost($op, $objectName, $objectId, &$objectRef) {
    */
   public function getFormObject($class, $formValues = [], $pageName = '') {
     $_POST = $formValues;
+    /* @var CRM_Core_Form $form */
     $form = new $class();
     $_SERVER['REQUEST_METHOD'] = 'GET';
     switch ($class) {
@@ -3280,8 +3281,7 @@ public function getFormObject($class, $formValues = [], $pageName = '') {
         $form->controller = new CRM_Core_Controller();
     }
     if (!$pageName) {
-      $formParts = explode('_', $class);
-      $pageName = array_pop($formParts);
+      $pageName = $form->getName();
     }
     $form->controller->setStateMachine(new CRM_Core_StateMachine($form->controller));
     $_SESSION['_' . $form->controller->_name . '_container']['values'][$pageName] = $formValues;

From 87edc8d2ab0de60dcd21d893583d6e0aabf8eeb7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 17 Sep 2020 17:26:38 -0700
Subject: [PATCH 671/834] CRM_Core_Resources::addBundle() - Fix handling of
 array inputs

(This fixes a small bug in a new function added during this release -- part of #18247.)

The signature of `addBundle()` optionally accepts an array/iterable -- if
given, then it should add all the items from the array. For example:

```php
Civi::resources()->addBundle(['foo', 'bar']);
```

Before
------

It adds `foo` but then bails out on `bar`.

After
-----

It adds both `foo` and `bar`.
---
 CRM/Core/Resources.php                 | 2 +-
 CRM/Core/Resources/CollectionTrait.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 4a48798230c8..77467b61203e 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -206,8 +206,8 @@ public function addBundle($bundle) {
     if (is_iterable($bundle)) {
       foreach ($bundle as $b) {
         $this->addBundle($b);
-        return $this;
       }
+      return $this;
     }
 
     if (is_string($bundle)) {
diff --git a/CRM/Core/Resources/CollectionTrait.php b/CRM/Core/Resources/CollectionTrait.php
index b7616edafce0..ec7ef1845356 100644
--- a/CRM/Core/Resources/CollectionTrait.php
+++ b/CRM/Core/Resources/CollectionTrait.php
@@ -327,8 +327,8 @@ public function addBundle($bundle) {
     if (is_iterable($bundle)) {
       foreach ($bundle as $b) {
         $this->addBundle($b);
-        return $this;
       }
+      return $this;
     }
     if (is_string($bundle)) {
       $bundle = Civi::service('bundle.' . $bundle);

From f4bc48bb6affbf8da130ecd4b29006465fa93e69 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 18 Sep 2020 12:29:06 +1200
Subject: [PATCH 672/834] Test fix - use valid membership type

Addresses cause of https://github.com/civicrm/civicrm-core/pull/18427 fail
---
 tests/phpunit/CRM/Member/Form/MembershipTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index bc7fad299b8a..4da732bc08f8 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -207,9 +207,7 @@ public function testFormRuleRollingEarlyStart() {
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
-    $rc = call_user_func(['CRM_Member_Form_Membership', 'formRule'],
-      $params, $files, $obj
-    );
+    $rc = CRM_Member_Form_Membership::formRule($params, $files, $obj);
     $this->assertType('array', $rc);
     $this->assertTrue(array_key_exists('start_date', $rc));
   }
@@ -450,8 +448,9 @@ public function testFormRuleRollingJoin2YearsAgo() {
   }
 
   /**
-   *  Test CRM_Member_Form_Membership::formRule() with a join date
-   *  of six months ago and a fixed membership type
+   *  Test CRM_Member_Form_Membership::formRule() with a current status.
+   *
+   * The setup is a join date of six months ago and a fixed membership type.
    */
   public function testFormRuleFixedJoin6MonthsAgo() {
     $unixNow = time();
@@ -460,7 +459,7 @@ public function testFormRuleFixedJoin6MonthsAgo() {
       'join_date' => date('Y-m-d', $unix6MAgo),
       'start_date' => '',
       'end_date' => '',
-      'membership_type_id' => [$this->ids['contact']['organization'], '7'],
+      'membership_type_id' => [$this->ids['contact']['organization'], $this->membershipTypeAnnualFixedID],
     ];
     $files = [];
     $obj = new CRM_Member_Form_Membership();
@@ -752,6 +751,7 @@ public function testSubmitPartialPayment($thousandSeparator) {
    * Test the submit function of the membership form.
    *
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function testSubmitRecur() {
     CRM_Core_Session::singleton()->getStatus(TRUE);

From 43a2114e251b61f1a0ef33ce1aa03d3b109540a1 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 17 Sep 2020 19:11:19 -0700
Subject: [PATCH 673/834] Container - Disable caching in as many unit-tests as
 we can

---
 Civi/Core/Container.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index acedf8a78024..28b210e2b074 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -56,7 +56,7 @@ public function loadContainer() {
     $cacheMode = defined('CIVICRM_CONTAINER_CACHE') ? CIVICRM_CONTAINER_CACHE : 'auto';
 
     // In pre-installation environments, don't bother with caching.
-    if (!defined('CIVICRM_DSN') || $cacheMode === 'never' || \CRM_Utils_System::isInUpgradeMode()) {
+    if (!defined('CIVICRM_DSN') || defined('CIVICRM_TEST') || CIVICRM_UF === 'UnitTests' || $cacheMode === 'never' || \CRM_Utils_System::isInUpgradeMode()) {
       $containerBuilder = $this->createContainer();
       $containerBuilder->compile();
       return $containerBuilder;

From 76b9562afb08d2484696b12bc8af15c9b8c7f354 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 17 Sep 2020 19:14:06 -0700
Subject: [PATCH 674/834] afform_clear() - Fix error when running on non-cached
 container

After switching the tests from an effective policy of `CIVICRM_CONTAINER_CACHE=auto`
to an effective policy of `CIVICRM_CONTAINER_CACHE=never`, this started to fail:

```
1) api_v4_AfformTest::testGetUpdateRevert with data set #0 ('mockPage', array('', '', 'civicrm/mock-page', 'access Foobar'))
Symfony\Component\DependencyInjection\Exception\BadMethodCallException: Setting service "angular" for an unknown or non-synthetic service definition on a compiled container is not allowed.

/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/vendor/symfony/dependency-injection/ContainerBuilder.php:532
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/ext/afform/core/afform.php:520
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/ext/afform/core/Civi/Api4/Afform.php:99
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/BasicBatchAction.php:88
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/BasicBatchAction.php:68
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Provider/ActionObjectProvider.php:68
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/API/Kernel.php:150
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/Civi/Api4/Generic/AbstractAction.php:238
/home/me/bknix/build/dmaster/web/sites/all/modules/civicrm/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php:53
/home/me/bknix/extern/phpunit6/phpunit6.phar:570
```
---
 Civi/Angular/Manager.php   | 14 ++++++++++++++
 ext/afform/core/afform.php |  5 +----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
index 4b21537d3fba..a763cf9e716d 100644
--- a/Civi/Angular/Manager.php
+++ b/Civi/Angular/Manager.php
@@ -53,6 +53,20 @@ public function __construct($res, \CRM_Utils_Cache_Interface $cache = NULL) {
     $this->cache = $cache ? $cache : new \CRM_Utils_Cache_ArrayCache([]);
   }
 
+  /**
+   * Clear out any runtime-cached metadata.
+   *
+   * This is useful if, eg, you have recently added or destroyed Angular modules.
+   *
+   * @return static
+   */
+  public function clear() {
+    $this->cache->clear();
+    $this->modules = NULL;
+    $this->changeSets = NULL;
+    return $this;
+  }
+
   /**
    * Get a list of AngularJS modules which should be autoloaded.
    *
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 9d445ab6a648..d63c34994f4f 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -514,10 +514,7 @@ function afform_civicrm_permission_check($permission, &$granted, $contactId) {
 function _afform_clear() {
   $container = \Civi::container();
   $container->get('afform_scanner')->clear();
-
-  // Civi\Angular\Manager doesn't currently have a way to clear its in-memory
-  // data, so we just reset the whole object.
-  $container->set('angular', NULL);
+  $container->get('angular')->clear();
 }
 
 /**

From b53fe17156a6b3102a6f4363ecc689b690521af7 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 18 Sep 2020 09:49:54 +1000
Subject: [PATCH 675/834] [REF] Fix visibility of afform_scanner container
 service for Symfony 3 and 4

---
 ext/afform/core/afform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 9d445ab6a648..96eceec8029d 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -33,7 +33,7 @@ function afform_civicrm_container($container) {
   $container->setDefinition('afform_scanner', new \Symfony\Component\DependencyInjection\Definition(
     'CRM_Afform_AfformScanner',
     []
-  ));
+  ))->setPublic(TRUE);
 }
 
 /**

From 986ac53f2addee153934d381c61ed3ffd73ab929 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 18 Sep 2020 14:25:34 +1200
Subject: [PATCH 676/834] [Ref] Extract getFormValues

Digging into this is seems the  is always an object that inherits from this class

It is called statically primarily because the export task does not have
subclasses per form & does not know what variant it's passing in. However, we can
move functions onto the CRM_Contact_Form_Task class as non-static functions
and call them form form-> however unintuitive that seems.

I am trying to clean up the structure such that we can move on from the
static method but decided I should tackle this function a little first.

To test try doing an export from any search & this is called in static mode
(same goes for any task but the path is less ambiguous)
---
 CRM/Contact/Form/Task.php | 15 ++++++---------
 CRM/Core/Form/Task.php    | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index 2f7695dc7db1..a7bd173701ef 100644
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -78,7 +78,7 @@ public function preProcess() {
   /**
    * Common pre-processing function.
    *
-   * @param CRM_Core_Form $form
+   * @param \CRM_Core_Form_Task $form
    *
    * @throws \CRM_Core_Exception
    */
@@ -88,7 +88,7 @@ public static function preProcessCommon(&$form) {
 
     $isStandAlone = in_array('task', $form->urlPath) || in_array('standalone', $form->urlPath);
     if ($isStandAlone) {
-      list($form->_task, $title) = CRM_Contact_Task::getTaskAndTitleByClass(get_class($form));
+      [$form->_task, $title] = CRM_Contact_Task::getTaskAndTitleByClass(get_class($form));
       if (!array_key_exists($form->_task, CRM_Contact_Task::permissionedTaskTitles(CRM_Core_Permission::getPermission()))) {
         CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
       }
@@ -103,19 +103,16 @@ public static function preProcessCommon(&$form) {
     // we'll need to get fv from either search or adv search in the future
     $fragment = 'search';
     if ($form->_action == CRM_Core_Action::ADVANCED) {
-      self::$_searchFormValues = $form->controller->exportValues('Advanced');
       $fragment .= '/advanced';
     }
     elseif ($form->_action == CRM_Core_Action::PROFILE) {
-      self::$_searchFormValues = $form->controller->exportValues('Builder');
       $fragment .= '/builder';
     }
     elseif ($form->_action == CRM_Core_Action::COPY) {
-      self::$_searchFormValues = $form->controller->exportValues('Custom');
       $fragment .= '/custom';
     }
-    elseif (!$isStandAlone) {
-      self::$_searchFormValues = $form->controller->exportValues('Basic');
+    if (!$isStandAlone) {
+      self::$_searchFormValues = $form->getFormValues();
     }
 
     //set the user context for redirection of task actions
@@ -125,12 +122,12 @@ public static function preProcessCommon(&$form) {
       $urlParams .= "&qfKey=$qfKey";
     }
 
-    $cacheKey = "civicrm search {$qfKey}";
-
     $url = CRM_Utils_System::url('civicrm/contact/' . $fragment, $urlParams);
     $session = CRM_Core_Session::singleton();
     $session->replaceUserContext($url);
 
+    $cacheKey = "civicrm search {$qfKey}";
+
     $form->_task = self::$_searchFormValues['task'] ?? NULL;
     $crmContactTaskTasks = CRM_Contact_Task::taskTitles();
     $form->assign('taskName', CRM_Utils_Array::value($form->_task, $crmContactTaskTasks));
diff --git a/CRM/Core/Form/Task.php b/CRM/Core/Form/Task.php
index 67ca0537adce..a3bde1d8b668 100644
--- a/CRM/Core/Form/Task.php
+++ b/CRM/Core/Form/Task.php
@@ -251,4 +251,22 @@ public function orderBy() {
     return '';
   }
 
+  /**
+   * Get the submitted values for the form.
+   *
+   * @return array
+   */
+  public function getFormValues() {
+    if ($this->_action === CRM_Core_Action::ADVANCED) {
+      return $this->controller->exportValues('Advanced');
+    }
+    if ($this->_action === CRM_Core_Action::PROFILE) {
+      return $this->controller->exportValues('Builder');
+    }
+    if ($this->_action == CRM_Core_Action::COPY) {
+      return $this->controller->exportValues('Custom');
+    }
+    return $this->controller->exportValues('Basic');
+  }
+
 }

From dabe5cd5db906cddebc0f5defef16185f32cbdbf Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 18 Sep 2020 16:11:50 +1200
Subject: [PATCH 677/834] [REF] Extract the code to determine the DAO name into
 a functions

Note per https://github.com/civicrm/civicrm-core/pull/18512 my intent is actually to land on class inheritance
rather than these switches but by starting to functionise them it becomes easier to start to determine what the functions
should be
---
 CRM/Export/Form/Select.php | 109 +++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 41 deletions(-)

diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php
index 3570008e5978..8710d8523667 100644
--- a/CRM/Export/Form/Select.php
+++ b/CRM/Export/Form/Select.php
@@ -81,46 +81,7 @@ public function preProcess() {
 
     // FIXME: This should use a modified version of CRM_Contact_Form_Search::getModeValue but it doesn't have all the contexts
     // FIXME: Or better still, use CRM_Core_DAO_AllCoreTables::getBriefName($daoName) to get the $entityShortName
-    switch ($this->getQueryMode()) {
-      case CRM_Contact_BAO_Query::MODE_CONTRIBUTE:
-        $entityShortname = 'Contribute';
-        $entityDAOName = $entityShortname;
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_MEMBER:
-        $entityShortname = 'Member';
-        $entityDAOName = 'Membership';
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_EVENT:
-        $entityShortname = 'Event';
-        $entityDAOName = $entityShortname;
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_PLEDGE:
-        $entityShortname = 'Pledge';
-        $entityDAOName = $entityShortname;
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_CASE:
-        $entityShortname = 'Case';
-        $entityDAOName = $entityShortname;
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_GRANT:
-        $entityShortname = 'Grant';
-        $entityDAOName = $entityShortname;
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_ACTIVITY:
-        $entityShortname = 'Activity';
-        $entityDAOName = $entityShortname;
-        break;
-
-      default:
-        $entityShortname = $this->getComponentName();
-        $entityDAOName = $this->controller->get('entity') ?? $entityShortname;
-    }
+    $entityShortname = $this->getEntityShortName();
 
     if (in_array($entityShortname, $components)) {
       $this->_exportMode = constant('CRM_Export_Form_Select::' . strtoupper($entityShortname) . '_EXPORT');
@@ -134,7 +95,7 @@ public function preProcess() {
       }
       else {
         $this::$entityShortname = $entityShortname;
-        $this::$tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($entityDAOName));
+        $this::$tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($this->getDAOName()));
       }
     }
 
@@ -504,4 +465,70 @@ protected function getComponentName(): string {
     return $componentName[1];
   }
 
+  /**
+   * Get the DAO name for the given export.
+   *
+   * @return string
+   */
+  protected function getDAOName(): string {
+    switch ($this->getQueryMode()) {
+      case CRM_Contact_BAO_Query::MODE_CONTRIBUTE:
+        return 'Contribute';
+
+      case CRM_Contact_BAO_Query::MODE_MEMBER:
+        return 'Membership';
+
+      case CRM_Contact_BAO_Query::MODE_EVENT:
+        return 'Event';
+
+      case CRM_Contact_BAO_Query::MODE_PLEDGE:
+        return 'Pledge';
+
+      case CRM_Contact_BAO_Query::MODE_CASE:
+        return 'Case';
+
+      case CRM_Contact_BAO_Query::MODE_GRANT:
+        return 'Grant';
+
+      case CRM_Contact_BAO_Query::MODE_ACTIVITY:
+        return 'Activity';
+
+      default:
+        return $this->controller->get('entity') ?? $this->getComponentName();
+    }
+  }
+
+  /**
+   * Get the entity short name for a given export.
+   *
+   * @return string
+   */
+  protected function getEntityShortName(): string {
+    switch ($this->getQueryMode()) {
+      case CRM_Contact_BAO_Query::MODE_CONTRIBUTE:
+        return 'Contribute';
+
+      case CRM_Contact_BAO_Query::MODE_MEMBER:
+        return 'Member';
+
+      case CRM_Contact_BAO_Query::MODE_EVENT:
+        return 'Event';
+
+      case CRM_Contact_BAO_Query::MODE_PLEDGE:
+        return 'Pledge';
+
+      case CRM_Contact_BAO_Query::MODE_CASE:
+        return 'Case';
+
+      case CRM_Contact_BAO_Query::MODE_GRANT:
+        return 'Grant';
+
+      case CRM_Contact_BAO_Query::MODE_ACTIVITY:
+        return 'Activity';
+
+      default:
+        return $this->getComponentName();
+    }
+  }
+
 }

From e2710fee5aba1d6e3d65392f066d8bb559605e1b Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 18 Sep 2020 15:51:38 +1200
Subject: [PATCH 678/834] Separate export into separate classe to allow
 unravelling of component handling

---
 CRM/Export/Controller/Standalone.php |  2 +-
 CRM/Export/Form/Map.php              |  9 +++++++++
 CRM/Export/Form/Select.php           |  9 +++++++++
 CRM/Export/Form/Select/Case.php      |  9 ---------
 CRM/Member/Export/Form/Map.php       | 23 +++++++++++++++++++++++
 CRM/Member/Export/Form/Select.php    | 23 +++++++++++++++++++++++
 CRM/Member/Task.php                  |  4 ++--
 7 files changed, 67 insertions(+), 12 deletions(-)
 create mode 100644 CRM/Member/Export/Form/Map.php
 create mode 100644 CRM/Member/Export/Form/Select.php

diff --git a/CRM/Export/Controller/Standalone.php b/CRM/Export/Controller/Standalone.php
index f95f4b8d84cf..2d3074eebdca 100644
--- a/CRM/Export/Controller/Standalone.php
+++ b/CRM/Export/Controller/Standalone.php
@@ -72,7 +72,7 @@ public function exportValues($pageName = NULL) {
     $className = 'CRM_' . $this->getComponent($this->get('entity')) . '_Task';
     foreach ($className::tasks() as $taskId => $task) {
       $taskForm = (array) $task['class'];
-      if ($taskForm[0] == 'CRM_Export_Form_Select') {
+      if (strpos($taskForm[0], 'CRM_Export_Form_Select') === 0) {
         $values['task'] = $taskId;
       }
     }
diff --git a/CRM/Export/Form/Map.php b/CRM/Export/Form/Map.php
index a4f64d533f4d..9e4e5fbaf1f5 100644
--- a/CRM/Export/Form/Map.php
+++ b/CRM/Export/Form/Map.php
@@ -27,6 +27,15 @@ class CRM_Export_Form_Map extends CRM_Core_Form {
    */
   protected $_mappingId;
 
+  /**
+   * Use the form name to create the tpl file name.
+   *
+   * @return string
+   */
+  public function getTemplateFileName() {
+    return 'CRM/Export/Form/Map.tpl';
+  }
+
   /**
    * Build the form object.
    */
diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php
index 3570008e5978..041fee844d92 100644
--- a/CRM/Export/Form/Select.php
+++ b/CRM/Export/Form/Select.php
@@ -52,6 +52,15 @@ class CRM_Export_Form_Select extends CRM_Core_Form_Task {
 
   public $_componentTable;
 
+  /**
+   * Use the form name to create the tpl file name.
+   *
+   * @return string
+   */
+  public function getTemplateFileName() {
+    return 'CRM/Export/Form/Select.tpl';
+  }
+
   /**
    * Build all the data structures needed to build the form.
    *
diff --git a/CRM/Export/Form/Select/Case.php b/CRM/Export/Form/Select/Case.php
index 3fd18998c6ca..c310aa9a489e 100644
--- a/CRM/Export/Form/Select/Case.php
+++ b/CRM/Export/Form/Select/Case.php
@@ -25,13 +25,4 @@ class CRM_Export_Form_Select_Case extends CRM_Export_Form_Select {
    */
   protected $queryMode = CRM_Contact_BAO_Query::MODE_CASE;
 
-  /**
-   * Use the form name to create the tpl file name.
-   *
-   * @return string
-   */
-  public function getTemplateFileName() {
-    return 'CRM/Export/Form/Select.tpl';
-  }
-
 }
diff --git a/CRM/Member/Export/Form/Map.php b/CRM/Member/Export/Form/Map.php
new file mode 100644
index 000000000000..9456d43e3e2c
--- /dev/null
+++ b/CRM/Member/Export/Form/Map.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * This class gets the name of the file to upload
+ */
+class CRM_Member_Export_Form_Map extends CRM_Export_Form_Map {
+
+}
diff --git a/CRM/Member/Export/Form/Select.php b/CRM/Member/Export/Form/Select.php
new file mode 100644
index 000000000000..f4cc4bacd015
--- /dev/null
+++ b/CRM/Member/Export/Form/Select.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * This class gets the name of the file to upload
+ */
+class CRM_Member_Export_Form_Select extends CRM_Export_Form_Select {
+
+}
diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
index 661f2a72fc00..ade20080e17c 100644
--- a/CRM/Member/Task.php
+++ b/CRM/Member/Task.php
@@ -55,8 +55,8 @@ public static function tasks() {
         self::TASK_EXPORT => [
           'title' => ts('Export members'),
           'class' => [
-            'CRM_Export_Form_Select',
-            'CRM_Export_Form_Map',
+            'CRM_Member_Export_Form_Select',
+            'CRM_Member_Export_Form_Map',
           ],
           'result' => FALSE,
         ],

From e0b2d43b746f8873f3b5d2b0abc507edbd83a8b6 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 7 Sep 2020 16:30:31 +0100
Subject: [PATCH 679/834] Switch membership BAO to use non-deprecated cached
 functions to get membershipType details

---
 CRM/Member/BAO/Membership.php     | 13 ++++++-------
 CRM/Member/BAO/MembershipType.php |  4 +++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 3a98f1d58776..32ff6e025910 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -282,7 +282,7 @@ public static function create(&$params, &$ids = []) {
     else {
       // if membership allows related, default max_related to value in membership_type
       if (!array_key_exists('max_related', $params) && !empty($params['membership_type_id'])) {
-        $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($params['membership_type_id']);
+        $membershipType = CRM_Member_BAO_MembershipType::getMembershipType($params['membership_type_id']);
         if (isset($membershipType['relationship_type_id'])) {
           $params['max_related'] = $membershipType['max_related'] ?? NULL;
         }
@@ -439,7 +439,8 @@ private static function addToRecentItems($membership) {
   public static function checkMembershipRelationship($membershipTypeID, $contactId, $action = CRM_Core_Action::ADD) {
     $contacts = [];
 
-    $membershipType = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($membershipTypeID);
+    $membershipType = CRM_Member_BAO_MembershipType::getMembershipType($membershipTypeID);
+
     $relationships = [];
     if (isset($membershipType['relationship_type_id'])) {
       $relationships = CRM_Contact_BAO_Relationship::getRelationship($contactId,
@@ -462,11 +463,9 @@ public static function checkMembershipRelationship($membershipTypeID, $contactId
         CRM_Contact_BAO_RelationshipType::retrieve($relType, $relValues);
         // Check if contact's relationship type exists in membership type
         $relTypeDirs = [];
-        $relTypeIds = explode(CRM_Core_DAO::VALUE_SEPARATOR, $membershipType['relationship_type_id']);
-        $relDirections = explode(CRM_Core_DAO::VALUE_SEPARATOR, $membershipType['relationship_direction']);
         $bidirectional = FALSE;
-        foreach ($relTypeIds as $key => $value) {
-          $relTypeDirs[] = $value . '_' . $relDirections[$key];
+        foreach ($membershipType['relationship_type_id'] as $key => $value) {
+          $relTypeDirs[] = $value . '_' . $membershipType['relationship_direction'][$key];
           if (in_array($value, $relType) &&
             $relValues['name_a_b'] == $relValues['name_b_a']
           ) {
@@ -1771,7 +1770,7 @@ public static function processMembership($contactID, $membershipTypeID, $is_test
     $allStatus = CRM_Member_PseudoConstant::membershipStatus();
     $format = '%Y%m%d';
     $statusFormat = '%Y-%m-%d';
-    $membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($membershipTypeID);
+    $membershipTypeDetails = CRM_Member_BAO_MembershipType::getMembershipType($membershipTypeID);
     $dates = [];
     $ids = [];
 
diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php
index 11593a8e44f7..c702b83af3aa 100644
--- a/CRM/Member/BAO/MembershipType.php
+++ b/CRM/Member/BAO/MembershipType.php
@@ -635,7 +635,7 @@ public static function getMemberOfContactByMemTypes($membershipTypes) {
   }
 
   /**
-   * The function returns all the Organization for  all membershipTypes .
+   * The function returns all the Organization for all membershipTypes .
    *
    * @param int $membershipTypeId
    *
@@ -814,6 +814,8 @@ public static function updateAllPriceFieldValue($membershipTypeId, $params) {
    * Caching is by domain - if that hits any issues we should add a new function getDomainMembershipTypes
    * or similar rather than 'just add another param'! but this is closer to earlier behaviour so 'should' be OK.
    *
+   * @return array
+   *   List of membershipType details keyed by membershipTypeID
    * @throws \CiviCRM_API3_Exception
    */
   public static function getAllMembershipTypes() {

From 4fea3bfdf678d811d2da10a1cf2165ffc69dd871 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 18 Sep 2020 10:34:27 -0400
Subject: [PATCH 680/834] Search ext: Fix field label for aggregate fields

---
 ext/search/ang/search/crmSearchFunction.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/search/ang/search/crmSearchFunction.html b/ext/search/ang/search/crmSearchFunction.html
index a88cc0a31ada..e0692e33d3e4 100644
--- a/ext/search/ang/search/crmSearchFunction.html
+++ b/ext/search/ang/search/crmSearchFunction.html
@@ -1,4 +1,4 @@
 <div class="form-inline">
-  <label>{{ $ctrl.field.title }}:</label>
+  <label>{{ $ctrl.field.label }}:</label>
   <input class="form-control" style="width: 15em;" ng-model="$ctrl.fn" crm-ui-select="{data: $ctrl.functions, placeholder: ts('Select')}" ng-change="$ctrl.selectFunction()">
 </div>

From 7da9d079c3a73417b3efea8322585caa0fd43842 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 18 Sep 2020 11:16:16 -0400
Subject: [PATCH 681/834] Search ext: When removing a column from SELECT, also
 remove from ORDER BY

---
 ext/search/ang/search/crmSearch.component.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 51f2532bc49a..703cd364d774 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -87,6 +87,9 @@
           ctrl.params.orderBy = {};
         }
         ctrl.params.orderBy[col] = dir;
+        if (ctrl.results) {
+          ctrl.refreshPage();
+        }
       };
 
       /**
@@ -233,6 +236,10 @@
       };
 
       function onChangeSelect(newSelect, oldSelect) {
+        // When removing a column from SELECT, also remove from ORDER BY
+        _.each(_.difference(_.keys(ctrl.params.orderBy), newSelect), function(col) {
+          delete ctrl.params.orderBy[col];
+        });
         // Re-arranging or removing columns doesn't merit a refresh, only adding columns does
         if (!oldSelect || _.difference(newSelect, oldSelect).length) {
           if (ctrl.autoSearch) {
@@ -243,12 +250,6 @@
         }
       }
 
-      function onChangeOrderBy() {
-        if (ctrl.results) {
-          ctrl.refreshPage();
-        }
-      }
-
       function onChangeFilters() {
         ctrl.stale = true;
         ctrl.selectedRows.length = 0;
@@ -480,7 +481,6 @@
           format: 'json',
           default: {}
         });
-        $scope.$watchCollection('$ctrl.params.orderBy', onChangeOrderBy);
 
         $scope.$bindToRoute({
           expr: '$ctrl.params.where',

From 5fcd63f47dc8fd43621ecbef82da7b6cb9c36ee1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 18 Sep 2020 11:27:20 -0400
Subject: [PATCH 682/834] Search ext: Ensure all non-grouped columns are
 aggregated if using GROUP BY

---
 ext/search/ang/search/crmSearch.component.js | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 703cd364d774..5eaaee5ababb 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -9,6 +9,9 @@
     controller: function($scope, $element, $timeout, crmApi4, dialogService, searchMeta, formatForSelect2) {
       var ts = $scope.ts = CRM.ts(),
         ctrl = this;
+
+      this.DEFAULT_AGGREGATE_FN = 'GROUP_CONCAT';
+
       this.selectedRows = [];
       this.limit = CRM.cache.get('searchPageSize', 30);
       this.page = 1;
@@ -74,6 +77,17 @@
         if (!ctrl.params.groupBy[idx]) {
           ctrl.clearParam('groupBy', idx);
         }
+        // Remove aggregate functions when no grouping
+        if (!ctrl.params.groupBy.length) {
+          _.each(ctrl.params.select, function(col, pos) {
+            if (_.contains(col, '(')) {
+              var info = searchMeta.parseExpr(col);
+              if (info.fn.category === 'aggregate') {
+                ctrl.params.select[pos] = info.path + info.suffix;
+              }
+            }
+          });
+        }
       };
 
       /**
@@ -133,6 +147,17 @@
         $('.crm-search-results', $element).css('height', '');
       }
 
+      // Ensure all non-grouped columns are aggregated if using GROUP BY
+      function aggregateGroupByColumns() {
+        if (ctrl.params.groupBy.length) {
+          _.each(ctrl.params.select, function(col, pos) {
+            if (!_.contains(col, '(') && ctrl.canAggregate(col)) {
+              ctrl.params.select[pos] = ctrl.DEFAULT_AGGREGATE_FN + '(' + col + ')';
+            }
+          });
+        }
+      }
+
       // Debounced callback for loadResults
       function _loadResultsCallback() {
         // Multiply limit to read 2 pages at once & save ajax requests
@@ -181,6 +206,7 @@
 
       function loadResults() {
         $scope.loading = true;
+        aggregateGroupByColumns();
         _loadResults();
       }
 

From 8e17d9d3a93e9c85029254ca11f44b2d3c1240f8 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 19 Sep 2020 08:07:56 +1200
Subject: [PATCH 683/834] Improve metadata on LineItem DAO

Adds pseudoconstants, labels
---
 CRM/Price/DAO/LineItem.php    | 17 +++++++++++++++--
 xml/schema/Price/LineItem.xml | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CRM/Price/DAO/LineItem.php b/CRM/Price/DAO/LineItem.php
index 7e9b779089b6..82cea2af7f51 100644
--- a/CRM/Price/DAO/LineItem.php
+++ b/CRM/Price/DAO/LineItem.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/LineItem.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:5a365a7d4b14c9b5963aeb61576395e4)
+ * (GenCodeChecksum:c9962dd4253fbcf43073bf10fbb0ce86)
  */
 
 /**
@@ -238,6 +238,12 @@ public static function &fields() {
           'bao' => 'CRM_Price_BAO_LineItem',
           'localizable' => 0,
           'FKClassName' => 'CRM_Price_DAO_PriceField',
+          'pseudoconstant' => [
+            'table' => 'civicrm_price_field',
+            'keyColumn' => 'id',
+            'labelColumn' => 'label',
+            'nameColumn' => 'name',
+          ],
           'add' => '1.7',
         ],
         'label' => [
@@ -343,12 +349,18 @@ public static function &fields() {
           'bao' => 'CRM_Price_BAO_LineItem',
           'localizable' => 0,
           'FKClassName' => 'CRM_Price_DAO_PriceFieldValue',
+          'pseudoconstant' => [
+            'table' => 'civicrm_price_field_value',
+            'keyColumn' => 'id',
+            'labelColumn' => 'label',
+            'nameColumn' => 'name',
+          ],
           'add' => '3.3',
         ],
         'financial_type_id' => [
           'name' => 'financial_type_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Financial Type'),
+          'title' => ts('Financial Type ID'),
           'description' => ts('FK to Financial Type.'),
           'where' => 'civicrm_line_item.financial_type_id',
           'default' => 'NULL',
@@ -359,6 +371,7 @@ public static function &fields() {
           'FKClassName' => 'CRM_Financial_DAO_FinancialType',
           'html' => [
             'type' => 'Select',
+            'label' => ts("Financial Type"),
           ],
           'pseudoconstant' => [
             'table' => 'civicrm_financial_type',
diff --git a/xml/schema/Price/LineItem.xml b/xml/schema/Price/LineItem.xml
index 82b9c9a7cc56..ee61447fee6c 100644
--- a/xml/schema/Price/LineItem.xml
+++ b/xml/schema/Price/LineItem.xml
@@ -58,6 +58,12 @@
     <title>Line Item Price Field</title>
     <type>int unsigned</type>
     <comment>FK to civicrm_price_field</comment>
+    <pseudoconstant>
+      <table>civicrm_price_field</table>
+      <keyColumn>id</keyColumn>
+      <nameColumn>name</nameColumn>
+      <labelColumn>label</labelColumn>
+    </pseudoconstant>
     <!-- changed to not required in 4.3 in order to change ON DELETE CASCADE FK constraint to SET NULL -->
     <add>1.7</add>
   </field>
@@ -145,6 +151,12 @@
     <type>int unsigned</type>
     <default>NULL</default>
     <comment>FK to civicrm_price_field_value</comment>
+    <pseudoconstant>
+      <table>civicrm_price_field_value</table>
+      <keyColumn>id</keyColumn>
+      <nameColumn>name</nameColumn>
+      <labelColumn>label</labelColumn>
+    </pseudoconstant>
     <add>3.3</add>
   </field>
   <foreignKey>
@@ -155,7 +167,7 @@
   </foreignKey>
   <field>
     <name>financial_type_id</name>
-    <title>Financial Type</title>
+    <title>Financial Type ID</title>
     <type>int unsigned</type>
     <default>NULL</default>
     <pseudoconstant>
@@ -167,6 +179,7 @@
     <add>4.3</add>
     <html>
       <type>Select</type>
+      <label>Financial Type</label>
     </html>
   </field>
   <foreignKey>

From 99f914d4746c865e3e386eae46cdf31f1e980e91 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Fri, 18 Sep 2020 16:21:22 -0400
Subject: [PATCH 684/834] fix datepickers to show correct minDate

---
 CRM/Admin/Form/Job.php         | 2 +-
 CRM/Member/Form/Membership.php | 2 +-
 CRM/SMS/Form/Schedule.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Admin/Form/Job.php b/CRM/Admin/Form/Job.php
index 0f69059f7b3e..65bb09710e2a 100644
--- a/CRM/Admin/Form/Job.php
+++ b/CRM/Admin/Form/Job.php
@@ -97,7 +97,7 @@ public function buildQuickForm($check = FALSE) {
     $this->add('select', 'run_frequency', ts('Run frequency'), CRM_Core_SelectValues::getJobFrequency());
 
     // CRM-17686
-    $this->add('datepicker', 'scheduled_run_date', ts('Scheduled Run Date'), NULL, FALSE, ['minDate' => time()]);
+    $this->add('datepicker', 'scheduled_run_date', ts('Scheduled Run Date'), NULL, FALSE, ['minDate' => date('Y-m-d')]);
 
     $this->add('textarea', 'parameters', ts('Command parameters'),
       "cols=50 rows=6"
diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 3c98b8570b9f..14c2f28caaf8 100644
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -570,7 +570,7 @@ public function buildQuickForm() {
         CRM_Member_StatusOverrideTypes::getSelectOptions()
       );
 
-      $this->add('datepicker', 'status_override_end_date', ts('Status Override End Date'), '', FALSE, ['minDate' => time(), 'time' => FALSE]);
+      $this->add('datepicker', 'status_override_end_date', ts('Status Override End Date'), '', FALSE, ['minDate' => date('Y-m-d'), 'time' => FALSE]);
 
       $this->addElement('checkbox', 'record_contribution', ts('Record Membership Payment?'));
 
diff --git a/CRM/SMS/Form/Schedule.php b/CRM/SMS/Form/Schedule.php
index 3de19681be32..04d68bda9f85 100644
--- a/CRM/SMS/Form/Schedule.php
+++ b/CRM/SMS/Form/Schedule.php
@@ -60,7 +60,7 @@ public function buildQuickform() {
       'send_later' => ['id' => 'send_later'],
     ]);
 
-    $this->add('datepicker', 'start_date', '', NULL, FALSE, ['minDate' => time()]);
+    $this->add('datepicker', 'start_date', '', NULL, FALSE, ['minDate' => date('Y-m-d')]);
 
     $this->addFormRule(['CRM_SMS_Form_Schedule', 'formRule'], $this);
 

From bef5923d667fa9274e76b64a2bdd98662e1d3376 Mon Sep 17 00:00:00 2001
From: Christian Wach <needle@haystack.co.uk>
Date: Sat, 19 Sep 2020 12:47:26 +0100
Subject: [PATCH 685/834] Fix PayPal Standard session loss in WordPress

---
 CRM/Core/Payment/PayPalImpl.php |   3 +
 CRM/Utils/SameSite.php          | 224 ++++++++++++++++++++++++++++++++
 CRM/Utils/System.php            |   8 ++
 CRM/Utils/System/Base.php       |   6 +
 CRM/Utils/System/WordPress.php  | 157 ++++++++++++++++++++++
 5 files changed, 398 insertions(+)
 create mode 100644 CRM/Utils/SameSite.php

diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php
index b1833a8752ca..a1002fe925e7 100644
--- a/CRM/Core/Payment/PayPalImpl.php
+++ b/CRM/Core/Payment/PayPalImpl.php
@@ -971,6 +971,9 @@ public function doTransferCheckout(&$params, $component = 'contribute') {
     $sub = empty($params['is_recur']) ? 'cgi-bin/webscr' : 'subscriptions';
     $paypalURL = "{$url}{$sub}?$uri";
 
+    // Allow each CMS to do a pre-flight check before redirecting to PayPal.
+    CRM_Utils_System::prePostRedirect();
+
     CRM_Utils_System::redirect($paypalURL);
   }
 
diff --git a/CRM/Utils/SameSite.php b/CRM/Utils/SameSite.php
new file mode 100644
index 000000000000..0431761aae65
--- /dev/null
+++ b/CRM/Utils/SameSite.php
@@ -0,0 +1,224 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * SameSite Utility Class.
+ *
+ * Determines if the current User Agent can handle the `SameSite=None` parameter
+ * by mapping against known incompatible clients.
+ *
+ * Sample code:
+ *
+ * // Get User Agent string.
+ * $rawUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
+ * $userAgent = mb_convert_encoding($rawUserAgent, 'UTF-8');
+ *
+ * // Get boolean representing User Agent compatibility.
+ * $shouldUseSameSite = CRM_Utils_SameSite::shouldSendSameSiteNone($userAgent);
+ *
+ * Based on code provided by "The Chromium Projects".
+ *
+ * @see https://www.chromium.org/updates/same-site/incompatible-clients
+ */
+class CRM_Utils_SameSite {
+
+  /**
+   * Determine if the current User Agent can handle the `SameSite=None` parameter.
+   *
+   * @param str $userAgent The User Agent.
+   * @return bool True if the User Agent is compatible, FALSE otherwise.
+   */
+  public static function shouldSendSameSiteNone($userAgent) {
+    return !self::isSameSiteNoneIncompatible($userAgent);
+  }
+
+  /**
+   * Detect classes of browsers known to be incompatible.
+   *
+   * @param str $userAgent The User Agent.
+   * @return bool True if the User Agent is determined to be incompatible, FALSE otherwise.
+   */
+  private static function isSameSiteNoneIncompatible($userAgent) {
+    return self::hasWebKitSameSiteBug($userAgent) ||
+           self::dropsUnrecognizedSameSiteCookies($userAgent);
+  }
+
+  /**
+   * Detect versions of Safari and embedded browsers on MacOS 10.14 and all
+   * browsers on iOS 12.
+   *
+   * These versions will erroneously treat cookies marked with `SameSite=None`
+   * as if they were marked `SameSite=Strict`.
+   *
+   * @param str $userAgent The User Agent.
+   * @return bool
+   */
+  private static function hasWebKitSameSiteBug($userAgent) {
+    return self::isIosVersion(12, $userAgent) || (self::isMacosxVersion(10, 14, $userAgent) &&
+           (self::isSafari($userAgent) || self::isMacEmbeddedBrowser($userAgent)));
+  }
+
+  /**
+   * Detect versions of UC Browser on Android prior to version 12.13.2.
+   *
+   * Older versions will reject a cookie with `SameSite=None`. This behavior was
+   * correct according to the version of the cookie specification at that time,
+   * but with the addition of the new "None" value to the specification, this
+   * behavior has been updated in newer versions of UC Browser.
+   *
+   * @param str $userAgent The User Agent.
+   * @return bool
+   */
+  private static function dropsUnrecognizedSameSiteCookies($userAgent) {
+    if (self::isUcBrowser($userAgent)) {
+      return !self::isUcBrowserVersionAtLeast(12, 13, 2, $userAgent);
+    }
+
+    return self::isChromiumBased($userAgent) &&
+           self::isChromiumVersionAtLeast(51, $userAgent, '>=') &&
+           self::isChromiumVersionAtLeast(67, $userAgent, '<=');
+  }
+
+  /**
+   * Detect iOS version.
+   *
+   * @param int $major The major version to test.
+   * @param str $userAgent The User Agent.
+   * @return bool
+   */
+  private static function isIosVersion($major, $userAgent) {
+    $regex = "/\(iP.+; CPU .*OS (\d+)[_\d]*.*\) AppleWebKit\//";
+    $matched = [];
+
+    if (preg_match($regex, $userAgent, $matched)) {
+      // Extract digits from first capturing group.
+      $version = (int) $matched[1];
+      return version_compare($version, $major, '<=');
+    }
+
+    return FALSE;
+  }
+
+  /**
+   * Detect MacOS version.
+   *
+   * @param int $major The major version to test.
+   * @param int $minor The minor version to test.
+   * @param str $userAgent The User Agent.
+   * @return bool
+   */
+  private static function isMacosxVersion($major, $minor, $userAgent) {
+    $regex = "/\(Macintosh;.*Mac OS X (\d+)_(\d+)[_\d]*.*\) AppleWebKit\//";
+    $matched = [];
+
+    if (preg_match($regex, $userAgent, $matched)) {
+      // Extract digits from first and second capturing groups.
+      return version_compare((int) $matched[1], $major, '=') &&
+             version_compare((int) $matched[2], $minor, '<=');
+    }
+
+    return FALSE;
+  }
+
+  /**
+   * Detect MacOS Safari.
+   *
+   * @param str $userAgent The User Agent.
+   * @return bool
+   */
+  private static function isSafari($userAgent) {
+    $regex = "/Version\/.* Safari\//";
+    return preg_match($regex, $userAgent) && !self::isChromiumBased($userAgent);
+  }
+
+  /**
+   * Detect MacOS embedded browser.
+   *
+   * @param str $userAgent The User Agent.
+   * @return FALSE|int
+   */
+  private static function isMacEmbeddedBrowser($userAgent) {
+    $regex = "/^Mozilla\/[\.\d]+ \(Macintosh;.*Mac OS X [_\d]+\) AppleWebKit\/[\.\d]+ \(KHTML, like Gecko\)$/";
+    return preg_match($regex, $userAgent);
+  }
+
+  /**
+   * Detect if browser is Chromium based.
+   *
+   * @param str $userAgent The User Agent.
+   * @return FALSE|int
+   */
+  private static function isChromiumBased($userAgent) {
+    $regex = "/Chrom(e|ium)/";
+    return preg_match($regex, $userAgent);
+  }
+
+  /**
+   * Detect if Chromium version meets requirements.
+   *
+   * @param int $major The major version to test.
+   * @param str $userAgent The User Agent.
+   * @param str $operator
+   * @return bool|int
+   */
+  private static function isChromiumVersionAtLeast($major, $userAgent, $operator) {
+    $regex = "/Chrom[^ \/]+\/(\d+)[\.\d]* /";
+    $matched = [];
+
+    if (preg_match($regex, $userAgent, $matched)) {
+      // Extract digits from first capturing group.
+      $version = (int) $matched[1];
+      return version_compare($version, $major, $operator);
+    }
+    return FALSE;
+  }
+
+  /**
+   * Detect UCBrowser.
+   *
+   * @param str $userAgent The User Agent.
+   * @return FALSE|int
+   */
+  private static function isUcBrowser($userAgent) {
+    $regex = "/UCBrowser\//";
+    return preg_match($regex, $userAgent);
+  }
+
+  /**
+   * Detect if UCBrowser version meets requirements.
+   *
+   * @param int $major The major version to test.
+   * @param int $minor The minor version to test.
+   * @param int $build The build version to test.
+   * @param str $userAgent The User Agent.
+   * @return bool|int
+   */
+  private static function isUcBrowserVersionAtLeast($major, $minor, $build, $userAgent) {
+    $regex = "/UCBrowser\/(\d+)\.(\d+)\.(\d+)[\.\d]* /";
+    $matched = [];
+
+    if (preg_match($regex, $userAgent, $matched)) {
+      // Extract digits from three capturing groups.
+      $majorVersion = (int) $matched[1];
+      $minorVersion = (int) $matched[2];
+      $buildVersion = (int) $matched[3];
+
+      if (version_compare($majorVersion, $major, '>=')) {
+        if (version_compare($minorVersion, $minor, '>=')) {
+          return version_compare($buildVersion, $build, '>=');
+        }
+      }
+    }
+
+    return FALSE;
+  }
+
+}
diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 20b266d68046..6af92e60caff 100644
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -1915,4 +1915,12 @@ public static function sendResponse(\Psr\Http\Message\ResponseInterface $respons
     $config = CRM_Core_Config::singleton()->userSystem->sendResponse($response);
   }
 
+  /**
+   * Perform any necessary actions prior to redirecting via POST.
+   */
+  public static function prePostRedirect() {
+    $config = CRM_Core_Config::singleton();
+    $config->userSystem->paypalBeforeRedirect();
+  }
+
 }
diff --git a/CRM/Utils/System/Base.php b/CRM/Utils/System/Base.php
index 5c4f1d58bb14..aabb9aa48b4d 100644
--- a/CRM/Utils/System/Base.php
+++ b/CRM/Utils/System/Base.php
@@ -998,4 +998,10 @@ public function viewsExists() {
     return FALSE;
   }
 
+  /**
+   * Perform any necessary actions prior to redirecting via POST.
+   */
+  public function prePostRedirect() {
+  }
+
 }
diff --git a/CRM/Utils/System/WordPress.php b/CRM/Utils/System/WordPress.php
index e82b2e93df01..f13ad3883035 100644
--- a/CRM/Utils/System/WordPress.php
+++ b/CRM/Utils/System/WordPress.php
@@ -1087,4 +1087,161 @@ public function sessionStart() {
     }
   }
 
+  /**
+   * Perform any necessary actions prior to redirecting via POST.
+   *
+   * Redirecting via POST means that cookies need to be sent with SameSite=None.
+   */
+  public function prePostRedirect() {
+    // Get User Agent string.
+    $rawUserAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
+    $userAgent = mb_convert_encoding($rawUserAgent, 'UTF-8');
+
+    // Bail early if User Agent does not support `SameSite=None`.
+    $shouldUseSameSite = CRM_Utils_SameSite::shouldSendSameSiteNone($userAgent);
+    if (!$shouldUseSameSite) {
+      return;
+    }
+
+    // Make sure session cookie is present in header.
+    $cookie_params = session_name() . '=' . session_id() . '; SameSite=None; Secure';
+    CRM_Utils_System::setHttpHeader('Set-Cookie', $cookie_params);
+
+    // Add WordPress auth cookies when user is logged in.
+    $user = wp_get_current_user();
+    if ($user->exists()) {
+      self::setAuthCookies($user->ID, TRUE, TRUE);
+    }
+  }
+
+  /**
+   * Explicitly set WordPress authentication cookies.
+   *
+   * Chrome 84 introduced a cookie policy change which prevents cookies for the
+   * session and for WordPress user authentication from being indentified when
+   * a purchaser returns to the site from PayPal using the "Back to Merchant"
+   * button.
+   *
+   * In order to comply with this policy, cookies need to be sent with their
+   * "SameSite" attribute set to "None" and with the "Secure" flag set, but this
+   * isn't possible to do via `wp_set_auth_cookie()` as it stands.
+   *
+   * This method is a modified clone of `wp_set_auth_cookie()` which satisfies
+   * the Chrome policy.
+   *
+   * @see wp_set_auth_cookie()
+   *
+   * The $remember parameter increases the time that the cookie will be kept. The
+   * default the cookie is kept without remembering is two days. When $remember is
+   * set, the cookies will be kept for 14 days or two weeks.
+   *
+   * @param int $user_id The WordPress User ID.
+   * @param bool $remember Whether to remember the user.
+   * @param bool|string $secure Whether the auth cookie should only be sent over
+   *                            HTTPS. Default is an empty string which means the
+   *                            value of `is_ssl()` will be used.
+   * @param string $token Optional. User's session token to use for this cookie.
+   */
+  private function setAuthCookies($user_id, $remember = FALSE, $secure = '', $token = '') {
+    if ($remember) {
+      /** This filter is documented in wp-includes/pluggable.php */
+      $expiration = time() + apply_filters('auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember);
+
+      /*
+       * Ensure the browser will continue to send the cookie after the expiration time is reached.
+       * Needed for the login grace period in wp_validate_auth_cookie().
+       */
+      $expire = $expiration + (12 * HOUR_IN_SECONDS);
+    }
+    else {
+      /** This filter is documented in wp-includes/pluggable.php */
+      $expiration = time() + apply_filters('auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember);
+      $expire = 0;
+    }
+
+    if ('' === $secure) {
+      $secure = is_ssl();
+    }
+
+    // Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
+    $secure_logged_in_cookie = $secure && 'https' === parse_url(get_option('home'), PHP_URL_SCHEME);
+
+    /** This filter is documented in wp-includes/pluggable.php */
+    $secure = apply_filters('secure_auth_cookie', $secure, $user_id);
+
+    /** This filter is documented in wp-includes/pluggable.php */
+    $secure_logged_in_cookie = apply_filters('secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure);
+
+    if ($secure) {
+      $auth_cookie_name = SECURE_AUTH_COOKIE;
+      $scheme = 'secure_auth';
+    }
+    else {
+      $auth_cookie_name = AUTH_COOKIE;
+      $scheme = 'auth';
+    }
+
+    if ('' === $token) {
+      $manager = WP_Session_Tokens::get_instance($user_id);
+      $token = $manager->create($expiration);
+    }
+
+    $auth_cookie = wp_generate_auth_cookie($user_id, $expiration, $scheme, $token);
+    $logged_in_cookie = wp_generate_auth_cookie($user_id, $expiration, 'logged_in', $token);
+
+    /** This filter is documented in wp-includes/pluggable.php */
+    do_action('set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme, $token);
+
+    /** This filter is documented in wp-includes/pluggable.php */
+    do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in', $token);
+
+    /** This filter is documented in wp-includes/pluggable.php */
+    if (!apply_filters('send_auth_cookies', TRUE)) {
+      return;
+    }
+
+    $base_options = [
+      'expires' => $expire,
+      'domain' => COOKIE_DOMAIN,
+      'httponly' => TRUE,
+      'samesite' => 'None',
+    ];
+
+    self::setAuthCookie($auth_cookie_name, $auth_cookie, $base_options + ['secure' => $secure, 'path' => PLUGINS_COOKIE_PATH]);
+    self::setAuthCookie($auth_cookie_name, $auth_cookie, $base_options + ['secure' => $secure, 'path' => ADMIN_COOKIE_PATH]);
+    self::setAuthCookie(LOGGED_IN_COOKIE, $logged_in_cookie, $base_options + ['secure' => $secure_logged_in_cookie, 'path' => COOKIEPATH]);
+    if (COOKIEPATH != SITECOOKIEPATH) {
+      self::setAuthCookie(LOGGED_IN_COOKIE, $logged_in_cookie, $base_options + ['secure' => $secure_logged_in_cookie, 'path' => SITECOOKIEPATH]);
+    }
+  }
+
+  /**
+   * Set cookie with "SameSite" flag.
+   *
+   * The method here is compatible with all versions of PHP. Needed because it
+   * is only as of PHP 7.3.0 that the setcookie() method supports the "SameSite"
+   * attribute in its options and will accept "None" as a valid value.
+   *
+   * @param $name The name of the cookie.
+   * @param $value The value of the cookie.
+   * @param array $options The header options for the cookie.
+   */
+  private function setAuthCookie($name, $value, $options) {
+    $header = 'Set-Cookie: ';
+    $header .= rawurlencode($name) . '=' . rawurlencode($value) . '; ';
+    $header .= 'expires=' . gmdate('D, d-M-Y H:i:s T', $options['expires']) . '; ';
+    $header .= 'Max-Age=' . max(0, (int) ($options['expires'] - time())) . '; ';
+    $header .= 'path=' . rawurlencode($options['path']) . '; ';
+    $header .= 'domain=' . rawurlencode($options['domain']) . '; ';
+
+    if (!empty($options['secure'])) {
+      $header .= 'secure; ';
+    }
+    $header .= 'httponly; ';
+    $header .= 'SameSite=' . rawurlencode($options['samesite']);
+
+    header($header, FALSE);
+    $_COOKIE[$name] = $value;
+  }
+
 }

From 14b26ac5837b06a1eafadf5fbf7b7024967b17ba Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 20 Sep 2020 08:22:39 +1000
Subject: [PATCH 686/834] [REF] Fix deprecated array and string offset access
 using curly braces in afform

---
 ext/afform/core/afform.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 910200a6208b..89c7dc090529 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -488,7 +488,7 @@ function afform_civicrm_alterMenu(&$items) {
  * @see CRM_Utils_Hook::permission_check()
  */
 function afform_civicrm_permission_check($permission, &$granted, $contactId) {
-  if ($permission{0} !== '@') {
+  if ($permission[0] !== '@') {
     // Micro-optimization - this function may get hit a lot.
     return;
   }
@@ -533,7 +533,7 @@ function _afform_angular_module_name($fileBaseName, $format = 'camel') {
       foreach (preg_split('/[-_ ]/', $fileBaseName, NULL, PREG_SPLIT_NO_EMPTY) as $shortNamePart) {
         $camelCase .= ucfirst($shortNamePart);
       }
-      return strtolower($camelCase{0}) . substr($camelCase, 1);
+      return strtolower($camelCase[0]) . substr($camelCase, 1);
 
     case 'dash':
       return strtolower(implode('-', preg_split('/[-_ ]|(?=[A-Z])/', $fileBaseName, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE)));

From 0951664a3c38dd31de8d7fd776bbf26bc4c803a0 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sun, 20 Sep 2020 16:00:46 +1000
Subject: [PATCH 687/834] [NFC] Fix dates in RelationshipTest

---
 tests/phpunit/CRM/Contact/BAO/RelationshipTest.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/phpunit/CRM/Contact/BAO/RelationshipTest.php b/tests/phpunit/CRM/Contact/BAO/RelationshipTest.php
index 97435c89af39..ed41757dca96 100644
--- a/tests/phpunit/CRM/Contact/BAO/RelationshipTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/RelationshipTest.php
@@ -224,11 +224,13 @@ public function testSingleMembershipForTwoRelationships() {
     $this->assertEquals([$orgToPersonTypeId1, $orgToPersonTypeId2], $membershipType['relationship_type_id']);
     $this->assertEquals(['b_a', 'b_a'], $membershipType['relationship_direction']);
 
+    $startDate = date('Y-m') . '-19';
+    $joinDate = date('Y-m', strtotime('1 month ago')) . '-19';
     $this->callAPISuccess('Membership', 'create', [
       'membership_type_id' => $membershipType['id'],
       'contact_id' => $organisationID,
-      'start_date' => '2019-08-19',
-      'join_date' => '2019-07-19',
+      'start_date' => $startDate,
+      'join_date' => $joinDate,
     ]);
 
     $relationshipOne = $this->callAPISuccess('Relationship', 'create', [
@@ -245,8 +247,8 @@ public function testSingleMembershipForTwoRelationships() {
     $this->callAPISuccessGetCount('Membership', ['contact_id' => $individualID], 1);
 
     $inheritedMembership = $this->callAPISuccessGetSingle('Membership', ['contact_id' => $individualID]);
-    $this->assertEquals('2019-08-19', $inheritedMembership['start_date']);
-    $this->assertEquals('2019-07-19', $inheritedMembership['join_date']);
+    $this->assertEquals($startDate, $inheritedMembership['start_date']);
+    $this->assertEquals($joinDate, $inheritedMembership['join_date']);
 
     $this->callAPISuccessGetCount('Membership', ['contact_id' => $organisationID], 1);
     // Disable the relationship & check the membership is not removed because the other relationship is still valid.

From f2882c118b8a501ad4d1ed0305ce10271cf8e16a Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 21 Sep 2020 08:03:30 +1000
Subject: [PATCH 688/834] dev/core#2030 ensure that the Country selector is a
 Select 2 and ensure that if it is not shown on the contribution form that it
 doesn't prevent form submissions

---
 CRM/Core/Payment.php                  | 2 +-
 templates/CRM/common/paymentBlock.tpl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index b312c8e8d931..94bdfd88ec35 100644
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -1131,7 +1131,7 @@ public function getBillingAddressFieldsMetadata($billingLocationID = NULL) {
         '' => ts('- select -'),
       ] + CRM_Core_PseudoConstant::country(),
       'is_required' => TRUE,
-      'extra' => ['class' => 'required'],
+      'extra' => ['class' => 'required crm-form-select2 crm-select2'],
     ];
     return $metadata;
   }
diff --git a/templates/CRM/common/paymentBlock.tpl b/templates/CRM/common/paymentBlock.tpl
index 1d5c3e5e71ac..c3171f349d40 100644
--- a/templates/CRM/common/paymentBlock.tpl
+++ b/templates/CRM/common/paymentBlock.tpl
@@ -28,6 +28,8 @@
       payment_processor.hide();
       payment_information.hide();
       billing_block.hide();
+      // Ensure that jquery validation doesn't block submission when we don't need to fill in the billing details section
+      cj('#billing-payment-block select.crm-select2').addClass('crm-no-validate');
       // also unset selected payment methods
       cj('input[name="payment_processor_id"]').removeProp('checked');
     }
@@ -36,6 +38,7 @@
       payment_processor.show();
       payment_information.show();
       billing_block.show();
+      cj('#billing-payment-block select.crm-select2').removeClass('crm-no-validate');
       // also set selected payment methods
       cj('input[name="payment_processor_id"][checked=checked]').prop('checked', true);
     }

From 67a10cc49c42784bea65585264e1e6a7c837badd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 11:13:50 +1200
Subject: [PATCH 689/834] Follow up fix on paypal redirect

Turns out we did some function renaming & missed a spot before merge.

As an aside I fixed Paypal to call CRM_Core_Config::singleton()->userSystem->prePostRedirect()
directly rather than via system. I'm tempted to take the System function back out
again - I don't think it offers a better one-liner
---
 CRM/Core/Exception/PrematureExitException.php |  7 ++
 CRM/Core/Payment/PayPalImpl.php               |  2 +-
 CRM/Utils/System.php                          |  5 +-
 .../CRM/Core/Payment/PaypalStdTest.php        | 76 +++++++++++++++++++
 4 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 tests/phpunit/CRM/Core/Payment/PaypalStdTest.php

diff --git a/CRM/Core/Exception/PrematureExitException.php b/CRM/Core/Exception/PrematureExitException.php
index e0eee738b926..f46bbfff8e55 100644
--- a/CRM/Core/Exception/PrematureExitException.php
+++ b/CRM/Core/Exception/PrematureExitException.php
@@ -25,6 +25,13 @@
  */
 class CRM_Core_Exception_PrematureExitException extends RuntimeException {
 
+  /**
+   * Contextual data.
+   *
+   * @var array
+   */
+  public $errorData;
+
   /**
    * Construct the exception. Note: The message is NOT binary safe.
    *
diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php
index a1002fe925e7..16526443bd01 100644
--- a/CRM/Core/Payment/PayPalImpl.php
+++ b/CRM/Core/Payment/PayPalImpl.php
@@ -972,7 +972,7 @@ public function doTransferCheckout(&$params, $component = 'contribute') {
     $paypalURL = "{$url}{$sub}?$uri";
 
     // Allow each CMS to do a pre-flight check before redirecting to PayPal.
-    CRM_Utils_System::prePostRedirect();
+    CRM_Core_Config::singleton()->userSystem->prePostRedirect();
 
     CRM_Utils_System::redirect($paypalURL);
   }
diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 6af92e60caff..51ba3572d43f 100644
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -511,7 +511,7 @@ public static function redirect($url = NULL, $context = []) {
     }
 
     self::setHttpHeader('Location', $url);
-    self::civiExit();
+    self::civiExit(0, ['url' => $url, 'context' => 'redirect']);
   }
 
   /**
@@ -1919,8 +1919,7 @@ public static function sendResponse(\Psr\Http\Message\ResponseInterface $respons
    * Perform any necessary actions prior to redirecting via POST.
    */
   public static function prePostRedirect() {
-    $config = CRM_Core_Config::singleton();
-    $config->userSystem->paypalBeforeRedirect();
+    CRM_Core_Config::singleton()->userSystem->prePostRedirect();
   }
 
 }
diff --git a/tests/phpunit/CRM/Core/Payment/PaypalStdTest.php b/tests/phpunit/CRM/Core/Payment/PaypalStdTest.php
new file mode 100644
index 000000000000..92a28eb376ad
--- /dev/null
+++ b/tests/phpunit/CRM/Core/Payment/PaypalStdTest.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Class CRM_Core_Payment_PaypalPro
+ * @group headless
+ */
+class CRM_Core_Payment_PaypalStdTest extends CiviUnitTestCase {
+
+  /**
+   * @var \CRM_Core_Payment_PayPalImpl
+   */
+  protected $processor;
+
+  /**
+   * @throws \CiviCRM_API3_Exception
+   */
+  public function setUp() {
+    parent::setUp();
+    $processorID = $this->processorCreate([
+      'payment_processor_type_id' => 'PayPal_Standard',
+      'is_recur' => TRUE,
+      'billing_mode' => 4,
+      'url_site' => 'https://www.paypal.com/',
+      'url_recur' => 'https://www.paypal.com/',
+      'class_name' => 'Payment_PayPalImpl',
+    ]);
+
+    $this->processor = Civi\Payment\System::singleton()->getById($processorID);
+  }
+
+  /**
+   * @throws \CRM_Core_Exception
+   */
+  public function tearDown() {
+    $this->quickCleanUpFinancialEntities();
+    parent::tearDown();
+  }
+
+  /**
+   * Test doing a one-off payment.
+   *
+   * @throws \Civi\Payment\Exception\PaymentProcessorException
+   */
+  public function testSinglePayment() {
+    $params = [];
+    $params['amount'] = 5.24;
+    $params['currency'] = 'USD';
+    $params['invoiceID'] = 'xyz';
+    $params['ip_address'] = '127.0.0.1';
+    $params['qfKey'] = 'w';
+    $params['currencyID'] = 'USD';
+    try {
+      $this->processor->doPayment($params);
+    }
+    catch (CRM_Core_Exception_PrematureExitException $e) {
+      $redirectValues = parse_url($e->errorData['url']);
+      $this->assertEquals('https', $redirectValues['scheme']);
+      $this->assertEquals('www.paypal.com', $redirectValues['host']);
+      $this->assertEquals('/cgi-bin/webscr', $redirectValues['path']);
+      $query = [];
+      parse_str($redirectValues['query'], $query);
+      $this->assertEquals(5.24, $query['amount']);
+      $this->assertEquals('CiviCRM_SP', $query['bn']);
+    }
+  }
+
+}

From 175f6d956cec618e9d76047816f27fa7e073b885 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 12:03:19 +1200
Subject: [PATCH 690/834] [REF] Remove unreachable lines

The function recur ONLY calls single if first is TRUE. Once we remove first from the if clause
we can see it applies if recur is TRUE or if recur is FALSE (or any other variant given we are using
truthiness). So the if can go
---
 CRM/Core/Payment/PayPalIPN.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index d63203a1553d..0330424e03ea 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -206,9 +206,7 @@ public function recur($input, $ids, $objects, $first) {
       return;
     }
 
-    $this->single($input, $ids, $objects,
-      TRUE, $first
-    );
+    $this->single($input, $ids, $objects, TRUE);
   }
 
   /**
@@ -216,25 +214,19 @@ public function recur($input, $ids, $objects, $first) {
    * @param array $ids
    * @param array $objects
    * @param bool $recur
-   * @param bool $first
    *
    * @return void
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public function single($input, $ids, $objects, $recur = FALSE, $first = FALSE) {
+  public function single($input, $ids, $objects, $recur = FALSE) {
     $contribution = &$objects['contribution'];
 
     // make sure the invoice is valid and matches what we have in the contribution record
-    if ((!$recur) || ($recur && $first)) {
-      if ($contribution->invoice_id != $input['invoice']) {
-        Civi::log()->debug('PayPalIPN: Invoice values dont match between database and IPN request. (ID: ' . $contribution->id . ').');
-        echo "Failure: Invoice values dont match between database and IPN request<p>";
-        return;
-      }
-    }
-    else {
-      $contribution->invoice_id = md5(uniqid(rand(), TRUE));
+    if ($contribution->invoice_id != $input['invoice']) {
+      Civi::log()->debug('PayPalIPN: Invoice values dont match between database and IPN request. (ID: ' . $contribution->id . ').');
+      echo "Failure: Invoice values dont match between database and IPN request<p>";
+      return;
     }
 
     if (!$recur) {

From a83a1f47f25254f79d6028d5648dae64a40a5706 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 12:16:48 +1200
Subject: [PATCH 691/834] [REF] Move not-actually shared-code out of shared
 code function

On looking at the recur function it turns out it never calls  without a
paymentStatus of 'Completed' - so the lines handling other payment statuses are not actually shared
between the 2 code paths but specifically belong to the 'main' (non-recur) code path.

Moving it out of this function we start to see there is very little shared code & probably no case for
the function to exist when we get down to it
---
 CRM/Core/Payment/PayPalIPN.php | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index d63203a1553d..9d3d2e393607 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -248,24 +248,6 @@ public function single($input, $ids, $objects, $recur = FALSE, $first = FALSE) {
       $contribution->total_amount = $input['amount'];
     }
 
-    $status = $input['paymentStatus'];
-    if ($status === 'Denied' || $status === 'Failed' || $status === 'Voided') {
-      $this->failed($objects);
-      return;
-    }
-    if ($status === 'Pending') {
-      Civi::log()->debug('Returning since contribution status is Pending');
-      return;
-    }
-    elseif ($status === 'Refunded' || $status === 'Reversed') {
-      $this->cancelled($objects);
-      return;
-    }
-    elseif ($status !== 'Completed') {
-      Civi::log()->debug('Returning since contribution status is not handled');
-      return;
-    }
-
     // check if contribution is already completed, if so we ignore this ipn
     $completedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
     if ($contribution->contribution_status_id == $completedStatusId) {
@@ -366,6 +348,23 @@ public function main() {
           return;
         }
       }
+      $status = $input['paymentStatus'];
+      if ($status === 'Denied' || $status === 'Failed' || $status === 'Voided') {
+        $this->failed($objects);
+        return;
+      }
+      if ($status === 'Pending') {
+        Civi::log()->debug('Returning since contribution status is Pending');
+        return;
+      }
+      if ($status === 'Refunded' || $status === 'Reversed') {
+        $this->cancelled($objects);
+        return;
+      }
+      if ($status !== 'Completed') {
+        Civi::log()->debug('Returning since contribution status is not handled');
+        return;
+      }
       $this->single($input, $ids, $objects);
     }
     catch (CRM_Core_Exception $e) {

From 460c1feffc66c5a94a99f2be93735566665f6d99 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 12:28:36 +1200
Subject: [PATCH 692/834] dev/core#1986 Alter default for  send notification to
 contributor checkbox on cancel or edit recurring to off

Per https://lab.civicrm.org/dev/core/-/issues/1986 this got strong support
---
 CRM/Contribute/Form/CancelSubscription.php | 1 -
 CRM/Contribute/Form/UpdateSubscription.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/CRM/Contribute/Form/CancelSubscription.php b/CRM/Contribute/Form/CancelSubscription.php
index ecb18817c51b..a1b8abf9e0cc 100644
--- a/CRM/Contribute/Form/CancelSubscription.php
+++ b/CRM/Contribute/Form/CancelSubscription.php
@@ -179,7 +179,6 @@ public function buildQuickForm() {
    */
   public function setDefaultValues() {
     return [
-      'is_notify' => 1,
       'send_cancel_request' => 1,
     ];
   }
diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php
index 51e218b99f3b..31e16f76cff9 100644
--- a/CRM/Contribute/Form/UpdateSubscription.php
+++ b/CRM/Contribute/Form/UpdateSubscription.php
@@ -131,7 +131,6 @@ public function setDefaultValues() {
     $this->_defaults['installments'] = $this->_subscriptionDetails->installments;
     $this->_defaults['campaign_id'] = $this->_subscriptionDetails->campaign_id;
     $this->_defaults['financial_type_id'] = $this->_subscriptionDetails->financial_type_id;
-    $this->_defaults['is_notify'] = 1;
     foreach ($this->editableScheduleFields as $field) {
       $this->_defaults[$field] = $this->_subscriptionDetails->$field ?? NULL;
     }

From 6ec388a8153c42225bc111ce78dcbfcaddb43154 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 18 Sep 2020 17:14:00 +1200
Subject: [PATCH 693/834] [REF] Remove checks as to whether entityShortName is
 in the component array

If entityShortName is not in components then formTaskClassName will never be set & later down the attempt to use
that variable in formTaskClassName::preProcessCommon MUST fail - ergo it is always in components.

To make it really explicit I added the exception & hard-coded list as I think it would be easy to revisit this
later without that
---
 CRM/Export/Form/Select.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php
index 8710d8523667..cb95ff243bc8 100644
--- a/CRM/Export/Form/Select.php
+++ b/CRM/Export/Form/Select.php
@@ -76,28 +76,28 @@ public function preProcess() {
     $this->_componentIds = [];
     $this->_componentClause = NULL;
 
-    // we need to determine component export
-    $components = CRM_Export_BAO_Export::getComponents();
-
     // FIXME: This should use a modified version of CRM_Contact_Form_Search::getModeValue but it doesn't have all the contexts
     // FIXME: Or better still, use CRM_Core_DAO_AllCoreTables::getBriefName($daoName) to get the $entityShortName
     $entityShortname = $this->getEntityShortName();
 
-    if (in_array($entityShortname, $components)) {
-      $this->_exportMode = constant('CRM_Export_Form_Select::' . strtoupper($entityShortname) . '_EXPORT');
-      $formTaskClassName = "CRM_{$entityShortname}_Form_Task";
-      $taskClassName = "CRM_{$entityShortname}_Task";
-      if (isset($formTaskClassName::$entityShortname)) {
-        $this::$entityShortname = $formTaskClassName::$entityShortname;
-        if (isset($formTaskClassName::$tableName)) {
-          $this::$tableName = $formTaskClassName::$tableName;
-        }
-      }
-      else {
-        $this::$entityShortname = $entityShortname;
-        $this::$tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($this->getDAOName()));
+    if (!in_array($entityShortname, ['Contact', 'Contribute', 'Member', 'Event', 'Pledge', 'Case', 'Grant', 'Activity'], TRUE)) {
+      // This is never reached - the exception here is just to clarify that entityShortName MUST be one of the above
+      // to save future refactorers & reviewers from asking that question.
+      throw new CRM_Core_Exception('Unreachable code');
+    }
+    $this->_exportMode = constant('CRM_Export_Form_Select::' . strtoupper($entityShortname) . '_EXPORT');
+    $formTaskClassName = "CRM_{$entityShortname}_Form_Task";
+    $taskClassName = "CRM_{$entityShortname}_Task";
+    if (isset($formTaskClassName::$entityShortname)) {
+      $this::$entityShortname = $formTaskClassName::$entityShortname;
+      if (isset($formTaskClassName::$tableName)) {
+        $this::$tableName = $formTaskClassName::$tableName;
       }
     }
+    else {
+      $this::$entityShortname = $entityShortname;
+      $this::$tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($this->getDAOName()));
+    }
 
     // get the submitted values based on search
     if ($this->_action == CRM_Core_Action::ADVANCED) {
@@ -110,7 +110,7 @@ public function preProcess() {
       $values = $this->controller->exportValues('Custom');
     }
     else {
-      if (in_array($entityShortname, $components) && $entityShortname !== 'Contact') {
+      if ($entityShortname !== 'Contact') {
         $values = $this->controller->exportValues('Search');
       }
       else {

From 059b1442f2663bc4b83404b1b6c6ded0cae2f2ad Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 13:53:43 +1200
Subject: [PATCH 694/834] [NFC] Cleanup in test class

Minor cleanup to test class (single quotes, Camel case entities for calling ipn, use getsingle)
---
 .../CRM/Core/Payment/PayPalIPNTest.php        | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php b/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php
index d51650131795..a073033f9097 100644
--- a/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/PayPalIPNTest.php
@@ -22,12 +22,6 @@ class CRM_Core_Payment_PayPalIPNTest extends CiviUnitTestCase {
   protected $_contributionPageID;
   protected $_paymentProcessorID;
   protected $_customFieldID;
-  /**
-   * IDs of entities created to support the tests.
-   *
-   * @var array
-   */
-  protected $ids = [];
 
   /**
    * Set up function.
@@ -36,8 +30,8 @@ public function setUp() {
     parent::setUp();
     $this->_paymentProcessorID = $this->paymentProcessorCreate(['is_test' => 0, 'payment_processor_type_id' => 'PayPal_Standard']);
     $this->_contactID = $this->individualCreate();
-    $contributionPage = $this->callAPISuccess('contribution_page', 'create', [
-      'title' => "Test Contribution Page",
+    $contributionPage = $this->callAPISuccess('ContributionPage', 'create', [
+      'title' => 'Test Contribution Page',
       'financial_type_id' => $this->_financialTypeID,
       'currency' => 'USD',
       'payment_processor' => $this->_paymentProcessorID,
@@ -50,6 +44,7 @@ public function setUp() {
    */
   public function tearDown() {
     $this->quickCleanUpFinancialEntities();
+    parent::tearDown();
   }
 
   /**
@@ -111,11 +106,11 @@ public function testIPNPaymentRecurSuccess() {
     $this->setupRecurringPaymentProcessorTransaction([], ['total_amount' => '15.00']);
     $paypalIPN = new CRM_Core_Payment_PayPalIPN($this->getPaypalRecurTransaction());
     $paypalIPN->main();
-    $contribution1 = $this->callAPISuccess('contribution', 'getsingle', ['id' => $this->_contributionID]);
+    $contribution1 = $this->callAPISuccess('Contribution', 'getsingle', ['id' => $this->_contributionID]);
     $this->assertEquals(1, $contribution1['contribution_status_id']);
     $this->assertEquals('8XA571746W2698126', $contribution1['trxn_id']);
     // source gets set by processor
-    $this->assertTrue(substr($contribution1['contribution_source'], 0, 20) == "Online Contribution:");
+    $this->assertTrue(substr($contribution1['contribution_source'], 0, 20) === 'Online Contribution:');
     $contributionRecur = $this->callAPISuccess('contribution_recur', 'getsingle', ['id' => $this->_contributionRecurID]);
     $this->assertEquals(5, $contributionRecur['contribution_status_id']);
     $paypalIPN = new CRM_Core_Payment_PayPalIPN($this->getPaypalRecurSubsequentTransaction());
@@ -301,22 +296,22 @@ public function testhookAlterIPNDataOnIPNPaymentSuccess() {
     ];
     $this->_contributionID = $this->contributionCreate($params);
     $this->createCustomField();
-    $contribution = $this->callAPISuccess('contribution', 'get', ['id' => $this->_contributionID, 'sequential' => 1]);
+    $contribution = $this->callAPISuccessGetSingle('contribution', ['id' => $this->_contributionID]);
     // assert that contribution created before handling payment via paypal standard has no transaction id set and pending status
-    $this->assertEquals(NULL, $contribution['values'][0]['trxn_id']);
-    $this->assertEquals($pendingStatusID, $contribution['values'][0]['contribution_status_id']);
+    $this->assertEquals(NULL, $contribution['trxn_id']);
+    $this->assertEquals($pendingStatusID, $contribution['contribution_status_id']);
     $this->hookClass->setHook('civicrm_postIPNProcess', [$this, 'hookCiviCRMAlterIPNData']);
     global $_REQUEST;
     $_REQUEST = ['q' => CRM_Utils_System::url('civicrm/payment/ipn/' . $this->_paymentProcessorID)] + $this->getPaypalTransaction();
 
     $mut = new CiviMailUtils($this, TRUE);
-    $payment = CRM_Core_Payment::handlePaymentMethod('PaymentNotification', ['processor_id' => $this->_paymentProcessorID]);
+    CRM_Core_Payment::handlePaymentMethod('PaymentNotification', ['processor_id' => $this->_paymentProcessorID]);
 
-    $contribution = $this->callAPISuccess('contribution', 'get', ['id' => $this->_contributionID, 'sequential' => 1]);
+    $contribution = $this->callAPISuccessGetSingle('Contribution', ['id' => $this->_contributionID, 'sequential' => 1]);
     // assert that contribution is completed after getting response from paypal standard which has transaction id set and completed status
-    $this->assertEquals($_REQUEST['txn_id'], $contribution['values'][0]['trxn_id']);
-    $this->assertEquals($completedStatusID, $contribution['values'][0]['contribution_status_id']);
-    $this->assertEquals('test12345', $contribution['values'][0]['custom_' . $this->_customFieldID]);
+    $this->assertEquals($_REQUEST['txn_id'], $contribution['trxn_id']);
+    $this->assertEquals($completedStatusID, $contribution['contribution_status_id']);
+    $this->assertEquals('test12345', $contribution['custom_' . $this->_customFieldID]);
   }
 
   /**

From d73cf2c385badb8856e38fde8f6fe5a432a0b7df Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 14:36:29 +1200
Subject: [PATCH 695/834] Fix deprecation notice

User deprecated function: Deprecated function CRM_Core_BAO_Cache::cleanKey, use CRM_Utils_Cache::cleanKey. Array ( [civi.tag] => deprecated ) in CRM_Core_Error_Log->log() (line 58 of /Users/eileenmcnaughton/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/Error/Log.php).
---
 CRM/Core/PrevNextCache/Sql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/PrevNextCache/Sql.php b/CRM/Core/PrevNextCache/Sql.php
index 7f8696732fed..85cf78b139ef 100644
--- a/CRM/Core/PrevNextCache/Sql.php
+++ b/CRM/Core/PrevNextCache/Sql.php
@@ -277,7 +277,7 @@ public function cleanup() {
       AND        c.created_date < date_sub( NOW( ), INTERVAL %2 day )
     ";
     $params = [
-      1 => [CRM_Core_BAO_Cache::cleanKey('CiviCRM Search PrevNextCache'), 'String'],
+      1 => [CRM_Utils_Cache::cleanKey('CiviCRM Search PrevNextCache'), 'String'],
       2 => [self::cacheDays, 'Integer'],
     ];
     CRM_Core_DAO::executeQuery($sql, $params);

From fecbf5ba9b7eb33d050afe1d8aa36603e6d7458d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 18:57:17 +1200
Subject: [PATCH 696/834] Fix civi version for greenwich

We are releasing this as a stable part of 5.31 - xml should reflect that
---
 ext/greenwich/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml
index edf93149f96a..04e87a48a3a8 100644
--- a/ext/greenwich/info.xml
+++ b/ext/greenwich/info.xml
@@ -19,9 +19,9 @@
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>
-  <develStage>alpha</develStage>
+  <develStage>stable</develStage>
   <compatibility>
-    <ver>5.0</ver>
+    <ver>5.31</ver>
   </compatibility>
   <classloader>
     <psr4 prefix="Civi\" path="Civi"/>

From ba63d8136006a5dc1f499fddbec922352f54f775 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 21 Sep 2020 19:26:01 +1200
Subject: [PATCH 697/834] [REF] Remove now used parameter & make function
 protected

This function used to be called by LineItem api but we removed that when adding v4 line item api

A universe check shows it's not otherwise called so it's only called with the same class, and making
it protected makes that clear. isLineItem is not passed in that one place
---
 CRM/Contribute/BAO/Contribution.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index cd261dc549dd..4df50cdd4aef 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4155,11 +4155,11 @@ public static function getContributionBalance($contributionId, $contributionTota
    * Get the tax amount (misnamed function).
    *
    * @param array $params
-   * @param bool $isLineItem
    *
    * @return array
+   * @throws \CiviCRM_API3_Exception
    */
-  public static function checkTaxAmount($params, $isLineItem = FALSE) {
+  protected static function checkTaxAmount($params) {
     $taxRates = CRM_Core_PseudoConstant::getTaxRates();
 
     // Update contribution.
@@ -4205,8 +4205,7 @@ public static function checkTaxAmount($params, $isLineItem = FALSE) {
 
     // New Contribution and update of contribution with tax rate financial type
     if (isset($params['financial_type_id']) && array_key_exists($params['financial_type_id'], $taxRates) &&
-      empty($params['skipLineItem']) && !$isLineItem
-    ) {
+      empty($params['skipLineItem'])) {
       $taxRateParams = $taxRates[$params['financial_type_id']];
       $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount(CRM_Utils_Array::value('total_amount', $params), $taxRateParams);
       $params['tax_amount'] = round($taxAmount['tax_amount'], 2);

From 4bfba76e4fa1edeaa0ecf89daf9e98e5b7f8cab4 Mon Sep 17 00:00:00 2001
From: magnolia61 <richard.van.oosterhout@gmail.com>
Date: Mon, 21 Sep 2020 12:45:52 +0200
Subject: [PATCH 698/834] Set participant status notification to false by
 default

---
 templates/CRM/Event/Form/Participant.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index 9cded07e8e16..dee4ac24db50 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -437,7 +437,7 @@
     notificationStatusIds = notificationStatusIds.split(',');
     if (cj.inArray(cj('select#status_id option:selected').val(), notificationStatusIds) > -1) {
       cj("#notify").show();
-      cj("#is_notify").prop('checked', true);
+      cj("#is_notify").prop('checked', false);
     }
     else {
       cj("#notify").hide();

From 887e9a49561de7de4ca6907c71b136f2d269c42b Mon Sep 17 00:00:00 2001
From: "Laryn - CEDC.org" <laryn@cedc.org>
Date: Mon, 21 Sep 2020 12:56:11 -0500
Subject: [PATCH 699/834] Check if BACKDROP_ROOT is defined already

---
 CRM/Utils/System/Backdrop.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CRM/Utils/System/Backdrop.php b/CRM/Utils/System/Backdrop.php
index 83b66078cd1c..7821682921dc 100644
--- a/CRM/Utils/System/Backdrop.php
+++ b/CRM/Utils/System/Backdrop.php
@@ -524,7 +524,9 @@ public function loadBootStrap($params = [], $loadUser = TRUE, $throwError = TRUE
     }
     // load Backdrop bootstrap
     chdir($cmsPath);
-    define('BACKDROP_ROOT', $cmsPath);
+    if (!defined('BACKDROP_ROOT')) {
+        define('BACKDROP_ROOT', $cmsPath);
+    }
 
     // For Backdrop multi-site CRM-11313
     if ($realPath && strpos($realPath, 'sites/all/modules/') === FALSE) {

From c9eaf5decbe7fab4716eef97553f99c048842d0e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 21 Sep 2020 14:20:10 -0400
Subject: [PATCH 700/834] Fix customGroup getTableNameByEntityName to recognize
 all entities

---
 CRM/Core/BAO/CustomGroup.php | 43 +++---------------------------------
 1 file changed, 3 insertions(+), 40 deletions(-)

diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index 3a0dac33f161..52a96839fb92 100644
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -1121,53 +1121,16 @@ public static function &getActiveGroups($entityType, $path, $cidToken = '%%cid%%
    * @see _apachesolr_civiAttachments_dereference_file_parent
    */
   public static function getTableNameByEntityName($entityType) {
-    $tableName = '';
     switch ($entityType) {
       case 'Contact':
       case 'Individual':
       case 'Household':
       case 'Organization':
-        $tableName = 'civicrm_contact';
-        break;
-
-      case 'Contribution':
-        $tableName = 'civicrm_contribution';
-        break;
-
-      case 'Group':
-        $tableName = 'civicrm_group';
-        break;
-
-      // DRAFTING: Verify if we cannot make it pluggable
-
-      case 'Activity':
-        $tableName = 'civicrm_activity';
-        break;
-
-      case 'Relationship':
-        $tableName = 'civicrm_relationship';
-        break;
-
-      case 'Membership':
-        $tableName = 'civicrm_membership';
-        break;
-
-      case 'Participant':
-        $tableName = 'civicrm_participant';
-        break;
-
-      case 'Event':
-        $tableName = 'civicrm_event';
-        break;
-
-      case 'Grant':
-        $tableName = 'civicrm_grant';
-        break;
+        return 'civicrm_contact';
 
-      // need to add cases for Location, Address
+      default:
+        return CRM_Core_DAO_AllCoreTables::getTableForEntityName($entityType);
     }
-
-    return $tableName;
   }
 
   /**

From 7a376e65974857ad6f3d52faa8079315cee9c2ba Mon Sep 17 00:00:00 2001
From: "Laryn - CEDC.org" <laryn@cedc.org>
Date: Mon, 21 Sep 2020 15:55:57 -0500
Subject: [PATCH 701/834] Update Backdrop.php

---
 CRM/Utils/System/Backdrop.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Utils/System/Backdrop.php b/CRM/Utils/System/Backdrop.php
index 7821682921dc..93342e256f36 100644
--- a/CRM/Utils/System/Backdrop.php
+++ b/CRM/Utils/System/Backdrop.php
@@ -525,7 +525,7 @@ public function loadBootStrap($params = [], $loadUser = TRUE, $throwError = TRUE
     // load Backdrop bootstrap
     chdir($cmsPath);
     if (!defined('BACKDROP_ROOT')) {
-        define('BACKDROP_ROOT', $cmsPath);
+      define('BACKDROP_ROOT', $cmsPath);
     }
 
     // For Backdrop multi-site CRM-11313

From 584b84649db761911c713ea06c981eb532717ae4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 21 Sep 2020 15:28:45 -0700
Subject: [PATCH 702/834] api_v3_MultilingualTest - Skip Cxn entities

---
 tests/phpunit/api/v3/MultilingualTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/phpunit/api/v3/MultilingualTest.php b/tests/phpunit/api/v3/MultilingualTest.php
index 0f62c40914c6..7c23093bd694 100644
--- a/tests/phpunit/api/v3/MultilingualTest.php
+++ b/tests/phpunit/api/v3/MultilingualTest.php
@@ -101,6 +101,8 @@ public function testAllEntities() {
     ];
     // deprecated or API.Get is not supported/implemented
     $skippableEntities = [
+      'Cxn',
+      'CxnApp',
       'Logging',
       'MailingEventConfirm',
       'MailingEventResubscribe',

From f63560eaa8f20be55a770f2cd8e74b459664e1ad Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 22 Sep 2020 13:04:34 +1200
Subject: [PATCH 703/834] Add bootstrap bundle to search

---
 ext/search/CRM/Search/Page/Ang.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index e38271a694cd..82508a201bb2 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -42,6 +42,7 @@ public function run() {
 
     Civi::resources()
       ->addPermissions(['edit groups', 'administer reserved groups'])
+      ->addBundle('bootstrap3')
       ->addVars('search', $vars);
 
     // Load angular module

From 24bff998c6ea49dc382f570c1475b8f97ca2ef47 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 21 Sep 2020 21:16:22 -0400
Subject: [PATCH 704/834] Remove obsolete load-bootstrap.js

---
 CRM/Api4/Page/Api4Explorer.php | 1 -
 js/load-bootstrap.js           | 7 -------
 2 files changed, 8 deletions(-)
 delete mode 100644 js/load-bootstrap.js

diff --git a/CRM/Api4/Page/Api4Explorer.php b/CRM/Api4/Page/Api4Explorer.php
index 8f2942d94207..d78ef91ddc55 100644
--- a/CRM/Api4/Page/Api4Explorer.php
+++ b/CRM/Api4/Page/Api4Explorer.php
@@ -43,7 +43,6 @@ public function run() {
       ->addBundle('bootstrap3')
       ->addVars('api4', $vars)
       ->addPermissions(['access debug output', 'edit groups', 'administer reserved groups'])
-      ->addScriptFile('civicrm', 'js/load-bootstrap.js')
       ->addScriptFile('civicrm', 'bower_components/js-yaml/dist/js-yaml.min.js')
       ->addScriptFile('civicrm', 'bower_components/marked/marked.min.js')
       ->addScriptFile('civicrm', 'bower_components/google-code-prettify/bin/prettify.min.js')
diff --git a/js/load-bootstrap.js b/js/load-bootstrap.js
deleted file mode 100644
index e528805a181d..000000000000
--- a/js/load-bootstrap.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Loads a copy of shoreditch's bootstrap if bootstrap is missing
-CRM.$(function($) {
-  if (!$.isFunction($.fn.dropdown)) {
-    //CRM.loadScript(CRM.vars.api4.basePath + 'lib/shoreditch/dropdown.js');
-    //$('head').append('<link type="text/css" rel="stylesheet" href="' + CRM.vars.api4.basePath + 'lib/shoreditch/bootstrap.css" />');
-  }
-});

From 28344f75bf5d3578dab3d7cf1f76a58a904dbac6 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 22 Sep 2020 12:01:44 +1000
Subject: [PATCH 705/834] [REF] Update composer compile plugin to latest
 version

---
 composer.json |  2 +-
 composer.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index da8da1a5244a..42e0c075f673 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,7 @@
     "pear/db": "1.10",
     "scssphp/scssphp": "~1.2",
     "padaliyajay/php-autoprefixer": "~1.2",
-    "civicrm/composer-compile-plugin": "~0.6"
+    "civicrm/composer-compile-plugin": "~0.7"
   },
   "scripts": {
     "post-install-cmd": [
diff --git a/composer.lock b/composer.lock
index 66e59d5c7616..1b958e1b4e41 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0a66565129698ff5013c06514c11c6a5",
+    "content-hash": "876c343676d03c0d5a945ba4b428bce0",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -299,16 +299,16 @@
         },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.6",
+            "version": "v0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "2f6925745d9d4b3857cc23b2842a2c3db6d66c57"
+                "reference": "7d4a89f7a924ac5844f5da0f12a04a86e2435344"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/2f6925745d9d4b3857cc23b2842a2c3db6d66c57",
-                "reference": "2f6925745d9d4b3857cc23b2842a2c3db6d66c57",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/7d4a89f7a924ac5844f5da0f12a04a86e2435344",
+                "reference": "7d4a89f7a924ac5844f5da0f12a04a86e2435344",
                 "shasum": ""
             },
             "require": {
@@ -340,7 +340,7 @@
                 }
             ],
             "description": "Define a 'compile' event for all packages in the dependency-graph",
-            "time": "2020-09-14T10:26:03+00:00"
+            "time": "2020-09-22T01:52:11+00:00"
         },
         {
             "name": "civicrm/composer-downloads-plugin",

From 3e358ffb8f36c198e84f0a967902da0b2e69cf06 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 22 Sep 2020 16:16:07 +1200
Subject: [PATCH 706/834] [REF] Finally remove deprecated ids handling

We've been pretty clear for a long time the only supported way to call crud functions is via the api.
We noisily deprecated ids about 9 months ago & it has been not-preferred for much longer
I only found one place in universe where ids IS passed in
https://github.com/lcdservices/biz.lcdservices.movecontrib/edit/master/CRM/LCD/MoveContrib/BAO/MoveContrib.php
---
 CRM/Contribute/BAO/Contribution.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 4df50cdd4aef..0bfe04d5d1e4 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -445,8 +445,6 @@ public static function getNumTermsByContributionAndMembershipType($membershipTyp
    *
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
-   * @param array $ids
-   *   The array that holds all the db ids.
    *
    * @return CRM_Contribute_BAO_Contribution
    *
@@ -454,15 +452,11 @@ public static function getNumTermsByContributionAndMembershipType($membershipTyp
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function create(&$params, $ids = []) {
+  public static function create(&$params) {
 
     $transaction = new CRM_Core_Transaction();
 
     try {
-      if (!isset($params['id']) && isset($ids['contribution'])) {
-        CRM_Core_Error::deprecatedFunctionWarning('ids should not be used for contribution create');
-        $params['id'] = $ids['contribution'];
-      }
       $contribution = self::add($params);
     }
     catch (CRM_Core_Exception $e) {

From 7d2c39725d5633dc3c08d79571e05cb1814ec4a2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 22 Sep 2020 16:59:48 +1200
Subject: [PATCH 707/834] [REF] Remove wrangling on activityType param

There is only 1 remaining place that calls this function & does not specifiy activityType. This fixes
that place to pass in activityType and stops attempting to calculate activityType
based on in-function guess work
---
 CRM/Activity/BAO/Activity.php       | 6 +-----
 CRM/Contribute/BAO/Contribution.php | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index cb7f29c43024..1e097c151c60 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -1694,14 +1694,11 @@ public static function getContactActivity($contactId) {
    */
   public static function addActivity(
     $activity,
-    $activityType = 'Membership Signup',
+    $activityType,
     $targetContactID = NULL,
     $params = []
   ) {
     $date = date('YmdHis');
-    if ($activity->__table === 'civicrm_participant' && $activityType !== 'Email') {
-      $activityType = 'Event Registration';
-    }
     if ($activity->__table == 'civicrm_contribution') {
       // create activity record only for Completed Contributions
       $contributionCompletedStatusId = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
@@ -1712,7 +1709,6 @@ public static function addActivity(
         }
         $params['status_id'] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', 'Scheduled');
       }
-      $activityType = 'Contribution';
 
       // retrieve existing activity based on source_record_id and activity_type
       if (empty($params['id'])) {
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 4df50cdd4aef..3b8c28c3e28b 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4493,7 +4493,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
         $targetContactID = $contribution->contact_id;
         $contribution->contact_id = $contributionContactID;
       }
-      CRM_Activity_BAO_Activity::addActivity($contribution, NULL, $targetContactID);
+      CRM_Activity_BAO_Activity::addActivity($contribution, 'Contribution', $targetContactID);
     }
 
     if (self::isEmailReceipt($input, $contribution->contribution_page_id, $recurringContributionID)) {

From 99d57de1d3ffa77d03345187677705dd2c7417f6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 15:34:30 +1200
Subject: [PATCH 708/834] Determine name of DAO when needed rather than passing
 a variable around

---
 CRM/Dedupe/MergeHandler.php | 40 +++++++++++++++++++++++++++++++++----
 CRM/Dedupe/Merger.php       |  6 +++---
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/CRM/Dedupe/MergeHandler.php b/CRM/Dedupe/MergeHandler.php
index f67371d6e081..e12cd7519d07 100644
--- a/CRM/Dedupe/MergeHandler.php
+++ b/CRM/Dedupe/MergeHandler.php
@@ -196,18 +196,19 @@ public function getLocationBlocksToMerge(): array {
    * This is intended as a refactoring step - not the long term function. Do not
    * call from any function other than the one it is taken from (Merger::mergeLocations).
    *
-   * @param string $daoName
    * @param int $otherBlockId
    * @param string $name
    * @param int $blkCount
    *
-   * @return mixed
+   * @return CRM_Core_DAO_Address|CRM_Core_DAO_Email|CRM_Core_DAO_IM|CRM_Core_DAO_Phone|CRM_Core_DAO_Website
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function copyDataToNewBlockDAO(string $daoName, $otherBlockId, $name, $blkCount) {
+  public function copyDataToNewBlockDAO($otherBlockId, $name, $blkCount) {
     $locationBlocks = CRM_Dedupe_Merger::getLocationBlockInfo();
     $migrationInfo = $this->getMigrationInfo();
     // For the block which belongs to other-contact, link the location block to main-contact
-    $otherBlockDAO = new $daoName();
+    $otherBlockDAO = $this->getDAOForLocationEntity($name);
     $otherBlockDAO->contact_id = $this->getToKeepID();
 
     // Get the ID of this block on the 'other' contact, otherwise skip
@@ -225,4 +226,35 @@ public function copyDataToNewBlockDAO(string $daoName, $otherBlockId, $name, $bl
     return $otherBlockDAO;
   }
 
+  /**
+   * Get the DAO object appropriate to the location entity.
+   *
+   * @param string $entity
+   *
+   * @return CRM_Core_DAO_Address|CRM_Core_DAO_Email|CRM_Core_DAO_IM|CRM_Core_DAO_Phone|CRM_Core_DAO_Website
+   * @throws \CRM_Core_Exception
+   */
+  public function getDAOForLocationEntity($entity) {
+    switch ($entity) {
+      case 'email':
+        return new CRM_Core_DAO_Email();
+
+      case 'address':
+        return new CRM_Core_DAO_Address();
+
+      case 'phone':
+        return new CRM_Core_DAO_Phone();
+
+      case 'website':
+        return new CRM_Core_DAO_Website();
+
+      case 'im':
+        return new CRM_Core_DAO_IM();
+
+      default:
+        // Mostly here, along with the switch over a more concise format, to help IDEs understand the possibilities.
+        throw new CRM_Core_Exception('Unsupported entity');
+    }
+  }
+
 }
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index d72c62414586..745d7464e7d6 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1820,7 +1820,7 @@ public static function mergeLocations($mergeHandler) {
           if (!$otherBlockId) {
             continue;
           }
-          $otherBlockDAO = $mergeHandler->copyDataToNewBlockDAO($daoName, $otherBlockId, $name, $blkCount);
+          $otherBlockDAO = $mergeHandler->copyDataToNewBlockDAO($otherBlockId, $name, $blkCount);
 
           // If we're deliberately setting this as primary then add the flag
           // and remove it from the current primary location (if there is one).
@@ -1829,7 +1829,7 @@ public static function mergeLocations($mergeHandler) {
           if (!$changePrimary && $set_primary == "1") {
             $otherBlockDAO->is_primary = 1;
             if ($primaryDAOId) {
-              $removePrimaryDAO = new $daoName();
+              $removePrimaryDAO = $mergeHandler->getDAOForLocationEntity($name);
               $removePrimaryDAO->id = $primaryDAOId;
               $removePrimaryDAO->is_primary = 0;
               $blocksDAO[$name]['update'][$primaryDAOId] = $removePrimaryDAO;
@@ -1848,7 +1848,7 @@ public static function mergeLocations($mergeHandler) {
 
           // overwrite - need to delete block which belongs to main-contact.
           if (!empty($mainBlockId) && $values['is_replace']) {
-            $deleteDAO = new $daoName();
+            $deleteDAO = $mergeHandler->getDAOForLocationEntity($name);
             $deleteDAO->id = $mainBlockId;
             $deleteDAO->find(TRUE);
 

From 12ffd868aae80951c39eb44b15ae0b249c441b6c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 07:40:33 +1200
Subject: [PATCH 709/834] Minor test fix

---
 tests/phpunit/CRM/Member/Form/MembershipTest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php
index 4fd886b55b3e..91bb01be62f5 100644
--- a/tests/phpunit/CRM/Member/Form/MembershipTest.php
+++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php
@@ -1574,10 +1574,10 @@ public function testMembershipViewContributionOwnerDifferent() {
     $contactId2 = $this->individualCreate();
 
     // create new membership type
-    $membershipTypeAnnualFixed = $this->callAPISuccess('membership_type', 'create', [
+    $membershipTypeAnnualFixed = $this->callAPISuccess('MembershipType', 'create', [
       'domain_id' => 1,
       'name' => 'AnnualFixed 2',
-      'member_of_contact_id' => 23,
+      'member_of_contact_id' => $this->organizationCreate(),
       'duration_unit' => 'year',
       'minimum_fee' => 50,
       'duration_interval' => 1,
@@ -1600,6 +1600,7 @@ public function testMembershipViewContributionOwnerDifferent() {
       'total_amount' => 25,
       'financial_type_id' => 2,
       'contact_id' => $contactId2,
+      'receive_date' => '2020-08-08',
     ];
     $contribution1 = CRM_Member_BAO_Membership::recordMembershipContribution($contriParams);
 
@@ -1609,6 +1610,7 @@ public function testMembershipViewContributionOwnerDifferent() {
       'total_amount' => 25,
       'financial_type_id' => 2,
       'contact_id' => $contactId2,
+      'receive_date' => '2020-07-08',
     ];
     $contribution2 = CRM_Member_BAO_Membership::recordMembershipContribution($contriParams);
 
@@ -1621,7 +1623,7 @@ public function testMembershipViewContributionOwnerDifferent() {
     $membershipViewForm->preProcess();
 
     // get contribution rows related to membership payments
-    $templateVar = $membershipViewForm->getTemplate()->get_template_vars('rows');
+    $templateVar = $membershipViewForm::getTemplate()->get_template_vars('rows');
 
     $this->assertEquals($templateVar[0]['contribution_id'], $contribution1->id);
     $this->assertEquals($templateVar[0]['contact_id'], $contactId2);

From 0afd87e2a8cdc1fc49f02af3fffd7435774b143c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 08:02:24 +1200
Subject: [PATCH 710/834] Minor test data fix up  - ensure domain contact's
 email is primary

---
 .../CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
index 7e806cafeecd..7a667dbdd614 100644
--- a/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
+++ b/tests/phpunit/CRM/Report/Form/Contribute/fixtures/dataset-ascii.sql
@@ -76,7 +76,7 @@ INSERT INTO `civicrm_contribution` (`id`, `contact_id`, `financial_type_id`, `co
 --
 
 INSERT INTO `civicrm_email` (`id`, `contact_id`, `location_type_id`, `email`, `is_primary`, `is_billing`, `on_hold`, `is_bulkmail`, `hold_date`, `reset_date`, `signature_text`, `signature_html`) VALUES
-(1, 1, 1, 'fixme.domainemail@example.org', 0, 0, 0, 0, NULL, NULL, NULL, NULL),
+(1, 1, 1, 'fixme.domainemail@example.org', 1, 0, 0, 0, NULL, NULL, NULL, NULL),
 (7, 71, 1, 'grantm@fishmail.net', 1, 0, 0, 0, NULL, NULL, NULL, NULL),
 (41, 2, 1, 'merrie@testmail.co.nz', 1, 0, 0, 0, NULL, NULL, NULL, NULL),
 (42, 2, 1, 'merriechowski95@notmail.info', 0, 0, 0, 0, NULL, NULL, NULL, NULL),

From c3ea05e1e032fc9f8978e5a3a6b49a5b9b37f698 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 15:49:12 +1200
Subject: [PATCH 711/834] [Ref] Move determination about location type to the
 getDAOForLocationEntity function

This seems more legible than the metadata trick....
---
 CRM/Dedupe/MergeHandler.php | 40 +++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/CRM/Dedupe/MergeHandler.php b/CRM/Dedupe/MergeHandler.php
index e12cd7519d07..77d112b8ea4b 100644
--- a/CRM/Dedupe/MergeHandler.php
+++ b/CRM/Dedupe/MergeHandler.php
@@ -208,17 +208,13 @@ public function copyDataToNewBlockDAO($otherBlockId, $name, $blkCount) {
     $locationBlocks = CRM_Dedupe_Merger::getLocationBlockInfo();
     $migrationInfo = $this->getMigrationInfo();
     // For the block which belongs to other-contact, link the location block to main-contact
-    $otherBlockDAO = $this->getDAOForLocationEntity($name);
+    $otherBlockDAO = $this->getDAOForLocationEntity($name, $this->getSelectedLocationType($name, $blkCount));
     $otherBlockDAO->contact_id = $this->getToKeepID();
 
     // Get the ID of this block on the 'other' contact, otherwise skip
     $otherBlockDAO->id = $otherBlockId;
 
     // Add/update location and type information from the form, if applicable
-    if ($locationBlocks[$name]['hasLocation']) {
-      $locTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['locTypeId'] ?? NULL;
-      $otherBlockDAO->location_type_id = $locTypeId;
-    }
     if ($locationBlocks[$name]['hasType']) {
       $typeTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['typeTypeId'] ?? NULL;
       $otherBlockDAO->{$locationBlocks[$name]['hasType']} = $typeTypeId;
@@ -231,25 +227,35 @@ public function copyDataToNewBlockDAO($otherBlockId, $name, $blkCount) {
    *
    * @param string $entity
    *
+   * @param null $locationTypeID
+   *
    * @return CRM_Core_DAO_Address|CRM_Core_DAO_Email|CRM_Core_DAO_IM|CRM_Core_DAO_Phone|CRM_Core_DAO_Website
    * @throws \CRM_Core_Exception
    */
-  public function getDAOForLocationEntity($entity) {
+  public function getDAOForLocationEntity($entity, $locationTypeID = NULL) {
     switch ($entity) {
       case 'email':
-        return new CRM_Core_DAO_Email();
+        $dao = new CRM_Core_DAO_Email();
+        $dao->location_type_id = $locationTypeID;
+        return $dao;
 
       case 'address':
-        return new CRM_Core_DAO_Address();
+        $dao = new CRM_Core_DAO_Address();
+        $dao->location_type_id = $locationTypeID;
+        return $dao;
 
       case 'phone':
-        return new CRM_Core_DAO_Phone();
+        $dao = new CRM_Core_DAO_Phone();
+        $dao->location_type_id = $locationTypeID;
+        return $dao;
 
       case 'website':
         return new CRM_Core_DAO_Website();
 
       case 'im':
-        return new CRM_Core_DAO_IM();
+        $dao = new CRM_Core_DAO_IM();
+        $dao->location_type_id = $locationTypeID;
+        return $dao;
 
       default:
         // Mostly here, along with the switch over a more concise format, to help IDEs understand the possibilities.
@@ -257,4 +263,18 @@ public function getDAOForLocationEntity($entity) {
     }
   }
 
+  /**
+   * Get the selected location type for the given location block.
+   *
+   * This will retrieve any user selection if they specified which location to move a block to.
+   *
+   * @param string $entity
+   * @param int $blockIndex
+   *
+   * @return int|null
+   */
+  protected function getSelectedLocationType($entity, $blockIndex) {
+    return $this->getMigrationInfo()['location_blocks'][$entity][$blockIndex]['locTypeId'] ?? NULL;
+  }
+
 }

From 443b070ff9d0a8eb59c0ac53cf593c93748c65d8 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 17 Sep 2020 16:34:10 +1200
Subject: [PATCH 712/834] dev/core#2047 [REF] Move calculation of 'type' to
 copyDataToNewBlockDAO

---
 CRM/Dedupe/MergeHandler.php | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/CRM/Dedupe/MergeHandler.php b/CRM/Dedupe/MergeHandler.php
index 77d112b8ea4b..654e87c20930 100644
--- a/CRM/Dedupe/MergeHandler.php
+++ b/CRM/Dedupe/MergeHandler.php
@@ -205,20 +205,11 @@ public function getLocationBlocksToMerge(): array {
    * @throws \CRM_Core_Exception
    */
   public function copyDataToNewBlockDAO($otherBlockId, $name, $blkCount) {
-    $locationBlocks = CRM_Dedupe_Merger::getLocationBlockInfo();
-    $migrationInfo = $this->getMigrationInfo();
     // For the block which belongs to other-contact, link the location block to main-contact
-    $otherBlockDAO = $this->getDAOForLocationEntity($name, $this->getSelectedLocationType($name, $blkCount));
+    $otherBlockDAO = $this->getDAOForLocationEntity($name, $this->getSelectedLocationType($name, $blkCount), $this->getSelectedType($name, $blkCount));
     $otherBlockDAO->contact_id = $this->getToKeepID();
-
     // Get the ID of this block on the 'other' contact, otherwise skip
     $otherBlockDAO->id = $otherBlockId;
-
-    // Add/update location and type information from the form, if applicable
-    if ($locationBlocks[$name]['hasType']) {
-      $typeTypeId = $migrationInfo['location_blocks'][$name][$blkCount]['typeTypeId'] ?? NULL;
-      $otherBlockDAO->{$locationBlocks[$name]['hasType']} = $typeTypeId;
-    }
     return $otherBlockDAO;
   }
 
@@ -227,12 +218,13 @@ public function copyDataToNewBlockDAO($otherBlockId, $name, $blkCount) {
    *
    * @param string $entity
    *
-   * @param null $locationTypeID
+   * @param int|null $locationTypeID
+   * @param int|null $typeID
    *
    * @return CRM_Core_DAO_Address|CRM_Core_DAO_Email|CRM_Core_DAO_IM|CRM_Core_DAO_Phone|CRM_Core_DAO_Website
    * @throws \CRM_Core_Exception
    */
-  public function getDAOForLocationEntity($entity, $locationTypeID = NULL) {
+  public function getDAOForLocationEntity($entity, $locationTypeID = NULL, $typeID = NULL) {
     switch ($entity) {
       case 'email':
         $dao = new CRM_Core_DAO_Email();
@@ -247,10 +239,13 @@ public function getDAOForLocationEntity($entity, $locationTypeID = NULL) {
       case 'phone':
         $dao = new CRM_Core_DAO_Phone();
         $dao->location_type_id = $locationTypeID;
+        $dao->phone_type_id = $typeID;
         return $dao;
 
       case 'website':
-        return new CRM_Core_DAO_Website();
+        $dao = new CRM_Core_DAO_Website();
+        $dao->website_type_id = $typeID;
+        return $dao;
 
       case 'im':
         $dao = new CRM_Core_DAO_IM();
@@ -277,4 +272,18 @@ protected function getSelectedLocationType($entity, $blockIndex) {
     return $this->getMigrationInfo()['location_blocks'][$entity][$blockIndex]['locTypeId'] ?? NULL;
   }
 
+  /**
+   * Get the selected type for the given location block.
+   *
+   * This will retrieve any user selection if they specified which type to move a block to (e.g 'Mobile' for phone).
+   *
+   * @param string $entity
+   * @param int $blockIndex
+   *
+   * @return int|null
+   */
+  protected function getSelectedType($entity, $blockIndex) {
+    return $this->getMigrationInfo()['location_blocks'][$entity][$blockIndex]['typeTypeId'] ?? NULL;
+  }
+
 }

From 8cf1fcacf548873dd2cd0b2956b2a25aaa1980ee Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 11:26:56 +1200
Subject: [PATCH 713/834] Extend test debug

Maybe this will help us understand why the test is intermittant
---
 tests/phpunit/E2E/Core/PrevNextTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/E2E/Core/PrevNextTest.php b/tests/phpunit/E2E/Core/PrevNextTest.php
index 4889f36e07ab..db52c588addd 100644
--- a/tests/phpunit/E2E/Core/PrevNextTest.php
+++ b/tests/phpunit/E2E/Core/PrevNextTest.php
@@ -332,7 +332,12 @@ protected function assertSelections($ids, $action = 'get', $cacheKey = NULL) {
       $cacheKey = $this->cacheKey;
     }
     $selected = $this->prevNext->getSelection($cacheKey, $action)[$cacheKey];
-    $this->assertEquals($ids, array_keys($selected), 'selected cache not correct for ' . $cacheKey . 'defined keys are ' . $this->cacheKey . 'and ' . $this->cacheKeyB);
+    $this->assertEquals($ids, array_keys($selected), 'selected cache not correct for ' . $cacheKey
+      . ' defined keys are ' . $this->cacheKey . 'and ' . $this->cacheKeyB
+      . ' result from getall is ' . print_r($this->prevNext->getSelection($cacheKey, 'getall'), 1)
+      . ' and the prevNext cache is ' . print_r($this->prevNext, TRUE)
+    );
+
     $this->assertCount(count($ids), $selected);
   }
 

From ea929c64afe3e122323e647ff9a94e48b922e16e Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Mon, 7 Sep 2020 16:32:40 +0100
Subject: [PATCH 714/834] Switch to non-deprecated/cached functions for
 membership pricesets

---
 CRM/Price/Form/Field.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php
index 1225b94be6af..a7f7420f9a14 100644
--- a/CRM/Price/Form/Field.php
+++ b/CRM/Price/Form/Field.php
@@ -556,12 +556,12 @@ public static function formRule($fields, $files, $form) {
             $foundDuplicate = FALSE;
             $orgIds = [];
             foreach ($memTypesIDS as $key => $val) {
-              $org = CRM_Member_BAO_MembershipType::getMembershipTypeOrganization($val);
-              if (in_array($org[$val], $orgIds)) {
+              $memTypeDetails = CRM_Member_BAO_MembershipType::getMembershipType($val);
+              if (in_array($memTypeDetails['member_of_contact_id'], $orgIds)) {
                 $foundDuplicate = TRUE;
                 break;
               }
-              $orgIds[$val] = $org[$val];
+              $orgIds[$val] = $memTypeDetails['member_of_contact_id'];
 
             }
             if ($foundDuplicate) {
@@ -573,7 +573,7 @@ public static function formRule($fields, $files, $form) {
           $foundAutorenew = FALSE;
           foreach ($memTypesIDS as $key => $val) {
             // see if any price field option values in this price field are for memberships with autorenew
-            $memTypeDetails = CRM_Member_BAO_MembershipType::getMembershipTypeDetails($val);
+            $memTypeDetails = CRM_Member_BAO_MembershipType::getMembershipType($val);
             if (!empty($memTypeDetails['auto_renew'])) {
               $foundAutorenew = TRUE;
               break;

From dc65872a1427b469047b7ab05f7974001cc986fe Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Sat, 19 Sep 2020 20:35:34 +0100
Subject: [PATCH 715/834] Switch to passing payment_processor_id as input param
 to completeOrder

---
 CRM/Contribute/BAO/Contribution.php  | 13 +------------
 CRM/Core/Payment/AuthorizeNetIPN.php |  1 +
 CRM/Core/Payment/PayPalIPN.php       |  2 ++
 CRM/Core/Payment/PayPalProIPN.php    |  2 ++
 api/v3/Contribution.php              |  3 ++-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 260e85926774..f59f205c87a0 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4406,18 +4406,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
       'financial_type_id',
     ];
 
-    // @todo - accept payment_processor_id as an input parameter as it is part of the
-    // incoming payment information (at least when coming from a payment processor).
-    // this is the last 'object' to get rid of....
-    $paymentProcessorId = '';
-    if (isset($objects['paymentProcessor'])) {
-      if (is_array($objects['paymentProcessor'])) {
-        $paymentProcessorId = $objects['paymentProcessor']['id'];
-      }
-      else {
-        $paymentProcessorId = $objects['paymentProcessor']->id;
-      }
-    }
+    $paymentProcessorId = $input['payment_processor_id'] ?? NULL;
 
     $completedContributionStatusID = CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed');
 
diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index 81e8d4b66835..4a3a7da023db 100644
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -86,6 +86,7 @@ public function main($component = 'contribute') {
           if ($objects['contribution']->contribution_status_id == 1) {
             $first = FALSE;
           }
+          $input['payment_processor_id'] = $paymentProcessorID;
           return $this->recur($input, $ids, $objects, $first);
         }
       }
diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index 0330424e03ea..7388507eb169 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -345,6 +345,8 @@ public function main() {
         return;
       }
 
+      $input['payment_processor_id'] = $paymentProcessorID;
+
       self::$_paymentProcessor = &$objects['paymentProcessor'];
       if ($component == 'contribute') {
         if ($ids['contributionRecur']) {
diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index 062107aadc62..ad49171254dc 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -471,6 +471,8 @@ public function main() {
         return;
       }
 
+      $input['payment_processor_id'] = $paymentProcessorID;
+
       self::$_paymentProcessor = &$objects['paymentProcessor'];
       //?? how on earth would we not have component be one of these?
       // they are the only valid settings & this IPN file can't even be called without one of them
diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 286eb8770843..e82dbcc0d248 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -606,7 +606,7 @@ function civicrm_api3_contribution_repeattransaction($params) {
     );
   }
 
-  $input['payment_processor_id'] = civicrm_api3('contributionRecur', 'getvalue', [
+  $input['payment_processor_id'] = $params['payment_processor_id'] = civicrm_api3('contributionRecur', 'getvalue', [
     'return' => 'payment_processor_id',
     'id' => $contribution->contribution_recur_id,
   ]);
@@ -626,6 +626,7 @@ function civicrm_api3_contribution_repeattransaction($params) {
       'financial_type_id',
       'contribution_status_id',
       'membership_id',
+      'payment_processor_id',
     ];
     $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 

From 24d59276f46ffb8acc1749424ea77b26e2566eab Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 06:50:37 +1200
Subject: [PATCH 716/834] Test cleanup fix

---
 tests/phpunit/api/v3/SyntaxConformanceTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index ed7e6a5ae1fd..38828c425716 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -1099,10 +1099,9 @@ public function testSqlOperators($entityName) {
     $entities = array_keys($entities['values']);
     $totalEntities = count($entities);
     if ($totalEntities < 3) {
-      $ids = [];
       for ($i = 0; $i < 3 - $totalEntities; $i++) {
         $baoObj = CRM_Core_DAO::createTestObject($baoString, ['currency' => 'USD']);
-        $ids[] = $baoObj->id;
+        $this->deletableTestObjects[$baoString][] = $baoObj->id;
       }
       $totalEntities = 3;
     }

From b577a1cd99bed26b2ac0e585ecedb1b3e8abed91 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 08:25:46 +1200
Subject: [PATCH 717/834] dev/financial#148 Duplicate validateData onto A.net

---
 CRM/Core/Payment/AuthorizeNetIPN.php | 43 ++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index 4a3a7da023db..bad241276fad 100644
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -73,9 +73,48 @@ public function main($component = 'contribute') {
           ]);
         }
 
-        if (!$this->validateData($input, $ids, $objects, TRUE, $paymentProcessorID)) {
-          return FALSE;
+        // Check if the contribution exists
+        // make sure contribution exists and is valid
+        $contribution = new CRM_Contribute_BAO_Contribution();
+        $contribution->id = $ids['contribution'];
+        if (!$contribution->find(TRUE)) {
+          throw new CRM_Core_Exception('Failure: Could not find contribution record for ' . (int) $contribution->id, NULL, ['context' => "Could not find contribution record: {$contribution->id} in IPN request: " . print_r($input, TRUE)]);
         }
+
+        // make sure contact exists and is valid
+        // use the contact id from the contribution record as the id in the IPN may not be valid anymore.
+        $contact = new CRM_Contact_BAO_Contact();
+        $contact->id = $contribution->contact_id;
+        $contact->find(TRUE);
+        if ($contact->id != $ids['contact']) {
+          // If the ids do not match then it is possible the contact id in the IPN has been merged into another contact which is why we use the contact_id from the contribution
+          CRM_Core_Error::debug_log_message("Contact ID in IPN {$ids['contact']} not found but contact_id found in contribution {$contribution->contact_id} used instead");
+          echo "WARNING: Could not find contact record: {$ids['contact']}<p>";
+          $ids['contact'] = $contribution->contact_id;
+        }
+
+        if (!empty($ids['contributionRecur'])) {
+          $contributionRecur = new CRM_Contribute_BAO_ContributionRecur();
+          $contributionRecur->id = $ids['contributionRecur'];
+          if (!$contributionRecur->find(TRUE)) {
+            CRM_Core_Error::debug_log_message("Could not find contribution recur record: {$ids['ContributionRecur']} in IPN request: " . print_r($input, TRUE));
+            echo "Failure: Could not find contribution recur record: {$ids['ContributionRecur']}<p>";
+            return FALSE;
+          }
+        }
+
+        $objects['contact'] = &$contact;
+        $objects['contribution'] = &$contribution;
+
+        // CRM-19478: handle oddity when p=null is set in place of contribution page ID,
+        if (!empty($ids['contributionPage']) && !is_numeric($ids['contributionPage'])) {
+          // We don't need to worry if about removing contribution page id as it will be set later in
+          //  CRM_Contribute_BAO_Contribution::loadRelatedObjects(..) using $objects['contribution']->contribution_page_id
+          unset($ids['contributionPage']);
+        }
+
+        $this->loadObjects($input, $ids, $objects, TRUE, $paymentProcessorID);
+
         if (!empty($ids['paymentProcessor']) && $objects['contributionRecur']->payment_processor_id != $ids['paymentProcessor']) {
           Civi::log()->warning('Payment Processor does not match the recurring processor id.', ['civi.tag' => 'deprecated']);
         }

From 24c1b3d8193acb17eb51d7a91d112a05bceceb80 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 10:38:51 +1200
Subject: [PATCH 718/834] [NFC] Minor cleanup - use strict comparison where
 possible

---
 CRM/Contribute/Form/Contribution/Confirm.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 8cca2fb6b061..d9642ae9bcf2 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -93,7 +93,7 @@ public static function handlePledge(&$form, $params, $contributionParams, $pledg
       $pledgeParams['frequency_interval'] = $params['pledge_frequency_interval'];
       $pledgeParams['installments'] = $params['pledge_installments'];
       $pledgeParams['frequency_unit'] = $params['pledge_frequency_unit'];
-      if ($pledgeParams['frequency_unit'] == 'month') {
+      if ($pledgeParams['frequency_unit'] === 'month') {
         $pledgeParams['frequency_day'] = intval(date("d"));
       }
       else {
@@ -149,6 +149,7 @@ public static function handlePledge(&$form, $params, $contributionParams, $pledg
    * @param int $recurringContributionID
    *
    * @return array
+   * @throws \CRM_Core_Exception
    */
   public static function getContributionParams(
     $params, $financialTypeID,
@@ -235,7 +236,7 @@ protected static function getNonDeductibleAmount($params, $financialType, $onlin
         }
         // if there is a product - compare the value to the contribution amount
         if (isset($selectProduct) &&
-          $selectProduct != 'no_thanks'
+          $selectProduct !== 'no_thanks'
         ) {
           $productDAO = new CRM_Contribute_DAO_Product();
           $productDAO->id = $selectProduct;
@@ -332,15 +333,15 @@ public function preProcess() {
         }
 
         if (in_array($field, $addressBlocks)) {
-          if ($locType == 'Primary') {
+          if ($locType === 'Primary') {
             $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
             $locType = $defaultLocationType->id;
           }
 
-          if ($field == 'country') {
+          if ($field === 'country') {
             $value = CRM_Core_PseudoConstant::countryIsoCode($value);
           }
-          elseif ($field == 'state_province') {
+          elseif ($field === 'state_province') {
             $value = CRM_Core_PseudoConstant::stateProvinceAbbreviation($value);
           }
 
@@ -361,7 +362,7 @@ public function preProcess() {
           if (!$typeId || is_numeric($typeId)) {
             $blockName = $fieldName = $field;
             $locationType = 'location_type_id';
-            if ($locType == 'Primary') {
+            if ($locType === 'Primary') {
               $defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
               $locationValue = $defaultLocationType->id;
             }
@@ -423,7 +424,7 @@ public function preProcess() {
           $this->_params['onbehalf_location']["{$loc}"] = $value;
         }
         else {
-          if ($loc == 'contact_sub_type') {
+          if ($loc === 'contact_sub_type') {
             $this->_params['onbehalf_location'][$loc] = $value;
           }
           else {
@@ -510,7 +511,7 @@ public function buildQuickForm() {
       $this->_params['is_quick_config'] = 1;
     }
 
-    if (!empty($params['selectProduct']) && $params['selectProduct'] != 'no_thanks') {
+    if (!empty($params['selectProduct']) && $params['selectProduct'] !== 'no_thanks') {
       $option = $params['options_' . $params['selectProduct']] ?? NULL;
       $productID = $params['selectProduct'];
       CRM_Contribute_BAO_Premium::buildPremiumBlock($this, $this->_id, FALSE,
@@ -522,7 +523,7 @@ public function buildQuickForm() {
     $config = CRM_Core_Config::singleton();
     if (in_array('CiviMember', $config->enableComponents) && empty($this->_ccid)) {
       if (isset($params['selectMembership']) &&
-        $params['selectMembership'] != 'no_thanks'
+        $params['selectMembership'] !== 'no_thanks'
       ) {
         $this->buildMembershipBlock(
           $this->_membershipContactID,

From 87ebf688da5000dc2ce43a32131c7279f8aa1dfd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 11:23:20 +1200
Subject: [PATCH 719/834] dev/core#2044 Make contact_id optional on v4 api for
 Address, phone, email

It's optional in the schema for events etc
---
 .../Service/Spec/Provider/AddressCreationSpecProvider.php     | 1 -
 Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php | 1 -
 Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php | 1 -
 tests/phpunit/api/v3/AddressTest.php                          | 4 +++-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php
index 1b29d79350bc..b929cb9da516 100644
--- a/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php
@@ -27,7 +27,6 @@ class AddressCreationSpecProvider implements Generic\SpecProviderInterface {
    * @param \Civi\Api4\Service\Spec\RequestSpec $spec
    */
   public function modifySpec(RequestSpec $spec) {
-    $spec->getFieldByName('contact_id')->setRequired(TRUE);
     $spec->getFieldByName('location_type_id')->setRequired(TRUE);
   }
 
diff --git a/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
index a7b0dd8a7ef8..8bbb299b4508 100644
--- a/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
@@ -27,7 +27,6 @@ class EmailCreationSpecProvider implements Generic\SpecProviderInterface {
    * @inheritDoc
    */
   public function modifySpec(RequestSpec $spec) {
-    $spec->getFieldByName('contact_id')->setRequired(TRUE);
     $spec->getFieldByName('email')->setRequired(TRUE);
     $spec->getFieldByName('on_hold')->setRequired(FALSE);
     $spec->getFieldByName('is_bulkmail')->setRequired(FALSE);
diff --git a/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php
index 27aef02c9afc..4faecb1c5539 100644
--- a/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php
@@ -27,7 +27,6 @@ class PhoneCreationSpecProvider implements Generic\SpecProviderInterface {
    * @inheritDoc
    */
   public function modifySpec(RequestSpec $spec) {
-    $spec->getFieldByName('contact_id')->setRequired(TRUE);
     $spec->getFieldByName('phone')->setRequired(TRUE);
   }
 
diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php
index 2a12ef95f5c4..400dacabb48a 100644
--- a/tests/phpunit/api/v3/AddressTest.php
+++ b/tests/phpunit/api/v3/AddressTest.php
@@ -57,11 +57,13 @@ public function tearDown() {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreateAddress($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPIAndDocument('address', 'create', $this->_params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument('Address', 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $this->assertNotNull($result['values'][$result['id']]['id']);
     $this->getAndCheck($this->_params, $result['id'], 'address');

From e3872d50979e140bd1fe2538ff47d3c5d5fb7bcf Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 11:45:23 +1200
Subject: [PATCH 720/834] dev/core#1921 Remove handling fo Civi4.2 from
 paypalProIPN

All the tests in
CRM_Core_Payment_PayPalProIPNTest pass through this line

It used to be necessary to reformat dates on a DAO before resaving
- up until 2014
---
 CRM/Core/Payment/PayPalProIPN.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/CRM/Core/Payment/PayPalProIPN.php b/CRM/Core/Payment/PayPalProIPN.php
index ad49171254dc..2866c9bdd6b3 100644
--- a/CRM/Core/Payment/PayPalProIPN.php
+++ b/CRM/Core/Payment/PayPalProIPN.php
@@ -174,15 +174,6 @@ public function recur($input, $ids, $objects, $first) {
 
     $now = date('YmdHis');
 
-    // fix dates that already exist
-    $dates = ['create', 'start', 'end', 'cancel', 'modified'];
-    foreach ($dates as $date) {
-      $name = "{$date}_date";
-      if ($recur->$name) {
-        $recur->$name = CRM_Utils_Date::isoToMysql($recur->$name);
-      }
-    }
-
     $sendNotification = FALSE;
     $subscriptionPaymentStatus = NULL;
     //List of Transaction Type

From 41c9d14702af1c587aadfb3fe1e1b4bc32ed9f15 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 12:36:52 +1200
Subject: [PATCH 721/834] dev/core#2043 Remove pass by reference

---
 CRM/Core/BAO/Location.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php
index 6af1d85bc8cf..871e5932671f 100644
--- a/CRM/Core/BAO/Location.php
+++ b/CRM/Core/BAO/Location.php
@@ -57,12 +57,11 @@ public static function create(&$params, $fixAddress = TRUE, $entity = NULL) {
 
     if ($entity) {
       // this is a special case for adding values in location block table
-      $entityElements = [
+
+      $location['id'] = self::createLocBlock($location, [
         'entity_table' => $params['entity_table'],
         'entity_id' => $params['entity_id'],
-      ];
-
-      $location['id'] = self::createLocBlock($location, $entityElements);
+      ]);
     }
     else {
       // when we come from a form which displays all the location elements (like the edit form or the inline block
@@ -80,12 +79,12 @@ public static function create(&$params, $fixAddress = TRUE, $entity = NULL) {
   /**
    * Creates the entry in the civicrm_loc_block.
    *
-   * @param string $location
+   * @param array $location
    * @param array $entityElements
    *
    * @return int
    */
-  public static function createLocBlock(&$location, &$entityElements) {
+  public static function createLocBlock($location, $entityElements) {
     $locId = self::findExisting($entityElements);
     $locBlock = [];
 
@@ -116,8 +115,7 @@ public static function createLocBlock(&$location, &$entityElements) {
       return NULL;
     }
 
-    $locBlockInfo = self::addLocBlock($locBlock);
-    return $locBlockInfo->id;
+    return self::addLocBlock($locBlock)->id;
   }
 
   /**
@@ -147,12 +145,11 @@ public static function findExisting($entityElements) {
    * Takes an associative array and adds location block.
    *
    * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
    *
-   * @return CRM_Core_BAO_locBlock
+   * @return CRM_Core_DAO_LocBlock
    *   Object on success, null otherwise
    */
-  public static function addLocBlock(&$params) {
+  public static function addLocBlock($params) {
     $locBlock = new CRM_Core_DAO_LocBlock();
 
     $locBlock->copyValues($params);

From e23c62b9bc731ae5e5f776aee35945503beed0aa Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 23 Sep 2020 21:10:51 -0400
Subject: [PATCH 722/834] Add select2-bootstrap to greenwich theme

---
 ext/greenwich/composer.compile.json | 2 +-
 ext/greenwich/scss/main.scss        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/greenwich/composer.compile.json b/ext/greenwich/composer.compile.json
index a731b607fb22..c58ad1afbef3 100644
--- a/ext/greenwich/composer.compile.json
+++ b/ext/greenwich/composer.compile.json
@@ -5,7 +5,7 @@
       "php-method": "\\Civi\\Compile\\Scss::build",
       "watch-files": ["scss"],
       "scss-files": {"scss/main.scss": "dist/bootstrap3.css"},
-      "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets"]
+      "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets", "../../bower_components/select2"]
     }
   ]
 }
diff --git a/ext/greenwich/scss/main.scss b/ext/greenwich/scss/main.scss
index 8c8f7c1bbc88..90da6210bb9f 100644
--- a/ext/greenwich/scss/main.scss
+++ b/ext/greenwich/scss/main.scss
@@ -1,4 +1,5 @@
 #bootstrap-theme {
   @import "greenwich";
   @import "bootstrap";
-}
\ No newline at end of file
+  @import "select2-bootstrap";
+}

From 8293f7c2c397db650b65448b10d09f6542ba4ba1 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 14:06:46 +1200
Subject: [PATCH 723/834] dev/core#2057 Remove select query that never or
 almost never finds something.

When it comes to quey efficiency it's good to do an extra select if it saves an update/insert
but not if it never does. To test the theory that this 'never does' I put
removing this select through the entire test suite. No tests failed, meaning
it was unnecessary 100% of the time. Adding the catch ensures
it will still succeed if it the row exists but we have moved our query conservation
from doing an extraneous select in 99.9% of cases to an extraneous update in .1% of cases

https://lab.civicrm.org/dev/core/-/issues/2057
---
 CRM/Activity/BAO/ActivityContact.php         | 15 ++++++++++++---
 tests/phpunit/api/v3/ActivityContactTest.php | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/CRM/Activity/BAO/ActivityContact.php b/CRM/Activity/BAO/ActivityContact.php
index 527e664da5da..6efa32ab9ddd 100644
--- a/CRM/Activity/BAO/ActivityContact.php
+++ b/CRM/Activity/BAO/ActivityContact.php
@@ -37,13 +37,22 @@ public function __construct() {
    *   activity_contact object
    */
   public static function create($params) {
+    $errorScope = CRM_Core_TemporaryErrorScope::useException();
     $activityContact = new CRM_Activity_DAO_ActivityContact();
-
     $activityContact->copyValues($params);
-    if (!$activityContact->find(TRUE)) {
+    try {
       return $activityContact->save();
     }
-    return $activityContact;
+    catch (PEAR_Exception $e) {
+      // This check used to be done first, creating an extra query before each insert.
+      // However, in none of the core tests was this ever called with values that already
+      // existed, meaning that this line would never or almost never be hit.
+      // hence it's better to save the select query here.
+      if ($activityContact->find(TRUE)) {
+        return $activityContact;
+      }
+      throw $e;
+    }
   }
 
   /**
diff --git a/tests/phpunit/api/v3/ActivityContactTest.php b/tests/phpunit/api/v3/ActivityContactTest.php
index 00884061ecab..73d690f32f26 100644
--- a/tests/phpunit/api/v3/ActivityContactTest.php
+++ b/tests/phpunit/api/v3/ActivityContactTest.php
@@ -40,21 +40,28 @@ public function setUp() {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreateActivityContact($version) {
     $this->_apiversion = $version;
 
-    $result = $this->callAPIAndDocument('activity_contact', 'create', $this->_params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument('ActivityContact', 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $this->assertNotNull($result['values'][$result['id']]['id']);
 
+    $result = $this->callAPIAndDocument('ActivityContact', 'create', $this->_params, __FUNCTION__, __FILE__);
+    $this->assertEquals(1, $result['count']);
+
     $this->callAPISuccess('activity_contact', 'delete', ['id' => $result['id']]);
   }
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testDeleteActivityContact($version) {
     $this->_apiversion = $version;
@@ -71,7 +78,9 @@ public function testDeleteActivityContact($version) {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testGetActivitiesByContact($version) {
     $this->_apiversion = $version;
@@ -80,7 +89,9 @@ public function testGetActivitiesByContact($version) {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testGetActivitiesByActivity($version) {
     $this->_apiversion = $version;
@@ -89,8 +100,11 @@ public function testGetActivitiesByActivity($version) {
 
   /**
    * Test civicrm_activity_contact_get with empty params.
+   *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testGetEmptyParams($version) {
     $this->_apiversion = $version;

From 94c3c353ca926d13ca418292317522980556f496 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 15:25:38 +1200
Subject: [PATCH 724/834] Unit test for
 https://github.com/civicrm/civicrm-core/pull/18568

---
 tests/phpunit/CRM/Price/Form/FieldTest.php | 188 +++++++++++++++++++++
 1 file changed, 188 insertions(+)

diff --git a/tests/phpunit/CRM/Price/Form/FieldTest.php b/tests/phpunit/CRM/Price/Form/FieldTest.php
index e4c71d881900..a7ecdafb369b 100644
--- a/tests/phpunit/CRM/Price/Form/FieldTest.php
+++ b/tests/phpunit/CRM/Price/Form/FieldTest.php
@@ -112,4 +112,192 @@ private function initializeFieldParameters($params) {
     return array_merge($defaultParams, $params);
   }
 
+  /**
+   * Minimal test intended to check for no glaring errors which membership types are validated.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function testPriceFieldFormRuleOnMembership() {
+    $membershipTypeID = $this->membershipTypeCreate();
+    $membershipTypeID2 = $this->membershipTypeCreate(['member_of_contact_id' => $this->setupIDs['contact']]);
+
+    $priceSetID = $this->callAPISuccess('PriceSet', 'create', ['title' => 'blah', 'extends' => 'CiviMember'])['id'];
+    /* @var \CRM_Price_Form_Field $form */
+    $form = $this->getFormObject('CRM_Price_Form_Field');
+    $_REQUEST['sid'] = $priceSetID;
+    $form->preProcess();
+    $form->buildQuickForm();
+    $form->_action = CRM_Core_Action::ADD;
+    $errors = CRM_Price_Form_Field::formRule(
+      [
+        'qfKey' => '91c63cb3e611280f3cd81787847e86568f72cf1ad387c785999ff66f90c575a5_568',
+        'entryURL' => 'http://dmaster.local/civicrm/admin/price/field?reset=1&amp;action=add&amp;sid=9',
+        'sid' => '9',
+        'fid' => '',
+        '_qf_default' => 'Field:next',
+        '_qf_Field_next' => '1',
+        'label' => 'member',
+        'html_type' => 'CheckBox',
+        'price' => '5',
+        'non_deductible_amount' => '',
+        'financial_type_id' => '1',
+        'membership_type_id' =>
+          [
+            1 => $membershipTypeID,
+            2 => $membershipTypeID2,
+            3 => '',
+            4 => '',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => '',
+            9 => '',
+            10 => '',
+            11 => '',
+            12 => '',
+            13 => '',
+            14 => '',
+            15 => '',
+          ],
+        'membership_num_terms' =>
+          [
+            1 => '1',
+            2 => 1,
+            3 => '',
+            4 => '',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => '',
+            9 => '',
+            10 => '',
+            11 => '',
+            12 => '',
+            13 => '',
+            14 => '',
+            15 => '',
+          ],
+        'option_label' =>
+          [
+            1 => 'General',
+            2 => 'Student',
+            3 => '',
+            4 => '',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => '',
+            9 => '',
+            10 => '',
+            11 => '',
+            12 => '',
+            13 => '',
+            14 => '',
+            15 => '',
+          ],
+        'option_amount' =>
+          [
+            1 => '100.00',
+            2 => '50',
+            3 => '',
+            4 => '',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => '',
+            9 => '',
+            10 => '',
+            11 => '',
+            12 => '',
+            13 => '',
+            14 => '',
+            15 => '',
+          ],
+        'option_financial_type_id' =>
+          [
+            1 => '2',
+            2 => '1',
+            3 => '1',
+            4 => '1',
+            5 => '1',
+            6 => '1',
+            7 => '1',
+            8 => '1',
+            9 => '1',
+            10 => '1',
+            11 => '1',
+            12 => '1',
+            13 => '1',
+            14 => '1',
+            15 => '1',
+          ],
+        'option_weight' =>
+          [
+            1 => '1',
+            2 => '2',
+            3 => '3',
+            4 => '4',
+            5 => '5',
+            6 => '6',
+            7 => '7',
+            8 => '8',
+            9 => '9',
+            10 => '10',
+            11 => '11',
+            12 => '12',
+            13 => '13',
+            14 => '14',
+            15 => '15',
+          ],
+        'option_visibility_id' =>
+          [
+            1 => '1',
+            2 => '1',
+            3 => '1',
+            4 => '1',
+            5 => '1',
+            6 => '1',
+            7 => '1',
+            8 => '1',
+            9 => '1',
+            10 => '1',
+            11 => '1',
+            12 => '1',
+            13 => '1',
+            14 => '1',
+            15 => '1',
+          ],
+        'option_status' =>
+          [
+            1 => '1',
+            2 => '1',
+            3 => '1',
+            4 => '1',
+            5 => '1',
+            6 => '1',
+            7 => '1',
+            8 => '1',
+            9 => '1',
+            10 => '1',
+            11 => '1',
+            12 => '1',
+            13 => '1',
+            14 => '1',
+            15 => '1',
+          ],
+        'options_per_line' => '1',
+        'is_display_amounts' => '1',
+        'weight' => '1',
+        'help_pre' => '',
+        'help_post' => '',
+        'active_on' => '',
+        'expire_on' => '',
+        'visibility_id' => '1',
+        'is_active' => '1',
+      ], [], $form);
+    $this->assertEquals([
+      '_qf_default' => 'You have selected multiple memberships for the same organization or entity. Please review your selections and choose only one membership per entity.',
+    ], $errors);
+  }
+
 }

From 531b6c9e4a96e5212dc1a637d6efe218ff74aedd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 12:49:11 +1200
Subject: [PATCH 725/834] Simplify CRM_Core_BAO_Location::createLocBlock by
 moving eventLocation specific handling back to the class

On grepping universe we find entity is only passed into
CRM_Core_BAO_Location::createLocBlock from this one place in the code - ergo we can
do the handling for it on that class & not in the shared code

Test cover added in preparation for this to CRM_Event_Form_ManageEvent_LocationTest
---
 CRM/Core/BAO/Location.php                   | 35 +++++++--------------
 CRM/Event/Form/ManageEvent/Location.php     | 14 +++++++--
 tests/phpunit/CRM/Core/BAO/LocationTest.php | 20 +++++++++---
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php
index 871e5932671f..add13da47965 100644
--- a/CRM/Core/BAO/Location.php
+++ b/CRM/Core/BAO/Location.php
@@ -35,11 +35,9 @@ class CRM_Core_BAO_Location extends CRM_Core_DAO {
    *   True if you need to fix (format) address values.
    *                               before inserting in db
    *
-   * @param null $entity
-   *
    * @return array
    */
-  public static function create(&$params, $fixAddress = TRUE, $entity = NULL) {
+  public static function create(&$params, $fixAddress = TRUE) {
     $location = [];
     if (!self::dataExists($params)) {
       return $location;
@@ -48,29 +46,19 @@ public static function create(&$params, $fixAddress = TRUE, $entity = NULL) {
     // create location blocks.
     foreach (self::$blocks as $block) {
       if ($block != 'address') {
-        $location[$block] = CRM_Core_BAO_Block::create($block, $params, $entity);
+        $location[$block] = CRM_Core_BAO_Block::create($block, $params);
       }
       else {
-        $location[$block] = CRM_Core_BAO_Address::create($params, $fixAddress, $entity);
+        $location[$block] = CRM_Core_BAO_Address::create($params, $fixAddress);
       }
     }
 
-    if ($entity) {
-      // this is a special case for adding values in location block table
-
-      $location['id'] = self::createLocBlock($location, [
-        'entity_table' => $params['entity_table'],
-        'entity_id' => $params['entity_id'],
-      ]);
-    }
-    else {
-      // when we come from a form which displays all the location elements (like the edit form or the inline block
-      // elements, we can skip the below check. The below check adds quite a feq queries to an already overloaded
-      // form
-      if (empty($params['updateBlankLocInfo'])) {
-        // make sure contact should have only one primary block, CRM-5051
-        self::checkPrimaryBlocks(CRM_Utils_Array::value('contact_id', $params));
-      }
+    // when we come from a form which displays all the location elements (like the edit form or the inline block
+    // elements, we can skip the below check. The below check adds quite a feq queries to an already overloaded
+    // form
+    if (empty($params['updateBlankLocInfo'])) {
+      // make sure contact should have only one primary block, CRM-5051
+      self::checkPrimaryBlocks(CRM_Utils_Array::value('contact_id', $params));
     }
 
     return $location;
@@ -151,10 +139,9 @@ public static function findExisting($entityElements) {
    */
   public static function addLocBlock($params) {
     $locBlock = new CRM_Core_DAO_LocBlock();
-
     $locBlock->copyValues($params);
-
-    return $locBlock->save();
+    $locBlock->save();
+    return $locBlock;
   }
 
   /**
diff --git a/CRM/Event/Form/ManageEvent/Location.php b/CRM/Event/Form/ManageEvent/Location.php
index 12d6c73862e4..a1a79396a0d6 100644
--- a/CRM/Event/Form/ManageEvent/Location.php
+++ b/CRM/Event/Form/ManageEvent/Location.php
@@ -234,11 +234,13 @@ public function postProcess() {
     $isUpdateToExistingLocationBlock = !empty($params['loc_event_id']) && (int) $params['loc_event_id'] === $this->locationBlock['loc_block_id'];
     // It should be impossible for there to be no default location type. Consider removing this handling
     $defaultLocationTypeID = CRM_Core_BAO_LocationType::getDefault()->id ?? 1;
+    $location = [];
     foreach ([
       'address' => $params['address'],
       'phone' => $params['phone'],
       'email' => $params['email'],
     ] as $block => $locationEntities) {
+
       $params[$block][1]['is_primary'] = 1;
       foreach ($locationEntities as $index => $locationEntity) {
         $params[$block][$index]['location_type_id'] = $defaultLocationTypeID;
@@ -247,10 +249,18 @@ public function postProcess() {
           $params[$block][$index]['id'] = $this->locationBlock['loc_block.' . $block . $fieldKey];
         }
       }
+      if ($block !== 'address') {
+        $location[$block] = CRM_Core_BAO_Block::create($block, $params, 'event');
+      }
+      else {
+        $location[$block] = CRM_Core_BAO_Address::create($params, TRUE, 'event');
+      }
     }
 
-    // create/update event location
-    $params['loc_block_id'] = CRM_Core_BAO_Location::create($params, TRUE, 'event')['id'];
+    $params['loc_block_id'] = CRM_Core_BAO_Location::createLocBlock($location, [
+      'entity_table' => $params['entity_table'],
+      'entity_id' => $params['entity_id'],
+    ]);
 
     // finally update event params
     $params['id'] = $this->_id;
diff --git a/tests/phpunit/CRM/Core/BAO/LocationTest.php b/tests/phpunit/CRM/Core/BAO/LocationTest.php
index 69a003a66d49..28b646d43a7b 100644
--- a/tests/phpunit/CRM/Core/BAO/LocationTest.php
+++ b/tests/phpunit/CRM/Core/BAO/LocationTest.php
@@ -245,12 +245,22 @@ public function testCreateWithLocBlock() {
     //create location block.
     //with various element of location block
     //like address, phone, email, im.
-    $locBlockId = CRM_Core_BAO_Location::create($params, NULL, TRUE)['id'];
+    foreach (['phone', 'email', 'im', 'openid', 'address'] as $block) {
+      if ($block !== 'address') {
+        $location[$block] = CRM_Core_BAO_Block::create($block, $params, 'event');
+      }
+      else {
+        $location[$block] = CRM_Core_BAO_Address::create($params, TRUE, 'event');
+      }
+    }
 
     //update event record with location block id
     $eventParams = [
       'id' => $event['id'],
-      'loc_block_id' => $locBlockId,
+      'loc_block_id' => CRM_Core_BAO_Location::createLocBlock($location, [
+        'entity_id' => $event['id'],
+        'entity_table' => 'civicrm_event',
+      ]),
     ];
 
     CRM_Event_BAO_Event::add($eventParams);
@@ -261,11 +271,11 @@ public function testCreateWithLocBlock() {
       $event['id'],
       'loc_block_id',
       'id',
-      $locBlockId,
+      $eventParams['loc_block_id'],
       'Checking database for the record.'
     );
     $locElementIds = [];
-    $locParams = ['id' => $locBlockId];
+    $locParams = ['id' => $eventParams['loc_block_id']];
     CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_LocBlock',
       $locParams,
       $locElementIds
@@ -328,7 +338,7 @@ public function testCreateWithLocBlock() {
     $this->assertDBCompareValues('CRM_Core_DAO_IM', $searchParams, $compareParams);
 
     // Cleanup.
-    CRM_Core_BAO_Location::deleteLocBlock($locBlockId);
+    CRM_Core_BAO_Location::deleteLocBlock($eventParams['loc_block_id']);
     $this->eventDelete($event['id']);
     $this->contactDelete($this->_contactId);
   }

From 2aba31d81f463db82b9902289f4923f2f3da796a Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Thu, 24 Sep 2020 07:57:10 -0400
Subject: [PATCH 726/834] ext/greenwich - Coerce `select2-bootstrap.css` to be
 handled as SCSS (#9)

Co-authored-by: Tim Otten <totten@civicrm.org>
---
 ext/greenwich/composer.compile.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ext/greenwich/composer.compile.json b/ext/greenwich/composer.compile.json
index c58ad1afbef3..932659b28687 100644
--- a/ext/greenwich/composer.compile.json
+++ b/ext/greenwich/composer.compile.json
@@ -1,11 +1,16 @@
 {
   "compile": [
+    {
+      "title": "Greenwich (Coerce <comment>select2-bootstrap</comment> to SCSS)",
+      "shell": "set -e ; mkdir -p extern/select2 ; cp ../../bower_components/select2/select2-bootstrap.css extern/select2/select2-bootstrap.scss",
+      "watch-files": ["../../bower_components/select2/"]
+    },
     {
       "title": "Greenwich CSS (<comment>dist/bootstrap3.css</comment>)",
       "php-method": "\\Civi\\Compile\\Scss::build",
-      "watch-files": ["scss"],
+      "watch-files": ["scss", "extern/select2"],
       "scss-files": {"scss/main.scss": "dist/bootstrap3.css"},
-      "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets", "../../bower_components/select2"]
+      "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets", "extern/select2"]
     }
   ]
 }

From 642ec559d5ee297ad2f5ba7eec249883c871c7eb Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 24 Sep 2020 04:57:33 -0700
Subject: [PATCH 727/834] composer.json - Update compile plugin

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 42e0c075f673..030026242ab1 100644
--- a/composer.json
+++ b/composer.json
@@ -82,7 +82,7 @@
     "pear/db": "1.10",
     "scssphp/scssphp": "~1.2",
     "padaliyajay/php-autoprefixer": "~1.2",
-    "civicrm/composer-compile-plugin": "~0.7"
+    "civicrm/composer-compile-plugin": "~0.8"
   },
   "scripts": {
     "post-install-cmd": [

From 9c91d0ff21352f7aff5f3d80d6f441f0a3a2502d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 24 Sep 2020 04:57:44 -0700
Subject: [PATCH 728/834] composer.lock - Update compile plugin

---
 composer.lock | 150 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 144 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1b958e1b4e41..26c72f834ff6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "876c343676d03c0d5a945ba4b428bce0",
+    "content-hash": "dab2def1e60e4c40f0e9141463f1697b",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -91,6 +91,12 @@
                 "brick",
                 "math"
             ],
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-15T15:59:35+00:00"
         },
         {
@@ -137,6 +143,12 @@
                 "currency",
                 "money"
             ],
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/brick/money",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-31T14:17:02+00:00"
         },
         {
@@ -299,16 +311,16 @@
         },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.7",
+            "version": "v0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "7d4a89f7a924ac5844f5da0f12a04a86e2435344"
+                "reference": "bcc7731731702434340715402d7fd3d6af250d00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/7d4a89f7a924ac5844f5da0f12a04a86e2435344",
-                "reference": "7d4a89f7a924ac5844f5da0f12a04a86e2435344",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/bcc7731731702434340715402d7fd3d6af250d00",
+                "reference": "bcc7731731702434340715402d7fd3d6af250d00",
                 "shasum": ""
             },
             "require": {
@@ -340,7 +352,7 @@
                 }
             ],
             "description": "Define a 'compile' event for all packages in the dependency-graph",
-            "time": "2020-09-22T01:52:11+00:00"
+            "time": "2020-09-24T11:50:28+00:00"
         },
         {
             "name": "civicrm/composer-downloads-plugin",
@@ -2363,6 +2375,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-12T14:33:46+00:00"
         },
         {
@@ -2434,6 +2460,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-13T09:33:40+00:00"
         },
         {
@@ -2497,6 +2537,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-03-15T09:38:08+00:00"
         },
         {
@@ -2547,6 +2601,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-12T16:54:01+00:00"
         },
         {
@@ -2654,6 +2722,20 @@
                 "polyfill",
                 "portable"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-12T16:14:59+00:00"
         },
         {
@@ -2713,6 +2795,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -2775,6 +2871,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -2903,6 +3013,20 @@
                 "portable",
                 "shim"
             ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -2952,6 +3076,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-12T14:33:46+00:00"
         },
         {

From 62b166aee5ceaff0ed52892a6ff3f8aecefc6937 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 24 Sep 2020 05:03:07 -0700
Subject: [PATCH 729/834] ext/greenwich - Improve portability. Consolidate
 tasks.

1. Using 'php-eval' instead of 'shell' should make it safer to run on Windows.

2. The two steps are very closesly related. Putting them into the same 'task'
   means that it's a bit easier to understand the 'watch' behavior.
---
 ext/greenwich/composer.compile.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ext/greenwich/composer.compile.json b/ext/greenwich/composer.compile.json
index 932659b28687..310523df0c8b 100644
--- a/ext/greenwich/composer.compile.json
+++ b/ext/greenwich/composer.compile.json
@@ -1,14 +1,13 @@
 {
   "compile": [
-    {
-      "title": "Greenwich (Coerce <comment>select2-bootstrap</comment> to SCSS)",
-      "shell": "set -e ; mkdir -p extern/select2 ; cp ../../bower_components/select2/select2-bootstrap.css extern/select2/select2-bootstrap.scss",
-      "watch-files": ["../../bower_components/select2/"]
-    },
     {
       "title": "Greenwich CSS (<comment>dist/bootstrap3.css</comment>)",
-      "php-method": "\\Civi\\Compile\\Scss::build",
-      "watch-files": ["scss", "extern/select2"],
+      "run": [
+        "@php-eval mkdir('extern/select2', 0777, TRUE);",
+        "@php-eval $ok = copy('../../bower_components/select2/select2-bootstrap.css', 'extern/select2/select2-bootstrap.scss'); exit($ok?0:1);",
+        "@php-method \\Civi\\Compile\\Scss::build"
+      ],
+      "watch-files": ["scss", "../../bower_components/select2/select2-bootstrap.css"],
       "scss-files": {"scss/main.scss": "dist/bootstrap3.css"},
       "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets", "extern/select2"]
     }

From 7ce7b1cdc4bda5f519ec6d321b7e57fe1150934f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 23 Sep 2020 14:35:40 -0400
Subject: [PATCH 730/834] APIv4 Search: Improve GROUP_CONCAT with :label prefix

This moves handing of pseudoconstant suffix replacement from the UI level to the API level,
which allows APIv4 to return GROUP_CONCAT results as an array (by default, if no separator specified).

It also improves post-query formatting in general, with finer-grained formating callbacks for sql functions.
---
 Civi/Api4/Query/Api4SelectQuery.php           |  2 +-
 Civi/Api4/Query/SqlExpression.php             |  8 ++
 Civi/Api4/Query/SqlField.php                  |  2 +
 Civi/Api4/Query/SqlFunction.php               | 92 ++++++++++++++-----
 Civi/Api4/Query/SqlFunctionCOUNT.php          | 11 +++
 Civi/Api4/Query/SqlFunctionGREATEST.php       |  2 +
 Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php   | 21 +++++
 Civi/Api4/Query/SqlFunctionLEAST.php          |  2 +
 Civi/Api4/Query/SqlFunctionMAX.php            |  2 +
 Civi/Api4/Query/SqlFunctionMIN.php            |  2 +
 Civi/Api4/Query/SqlFunctionNULLIF.php         |  2 +
 Civi/Api4/Utils/FormattingUtil.php            | 57 +++++++-----
 ext/search/ang/search/crmSearch.component.js  | 26 ++----
 .../ang/search/crmSearchFunction.component.js |  2 +-
 .../phpunit/api/v4/Action/SqlFunctionTest.php | 30 ++++--
 .../api/v4/Query/SqlExpressionParserTest.php  | 30 +++---
 16 files changed, 202 insertions(+), 89 deletions(-)

diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php
index 009095ebc91d..a1654769af00 100644
--- a/Civi/Api4/Query/Api4SelectQuery.php
+++ b/Civi/Api4/Query/Api4SelectQuery.php
@@ -138,7 +138,7 @@ public function run() {
       }
       $results[] = $result;
     }
-    FormattingUtil::formatOutputValues($results, $this->apiFieldSpec, $this->getEntity());
+    FormattingUtil::formatOutputValues($results, $this->apiFieldSpec, $this->getEntity(), 'get', $this->selectAliases);
     return $results;
   }
 
diff --git a/Civi/Api4/Query/SqlExpression.php b/Civi/Api4/Query/SqlExpression.php
index 2759d3baff0a..bce3d47144da 100644
--- a/Civi/Api4/Query/SqlExpression.php
+++ b/Civi/Api4/Query/SqlExpression.php
@@ -37,6 +37,14 @@ abstract class SqlExpression {
    */
   public $expr = '';
 
+  /**
+   * Whether or not pseudoconstant suffixes should be evaluated during output.
+   *
+   * @var bool
+   * @see \Civi\Api4\Utils\FormattingUtil::formatOutputValues
+   */
+  public $supportsExpansion = FALSE;
+
   /**
    * SqlFunction constructor.
    * @param string $expr
diff --git a/Civi/Api4/Query/SqlField.php b/Civi/Api4/Query/SqlField.php
index 67f1c206a6ff..b6f69f4d5fb0 100644
--- a/Civi/Api4/Query/SqlField.php
+++ b/Civi/Api4/Query/SqlField.php
@@ -16,6 +16,8 @@
  */
 class SqlField extends SqlExpression {
 
+  public $supportsExpansion = TRUE;
+
   protected function initialize() {
     if ($this->alias && $this->alias !== $this->expr) {
       throw new \API_Exception("Aliasing field names is not allowed, only expressions can have an alias.");
diff --git a/Civi/Api4/Query/SqlFunction.php b/Civi/Api4/Query/SqlFunction.php
index dbc245f7bfc4..ef5d7747f259 100644
--- a/Civi/Api4/Query/SqlFunction.php
+++ b/Civi/Api4/Query/SqlFunction.php
@@ -18,8 +18,14 @@
  */
 abstract class SqlFunction extends SqlExpression {
 
+  /**
+   * @var array
+   */
   protected static $params = [];
 
+  /**
+   * @var array[]
+   */
   protected $args = [];
 
   /**
@@ -40,17 +46,22 @@ abstract class SqlFunction extends SqlExpression {
    */
   protected function initialize() {
     $arg = trim(substr($this->expr, strpos($this->expr, '(') + 1, -1));
-    foreach ($this->getParams() as $param) {
+    foreach ($this->getParams() as $idx => $param) {
       $prefix = $this->captureKeyword($param['prefix'], $arg);
+      $this->args[$idx] = [
+        'prefix' => $prefix,
+        'expr' => [],
+        'suffix' => NULL,
+      ];
       if ($param['expr'] && isset($prefix) || in_array('', $param['prefix']) || !$param['optional']) {
-        $this->captureExpressions($arg, $param['expr'], $param['must_be'], $param['cant_be']);
-        $this->captureKeyword($param['suffix'], $arg);
+        $this->args[$idx]['expr'] = $this->captureExpressions($arg, $param['expr'], $param['must_be'], $param['cant_be']);
+        $this->args[$idx]['suffix'] = $this->captureKeyword($param['suffix'], $arg);
       }
     }
   }
 
   /**
-   * Shift a keyword off the beginning of the argument string and into the argument array.
+   * Shift a keyword off the beginning of the argument string and return it.
    *
    * @param array $keywords
    *   Whitelist of keywords
@@ -60,7 +71,6 @@ protected function initialize() {
   private function captureKeyword($keywords, &$arg) {
     foreach (array_filter($keywords) as $key) {
       if (strpos($arg, $key . ' ') === 0) {
-        $this->args[] = $key;
         $arg = ltrim(substr($arg, strlen($key)));
         return $key;
       }
@@ -69,35 +79,34 @@ private function captureKeyword($keywords, &$arg) {
   }
 
   /**
-   * Shifts 0 or more expressions off the argument string and into the argument array
+   * Shifts 0 or more expressions off the argument string and returns them
    *
    * @param string $arg
    * @param int $limit
    * @param array $mustBe
    * @param array $cantBe
+   * @return array
    * @throws \API_Exception
    */
   private function captureExpressions(&$arg, $limit, $mustBe, $cantBe) {
-    $captured = 0;
+    $captured = [];
     $arg = ltrim($arg);
     while ($arg) {
       $item = $this->captureExpression($arg);
       $arg = ltrim(substr($arg, strlen($item)));
       $expr = SqlExpression::convert($item, FALSE, $mustBe, $cantBe);
       $this->fields = array_merge($this->fields, $expr->getFields());
-      if ($captured) {
-        $this->args[] = ',';
-      }
-      $this->args[] = $expr;
+      $captured[] = $expr;
       $captured++;
       // Keep going if we have a comma indicating another expression follows
-      if ($captured < $limit && substr($arg, 0, 1) === ',') {
+      if (count($captured) < $limit && substr($arg, 0, 1) === ',') {
         $arg = ltrim(substr($arg, 1));
       }
       else {
-        return;
+        break;
       }
     }
+    return $captured;
   }
 
   /**
@@ -147,20 +156,50 @@ private function captureExpression($arg) {
     return $item;
   }
 
+  /**
+   * Render the expression for insertion into the sql query
+   *
+   * @param array $fieldList
+   * @return string
+   */
   public function render(array $fieldList): string {
-    $output = $this->getName() . '(';
+    $output = '';
+    $params = $this->getParams();
     foreach ($this->args as $index => $arg) {
-      if ($index && $arg !== ',') {
-        $output .= ' ';
-      }
-      if (is_object($arg)) {
-        $output .= $arg->render($fieldList);
+      $rendered = $this->renderArg($arg, $params[$index], $fieldList);
+      if (strlen($rendered)) {
+        $output .= (strlen($output) ? ' ' : '') . $rendered;
       }
-      else {
-        $output .= $arg;
+    }
+    return $this->getName() . '(' . $output . ')';
+  }
+
+  /**
+   * @param array $arg
+   * @param array $param
+   * @param array $fieldList
+   * @return string
+   */
+  private function renderArg($arg, $param, $fieldList): string {
+    // Supply api_default
+    if (!isset($arg['prefix']) && !isset($arg['suffix']) && empty($arg['expr']) && !empty($param['api_default'])) {
+      $arg = [
+        'prefix' => $param['api_default']['prefix'] ?? reset($param['prefix']),
+        'expr' => array_map([parent::class, 'convert'], $param['api_default']['expr'] ?? []),
+        'suffix' => $param['api_default']['suffix'] ?? reset($param['suffix']),
+      ];
+    }
+    $rendered = $arg['prefix'] ?? '';
+    foreach ($arg['expr'] ?? [] as $idx => $expr) {
+      if (strlen($rendered) || $idx) {
+        $rendered .= $idx ? ', ' : ' ';
       }
+      $rendered .= $expr->render($fieldList);
+    }
+    if (isset($arg['suffix'])) {
+      $rendered .= (strlen($rendered) ? ' ' : '') . $arg['suffix'];
     }
-    return $output . ')';
+    return $rendered;
   }
 
   /**
@@ -194,11 +233,20 @@ public static function getParams(): array {
         'optional' => FALSE,
         'must_be' => [],
         'cant_be' => ['SqlWild'],
+        'api_default' => NULL,
       ];
     }
     return $params;
   }
 
+  /**
+   * Get the arguments passed to this sql function instance.
+   * @return array[]
+   */
+  public function getArgs(): array {
+    return $this->args;
+  }
+
   /**
    * @return string
    */
diff --git a/Civi/Api4/Query/SqlFunctionCOUNT.php b/Civi/Api4/Query/SqlFunctionCOUNT.php
index f149108a8d9e..2ab3d661630f 100644
--- a/Civi/Api4/Query/SqlFunctionCOUNT.php
+++ b/Civi/Api4/Query/SqlFunctionCOUNT.php
@@ -27,6 +27,17 @@ class SqlFunctionCOUNT extends SqlFunction {
     ],
   ];
 
+  /**
+   * Reformat result as array if using default separator
+   *
+   * @see \Civi\Api4\Utils\FormattingUtil::formatOutputValues
+   * @param string $value
+   * @return string|array
+   */
+  public function formatOutputValue($value) {
+    return (int) $value;
+  }
+
   /**
    * @return string
    */
diff --git a/Civi/Api4/Query/SqlFunctionGREATEST.php b/Civi/Api4/Query/SqlFunctionGREATEST.php
index 755ab2815112..5ce1b496a78e 100644
--- a/Civi/Api4/Query/SqlFunctionGREATEST.php
+++ b/Civi/Api4/Query/SqlFunctionGREATEST.php
@@ -16,6 +16,8 @@
  */
 class SqlFunctionGREATEST extends SqlFunction {
 
+  public $supportsExpansion = TRUE;
+
   protected static $category = self::CATEGORY_COMPARISON;
 
   protected static $params = [
diff --git a/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php b/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php
index 869bd077bfea..b683f15a7236 100644
--- a/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php
+++ b/Civi/Api4/Query/SqlFunctionGROUP_CONCAT.php
@@ -16,6 +16,8 @@
  */
 class SqlFunctionGROUP_CONCAT extends SqlFunction {
 
+  public $supportsExpansion = TRUE;
+
   protected static $category = self::CATEGORY_AGGREGATE;
 
   protected static $params = [
@@ -37,9 +39,28 @@ class SqlFunctionGROUP_CONCAT extends SqlFunction {
       'expr' => 1,
       'must_be' => ['SqlString'],
       'optional' => TRUE,
+      // @see self::formatOutput()
+      'api_default' => [
+        'expr' => ['"' . \CRM_Core_DAO::VALUE_SEPARATOR . '"'],
+      ],
     ],
   ];
 
+  /**
+   * Reformat result as array if using default separator
+   *
+   * @see \Civi\Api4\Utils\FormattingUtil::formatOutputValues
+   * @param string $value
+   * @return string|array
+   */
+  public function formatOutputValue($value) {
+    $exprArgs = $this->getArgs();
+    if (!$exprArgs[2]['prefix']) {
+      $value = explode(\CRM_Core_DAO::VALUE_SEPARATOR, $value);
+    }
+    return $value;
+  }
+
   /**
    * @return string
    */
diff --git a/Civi/Api4/Query/SqlFunctionLEAST.php b/Civi/Api4/Query/SqlFunctionLEAST.php
index ea246a820da7..b0f315a98822 100644
--- a/Civi/Api4/Query/SqlFunctionLEAST.php
+++ b/Civi/Api4/Query/SqlFunctionLEAST.php
@@ -16,6 +16,8 @@
  */
 class SqlFunctionLEAST extends SqlFunction {
 
+  public $supportsExpansion = TRUE;
+
   protected static $category = self::CATEGORY_COMPARISON;
 
   protected static $params = [
diff --git a/Civi/Api4/Query/SqlFunctionMAX.php b/Civi/Api4/Query/SqlFunctionMAX.php
index 2116ec19f374..c783d2cab712 100644
--- a/Civi/Api4/Query/SqlFunctionMAX.php
+++ b/Civi/Api4/Query/SqlFunctionMAX.php
@@ -16,6 +16,8 @@
  */
 class SqlFunctionMAX extends SqlFunction {
 
+  public $supportsExpansion = TRUE;
+
   protected static $category = self::CATEGORY_AGGREGATE;
 
   protected static $params = [
diff --git a/Civi/Api4/Query/SqlFunctionMIN.php b/Civi/Api4/Query/SqlFunctionMIN.php
index e8d4c56ebb3a..f5fe4e86bd57 100644
--- a/Civi/Api4/Query/SqlFunctionMIN.php
+++ b/Civi/Api4/Query/SqlFunctionMIN.php
@@ -16,6 +16,8 @@
  */
 class SqlFunctionMIN extends SqlFunction {
 
+  public $supportsExpansion = TRUE;
+
   protected static $category = self::CATEGORY_AGGREGATE;
 
   protected static $params = [
diff --git a/Civi/Api4/Query/SqlFunctionNULLIF.php b/Civi/Api4/Query/SqlFunctionNULLIF.php
index 846981c736b1..53ec601bcce2 100644
--- a/Civi/Api4/Query/SqlFunctionNULLIF.php
+++ b/Civi/Api4/Query/SqlFunctionNULLIF.php
@@ -16,6 +16,8 @@
  */
 class SqlFunctionNULLIF extends SqlFunction {
 
+  public $supportsExpansion = TRUE;
+
   protected static $category = self::CATEGORY_COMPARISON;
 
   protected static $params = [
diff --git a/Civi/Api4/Utils/FormattingUtil.php b/Civi/Api4/Utils/FormattingUtil.php
index f170969a7fda..82e1f770059e 100644
--- a/Civi/Api4/Utils/FormattingUtil.php
+++ b/Civi/Api4/Utils/FormattingUtil.php
@@ -19,6 +19,8 @@
 
 namespace Civi\Api4\Utils;
 
+use Civi\Api4\Query\SqlExpression;
+
 require_once 'api/v3/utils.php';
 
 class FormattingUtil {
@@ -134,38 +136,47 @@ public static function formatInputValue(&$value, $fieldName, $fieldSpec, $action
    * @param array $fields
    * @param string $entity
    * @param string $action
+   * @param array $selectAliases
    * @throws \API_Exception
    * @throws \CRM_Core_Exception
    */
-  public static function formatOutputValues(&$results, $fields, $entity, $action = 'get') {
+  public static function formatOutputValues(&$results, $fields, $entity, $action = 'get', $selectAliases = []) {
     $fieldOptions = [];
     foreach ($results as &$result) {
       $contactTypePaths = [];
-      foreach ($result as $fieldExpr => $value) {
-        $field = $fields[$fieldExpr] ?? NULL;
-        $dataType = $field['data_type'] ?? ($fieldExpr == 'id' ? 'Integer' : NULL);
-        if ($field) {
-          // Evaluate pseudoconstant suffixes
-          $suffix = strrpos($fieldExpr, ':');
-          if ($suffix) {
-            $fieldOptions[$fieldExpr] = $fieldOptions[$fieldExpr] ?? self::getPseudoconstantList($field, substr($fieldExpr, $suffix + 1), $result, $action);
-            $dataType = NULL;
-          }
-          if (!empty($field['serialize'])) {
-            if (is_string($value)) {
-              $value = \CRM_Core_DAO::unSerializeField($value, $field['serialize']);
-            }
-          }
-          if (isset($fieldOptions[$fieldExpr])) {
-            $value = self::replacePseudoconstant($fieldOptions[$fieldExpr], $value);
+      foreach ($result as $key => $value) {
+        $fieldExpr = SqlExpression::convert($selectAliases[$key] ?? $key);
+        $fieldName = \CRM_Utils_Array::first($fieldExpr->getFields());
+        $field = $fieldName && isset($fields[$fieldName]) ? $fields[$fieldName] : NULL;
+        $dataType = $field['data_type'] ?? ($fieldName == 'id' ? 'Integer' : NULL);
+        // If Sql Function e.g. GROUP_CONCAT or COUNT wants to do its own formatting, apply and skip dataType conversion
+        if (method_exists($fieldExpr, 'formatOutputValue') && is_string($value)) {
+          $result[$key] = $value = $fieldExpr->formatOutputValue($value);
+          $dataType = NULL;
+        }
+        if (!$field) {
+          continue;
+        }
+        // Evaluate pseudoconstant suffixes
+        $suffix = strrpos($fieldName, ':');
+        if ($suffix) {
+          $fieldOptions[$fieldName] = $fieldOptions[$fieldName] ?? self::getPseudoconstantList($field, substr($fieldName, $suffix + 1), $result, $action);
+          $dataType = NULL;
+        }
+        if ($fieldExpr->supportsExpansion) {
+          if (!empty($field['serialize']) && is_string($value)) {
+            $value = \CRM_Core_DAO::unSerializeField($value, $field['serialize']);
           }
-          // Keep track of contact types for self::contactFieldsToRemove
-          if ($value && isset($field['entity']) && $field['entity'] === 'Contact' && $field['name'] === 'contact_type') {
-            $prefix = strrpos($fieldExpr, '.');
-            $contactTypePaths[$prefix ? substr($fieldExpr, 0, $prefix + 1) : ''] = $value;
+          if (isset($fieldOptions[$fieldName])) {
+            $value = self::replacePseudoconstant($fieldOptions[$fieldName], $value);
           }
         }
-        $result[$fieldExpr] = self::convertDataType($value, $dataType);
+        // Keep track of contact types for self::contactFieldsToRemove
+        if ($value && isset($field['entity']) && $field['entity'] === 'Contact' && $field['name'] === 'contact_type') {
+          $prefix = strrpos($fieldName, '.');
+          $contactTypePaths[$prefix ? substr($fieldName, 0, $prefix + 1) : ''] = $value;
+        }
+        $result[$key] = self::convertDataType($value, $dataType);
       }
       // Remove inapplicable contact fields
       foreach ($contactTypePaths as $prefix => $contactType) {
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 9c7b7854c621..88ba4c7b11d4 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -356,11 +356,7 @@
         var info = searchMeta.parseExpr(col),
           key = info.fn ? (info.fn.name + ':' + info.path + info.suffix) : col,
           value = row[key];
-        // Handle grouped results
-        if (info.fn && info.fn.name === 'GROUP_CONCAT' && value) {
-          return formatGroupConcatValues(info, value);
-        }
-        else if (info.fn && info.fn.name === 'COUNT') {
+        if (info.fn && info.fn.name === 'COUNT') {
           return value;
         }
         return formatFieldValue(info.field, value);
@@ -368,31 +364,23 @@
 
       function formatFieldValue(field, value) {
         var type = field.data_type;
+        if (_.isArray(value)) {
+          return _.map(value, function(val) {
+            return formatFieldValue(field, val);
+          }).join(', ');
+        }
         if (value && (type === 'Date' || type === 'Timestamp') && /^\d{4}-\d{2}-\d{2}/.test(value)) {
           return CRM.utils.formatDate(value, null, type === 'Timestamp');
         }
         else if (type === 'Boolean' && typeof value === 'boolean') {
           return value ? ts('Yes') : ts('No');
         }
-        else if (type === 'Money') {
+        else if (type === 'Money' && typeof value === 'number') {
           return CRM.formatMoney(value);
         }
-        if (_.isArray(value)) {
-          return value.join(', ');
-        }
         return value;
       }
 
-      function formatGroupConcatValues(info, values) {
-        return _.transform(values.split(','), function(result, val) {
-          if (info.field.options && !info.suffix) {
-            result.push(_.result(getOption(info.field, val), 'label'));
-          } else {
-            result.push(formatFieldValue(info.field, val));
-          }
-        }).join(', ');
-      }
-
       function getOption(field, value) {
         return _.find(field.options, function(option) {
           // Type coersion is intentional
diff --git a/ext/search/ang/search/crmSearchFunction.component.js b/ext/search/ang/search/crmSearchFunction.component.js
index e75bac957148..7a46aff4311f 100644
--- a/ext/search/ang/search/crmSearchFunction.component.js
+++ b/ext/search/ang/search/crmSearchFunction.component.js
@@ -14,7 +14,7 @@
 
       this.$onInit = function() {
         var fieldInfo = searchMeta.parseExpr(ctrl.expr);
-        ctrl.path = fieldInfo.path;
+        ctrl.path = fieldInfo.path + fieldInfo.suffix;
         ctrl.field = fieldInfo.field;
         ctrl.fn = !fieldInfo.fn ? '' : fieldInfo.fn.name;
       };
diff --git a/tests/phpunit/api/v4/Action/SqlFunctionTest.php b/tests/phpunit/api/v4/Action/SqlFunctionTest.php
index af91acffaff4..0ff7f2cec13a 100644
--- a/tests/phpunit/api/v4/Action/SqlFunctionTest.php
+++ b/tests/phpunit/api/v4/Action/SqlFunctionTest.php
@@ -39,14 +39,16 @@ public function testGetFunctions() {
   public function testGroupAggregates() {
     $cid = Contact::create(FALSE)->addValue('first_name', 'bill')->execute()->first()['id'];
     Contribution::save(FALSE)
-      ->setDefaults(['contact_id' => $cid, 'financial_type_id' => 1])
+      ->setDefaults(['contact_id' => $cid, 'financial_type_id:name' => 'Donation'])
       ->setRecords([
         ['total_amount' => 100, 'receive_date' => '2020-01-01'],
         ['total_amount' => 200, 'receive_date' => '2020-01-01'],
-        ['total_amount' => 300, 'receive_date' => '2020-01-01'],
-        ['total_amount' => 400, 'receive_date' => '2020-01-01'],
+        ['total_amount' => 300, 'receive_date' => '2020-01-01', 'financial_type_id:name' => 'Member Dues'],
+        ['total_amount' => 400, 'receive_date' => '2020-01-01', 'financial_type_id:name' => 'Event Fee'],
       ])
       ->execute();
+
+    // Test AVG, SUM, MAX, MIN, COUNT
     $agg = Contribution::get(FALSE)
       ->addGroupBy('contact_id')
       ->addWhere('contact_id', '=', $cid)
@@ -57,11 +59,23 @@ public function testGroupAggregates() {
       ->addSelect('COUNT(*) AS count')
       ->execute()
       ->first();
-    $this->assertEquals(250, $agg['average']);
-    $this->assertEquals(1000, $agg['SUM:total_amount']);
-    $this->assertEquals(400, $agg['MAX:total_amount']);
-    $this->assertEquals(100, $agg['MIN:total_amount']);
-    $this->assertEquals(4, $agg['count']);
+    $this->assertTrue(250.0 === $agg['average']);
+    $this->assertTrue(1000.0 === $agg['SUM:total_amount']);
+    $this->assertTrue(400.0 === $agg['MAX:total_amount']);
+    $this->assertTrue(100.0 === $agg['MIN:total_amount']);
+    $this->assertTrue(4 === $agg['count']);
+
+    // Test GROUP_CONCAT
+    $agg = Contribution::get(FALSE)
+      ->addGroupBy('contact_id')
+      ->addWhere('contact_id', '=', $cid)
+      ->addSelect('GROUP_CONCAT(financial_type_id:name)')
+      ->addSelect('COUNT(*) AS count')
+      ->execute()
+      ->first();
+
+    $this->assertTrue(4 === $agg['count']);
+    $this->assertContains('Donation', $agg['GROUP_CONCAT:financial_type_id:name']);
   }
 
   public function testGroupHaving() {
diff --git a/tests/phpunit/api/v4/Query/SqlExpressionParserTest.php b/tests/phpunit/api/v4/Query/SqlExpressionParserTest.php
index 2f18648837f3..9532529250a5 100644
--- a/tests/phpunit/api/v4/Query/SqlExpressionParserTest.php
+++ b/tests/phpunit/api/v4/Query/SqlExpressionParserTest.php
@@ -50,19 +50,31 @@ public function testAggregateFuncitons($fnName) {
     $sqlFn = new $className($fnName . '(total)');
     $this->assertEquals($fnName, $sqlFn->getName());
     $this->assertEquals(['total'], $sqlFn->getFields());
-    $this->assertCount(1, $this->getArgs($sqlFn));
+    $args = $sqlFn->getArgs();
+    $this->assertCount(1, $args);
+    $this->assertNull($args[0]['prefix']);
+    $this->assertNull($args[0]['suffix']);
+    $this->assertTrue(is_a($args[0]['expr'][0], 'Civi\Api4\Query\SqlField'));
 
     $sqlFn = SqlExpression::convert($fnName . '(DISTINCT stuff)');
     $this->assertEquals($fnName, $sqlFn->getName());
     $this->assertEquals("Civi\Api4\Query\SqlFunction$fnName", get_class($sqlFn));
     $this->assertEquals($params, $sqlFn->getParams());
     $this->assertEquals(['stuff'], $sqlFn->getFields());
-    $this->assertCount(2, $this->getArgs($sqlFn));
+    $args = $sqlFn->getArgs();
+    $this->assertCount(1, $args);
+    $this->assertEquals('DISTINCT', $args[0]['prefix']);
+    $this->assertNull($args[0]['suffix']);
+    $this->assertTrue(is_a($args[0]['expr'][0], 'Civi\Api4\Query\SqlField'));
 
     try {
       $sqlFn = SqlExpression::convert($fnName . '(*)');
       if ($fnName === 'COUNT') {
-        $this->assertTrue(is_a($this->getArgs($sqlFn)[0], 'Civi\Api4\Query\SqlWild'));
+        $args = $sqlFn->getArgs();
+        $this->assertCount(1, $args);
+        $this->assertNull($args[0]['prefix']);
+        $this->assertNull($args[0]['suffix']);
+        $this->assertTrue(is_a($args[0]['expr'][0], 'Civi\Api4\Query\SqlWild'));
       }
       else {
         $this->fail('SqlWild should only be allowed in COUNT.');
@@ -73,16 +85,4 @@ public function testAggregateFuncitons($fnName) {
     }
   }
 
-  /**
-   * @param \Civi\Api4\Query\SqlFunction $fn
-   * @return array
-   * @throws \ReflectionException
-   */
-  private function getArgs($fn) {
-    $ref = new \ReflectionClass($fn);
-    $args = $ref->getProperty('args');
-    $args->setAccessible(TRUE);
-    return $args->getValue($fn);
-  }
-
 }

From f99d41d2797a664d5db7dc99821d7d8ed05b96f2 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 24 Sep 2020 10:31:09 -0400
Subject: [PATCH 731/834] Search ext: Expose DISTINCT modifier

---
 ext/search/ang/search.module.js               |  6 ++++--
 .../ang/search/crmSearchFunction.component.js | 20 ++++++++++++++++++-
 ext/search/ang/search/crmSearchFunction.html  |  4 ++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ext/search/ang/search.module.js b/ext/search/ang/search.module.js
index ed60680e0020..cec26c5d6ea0 100644
--- a/ext/search/ang/search.module.js
+++ b/ext/search/ang/search.module.js
@@ -100,12 +100,14 @@
         getEntity: getEntity,
         getField: getField,
         parseExpr: function(expr) {
-          var result = {},
+          var result = {fn: null, modifier: ''},
             fieldName = expr,
             bracketPos = expr.indexOf('(');
           if (bracketPos >= 0) {
-            fieldName = expr.match(/[A-Z( _]*([\w.:]+)/)[1];
+            var parsed = expr.substr(bracketPos).match(/[ ]?([A-Z]+[ ]+)?([\w.:]+)/);
+            fieldName = parsed[2];
             result.fn = _.find(CRM.vars.search.functions, {name: expr.substring(0, bracketPos)});
+            result.modifier = _.trim(parsed[1]);
           }
           result.field = getField(fieldName);
           var split = fieldName.split(':'),
diff --git a/ext/search/ang/search/crmSearchFunction.component.js b/ext/search/ang/search/crmSearchFunction.component.js
index 7a46aff4311f..9b7efce4b837 100644
--- a/ext/search/ang/search/crmSearchFunction.component.js
+++ b/ext/search/ang/search/crmSearchFunction.component.js
@@ -17,10 +17,28 @@
         ctrl.path = fieldInfo.path + fieldInfo.suffix;
         ctrl.field = fieldInfo.field;
         ctrl.fn = !fieldInfo.fn ? '' : fieldInfo.fn.name;
+        ctrl.modifier = fieldInfo.modifier || null;
+        initFunction();
       };
 
+      function initFunction() {
+        ctrl.fnInfo = _.find(CRM.vars.search.functions, {name: ctrl.fn});
+        if (ctrl.fnInfo && _.includes(ctrl.fnInfo.params[0].prefix, 'DISTINCT')) {
+          ctrl.modifierAllowed = true;
+        }
+        else {
+          ctrl.modifierAllowed = false;
+          ctrl.modifier = null;
+        }
+      }
+
       this.selectFunction = function() {
-        ctrl.expr = ctrl.fn ? (ctrl.fn + '(' + ctrl.path + ')') : ctrl.path;
+        initFunction();
+        ctrl.writeExpr();
+      };
+
+      this.writeExpr = function() {
+        ctrl.expr = ctrl.fn ? (ctrl.fn + '(' + (ctrl.modifier ? ctrl.modifier + ' ' : '') + ctrl.path + ')') : ctrl.path;
       };
     }
   });
diff --git a/ext/search/ang/search/crmSearchFunction.html b/ext/search/ang/search/crmSearchFunction.html
index e0692e33d3e4..03238b825c05 100644
--- a/ext/search/ang/search/crmSearchFunction.html
+++ b/ext/search/ang/search/crmSearchFunction.html
@@ -1,4 +1,8 @@
 <div class="form-inline">
   <label>{{ $ctrl.field.label }}:</label>
   <input class="form-control" style="width: 15em;" ng-model="$ctrl.fn" crm-ui-select="{data: $ctrl.functions, placeholder: ts('Select')}" ng-change="$ctrl.selectFunction()">
+  <label ng-if="$ctrl.modifierAllowed">
+    <input type="checkbox" ng-model="$ctrl.modifier" ng-change="$ctrl.writeExpr()" ng-true-value="'DISTINCT'" ng-false-value="null">
+    {{ ts('Distinct') }}
+  </label>
 </div>

From f8471e72ef8d578629ca8b2abefe40de79949992 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Thu, 24 Sep 2020 14:23:45 -0400
Subject: [PATCH 732/834] test for target contacts on Bulk Email for mailing in
 batches

---
 .../phpunit/api/v3/JobProcessMailingTest.php  | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php
index c45c4c55c826..98e8438d2d29 100644
--- a/tests/phpunit/api/v3/JobProcessMailingTest.php
+++ b/tests/phpunit/api/v3/JobProcessMailingTest.php
@@ -470,6 +470,49 @@ public function testConcurrency($settings, $expectedTallies, $expectedTotal) {
     $this->assertEquals(0, $apiCalls->getRunningCount());
   }
 
+  /**
+   * Check that the earlier iterations's activity targets on the recorded
+   * BulkEmail activity don't get wiped out by subsequent iterations when
+   * using batches.
+   */
+  public function testBatchActivityTargets() {
+    $loggedInUserId = $this->createLoggedInUser();
+
+    \Civi::settings()->set('mailerBatchLimit', 2);
+
+    // We have such small batches we need to lower this interval to get it
+    // to create the activity.
+    $old_sync_interval = \Civi::settings()->get('civimail_sync_interval');
+    \Civi::settings()->set('civimail_sync_interval', 1);
+
+    $this->createContactsInGroup(6, $this->_groupID);
+    $mailing = $this->callAPISuccess('mailing', 'create', $this->_params + ['scheduled_id' => $loggedInUserId]);
+    $this->callAPISuccess('job', 'process_mailing', []);
+    $bulkEmailActivity = $this->callAPISuccess('Activity', 'getsingle', [
+      'source_record_id' => $mailing['id'],
+      'activity_type_id' => 'Bulk Email',
+      'return' => ['target_contact_id'],
+    ]);
+    // After first batch, should have two targets
+    $this->assertCount(2, $bulkEmailActivity['target_contact_id']);
+
+    // Because we're running in script mode need to reset this static
+    // to get it to process the other batches.
+    CRM_Mailing_BAO_MailingJob::$mailsProcessed = 0;
+
+    $this->callAPISuccess('job', 'process_mailing', []);
+    $bulkEmailActivity = $this->callAPISuccess('Activity', 'getsingle', [
+      'source_record_id' => $mailing['id'],
+      'activity_type_id' => 'Bulk Email',
+      'return' => ['target_contact_id'],
+    ]);
+    // After second batch, should have four targets
+    $this->assertCount(4, $bulkEmailActivity['target_contact_id']);
+
+    // restore setting
+    \Civi::settings()->set('civimail_sync_interval', $old_sync_interval);
+  }
+
   /**
    * Create contacts in group.
    *

From 5e04a2d4ab72f7f5d2f94212bb6e71bcb65d6e93 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 24 Sep 2020 14:27:20 -0400
Subject: [PATCH 733/834] Afform: code cleanup & remove unused menu item

---
 ext/afform/core/afform.php                          | 3 +--
 ext/afform/gui/CRM/AfformGui/Upgrader.php           | 5 +++--
 ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl | 0
 ext/afform/gui/xml/Menu/afform_gui.xml              | 9 ---------
 4 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl
 delete mode 100644 ext/afform/gui/xml/Menu/afform_gui.xml

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index 89c7dc090529..c78170823b88 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -150,8 +150,7 @@ function afform_civicrm_caseTypes(&$caseTypes) {
 function afform_civicrm_angularModules(&$angularModules) {
   _afform_civix_civicrm_angularModules($angularModules);
 
-  $afforms = \Civi\Api4\Afform::get()
-    ->setCheckPermissions(FALSE)
+  $afforms = \Civi\Api4\Afform::get(FALSE)
     ->setSelect(['name', 'requires', 'module_name', 'directive_name'])
     ->execute();
 
diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/gui/CRM/AfformGui/Upgrader.php
index a421855de16e..6b6871c9526a 100644
--- a/ext/afform/gui/CRM/AfformGui/Upgrader.php
+++ b/ext/afform/gui/CRM/AfformGui/Upgrader.php
@@ -10,10 +10,11 @@ class CRM_AfformGui_Upgrader extends CRM_AfformGui_Upgrader_Base {
   // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
 
   /**
-   * Setup navigation item on new installs
+   * Setup navigation item on new installs.
+   *
+   * Note: this path is not in the menu.xml because it is handled by afform
    */
   public function install() {
-    // $this->executeSqlFile('sql/myinstall.sql');
     try {
       $existing = civicrm_api3('Navigation', 'getcount', [
         'name' => 'afform_gui',
diff --git a/ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl b/ext/afform/gui/templates/CRM/AfformGui/Page/Gui.tpl
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/ext/afform/gui/xml/Menu/afform_gui.xml b/ext/afform/gui/xml/Menu/afform_gui.xml
deleted file mode 100644
index b13ee535699d..000000000000
--- a/ext/afform/gui/xml/Menu/afform_gui.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<menu>
-  <item>
-    <path>civicrm/admin/afform</path>
-    <page_callback>CRM_AfformGui_Page_Gui</page_callback>
-    <title>Gui</title>
-    <access_arguments>access CiviCRM</access_arguments>
-  </item>
-</menu>

From 4905dacf4ab55f9d2b2b700b7bcc741a274f8ce8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 24 Sep 2020 14:27:45 -0400
Subject: [PATCH 734/834] Afform: add bootstrap3 bundle

---
 ext/afform/core/CRM/Afform/Page/AfformBase.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/afform/core/CRM/Afform/Page/AfformBase.php b/ext/afform/core/CRM/Afform/Page/AfformBase.php
index 3a64be2f6fab..540b16fe9426 100644
--- a/ext/afform/core/CRM/Afform/Page/AfformBase.php
+++ b/ext/afform/core/CRM/Afform/Page/AfformBase.php
@@ -21,7 +21,9 @@ public function run() {
       'afform' => [
         'open' => $afform['directive_name'],
       ],
-    ]);
+    ])
+      // TODO: Allow afforms to declare their own theming requirements
+      ->addBundle('bootstrap3');
     $loader->load();
 
     if (!empty($afform['title'])) {

From 828fc2c3fda939ea862427de2e72fe75e6ca401e Mon Sep 17 00:00:00 2001
From: Justin Freeman <justin@agileware.com.au>
Date: Fri, 25 Sep 2020 07:08:05 +1000
Subject: [PATCH 735/834] CIVICRM-1567 Update the post-upgrade thank you
 message to include URLs to CiviCRM contributors, CiviCRM members and minor
 rewrite

---
 templates/CRM/common/success.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl
index 14ca9873a9fd..4871f6b56a64 100644
--- a/templates/CRM/common/success.tpl
+++ b/templates/CRM/common/success.tpl
@@ -44,7 +44,7 @@
       <div class="bold" style="padding: 1em; background-color: rgba(255, 255, 255, 0.76);">
         <p>
           <img style="display:block; float:left; width:40px; margin-right:10px;" src="{$config->resourceBase}i/logo_lg.png">
-          {ts 1="https://civicrm.org/core-team" 2="https://civicrm.org/providers/contributors" 3="https://civicrm.org/become-a-member?src=ug&sid=$sid" 4=$newVersion}Thank you for upgrading to %4, the latest version of CiviCRM. Packed with new features and improvements, this release was made possible by both the <a href="%1">CiviCRM Core Team</a> and an incredible group of <a href="%2">contributors</a>, combined with the financial support of CiviCRM Members and Partners, without whom the project could not exist. We invite you to join their ranks by <a href="%3">becoming a member of CiviCRM today</a>. There is no better way to say thanks than to support those that have made CiviCRM %4 possible. <a href="%3">Join today</a>.{/ts}
+          {ts 1="https://civicrm.org/core-team" 2="https://civicrm.org/contributors" 3="https://civicrm.org/members" 4="https://civicrm.org/partners" 5="https://civicrm.org/become-a-member?src=ug&sid=$sid" 6=$newVersion 7="https://civicrm.org/become-a-partner" 8="https://civicrm.org"}Thank you for upgrading to %6. This release was made possible by the <a href="%1" target="_blank">CiviCRM Core Team</a> and an <a href="%2" target="_blank">incredible group of CiviCRM Contributors</a>. The CiviCRM project could not exist without the continued financial support of <a href="%3" target="_blank">CiviCRM Members</a> and <a href="%4" target="_blank">CiviCRM Partners</a>. We invite you to support CiviCRM by becoming a <a href="%5" target="_blank">CiviCRM Member</a> or <a href="%7" target="_blank">CiviCRM Partner</a> today. Providing financial support ensures that the <a href="%8" target="_blank">CiviCRM project</a> can continue to provide the essential resources and services to support the <a href="%8" target="_blank">CiviCRM community</a>.{/ts}
         </p>
       </div>
       <p><span class="crm-status-icon success"> </span>{$message}</p>

From 7c98e76fdde13ed1bd1cfc622be924ed1867c26d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 25 Sep 2020 11:17:47 +1200
Subject: [PATCH 736/834] dev/core#2029 More debug attempts

---
 tests/phpunit/E2E/Core/PrevNextTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/E2E/Core/PrevNextTest.php b/tests/phpunit/E2E/Core/PrevNextTest.php
index db52c588addd..f05ebb113d79 100644
--- a/tests/phpunit/E2E/Core/PrevNextTest.php
+++ b/tests/phpunit/E2E/Core/PrevNextTest.php
@@ -251,7 +251,10 @@ public function testDeleteByCacheKey() {
     $this->testFillArray();
 
     $all = $this->prevNext->getSelection($this->cacheKey, 'getall')[$this->cacheKey];
-    $this->assertEquals([100, 400, 200, 300], array_keys($all));
+    $this->assertEquals([100, 400, 200, 300], array_keys($all), 'selected cache not correct for ' . $this->cacheKey
+      . ' defined keys are ' . $this->cacheKey . 'and ' . $this->cacheKeyB
+      . ' the prevNext cache is ' . print_r($this->prevNext, TRUE)
+    );
 
     list ($id1, $id2, $id3) = array_keys($all);
     $this->prevNext->markSelection($this->cacheKey, 'select', [$id1, $id3]);

From 717c29031d968c0bbb3b115ee63f3769b53ec7bc Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 25 Sep 2020 11:31:39 +1200
Subject: [PATCH 737/834] dev/core#2046 Fix Phone:add to be a pseudonym for
 Phone.create

Per https://lab.civicrm.org/dev/core/-/issues/2046 we have discussed rationalising add vs create

In the case of phone making this change only affects one place - a place that currently has a
bug that relates specifically to the handling of is_primary & which is more solvable by
calling create with it's extra is_primary handling.

(the related bug is that the is_primary handling in Block::create is unreliable &
to mitigate that we are doing an additional 10 queries on every contact create - so
handling is_primary right in the first place helps address that)
---
 CRM/Core/BAO/Block.php                        |  3 +++
 CRM/Core/BAO/Phone.php                        | 17 +++++++++--------
 tests/phpunit/CRM/Contact/BAO/ContactTest.php |  2 +-
 tests/phpunit/CRM/Core/BAO/PhoneTest.php      |  7 +++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 9e734afa063f..4f17f5b57c49 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -331,6 +331,9 @@ public static function create($blockName, $params, $entity = NULL, $contactId =
         // and the primary handling is otherwise bypassed on importing an email update.
         $blocks[] = CRM_Core_BAO_Email::create($blockFields);
       }
+      elseif ($name === 'Phone') {
+        $blocks[] = CRM_Core_BAO_Phone::create($blockFields);
+      }
       else {
         $baoString = 'CRM_Core_BAO_' . $name;
         $blocks[] = $baoString::add($blockFields);
diff --git a/CRM/Core/BAO/Phone.php b/CRM/Core/BAO/Phone.php
index f5851eee26cf..dac8c9fa5fac 100644
--- a/CRM/Core/BAO/Phone.php
+++ b/CRM/Core/BAO/Phone.php
@@ -39,25 +39,26 @@ public static function create($params) {
     ) {
       CRM_Core_BAO_Block::handlePrimary($params, get_class());
     }
-    $phone = self::add($params);
-
-    return $phone;
+    return self::writeRecord($params);
   }
 
   /**
    * Takes an associative array and adds phone.
    *
+   * @deprecated use create.
+   *
    * @param array $params
    *   (reference ) an assoc array of name/value pairs.
    *
    * @return object
    *   CRM_Core_BAO_Phone object on success, null otherwise
+   *
+   * @throws \API_Exception
+   * @throws \CRM_Core_Exception
    */
-  public static function add(&$params) {
-    // Ensure mysql phone function exists
-    CRM_Core_DAO::checkSqlFunctionsExist();
-
-    return self::writeRecord($params);
+  public static function add($params) {
+    CRM_Core_Error::deprecatedFunctionWarning('Use the v4 api');
+    return self::create($params);
   }
 
   /**
diff --git a/tests/phpunit/CRM/Contact/BAO/ContactTest.php b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
index 3b4af8c9a317..b4fc988a6700 100644
--- a/tests/phpunit/CRM/Contact/BAO/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/ContactTest.php
@@ -1446,7 +1446,7 @@ public function testTimestampsPhone() {
           'location_type_id' => 1,
           'contact_id' => $contactId,
         ];
-        CRM_Core_BAO_Phone::add($params);
+        CRM_Core_BAO_Phone::create($params);
         $test->assertDBQuery('202-555-1000',
           'SELECT phone FROM civicrm_phone WHERE contact_id = %1 ORDER BY id DESC LIMIT 1',
           [1 => [$contactId, 'Integer']]
diff --git a/tests/phpunit/CRM/Core/BAO/PhoneTest.php b/tests/phpunit/CRM/Core/BAO/PhoneTest.php
index f0be5b48ede1..bd6beca1e7ab 100644
--- a/tests/phpunit/CRM/Core/BAO/PhoneTest.php
+++ b/tests/phpunit/CRM/Core/BAO/PhoneTest.php
@@ -34,7 +34,7 @@ public function testAdd() {
       'contact_id' => $contactId,
     ];
 
-    CRM_Core_BAO_Phone::add($params);
+    CRM_Core_BAO_Phone::create($params);
 
     $phoneId = $this->assertDBNotNull('CRM_Core_DAO_Phone', $contactId, 'id', 'contact_id',
       'Database check for created phone record.'
@@ -44,16 +44,15 @@ public function testAdd() {
       "Check if phone field has expected value in new record ( civicrm_phone.id={$phoneId} )."
     );
 
-    // Now call add() to modify the existing phone number
+    // Now call create() to modify the existing phone number
 
-    $params = [];
     $params = [
       'id' => $phoneId,
       'contact_id' => $contactId,
       'phone' => '(415) 222-5432',
     ];
 
-    CRM_Core_BAO_Phone::add($params);
+    CRM_Core_BAO_Phone::create($params);
 
     $this->assertDBCompareValue('CRM_Core_DAO_Phone', $phoneId, 'phone', 'id', '(415) 222-5432',
       "Check if phone field has expected value in updated record ( civicrm_phone.id={$phoneId} )."

From c641ac454757f750d90ae7b90a67ec6953a2d43b Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 25 Sep 2020 14:07:58 +1200
Subject: [PATCH 738/834] [REF] Remove unused taskName variable

This variable is only used at the tpl layer in export - there is a separate PR
to change that usage to something more meaningful
https://github.com/civicrm/civicrm-core/pull/18589

Other than that all this task assignment appears to be just cruft

It's likely that it precedes other ways of setting the page title
---
 CRM/Activity/Form/Task.php           | 2 --
 CRM/Campaign/Form/Task.php           | 3 ---
 CRM/Contact/Form/Task.php            | 2 --
 CRM/Contact/Form/Task/SaveSearch.php | 2 --
 CRM/Contribute/Form/Task.php         | 2 --
 CRM/Core/Form/Task.php               | 3 ---
 CRM/Event/Form/Task.php              | 1 -
 CRM/Grant/Form/Task.php              | 1 -
 CRM/Mailing/Form/Task.php            | 2 --
 CRM/Member/Form/Task.php             | 1 -
 CRM/Pledge/Form/Task.php             | 2 --
 11 files changed, 21 deletions(-)

diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
index 462499c38fd3..2b550eb813ae 100644
--- a/CRM/Activity/Form/Task.php
+++ b/CRM/Activity/Form/Task.php
@@ -48,8 +48,6 @@ public static function preProcessCommon(&$form) {
     $values = $form->controller->exportValues($form->get('searchFormName'));
 
     $form->_task = $values['task'];
-    $activityTasks = CRM_Activity_Task::tasks();
-    $form->assign('taskName', $activityTasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {
diff --git a/CRM/Campaign/Form/Task.php b/CRM/Campaign/Form/Task.php
index f59cc30ea60f..61411931d0ad 100644
--- a/CRM/Campaign/Form/Task.php
+++ b/CRM/Campaign/Form/Task.php
@@ -34,9 +34,6 @@ public function preProcess() {
     $values = $this->controller->exportValues('Search');
 
     $this->_task = $values['task'];
-    $campaignTasks = CRM_Campaign_Task::tasks();
-    $taskName = $campaignTasks[$this->_task] ?? NULL;
-    $this->assign('taskName', $taskName);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {
diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index a7bd173701ef..198d64ba5204 100644
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -129,8 +129,6 @@ public static function preProcessCommon(&$form) {
     $cacheKey = "civicrm search {$qfKey}";
 
     $form->_task = self::$_searchFormValues['task'] ?? NULL;
-    $crmContactTaskTasks = CRM_Contact_Task::taskTitles();
-    $form->assign('taskName', CRM_Utils_Array::value($form->_task, $crmContactTaskTasks));
 
     // all contacts or action = save a search
     if ((CRM_Utils_Array::value('radio_ts', self::$_searchFormValues) == 'ts_all') ||
diff --git a/CRM/Contact/Form/Task/SaveSearch.php b/CRM/Contact/Form/Task/SaveSearch.php
index a98a29fee0ad..f843f69ecb1b 100644
--- a/CRM/Contact/Form/Task/SaveSearch.php
+++ b/CRM/Contact/Form/Task/SaveSearch.php
@@ -53,9 +53,7 @@ public function preProcess() {
     // Get Task name
     $modeValue = CRM_Contact_Form_Search::getModeValue(CRM_Utils_Array::value('component_mode', $values, CRM_Contact_BAO_Query::MODE_CONTACTS));
     $className = $modeValue['taskClassName'];
-    $taskList = $className::taskTitles();
     $this->_task = $values['task'] ?? NULL;
-    $this->assign('taskName', CRM_Utils_Array::value($this->_task, $taskList));
   }
 
   /**
diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php
index 16d61166670f..e2f24b6562e5 100644
--- a/CRM/Contribute/Form/Task.php
+++ b/CRM/Contribute/Form/Task.php
@@ -58,8 +58,6 @@ public static function preProcessCommon(&$form) {
     $values = $form->controller->exportValues($form->get('searchFormName'));
 
     $form->_task = $values['task'] ?? NULL;
-    $contributeTasks = CRM_Contribute_Task::tasks();
-    $form->assign('taskName', CRM_Utils_Array::value($form->_task, $contributeTasks));
 
     $ids = [];
     if (isset($values['radio_ts']) && $values['radio_ts'] == 'ts_sel') {
diff --git a/CRM/Core/Form/Task.php b/CRM/Core/Form/Task.php
index a3bde1d8b668..579eefc533e7 100644
--- a/CRM/Core/Form/Task.php
+++ b/CRM/Core/Form/Task.php
@@ -95,9 +95,6 @@ public static function preProcessCommon(&$form) {
     $searchFormValues = $form->controller->exportValues($form->get('searchFormName'));
 
     $form->_task = $searchFormValues['task'];
-    $className = 'CRM_' . ucfirst($form::$entityShortname) . '_Task';
-    $entityTasks = $className::tasks();
-    $form->assign('taskName', $entityTasks[$form->_task]);
 
     $entityIds = [];
     if ($searchFormValues['radio_ts'] == 'ts_sel') {
diff --git a/CRM/Event/Form/Task.php b/CRM/Event/Form/Task.php
index 18962108a61c..08d4f7cc9f0c 100644
--- a/CRM/Event/Form/Task.php
+++ b/CRM/Event/Form/Task.php
@@ -52,7 +52,6 @@ public static function preProcessCommon(&$form) {
     if (!array_key_exists($form->_task, $tasks)) {
       CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
     }
-    $form->assign('taskName', $tasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {
diff --git a/CRM/Grant/Form/Task.php b/CRM/Grant/Form/Task.php
index b983cec3d72a..571c25433db1 100644
--- a/CRM/Grant/Form/Task.php
+++ b/CRM/Grant/Form/Task.php
@@ -46,7 +46,6 @@ public static function preProcessCommon(&$form) {
     if (!array_key_exists($form->_task, $tasks)) {
       CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
     }
-    $form->assign('taskName', $tasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {
diff --git a/CRM/Mailing/Form/Task.php b/CRM/Mailing/Form/Task.php
index 4a84746aaaba..154a04ed3a34 100644
--- a/CRM/Mailing/Form/Task.php
+++ b/CRM/Mailing/Form/Task.php
@@ -35,8 +35,6 @@ public static function preProcessCommon(&$form) {
     $values = $form->controller->exportValues($form->get('searchFormName'));
 
     $form->_task = $values['task'] ?? NULL;
-    $mailingTasks = CRM_Mailing_Task::tasks();
-    $form->assign('taskName', CRM_Utils_Array::value('task', $values));
 
     // ids are mailing event queue ids
     $ids = [];
diff --git a/CRM/Member/Form/Task.php b/CRM/Member/Form/Task.php
index 5f5791d01ab0..da684e433d4b 100644
--- a/CRM/Member/Form/Task.php
+++ b/CRM/Member/Form/Task.php
@@ -55,7 +55,6 @@ public static function preProcessCommon(&$form) {
     if (!array_key_exists($form->_task, $tasks)) {
       CRM_Core_Error::statusBounce(ts('You do not have permission to access this page.'));
     }
-    $form->assign('taskName', $tasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] === 'ts_sel') {
diff --git a/CRM/Pledge/Form/Task.php b/CRM/Pledge/Form/Task.php
index 2dc623f2fc77..12df902a9169 100644
--- a/CRM/Pledge/Form/Task.php
+++ b/CRM/Pledge/Form/Task.php
@@ -46,8 +46,6 @@ public static function preProcessCommon(&$form) {
     $values = $form->controller->exportValues('Search');
 
     $form->_task = $values['task'];
-    $pledgeTasks = CRM_Pledge_Task::tasks();
-    $form->assign('taskName', $pledgeTasks[$form->_task]);
 
     $ids = [];
     if ($values['radio_ts'] == 'ts_sel') {

From aa06ad4a5f6851a5ffab3de2d2d2dea4bc864f45 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 25 Sep 2020 11:01:09 +1200
Subject: [PATCH 739/834] [REF] Fix Event location to create it's locations
 directly rather than via shared methods

This form does extra work in order to call  CRM_Core_BAO_Block::create and CRM_Core_BAO_Address::create - but they have
extra handling that only exists for this code place. So, we are making 2 functions more complex in order to inter-relate them.

This simplifies the CRM_Event_Form_ManageEvent_Location and I will do follow on cleanup once merged. Note I previously
added tests to CRM_Event_Form_ManageEvent_LocationTest specifically to cover this (in a recent previous refactor
---
 CRM/Core/BAO/Location.php                     |   1 +
 CRM/Core/BAO/Phone.php                        |   1 +
 CRM/Event/Form/ManageEvent/Location.php       |  35 ++--
 Civi/Api4/LocBlock.php                        |  22 +++
 tests/phpunit/CRM/Core/BAO/LocationTest.php   | 159 ------------------
 .../Event/Form/ManageEvent/LocationTest.php   | 108 ++++++++++--
 tests/phpunit/api/v3/ACLPermissionTest.php    |   1 +
 7 files changed, 142 insertions(+), 185 deletions(-)
 create mode 100644 Civi/Api4/LocBlock.php

diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php
index add13da47965..911862b8fc18 100644
--- a/CRM/Core/BAO/Location.php
+++ b/CRM/Core/BAO/Location.php
@@ -73,6 +73,7 @@ public static function create(&$params, $fixAddress = TRUE) {
    * @return int
    */
   public static function createLocBlock($location, $entityElements) {
+    CRM_Core_Error::deprecatedFunctionWarning('Use LocBlock api');
     $locId = self::findExisting($entityElements);
     $locBlock = [];
 
diff --git a/CRM/Core/BAO/Phone.php b/CRM/Core/BAO/Phone.php
index dac8c9fa5fac..a9303ed0cb0a 100644
--- a/CRM/Core/BAO/Phone.php
+++ b/CRM/Core/BAO/Phone.php
@@ -28,6 +28,7 @@ class CRM_Core_BAO_Phone extends CRM_Core_DAO_Phone {
    *
    * @return object
    * @throws API_Exception
+   * @throws \CRM_Core_Exception
    */
   public static function create($params) {
     // Ensure mysql phone function exists
diff --git a/CRM/Event/Form/ManageEvent/Location.php b/CRM/Event/Form/ManageEvent/Location.php
index a1a79396a0d6..aa5aca492af8 100644
--- a/CRM/Event/Form/ManageEvent/Location.php
+++ b/CRM/Event/Form/ManageEvent/Location.php
@@ -10,6 +10,10 @@
  */
 
 use Civi\Api4\Event;
+use Civi\Api4\LocBlock;
+use Civi\Api4\Email;
+use Civi\Api4\Phone;
+use Civi\Api4\Address;
 
 /**
  *
@@ -227,14 +231,10 @@ public function postProcess() {
       CRM_Event_BAO_Event::deleteEventLocBlock($this->_oldLocBlockId, $this->_id);
     }
 
-    // get ready with location block params
-    $params['entity_table'] = 'civicrm_event';
-    $params['entity_id'] = $this->_id;
-
     $isUpdateToExistingLocationBlock = !empty($params['loc_event_id']) && (int) $params['loc_event_id'] === $this->locationBlock['loc_block_id'];
     // It should be impossible for there to be no default location type. Consider removing this handling
     $defaultLocationTypeID = CRM_Core_BAO_LocationType::getDefault()->id ?? 1;
-    $location = [];
+
     foreach ([
       'address' => $params['address'],
       'phone' => $params['phone'],
@@ -249,18 +249,21 @@ public function postProcess() {
           $params[$block][$index]['id'] = $this->locationBlock['loc_block.' . $block . $fieldKey];
         }
       }
-      if ($block !== 'address') {
-        $location[$block] = CRM_Core_BAO_Block::create($block, $params, 'event');
-      }
-      else {
-        $location[$block] = CRM_Core_BAO_Address::create($params, TRUE, 'event');
-      }
     }
-
-    $params['loc_block_id'] = CRM_Core_BAO_Location::createLocBlock($location, [
-      'entity_table' => $params['entity_table'],
-      'entity_id' => $params['entity_id'],
-    ]);
+    $addresses = Address::save(FALSE)->setRecords($params['address'])->execute();
+    $emails = Email::save(FALSE)->setRecords($params['email'])->execute();
+    $phones = Phone::save(FALSE)->setRecords($params['phone'])->execute();
+
+    $params['loc_block_id'] = LocBlock::save(FALSE)->setRecords([
+      [
+        'email_id' => $emails[0]['id'] ?? NULL,
+        'address_id' => $addresses[0]['id'] ?? NULL,
+        'phone_id' => $phones[0]['id'] ?? NULL,
+        'email_2_id' => $emails[1]['id'] ?? NULL,
+        'address_2_id' => $addresses[1]['id'] ?? NULL,
+        'phone_2_id' => $phones[1]['id'] ?? NULL,
+      ],
+    ])->execute()->first()['id'];
 
     // finally update event params
     $params['id'] = $this->_id;
diff --git a/Civi/Api4/LocBlock.php b/Civi/Api4/LocBlock.php
new file mode 100644
index 000000000000..6b0ac77de9a1
--- /dev/null
+++ b/Civi/Api4/LocBlock.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+namespace Civi\Api4;
+
+/**
+ * ContributionPage entity.
+ *
+ * @package Civi\Api4
+ */
+class LocBlock extends Generic\DAOEntity {
+
+}
diff --git a/tests/phpunit/CRM/Core/BAO/LocationTest.php b/tests/phpunit/CRM/Core/BAO/LocationTest.php
index 28b646d43a7b..fb82c0ab6b10 100644
--- a/tests/phpunit/CRM/Core/BAO/LocationTest.php
+++ b/tests/phpunit/CRM/Core/BAO/LocationTest.php
@@ -184,165 +184,6 @@ public function testCreateWithoutLocBlock() {
     $this->contactDelete($contactId);
   }
 
-  /**
-   * Create() method
-   * create various elements of location block
-   * with civicrm_loc_block
-   */
-  public function testCreateWithLocBlock() {
-    $this->_contactId = $this->individualCreate();
-    $event = $this->eventCreate();
-    $params = [
-      'address' => [
-        '1' => [
-          'street_address' => 'Saint Helier St',
-          'supplemental_address_1' => 'Hallmark Ct',
-          'supplemental_address_2' => 'Jersey Village',
-          'supplemental_address_3' => 'My Town',
-          'city' => 'Newark',
-          'postal_code' => '01903',
-          'country_id' => 1228,
-          'state_province_id' => 1029,
-          'geo_code_1' => '18.219023',
-          'geo_code_2' => '-105.00973',
-          'is_primary' => 1,
-          'location_type_id' => 1,
-        ],
-      ],
-      'email' => [
-        '1' => [
-          'email' => 'john.smith@example.org',
-          'is_primary' => 1,
-          'location_type_id' => 1,
-        ],
-      ],
-      'phone' => [
-        '1' => [
-          'phone_type_id' => 1,
-          'phone' => '303443689',
-          'is_primary' => 1,
-          'location_type_id' => 1,
-        ],
-        '2' => [
-          'phone_type_id' => 2,
-          'phone' => '9833910234',
-          'location_type_id' => 1,
-        ],
-      ],
-      'im' => [
-        '1' => [
-          'name' => 'jane.doe',
-          'provider_id' => 1,
-          'location_type_id' => 1,
-          'is_primary' => 1,
-        ],
-      ],
-    ];
-
-    $params['entity_id'] = $event['id'];
-    $params['entity_table'] = 'civicrm_event';
-
-    //create location block.
-    //with various element of location block
-    //like address, phone, email, im.
-    foreach (['phone', 'email', 'im', 'openid', 'address'] as $block) {
-      if ($block !== 'address') {
-        $location[$block] = CRM_Core_BAO_Block::create($block, $params, 'event');
-      }
-      else {
-        $location[$block] = CRM_Core_BAO_Address::create($params, TRUE, 'event');
-      }
-    }
-
-    //update event record with location block id
-    $eventParams = [
-      'id' => $event['id'],
-      'loc_block_id' => CRM_Core_BAO_Location::createLocBlock($location, [
-        'entity_id' => $event['id'],
-        'entity_table' => 'civicrm_event',
-      ]),
-    ];
-
-    CRM_Event_BAO_Event::add($eventParams);
-
-    //Now check DB for location block
-
-    $this->assertDBCompareValue('CRM_Event_DAO_Event',
-      $event['id'],
-      'loc_block_id',
-      'id',
-      $eventParams['loc_block_id'],
-      'Checking database for the record.'
-    );
-    $locElementIds = [];
-    $locParams = ['id' => $eventParams['loc_block_id']];
-    CRM_Core_DAO::commonRetrieve('CRM_Core_DAO_LocBlock',
-      $locParams,
-      $locElementIds
-    );
-
-    //Now check DB for location elements.
-    $searchParams = [
-      'id' => $locElementIds['address_id'] ?? NULL,
-      'location_type_id' => 1,
-      'is_primary' => 1,
-    ];
-    $compareParams = [
-      'street_address' => 'Saint Helier St',
-      'supplemental_address_1' => 'Hallmark Ct',
-      'supplemental_address_2' => 'Jersey Village',
-      'supplemental_address_3' => 'My Town',
-      'city' => 'Newark',
-      'postal_code' => '01903',
-      'country_id' => 1228,
-      'state_province_id' => 1029,
-      'geo_code_1' => '18.219023',
-      'geo_code_2' => '-105.00973',
-    ];
-    $this->assertDBCompareValues('CRM_Core_DAO_Address', $searchParams, $compareParams);
-
-    $searchParams = [
-      'id' => $locElementIds['email_id'] ?? NULL,
-      'location_type_id' => 1,
-      'is_primary' => 1,
-    ];
-    $compareParams = ['email' => 'john.smith@example.org'];
-    $this->assertDBCompareValues('CRM_Core_DAO_Email', $searchParams, $compareParams);
-
-    $searchParams = [
-      'id' => $locElementIds['phone_id'] ?? NULL,
-      'location_type_id' => 1,
-      'is_primary' => 1,
-      'phone_type_id' => 1,
-    ];
-    $compareParams = ['phone' => '303443689'];
-    $this->assertDBCompareValues('CRM_Core_DAO_Phone', $searchParams, $compareParams);
-
-    $searchParams = [
-      'id' => $locElementIds['phone_2_id'] ?? NULL,
-      'location_type_id' => 1,
-      'phone_type_id' => 2,
-    ];
-    $compareParams = ['phone' => '9833910234'];
-    $this->assertDBCompareValues('CRM_Core_DAO_Phone', $searchParams, $compareParams);
-
-    $searchParams = [
-      'id' => $locElementIds['im_id'] ?? NULL,
-      'location_type_id' => 1,
-      'is_primary' => 1,
-    ];
-    $compareParams = [
-      'name' => 'jane.doe',
-      'provider_id' => 1,
-    ];
-    $this->assertDBCompareValues('CRM_Core_DAO_IM', $searchParams, $compareParams);
-
-    // Cleanup.
-    CRM_Core_BAO_Location::deleteLocBlock($eventParams['loc_block_id']);
-    $this->eventDelete($event['id']);
-    $this->contactDelete($this->_contactId);
-  }
-
   /**
    * GetValues() method
    * get the values of various location elements
diff --git a/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php b/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
index 1767a26c815e..8ff04280db66 100644
--- a/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
+++ b/tests/phpunit/CRM/Event/Form/ManageEvent/LocationTest.php
@@ -20,22 +20,96 @@ class CRM_Event_Form_ManageEvent_LocationTest extends CiviUnitTestCase {
    */
   public function testSubmit() {
     $eventID = (int) $this->eventCreate()['id'];
-    $form = $this->getFormObject('CRM_Event_Form_ManageEvent_Location', $this->getFormValues());
-    $form->set('id', $eventID);
-    $form->preProcess();
-    $form->buildQuickForm();
-    $form->postProcess();
+    $this->submitForm([], $eventID);
     $this->assertCorrectEmails($eventID);
 
     // Now do it again to see if it gets messed with.
-    $form = $this->getFormObject('CRM_Event_Form_ManageEvent_Location', array_merge($this->getFormValues(), ['loc_event_id' => $this->ids['LocBlock'][0]]));
-    $form->set('id', $eventID);
-    $form->preProcess();
-    $form->buildQuickForm();
-    $form->postProcess();
+    $this->submitForm(['loc_event_id' => $this->ids['LocBlock'][0]], $eventID);
     $this->assertCorrectEmails($eventID);
   }
 
+  /**
+   * Create() method
+   * create various elements of location block
+   * with civicrm_loc_block
+   */
+  public function testCreateWithLocBlock() {
+    $eventID = (int) $this->eventCreate()['id'];
+    $this->submitForm([
+      'address' => [
+        '1' => [
+          'street_address' => 'Saint Helier St',
+          'supplemental_address_1' => 'Hallmark Ct',
+          'supplemental_address_2' => 'Jersey Village',
+          'supplemental_address_3' => 'My Town',
+          'city' => 'Newark',
+          'postal_code' => '01903',
+          'country_id' => 1228,
+          'state_province_id' => 1029,
+          'geo_code_1' => '18.219023',
+          'geo_code_2' => '-105.00973',
+          'is_primary' => 1,
+          'location_type_id' => 1,
+        ],
+      ],
+      'email' => [
+        '1' => [
+          'email' => 'john.smith@example.org',
+          'is_primary' => 1,
+          'location_type_id' => 1,
+        ],
+      ],
+      'phone' => [
+        '1' => [
+          'phone_type_id' => 1,
+          'phone' => '303443689',
+          'is_primary' => 1,
+          'location_type_id' => 1,
+        ],
+        '2' => [
+          'phone_type_id' => 2,
+          'phone' => '9833910234',
+          'location_type_id' => 1,
+        ],
+      ],
+    ], $eventID);
+
+    //Now check DB for location block
+
+    $locationBlock = Event::get()
+      ->addWhere('id', '=', $eventID)
+      ->setSelect(['loc_block.*', 'loc_block_id'])
+      ->execute()->first();
+
+    $address = $this->callAPISuccessGetSingle('Address', ['id' => $locationBlock['loc_block.address_id']]);
+
+    $this->assertEquals([
+      'id' => $address['id'],
+      'location_type_id' => '1',
+      'is_primary' => '1',
+      'is_billing' => '0',
+      'street_address' => 'Saint Helier St',
+      'supplemental_address_1' => 'Hallmark Ct',
+      'supplemental_address_2' => 'Jersey Village',
+      'supplemental_address_3' => 'My Town',
+      'city' => 'Newark',
+      'postal_code' => '01903',
+      'country_id' => 1228,
+      'state_province_id' => 1029,
+      'geo_code_1' => '18.219023',
+      'geo_code_2' => '-105.00973',
+      'manual_geo_code' => '0',
+    ], $address);
+
+    $this->callAPISuccessGetSingle('Email', ['id' => $locationBlock['loc_block.email_id'], 'email' => 'john.smith@example.org']);
+    $this->callAPISuccessGetSingle('Phone', ['id' => $locationBlock['loc_block.phone_id'], 'phone' => '303443689']);
+    $this->callAPISuccessGetSingle('Phone', ['id' => $locationBlock['loc_block.phone_2_id'], 'phone' => '9833910234']);
+
+    // Cleanup.
+    CRM_Core_BAO_Location::deleteLocBlock($locationBlock['loc_block_id']);
+    $this->eventDelete($eventID);
+  }
+
   /**
    * Get the values to submit for the form.
    *
@@ -120,4 +194,18 @@ protected function assertCorrectEmails($eventID) {
     return $emails;
   }
 
+  /**
+   * @param array $formValues
+   * @param int $eventID
+   *
+   * @throws \CRM_Core_Exception
+   */
+  protected function submitForm(array $formValues, int $eventID): void {
+    $form = $this->getFormObject('CRM_Event_Form_ManageEvent_Location', array_merge($this->getFormValues(), $formValues));
+    $form->set('id', $eventID);
+    $form->preProcess();
+    $form->buildQuickForm();
+    $form->postProcess();
+  }
+
 }
diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index fdbdabea1c3c..558e99a48472 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -43,6 +43,7 @@ public function tearDown() {
     $this->cleanUpAfterACLs();
     $tablesToTruncate = [
       'civicrm_contact',
+      'civicrm_address',
       'civicrm_group_contact',
       'civicrm_group',
       'civicrm_acl',

From 2bd8b0289cfcf6934601b88ba179b23cacf82ade Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 14:22:07 +1200
Subject: [PATCH 740/834] Fix 'sleeper-bug' in api.

It turns out that the Activity.create BAO
- deletes the existing source contact for an activity if the param 'source_contact_id' is set
- deletes existing assignee contacts for an activity if the param 'assignee_contact_id' is empty
- deletes existing target contacts for an activity if the param 'target_contact_id' is empty

The v3 api provides some fairly convoluted wrapping to effectively convert is empty
to isset (via 2 params deleteActivityAssignment, deleteActivityTarget which would only
be anything other than true if the relevant value key is not set or we are operating from
the one place in universe that passes in this param (well actually it's true then too
https://github.com/eileenmcnaughton/civicrm_entity/commit/bd779c19bbf82ca22260615b4f7667d02eee1200
)

The v4 api does no handling and we can expect that on update activity contact records are
likely being lost - ditto with direct BAO calls that were probably QAd at some point but
may have changed over time.

This changes the BAO to treat the assignee & target params the same way as source
- ie do nothing if not set, but empty means to delete them

Remove support for api param deleteActivityAssignment, deleteActivityTarget

I did a universe search & it was only called from one place which
I fixed
https://github.com/eileenmcnaughton/civicrm_entity/commit/bd779c19bbf82ca22260615b4f7667d02eee1200

- it's never been a tested param so technically not supported

This is part of my effort to fix redundant queries in Activity.create regarding
activity contacts
---
 CRM/Activity/BAO/Activity.php         | 24 ++++------
 Civi/Test/ContactTestTrait.php        |  2 +-
 api/v3/Activity.php                   | 14 ------
 tests/phpunit/api/v3/ActivityTest.php | 63 ++++++++++++++++++---------
 4 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 1e097c151c60..ad656ea90650 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -368,10 +368,8 @@ public static function create(&$params) {
       $assignmentParams = ['activity_id' => $activityId];
 
       if (is_array($params['assignee_contact_id'])) {
-        if (CRM_Utils_Array::value('deleteActivityAssignment', $params, TRUE)) {
-          // first delete existing assignments if any
-          self::deleteActivityContact($activityId, $assigneeID);
-        }
+        // first delete existing assignments if any
+        self::deleteActivityContact($activityId, $assigneeID);
 
         foreach ($params['assignee_contact_id'] as $acID) {
           if ($acID) {
@@ -403,10 +401,8 @@ public static function create(&$params) {
         }
       }
     }
-    else {
-      if (CRM_Utils_Array::value('deleteActivityAssignment', $params, TRUE)) {
-        self::deleteActivityContact($activityId, $assigneeID);
-      }
+    elseif (isset($params['assignee_contact_id'])) {
+      self::deleteActivityContact($activityId, $assigneeID);
     }
 
     if (is_a($resultAssignment, 'CRM_Core_Error')) {
@@ -421,10 +417,8 @@ public static function create(&$params) {
       $targetParams = ['activity_id' => $activityId];
       $resultTarget = [];
       if (is_array($params['target_contact_id'])) {
-        if (CRM_Utils_Array::value('deleteActivityTarget', $params, TRUE)) {
-          // first delete existing targets if any
-          self::deleteActivityContact($activityId, $targetID);
-        }
+        // first delete existing targets if any
+        self::deleteActivityContact($activityId, $targetID);
 
         foreach ($params['target_contact_id'] as $tid) {
           if ($tid) {
@@ -456,10 +450,8 @@ public static function create(&$params) {
         }
       }
     }
-    else {
-      if (CRM_Utils_Array::value('deleteActivityTarget', $params, TRUE)) {
-        self::deleteActivityContact($activityId, $targetID);
-      }
+    elseif (isset($params['target_contact_id'])) {
+      self::deleteActivityContact($activityId, $targetID);
     }
 
     // write to changelog before transaction is committed/rolled
diff --git a/Civi/Test/ContactTestTrait.php b/Civi/Test/ContactTestTrait.php
index 26991ea8cfdf..065c6bccb7e6 100644
--- a/Civi/Test/ContactTestTrait.php
+++ b/Civi/Test/ContactTestTrait.php
@@ -74,7 +74,7 @@ public function organizationCreate($params = [], $seq = 0) {
    * @return int
    *   id of Individual created
    *
-   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function individualCreate($params = [], $seq = 0, $random = FALSE) {
     $params = array_merge($this->sampleContact('Individual', $seq, $random), $params);
diff --git a/api/v3/Activity.php b/api/v3/Activity.php
index 8898fb22155d..422ebff5905d 100644
--- a/api/v3/Activity.php
+++ b/api/v3/Activity.php
@@ -95,20 +95,6 @@ function civicrm_api3_activity_create($params) {
     }
   }
 
-  $deleteActivityAssignment = FALSE;
-  if (isset($params['assignee_contact_id'])) {
-    $deleteActivityAssignment = TRUE;
-  }
-
-  $deleteActivityTarget = FALSE;
-  if (isset($params['target_contact_id'])) {
-    $deleteActivityTarget = TRUE;
-  }
-
-  // this should all be handled at the BAO layer
-  $params['deleteActivityAssignment'] = CRM_Utils_Array::value('deleteActivityAssignment', $params, $deleteActivityAssignment);
-  $params['deleteActivityTarget'] = CRM_Utils_Array::value('deleteActivityTarget', $params, $deleteActivityTarget);
-
   if ($case_id && $createRevision) {
     // This is very similar to the copy-to-case action.
     if (!CRM_Utils_Array::crmIsEmptyArray($oldActivityValues['target_contact'])) {
diff --git a/tests/phpunit/api/v3/ActivityTest.php b/tests/phpunit/api/v3/ActivityTest.php
index 86e7d23062f8..2ab72b6b38ae 100644
--- a/tests/phpunit/api/v3/ActivityTest.php
+++ b/tests/phpunit/api/v3/ActivityTest.php
@@ -370,8 +370,10 @@ public function testActivityCreateCampaignTypeID($version) {
 
   /**
    * Test get returns target and assignee contacts.
+   *
    * @dataProvider versionThreeAndFour
    * @var int $version
+   * @throws \CRM_Core_Exception
    */
   public function testActivityReturnTargetAssignee($version) {
     $this->_apiversion = $version;
@@ -1010,50 +1012,69 @@ public function testActivityUpdateWithIncorrectContactActivityType() {
   }
 
   /**
-   * Test civicrm_activity_update() to update an existing activity
+   * Test api updates an existing activity, including removing activity contacts in apiv3 style.
    */
   public function testActivityUpdate() {
     $result = $this->callAPISuccess('activity', 'create', $this->_params);
-    $this->_contactID2 = $this->individualCreate();
 
     $params = [
       'id' => $result['id'],
       'subject' => 'Make-it-Happen Meeting',
-      'activity_date_time' => '20091011123456',
+      'activity_date_time' => '2009-10-11 12:34:56',
       'duration' => 120,
       'location' => '21, Park Avenue',
       'details' => 'Lets update Meeting',
       'status_id' => 1,
       'source_contact_id' => $this->_contactID,
-      'assignee_contact_id' => $this->_contactID2,
+      'assignee_contact_id' => $this->individualCreate(),
+      'target_contact_id' => $this->individualCreate(),
       'priority_id' => 1,
     ];
 
     $result = $this->callAPISuccess('activity', 'create', $params);
-    //hack on date comparison - really we should make getAndCheck smarter to handle dates
-    $params['activity_date_time'] = '2009-10-11 12:34:56';
+
     // we also unset source_contact_id since it is stored in an aux table
     unset($params['source_contact_id']);
-    //Check if assignee created.
-    $assignee = $this->callAPISuccess('ActivityContact', 'get', [
+    //Check if assignee & target created.
+    $this->callAPISuccessGetCount('ActivityContact', [
+      'activity_id' => $result['id'],
+      'record_type_id' => ['IN' => ['Activity Assignees', 'Activity Targets']],
+    ], 2);
+
+    // Replace the existing 1 per type with 3 per type.
+    $this->callAPISuccess('Activity', 'create', [
+      'id' => $result['id'],
+      'assignee_contact_id' => [$this->individualCreate(), $this->individualCreate(), $this->individualCreate()],
+      'target_contact_id' => [$this->individualCreate(), $this->individualCreate(), $this->individualCreate()],
+    ]);
+
+    //Check if assignee & target created.
+    $this->callAPISuccessGetCount('ActivityContact', [
       'activity_id' => $result['id'],
-      'return' => ["contact_id"],
-      'record_type_id' => "Activity Assignees",
+      'record_type_id' => ['IN' => ['Activity Assignees', 'Activity Targets']],
+    ], 6);
+
+    // Do a blank update - no deletes?
+    $this->callAPISuccess('Activity', 'create', [
+      'id' => $result['id'],
     ]);
-    $this->assertNotEmpty($assignee['values']);
+    $this->callAPISuccessGetCount('ActivityContact', [
+      'activity_id' => $result['id'],
+      'record_type_id' => ['IN' => ['Activity Assignees', 'Activity Targets']],
+    ], 6);
 
     //clear assignee contacts.
-    $updateParams = [
+    $this->callAPISuccess('Activity', 'create', [
       'id' => $result['id'],
       'assignee_contact_id' => [],
-    ];
-    $activity = $this->callAPISuccess('activity', 'create', $updateParams);
-    $assignee = $this->callAPISuccess('ActivityContact', 'get', [
-      'activity_id' => $activity['id'],
-      'return' => ["contact_id"],
-      'record_type_id' => "Activity Assignees",
+      'target_contact_id' => [],
     ]);
-    $this->assertEmpty($assignee['values']);
+    $this->callAPISuccessGetCount('ActivityContact', [
+      'activity_id' => $result['id'],
+      'record_type_id' => ['IN' => ['Activity Assignees', 'Activity Targets']],
+    ], 0);
+
+    unset($params['source_contact_id']);
     $this->getAndCheck($params, $result['id'], 'activity');
   }
 
@@ -1284,8 +1305,8 @@ public function testActivityUpdateKeepSource() {
       'priority_id' => 1,
     ];
 
-    $result = $this->callAPISuccess('activity', 'create', $params);
-    $findactivity = $this->callAPISuccess('Activity', 'Get', ['id' => $activity['id']]);
+    $this->callAPISuccess('Activity', 'create', $params);
+    $this->callAPISuccessGetSingle('Activity', ['id' => $activity['id']]);
   }
 
   /**

From 2b810608b9f224f1064e7df98bbfaa6839705ab9 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 25 Sep 2020 20:45:25 +1200
Subject: [PATCH 741/834] Fix MailingJob::writeToDB to handle it's own
 activityTarget wrangling

Per https://github.com/civicrm/civicrm-core/pull/18567 it makes sense for activity to have basic support for activity targets
but form more nuance the function can DIY
---
 CRM/Mailing/BAO/MailingJob.php                | 25 +++++++++----------
 .../phpunit/CRM/Activity/BAO/ActivityTest.php |  4 +--
 .../phpunit/api/v3/JobProcessMailingTest.php  | 10 +++++++-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php
index 7868dfb85ffe..39ed78bf4056 100644
--- a/CRM/Mailing/BAO/MailingJob.php
+++ b/CRM/Mailing/BAO/MailingJob.php
@@ -8,6 +8,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
  */
+use Civi\Api4\ActivityContact;
 
 /**
  *
@@ -985,14 +986,11 @@ public function writeToDB(
 
       $activity = [
         'source_contact_id' => $mailing->scheduled_id,
-        // CRM-9519
-        'target_contact_id' => array_unique($targetParams),
         'activity_type_id' => $activityTypeID,
         'source_record_id' => $this->mailing_id,
         'activity_date_time' => $job_date,
         'subject' => $mailing->subject,
         'status_id' => 'Completed',
-        'deleteActivityTarget' => FALSE,
         'campaign_id' => $mailing->campaign_id,
       ];
 
@@ -1010,36 +1008,37 @@ public function writeToDB(
         2 => [$this->mailing_id, 'Integer'],
       ];
       $activityID = CRM_Core_DAO::singleValueQuery($query, $queryParams);
+      $targetRecordID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets');
 
+      $activityTargets = [];
+      foreach ($targetParams as $id) {
+        $activityTargets[$id] = ['contact_id' => (int) $id];
+      }
       if ($activityID) {
         $activity['id'] = $activityID;
 
         // CRM-9519
         if (CRM_Core_BAO_Email::isMultipleBulkMail()) {
-          static $targetRecordID = NULL;
-          if (!$targetRecordID) {
-            $activityContacts = CRM_Activity_BAO_ActivityContact::buildOptions('record_type_id', 'validate');
-            $targetRecordID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
-          }
-
           // make sure we don't attempt to duplicate the target activity
-          foreach ($activity['target_contact_id'] as $key => $targetID) {
+          // @todo - we don't have to do one contact at a time....
+          foreach ($activityTargets as $key => $target) {
             $sql = "
 SELECT id
 FROM   civicrm_activity_contact
 WHERE  activity_id = $activityID
-AND    contact_id = $targetID
+AND    contact_id = {$target['contact_id']}
 AND    record_type_id = $targetRecordID
 ";
             if (CRM_Core_DAO::singleValueQuery($sql)) {
-              unset($activity['target_contact_id'][$key]);
+              unset($activityTargets[$key]);
             }
           }
         }
       }
 
       try {
-        civicrm_api3('Activity', 'create', $activity);
+        $activity = civicrm_api3('Activity', 'create', $activity);
+        ActivityContact::save(FALSE)->setRecords($activityTargets)->setDefaults(['activity_id' => $activity['id'], 'record_type_id' => $targetRecordID])->execute();
       }
       catch (Exception $e) {
         $result = FALSE;
diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 20848b06d09d..d89fd279a935 100644
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -276,9 +276,7 @@ public function testDeleteActivity() {
   }
 
   /**
-   * Test case for deleteActivityTarget() method.
-   *
-   * deleteActivityTarget($activityId) method deletes activity target for given activity id.
+   * Test case for deleteActivityContact() method.
    */
   public function testDeleteActivityTarget() {
     $contactId = $this->individualCreate();
diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php
index 98e8438d2d29..23153c40e4ec 100644
--- a/tests/phpunit/api/v3/JobProcessMailingTest.php
+++ b/tests/phpunit/api/v3/JobProcessMailingTest.php
@@ -86,6 +86,7 @@ public function tearDown() {
     //$this->_mut->clearMessages();
     $this->_mut->stop();
     CRM_Utils_Hook::singleton()->reset();
+    $this->quickCleanup(['civicrm_activity_contact', 'civicrm_activity']);
     // DGW
     CRM_Mailing_BAO_MailingJob::$mailsProcessed = 0;
     //$this->cleanupMailingTest();
@@ -474,11 +475,18 @@ public function testConcurrency($settings, $expectedTallies, $expectedTotal) {
    * Check that the earlier iterations's activity targets on the recorded
    * BulkEmail activity don't get wiped out by subsequent iterations when
    * using batches.
+   *
+   * @dataProvider getBooleanDataProvider
+   *
+   * @param bool $isBulk
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function testBatchActivityTargets() {
+  public function testBatchActivityTargets($isBulk) {
     $loggedInUserId = $this->createLoggedInUser();
 
     \Civi::settings()->set('mailerBatchLimit', 2);
+    \Civi::settings()->set('civimail_multiple_bulk_emails', $isBulk);
 
     // We have such small batches we need to lower this interval to get it
     // to create the activity.

From ed3bf90356d1f2940796e5934c35888525163881 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Fri, 25 Sep 2020 16:18:20 +0100
Subject: [PATCH 742/834] Remove double exception handling in repeattransaction

---
 api/v3/Contribution.php | 42 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index e82dbcc0d248..26ac4fa58f4e 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -610,31 +610,27 @@ function civicrm_api3_contribution_repeattransaction($params) {
     'return' => 'payment_processor_id',
     'id' => $contribution->contribution_recur_id,
   ]);
-  try {
-    if (!$contribution->loadRelatedObjects($input, $ids, TRUE)) {
-      throw new API_Exception('failed to load related objects');
-    }
-
-    unset($contribution->id, $contribution->receive_date, $contribution->invoice_id);
-    $contribution->receive_date = $params['receive_date'];
-
-    $passThroughParams = [
-      'trxn_id',
-      'total_amount',
-      'campaign_id',
-      'fee_amount',
-      'financial_type_id',
-      'contribution_status_id',
-      'membership_id',
-      'payment_processor_id',
-    ];
-    $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 
-    return _ipn_process_transaction($params, $contribution, $input, $ids);
-  }
-  catch (Exception $e) {
-    throw new API_Exception('failed to load related objects' . $e->getMessage() . "\n" . $e->getTraceAsString());
+  if (!$contribution->loadRelatedObjects($input, $ids, TRUE)) {
+    throw new API_Exception('failed to load related objects');
   }
+
+  unset($contribution->id, $contribution->receive_date, $contribution->invoice_id);
+  $contribution->receive_date = $params['receive_date'];
+
+  $passThroughParams = [
+    'trxn_id',
+    'total_amount',
+    'campaign_id',
+    'fee_amount',
+    'financial_type_id',
+    'contribution_status_id',
+    'membership_id',
+    'payment_processor_id',
+  ];
+  $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
+
+  return _ipn_process_transaction($params, $contribution, $input, $ids);
 }
 
 /**

From 19dbb9abe5f916814f732211cc3d500609bbcd54 Mon Sep 17 00:00:00 2001
From: Alan Dixon <alan.g.dixon@gmail.com>
Date: Fri, 25 Sep 2020 12:11:04 -0400
Subject: [PATCH 743/834] pass in "required" value when building
 preferred_language form element

---
 CRM/Core/BAO/UFGroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index aca664795e7f..88d84f04afa8 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -2019,7 +2019,7 @@ public static function buildProfile(
       $form->add('select', $name, $title, CRM_Core_SelectValues::pmf());
     }
     elseif ($fieldName === 'preferred_language') {
-      $form->add('select', $name, $title, ['' => ts('- select -')] + CRM_Contact_BAO_Contact::buildOptions('preferred_language'));
+      $form->add('select', $name, $title, ['' => ts('- select -')] + CRM_Contact_BAO_Contact::buildOptions('preferred_language'), $required);
     }
     elseif ($fieldName == 'external_identifier') {
       $form->add('text', $name, $title, $attributes, $required);

From 2d09a0c34e59d879a30239064365ce957b166420 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 25 Sep 2020 14:46:31 +1200
Subject: [PATCH 744/834] [REF] Consolidate retrieval of searchFormValues

Currently there are 3 ways in which the values from the searchForm are retrieved

1) the search form sets a value 'searchFormName' on the form during search which can
be later retrieved
2) the search task has an action that reflects the form it came from
3) as per 2 but there is additional handling for the fact it might be
the contact search (knowable because the entity has been set to 'Contact'

I'm not 100% sure at this stage that the selected method (3) in this PR is the best -
but it seems 'as good' as 1 with less form-state stuff and this PR consolidates it
into 1 place so it is handled consistently
---
 CRM/Activity/Form/Task.php                    |  4 ++--
 CRM/Case/Form/Search.php                      |  3 +++
 CRM/Contact/Form/Search/Advanced.php          |  3 +++
 CRM/Contact/Form/Search/Basic.php             |  3 +++
 CRM/Contact/Form/Search/Builder.php           |  3 +++
 CRM/Contact/Form/Search/Custom.php            |  3 +++
 CRM/Contact/Form/Task.php                     |  2 +-
 CRM/Contribute/Form/Search.php                |  3 +++
 CRM/Contribute/Form/Task.php                  |  6 ++++--
 CRM/Core/Form/Task.php                        |  7 +++++--
 CRM/Event/Form/Search.php                     |  3 +++
 CRM/Event/Form/Task.php                       |  4 ++--
 CRM/Export/Form/Select.php                    | 19 +------------------
 CRM/Grant/Form/Task.php                       |  6 ++++--
 CRM/Mailing/Form/Task.php                     |  6 ++++--
 CRM/Member/Form/Search.php                    |  3 +++
 CRM/Member/Form/Task.php                      |  4 ++--
 .../phpunit/CRM/Contribute/Form/TaskTest.php  |  3 +--
 18 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/CRM/Activity/Form/Task.php b/CRM/Activity/Form/Task.php
index 462499c38fd3..470e3692e8df 100644
--- a/CRM/Activity/Form/Task.php
+++ b/CRM/Activity/Form/Task.php
@@ -38,14 +38,14 @@ public function preProcess() {
   /**
    * Common pre-process function.
    *
-   * @param CRM_Core_Form $form
+   * @param \CRM_Core_Form_Task $form
    *
    * @throws \CRM_Core_Exception
    */
   public static function preProcessCommon(&$form) {
     $form->_activityHolderIds = [];
 
-    $values = $form->controller->exportValues($form->get('searchFormName'));
+    $values = $form->getSearchFormValues();
 
     $form->_task = $values['task'];
     $activityTasks = CRM_Activity_Task::tasks();
diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php
index b22ab8c08e97..d3ba7a07c4d7 100644
--- a/CRM/Case/Form/Search.php
+++ b/CRM/Case/Form/Search.php
@@ -58,6 +58,9 @@ public function getDefaultEntity() {
    * Processing needed for buildForm and later.
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Search');
 
     //check for civicase access.
diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index e579c7433166..95e981a63dad 100644
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -24,6 +24,9 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
    * Processing needed for buildForm and later.
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Advanced');
 
     parent::preProcess();
diff --git a/CRM/Contact/Form/Search/Basic.php b/CRM/Contact/Form/Search/Basic.php
index c1e84382319f..6deec9e2a44d 100644
--- a/CRM/Contact/Form/Search/Basic.php
+++ b/CRM/Contact/Form/Search/Basic.php
@@ -117,6 +117,9 @@ public function addRules() {
    * Processing needed for buildForm and later.
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Basic');
 
     parent::preProcess();
diff --git a/CRM/Contact/Form/Search/Builder.php b/CRM/Contact/Form/Search/Builder.php
index fc51f6580d35..0eccbcb5049f 100644
--- a/CRM/Contact/Form/Search/Builder.php
+++ b/CRM/Contact/Form/Search/Builder.php
@@ -38,6 +38,9 @@ class CRM_Contact_Form_Search_Builder extends CRM_Contact_Form_Search {
    * Build the form object.
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Builder');
 
     $this->set('context', 'builder');
diff --git a/CRM/Contact/Form/Search/Custom.php b/CRM/Contact/Form/Search/Custom.php
index cfc78ef8355b..d2b4fd4cdd39 100644
--- a/CRM/Contact/Form/Search/Custom.php
+++ b/CRM/Contact/Form/Search/Custom.php
@@ -19,6 +19,9 @@ class CRM_Contact_Form_Search_Custom extends CRM_Contact_Form_Search {
   protected $_customClass = NULL;
 
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Custom');
 
     $this->set('context', 'custom');
diff --git a/CRM/Contact/Form/Task.php b/CRM/Contact/Form/Task.php
index a7bd173701ef..8263094ea0ec 100644
--- a/CRM/Contact/Form/Task.php
+++ b/CRM/Contact/Form/Task.php
@@ -112,7 +112,7 @@ public static function preProcessCommon(&$form) {
       $fragment .= '/custom';
     }
     if (!$isStandAlone) {
-      self::$_searchFormValues = $form->getFormValues();
+      self::$_searchFormValues = $form->getSearchFormValues();
     }
 
     //set the user context for redirection of task actions
diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index 341c54c868d4..866c178848df 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -61,6 +61,9 @@ public function getDefaultEntity() {
    * @throws \CRM_Core_Exception
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Search');
 
     $this->_actionButtonName = $this->getButtonName('next', 'action');
diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php
index 16d61166670f..ce5b071fa9bb 100644
--- a/CRM/Contribute/Form/Task.php
+++ b/CRM/Contribute/Form/Task.php
@@ -50,12 +50,14 @@ public function preProcess() {
   }
 
   /**
-   * @param CRM_Core_Form $form
+   * @param \CRM_Core_Form_Task $form
+   *
+   * @throws \CRM_Core_Exception
    */
   public static function preProcessCommon(&$form) {
     $form->_contributionIds = [];
 
-    $values = $form->controller->exportValues($form->get('searchFormName'));
+    $values = $form->getSearchFormValues();
 
     $form->_task = $values['task'] ?? NULL;
     $contributeTasks = CRM_Contribute_Task::tasks();
diff --git a/CRM/Core/Form/Task.php b/CRM/Core/Form/Task.php
index a3bde1d8b668..65a105d3878c 100644
--- a/CRM/Core/Form/Task.php
+++ b/CRM/Core/Form/Task.php
@@ -92,7 +92,7 @@ public function preProcess() {
   public static function preProcessCommon(&$form) {
     $form->_entityIds = [];
 
-    $searchFormValues = $form->controller->exportValues($form->get('searchFormName'));
+    $searchFormValues = $form->getSearchFormValues();
 
     $form->_task = $searchFormValues['task'];
     $className = 'CRM_' . ucfirst($form::$entityShortname) . '_Task';
@@ -256,7 +256,7 @@ public function orderBy() {
    *
    * @return array
    */
-  public function getFormValues() {
+  public function getSearchFormValues() {
     if ($this->_action === CRM_Core_Action::ADVANCED) {
       return $this->controller->exportValues('Advanced');
     }
@@ -266,6 +266,9 @@ public function getFormValues() {
     if ($this->_action == CRM_Core_Action::COPY) {
       return $this->controller->exportValues('Custom');
     }
+    if ($this->get('entity') !== 'Contact') {
+      return $this->controller->exportValues('Search');
+    }
     return $this->controller->exportValues('Basic');
   }
 
diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php
index 300011068713..ac4404ca6de1 100644
--- a/CRM/Event/Form/Search.php
+++ b/CRM/Event/Form/Search.php
@@ -79,6 +79,9 @@ public function getDefaultEntity() {
    * @throws \CiviCRM_API3_Exception
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Search');
 
     /**
diff --git a/CRM/Event/Form/Task.php b/CRM/Event/Form/Task.php
index 18962108a61c..ddb8953815b0 100644
--- a/CRM/Event/Form/Task.php
+++ b/CRM/Event/Form/Task.php
@@ -40,12 +40,12 @@ public function preProcess() {
   }
 
   /**
-   * @param CRM_Core_Form $form
+   * @param CRM_Core_Form_Task $form
    */
   public static function preProcessCommon(&$form) {
     $form->_participantIds = [];
 
-    $values = $form->controller->exportValues($form->get('searchFormName'));
+    $values = $form->getSearchFormValues();
 
     $form->_task = $values['task'];
     $tasks = CRM_Event_Task::permissionedTaskTitles(CRM_Core_Permission::getPermission());
diff --git a/CRM/Export/Form/Select.php b/CRM/Export/Form/Select.php
index abc1f3b2deb6..4772536ab763 100644
--- a/CRM/Export/Form/Select.php
+++ b/CRM/Export/Form/Select.php
@@ -108,24 +108,7 @@ public function preProcess() {
       $this::$tableName = CRM_Core_DAO_AllCoreTables::getTableForClass(CRM_Core_DAO_AllCoreTables::getFullName($this->getDAOName()));
     }
 
-    // get the submitted values based on search
-    if ($this->_action == CRM_Core_Action::ADVANCED) {
-      $values = $this->controller->exportValues('Advanced');
-    }
-    elseif ($this->_action == CRM_Core_Action::PROFILE) {
-      $values = $this->controller->exportValues('Builder');
-    }
-    elseif ($this->_action == CRM_Core_Action::COPY) {
-      $values = $this->controller->exportValues('Custom');
-    }
-    else {
-      if ($entityShortname !== 'Contact') {
-        $values = $this->controller->exportValues('Search');
-      }
-      else {
-        $values = $this->controller->exportValues('Basic');
-      }
-    }
+    $values = $this->getSearchFormValues();
 
     $count = 0;
     $this->_matchingContacts = FALSE;
diff --git a/CRM/Grant/Form/Task.php b/CRM/Grant/Form/Task.php
index b983cec3d72a..3917ac01f88c 100644
--- a/CRM/Grant/Form/Task.php
+++ b/CRM/Grant/Form/Task.php
@@ -34,12 +34,14 @@ public function preProcess() {
   }
 
   /**
-   * @param CRM_Core_Form $form
+   * @param \CRM_Core_Form_Task $form
+   *
+   * @throws \CRM_Core_Exception
    */
   public static function preProcessCommon(&$form) {
     $form->_grantIds = [];
 
-    $values = $form->controller->exportValues($form->get('searchFormName'));
+    $values = $form->getSearchFormValues();
 
     $form->_task = $values['task'];
     $tasks = CRM_Grant_Task::tasks();
diff --git a/CRM/Mailing/Form/Task.php b/CRM/Mailing/Form/Task.php
index 4a84746aaaba..f7f37eee39cd 100644
--- a/CRM/Mailing/Form/Task.php
+++ b/CRM/Mailing/Form/Task.php
@@ -29,10 +29,12 @@ public function preProcess() {
   }
 
   /**
-   * @param CRM_Core_Form $form
+   * @param \CRM_Core_Form_Task $form
+   *
+   * @throws \CRM_Core_Exception
    */
   public static function preProcessCommon(&$form) {
-    $values = $form->controller->exportValues($form->get('searchFormName'));
+    $values = $form->getSearchFormValues();
 
     $form->_task = $values['task'] ?? NULL;
     $mailingTasks = CRM_Mailing_Task::tasks();
diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php
index fc0ba94de0b5..dd937142ff66 100644
--- a/CRM/Member/Form/Search.php
+++ b/CRM/Member/Form/Search.php
@@ -63,6 +63,9 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search {
    * @throws \CiviCRM_API3_Exception
    */
   public function preProcess() {
+    // SearchFormName is deprecated & to be removed - the replacement is for the task to
+    // call $this->form->getSearchFormValues()
+    // A couple of extensions use it.
     $this->set('searchFormName', 'Search');
 
     $this->_actionButtonName = $this->getButtonName('next', 'action');
diff --git a/CRM/Member/Form/Task.php b/CRM/Member/Form/Task.php
index 5f5791d01ab0..86eda194ddac 100644
--- a/CRM/Member/Form/Task.php
+++ b/CRM/Member/Form/Task.php
@@ -41,14 +41,14 @@ public function preProcess() {
   }
 
   /**
-   * @param CRM_Core_Form $form
+   * @param \CRM_Core_Form_Task $form
    *
    * @throws \CRM_Core_Exception
    */
   public static function preProcessCommon(&$form) {
     $form->_memberIds = [];
 
-    $values = $form->controller->exportValues($form->get('searchFormName'));
+    $values = $form->getSearchFormValues();
 
     $form->_task = $values['task'];
     $tasks = CRM_Member_Task::permissionedTaskTitles(CRM_Core_Permission::getPermission());
diff --git a/tests/phpunit/CRM/Contribute/Form/TaskTest.php b/tests/phpunit/CRM/Contribute/Form/TaskTest.php
index acd140f5bb17..51605fe923c3 100644
--- a/tests/phpunit/CRM/Contribute/Form/TaskTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/TaskTest.php
@@ -66,8 +66,7 @@ public function testPreProcessCommonAfterSorting() {
     }
 
     // Assert contribIds are returned in a sorted order.
-    $form = new CRM_Contribute_Form_Task();
-    $form->controller = new CRM_Core_Controller();
+    $form = $this->getFormObject('CRM_Contribute_Form_Task', [], 'Search');
     foreach ($fields as $val) {
       $form->set(CRM_Utils_Sort::SORT_ORDER, "`{$val}` asc");
       CRM_Contribute_Form_Task::preProcessCommon($form);

From c73d08ef6f885f608523797556719c7856526776 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Fri, 25 Sep 2020 16:21:30 -0400
Subject: [PATCH 745/834] Don't throw a warning when public ext directory isn't
 found

---
 CRM/Utils/Check/Component/Env.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/CRM/Utils/Check/Component/Env.php b/CRM/Utils/Check/Component/Env.php
index 7c57df65fd6e..29e0a2fd6a85 100644
--- a/CRM/Utils/Check/Component/Env.php
+++ b/CRM/Utils/Check/Component/Env.php
@@ -600,20 +600,6 @@ public function checkExtensions() {
       return $messages;
     }
 
-    if (!$remotes) {
-      // CRM-13141 There may not be any compatible extensions available for the requested CiviCRM version + CMS. If so, $extdir is empty so just return a notice.
-      $messages[] = new CRM_Utils_Check_Message(
-        __FUNCTION__,
-        ts('There are currently no extensions on the CiviCRM public extension directory which are compatible with version %1. If you want to install an extension which is not marked as compatible, you may be able to download and install extensions manually (depending on access to your web server).', [
-          1 => CRM_Utils_System::majorVersion(),
-        ]) . '<br />' . CRM_Utils_System::docURL2('sysadmin/customize/extensions/#installing-a-new-extension'),
-        ts('No Extensions Available for this Version'),
-        \Psr\Log\LogLevel::NOTICE,
-        'fa-plug'
-      );
-      return $messages;
-    }
-
     $keys = array_keys($manager->getStatuses());
     sort($keys);
     $updates = $errors = $okextensions = [];

From 978e5e1d8e3af38cfa96d0c6b498e1f86aafab58 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 26 Sep 2020 06:41:28 +1000
Subject: [PATCH 746/834] [REF] Include recently added core extensions into
 distmaker

---
 distmaker/dists/common.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 0b7e42ed5dfe..90fbeb5d6c5f 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -124,6 +124,8 @@ function dm_core_exts() {
   echo ext/eventcart
   echo ext/ewaysingle
   echo ext/financialacls
+  echo ext/afform
+  echo ext/greenwich
 }
 
 ## Copy all packages

From 3bec4854eedca7ff3218ae76b263fb68a35d9552 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 08:49:18 +1200
Subject: [PATCH 747/834] Fix bug inn primary handling where TRUE rather than 1
 used

---
 CRM/Core/BAO/Address.php           |  5 +----
 CRM/Core/BAO/Block.php             |  4 ++++
 CRM/Core/BAO/Email.php             |  5 +----
 CRM/Core/BAO/IM.php                |  4 +---
 CRM/Core/BAO/OpenID.php            |  4 +---
 CRM/Core/BAO/Phone.php             | 13 +++++--------
 tests/phpunit/api/v3/PhoneTest.php | 20 +++++++++++++++++---
 7 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index ea7da9440c15..771c6cc95f4e 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -131,10 +131,7 @@ public static function add(&$params, $fixAddress = FALSE) {
     $hook = empty($params['id']) ? 'create' : 'edit';
     CRM_Utils_Hook::pre($hook, 'Address', CRM_Utils_Array::value('id', $params), $params);
 
-    // if id is set & is_primary isn't we can assume no change
-    if (is_numeric(CRM_Utils_Array::value('is_primary', $params)) || empty($params['id'])) {
-      CRM_Core_BAO_Block::handlePrimary($params, get_class());
-    }
+    CRM_Core_BAO_Block::handlePrimary($params, get_class());
 
     // (prevent chaining 1 and 3) CRM-21214
     if (isset($params['master_id']) && !CRM_Utils_System::isNull($params['master_id'])) {
diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 4f17f5b57c49..07167d621c55 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -391,6 +391,10 @@ public static function blockDelete($blockName, $params) {
    * @throws API_Exception
    */
   public static function handlePrimary(&$params, $class) {
+    if (isset($params['id']) && CRM_Utils_System::isNull($params['is_primary'] ?? NULL)) {
+      // if id is set & is_primary isn't we can assume no change)
+      return;
+    }
     $table = CRM_Core_DAO_AllCoreTables::getTableForClass($class);
     if (!$table) {
       throw new API_Exception("Failed to locate table for class [$class]");
diff --git a/CRM/Core/BAO/Email.php b/CRM/Core/BAO/Email.php
index d92b6e94a6ea..aa0fdc956a88 100644
--- a/CRM/Core/BAO/Email.php
+++ b/CRM/Core/BAO/Email.php
@@ -31,10 +31,7 @@ class CRM_Core_BAO_Email extends CRM_Core_DAO_Email {
    * @return object
    */
   public static function create($params) {
-    // if id is set & is_primary isn't we can assume no change
-    if (is_numeric(CRM_Utils_Array::value('is_primary', $params)) || empty($params['id'])) {
-      CRM_Core_BAO_Block::handlePrimary($params, get_class());
-    }
+    CRM_Core_BAO_Block::handlePrimary($params, get_class());
 
     $hook = empty($params['id']) ? 'create' : 'edit';
     CRM_Utils_Hook::pre($hook, 'Email', CRM_Utils_Array::value('id', $params), $params);
diff --git a/CRM/Core/BAO/IM.php b/CRM/Core/BAO/IM.php
index cdab960f6553..c7e11c450cba 100644
--- a/CRM/Core/BAO/IM.php
+++ b/CRM/Core/BAO/IM.php
@@ -30,9 +30,7 @@ class CRM_Core_BAO_IM extends CRM_Core_DAO_IM {
    * @throws \API_Exception
    */
   public static function add($params) {
-    if (empty($params['id']) || is_numeric($params['is_primary'] ?? NULL)) {
-      CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
-    }
+    CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
     return self::writeRecord($params);
   }
 
diff --git a/CRM/Core/BAO/OpenID.php b/CRM/Core/BAO/OpenID.php
index c603155a9fa5..4382097e67bc 100644
--- a/CRM/Core/BAO/OpenID.php
+++ b/CRM/Core/BAO/OpenID.php
@@ -31,9 +31,7 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID {
    * @throws \CRM_Core_Exception
    */
   public static function add($params) {
-    if (empty($params['id']) || is_numeric($params['is_primary'] ?? NULL)) {
-      CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
-    }
+    CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
     return self::writeRecord($params);
   }
 
diff --git a/CRM/Core/BAO/Phone.php b/CRM/Core/BAO/Phone.php
index dac8c9fa5fac..7e5a7eede55f 100644
--- a/CRM/Core/BAO/Phone.php
+++ b/CRM/Core/BAO/Phone.php
@@ -26,19 +26,15 @@ class CRM_Core_BAO_Phone extends CRM_Core_DAO_Phone {
    *
    * @param array $params
    *
-   * @return object
+   * @return \CRM_Core_DAO_Phone
+   *
    * @throws API_Exception
+   * @throws \CRM_Core_Exception
    */
   public static function create($params) {
     // Ensure mysql phone function exists
     CRM_Core_DAO::checkSqlFunctionsExist();
-
-    if (is_numeric(CRM_Utils_Array::value('is_primary', $params)) ||
-      // if id is set & is_primary isn't we can assume no change
-      empty($params['id'])
-    ) {
-      CRM_Core_BAO_Block::handlePrimary($params, get_class());
-    }
+    CRM_Core_BAO_Block::handlePrimary($params, get_class());
     return self::writeRecord($params);
   }
 
@@ -69,6 +65,7 @@ public static function add($params) {
    *
    * @return array
    *   array of phone objects
+   * @throws \CRM_Core_Exception
    */
   public static function &getValues($entityBlock) {
     $getValues = CRM_Core_BAO_Block::getValues('phone', $entityBlock);
diff --git a/tests/phpunit/api/v3/PhoneTest.php b/tests/phpunit/api/v3/PhoneTest.php
index 6b13d392dcc9..a051b92656d0 100644
--- a/tests/phpunit/api/v3/PhoneTest.php
+++ b/tests/phpunit/api/v3/PhoneTest.php
@@ -22,6 +22,13 @@ class api_v3_PhoneTest extends CiviUnitTestCase {
   protected $_params;
   protected $_entity;
 
+  /**
+   * Should location types be checked to ensure primary addresses are correctly assigned after each test.
+   *
+   * @var bool
+   */
+  protected $isLocationTypesOnPostAssert = TRUE;
+
   public function setUp() {
     $this->_entity = 'Phone';
     parent::setUp();
@@ -35,19 +42,21 @@ public function setUp() {
       'contact_id' => $this->_contactID,
       'location_type_id' => $this->_locationType,
       'phone' => '(123) 456-7890',
-      'is_primary' => 1,
+      'is_primary' => TRUE,
       'phone_type_id' => 1,
     ];
   }
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreatePhone($version) {
     $this->_apiversion = $version;
 
-    $result = $this->callAPIAndDocument('phone', 'create', $this->_params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument('Phone', 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $this->assertNotNull($result['values'][$result['id']]['id']);
 
@@ -59,7 +68,9 @@ public function testCreatePhone($version) {
    * the LocationType default
    *
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreatePhoneDefaultLocation($version) {
     $this->_apiversion = $version;
@@ -164,17 +175,20 @@ public function testCreatePhonePrimaryHandlingChangeToPrimary($version) {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreatePhonePrimaryHandlingChangeExisting($version) {
     $this->_apiversion = $version;
     $phone1 = $this->callAPISuccess('phone', 'create', $this->_params);
-    $phone2 = $this->callAPISuccess('phone', 'create', $this->_params);
+    $this->callAPISuccess('phone', 'create', $this->_params);
     $check = $this->callAPISuccess('phone', 'getcount', [
       'is_primary' => 1,
       'contact_id' => $this->_contactID,
     ]);
     $this->assertEquals(1, $check);
+    $this->callAPISuccess('Phone', 'create', ['id' => $phone1['id'], 'is_primary' => TRUE]);
   }
 
 }

From 55bc843db4557a950aac0f38f0507275fa9706c8 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 09:54:54 +1200
Subject: [PATCH 748/834] [REF] IPN - move unshared chunk of code out of shared
 function

We are passing a lot of variables into recur (& going to a lot of work to construct them) when they are not
actually processed in a common way - returning them to the calling functions makes it clear we are
a skip & a jump from not needing to instantiate objects at all
---
 CRM/Contribute/BAO/Contribution.php  |  4 ++-
 CRM/Core/Payment/AuthorizeNetIPN.php | 39 +++++++++++++---------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index f59f205c87a0..c279e4df9045 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4377,6 +4377,8 @@ public static function isSingleLineItem($id) {
   public static function completeOrder($input, $ids, $objects, $isPostPaymentCreate = FALSE) {
     $transaction = new CRM_Core_Transaction();
     $contribution = $objects['contribution'];
+    // Unset objects just to make it clear it's not used again.
+    unset($objects);
     // @todo see if we even need this - it's used further down to create an activity
     // but the BAO layer should create that - we just need to add a test to cover it & can
     // maybe remove $ids altogether.
@@ -4418,7 +4420,7 @@ public static function completeOrder($input, $ids, $objects, $isPostPaymentCreat
 
     $contributionParams['payment_processor'] = $paymentProcessorId;
 
-    if (empty($contributionParams['payment_instrument_id']) && isset($contribution->_relatedObjects['paymentProcessor']['payment_instrument_id'])) {
+    if (empty($contributionParams['payment_instrument_id']) && $paymentProcessorId) {
       $contributionParams['payment_instrument_id'] = PaymentProcessor::get(FALSE)->addWhere('id', '=', $paymentProcessorId)->addSelect('payment_instrument_id')->execute()->first()['payment_instrument_id'];
     }
 
diff --git a/CRM/Core/Payment/AuthorizeNetIPN.php b/CRM/Core/Payment/AuthorizeNetIPN.php
index bad241276fad..06e3049cf4e9 100644
--- a/CRM/Core/Payment/AuthorizeNetIPN.php
+++ b/CRM/Core/Payment/AuthorizeNetIPN.php
@@ -124,6 +124,21 @@ public function main($component = 'contribute') {
           $first = TRUE;
           if ($objects['contribution']->contribution_status_id == 1) {
             $first = FALSE;
+            //load new contribution object if required.
+            // create a contribution and then get it processed
+            $contribution = new CRM_Contribute_BAO_Contribution();
+            $contribution->contact_id = $ids['contact'];
+            $contribution->financial_type_id = $objects['contributionType']->id;
+            $contribution->contribution_page_id = $ids['contributionPage'];
+            $contribution->contribution_recur_id = $ids['contributionRecur'];
+            $contribution->receive_date = $input['receive_date'];
+            $contribution->currency = $objects['contribution']->currency;
+            $contribution->amount_level = $objects['contribution']->amount_level;
+            $contribution->address_id = $objects['contribution']->address_id;
+            $contribution->campaign_id = $objects['contribution']->campaign_id;
+            $contribution->_relatedObjects = $objects['contribution']->_relatedObjects;
+
+            $objects['contribution'] = &$contribution;
           }
           $input['payment_processor_id'] = $paymentProcessorID;
           return $this->recur($input, $ids, $objects, $first);
@@ -144,11 +159,11 @@ public function main($component = 'contribute') {
    * @param $first
    *
    * @return bool
+   * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
   public function recur($input, $ids, $objects, $first) {
-    $this->_isRecurring = TRUE;
     $recur = &$objects['contributionRecur'];
-    $paymentProcessorObject = $objects['contribution']->_relatedObjects['paymentProcessor']['object'];
 
     // do a subscription check
     if ($recur->processor_id != $input['subscription_id']) {
@@ -159,24 +174,6 @@ public function recur($input, $ids, $objects, $first) {
 
     $now = date('YmdHis');
 
-    //load new contribution object if required.
-    if (!$first) {
-      // create a contribution and then get it processed
-      $contribution = new CRM_Contribute_BAO_Contribution();
-      $contribution->contact_id = $ids['contact'];
-      $contribution->financial_type_id = $objects['contributionType']->id;
-      $contribution->contribution_page_id = $ids['contributionPage'];
-      $contribution->contribution_recur_id = $ids['contributionRecur'];
-      $contribution->receive_date = $input['receive_date'];
-      $contribution->currency = $objects['contribution']->currency;
-      $contribution->payment_instrument_id = $objects['contribution']->payment_instrument_id;
-      $contribution->amount_level = $objects['contribution']->amount_level;
-      $contribution->address_id = $objects['contribution']->address_id;
-      $contribution->campaign_id = $objects['contribution']->campaign_id;
-      $contribution->_relatedObjects = $objects['contribution']->_relatedObjects;
-
-      $objects['contribution'] = &$contribution;
-    }
     $objects['contribution']->invoice_id = md5(uniqid(rand(), TRUE));
     $objects['contribution']->total_amount = $input['amount'];
     $objects['contribution']->trxn_id = $input['trxn_id'];
@@ -229,7 +226,7 @@ public function recur($input, $ids, $objects, $first) {
       'related_contact' => $ids['related_contact'] ?? NULL,
       'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
       'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
-    ], $objects);
+    ], ['contribution' => $objects['contribution']]);
 
     // Only Authorize.net does this so it is on the a.net class. If there is a need for other processors
     // to do this we should make it available via the api, e.g as a parameter, changing the nuance

From 21c915abe632345a6885ce93be50e934498ae5f4 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 12:23:33 +1200
Subject: [PATCH 749/834] Test cleanup fix

Note it's better practice to clean up in the tear down but it looks like someone
tried & failed before so let's see....
---
 tests/phpunit/api/v3/JobProcessMailingTest.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php
index 23153c40e4ec..71d18540772e 100644
--- a/tests/phpunit/api/v3/JobProcessMailingTest.php
+++ b/tests/phpunit/api/v3/JobProcessMailingTest.php
@@ -42,7 +42,6 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase {
   private $_mut;
 
   public function setUp() {
-    $this->cleanupMailingTest();
     parent::setUp();
     // DGW
     CRM_Mailing_BAO_MailingJob::$mailsProcessed = 0;
@@ -83,13 +82,10 @@ public function setUp() {
   /**
    */
   public function tearDown() {
-    //$this->_mut->clearMessages();
     $this->_mut->stop();
     CRM_Utils_Hook::singleton()->reset();
-    $this->quickCleanup(['civicrm_activity_contact', 'civicrm_activity']);
-    // DGW
+    $this->cleanupMailingTest();
     CRM_Mailing_BAO_MailingJob::$mailsProcessed = 0;
-    //$this->cleanupMailingTest();
     parent::tearDown();
   }
 
@@ -572,6 +568,8 @@ protected function cleanupMailingTest() {
       'civicrm_group',
       'civicrm_group_contact',
       'civicrm_contact',
+      'civicrm_activity_contact',
+      'civicrm_activity',
     ]);
   }
 

From 08291317c2e83fc3dab33fd468c6bc1e0a1ad508 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 15:31:07 +1200
Subject: [PATCH 750/834] Remove unused variable

---
 CRM/Activity/BAO/Activity.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index ad656ea90650..1bea3cd02e93 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -411,11 +411,9 @@ public static function create(&$params) {
     }
 
     // attempt to save activity targets
-    $resultTarget = NULL;
     if (!empty($params['target_contact_id'])) {
 
       $targetParams = ['activity_id' => $activityId];
-      $resultTarget = [];
       if (is_array($params['target_contact_id'])) {
         // first delete existing targets if any
         self::deleteActivityContact($activityId, $targetID);
@@ -442,11 +440,11 @@ public static function create(&$params) {
 
           if ($target->contact_id != $params['target_contact_id']) {
             $targetParams['id'] = $target->id;
-            $resultTarget = CRM_Activity_BAO_ActivityContact::create($targetParams);
+            CRM_Activity_BAO_ActivityContact::create($targetParams);
           }
         }
         else {
-          $resultTarget = CRM_Activity_BAO_ActivityContact::create($targetParams);
+          CRM_Activity_BAO_ActivityContact::create($targetParams);
         }
       }
     }

From 3d619e42789a02d69b1233989c329dbd6d88adb2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 23 Sep 2020 15:33:39 +1200
Subject: [PATCH 751/834] Minor code cleanup

---
 CRM/Activity/BAO/Activity.php | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 1bea3cd02e93..a69a8164502a 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -315,13 +315,8 @@ public static function create(&$params) {
       $params['assignee_contact_id'] = array_unique($params['assignee_contact_id']);
     }
 
-    // CRM-9137
-    if (!empty($params['id'])) {
-      CRM_Utils_Hook::pre('edit', 'Activity', $params['id'], $params);
-    }
-    else {
-      CRM_Utils_Hook::pre('create', 'Activity', NULL, $params);
-    }
+    $action = empty($params['id']) ? 'create' : 'edit';
+    CRM_Utils_Hook::pre($action, 'Activity', $params['id'] ?? NULL, $params);
 
     $activity->copyValues($params);
     if (isset($params['case_id'])) {
@@ -597,13 +592,7 @@ public static function create(&$params) {
         self::logActivityAction($activity, "Case details for {$matches[1]} not found while recording an activity on case.");
       }
     }
-    if (!empty($params['id'])) {
-      CRM_Utils_Hook::post('edit', 'Activity', $activity->id, $activity);
-    }
-    else {
-      CRM_Utils_Hook::post('create', 'Activity', $activity->id, $activity);
-    }
-
+    CRM_Utils_Hook::post($action, 'Activity', $activity->id, $activity);
     return $result;
   }
 

From e0dcd0579fd44ff11cce8e1c30c901774d635253 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 25 Sep 2020 17:46:23 -0700
Subject: [PATCH 752/834] dev/core#1393 - distmaker - Skip new file
 "vendor/bin/pscss"

This file was recently added by way of `scssphp`.  We don't use it, and
trying to bundle the symlink into the tarball breaks some consumers.

* Before (last release): `vendor/bin/pscss` does not exist
* Before (current master): `vendor/bin/pscss` is created as symlink, copied to tarball
* After (this commit): `vendor/bin/pscss` is created on dev-builds but omitted from tarball
---
 distmaker/dists/common.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 90fbeb5d6c5f..dea909f5a2f0 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -53,7 +53,7 @@ function dm_remove_files() {
   shift
 
   for file in "$@" ; do
-    [ -f "$tgt/$file" ] && rm -f "$tgt/$file"
+    [ -f "$tgt/$file" -o -L "$tgt/$file" ] && rm -f "$tgt/$file"
   done
 }
 
@@ -208,6 +208,8 @@ function dm_install_vendor() {
 
   [ ! -d "$to" ] && mkdir "$to"
   ${DM_RSYNC:-rsync} -avC $excludes_rsync "$repo/./" "$to/./"
+  ## We don't this use CLI script in production, and the symlink breaks D7/BD URL installs
+  dm_remove_files "$to" "bin/pscss"
 }
 
 ##  usage: dm_install_wordpress <wp_repo_path> <to_path>

From 5a2231b86688fb5b394566d8590ed618f25ee8e0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 12:43:38 +1200
Subject: [PATCH 753/834] dev/core#2035 Invoice template - show Amount paid
 even when it is fully paid

In https://github.com/civicrm/civicrm-core/pull/16680/files?w=1#diff-b211e0dac858fdad5d480c118d645e0bR129 there was a change from
'show amount paid & due depending on pay-later status' to 'show amount paid & due depending on whether payment is due'

This has been experienced as a regression and, being an invoice, there seems no reason to only change it sometimes.

This change just alters the template that new installs will receive. If approved another step is needed to update existing
installs (unless they have customised the template)
---
 .../CRM/Contribute/Form/Task/InvoiceTest.php  |  3 +-
 .../contribution_invoice_receipt_html.tpl     | 45 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php b/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
index 01172c613359..a8d020da56c1 100644
--- a/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/Task/InvoiceTest.php
@@ -74,8 +74,7 @@ public function testInvoiceForDueDate() {
     $this->assertContains('PAYMENT ADVICE', $invoiceHTML[$contribution['id']]);
 
     $this->assertContains('AMOUNT DUE:</font></b></td>
-                  <td style="text-align:right;"><b><font size="1">$ 92.00</font></b></td>', $invoiceHTML[$contribution3['id']]);
-
+                <td style="text-align:right;"><b><font size="1">$ 92.00</font></b></td>', $invoiceHTML[$contribution3['id']]);
   }
 
   /**
diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
index d6093e8510f7..2222bf0b5c05 100644
--- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
+++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl
@@ -126,29 +126,28 @@
                 <td style="text-align:right;white-space: nowrap"><b><font size="1">{ts 1=$defaultCurrency}TOTAL %1{/ts}</font></b></td>
                 <td style="text-align:right;"><font size="1">{$amount|crmMoney:$currency}</font></td>
               </tr>
-             {if $amountDue != 0}
-                <tr>
-                  <td colspan="3"></td>
-                  <td style="text-align:right;white-space: nowrap"><font size="1">
-                    {if $contribution_status_id == $refundedStatusId}
-                      {ts}Amount Credited{/ts}
-                    {else}
-                      {ts}Amount Paid{/ts}
-                    {/if}
-                   </font>
-                  </td>
-                  <td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
-                </tr>
-                <tr>
-                  <td colspan="3"></td>
-                  <td colspan="2"><hr></hr></td>
-                </tr>
-                <tr>
-                  <td colspan="3"></td>
-                  <td style="text-align:right;white-space: nowrap" ><b><font size="1">{ts}AMOUNT DUE:{/ts}</font></b></td>
-                  <td style="text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
-                </tr>
-              {/if}
+              <tr>
+                <td colspan="3"></td>
+                <td style="text-align:right;white-space: nowrap"><font size="1">
+                  {if $contribution_status_id == $refundedStatusId}
+                    {ts}Amount Credited{/ts}
+                  {else}
+                    {ts}Amount Paid{/ts}
+                  {/if}
+                 </font>
+                </td>
+                <td style="text-align:right;"><font size="1">{$amountPaid|crmMoney:$currency}</font></td>
+              </tr>
+              <tr>
+                <td colspan="3"></td>
+                <td colspan="2"><hr></hr></td>
+              </tr>
+              <tr>
+                <td colspan="3"></td>
+                <td style="text-align:right;white-space: nowrap" ><b><font size="1">{ts}AMOUNT DUE:{/ts}</font></b></td>
+                <td style="text-align:right;"><b><font size="1">{$amountDue|crmMoney:$currency}</font></b></td>
+              </tr>
+
               <br/><br/><br/>
               <tr>
                 <td colspan="5"></td>

From 9f8f650e3869b1cc255c60e2b8020c511aba2693 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 15:15:13 +1200
Subject: [PATCH 754/834] dev/core#2046 Ensure location BAOs have create
 actions, deprecate add, simplify block code

Per https://lab.civicrm.org/dev/core/-/issues/2046 we have a goal (long term) to consolidate create & add functions into one function - with the functionality moved from add into create & add becoming a deprecated wrapper around create.

This makes that change on the IM & OpenID in line with the previous change on Phone & Email, leaving just Address & Website which are
both a bit trickier. The code in Block runs on the 4 that are updated so this simplifies & confirms all 4 are calling
functions that handle primary. We could switch to an apiv4 call - I just want to be a bit more sure we've handlled primary there
& also that we look into Address & website
---
 CRM/Core/BAO/Block.php                    | 17 ++---------
 CRM/Core/BAO/IM.php                       | 18 +++++++++++-
 CRM/Core/BAO/OpenID.php                   | 18 +++++++++++-
 tests/phpunit/CRM/Core/BAO/IMTest.php     | 12 ++++----
 tests/phpunit/CRM/Core/BAO/OpenIDTest.php | 36 +++++++----------------
 5 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 07167d621c55..6308a6336350 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -323,21 +323,8 @@ public static function create($blockName, $params, $entity = NULL, $contactId =
       }
 
       $blockFields = array_merge($value, $contactFields);
-      if ($name === 'Email') {
-        // @todo ideally all would call the api which is our main tested function,
-        // and towards that call the create rather than add which is preferred by the
-        // api. In order to be careful with change only email is swapped over here because it
-        // is specifically tested in testImportParserWithUpdateWithContactID
-        // and the primary handling is otherwise bypassed on importing an email update.
-        $blocks[] = CRM_Core_BAO_Email::create($blockFields);
-      }
-      elseif ($name === 'Phone') {
-        $blocks[] = CRM_Core_BAO_Phone::create($blockFields);
-      }
-      else {
-        $baoString = 'CRM_Core_BAO_' . $name;
-        $blocks[] = $baoString::add($blockFields);
-      }
+      $baoString = 'CRM_Core_BAO_' . $name;
+      $blocks[] = $baoString::create($blockFields);
     }
 
     return $blocks;
diff --git a/CRM/Core/BAO/IM.php b/CRM/Core/BAO/IM.php
index c7e11c450cba..bca4ce1365df 100644
--- a/CRM/Core/BAO/IM.php
+++ b/CRM/Core/BAO/IM.php
@@ -29,11 +29,27 @@ class CRM_Core_BAO_IM extends CRM_Core_DAO_IM {
    * @throws \CRM_Core_Exception
    * @throws \API_Exception
    */
-  public static function add($params) {
+  public static function create($params) {
     CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
     return self::writeRecord($params);
   }
 
+  /**
+   * Create or update IM record.
+   *
+   * @deprecated
+   *
+   * @param array $params
+   *
+   * @return \CRM_Core_DAO|\CRM_Core_DAO_IM
+   * @throws \CRM_Core_Exception
+   * @throws \API_Exception
+   */
+  public static function add($params) {
+    CRM_Core_Error::deprecatedFunctionWarning('use the v4 api');
+    return self::create($params);
+  }
+
   /**
    * Given the list of params in the params array, fetch the object
    * and store the values in the values array
diff --git a/CRM/Core/BAO/OpenID.php b/CRM/Core/BAO/OpenID.php
index 4382097e67bc..f2000435737d 100644
--- a/CRM/Core/BAO/OpenID.php
+++ b/CRM/Core/BAO/OpenID.php
@@ -30,11 +30,27 @@ class CRM_Core_BAO_OpenID extends CRM_Core_DAO_OpenID {
    * @throws \API_Exception
    * @throws \CRM_Core_Exception
    */
-  public static function add($params) {
+  public static function create($params) {
     CRM_Core_BAO_Block::handlePrimary($params, __CLASS__);
     return self::writeRecord($params);
   }
 
+  /**
+   * Create or update OpenID record.
+   *
+   * @deprecated
+   *
+   * @param array $params
+   *
+   * @return \CRM_Core_DAO|\CRM_Core_DAO_IM
+   * @throws \CRM_Core_Exception
+   * @throws \API_Exception
+   */
+  public static function add($params) {
+    CRM_Core_Error::deprecatedFunctionWarning('use the v4 api');
+    return self::create($params);
+  }
+
   /**
    * Given the list of params in the params array, fetch the object
    * and store the values in the values array
diff --git a/tests/phpunit/CRM/Core/BAO/IMTest.php b/tests/phpunit/CRM/Core/BAO/IMTest.php
index cc82bd0eb02f..5847ab1b5de2 100644
--- a/tests/phpunit/CRM/Core/BAO/IMTest.php
+++ b/tests/phpunit/CRM/Core/BAO/IMTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Civi\Api4\IM;
+
 /**
  * Class CRM_Core_BAO_IMTest
  * @group headless
@@ -11,12 +13,11 @@ public function setUp() {
   }
 
   /**
-   * Add() method (create and update modes)
+   * Create() method (create and update modes)
    */
-  public function testAdd() {
+  public function testCreate() {
     $contactId = $this->individualCreate();
 
-    $params = [];
     $params = [
       'name' => 'jane.doe',
       'provider_id' => 1,
@@ -25,7 +26,7 @@ public function testAdd() {
       'contact_id' => $contactId,
     ];
 
-    CRM_Core_BAO_IM::add($params);
+    IM::create(FALSE)->setValues($params)->execute();
 
     $imId = $this->assertDBNotNull('CRM_Core_DAO_IM', 'jane.doe', 'id', 'name',
       'Database check for created IM name.'
@@ -33,7 +34,6 @@ public function testAdd() {
 
     // Now call add() to modify an existing IM
 
-    $params = [];
     $params = [
       'id' => $imId,
       'contact_id' => $contactId,
@@ -41,7 +41,7 @@ public function testAdd() {
       'name' => 'doe.jane',
     ];
 
-    CRM_Core_BAO_IM::add($params);
+    IM::update(FALSE)->addWhere('id', '=', $imId)->setValues($params)->execute();
 
     $isEditIM = $this->assertDBNotNull('CRM_Core_DAO_IM', $imId, 'provider_id', 'id', 'Database check on updated IM provider_name record.');
     $this->assertEquals($isEditIM, 3, 'Verify IM provider_id value is 3.');
diff --git a/tests/phpunit/CRM/Core/BAO/OpenIDTest.php b/tests/phpunit/CRM/Core/BAO/OpenIDTest.php
index 0e4446635893..3bf68c709c9e 100644
--- a/tests/phpunit/CRM/Core/BAO/OpenIDTest.php
+++ b/tests/phpunit/CRM/Core/BAO/OpenIDTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use Civi\Api4\OpenID;
+
 /**
  * Class CRM_Core_BAO_OpenIDTest
  * @group headless
@@ -7,15 +9,8 @@
 class CRM_Core_BAO_OpenIDTest extends CiviUnitTestCase {
 
   public function tearDown() {
-    // If we truncate only contact, then stale domain and openid records will be left.
-    // If we truncate none of these tables, then contactDelete() will incrementally
-    // clean correctly.
-    //$tablesToTruncate = array('civicrm_domain', 'civicrm_contact', 'civicrm_openid');
-    //$this->quickCleanup($tablesToTruncate);
-  }
-
-  public function setUp() {
-    parent::setUp();
+    $this->quickCleanup(['civicrm_contact', 'civicrm_openid', 'civicrm_email']);
+    parent::tearDown();
   }
 
   /**
@@ -33,15 +28,13 @@ public function testAdd() {
       'is_primary' => 1,
     ];
 
-    $openObject = CRM_Core_BAO_OpenID::add($params);
-
-    $openId = $openObject->id;
+    $openId = OpenID::create(FALSE)->setValues($params)->execute()->first()['id'];
 
     $this->assertDBNotNull('CRM_Core_DAO_OpenID', $openIdURL, 'id', 'openid',
       'Database check for created OpenID.'
     );
 
-    // Now call add() to modify an existing open-id record
+    // Now modify an existing open-id record
 
     $params = [
       'id' => $openId,
@@ -51,15 +44,12 @@ public function testAdd() {
       'allowed_to_login' => 1,
     ];
 
-    CRM_Core_BAO_OpenID::add($params);
+    OpenID::update(FALSE)->addWhere('id', '=', $openId)->setValues($params)->execute();
 
     $allowedToLogin = $this->assertDBNotNull('CRM_Core_DAO_OpenID', $openId, 'allowed_to_login', 'id',
       'Database check on updated OpenID record.'
     );
     $this->assertEquals($allowedToLogin, 1, 'Verify allowed_to_login value is 1.');
-
-    $this->contactDelete($contactId);
-    $this->assertDBRowNotExist('CRM_Contact_DAO_Contact', $contactId);
   }
 
   /**
@@ -79,9 +69,7 @@ public function testAllOpenIDs() {
       'allowed_to_login' => 1,
     ];
 
-    $openObjectOne = CRM_Core_BAO_OpenID::add($params);
-
-    $openIdOne = $openObjectOne->id;
+    $openIdOne = OpenID::create(FALSE)->setValues($params)->execute()->first()['id'];
     $this->assertDBNotNull('CRM_Core_DAO_OpenID', $openIdURLOne, 'id', 'openid',
       'Database check for created OpenID.'
     );
@@ -94,8 +82,7 @@ public function testAllOpenIDs() {
       'openid' => $openIdURLTwo,
     ];
 
-    $openObjectTwo = CRM_Core_BAO_OpenID::add($params);
-    $openIdTwo = $openObjectTwo->id;
+    $openIdTwo = OpenID::create(FALSE)->setValues($params)->execute()->first()['id'];
 
     $this->assertDBNotNull('CRM_Core_DAO_OpenID', $openIdURLTwo, 'id', 'openid',
       'Database check for created OpenID.'
@@ -105,7 +92,7 @@ public function testAllOpenIDs() {
     $openIds = CRM_Core_BAO_OpenID::allOpenIDs($contactId);
 
     // check number of openids for the contact
-    $this->assertEquals(2, count($openIds), 'Checking number of returned open-ids.');
+    $this->assertCount(2, $openIds, 'Checking number of returned open-ids.');
 
     // check first openid values
     $this->assertEquals($openIdURLOne, $openIds[$openIdOne]['openid'],
@@ -120,9 +107,6 @@ public function testAllOpenIDs() {
     );
     $this->assertEquals(0, $openIds[$openIdTwo]['is_primary'], 'Confirm is_primary field value for second openid.');
     $this->assertEquals(0, $openIds[$openIdTwo]['allowed_to_login'], 'Confirm allowed_to_login field value for second openid.');
-
-    $this->contactDelete($contactId);
-    $this->assertDBRowNotExist('CRM_Contact_DAO_Contact', $contactId);
   }
 
 }

From 22911720df7c970d390534a45a0aa72edb5ce2e2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 15:24:51 +1200
Subject: [PATCH 755/834] dev/core#2046 Rationalise add vs create on website
 BAO

2 years ago we deprecated 'calling website create in weird ways' - it seems like now we can remove that
handling & standardise on recommended create function & deprecate add

https://lab.civicrm.org/dev/core/-/issues/2046
---
 CRM/Core/BAO/Website.php                    | 25 ++++++++-------------
 Civi/Api4/Generic/Traits/DAOActionTrait.php |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/CRM/Core/BAO/Website.php b/CRM/Core/BAO/Website.php
index 358ddd2f3c2c..d5f386e8fdb8 100644
--- a/CRM/Core/BAO/Website.php
+++ b/CRM/Core/BAO/Website.php
@@ -24,9 +24,11 @@ class CRM_Core_BAO_Website extends CRM_Core_DAO_Website {
    * Create or update Website record.
    *
    * @param array $params
+   *
    * @return CRM_Core_DAO_Website
+   * @throws \CRM_Core_Exception
    */
-  public static function add($params) {
+  public static function create($params) {
     return self::writeRecord($params);
   }
 
@@ -36,23 +38,13 @@ public static function add($params) {
    * If called in a legacy manner this, temporarily, fails back to calling the legacy function.
    *
    * @param array $params
-   * @param int $contactID
-   * @param bool $skipDelete
    *
    * @return bool|CRM_Core_BAO_Website
+   * @throws \CRM_Core_Exception
    */
-  public static function create($params, $contactID = NULL, $skipDelete = NULL) {
-    if ($skipDelete !== NULL || ($contactID && !is_array($contactID))) {
-      \Civi::log()->warning(ts('Calling website:create with vars other than $params is deprecated. Use process'), ['civi.tag' => 'deprecated']);
-      return self::process($params, $contactID, $skipDelete);
-    }
-    foreach ($params as $key => $value) {
-      if (is_numeric($key)) {
-        \Civi::log()->warning(ts('Calling website:create for multiple websites $params is deprecated. Use process'), ['civi.tag' => 'deprecated']);
-        return self::process($params, $contactID, $skipDelete);
-      }
-    }
-    return self::add($params);
+  public static function add($params) {
+    CRM_Core_Error::deprecatedFunctionWarning('use apiv4');
+    return self::create($params);
   }
 
   /**
@@ -65,6 +57,7 @@ public static function create($params, $contactID = NULL, $skipDelete = NULL) {
    * @param bool $skipDelete
    *
    * @return bool
+   * @throws \CRM_Core_Exception
    */
   public static function process($params, $contactID, $skipDelete) {
     if (empty($params)) {
@@ -87,7 +80,7 @@ public static function process($params, $contactID, $skipDelete) {
       }
       if (!empty($values['url'])) {
         $values['contact_id'] = $contactID;
-        self::add($values);
+        self::create($values);
       }
       elseif ($skipDelete && !empty($values['id'])) {
         self::del($values['id']);
diff --git a/Civi/Api4/Generic/Traits/DAOActionTrait.php b/Civi/Api4/Generic/Traits/DAOActionTrait.php
index 9404b11ecf6f..3982e4dba8d3 100644
--- a/Civi/Api4/Generic/Traits/DAOActionTrait.php
+++ b/Civi/Api4/Generic/Traits/DAOActionTrait.php
@@ -110,7 +110,6 @@ protected function writeObjects($items) {
     $oddballs = [
       'EntityTag' => 'add',
       'GroupContact' => 'add',
-      'Website' => 'add',
     ];
     $method = $oddballs[$this->getEntityName()] ?? 'create';
     if (!method_exists($baoName, $method)) {

From c3317f503eab0eeca0e21c717ba60fd4e0f378aa Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Sat, 26 Sep 2020 18:15:08 +0100
Subject: [PATCH 756/834] Add modified_date to list of activity tokens

---
 CRM/Activity/Tokens.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CRM/Activity/Tokens.php b/CRM/Activity/Tokens.php
index fff8e6224a50..250f88a38dcd 100644
--- a/CRM/Activity/Tokens.php
+++ b/CRM/Activity/Tokens.php
@@ -134,7 +134,7 @@ public function evaluateToken(\Civi\Token\TokenRow $row, $entity, $field, $prefe
 
     $activity = (object) $prefetch['activity'][$activityId];
 
-    if (in_array($field, ['activity_date_time', 'created_date'])) {
+    if (in_array($field, ['activity_date_time', 'created_date', 'modified_date'])) {
       $row->tokens($entity, $field, \CRM_Utils_Date::customFormat($activity->$field));
     }
     elseif (isset($mapping[$field]) and (isset($activity->{$mapping[$field]}))) {
@@ -179,11 +179,12 @@ protected function getBasicTokens() {
         'subject' => ts('Activity Subject'),
         'details' => ts('Activity Details'),
         'activity_date_time' => ts('Activity Date-Time'),
+        'created_date' => ts('Activity Created Date'),
+        'modified_date' => ts('Activity Modified Date'),
         'activity_type_id' => ts('Activity Type ID'),
         'status' => ts('Activity Status'),
         'status_id' => ts('Activity Status ID'),
         'location' => ts('Activity Location'),
-        'created_date' => ts('Activity Creation Date'),
         'duration' => ts('Activity Duration'),
         'campaign' => ts('Activity Campaign'),
         'campaign_id' => ts('Activity Campaign ID'),

From ed2ee15ab71cad13aaeb0abf1de12c6b9185a7c8 Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Fri, 17 Jan 2020 19:04:00 +0000
Subject: [PATCH 757/834] Add an 'Execute Now' button to the job log

---
 CRM/Admin/Form/Job.php              | 11 ++++++++++-
 CRM/Admin/Page/Job.php              |  3 +++
 CRM/Admin/Page/JobLog.php           |  8 ++++----
 templates/CRM/Admin/Page/JobLog.tpl |  6 ++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CRM/Admin/Form/Job.php b/CRM/Admin/Form/Job.php
index 65bb09710e2a..dec88aeeab13 100644
--- a/CRM/Admin/Form/Job.php
+++ b/CRM/Admin/Form/Job.php
@@ -24,6 +24,7 @@ class CRM_Admin_Form_Job extends CRM_Admin_Form {
   public function preProcess() {
 
     parent::preProcess();
+    $this->setContext();
 
     CRM_Utils_System::setTitle(ts('Manage - Scheduled Jobs'));
 
@@ -194,7 +195,15 @@ public function postProcess() {
       $jm->executeJobById($this->_id);
       $jobName = self::getJobName($this->_id);
       CRM_Core_Session::setStatus(ts('%1 Scheduled Job has been executed. See the log for details.', [1 => $jobName]), ts("Executed"), "success");
-      CRM_Utils_System::redirect(CRM_Utils_System::url('civicrm/admin/job', 'reset=1'));
+
+      if ($this->getContext() === 'joblog') {
+        // If we were triggered via the joblog form redirect back there when we finish
+        $redirectUrl = CRM_Utils_System::url('civicrm/admin/joblog', 'reset=1&jid=' . $this->_id);
+      }
+      else {
+        $redirectUrl = CRM_Utils_System::url('civicrm/admin/job', 'reset=1');
+      }
+      CRM_Utils_System::redirect($redirectUrl);
       return;
     }
 
diff --git a/CRM/Admin/Page/Job.php b/CRM/Admin/Page/Job.php
index 2164d2b7cefa..5a8d30767c57 100644
--- a/CRM/Admin/Page/Job.php
+++ b/CRM/Admin/Page/Job.php
@@ -117,6 +117,9 @@ public function run() {
     $this->_action = CRM_Utils_Request::retrieve('action', 'String',
       $this, FALSE, 0
     );
+    $this->_context = CRM_Utils_Request::retrieve('context', 'String',
+      $this, FALSE, 0
+    );
 
     if (($this->_action & CRM_Core_Action::COPY) && (!empty($this->_id))) {
       try {
diff --git a/CRM/Admin/Page/JobLog.php b/CRM/Admin/Page/JobLog.php
index c7b1226535f9..e31a52558d6f 100644
--- a/CRM/Admin/Page/JobLog.php
+++ b/CRM/Admin/Page/JobLog.php
@@ -73,17 +73,17 @@ public function run() {
    * Browse all jobs.
    */
   public function browse() {
-    $jid = CRM_Utils_Request::retrieve('jid', 'Positive', $this);
+    $jid = CRM_Utils_Request::retrieve('jid', 'Positive');
 
     $sj = new CRM_Core_JobManager();
 
-    $jobName = NULL;
     if ($jid) {
       $jobName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_Job', $jid);
+      $this->assign('jobName', $jobName);
+      $jobRunUrl = CRM_Utils_System::url('civicrm/admin/job', 'action=view&reset=1&context=joblog&id=' . $jid);
+      $this->assign('jobRunUrl', $jobRunUrl);
     }
 
-    $this->assign('jobName', $jobName);
-
     $dao = new CRM_Core_DAO_JobLog();
     $dao->orderBy('id desc');
 
diff --git a/templates/CRM/Admin/Page/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl
index 367b0f5b1b11..ca3bac9e5566 100644
--- a/templates/CRM/Admin/Page/JobLog.tpl
+++ b/templates/CRM/Admin/Page/JobLog.tpl
@@ -19,6 +19,9 @@
 
   <div class="action-link">
     <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-top" class="button"><span><i class="crm-i fa-chevron-left" aria-hidden="true"></i> {ts}Back to Scheduled Jobs Listing{/ts}</span></a>
+    {if $jobRunUrl}
+      <a href="{$jobRunUrl}" id="jobsList-run-top" class="button"><span><i class="crm-i fa-play" aria-hidden="true"></i> {ts}Execute Now{/ts}</span></a>
+    {/if}
   </div>
 
 {if $rows}
@@ -60,5 +63,8 @@
 
   <div class="action-link">
     <a href="{crmURL p='civicrm/admin/job' q="reset=1"}" id="jobsList-bottom" class="button"><span><i class="crm-i fa-chevron-left" aria-hidden="true"></i> {ts}Back to Scheduled Jobs Listing{/ts}</span></a>
+    {if $jobRunUrl}
+      <a href="{$jobRunUrl}" id="jobsList-run-bottom" class="button"><span><i class="crm-i fa-play" aria-hidden="true"></i> {ts}Execute Now{/ts}</span></a>
+    {/if}
   </div>
 </div>

From 1acaddb8543f8c31b46a24d77f3ed84967e0d2f5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 19:58:57 +1200
Subject: [PATCH 758/834] dev/core#2057 Reduce queries when calling
 activity.create

This reduces queries in 2 ways
1) if the action is 'create' then existing activity contacts cannot exist, so do not try to delete them
2) if the action is 'edit' then look for & delete for all 3 record types at once.

There are still questions about how we can improve this further but it should remove up to 3 queries per
Activity.create call
---
 CRM/Activity/BAO/Activity.php | 39 ++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index a69a8164502a..f98328217678 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\ActivityContact;
+
 /**
  *
  * @package CRM
@@ -343,13 +345,37 @@ public static function create(&$params) {
     $assigneeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Assignees');
     $targetID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets');
 
+    $activityRecordTypes = [
+      'source_contact_id' => 'Activity Source',
+      'assignee_contact_id' => 'Activity Assignees',
+      'target_contact_id' => 'Activity Targets',
+    ];
+    $activityContacts = array_intersect_key($params, $activityRecordTypes);
+
+    // Unset any which are a single id - this is just because they have traditionally been updated as
+    // opposed to delete + possible create for the others.
+    // Potentially we should nuance it for the others too....
+    foreach ($activityContacts as $index => $value) {
+      if ($value && !is_array($value)) {
+        unset($activityContacts[$index]);
+      }
+    }
+
+    if ($action === 'edit' && !empty($activityContacts)) {
+      $wheres = [['activity_id', '=', $params['id']], ['record_type_id:name', 'IN', array_intersect_key($activityRecordTypes, $activityContacts)]];
+      // Delete all existing records for the types to be updated. Do a quick check to make sure there
+      // is at least one to avoid a delete query if not necessary (delete queries are more likely to cause contention).
+      if (ActivityContact::get($params['check_permissions'] ?? FALSE)->setLimit(1)->setWhere($wheres)->selectRowCount()->execute()) {
+        ActivityContact::delete($params['check_permissions'] ?? FALSE)->setWhere($wheres)->execute();
+      }
+    }
+
     if (isset($params['source_contact_id'])) {
       $acParams = [
         'activity_id' => $activityId,
         'contact_id' => $params['source_contact_id'],
         'record_type_id' => $sourceID,
       ];
-      self::deleteActivityContact($activityId, $sourceID);
       CRM_Activity_BAO_ActivityContact::create($acParams);
     }
 
@@ -363,9 +389,6 @@ public static function create(&$params) {
       $assignmentParams = ['activity_id' => $activityId];
 
       if (is_array($params['assignee_contact_id'])) {
-        // first delete existing assignments if any
-        self::deleteActivityContact($activityId, $assigneeID);
-
         foreach ($params['assignee_contact_id'] as $acID) {
           if ($acID) {
             $assigneeParams = [
@@ -396,9 +419,6 @@ public static function create(&$params) {
         }
       }
     }
-    elseif (isset($params['assignee_contact_id'])) {
-      self::deleteActivityContact($activityId, $assigneeID);
-    }
 
     if (is_a($resultAssignment, 'CRM_Core_Error')) {
       $transaction->rollback();
@@ -410,8 +430,6 @@ public static function create(&$params) {
 
       $targetParams = ['activity_id' => $activityId];
       if (is_array($params['target_contact_id'])) {
-        // first delete existing targets if any
-        self::deleteActivityContact($activityId, $targetID);
 
         foreach ($params['target_contact_id'] as $tid) {
           if ($tid) {
@@ -443,9 +461,6 @@ public static function create(&$params) {
         }
       }
     }
-    elseif (isset($params['target_contact_id'])) {
-      self::deleteActivityContact($activityId, $targetID);
-    }
 
     // write to changelog before transaction is committed/rolled
     // back (and prepare status to display)

From 172dfebe71c4f12fa8fa2fdfb319208580cee340 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 26 Sep 2020 15:33:37 +1200
Subject: [PATCH 759/834] [REF] Follow up cleanup from Event Location

CRM_Core_BAO_Block::create & CRM_Core_BAO_Address::create are no longer called with the entity param
- remove support
---
 CRM/Core/BAO/Address.php                   | 21 ++++-----------------
 CRM/Core/BAO/Block.php                     | 14 ++------------
 tests/phpunit/CRM/Core/BAO/AddressTest.php |  6 +++---
 3 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 771c6cc95f4e..329940adbdf9 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -29,33 +29,20 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address {
    *   True if you need to fix (format) address values.
    *                               before inserting in db
    *
-   * @param null $entity
-   *
    * @return array|NULL
    *   array of created address
    */
-  public static function create(&$params, $fixAddress = TRUE, $entity = NULL) {
+  public static function create(&$params, $fixAddress = TRUE) {
     if (!isset($params['address']) || !is_array($params['address'])) {
       return NULL;
     }
     CRM_Core_BAO_Block::sortPrimaryFirst($params['address']);
-    $addresses = [];
     $contactId = NULL;
 
     $updateBlankLocInfo = CRM_Utils_Array::value('updateBlankLocInfo', $params, FALSE);
-    if (!$entity) {
-      $contactId = $params['contact_id'];
-      //get all the addresses for this contact
-      $addresses = self::allAddress($contactId);
-    }
-    else {
-      // get all address from location block
-      $entityElements = [
-        'entity_table' => $params['entity_table'],
-        'entity_id' => $params['entity_id'],
-      ];
-      $addresses = self::allEntityAddress($entityElements);
-    }
+    $contactId = $params['contact_id'];
+    //get all the addresses for this contact
+    $addresses = self::allAddress($contactId);
 
     $isPrimary = $isBilling = TRUE;
     $blocks = [];
diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 07167d621c55..62c8bcee0c42 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -193,13 +193,11 @@ public static function getBlockIds($blockName, $contactId = NULL, $entityElement
    *   Block name.
    * @param array $params
    *   Array of name/value pairs.
-   * @param string $entity
-   * @param int $contactId
    *
    * @return array|null
    *   Array of created location entities or NULL if none to create.
    */
-  public static function create($blockName, $params, $entity = NULL, $contactId = NULL) {
+  public static function create($blockName, $params) {
     if (!self::blockExists($blockName, $params)) {
       return NULL;
     }
@@ -210,15 +208,7 @@ public static function create($blockName, $params, $entity = NULL, $contactId =
     $resetPrimaryId = NULL;
     $primaryId = FALSE;
 
-    if ($entity) {
-      $entityElements = [
-        'entity_table' => $params['entity_table'],
-        'entity_id' => $params['entity_id'],
-      ];
-    }
-    else {
-      $contactId = $params['contact_id'];
-    }
+    $contactId = $params['contact_id'];
 
     $updateBlankLocInfo = CRM_Utils_Array::value('updateBlankLocInfo', $params, FALSE);
     $isIdSet = CRM_Utils_Array::value('isIdSet', $params[$blockName], FALSE);
diff --git a/tests/phpunit/CRM/Core/BAO/AddressTest.php b/tests/phpunit/CRM/Core/BAO/AddressTest.php
index 000f8172e4b4..8e8ddcfe7701 100644
--- a/tests/phpunit/CRM/Core/BAO/AddressTest.php
+++ b/tests/phpunit/CRM/Core/BAO/AddressTest.php
@@ -50,7 +50,7 @@ public function testCreate() {
 
     $fixAddress = TRUE;
 
-    CRM_Core_BAO_Address::create($params, $fixAddress, $entity = NULL);
+    CRM_Core_BAO_Address::create($params, $fixAddress);
     $addressId = $this->assertDBNotNull('CRM_Core_DAO_Address', 'Oberoi Garden', 'id', 'street_address',
       'Database check for created address.'
     );
@@ -76,7 +76,7 @@ public function testCreate() {
     ];
     $params['contact_id'] = $contactId;
 
-    $block = CRM_Core_BAO_Address::create($params, $fixAddress, $entity = NULL);
+    $block = CRM_Core_BAO_Address::create($params, $fixAddress);
 
     $this->assertDBNotNull('CRM_Core_DAO_Address', $contactId, 'id', 'contact_id',
       'Database check for updated address by contactId.'
@@ -253,7 +253,7 @@ public function testGetValues() {
 
     $fixAddress = TRUE;
 
-    CRM_Core_BAO_Address::create($params, $fixAddress, $entity = NULL);
+    CRM_Core_BAO_Address::create($params, $fixAddress);
 
     $addressId = $this->assertDBNotNull('CRM_Core_DAO_Address', $contactId, 'id', 'contact_id',
       'Database check for created address.'

From f52b324190dbf2ace650206c605274836bbe70a6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 27 Sep 2020 18:34:09 +1300
Subject: [PATCH 760/834] [Ref] Extract getOrderParams

Overview
----------------------------------------
Minor extraction

Before
----------------------------------------
Code not re-usable

After
----------------------------------------
Code is re-useable, basis for further fix

Technical Details
----------------------------------------

Comments
----------------------------------------
Note this ties into https://lab.civicrm.org/dev/membership/-/issues/28
---
 CRM/Member/Form/MembershipRenewal.php | 36 +++++++++++++++++++--------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 55600909effe..6defa6faecf7 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -610,22 +610,13 @@ protected function submit() {
 
     if (!empty($this->_params['record_contribution']) || $this->_mode) {
       // set the source
-      list($userName) = CRM_Contact_BAO_Contact_Location::getEmailDetails(CRM_Core_Session::singleton()->get('userID'));
+      [$userName] = CRM_Contact_BAO_Contact_Location::getEmailDetails(CRM_Core_Session::singleton()->get('userID'));
       $this->_params['contribution_source'] = "{$this->membershipTypeName} Membership: Offline membership renewal (by {$userName})";
 
       //create line items
       $this->_params = $this->setPriceSetParameters($this->_params);
 
-      $order = new CRM_Financial_BAO_Order();
-      $order->setPriceSelectionFromUnfilteredInput($this->_params);
-      $order->setPriceSetID(self::getPriceSetID($this->_params));
-      $order->setOverrideTotalAmount($this->_params['total_amount']);
-      $order->setOverrideFinancialTypeID((int) $this->_params['financial_type_id']);
-
-      $this->_params['lineItems'][$this->_priceSetId] = $order->getLineItems();
-      // This is one of those weird & wonderful legacy params we aim to get rid of.
-      $this->_params['processPriceSet'] = TRUE;
-      $this->_params['tax_amount'] = $order->getTotalTaxAmount();
+      $this->_params = array_merge($this->_params, $this->getOrderParams());
 
       //assign contribution contact id to the field expected by recordMembershipContribution
       if ($this->_contributorContactID != $this->_contactID) {
@@ -805,4 +796,27 @@ public function processMembership($memParams, $changeToday, $numRenewTerms, $pen
     return $membership;
   }
 
+  /**
+   * Get order related params.
+   *
+   * In practice these are contribution params but later they cann be used with the Order api.
+   *
+   * @return array
+   *
+   * @throws \CiviCRM_API3_Exception
+   */
+  protected function getOrderParams(): array {
+    $order = new CRM_Financial_BAO_Order();
+    $order->setPriceSelectionFromUnfilteredInput($this->_params);
+    $order->setPriceSetID(self::getPriceSetID($this->_params));
+    $order->setOverrideTotalAmount($this->_params['total_amount']);
+    $order->setOverrideFinancialTypeID((int) $this->_params['financial_type_id']);
+    return [
+      'lineItems' => [$this->_priceSetId => $order->getLineItems()],
+      // This is one of those weird & wonderful legacy params we aim to get rid of.
+      'processPriceSet' => TRUE,
+      'tax_amount' => $order->getTotalTaxAmount(),
+    ];
+  }
+
 }

From 97dda7c05cfc99ca336975fdc661953449f8e345 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 27 Sep 2020 14:14:25 +1300
Subject: [PATCH 761/834] Fix regression or back-office membership renewal by
 credit card

Looking at the code I realised a mistake was made in  https://github.com/civicrm/civicrm-core/pull/17398 whereby
the actual membership id would not be passed through correctly
---
 CRM/Member/Form.php                   | 6 +++---
 CRM/Member/Form/MembershipRenewal.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CRM/Member/Form.php b/CRM/Member/Form.php
index 73f7cb46a915..3ae6973ef52b 100644
--- a/CRM/Member/Form.php
+++ b/CRM/Member/Form.php
@@ -358,19 +358,19 @@ protected function setContextVariables($params) {
    *
    * @param array $contributionRecurParams
    *
-   * @param int $membershipID
+   * @param int $membershipTypeID
    *
    * @return array
    * @throws \CiviCRM_API3_Exception
    */
-  protected function processRecurringContribution($contributionRecurParams, $membershipID) {
+  protected function processRecurringContribution($contributionRecurParams, $membershipTypeID) {
 
     $mapping = [
       'frequency_interval' => 'duration_interval',
       'frequency_unit' => 'duration_unit',
     ];
     $membershipType = civicrm_api3('MembershipType', 'getsingle', [
-      'id' => $membershipID,
+      'id' => $membershipTypeID,
       'return' => $mapping,
     ]);
 
diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 162ca1cc613f..908e51adc9a4 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -553,7 +553,7 @@ protected function submit() {
           'is_email_receipt' => !empty($this->_params['send_receipt']),
           'payment_instrument_id' => $this->_params['payment_instrument_id'],
           'invoice_id' => $this->_params['invoice_id'],
-        ], $membershipID = $paymentParams['membership_type_id'][1]);
+        ], $paymentParams['membership_type_id'][1]);
 
         $contributionRecurID = $contributionRecurParams['contributionRecurID'];
         $paymentParams = array_merge($paymentParams, $contributionRecurParams);

From 28743d2f5e649f1f39062672e602d9d5257cbb13 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sun, 27 Sep 2020 14:12:51 -0400
Subject: [PATCH 762/834] test activity contact variations

---
 .../phpunit/CRM/Activity/BAO/ActivityTest.php | 589 ++++++++++++++++++
 1 file changed, 589 insertions(+)

diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index d89fd279a935..2e2666d1f9b7 100644
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -8,6 +8,10 @@ class CRM_Activity_BAO_ActivityTest extends CiviUnitTestCase {
 
   private $allowedContactsACL = [];
 
+  private $loggedInUserId = NULL;
+
+  private $someContacts = [];
+
   /**
    * Set up for test.
    *
@@ -1625,4 +1629,589 @@ protected function setShowCaseActivitiesInCore(bool $val) {
     Civi::$statics['CRM_Core_Component']['info']['CiviCase']->info['showActivitiesInCore'] = $val;
   }
 
+  /**
+   * Test multiple variations of target and assignee contacts in create
+   * and edit mode.
+   *
+   * @dataProvider targetAndAssigneeProvider
+   * @param array $do_first
+   * @param array $do_second
+   */
+  public function testTargetAssigneeVariations(array $do_first, array $do_second) {
+    // Originally wanted to put this in setUp() but it broke other tests.
+    $this->loggedInUserId = $this->createLoggedInUser();
+    for ($i = 1; $i <= 4; $i++) {
+      $this->someContacts[$i] = $this->individualCreate([], $i - 1, TRUE);
+    }
+
+    $params = [
+      'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Meeting'),
+      'subject' => 'Test Meeting',
+      'source_contact_id' => $this->loggedInUserId,
+    ];
+
+    // Create an activity first if specified.
+    $activity = NULL;
+    if (!empty($do_first)) {
+      if (!empty($do_first['targets'])) {
+        // e.g. if it is [1], then pick $someContacts[1]. If it's [1,2], then
+        // pick $someContacts[1] and $someContacts[2].
+        $params['target_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_first['targets'])));
+      }
+      if (!empty($do_first['assignees'])) {
+        $params['assignee_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_first['assignees'])));
+      }
+
+      $activity = CRM_Activity_BAO_Activity::create($params);
+      $this->assertNotEmpty($activity->id);
+
+      $params['id'] = $activity->id;
+    }
+
+    // Now do the second one, which will either create or update depending what
+    // we did first.
+    $params['target_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_second['targets'])));
+    $params['assignee_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_second['assignees'])));
+    $activity = CRM_Activity_BAO_Activity::create($params);
+
+    // Check targets
+    $queryParams = [
+      1 => [$activity->id, 'Integer'],
+      2 => [CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets'), 'Integer'],
+    ];
+    $this->assertEquals($params['target_contact_id'], array_column(CRM_Core_DAO::executeQuery('SELECT contact_id FROM civicrm_activity_contact WHERE activity_id = %1 AND record_type_id = %2', $queryParams)->fetchAll(), 'contact_id'));
+
+    // Check assignees
+    $queryParams = [
+      1 => [$activity->id, 'Integer'],
+      2 => [CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Assignees'), 'Integer'],
+    ];
+    $this->assertEquals($params['assignee_contact_id'], array_column(CRM_Core_DAO::executeQuery('SELECT contact_id FROM civicrm_activity_contact WHERE activity_id = %1 AND record_type_id = %2', $queryParams)->fetchAll(), 'contact_id'));
+
+    // Clean up
+    foreach ($this->someContacts as $cid) {
+      $this->callAPISuccess('Contact', 'delete', ['id' => $cid]);
+    }
+  }
+
+  /**
+   * Dataprovider for testTargetAssigneeVariations
+   * @return array
+   */
+  public function targetAndAssigneeProvider():array {
+    return [
+      // Explicit index so that it's easy to see which one has failed without
+      // having to finger count.
+      0 => [
+        'do first' => [
+          // Completely empty array means don't create any activity first,
+          // as opposed to the ones we do later where "do first" has member
+          // elements but those are empty, which means create an activity first
+          // but with no contacts.
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+      ],
+      1 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+      ],
+      2 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+      ],
+      3 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+      ],
+      4 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+      ],
+      5 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [3],
+        ],
+      ],
+      6 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3],
+        ],
+      ],
+      7 => [
+        'do first' => [],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3, 4],
+        ],
+      ],
+      // The next sets test the same thing again but updating an activity
+      // that has no contacts
+      8 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+      ],
+      9 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+      ],
+      10 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+      ],
+      11 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+      ],
+      12 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+      ],
+      13 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [3],
+        ],
+      ],
+      14 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3],
+        ],
+      ],
+      15 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3, 4],
+        ],
+      ],
+      // And again but updating an activity with 1 contact
+      16 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+      ],
+      17 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+      ],
+      18 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+      ],
+      19 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+      ],
+      20 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+      ],
+      21 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [3],
+        ],
+      ],
+      22 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3],
+        ],
+      ],
+      23 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3, 4],
+        ],
+      ],
+      24 => [
+        'do first' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+        'do second' => [
+          // a little different variation where we're changing the target as
+          // opposed to adding one or deleting
+          'targets' => [2],
+          'assignees' => [],
+        ],
+      ],
+      // And again but updating an activity with 2 contacts
+      25 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+      ],
+      26 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+      ],
+      27 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+      ],
+      28 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+      ],
+      29 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+      ],
+      30 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [3],
+        ],
+      ],
+      31 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3],
+        ],
+      ],
+      32 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3, 4],
+        ],
+      ],
+      33 => [
+        'do first' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+        'do second' => [
+          'targets' => [2],
+          'assignees' => [],
+        ],
+      ],
+      // And again but now start with assignees
+      34 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+      ],
+      35 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+      ],
+      36 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+      ],
+      37 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+      ],
+      38 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+      ],
+      39 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [3],
+        ],
+      ],
+      40 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3],
+        ],
+      ],
+      41 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3, 4],
+        ],
+      ],
+      42 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [4],
+        ],
+      ],
+      // And again but now start with 2 assignees
+      43 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [],
+        ],
+      ],
+      44 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [],
+        ],
+      ],
+      45 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [],
+        ],
+      ],
+      46 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3],
+        ],
+      ],
+      47 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+      ],
+      48 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [1],
+          'assignees' => [3],
+        ],
+      ],
+      49 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3],
+        ],
+      ],
+      50 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [1, 2],
+          'assignees' => [3, 4],
+        ],
+      ],
+      51 => [
+        'do first' => [
+          'targets' => [],
+          'assignees' => [3, 4],
+        ],
+        'do second' => [
+          'targets' => [],
+          'assignees' => [4],
+        ],
+      ],
+    ];
+  }
+
 }

From 2d227fa36e38ffce7e639d557bef5856323b1534 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 28 Sep 2020 11:02:23 +1300
Subject: [PATCH 763/834] Enotice fix

---
 CRM/Member/BAO/MembershipType.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php
index c702b83af3aa..581f11d686a1 100644
--- a/CRM/Member/BAO/MembershipType.php
+++ b/CRM/Member/BAO/MembershipType.php
@@ -823,7 +823,7 @@ public static function getAllMembershipTypes() {
     if (!Civi::cache('metadata')->has($cacheString)) {
       $types = civicrm_api3('MembershipType', 'get', ['options' => ['limit' => 0, 'sort' => 'weight']])['values'];
       $taxRates = CRM_Core_PseudoConstant::getTaxRates();
-      $keys = ['description', 'relationship_type_id', 'relationship_direction', 'max_related'];
+      $keys = ['description', 'relationship_type_id', 'relationship_direction', 'max_related', 'auto_renew'];
       // In order to avoid down-stream e-notices we undo api v3 filtering of NULL values. This is covered
       // in Unit tests & ideally we might switch to apiv4 but I would argue we should build caching
       // of metadata entities like this directly into apiv4.

From 094ff61f986a292c8acfc69f45aabdb28eb58c39 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 28 Sep 2020 13:05:38 +1300
Subject: [PATCH 764/834] dev/membership#27 Update outdated membership statuses
 in preProcess rather than submit

Per https://lab.civicrm.org/dev/membership/-/issues/27 the function fixMembershipBeforeRenew is agreed to be a useful part of this flow
(ie we should set to expired before renewing if that is the correct pre-renewal status). As discussed on that
issue this moves that handling to the pre-process function.

In the process I hit what appears to be an unreleased regression affecting fixMembershipBeforeRenew borking
when changeDate = NULL from https://github.com/civicrm/civicrm-core/commit/2cb6497039fde605f5d64b2fe4fa0548cd5d1e07#diff-f43c8498e32f5b2d68ab27bcd243ca36L1136

The regression only affects master
---
 CRM/Member/BAO/Membership.php                   | 11 +++--------
 CRM/Member/Form/MembershipRenewal.php           | 12 +++++-------
 templates/CRM/Member/Form/MembershipRenewal.tpl |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 32ff6e025910..41fa61e50f25 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1125,13 +1125,13 @@ public static function updateRecurMembership(CRM_Member_DAO_Membership $membersh
    *   Reference to the array.
    *   containing all values of
    *   the current membership
-   * @param string $changeToday
+   * @param string|null $changeToday
    *   In case today needs
    *   to be customised, null otherwise
    *
    * @throws \CRM_Core_Exception
    */
-  public static function fixMembershipStatusBeforeRenew(&$currentMembership, $changeToday) {
+  public static function fixMembershipStatusBeforeRenew(&$currentMembership, $changeToday = NULL) {
     $today = 'now';
     if ($changeToday) {
       $today = CRM_Utils_Date::processDate($changeToday, NULL, FALSE, 'Y-m-d');
@@ -1151,8 +1151,6 @@ public static function fixMembershipStatusBeforeRenew(&$currentMembership, $chan
       throw new CRM_Core_Exception(ts('Oops, it looks like there is no valid membership status corresponding to the membership start and end dates for this membership. Contact the site administrator for assistance.'));
     }
 
-    $currentMembership['today_date'] = $today;
-
     if ($status['id'] !== $currentMembership['status_id']) {
       $oldStatus = $currentMembership['status_id'];
       $memberDAO = new CRM_Member_DAO_Membership();
@@ -1181,10 +1179,7 @@ public static function fixMembershipStatusBeforeRenew(&$currentMembership, $chan
           $currentMembership['end_date'],
           $format
         ),
-        'modified_date' => CRM_Utils_Date::customFormat(
-          $currentMembership['today_date'],
-          $format
-        ),
+        'modified_date' => date('Y-m-d H:i:s', strtotime($today)),
         'membership_type_id' => $currentMembership['membership_type_id'],
         'max_related' => $currentMembership['max_related'] ?? 0,
       ];
diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 55600909effe..8feaa97b8bb3 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -137,10 +137,11 @@ public function preProcess() {
     $this->assign('formClass', 'membershiprenew');
     parent::preProcess();
 
-    $this->assign('endDate', CRM_Utils_Date::customFormat(CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership',
-      $this->_id, 'end_date'
-    )
-    ));
+    // @todo - we should store this as a property & re-use in setDefaults - for now that's a bigger change.
+    $currentMembership = civicrm_api3('Membership', 'getsingle', ['id' => $this->_id]);
+    CRM_Member_BAO_Membership::fixMembershipStatusBeforeRenew($currentMembership);
+
+    $this->assign('endDate', $currentMembership['end_date']);
     $this->assign('membershipStatus',
       CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipStatus',
         CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership',
@@ -770,9 +771,6 @@ public function processMembership($memParams, $changeToday, $numRenewTerms, $pen
       return CRM_Member_BAO_Membership::create($memParams);
     }
 
-    // Check and fix the membership if it is STALE
-    CRM_Member_BAO_Membership::fixMembershipStatusBeforeRenew($currentMembership, $changeToday);
-
     $isMembershipCurrent = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipStatus', $currentMembership['status_id'], 'is_current_member');
 
     // CRM-7297 Membership Upsell - calculate dates based on new membership type
diff --git a/templates/CRM/Member/Form/MembershipRenewal.tpl b/templates/CRM/Member/Form/MembershipRenewal.tpl
index 73b1b6850a4b..aa8ff8fb6ed0 100644
--- a/templates/CRM/Member/Form/MembershipRenewal.tpl
+++ b/templates/CRM/Member/Form/MembershipRenewal.tpl
@@ -68,7 +68,7 @@
       </tr>
       <tr class="crm-member-membershiprenew-form-block-end_date">
         <td class="label">{ts}Membership End Date{/ts}</td>
-        <td class="html-adjust">&nbsp;{$endDate}</td>
+        <td class="html-adjust">&nbsp;{$endDate|crmDate}</td>
       </tr>
       <tr class="crm-member-membershiprenew-form-block-renewal_date">
         <td class="label">{$form.renewal_date.label}</td>

From 68dea53c68520ab041e8210cd3a879bb141a83f7 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 27 Sep 2020 13:32:49 +1300
Subject: [PATCH 765/834] [REF] Remove some unused params, move one to where it
 is used

---
 CRM/Member/Form/MembershipRenewal.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index 99d67548e2df..47b32fe5c906 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -78,13 +78,6 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
    */
   public $_context;
 
-  /**
-   * End date of renewed membership.
-   *
-   * @var string
-   */
-  protected $endDate = NULL;
-
   /**
    * Has an email been sent.
    *
@@ -572,9 +565,6 @@ protected function submit() {
 
     $renewalDate = !empty($this->_params['renewal_date']) ? $renewalDate = $this->_params['renewal_date'] : NULL;
 
-    // check for test membership.
-    $isTestMembership = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $this->_membershipId, 'is_test');
-
     // chk for renewal for multiple terms CRM-8750
     $numRenewTerms = 1;
     if (is_numeric(CRM_Utils_Array::value('num_terms', $this->_params))) {
@@ -603,14 +593,11 @@ protected function submit() {
     }
     $membership = $this->processMembership($membershipParams, $renewalDate, $numRenewTerms, $pending);
 
-    $this->endDate = CRM_Utils_Date::processDate($membership->end_date);
-
-    $this->membershipTypeName = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType', $membership->membership_type_id,
-      'name');
-
     if (!empty($this->_params['record_contribution']) || $this->_mode) {
       // set the source
       [$userName] = CRM_Contact_BAO_Contact_Location::getEmailDetails(CRM_Core_Session::singleton()->get('userID'));
+      $this->membershipTypeName = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_MembershipType', $membership->membership_type_id,
+        'name');
       $this->_params['contribution_source'] = "{$this->membershipTypeName} Membership: Offline membership renewal (by {$userName})";
 
       //create line items

From 8c1ed7f8b474ca881a357970e38ce22c3740a7fe Mon Sep 17 00:00:00 2001
From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Sat, 26 Sep 2020 19:40:26 +0100
Subject: [PATCH 766/834] Simplify call to loadRelationObjects in
 repeat/completetransaction

---
 api/v3/Contribution.php | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
index 26ac4fa58f4e..7a4da8e57ac9 100644
--- a/api/v3/Contribution.php
+++ b/api/v3/Contribution.php
@@ -471,23 +471,15 @@ function _civicrm_api3_contribution_sendconfirmation_spec(&$params) {
  * @throws \Exception
  */
 function civicrm_api3_contribution_completetransaction($params) {
-  $input = $ids = [];
-
   $contribution = new CRM_Contribute_BAO_Contribution();
   $contribution->id = $params['id'];
   if (!$contribution->find(TRUE)) {
     throw new API_Exception('A valid contribution ID is required', 'invalid_data');
   }
-
-  if (isset($params['payment_processor_id'])) {
-    $input['payment_processor_id'] = $params['payment_processor_id'];
-  }
-  if (!$contribution->loadRelatedObjects($input, $ids, TRUE)) {
-    throw new API_Exception('failed to load related objects');
-  }
-  elseif ($contribution->contribution_status_id == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')) {
+  if ($contribution->contribution_status_id == CRM_Core_PseudoConstant::getKey('CRM_Contribute_BAO_Contribution', 'contribution_status_id', 'Completed')) {
     throw new API_Exception(ts('Contribution already completed'), 'contribution_completed');
   }
+
   $params['trxn_id'] = $params['trxn_id'] ?? $contribution->trxn_id;
 
   $passThroughParams = [
@@ -497,6 +489,11 @@ function civicrm_api3_contribution_completetransaction($params) {
   ];
   $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 
+  $ids = [];
+  if (!$contribution->loadRelatedObjects(['payment_processor_id' => $input['payment_processor_id'] ?? NULL], $ids, TRUE)) {
+    throw new API_Exception('failed to load related objects');
+  }
+
   return _ipn_process_transaction($params, $contribution, $input, $ids);
 }
 
@@ -580,7 +577,6 @@ function _civicrm_api3_contribution_completetransaction_spec(&$params) {
  * @throws API_Exception
  */
 function civicrm_api3_contribution_repeattransaction($params) {
-  $input = $ids = [];
   civicrm_api3_verify_one_mandatory($params, NULL, ['contribution_recur_id', 'original_contribution_id']);
   if (empty($params['original_contribution_id'])) {
     //  CRM-19873 call with test mode.
@@ -606,18 +602,11 @@ function civicrm_api3_contribution_repeattransaction($params) {
     );
   }
 
-  $input['payment_processor_id'] = $params['payment_processor_id'] = civicrm_api3('contributionRecur', 'getvalue', [
+  $params['payment_processor_id'] = civicrm_api3('contributionRecur', 'getvalue', [
     'return' => 'payment_processor_id',
     'id' => $contribution->contribution_recur_id,
   ]);
 
-  if (!$contribution->loadRelatedObjects($input, $ids, TRUE)) {
-    throw new API_Exception('failed to load related objects');
-  }
-
-  unset($contribution->id, $contribution->receive_date, $contribution->invoice_id);
-  $contribution->receive_date = $params['receive_date'];
-
   $passThroughParams = [
     'trxn_id',
     'total_amount',
@@ -630,6 +619,13 @@ function civicrm_api3_contribution_repeattransaction($params) {
   ];
   $input = array_intersect_key($params, array_fill_keys($passThroughParams, NULL));
 
+  $ids = [];
+  if (!$contribution->loadRelatedObjects(['payment_processor_id' => $input['payment_processor_id']], $ids, TRUE)) {
+    throw new API_Exception('failed to load related objects');
+  }
+  unset($contribution->id, $contribution->receive_date, $contribution->invoice_id);
+  $contribution->receive_date = $params['receive_date'];
+
   return _ipn_process_transaction($params, $contribution, $input, $ids);
 }
 

From 249b6cdb9271011d6d5ff7941ac6aa473c292071 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Mon, 28 Sep 2020 15:25:53 -0400
Subject: [PATCH 767/834] missing id

---
 tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php b/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
index 89354b9783ce..13a25d78cc12 100644
--- a/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
+++ b/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
@@ -163,7 +163,7 @@ public function setUpMailing() {
       'api.GroupContact.create' => [
         'contact_id' => $this->contactID,
       ],
-    ]);
+    ])['id'];
     $this->createMailing(['scheduled_date' => 'now', 'groups' => ['include' => [$groupID]]]);
     $this->callAPISuccess('job', 'process_mailing', []);
     $this->eventQueue = $this->callAPISuccess('MailingEventQueue', 'get', ['api.MailingEventQueue.create' => ['hash' => 'aaaaaaaaaaaaaaaa']]);

From 7d198b2dbc060b889500a81d23d9bd9fee2bd1a3 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@symbiotic.coop>
Date: Wed, 23 Sep 2020 16:07:39 -0400
Subject: [PATCH 768/834] dev/core#2061 PCP: call the hook_civicrm_links hook
 for PCP page user actions

---
 CRM/PCP/BAO/PCP.php                   | 17 ++++++----
 CRM/PCP/Page/PCPInfo.php              |  2 +-
 tests/phpunit/CRM/PCP/BAO/PCPTest.php | 46 +++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/CRM/PCP/BAO/PCP.php b/CRM/PCP/BAO/PCP.php
index e71609eccd31..6fdd36d02753 100644
--- a/CRM/PCP/BAO/PCP.php
+++ b/CRM/PCP/BAO/PCP.php
@@ -88,8 +88,6 @@ public static function displayName($id) {
    *   array of Pcp if found
    */
   public static function getPcpDashboardInfo($contactId) {
-    $links = self::pcpLinks();
-
     $query = '
 SELECT pcp.*, block.is_tellfriend_enabled FROM civicrm_pcp pcp
 LEFT JOIN civicrm_pcp_block block ON block.id = pcp.pcp_block_id
@@ -98,13 +96,13 @@ public static function getPcpDashboardInfo($contactId) {
 ORDER BY page_type, page_id';
 
     $params = [1 => [$contactId, 'Integer']];
-
     $pcpInfoDao = CRM_Core_DAO::executeQuery($query, $params);
-    $pcpInfo = [];
-    $hide = $mask = array_sum(array_keys($links['all']));
-    $contactPCPPages = [];
 
+    $links = self::pcpLinks();
+    $hide = $mask = array_sum(array_keys($links['all']));
     $approved = CRM_Core_PseudoConstant::getKey('CRM_PCP_BAO_PCP', 'status_id', 'Approved');
+    $contactPCPPages = [];
+    $pcpInfo = [];
 
     while ($pcpInfoDao->fetch()) {
       $mask = $hide;
@@ -264,10 +262,13 @@ public static function honorRoll($pcpId) {
   /**
    * Get action links.
    *
+   * @param int $pcpId
+   *   Contains the pcp ID. Defaults to NULL for backwards compatibility.
+   *
    * @return array
    *   (reference) of action links
    */
-  public static function &pcpLinks() {
+  public static function &pcpLinks($pcpId = NULL) {
     if (!(self::$_pcpLinks)) {
       $deleteExtra = ts('Are you sure you want to delete this Personal Campaign Page?') . '\n' . ts('This action cannot be undone.');
 
@@ -326,6 +327,8 @@ public static function &pcpLinks() {
           'title' => ts('Delete'),
         ],
       ];
+
+      CRM_Utils_Hook::links('pcp.user.actions', 'Pcp', $pcpId, self::$_pcpLinks);
     }
     return self::$_pcpLinks;
   }
diff --git a/CRM/PCP/Page/PCPInfo.php b/CRM/PCP/Page/PCPInfo.php
index 437ef4d968e9..38140ba235b1 100644
--- a/CRM/PCP/Page/PCPInfo.php
+++ b/CRM/PCP/Page/PCPInfo.php
@@ -141,7 +141,7 @@ public function run() {
 
       $this->assign('owner', $owner);
 
-      $link = CRM_PCP_BAO_PCP::pcpLinks();
+      $link = CRM_PCP_BAO_PCP::pcpLinks($pcpInfo['id']);
 
       $hints = [
         CRM_Core_Action::UPDATE => ts('Change the content and appearance of your page'),
diff --git a/tests/phpunit/CRM/PCP/BAO/PCPTest.php b/tests/phpunit/CRM/PCP/BAO/PCPTest.php
index d03f933036dc..adfe01f2bae4 100644
--- a/tests/phpunit/CRM/PCP/BAO/PCPTest.php
+++ b/tests/phpunit/CRM/PCP/BAO/PCPTest.php
@@ -123,6 +123,52 @@ public function testGetPcpDashboardInfo() {
     ], CRM_PCP_BAO_PCP::getPcpDashboardInfo($contactID));
   }
 
+  /**
+   * Test that hook_civicrm_links is called.
+   */
+  public function testPcpInfoLinksHook() {
+    Civi::dispatcher()->addListener('hook_civicrm_links', [$this, 'hookLinks']);
+
+    // Reset the cache otherwise our hook will not be called
+    CRM_PCP_BAO_PCP::$_pcpLinks = NULL;
+
+    $block = CRM_PCP_BAO_PCPBlock::create($this->pcpBlockParams());
+    $contactID = $this->individualCreate();
+    $contributionPage = $this->callAPISuccessGetSingle('ContributionPage', []);
+    $pcp = $this->callAPISuccess('Pcp', 'create', ['contact_id' => $contactID, 'title' => 'pcp', 'page_id' => $contributionPage['id'], 'pcp_block_id' => $block->id, 'is_active' => TRUE, 'status_id' => 'Approved']);
+
+    $links = CRM_PCP_BAO_PCP::pcplinks($pcp['id']);
+
+    foreach ($links['all'] as $link) {
+      if ($link['name'] == 'URL for this Page') {
+        $found = TRUE;
+        $this->assertEquals($link['url'], 'https://civicrm.org/mih');
+      }
+    }
+
+    $this->assertEquals($found, TRUE);
+  }
+
+  /**
+   * This is the listener for hook_civicrm_links
+   *
+   * Replaces the "URL for this Page" link by a hardcoded link.
+   * This is the listener for hook_civicrm_alterReportVar
+   *
+   * @param \Civi\Core\Event\GenericHookEvent $e
+   *   Should contain 'op', 'links', and other members corresponding
+   *   to the hook parameters.
+   */
+  public function hookLinks(\Civi\Core\Event\GenericHookEvent $e) {
+    if ($e->op == 'pcp.user.actions') {
+      foreach ($e->links['all'] as $key => &$link) {
+        if ($link['name'] == 'URL for this Page') {
+          $e->links['all'][$key]['url'] = 'https://civicrm.org/mih';
+        }
+      }
+    }
+  }
+
   /**
    * Test that CRM_Contribute_BAO_Contribution::_gatherMessageValues() works
    * with PCP.

From 5e9334ea7329adde76dabc7ac2c01a5f42142622 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 29 Sep 2020 06:15:09 +1000
Subject: [PATCH 769/834] dev/core#2035 Add in upgrade step to fix the template
 copy on current installs

---
 CRM/Upgrade/Incremental/MessageTemplates.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CRM/Upgrade/Incremental/MessageTemplates.php b/CRM/Upgrade/Incremental/MessageTemplates.php
index 94f932a96e50..0fc233bb2b23 100644
--- a/CRM/Upgrade/Incremental/MessageTemplates.php
+++ b/CRM/Upgrade/Incremental/MessageTemplates.php
@@ -225,7 +225,13 @@ protected function getTemplateUpdates() {
           ['name' => 'event_online_receipt', 'type' => 'text'],
         ],
       ],
-
+      [
+        'version' => '5.30.beta1',
+        'upgrade_descriptor' => ts('Ensure that amount paid is shown even when fully paid'),
+        'templates' => [
+          ['name' => 'contribution_invoice_receipt', 'type' => 'html'],
+        ],
+      ],
     ];
   }
 

From 9b344b95d9c89c7dccdb2628da037e1b7a2a8cf6 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 29 Sep 2020 10:14:59 +1300
Subject: [PATCH 770/834] [REF] Parse ids before sending to single function
 (minor simplification)

Overview
----------------------------------------
Minor simplification - parse ids into valid format & pass them into single, rather than passing them in wrong & 'asking' singleto parse them

Before
----------------------------------------
parsing of ids into usable array done at the last minute, other values passes around unnecessarily

After
----------------------------------------
parsing done close to the point where they are derived

Technical Details
----------------------------------------

Comments
----------------------------------------
---
 CRM/Core/Payment/PayPalIPN.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/Payment/PayPalIPN.php b/CRM/Core/Payment/PayPalIPN.php
index 2a3616fce072..c9e35fae4297 100644
--- a/CRM/Core/Payment/PayPalIPN.php
+++ b/CRM/Core/Payment/PayPalIPN.php
@@ -206,7 +206,11 @@ public function recur($input, $ids, $objects, $first) {
       return;
     }
 
-    $this->single($input, $ids, $objects, TRUE);
+    $this->single($input, [
+      'related_contact' => $ids['related_contact'] ?? NULL,
+      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+      'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+    ], $objects, TRUE);
   }
 
   /**
@@ -248,11 +252,7 @@ public function single($input, $ids, $objects, $recur = FALSE) {
       return;
     }
 
-    CRM_Contribute_BAO_Contribution::completeOrder($input, [
-      'related_contact' => $ids['related_contact'] ?? NULL,
-      'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
-      'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
-    ], $objects);
+    CRM_Contribute_BAO_Contribution::completeOrder($input, $ids, $objects);
   }
 
   /**
@@ -359,7 +359,11 @@ public function main() {
         Civi::log()->debug('Returning since contribution status is not handled');
         return;
       }
-      $this->single($input, $ids, $objects);
+      $this->single($input, [
+        'related_contact' => $ids['related_contact'] ?? NULL,
+        'participant' => !empty($objects['participant']) ? $objects['participant']->id : NULL,
+        'contributionRecur' => !empty($objects['contributionRecur']) ? $objects['contributionRecur']->id : NULL,
+      ], $objects);
     }
     catch (CRM_Core_Exception $e) {
       Civi::log()->debug($e->getMessage());

From 708fb7a27105c19d3623f8b8b8c3929fbcd3d4c5 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 29 Sep 2020 17:03:48 +1300
Subject: [PATCH 771/834] dev/core#2073 just tweak a memory leak

This one is like https://github.com/civicrm/civicrm-core/pull/18632 but only
seems to have switched us from an xml leakage to a string leakage - it still
seems slightly better from a code quality point of view
---
 CRM/Core/CodeGen/Main.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/CodeGen/Main.php b/CRM/Core/CodeGen/Main.php
index 1b754b959fb4..d10810225961 100644
--- a/CRM/Core/CodeGen/Main.php
+++ b/CRM/Core/CodeGen/Main.php
@@ -5,6 +5,10 @@
  */
 class CRM_Core_CodeGen_Main {
   public $buildVersion;
+
+  /**
+   * @var string
+   */
   public $db_version;
   /**
    * drupal, joomla, wordpress
@@ -76,11 +80,11 @@ public function __construct($CoreDAOCodePath, $sqlCodePath, $phpCodePath, $tplCo
 
     $versionFile = $this->phpCodePath . "/xml/version.xml";
     $versionXML = CRM_Core_CodeGen_Util_Xml::parse($versionFile);
-    $this->db_version = $versionXML->version_no;
+    $this->db_version = (string) $versionXML->version_no;
     $this->buildVersion = preg_replace('/^(\d{1,2}\.\d{1,2})\.(\d{1,2}|\w{4,7})$/i', '$1', $this->db_version);
     if (isset($argVersion)) {
       // change the version to that explicitly passed, if any
-      $this->db_version = $argVersion;
+      $this->db_version = (string) $argVersion;
     }
 
     $this->schemaPath = $schemaPath;

From d4d66593f63ff9785f2ab622f32ce48ea623b44a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 29 Sep 2020 16:33:31 +1300
Subject: [PATCH 772/834] dev/core#2073 Memory leak fix

---
 tests/phpunit/CRM/Contact/SelectorTest.php  |  8 +--
 tests/phpunit/CiviTest/CiviUnitTestCase.php |  2 +-
 tests/phpunit/api/v3/AddressTest.php        | 20 ++++----
 tests/phpunit/api/v3/EmailTest.php          | 54 ++++++++++-----------
 tests/phpunit/api/v3/PhoneTest.php          |  3 +-
 5 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/tests/phpunit/CRM/Contact/SelectorTest.php b/tests/phpunit/CRM/Contact/SelectorTest.php
index bb103b9c123c..6129ee5ec08a 100644
--- a/tests/phpunit/CRM/Contact/SelectorTest.php
+++ b/tests/phpunit/CRM/Contact/SelectorTest.php
@@ -453,7 +453,7 @@ public function testContactIDQuery() {
    */
   public function testSelectorQueryOnNonASCIIlocationType() {
     $contactID = $this->individualCreate();
-    $locationType = $this->locationTypeCreate([
+    $locationTypeID = $this->locationTypeCreate([
       'name' => 'Non ASCII Location Type',
       'display_name' => 'Дом Location type',
       'vcard_name' => 'Non ASCII Location Type',
@@ -461,7 +461,7 @@ public function testSelectorQueryOnNonASCIIlocationType() {
     ]);
     $this->callAPISuccess('Email', 'create', [
       'contact_id' => $contactID,
-      'location_type_id' => $locationType->id,
+      'location_type_id' => $locationTypeID,
       'email' => 'test@test.com',
     ]);
 
@@ -470,7 +470,7 @@ public function testSelectorQueryOnNonASCIIlocationType() {
       ['email' => ['IS NOT NULL' => 1]],
       [
         [
-          0 => 'email-' . $locationType->id,
+          0 => 'email-' . $locationTypeID,
           1 => 'IS NOT NULL',
           2 => NULL,
           3 => 1,
@@ -483,7 +483,7 @@ public function testSelectorQueryOnNonASCIIlocationType() {
         'sort_name' => 1,
         'location' => [
           'Non ASCII Location Type' => [
-            'location_type' => $locationType->id,
+            'location_type' => $locationTypeID,
             'email' => 1,
           ],
         ],
diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php
index 434cdaade827..a46ecbc21eee 100644
--- a/tests/phpunit/CiviTest/CiviUnitTestCase.php
+++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php
@@ -1230,7 +1230,7 @@ public function locationTypeCreate($params = NULL) {
     // clear getfields cache
     CRM_Core_PseudoConstant::flush();
     $this->callAPISuccess('phone', 'getfields', ['version' => 3, 'cache_clear' => 1]);
-    return $locationType;
+    return $locationType->id;
   }
 
   /**
diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php
index 400dacabb48a..5e5e89c61af5 100644
--- a/tests/phpunit/api/v3/AddressTest.php
+++ b/tests/phpunit/api/v3/AddressTest.php
@@ -22,7 +22,7 @@
  */
 class api_v3_AddressTest extends CiviUnitTestCase {
   protected $_contactID;
-  protected $_locationType;
+  protected $_locationTypeID;
   protected $_params;
 
   protected $_entity;
@@ -32,12 +32,12 @@ public function setUp() {
     parent::setUp();
 
     $this->_contactID = $this->organizationCreate();
-    $this->_locationType = $this->locationTypeCreate();
+    $this->_locationTypeID = $this->locationTypeCreate();
     CRM_Core_PseudoConstant::flush();
 
     $this->_params = [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
       'street_name' => 'Ambachtstraat',
       'street_number' => '23',
       'street_address' => 'Ambachtstraat 23',
@@ -49,7 +49,7 @@ public function setUp() {
   }
 
   public function tearDown() {
-    $this->locationTypeDelete($this->_locationType->id);
+    $this->locationTypeDelete($this->_locationTypeID);
     $this->contactDelete($this->_contactID);
     $this->quickCleanup(['civicrm_address', 'civicrm_relationship']);
     parent::tearDown();
@@ -78,7 +78,7 @@ public function testCreateAddressParsing($version) {
     $params = [
       'street_parsing' => 1,
       'street_address' => '54A Excelsior Ave. Apt 1C',
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
       'contact_id' => $this->_contactID,
     ];
     $subfile = "AddressParse";
@@ -256,7 +256,7 @@ public function testDeleteAddress($version) {
     $this->_apiversion = $version;
     //check there are no address to start with
     $get = $this->callAPISuccess('address', 'get', [
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(0, $get['count'], 'Contact already exists ');
 
@@ -266,7 +266,7 @@ public function testDeleteAddress($version) {
     $result = $this->callAPIAndDocument('address', 'delete', ['id' => $create['id']], __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $get = $this->callAPISuccess('address', 'get', [
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(0, $get['count'], 'Contact not successfully deleted In line ' . __LINE__);
   }
@@ -434,7 +434,7 @@ public function testCreateAddressPrimaryHandlingChangeExisting($version) {
   public function testCreateDuplicateLocationTypes() {
     $address1 = $this->callAPISuccess('address', 'create', $this->_params);
     $address2 = $this->callAPISuccess('address', 'create', [
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
       'street_address' => '1600 Pensilvania Avenue',
       'city' => 'Washington DC',
       'is_primary' => 0,
@@ -443,7 +443,7 @@ public function testCreateDuplicateLocationTypes() {
     ]);
     $check = $this->callAPISuccess('address', 'getcount', [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(2, $check);
     $this->callAPISuccess('address', 'delete', ['id' => $address1['id']]);
@@ -454,7 +454,7 @@ public function testGetWithJoin() {
     $cid = $this->individualCreate([
       'api.Address.create' => [
         'street_address' => __FUNCTION__,
-        'location_type_id' => $this->_locationType->id,
+        'location_type_id' => $this->_locationTypeID,
       ],
     ]);
     $result = $this->callAPISuccess('address', 'getsingle', [
diff --git a/tests/phpunit/api/v3/EmailTest.php b/tests/phpunit/api/v3/EmailTest.php
index a54183e71c6f..1de8dbf9fdc2 100644
--- a/tests/phpunit/api/v3/EmailTest.php
+++ b/tests/phpunit/api/v3/EmailTest.php
@@ -16,8 +16,8 @@
  */
 class api_v3_EmailTest extends CiviUnitTestCase {
   protected $_contactID;
-  protected $_locationType;
-  protected $locationType2;
+  protected $_locationTypeID;
+  protected $locationType2ID;
   protected $_entity;
   protected $_params;
 
@@ -27,8 +27,8 @@ public function setUp() {
     $this->useTransaction(TRUE);
 
     $this->_contactID = $this->organizationCreate(NULL);
-    $this->_locationType = $this->locationTypeCreate(NULL);
-    $this->locationType2 = $this->locationTypeCreate([
+    $this->_locationTypeID = $this->locationTypeCreate();
+    $this->locationType2ID = $this->locationTypeCreate([
       'name' => 'New Location Type 2',
       'vcard_name' => 'New Location Type 2',
       'description' => 'Another Location Type',
@@ -36,7 +36,7 @@ public function setUp() {
     ]);
     $this->_params = [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
       'email' => 'api@a-team.com',
       'is_primary' => 1,
 
@@ -57,7 +57,7 @@ public function testCreateEmail($version) {
     $params = $this->_params;
     //check there are no emails to start with
     $get = $this->callAPISuccess('email', 'get', [
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(0, $get['count'], 'Contact not successfully deleted.');
 
@@ -167,7 +167,7 @@ public function testDeleteEmail($version) {
     $this->_apiversion = $version;
     $params = [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
       'email' => 'api@a-team.com',
       'is_primary' => 1,
 
@@ -175,7 +175,7 @@ public function testDeleteEmail($version) {
     ];
     //check there are no emails to start with
     $get = $this->callAPISuccess('email', 'get', [
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(0, $get['count'], 'email already exists');
 
@@ -185,7 +185,7 @@ public function testDeleteEmail($version) {
     $result = $this->callAPIAndDocument('email', 'delete', ['id' => $create['id']], __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $get = $this->callAPISuccess('email', 'get', [
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(0, $get['count'], 'Contact not successfully deleted');
   }
@@ -209,27 +209,27 @@ public function testReplaceEmail($version) {
       'contact_id' => $this->_contactID,
       'values' => [
         [
-          'location_type_id' => $this->_locationType->id,
+          'location_type_id' => $this->_locationTypeID,
           'email' => '1-1@example.com',
           'is_primary' => 1,
         ],
         [
-          'location_type_id' => $this->_locationType->id,
+          'location_type_id' => $this->_locationTypeID,
           'email' => '1-2@example.com',
           'is_primary' => 0,
         ],
         [
-          'location_type_id' => $this->_locationType->id,
+          'location_type_id' => $this->_locationTypeID,
           'email' => '1-3@example.com',
           'is_primary' => 0,
         ],
         [
-          'location_type_id' => $this->locationType2->id,
+          'location_type_id' => $this->locationType2ID,
           'email' => '2-1@example.com',
           'is_primary' => 0,
         ],
         [
-          'location_type_id' => $this->locationType2->id,
+          'location_type_id' => $this->locationType2ID,
           'email' => '2-2@example.com',
           'is_primary' => 0,
         ],
@@ -247,7 +247,7 @@ public function testReplaceEmail($version) {
     // replace the subset of emails in location #1, but preserve location #2
     $replace2Params = [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
       'values' => [
         [
           'email' => '1-4@example.com',
@@ -261,14 +261,14 @@ public function testReplaceEmail($version) {
     // check emails at location #1 -- all three replaced by one
     $get = $this->callAPISuccess('email', 'get', [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
     $this->assertEquals(1, $get['count'], 'Incorrect email count');
 
     // check emails at location #2 -- preserve the original two
     $get = $this->callAPISuccess('email', 'get', [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->locationType2->id,
+      'location_type_id' => $this->locationType2ID,
     ]);
 
     $this->assertEquals(2, $get['count'], 'Incorrect email count');
@@ -314,27 +314,27 @@ public function testReplaceEmailsInChain($version) {
       'api.email.replace' => [
         'values' => [
           [
-            'location_type_id' => $this->_locationType->id,
+            'location_type_id' => $this->_locationTypeID,
             'email' => '1-1@example.com',
             'is_primary' => 1,
           ],
           [
-            'location_type_id' => $this->_locationType->id,
+            'location_type_id' => $this->_locationTypeID,
             'email' => '1-2@example.com',
             'is_primary' => 0,
           ],
           [
-            'location_type_id' => $this->_locationType->id,
+            'location_type_id' => $this->_locationTypeID,
             'email' => '1-3@example.com',
             'is_primary' => 0,
           ],
           [
-            'location_type_id' => $this->locationType2->id,
+            'location_type_id' => $this->locationType2ID,
             'email' => '2-1@example.com',
             'is_primary' => 0,
           ],
           [
-            'location_type_id' => $this->locationType2->id,
+            'location_type_id' => $this->locationType2ID,
             'email' => '2-2@example.com',
             'is_primary' => 0,
           ],
@@ -354,7 +354,7 @@ public function testReplaceEmailsInChain($version) {
     $getReplace2Params = [
       'id' => $this->_contactID,
       'api.email.replace' => [
-        'location_type_id' => $this->_locationType->id,
+        'location_type_id' => $this->_locationTypeID,
         'values' => [
           [
             'email' => '1-4@example.com',
@@ -370,7 +370,7 @@ public function testReplaceEmailsInChain($version) {
     // check emails at location #1 -- all three replaced by one
     $get = $this->callAPISuccess('email', 'get', [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
 
     $this->assertEquals(1, $get['count'], 'Incorrect email count');
@@ -378,7 +378,7 @@ public function testReplaceEmailsInChain($version) {
     // check emails at location #2 -- preserve the original two
     $get = $this->callAPISuccess('email', 'get', [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->locationType2->id,
+      'location_type_id' => $this->locationType2ID,
     ]);
     $this->assertEquals(2, $get['count'], 'Incorrect email count');
   }
@@ -402,7 +402,7 @@ public function testReplaceEmailWithId($version) {
       'contact_id' => $this->_contactID,
       'values' => [
         [
-          'location_type_id' => $this->_locationType->id,
+          'location_type_id' => $this->_locationTypeID,
           'email' => '1-1@example.com',
           'is_primary' => 1,
           'on_hold' => 1,
@@ -431,7 +431,7 @@ public function testReplaceEmailWithId($version) {
     // ensure the 'email' was updated while other fields were preserved
     $get = $this->callAPISuccess('email', 'get', [
       'contact_id' => $this->_contactID,
-      'location_type_id' => $this->_locationType->id,
+      'location_type_id' => $this->_locationTypeID,
     ]);
 
     $this->assertEquals(1, $get['count'], 'Incorrect email count at ' . __LINE__);
diff --git a/tests/phpunit/api/v3/PhoneTest.php b/tests/phpunit/api/v3/PhoneTest.php
index a051b92656d0..ea2cbc882ffc 100644
--- a/tests/phpunit/api/v3/PhoneTest.php
+++ b/tests/phpunit/api/v3/PhoneTest.php
@@ -35,8 +35,7 @@ public function setUp() {
     $this->useTransaction();
 
     $this->_contactID = $this->organizationCreate();
-    $loc = $this->locationTypeCreate();
-    $this->_locationType = $loc->id;
+    $this->_locationType = $this->locationTypeCreate();
     CRM_Core_PseudoConstant::flush();
     $this->_params = [
       'contact_id' => $this->_contactID,

From 50bdbb5ba90a1f81ceaa61bcd8f31d0ecc925fc2 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 23 Sep 2020 08:50:03 +1000
Subject: [PATCH 773/834] dev/core#1838 Ensure that no fatal error is triggered
 if you try to access a merged contact and the contact that it was merged into
 has been permanently deleted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move exception capturing into the page layer and extend unit test to cover page function

Update status message as per Mikeý's comment
---
 CRM/Contact/Page/View.php            |  8 +++++++-
 tests/phpunit/api/v3/ContactTest.php | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CRM/Contact/Page/View.php b/CRM/Contact/Page/View.php
index faeb0cb8cfcf..ce076fe83c89 100644
--- a/CRM/Contact/Page/View.php
+++ b/CRM/Contact/Page/View.php
@@ -311,7 +311,13 @@ public static function setTitle($contactId, $isDeleted = FALSE) {
     }
     if ($isDeleted) {
       $title = "<del>{$title}</del>";
-      $mergedTo = civicrm_api3('Contact', 'getmergedto', ['contact_id' => $contactId, 'api.Contact.get' => ['return' => 'display_name']]);
+      try {
+        $mergedTo = civicrm_api3('Contact', 'getmergedto', ['contact_id' => $contactId, 'api.Contact.get' => ['return' => 'display_name']]);
+      }
+      catch (CiviCRM_API3_Exception $e) {
+        CRM_Core_Session::singleton()->setStatus(ts('This contact was deleted during a merge operation. The contact it was merged into cannot be found and may have been deleted.'));
+        $mergedTo = ['count' => 0];
+      }
       if ($mergedTo['count']) {
         $mergedToContactID = $mergedTo['id'];
         $mergedToDisplayName = $mergedTo['values'][$mergedToContactID]['api.Contact.get']['values'][0]['display_name'];
diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php
index 4d99ff2562ec..df25b45c0052 100644
--- a/tests/phpunit/api/v3/ContactTest.php
+++ b/tests/phpunit/api/v3/ContactTest.php
@@ -4166,6 +4166,30 @@ public function testMergedGet() {
     $this->assertEquals($mergedContactIds, array_keys($result));
   }
 
+  /**
+   * Test retrieving merged contacts.
+   *
+   * The goal here is to start with a contact deleted by merged and find out the contact that is the current version of them.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function testMergedGetWithPermanentlyDeletedContact() {
+    $this->contactIDs[] = $this->individualCreate();
+    $this->contactIDs[] = $this->individualCreate();
+    $this->contactIDs[] = $this->individualCreate();
+    $this->contactIDs[] = $this->individualCreate();
+
+    // First do an 'unnatural merge' - they 'like to merge into the lowest but this will mean that contact 0 merged to contact [3].
+    // When the batch merge runs.... the new lowest contact is contact[1]. All contacts will merge into that contact,
+    // including contact[3], resulting in only 3 existing at the end. For each contact the correct answer to 'who did I eventually
+    // wind up being should be [1]
+    $this->callAPISuccess('Contact', 'merge', ['to_remove_id' => $this->contactIDs[0], 'to_keep_id' => $this->contactIDs[3]]);
+    $this->callAPISuccess('Contact', 'delete', ['id' => $this->contactIDs[3], 'skip_undelete' => TRUE]);
+    $this->callAPIFailure('Contact', 'getmergedto', ['sequential' => 1, 'contact_id' => $this->contactIDs[0]]);
+    $title = CRM_Contact_Page_View::setTitle($this->contactIDs[0], TRUE);
+    $this->assertContains('civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4', $title);
+  }
+
   /**
    * Test merging 2 contacts with delete to trash off.
    *

From 939f157565848c662c729404377d297eae30f28b Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Tue, 29 Sep 2020 19:03:39 -0400
Subject: [PATCH 774/834] test activity contacts as scalars

---
 .../phpunit/CRM/Activity/BAO/ActivityTest.php | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 2e2666d1f9b7..913728bc0869 100644
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -1694,6 +1694,83 @@ public function testTargetAssigneeVariations(array $do_first, array $do_second)
     }
   }
 
+  /**
+   * Same as testTargetAssigneeVariations but passes the target/assignee
+   * in as a scalar when there's only one of them.
+   *
+   * @dataProvider targetAndAssigneeProvider
+   * @param array $do_first
+   * @param array $do_second
+   */
+  public function testTargetAssigneeVariationsWithScalars(array $do_first, array $do_second) {
+    // Originally wanted to put this in setUp() but it broke other tests.
+    $this->loggedInUserId = $this->createLoggedInUser();
+    for ($i = 1; $i <= 4; $i++) {
+      $this->someContacts[$i] = $this->individualCreate([], $i - 1, TRUE);
+    }
+
+    $params = [
+      'activity_type_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_type_id', 'Meeting'),
+      'subject' => 'Test Meeting',
+      'source_contact_id' => $this->loggedInUserId,
+    ];
+
+    // Create an activity first if specified.
+    $activity = NULL;
+    if (!empty($do_first)) {
+      if (!empty($do_first['targets'])) {
+        // e.g. if it is [1], then pick $someContacts[1]. If it's [1,2], then
+        // pick $someContacts[1] and $someContacts[2].
+        $params['target_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_first['targets'])));
+        if (count($params['target_contact_id']) == 1) {
+          $params['target_contact_id'] = $params['target_contact_id'][0];
+        }
+      }
+      if (!empty($do_first['assignees'])) {
+        $params['assignee_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_first['assignees'])));
+        if (count($params['assignee_contact_id']) == 1) {
+          $params['assignee_contact_id'] = $params['assignee_contact_id'][0];
+        }
+      }
+
+      $activity = CRM_Activity_BAO_Activity::create($params);
+      $this->assertNotEmpty($activity->id);
+
+      $params['id'] = $activity->id;
+    }
+
+    // Now do the second one, which will either create or update depending what
+    // we did first.
+    $params['target_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_second['targets'])));
+    if (count($params['target_contact_id']) == 1) {
+      $params['target_contact_id'] = $params['target_contact_id'][0];
+    }
+    $params['assignee_contact_id'] = array_values(array_intersect_key($this->someContacts, array_flip($do_second['assignees'])));
+    if (count($params['assignee_contact_id']) == 1) {
+      $params['assignee_contact_id'] = $params['assignee_contact_id'][0];
+    }
+    $activity = CRM_Activity_BAO_Activity::create($params);
+
+    // Check targets
+    $queryParams = [
+      1 => [$activity->id, 'Integer'],
+      2 => [CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets'), 'Integer'],
+    ];
+    $this->assertEquals((array) $params['target_contact_id'], array_column(CRM_Core_DAO::executeQuery('SELECT contact_id FROM civicrm_activity_contact WHERE activity_id = %1 AND record_type_id = %2', $queryParams)->fetchAll(), 'contact_id'));
+
+    // Check assignees
+    $queryParams = [
+      1 => [$activity->id, 'Integer'],
+      2 => [CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Assignees'), 'Integer'],
+    ];
+    $this->assertEquals((array) $params['assignee_contact_id'], array_column(CRM_Core_DAO::executeQuery('SELECT contact_id FROM civicrm_activity_contact WHERE activity_id = %1 AND record_type_id = %2', $queryParams)->fetchAll(), 'contact_id'));
+
+    // Clean up
+    foreach ($this->someContacts as $cid) {
+      $this->callAPISuccess('Contact', 'delete', ['id' => $cid]);
+    }
+  }
+
   /**
    * Dataprovider for testTargetAssigneeVariations
    * @return array

From 114a0695ee1a34ff55caf0398b0fd2cd5d9413fe Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Tue, 29 Sep 2020 19:29:50 -0400
Subject: [PATCH 775/834] handle missing details

---
 CRM/Activity/Form/Activity.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 329e33096067..4d457aafda3a 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -503,7 +503,7 @@ public function preProcess() {
     }
 
     if ($this->_action & CRM_Core_Action::VIEW) {
-      $this->_values['details'] = CRM_Utils_String::purifyHtml($this->_values['details']);
+      $this->_values['details'] = CRM_Utils_String::purifyHtml($this->_values['details'] ?? '');
       $url = CRM_Utils_System::url(implode("/", $this->urlPath), "reset=1&id={$this->_activityId}&action=view&cid={$this->_values['source_contact_id']}");
       CRM_Utils_Recent::add(CRM_Utils_Array::value('subject', $this->_values, ts('(no subject)')),
         $url,

From 757f44229cc45da7302b561e96a71dce0a40f96d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 30 Sep 2020 13:27:20 +1300
Subject: [PATCH 776/834] [Civi\Test] Fix test output noise

Seeing this is test logs

Warning: Invalid argument supplied for foreach() in /home/jenkins/bknix-dfl/build/core-18634-8zcf7/web/sites/all/modules/civicrm/Civi/Test/Schema.php on line 29

Call Stack:
    0.0007     530944   1. {main}() /home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar:0
    0.0498    9999808   2. PHPUnit\TextUI\Command::main() /home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar:615
    0.0498   10008600   3. PHPUnit\TextUI\Command->run() phar:///home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar/phpunit/TextUI/Command.php:162
    1.1684  104654872   4. PHPUnit\TextUI\TestRunner->doRun() phar:///home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar/phpunit/TextUI/Command.php:206
    1.2327  104791840   5. PHPUnit\Framework\TestSuite->run() phar:///home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar/phpunit/TextUI/TestRunner.php:652
 3300.8182  675188928   6. PHPUnit\Framework\TestSuite->run() phar:///home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar/phpunit/Framework/TestSuite.php:746
 3300.8199  675188928   7. CiviUnitTestCase::setUpBeforeClass() phar:///home/jenkins/bknix-dfl/extern/phpunit7/phpunit7.phar/phpunit/Framework/TestSuite.php:703
 3300.8199  675188928   8. CiviUnitTestCase::_populateDB() /home/jenkins/bknix-dfl/build/core-18634-8zcf7/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:311
 3300.8199  675188928   9. Civi\Test\Data->populate() /home/jenkins/bknix-dfl/build/core-18634-8zcf7/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:305
 3300.8199  675189248  10. Civi\Test::asPreInstall() /home/jenkins/bknix-dfl/build/core-18634-8zcf7/web/sites/all/modules/civicrm/Civi/Test/Data.php:45
:
---
 Civi/Test/Schema.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Civi/Test/Schema.php b/Civi/Test/Schema.php
index adca28b1b48a..28519131896a 100644
--- a/Civi/Test/Schema.php
+++ b/Civi/Test/Schema.php
@@ -26,8 +26,10 @@ public function getTables($type) {
     );
     $tables = $pdo->query($query);
     $result = [];
-    foreach ($tables as $table) {
-      $result[] = $table['TABLE_NAME'] ?? $table['table_name'];
+    if (!empty($tables)) {
+      foreach ($tables as $table) {
+        $result[] = $table['TABLE_NAME'] ?? $table['table_name'];
+      }
     }
     return $result;
   }

From 3e8437f31f2540031b8e6bbb954434c66cd17de9 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 30 Sep 2020 18:44:19 +1300
Subject: [PATCH 777/834] dev/core#2073 Fix a real live leak

I used the same methods I had been playing with on the test class on a contribution
import script and found that the object that was increasing in memory in tandem with
me increasing iterations was an instance of DB_result

I tracked it down to here. In essence our main DAO functions clean up after themselves - e.g
when the DAO is destructed it cleans up the globals it has created.

However, this older ->query() function does not do that and each time is is called increases it's memory hold.

It's also worth better caching in this function...
---
 CRM/ACL/BAO/ACL.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index 873e6d55b7a7..583b3dc0ce5c 100644
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -204,8 +204,6 @@ protected static function getGroupACLs($contact_id, $aclRoles = FALSE) {
   protected static function getGroupACLRoles($contact_id) {
     $contact_id = CRM_Utils_Type::escape($contact_id, 'Integer');
 
-    $rule = new CRM_ACL_BAO_ACL();
-
     $query = "   SELECT          acl.*
                         FROM            civicrm_acl acl
                         INNER JOIN      civicrm_option_group og
@@ -228,7 +226,7 @@ protected static function getGroupACLRoles($contact_id) {
 
     $results = [];
 
-    $rule->query($query);
+    $rule = CRM_Core_DAO::executeQuery($query);
 
     while ($rule->fetch()) {
       $results[$rule->id] = $rule->toArray();
@@ -249,7 +247,7 @@ protected static function getGroupACLRoles($contact_id) {
    AND acl.entity_table   = 'civicrm_acl_role'
 ";
 
-    $rule->query($query);
+    $rule = CRM_Core_DAO::executeQuery($query);
     while ($rule->fetch()) {
       $results[$rule->id] = $rule->toArray();
     }

From 35fd9d21457113beb75e2e27b82f8749717c3d64 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 26 Sep 2020 07:05:06 +1000
Subject: [PATCH 778/834] [REF] Add in frontend fields for title and
 description of group Schema only change

Add in upgrade step to expand title column to be 255 as well

Update langauge as per Artfulrobot and require group title field
---
 CRM/Contact/BAO/Group.php                     |   2 +-
 CRM/Contact/DAO/Group.php                     |  57 +-
 CRM/Core/I18n/SchemaStructure.php             |  13 +-
 CRM/Core/I18n/SchemaStructure_5_31_alpha1.php | 722 ++++++++++++++++++
 CRM/Upgrade/Incremental/Base.php              |   5 +-
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php |  27 +
 .../phpunit/api/v3/dataset/uf_group_test.xml  |   1 +
 xml/schema/Contact/Group.xml                  |  30 +-
 8 files changed, 849 insertions(+), 8 deletions(-)
 create mode 100644 CRM/Core/I18n/SchemaStructure_5_31_alpha1.php

diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
index ab328527e0bb..4679168a39d5 100644
--- a/CRM/Contact/BAO/Group.php
+++ b/CRM/Contact/BAO/Group.php
@@ -1337,7 +1337,7 @@ protected function assignTestValue($fieldName, &$fieldDef, $counter) {
       $this->{$fieldName} = "NULL";
     }
     else {
-      parent::assignTestValues($fieldName, $fieldDef, $counter);
+      parent::assignTestValue($fieldName, $fieldDef, $counter);
     }
   }
 
diff --git a/CRM/Contact/DAO/Group.php b/CRM/Contact/DAO/Group.php
index 81f335ad6022..c6428e5b0ef4 100644
--- a/CRM/Contact/DAO/Group.php
+++ b/CRM/Contact/DAO/Group.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/Group.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9d3fc8fbc20e3b8068d5989828341c66)
+ * (GenCodeChecksum:25bcea958ed3b88317a2bbb89169b0a6)
  */
 
 /**
@@ -175,6 +175,20 @@ class CRM_Contact_DAO_Group extends CRM_Core_DAO {
    */
   public $modified_id;
 
+  /**
+   * Alternative public title for this Group.
+   *
+   * @var string
+   */
+  public $frontend_title;
+
+  /**
+   * Alternative public description of the group.
+   *
+   * @var text
+   */
+  public $frontend_description;
+
   /**
    * Class constructor.
    */
@@ -250,8 +264,9 @@ public static function &fields() {
           'type' => CRM_Utils_Type::T_STRING,
           'title' => ts('Group Title'),
           'description' => ts('Name of Group.'),
-          'maxlength' => 64,
-          'size' => CRM_Utils_Type::BIG,
+          'required' => TRUE,
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
           'where' => 'civicrm_group.title',
           'table_name' => 'civicrm_group',
           'entity' => 'Group',
@@ -501,6 +516,42 @@ public static function &fields() {
           'FKClassName' => 'CRM_Contact_DAO_Contact',
           'add' => '4.5',
         ],
+        'frontend_title' => [
+          'name' => 'frontend_title',
+          'type' => CRM_Utils_Type::T_STRING,
+          'title' => ts('Public Group Title'),
+          'description' => ts('Alternative public title for this Group.'),
+          'maxlength' => 255,
+          'size' => CRM_Utils_Type::HUGE,
+          'where' => 'civicrm_group.frontend_title',
+          'default' => 'NULL',
+          'table_name' => 'civicrm_group',
+          'entity' => 'Group',
+          'bao' => 'CRM_Contact_BAO_Group',
+          'localizable' => 1,
+          'html' => [
+            'type' => 'Text',
+          ],
+          'add' => '5.31',
+        ],
+        'frontend_description' => [
+          'name' => 'frontend_description',
+          'type' => CRM_Utils_Type::T_TEXT,
+          'title' => ts('Public Group Description'),
+          'description' => ts('Alternative public description of the group.'),
+          'rows' => 2,
+          'cols' => 60,
+          'where' => 'civicrm_group.frontend_description',
+          'default' => 'NULL',
+          'table_name' => 'civicrm_group',
+          'entity' => 'Group',
+          'bao' => 'CRM_Contact_BAO_Group',
+          'localizable' => 1,
+          'html' => [
+            'type' => 'TextArea',
+          ],
+          'add' => '5.31',
+        ],
       ];
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
     }
diff --git a/CRM/Core/I18n/SchemaStructure.php b/CRM/Core/I18n/SchemaStructure.php
index 02a51c9a7874..641d565d23d6 100644
--- a/CRM/Core/I18n/SchemaStructure.php
+++ b/CRM/Core/I18n/SchemaStructure.php
@@ -92,7 +92,9 @@ public static function &columns() {
           'description' => "text COMMENT 'Optional description.'",
         ],
         'civicrm_group' => [
-          'title' => "varchar(64) COMMENT 'Name of Group.'",
+          'title' => "varchar(255) NOT NULL COMMENT 'Name of Group.'",
+          'frontend_title' => "varchar(255) DEFAULT NULL COMMENT 'Alternative public title for this Group.'",
+          'frontend_description' => "text DEFAULT NULL COMMENT 'Alternative public description of the group.'",
         ],
         'civicrm_contribution_page' => [
           'title' => "varchar(255) COMMENT 'Contribution Page title. For top of page display'",
@@ -412,6 +414,15 @@ public static function &widgets() {
         'civicrm_group' => [
           'title' => [
             'type' => "Text",
+            'required' => "true",
+          ],
+          'frontend_title' => [
+            'type' => "Text",
+          ],
+          'frontend_description' => [
+            'type' => "TextArea",
+            'rows' => "2",
+            'cols' => "60",
           ],
         ],
         'civicrm_contribution_page' => [
diff --git a/CRM/Core/I18n/SchemaStructure_5_31_alpha1.php b/CRM/Core/I18n/SchemaStructure_5_31_alpha1.php
new file mode 100644
index 000000000000..bc9ced236d25
--- /dev/null
+++ b/CRM/Core/I18n/SchemaStructure_5_31_alpha1.php
@@ -0,0 +1,722 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ *
+ * Generated from schema_structure.tpl
+ * DO NOT EDIT.  Generated by CRM_Core_CodeGen
+ */
+class CRM_Core_I18n_SchemaStructure_5_31_alpha1 {
+
+  /**
+   * Get translatable columns.
+   *
+   * @return array
+   *   A table-indexed array of translatable columns.
+   */
+  public static function &columns() {
+    static $result = NULL;
+    if (!$result) {
+      $result = [
+        'civicrm_location_type' => [
+          'display_name' => "varchar(64) COMMENT 'Location Type Display Name.'",
+        ],
+        'civicrm_option_group' => [
+          'title' => "varchar(255) COMMENT 'Option Group title.'",
+          'description' => "varchar(255) COMMENT 'Option group description.'",
+        ],
+        'civicrm_relationship_type' => [
+          'label_a_b' => "varchar(64) COMMENT 'label for relationship of contact_a to contact_b.'",
+          'label_b_a' => "varchar(64) COMMENT 'Optional label for relationship of contact_b to contact_a.'",
+          'description' => "varchar(255) COMMENT 'Optional verbose description of the relationship type.'",
+        ],
+        'civicrm_contact_type' => [
+          'label' => "varchar(64) COMMENT 'localized Name of Contact Type.'",
+          'description' => "text COMMENT 'localized Optional verbose description of the type.'",
+        ],
+        'civicrm_batch' => [
+          'title' => "varchar(255) COMMENT 'Friendly Name.'",
+          'description' => "text COMMENT 'Description of this batch set.'",
+        ],
+        'civicrm_premiums' => [
+          'premiums_intro_title' => "varchar(255) COMMENT 'Title for Premiums section.'",
+          'premiums_intro_text' => "text COMMENT 'Displayed in <div> at top of Premiums section of page. Text and HTML allowed.'",
+          'premiums_nothankyou_label' => "varchar(255) COMMENT 'Label displayed for No Thank-you option in premiums block (e.g. No thank you)'",
+        ],
+        'civicrm_membership_status' => [
+          'label' => "varchar(128) COMMENT 'Label for Membership Status'",
+        ],
+        'civicrm_survey' => [
+          'title' => "varchar(255) NOT NULL COMMENT 'Title of the Survey.'",
+          'instructions' => "text COMMENT 'Script instructions for volunteers to use for the survey.'",
+          'thankyou_title' => "varchar(255) COMMENT 'Title for Thank-you page (header title tag, and display at the top of the page).'",
+          'thankyou_text' => "text COMMENT 'text and html allowed. displayed above result on success page'",
+        ],
+        'civicrm_participant_status_type' => [
+          'label' => "varchar(255) COMMENT 'localized label for display of this status type'",
+        ],
+        'civicrm_case_type' => [
+          'title' => "varchar(64) NOT NULL COMMENT 'Natural language name for Case Type'",
+          'description' => "varchar(255) COMMENT 'Description of the Case Type'",
+        ],
+        'civicrm_tell_friend' => [
+          'title' => "varchar(255)",
+          'intro' => "text COMMENT 'Introductory message to contributor or participant displayed on the Tell a Friend form.'",
+          'suggested_message' => "text COMMENT 'Suggested message to friends, provided as default on the Tell A Friend form.'",
+          'thankyou_title' => "varchar(255) COMMENT 'Text for Tell a Friend thank you page header and HTML title.'",
+          'thankyou_text' => "text COMMENT 'Thank you message displayed on success page.'",
+        ],
+        'civicrm_custom_group' => [
+          'title' => "varchar(64) NOT NULL COMMENT 'Friendly Name.'",
+          'help_pre' => "text COMMENT 'Description and/or help text to display before fields in form.'",
+          'help_post' => "text COMMENT 'Description and/or help text to display after fields in form.'",
+        ],
+        'civicrm_custom_field' => [
+          'label' => "varchar(255) NOT NULL COMMENT 'Text for form field label (also friendly name for administering this custom property).'",
+          'help_pre' => "text COMMENT 'Description and/or help text to display before this field.'",
+          'help_post' => "text COMMENT 'Description and/or help text to display after this field.'",
+        ],
+        'civicrm_option_value' => [
+          'label' => "varchar(512) NOT NULL COMMENT 'Option string as displayed to users - e.g. the label in an HTML OPTION tag.'",
+          'description' => "text COMMENT 'Optional description.'",
+        ],
+        'civicrm_group' => [
+          'title' => "varchar(255) NOT NULL COMMENT 'Name of Group.'",
+          'frontend_title' => "varchar(255) DEFAULT NULL COMMENT 'Alternative public title for this Group.'",
+          'frontend_description' => "text DEFAULT NULL COMMENT 'Alternative public description of the group.'",
+        ],
+        'civicrm_contribution_page' => [
+          'title' => "varchar(255) COMMENT 'Contribution Page title. For top of page display'",
+          'intro_text' => "text COMMENT 'Text and html allowed. Displayed below title.'",
+          'pay_later_text' => "text COMMENT 'The text displayed to the user in the main form'",
+          'pay_later_receipt' => "text COMMENT 'The receipt sent to the user instead of the normal receipt text'",
+          'initial_amount_label' => "varchar(255) COMMENT 'Initial amount label for partial payment'",
+          'initial_amount_help_text' => "text COMMENT 'Initial amount help text for partial payment'",
+          'thankyou_title' => "varchar(255) COMMENT 'Title for Thank-you page (header title tag, and display at the top of the page).'",
+          'thankyou_text' => "text COMMENT 'text and html allowed. displayed above result on success page'",
+          'thankyou_footer' => "text COMMENT 'Text and html allowed. displayed at the bottom of the success page. Common usage is to include link(s) to other pages such as tell-a-friend, etc.'",
+          'receipt_from_name' => "varchar(255) COMMENT 'FROM email name used for receipts generated by contributions to this contribution page.'",
+          'receipt_text' => "text COMMENT 'text to include above standard receipt info on receipt email. emails are text-only, so do not allow html for now'",
+          'footer_text' => "text COMMENT 'Text and html allowed. Displayed at the bottom of the first page of the contribution wizard.'",
+          'frontend_title' => "varchar(255) DEFAULT NULL COMMENT 'Contribution Page Public title'",
+        ],
+        'civicrm_product' => [
+          'name' => "varchar(255) NOT NULL COMMENT 'Required product/premium name'",
+          'description' => "text COMMENT 'Optional description of the product/premium.'",
+          'options' => "text COMMENT 'Store comma-delimited list of color, size, etc. options for the product.'",
+        ],
+        'civicrm_payment_processor' => [
+          'title' => "varchar(127) COMMENT 'Payment Processor Descriptive Name.'",
+        ],
+        'civicrm_membership_type' => [
+          'name' => "varchar(128) NOT NULL COMMENT 'Name of Membership Type'",
+          'description' => "varchar(255) COMMENT 'Description of Membership Type'",
+        ],
+        'civicrm_membership_block' => [
+          'new_title' => "varchar(255) COMMENT 'Title to display at top of block'",
+          'new_text' => "text COMMENT 'Text to display below title'",
+          'renewal_title' => "varchar(255) COMMENT 'Title for renewal'",
+          'renewal_text' => "text COMMENT 'Text to display for member renewal'",
+        ],
+        'civicrm_price_set' => [
+          'title' => "varchar(255) NOT NULL COMMENT 'Displayed title for the Price Set.'",
+          'help_pre' => "text COMMENT 'Description and/or help text to display before fields in form.'",
+          'help_post' => "text COMMENT 'Description and/or help text to display after fields in form.'",
+        ],
+        'civicrm_dashboard' => [
+          'label' => "varchar(255) COMMENT 'dashlet title'",
+        ],
+        'civicrm_uf_group' => [
+          'title' => "varchar(64) NOT NULL COMMENT 'Form title.'",
+          'frontend_title' => "varchar(64) COMMENT 'Profile Form Public title'",
+          'help_pre' => "text COMMENT 'Description and/or help text to display before fields in form.'",
+          'help_post' => "text COMMENT 'Description and/or help text to display after fields in form.'",
+          'cancel_button_text' => "varchar(64) DEFAULT NULL COMMENT 'Custom Text to display on the Cancel button when used in create or edit mode'",
+          'submit_button_text' => "varchar(64) DEFAULT NULL COMMENT 'Custom Text to display on the submit button on profile edit/create screens'",
+        ],
+        'civicrm_uf_field' => [
+          'help_post' => "text COMMENT 'Description and/or help text to display after this field.'",
+          'help_pre' => "text COMMENT 'Description and/or help text to display before this field.'",
+          'label' => "varchar(255) NOT NULL COMMENT 'To save label for fields.'",
+        ],
+        'civicrm_price_field' => [
+          'label' => "varchar(255) NOT NULL COMMENT 'Text for form field label (also friendly name for administering this field).'",
+          'help_pre' => "text COMMENT 'Description and/or help text to display before this field.'",
+          'help_post' => "text COMMENT 'Description and/or help text to display after this field.'",
+        ],
+        'civicrm_price_field_value' => [
+          'label' => "varchar(255) DEFAULT NULL COMMENT 'Price field option label'",
+          'description' => "text DEFAULT NULL COMMENT 'Price field option description.'",
+          'help_pre' => "text DEFAULT NULL COMMENT 'Price field option pre help text.'",
+          'help_post' => "text DEFAULT NULL COMMENT 'Price field option post field help.'",
+        ],
+        'civicrm_pcp_block' => [
+          'link_text' => "varchar(255) DEFAULT NULL COMMENT 'Link text for PCP.'",
+        ],
+        'civicrm_event' => [
+          'title' => "varchar(255) COMMENT 'Event Title (e.g. Fall Fundraiser Dinner)'",
+          'summary' => "text COMMENT 'Brief summary of event. Text and html allowed. Displayed on Event Registration form and can be used on other CMS pages which need an event summary.'",
+          'description' => "text COMMENT 'Full description of event. Text and html allowed. Displayed on built-in Event Information screens.'",
+          'registration_link_text' => "varchar(255) COMMENT 'Text for link to Event Registration form which is displayed on Event Information screen when is_online_registration is true.'",
+          'event_full_text' => "text COMMENT 'Message to display on Event Information page and INSTEAD OF Event Registration form if maximum participants are signed up. Can include email address/info about getting on a waiting list, etc. Text and html allowed.'",
+          'fee_label' => "varchar(255)",
+          'intro_text' => "text COMMENT 'Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.'",
+          'footer_text' => "text COMMENT 'Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.'",
+          'confirm_title' => "varchar(255) DEFAULT NULL COMMENT 'Title for Confirmation page.'",
+          'confirm_text' => "text COMMENT 'Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.'",
+          'confirm_footer_text' => "text COMMENT 'Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.'",
+          'confirm_email_text' => "text COMMENT 'text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now'",
+          'confirm_from_name' => "varchar(255) COMMENT 'FROM email name used for confirmation emails.'",
+          'thankyou_title' => "varchar(255) DEFAULT NULL COMMENT 'Title for ThankYou page.'",
+          'thankyou_text' => "text COMMENT 'ThankYou Text.'",
+          'thankyou_footer_text' => "text COMMENT 'Footer message.'",
+          'pay_later_text' => "text COMMENT 'The text displayed to the user in the main form'",
+          'pay_later_receipt' => "text COMMENT 'The receipt sent to the user instead of the normal receipt text'",
+          'initial_amount_label' => "varchar(255) COMMENT 'Initial amount label for partial payment'",
+          'initial_amount_help_text' => "text COMMENT 'Initial amount help text for partial payment'",
+          'waitlist_text' => "text COMMENT 'Text to display when the event is full, but participants can signup for a waitlist.'",
+          'approval_req_text' => "text COMMENT 'Text to display when the approval is required to complete registration for an event.'",
+          'template_title' => "varchar(255) COMMENT 'Event Template Title'",
+        ],
+      ];
+    }
+    return $result;
+  }
+
+  /**
+   * Get a table indexed array of the indices for translatable fields.
+   *
+   * @return array
+   *   Indices for translatable fields.
+   */
+  public static function &indices() {
+    static $result = NULL;
+    if (!$result) {
+      $result = [
+        'civicrm_custom_group' => [
+          'UI_title_extends' => [
+            'name' => 'UI_title_extends',
+            'field' => [
+              'title',
+              'extends',
+            ],
+            'unique' => 1,
+          ],
+        ],
+        'civicrm_custom_field' => [
+          'UI_label_custom_group_id' => [
+            'name' => 'UI_label_custom_group_id',
+            'field' => [
+              'label',
+              'custom_group_id',
+            ],
+            'unique' => 1,
+          ],
+        ],
+        'civicrm_group' => [
+          'UI_title' => [
+            'name' => 'UI_title',
+            'field' => [
+              'title',
+            ],
+            'unique' => 1,
+          ],
+        ],
+      ];
+    }
+    return $result;
+  }
+
+  /**
+   * Get tables with translatable fields.
+   *
+   * @return array
+   *   Array of names of tables with fields that can be translated.
+   */
+  public static function &tables() {
+    static $result = NULL;
+    if (!$result) {
+      $result = array_keys(self::columns());
+    }
+    return $result;
+  }
+
+  /**
+   * Get a list of widgets for editing translatable fields.
+   *
+   * @return array
+   *   Array of the widgets for editing translatable fields.
+   */
+  public static function &widgets() {
+    static $result = NULL;
+    if (!$result) {
+      $result = [
+        'civicrm_location_type' => [
+          'display_name' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_option_group' => [
+          'title' => [
+            'type' => "Text",
+          ],
+          'description' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_relationship_type' => [
+          'label_a_b' => [
+            'type' => "Text",
+          ],
+          'label_b_a' => [
+            'type' => "Text",
+          ],
+          'description' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_contact_type' => [
+          'label' => [
+            'type' => "Text",
+          ],
+          'description' => [
+            'type' => "TextArea",
+            'rows' => "2",
+            'cols' => "60",
+          ],
+        ],
+        'civicrm_batch' => [
+          'title' => [
+            'type' => "Text",
+          ],
+          'description' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+        ],
+        'civicrm_premiums' => [
+          'premiums_intro_title' => [
+            'type' => "Text",
+          ],
+          'premiums_intro_text' => [
+            'type' => "Text",
+          ],
+          'premiums_nothankyou_label' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_membership_status' => [
+          'label' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_survey' => [
+          'title' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'instructions' => [
+            'type' => "TextArea",
+            'rows' => "20",
+            'cols' => "80",
+          ],
+          'thankyou_title' => [
+            'type' => "Text",
+          ],
+          'thankyou_text' => [
+            'type' => "TextArea",
+            'rows' => "8",
+            'cols' => "60",
+          ],
+        ],
+        'civicrm_participant_status_type' => [
+          'label' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_case_type' => [
+          'title' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'description' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_tell_friend' => [
+          'title' => [
+            'type' => "Text",
+          ],
+          'intro' => [
+            'type' => "Text",
+          ],
+          'suggested_message' => [
+            'type' => "Text",
+          ],
+          'thankyou_title' => [
+            'type' => "Text",
+          ],
+          'thankyou_text' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_custom_group' => [
+          'title' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'help_pre' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+          'help_post' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+        ],
+        'civicrm_custom_field' => [
+          'label' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'help_pre' => [
+            'type' => "Text",
+          ],
+          'help_post' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_option_value' => [
+          'label' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'description' => [
+            'type' => "TextArea",
+            'rows' => "8",
+            'cols' => "60",
+          ],
+        ],
+        'civicrm_group' => [
+          'title' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'frontend_title' => [
+            'type' => "Text",
+          ],
+          'frontend_description' => [
+            'type' => "TextArea",
+            'rows' => "2",
+            'cols' => "60",
+          ],
+        ],
+        'civicrm_contribution_page' => [
+          'title' => [
+            'type' => "Text",
+          ],
+          'intro_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'pay_later_text' => [
+            'type' => "Text",
+          ],
+          'pay_later_receipt' => [
+            'type' => "Text",
+          ],
+          'initial_amount_label' => [
+            'type' => "Text",
+          ],
+          'initial_amount_help_text' => [
+            'type' => "Text",
+          ],
+          'thankyou_title' => [
+            'type' => "Text",
+          ],
+          'thankyou_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "8",
+            'cols' => "60",
+          ],
+          'thankyou_footer' => [
+            'type' => "RichTextEditor",
+            'rows' => "8",
+            'cols' => "60",
+          ],
+          'receipt_from_name' => [
+            'type' => "Text",
+          ],
+          'receipt_text' => [
+            'type' => "TextArea",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'footer_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'frontend_title' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_product' => [
+          'name' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'description' => [
+            'type' => "Text",
+          ],
+          'options' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_payment_processor' => [
+          'title' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_membership_type' => [
+          'name' => [
+            'type' => "Text",
+            'label' => "Name",
+            'required' => "true",
+          ],
+          'description' => [
+            'type' => "TextArea",
+            'rows' => "6",
+            'cols' => "50",
+            'label' => "Description",
+          ],
+        ],
+        'civicrm_membership_block' => [
+          'new_title' => [
+            'type' => "Text",
+          ],
+          'new_text' => [
+            'type' => "Text",
+          ],
+          'renewal_title' => [
+            'type' => "Text",
+          ],
+          'renewal_text' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_price_set' => [
+          'title' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'help_pre' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+          'help_post' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+        ],
+        'civicrm_dashboard' => [
+          'label' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_uf_group' => [
+          'title' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'frontend_title' => [
+            'type' => "Text",
+          ],
+          'help_pre' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+          'help_post' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+          'cancel_button_text' => [
+            'type' => "Text",
+          ],
+          'submit_button_text' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_uf_field' => [
+          'help_post' => [
+            'type' => "Text",
+          ],
+          'help_pre' => [
+            'type' => "Text",
+          ],
+          'label' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+        ],
+        'civicrm_price_field' => [
+          'label' => [
+            'type' => "Text",
+            'required' => "true",
+          ],
+          'help_pre' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+          'help_post' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "80",
+          ],
+        ],
+        'civicrm_price_field_value' => [
+          'label' => [
+            'type' => "Text",
+          ],
+          'description' => [
+            'type' => "TextArea",
+            'rows' => "2",
+            'cols' => "60",
+          ],
+          'help_pre' => [
+            'type' => "TextArea",
+            'rows' => "2",
+            'cols' => "60",
+          ],
+          'help_post' => [
+            'type' => "TextArea",
+            'rows' => "2",
+            'cols' => "60",
+          ],
+        ],
+        'civicrm_pcp_block' => [
+          'link_text' => [
+            'type' => "Text",
+          ],
+        ],
+        'civicrm_event' => [
+          'title' => [
+            'type' => "Text",
+          ],
+          'summary' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "60",
+          ],
+          'description' => [
+            'type' => "RichTextEditor",
+            'rows' => "8",
+            'cols' => "60",
+          ],
+          'registration_link_text' => [
+            'type' => "Text",
+          ],
+          'event_full_text' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "60",
+          ],
+          'fee_label' => [
+            'type' => "Text",
+          ],
+          'intro_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'footer_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'confirm_title' => [
+            'type' => "Text",
+          ],
+          'confirm_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'confirm_footer_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'confirm_email_text' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "50",
+          ],
+          'confirm_from_name' => [
+            'type' => "Text",
+          ],
+          'thankyou_title' => [
+            'type' => "Text",
+          ],
+          'thankyou_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'thankyou_footer_text' => [
+            'type' => "RichTextEditor",
+            'rows' => "6",
+            'cols' => "50",
+          ],
+          'pay_later_text' => [
+            'type' => "RichTextEditor",
+          ],
+          'pay_later_receipt' => [
+            'type' => "Text",
+          ],
+          'initial_amount_label' => [
+            'type' => "Text",
+          ],
+          'initial_amount_help_text' => [
+            'type' => "Text",
+          ],
+          'waitlist_text' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "60",
+          ],
+          'approval_req_text' => [
+            'type' => "TextArea",
+            'rows' => "4",
+            'cols' => "60",
+          ],
+          'template_title' => [
+            'type' => "Text",
+          ],
+        ],
+      ];
+    }
+    return $result;
+  }
+
+}
diff --git a/CRM/Upgrade/Incremental/Base.php b/CRM/Upgrade/Incremental/Base.php
index 3f5393dc0c2b..a7c5ee6e4e7f 100644
--- a/CRM/Upgrade/Incremental/Base.php
+++ b/CRM/Upgrade/Incremental/Base.php
@@ -136,10 +136,11 @@ public static function checkFKExists($table_name, $constraint_name) {
    * @param string $properties
    * @param bool $localizable is this a field that should be localized
    * @param string|null $version CiviCRM version to use if rebuilding multilingual schema
+   * @param bool $triggerRebuild should we trigger the rebuild of the multilingual schema
    *
    * @return bool
    */
-  public static function addColumn($ctx, $table, $column, $properties, $localizable = FALSE, $version = NULL) {
+  public static function addColumn($ctx, $table, $column, $properties, $localizable = FALSE, $version = NULL, $triggerRebuild = TRUE) {
     $locales = CRM_Core_I18n::getMultilingual();
     $queries = [];
     if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists($table, $column, FALSE)) {
@@ -162,7 +163,7 @@ public static function addColumn($ctx, $table, $column, $properties, $localizabl
         CRM_Core_DAO::executeQuery($query, [], TRUE, NULL, FALSE, FALSE);
       }
     }
-    if ($locales) {
+    if ($locales && $triggerRebuild) {
       CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, $version, TRUE);
     }
     return TRUE;
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 2833c33e7670..8cbbaf1aaed9 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -58,6 +58,9 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
    * @param string $rev
    */
   public function upgrade_5_31_alpha1($rev) {
+    $this->addTask('Expand internal civicrm group title field to be 255 in length', 'grouptitlefieldExpand');
+    $this->addTask('Add in optional public title group table', 'addColumn', 'civicrm_group', 'frontend_title', "varchar(255)   DEFAULT NULL COMMENT 'Alternative public title for this Group.'", TRUE, '5.31.alpha1', FALSE);
+    $this->addTask('Add in optional public description group table', 'addColumn', 'civicrm_group', 'frontend_description', "text   DEFAULT NULL COMMENT 'Alternative public description of the group.'", TRUE, '5.31.alpha1');
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Remove Eway Single Currency Payment Processor type if not used or install the new extension for it', 'enableEwaySingleExtension');
     $this->addTask('dev/core#1486 Remove FKs from ACL Cache tables', 'removeFKsFromACLCacheTables');
@@ -133,4 +136,28 @@ public static function installGreenwich(CRM_Queue_TaskContext $ctx) {
     return TRUE;
   }
 
+  /**
+   * Expands the length of the civicrm_group.title field in the database to be 255.
+   *
+   * @param \CRM_Queue_TaskContext $ctx
+   *
+   * @return bool
+   */
+  public static function grouptitlefieldExpand(CRM_Queue_TaskContext $ctx) {
+    $locales = CRM_Core_I18n::getMultilingual();
+    $queries = [];
+    if ($locales) {
+      foreach ($locales as $locale) {
+        $queries[] = "ALTER TABLE civicrm_group CHANGE `title_{$locale}` `title_{$locale}` varchar(255) NOT NULL COMMENT 'Name of Group.'";
+      }
+    }
+    else {
+      $queries[] = "ALTER TABLE civicrm_group CHANGE `title` `title` varchar(255) NOT NULL COMMENT 'Name of Group.'";
+    }
+    foreach ($queries as $query) {
+      CRM_Core_DAO::executeQuery($query, [], TRUE, NULL, FALSE, FALSE);
+    }
+    return TRUE;
+  }
+
 }
diff --git a/tests/phpunit/api/v3/dataset/uf_group_test.xml b/tests/phpunit/api/v3/dataset/uf_group_test.xml
index 5a2ffa76d623..8df3bc85f9a9 100644
--- a/tests/phpunit/api/v3/dataset/uf_group_test.xml
+++ b/tests/phpunit/api/v3/dataset/uf_group_test.xml
@@ -3,6 +3,7 @@
 <dataset>
   <civicrm_group
     id = '2'
+    title = 'Test Group'
   />
   <civicrm_contact
     id = '69'
diff --git a/xml/schema/Contact/Group.xml b/xml/schema/Contact/Group.xml
index 509f20debcc3..043beab52d43 100644
--- a/xml/schema/Contact/Group.xml
+++ b/xml/schema/Contact/Group.xml
@@ -32,8 +32,9 @@
     <name>title</name>
     <type>varchar</type>
     <title>Group Title</title>
-    <length>64</length>
+    <length>255</length>
     <localizable>true</localizable>
+    <required>true</required>
     <comment>Name of Group.</comment>
     <add>1.1</add>
     <html>
@@ -225,4 +226,31 @@
     <add>4.5</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
+  <field>
+    <name>frontend_title</name>
+    <type>varchar</type>
+    <title>Public Group Title</title>
+    <length>255</length>
+    <localizable>true</localizable>
+    <comment>Alternative public title for this Group.</comment>
+    <default>NULL</default>
+    <add>5.31</add>
+    <html>
+      <type>Text</type>
+    </html>
+  </field>
+  <field>
+    <name>frontend_description</name>
+    <type>text</type>
+    <title>Public Group Description</title>
+    <html>
+      <type>TextArea</type>
+      <rows>2</rows>
+      <cols>60</cols>
+    </html>
+    <comment>Alternative public description of the group.</comment>
+    <localizable>true</localizable>
+    <default>NULL</default>
+    <add>5.31</add>
+  </field>
 </table>

From 799f3149bf398df1503c38106e4229ab748830d0 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 30 Sep 2020 18:19:58 +1000
Subject: [PATCH 779/834] dev/core#334 Use the current in use collation and
 character sets when creating new custom value tables

---
 CRM/Core/BAO/CustomField.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 55e1b786bbc7..41cc7fe7ba88 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -1610,10 +1610,15 @@ public static function formatCustomField(
    */
   public static function defaultCustomTableSchema($params) {
     // add the id and extends_id
+    $collation = CRM_Core_BAO_SchemaHandler::getInUseCollation();
+    $characterSet = 'utf8';
+    if (stripos($collation, 'utf8mb4') !== FALSE) {
+      $characterSet = 'utf8mb4';
+    }
     $table = [
       'name' => $params['name'],
       'is_multiple' => $params['is_multiple'],
-      'attributes' => "ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci",
+      'attributes' => "ENGINE=InnoDB DEFAULT CHARACTER SET {$characterSet} COLLATE {$collation}",
       'fields' => [
         [
           'name' => 'id',

From 096110f396365db1625bd8bf8b8222d00e8b2ff2 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 9 Sep 2020 15:54:50 +1000
Subject: [PATCH 780/834] dev/core#2003 Use Brick/Money to ensure that we
 display all possible digits stored in the database for the option amount

Add in noisy notice about fall back due to missing intl extension
---
 CRM/Price/Form/Option.php |  5 +----
 CRM/Utils/Money.php       | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CRM/Price/Form/Option.php b/CRM/Price/Form/Option.php
index adf22e19a862..5aa3b3687b14 100644
--- a/CRM/Price/Form/Option.php
+++ b/CRM/Price/Form/Option.php
@@ -75,10 +75,7 @@ public function setDefaultValues() {
 
       // fix the display of the monetary value, CRM-4038
       foreach ($this->_moneyFields as $field) {
-        // @todo use formatLocaleNumericRoundedByOptionalPrecision - but note that there is an issue where php doesn't handle
-        // money strings beyond a certain total length - per https://github.com/civicrm/civicrm-core/pull/18409
-        // & https://github.com/civicrm/civicrm-core/pull/18409
-        $defaults[$field] = CRM_Utils_Money::format(CRM_Utils_Array::value($field, $defaults), NULL, '%a');
+        $defaults[$field] = isset($defaults[$field]) ? CRM_Utils_Money::formatLocaleNumericRoundedByOptionalPrecision($defaults[$field], 9) : '';
       }
     }
 
diff --git a/CRM/Utils/Money.php b/CRM/Utils/Money.php
index 45d2d3fd79cb..c99a792167c7 100644
--- a/CRM/Utils/Money.php
+++ b/CRM/Utils/Money.php
@@ -17,6 +17,7 @@
 
 use Brick\Money\Money;
 use Brick\Money\Context\DefaultContext;
+use Brick\Money\Context\CustomContext;
 use Brick\Math\RoundingMode;
 
 /**
@@ -201,7 +202,15 @@ protected static function formatLocaleNumeric($amount) {
    * @return string
    */
   protected static function formatLocaleNumericRounded($amount, $numberOfPlaces) {
-    return self::formatNumericByFormat($amount, '%!.' . $numberOfPlaces . 'i');
+    if (!extension_loaded('intl')) {
+      self::missingIntlNotice();
+      return self::formatNumericByFormat($amount, '%!.' . $numberOfPlaces . 'i');
+    }
+    $money = Money::of($amount, CRM_Core_Config::singleton()->defaultCurrency, new CustomContext($numberOfPlaces), RoundingMode::CEILING);
+    $formatter = new \NumberFormatter(CRM_Core_I18n::getLocale(), NumberFormatter::CURRENCY);
+    $formatter->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, '');
+    $formatter->setAttribute(\NumberFormatter::MIN_FRACTION_DIGITS, $numberOfPlaces);
+    return $money->formatWith($formatter);
   }
 
   /**
@@ -306,4 +315,11 @@ protected static function formatNumericByFormat($amount, $valueFormat) {
     return $amount;
   }
 
+  /**
+   * Emits a notice indicating we have fallen back to a less accurate way of formatting money due to missing intl extension
+   */
+  public static function missingIntlNotice() {
+    CRM_Core_Session::singleton()->setStatus(ts('As this system does not include the PHP intl extension, CiviCRM has fallen back onto a slightly less accurate and deprecated method to format money'), ts('Missing PHP INTL extension'));
+  }
+
 }

From 4fed6a994d3da3db709d902b056c1c663bad70bd Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 30 Sep 2020 14:36:44 -0700
Subject: [PATCH 781/834] composer.json - Switch to composer-compile-lib. Add
 more helpers.

The overall effect of this change is to get access to a few more helpers.

Before: Load `composer-compile-plugin`, `scssphp`, and `php-autoprefxer` as
three distinct packages.

After: Load `composer-compile-lib`, which transitively requires all those others
*and* includes some helpers.

Sea also

* https://github.com/civicrm/composer-compile-plugin
* https://github.com/civicrm/composer-compile-lib
---
 composer.json |   7 ++-
 composer.lock | 134 +++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 126 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 030026242ab1..8d2b9c1e6e30 100644
--- a/composer.json
+++ b/composer.json
@@ -80,9 +80,7 @@
     "ext-intl": "*",
     "pear/mail_mime": "~1.10",
     "pear/db": "1.10",
-    "scssphp/scssphp": "~1.2",
-    "padaliyajay/php-autoprefixer": "~1.2",
-    "civicrm/composer-compile-plugin": "~0.8"
+    "civicrm/composer-compile-lib": "~0.2 || ~1.0"
   },
   "scripts": {
     "post-install-cmd": [
@@ -283,6 +281,7 @@
         "CiviCRM Custom Patches for ZetaCompoents mail": "https://raw.githubusercontent.com/civicrm/civicrm-core/9d93748a36c7c5d44422911db1c98fb2f7067b34/tools/scripts/composer/patches/civicrm-custom-patches-zetacompoents-mail.patch"
       }
     },
-    "compile-includes": ["ext/greenwich/composer.compile.json"]
+    "compile-includes": ["ext/greenwich/composer.compile.json"],
+    "compile-whitelist": ["civicrm/composer-compile-lib"]
   }
 }
diff --git a/composer.lock b/composer.lock
index 26c72f834ff6..ba2584e72445 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dab2def1e60e4c40f0e9141463f1697b",
+    "content-hash": "197ce47c1897c60cbc5ce809f3d5cf14",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -309,18 +309,77 @@
             "description": "RPC library for CiviConnect",
             "time": "2020-02-05T03:24:26+00:00"
         },
+        {
+            "name": "civicrm/composer-compile-lib",
+            "version": "v0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/civicrm/composer-compile-lib.git",
+                "reference": "ceed2f3abe500a8333470a1e916812391cd68261"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-lib/zipball/ceed2f3abe500a8333470a1e916812391cd68261",
+                "reference": "ceed2f3abe500a8333470a1e916812391cd68261",
+                "shasum": ""
+            },
+            "require": {
+                "civicrm/composer-compile-plugin": "~0.9 || ~1.0",
+                "padaliyajay/php-autoprefixer": "~1.2",
+                "scssphp/scssphp": "~1.2",
+                "symfony/filesystem": "~2.8 || ~3.4 || ~4.0 || ~5.0",
+                "tubalmartin/cssmin": "^4.1"
+            },
+            "type": "library",
+            "extra": {
+                "compile": [
+                    {
+                        "title": "Generate <comment>CCL</comment> wrapper functions",
+                        "run": [
+                            "@php-script src/StubsTpl.php"
+                        ],
+                        "watch-files": [
+                            "src/StubsTpl.php",
+                            "src/Functions.php"
+                        ]
+                    }
+                ]
+            },
+            "autoload": {
+                "psr-0": {
+                    "CCL": ""
+                },
+                "psr-4": {
+                    "CCL\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "CiviCRM",
+                    "email": "info@civicrm.org"
+                }
+            ],
+            "description": "Small library of compilation helpers",
+            "time": "2020-09-30T22:30:37+00:00"
+        },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.8",
+            "version": "v0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "bcc7731731702434340715402d7fd3d6af250d00"
+                "reference": "2624473090698cf813d14545a70b422b48f263e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/bcc7731731702434340715402d7fd3d6af250d00",
-                "reference": "bcc7731731702434340715402d7fd3d6af250d00",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/2624473090698cf813d14545a70b422b48f263e8",
+                "reference": "2624473090698cf813d14545a70b422b48f263e8",
                 "shasum": ""
             },
             "require": {
@@ -352,7 +411,7 @@
                 }
             ],
             "description": "Define a 'compile' event for all packages in the dependency-graph",
-            "time": "2020-09-24T11:50:28+00:00"
+            "time": "2020-09-30T21:14:46+00:00"
         },
         {
             "name": "civicrm/composer-downloads-plugin",
@@ -920,16 +979,16 @@
         },
         {
             "name": "padaliyajay/php-autoprefixer",
-            "version": "1.2",
+            "version": "1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/padaliyajay/php-autoprefixer.git",
-                "reference": "0f36b7cfbd71d25836bcb9f4b58c09252ca4e9ec"
+                "reference": "f05f374f0c1e463db62209613f52b38bf4b52430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/padaliyajay/php-autoprefixer/zipball/0f36b7cfbd71d25836bcb9f4b58c09252ca4e9ec",
-                "reference": "0f36b7cfbd71d25836bcb9f4b58c09252ca4e9ec",
+                "url": "https://api.github.com/repos/padaliyajay/php-autoprefixer/zipball/f05f374f0c1e463db62209613f52b38bf4b52430",
+                "reference": "f05f374f0c1e463db62209613f52b38bf4b52430",
                 "shasum": ""
             },
             "require": {
@@ -951,7 +1010,7 @@
                 }
             ],
             "description": "CSS Autoprefixer written in pure PHP.",
-            "time": "2019-03-06T12:49:40+00:00"
+            "time": "2019-11-26T09:55:37+00:00"
         },
         {
             "name": "pclzip/pclzip",
@@ -3321,6 +3380,59 @@
                 "time"
             ]
         },
+        {
+            "name": "tubalmartin/cssmin",
+            "version": "v4.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "cogpowered/finediff": "0.3.*",
+                "phpunit/phpunit": "4.8.*"
+            },
+            "bin": [
+                "cssmin"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "tubalmartin\\CssMin\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Túbal Martín",
+                    "homepage": "http://tubalmartin.me/"
+                }
+            ],
+            "description": "A PHP port of the YUI CSS compressor",
+            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
+            "keywords": [
+                "compress",
+                "compressor",
+                "css",
+                "cssmin",
+                "minify",
+                "yui"
+            ],
+            "time": "2018-01-15T15:26:51+00:00"
+        },
         {
             "name": "typo3/phar-stream-wrapper",
             "version": "v3.1.4",

From 5cbbd191347f3f018375134f736638c84c1c67ea Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 1 Oct 2020 09:18:33 +1000
Subject: [PATCH 782/834] [REF] Add in css classes to make the save and preview
 button on the Contribution Page widget settings form look consistant with the
 other buttons on the page

---
 CRM/Contribute/Form/ContributionPage/Widget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Contribute/Form/ContributionPage/Widget.php b/CRM/Contribute/Form/ContributionPage/Widget.php
index 77cdd5094a97..f962551188c5 100644
--- a/CRM/Contribute/Form/ContributionPage/Widget.php
+++ b/CRM/Contribute/Form/ContributionPage/Widget.php
@@ -191,7 +191,7 @@ public function buildQuickForm() {
     $this->addElement('xbutton',
       $this->_refreshButtonName,
       ts('Save and Preview'),
-      ['type' => 'submit']
+      ['type' => 'submit', 'class' => 'crm-button crm-form-submit crm-button-type-submit']
     );
     parent::buildQuickForm();
     $this->addFormRule(['CRM_Contribute_Form_ContributionPage_Widget', 'formRule'], $this);

From 2ffb24e7ec1dc89fee2c2bed6b8f0cc71b7be6d2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 30 Sep 2020 15:42:29 -0700
Subject: [PATCH 783/834] Greenwich - Switch to composer-compile-lib

---
 Civi/Compile/Scss.php               | 49 -----------------------------
 ext/greenwich/composer.compile.json |  9 +++---
 2 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 Civi/Compile/Scss.php

diff --git a/Civi/Compile/Scss.php b/Civi/Compile/Scss.php
deleted file mode 100644
index b695a89ce21a..000000000000
--- a/Civi/Compile/Scss.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-namespace Civi\Compile;
-
-class Scss {
-
-  /**
-   * Compile some SCSS file(s).
-   *
-   * NOTE: This function runs during 'composer install', which is a pre-boot
-   * environment. The composer autoloader has been configured, but no other
-   * Civi services are online.
-   *
-   * @param array $task
-   *   With keys:
-   *   - scss-includes: string[], list of paths with SCSS helper files
-   *   - scss-files: array, key-value mapping with input-files and output-files
-   *
-   * @see composer.json
-   * @link https://github.com/civicrm/composer-compile-plugin/blob/master/doc/tasks.md
-   */
-  public static function build(array $task) {
-    $scssCompiler = new \ScssPhp\ScssPhp\Compiler();
-    $includes = $task['scss-includes'] ?? [];
-    foreach ($includes as $include) {
-      $scssCompiler->addImportPath($include);
-    }
-
-    if (empty($task['scss-files'])) {
-      throw new \InvalidArgumentException("Invalid task: required argument 'scss-files' is missing");
-    }
-    foreach ($task['scss-files'] as $inputFile => $outputFile) {
-      if (!file_exists($inputFile)) {
-        throw new \InvalidArgumentException("File does not exist: " . $inputFile);
-      }
-      $inputScss = file_get_contents($inputFile);
-      $css = $scssCompiler->compile($inputScss);
-      $autoprefixer = new \Padaliyajay\PHPAutoprefixer\Autoprefixer($css);
-
-      if (!file_exists(dirname($outputFile))) {
-        mkdir(dirname($outputFile), 0777, TRUE);
-      }
-      $outputCss = $autoprefixer->compile();
-      if (!file_put_contents($outputFile, $outputCss)) {
-        throw new \RuntimeException("Failed to write file: $outputFile");
-      }
-    }
-  }
-
-}
diff --git a/ext/greenwich/composer.compile.json b/ext/greenwich/composer.compile.json
index 310523df0c8b..5ddfeb155344 100644
--- a/ext/greenwich/composer.compile.json
+++ b/ext/greenwich/composer.compile.json
@@ -3,13 +3,12 @@
     {
       "title": "Greenwich CSS (<comment>dist/bootstrap3.css</comment>)",
       "run": [
-        "@php-eval mkdir('extern/select2', 0777, TRUE);",
-        "@php-eval $ok = copy('../../bower_components/select2/select2-bootstrap.css', 'extern/select2/select2-bootstrap.scss'); exit($ok?0:1);",
-        "@php-method \\Civi\\Compile\\Scss::build"
+        "@php-eval \\CCL::copy('../../bower_components/select2/select2-bootstrap.css', 'extern/select2/select2-bootstrap.scss');",
+        "@php-method \\CCL\\Tasks::scss"
       ],
       "watch-files": ["scss", "../../bower_components/select2/select2-bootstrap.css"],
-      "scss-files": {"scss/main.scss": "dist/bootstrap3.css"},
-      "scss-includes": ["scss", "extern/bootstrap3/assets/stylesheets", "extern/select2"]
+      "scss-files": {"dist/bootstrap3.css": "scss/main.scss"},
+      "scss-imports": ["scss", "extern/bootstrap3/assets/stylesheets", "extern/select2"]
     }
   ]
 }

From 34801bd0f7c10167561d5dcffd63e99821931e25 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Wed, 30 Sep 2020 19:44:48 -0400
Subject: [PATCH 784/834] fix missing mail setting help

---
 settings/Mailing.setting.php              |  2 +-
 templates/CRM/Admin/Form/Setting/Mail.hlp | 14 ++++++++++++
 templates/CRM/Mailing/Form/Settings.hlp   | 28 -----------------------
 3 files changed, 15 insertions(+), 29 deletions(-)
 create mode 100644 templates/CRM/Admin/Form/Setting/Mail.hlp
 delete mode 100644 templates/CRM/Mailing/Form/Settings.hlp

diff --git a/settings/Mailing.setting.php b/settings/Mailing.setting.php
index cb0b5ec0b695..bfcc3580741d 100644
--- a/settings/Mailing.setting.php
+++ b/settings/Mailing.setting.php
@@ -386,6 +386,6 @@
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => ts('The frequency that CiviMail updates its sent mail database.'),
-    'help_text' => 'CiviMail records email sent at the frequency you specify.  If you set it to 1, it will update the database every time it sends an email.  This ensures that emails are not resent if the batch job fails, but this may cause a performance hit, particularly for large jobs.',
+    'help_text' => NULL,
   ],
 ];
diff --git a/templates/CRM/Admin/Form/Setting/Mail.hlp b/templates/CRM/Admin/Form/Setting/Mail.hlp
new file mode 100644
index 000000000000..e33c7912c59f
--- /dev/null
+++ b/templates/CRM/Admin/Form/Setting/Mail.hlp
@@ -0,0 +1,14 @@
+{*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+*}
+{htxt id="civimail-sync-interval-id"}
+  <p>
+    {ts}CiviMail records email sent at the frequency you specify. If you set it to 1, it will update the database every time it sends an email. This ensures that emails are not resent if the batch job fails, but this may cause a performance hit, particularly for large jobs.{/ts}
+  </p>
+{/htxt}
diff --git a/templates/CRM/Mailing/Form/Settings.hlp b/templates/CRM/Mailing/Form/Settings.hlp
deleted file mode 100644
index 99d515ee397d..000000000000
--- a/templates/CRM/Mailing/Form/Settings.hlp
+++ /dev/null
@@ -1,28 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
-*}
-{htxt id="mailing-visibility-title"}
-  {ts}Visibility{/ts}
-{/htxt}
-{htxt id="mailing-visibility"}
-<p>
-{assign var=hlpViewURL value="mailing.viewUrl"}
-{ts 1=$hlpViewURL}This option makes it possible to make the contents of the email accessible to users as a web page. This option is only relevant if you insert the Mailing permalink token %1 in your message in the next step. This token generates a URL on which the message can be viewed (remember to insert the code in the appropriate HTML tags).{/ts}
-</p><p>
-{ts}You have two options to specify the visibility of the mailing{/ts}:
-</p><p>
-{ts}"public pages" will make the content of this mailing be viewable as a web page by everyone who has the permission of "view public CiviMail content"{/ts}
-</p><p>
-{ts}"user and user admin" only means that only users that received the mailing or administrators can view the content of this email as a web page; the recipients will have to log in to be able to view the message{/ts}
-<p></p>
-{htxt id="mailing-sync-interval-title"}
-  {ts}Sync Interval{/ts}
-{ts}"civimail_sync_interval" specifies how frequently CiviMail records which emails it has sent.  A value of 1 means that it updates the database with every email sent, but this may have a performance hit.{/ts}:
-<p></p>
-{/htxt}

From a8a2f26f9d48fe2c3dbb7a78ceb00bb76397c637 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 30 Sep 2020 18:09:05 +1300
Subject: [PATCH 785/834] dev/core#2073 Improve cleanup on syntaxconformance
 test

Cleaning up all objects seems a bit too much - but ensuring we
re-set the DAO we create in this class should be a memory-friendly action

https://github.com/civicrm/civicrm-core/pull/18639
---
 .../phpunit/api/v3/SyntaxConformanceTest.php  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 38828c425716..0365d2a09153 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -111,13 +111,6 @@ public function setUp() {
       'Payment',
       'Order',
     ];
-    $this->onlyIDNonZeroCount['get'] = [
-      'ActivityType',
-      'Entity',
-      'Domain',
-      'Setting',
-      'User',
-    ];
     $this->deprecatedAPI = ['Location', 'ActivityType', 'SurveyRespondant'];
     $this->deletableTestObjects = [];
   }
@@ -128,6 +121,7 @@ public function tearDown() {
         CRM_Core_DAO::deleteTestObjects($entityName, ['id' => $entityID]);
       }
     }
+    $this->deletableTestObjects = NULL;
   }
 
   /**
@@ -928,7 +922,7 @@ public function testAcceptsOnlyID_get($Entity) {
       // just to get a clearer message in the log
       $this->assertEquals("only id should be enough", $result['error_message']);
     }
-    if (!in_array($Entity, $this->onlyIDNonZeroCount['get'])) {
+    if (!in_array($Entity, $this->getOnlyIDNonZeroCount(), TRUE)) {
       $this->assertEquals(0, $result['count']);
     }
   }
@@ -987,7 +981,7 @@ public function testByID_get($entityName) {
     }
 
     $baos = $this->getMockableBAOObjects($entityName);
-    list($baoObj1, $baoObj2) = $baos;
+    [$baoObj1, $baoObj2] = $baos;
 
     // fetch first by ID
     $result = $this->callAPISuccess($entityName, 'get', [
@@ -1209,7 +1203,7 @@ public function testNonExistantID_get($Entity) {
 
     $this->assertArrayHasKey('version', $result);
     $this->assertEquals(3, $result['version']);
-    if (!in_array($Entity, $this->onlyIDNonZeroCount['get'])) {
+    if (!in_array($Entity, $this->getOnlyIDNonZeroCount(), TRUE)) {
       $this->assertEquals(0, $result['count']);
     }
   }
@@ -1598,7 +1592,7 @@ public function testByID_delete($entityName) {
     $startCount = $this->callAPISuccess($entityName, 'getcount', []);
     $createcount = 2;
     $baos = $this->getMockableBAOObjects($entityName, $createcount);
-    list($baoObj1, $baoObj2) = $baos;
+    [$baoObj1, $baoObj2] = $baos;
 
     // make sure exactly 2 exist
     $result = $this->callAPISuccess($entityName, 'getcount', [],
@@ -1837,4 +1831,19 @@ public function testEncodeWrite() {
     ]);
   }
 
+  /**
+   * Get entities that have non-zero counts already.
+   *
+   * @return string[]
+   */
+  protected function getOnlyIDNonZeroCount(): array {
+    return [
+      'ActivityType',
+      'Entity',
+      'Domain',
+      'Setting',
+      'User',
+    ];
+  }
+
 }

From 69fb41da4566bbda627c2feda3e5eb28958759b2 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 30 Sep 2020 22:04:43 +1300
Subject: [PATCH 786/834] Fix cache bypass

If the contact is not impacted by any acls then ids will be an empty array. However, currently
an empty array is treated as 'uncached' rather than 'cached by empty' which
would be represented by null
---
 CRM/ACL/BAO/ACL.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index 583b3dc0ce5c..ec8666164dce 100644
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -480,7 +480,7 @@ public static function group(
       $cacheKey = CRM_Utils_Cache::cleanKey("$tableName-$aclKeys");
       $cache = CRM_Utils_Cache::singleton();
       $ids = $cache->get($cacheKey);
-      if (!$ids) {
+      if (!is_array($ids)) {
         $ids = [];
         $query = "
 SELECT   a.operation, a.object_id

From d4761b7fb6dad0cc77236f3b3780d6bc7a156cdf Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 1 Oct 2020 16:15:35 +1300
Subject: [PATCH 787/834] Fix insufficiently distinct cache key

---
 CRM/ACL/BAO/ACL.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index ec8666164dce..2fa703199fa0 100644
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -477,7 +477,7 @@ public static function group(
       $aclKeys = array_keys($acls);
       $aclKeys = implode(',', $aclKeys);
 
-      $cacheKey = CRM_Utils_Cache::cleanKey("$tableName-$aclKeys");
+      $cacheKey = CRM_Utils_Cache::cleanKey("$type-$tableName-$aclKeys");
       $cache = CRM_Utils_Cache::singleton();
       $ids = $cache->get($cacheKey);
       if (!is_array($ids)) {

From 7b7bbd76125ba70d0a600a534f2020775d7da1ae Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 1 Oct 2020 16:59:30 +1300
Subject: [PATCH 788/834] Fix patently silly code

---
 CRM/Grant/BAO/Query.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php
index f34f89461212..2e814b2a7755 100644
--- a/CRM/Grant/BAO/Query.php
+++ b/CRM/Grant/BAO/Query.php
@@ -15,12 +15,12 @@
 class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
 
   /**
+   * Get grant fields.
+   *
    * @return array
    */
   public static function &getFields() {
-    $fields = [];
-    $fields = CRM_Grant_BAO_Grant::exportableFields();
-    return $fields;
+    return CRM_Grant_BAO_Grant::exportableFields();
   }
 
   /**

From cb47d0530e9bb090852344ea4dcacd2135989c9f Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 1 Oct 2020 18:39:34 +1300
Subject: [PATCH 789/834] [REF] Fix some more calls to getTokens to make it
 clear only the first return value is used

---
 api/v3/Mailing.php                    | 4 ++--
 tests/phpunit/CRM/Utils/TokenTest.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php
index 756cf75ab823..653fdcd2b2a9 100644
--- a/api/v3/Mailing.php
+++ b/api/v3/Mailing.php
@@ -567,8 +567,8 @@ function civicrm_api3_mailing_preview($params) {
     $details = $details[0][0] ?? NULL;
   }
   else {
-    $details = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
-    $details = $details[0][$contactID];
+    [$details] = CRM_Utils_Token::getTokenDetails($mailingParams, $returnProperties, TRUE, TRUE, NULL, $mailing->getFlattenedTokens());
+    $details = $details[$contactID];
   }
 
   $mime = $mailing->compose(NULL, NULL, NULL, $contactID, $fromEmail, $fromEmail,
diff --git a/tests/phpunit/CRM/Utils/TokenTest.php b/tests/phpunit/CRM/Utils/TokenTest.php
index 450397298c5c..dfb3532ce62f 100644
--- a/tests/phpunit/CRM/Utils/TokenTest.php
+++ b/tests/phpunit/CRM/Utils/TokenTest.php
@@ -11,8 +11,8 @@ class CRM_Utils_TokenTest extends CiviUnitTestCase {
    */
   public function testGetTokenDetails() {
     $contactID = $this->individualCreate(['preferred_communication_method' => ['Phone', 'Fax']]);
-    $resolvedTokens = CRM_Utils_Token::getTokenDetails([$contactID]);
-    $this->assertEquals('Phone, Fax', $resolvedTokens[0][$contactID]['preferred_communication_method']);
+    [$resolvedTokens] = CRM_Utils_Token::getTokenDetails([$contactID]);
+    $this->assertEquals('Phone, Fax', $resolvedTokens[$contactID]['preferred_communication_method']);
   }
 
   /**
@@ -49,8 +49,8 @@ public function testSearchByPrimaryLocation() {
     $contactIDs = [$contactID];
 
     // when we are fetching contact details ON basis of primary address fields
-    $contactDetails = CRM_Utils_Token::getTokenDetails($contactIDs);
-    $this->assertEquals($primaryEmail, $contactDetails[0][$contactID]['email']);
+    [$contactDetails] = CRM_Utils_Token::getTokenDetails($contactIDs);
+    $this->assertEquals($primaryEmail, $contactDetails[$contactID]['email']);
 
     // restore setting
     Civi::settings()->set('searchPrimaryDetailsOnly', '1');

From 66cbbfb6c7d23527dd067b050e6df64b4dc3dfef Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 28 Sep 2020 23:06:26 +1300
Subject: [PATCH 790/834] dev/core#2057 Remove extraneous activity contact
 queries on activity update

This changes it so that instead of doing either

1) if passing in an array of activity contacts for a given type then attempt
to delete existing contacts, regardless of whether they are the same as the
existing ones, create new ones

OR

2) if the param is an int then do a lookup, per record type, and update if needed to

- Do one query to find existing records of types to be deleted (for all 3 record types).
Only delete activity contact records that are not to be kept and
don't alter those records that should be retained
---
 CRM/Activity/BAO/Activity.php | 154 ++++++++++++----------------------
 1 file changed, 53 insertions(+), 101 deletions(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index f98328217678..60ffb77aa5db 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -341,28 +341,57 @@ public static function create(&$params) {
     }
 
     $activityId = $activity->id;
-    $sourceID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Source');
-    $assigneeID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Assignees');
-    $targetID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets');
-
     $activityRecordTypes = [
-      'source_contact_id' => 'Activity Source',
-      'assignee_contact_id' => 'Activity Assignees',
-      'target_contact_id' => 'Activity Targets',
+      'source_contact_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Source'),
+      'assignee_contact_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Assignees'),
+      'target_contact_id' => CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Targets'),
     ];
-    $activityContacts = array_intersect_key($params, $activityRecordTypes);
 
-    // Unset any which are a single id - this is just because they have traditionally been updated as
-    // opposed to delete + possible create for the others.
-    // Potentially we should nuance it for the others too....
-    foreach ($activityContacts as $index => $value) {
-      if ($value && !is_array($value)) {
-        unset($activityContacts[$index]);
+    $activityContacts = [];
+    // Cast to an array if we just have an integer. Index by record type id.
+    foreach ($activityRecordTypes as $key => $recordTypeID) {
+      if (isset($params[$key])) {
+        if (empty($params[$key])) {
+          $activityContacts[$recordTypeID] = [];
+        }
+        else {
+          foreach ((array) $params[$key] as $contactID) {
+            $activityContacts[$recordTypeID][$contactID] = (int) $contactID;
+          }
+        }
       }
     }
 
     if ($action === 'edit' && !empty($activityContacts)) {
-      $wheres = [['activity_id', '=', $params['id']], ['record_type_id:name', 'IN', array_intersect_key($activityRecordTypes, $activityContacts)]];
+      $wheres = [];
+      foreach ($activityContacts as $recordTypeID => $contactIDs) {
+        if (!empty($contactIDs)) {
+          $wheres[$key] = "(record_type_id = $recordTypeID AND contact_id IN (" . implode(',', $contactIDs) . '))';
+        }
+      }
+      $existingArray = empty($wheres) ? [] : CRM_Core_DAO::executeQuery("
+        SELECT id, contact_id, record_type_id
+        FROM civicrm_activity_contact
+        WHERE activity_id = %1
+          AND (" . implode(' OR ', $wheres) . ')',
+      [1 => [$params['id'], 'Integer']])->fetchAll();
+
+      $recordsToKeep = [];
+      $wheres = [['activity_id', '=', $params['id']], ['record_type_id', 'IN', array_keys($activityContacts)]];
+
+      foreach ($existingArray as $existingRecords) {
+        $recordsToKeep[$existingRecords['id']] = ['contact_id' => $existingRecords['contact_id'], 'record_type_id' => $existingRecords['record_type_id']];
+        unset($activityContacts[$recordTypeID][$existingRecords['contact_id']]);
+        if (empty($activityContacts[$recordTypeID])) {
+          // If we just removed the last one to update then also unset the key.
+          unset($activityContacts[$recordTypeID]);
+        }
+      }
+
+      if (!empty($recordsToKeep)) {
+        $wheres[] = ['id', 'NOT IN', array_keys($recordsToKeep)];
+      }
+
       // Delete all existing records for the types to be updated. Do a quick check to make sure there
       // is at least one to avoid a delete query if not necessary (delete queries are more likely to cause contention).
       if (ActivityContact::get($params['check_permissions'] ?? FALSE)->setLimit(1)->setWhere($wheres)->selectRowCount()->execute()) {
@@ -370,97 +399,20 @@ public static function create(&$params) {
       }
     }
 
-    if (isset($params['source_contact_id'])) {
-      $acParams = [
-        'activity_id' => $activityId,
-        'contact_id' => $params['source_contact_id'],
-        'record_type_id' => $sourceID,
-      ];
-      CRM_Activity_BAO_ActivityContact::create($acParams);
-    }
-
-    // check and attach and files as needed
-    CRM_Core_BAO_File::processAttachment($params, 'civicrm_activity', $activityId);
-
-    // attempt to save activity assignment
-    $resultAssignment = NULL;
-    if (!empty($params['assignee_contact_id'])) {
-
-      $assignmentParams = ['activity_id' => $activityId];
-
-      if (is_array($params['assignee_contact_id'])) {
-        foreach ($params['assignee_contact_id'] as $acID) {
-          if ($acID) {
-            $assigneeParams = [
-              'activity_id' => $activityId,
-              'contact_id' => $acID,
-              'record_type_id' => $assigneeID,
-            ];
-            CRM_Activity_BAO_ActivityContact::create($assigneeParams);
-          }
-        }
-      }
-      else {
-        $assignmentParams['contact_id'] = $params['assignee_contact_id'];
-        $assignmentParams['record_type_id'] = $assigneeID;
-        if (!empty($params['id'])) {
-          $assignment = new CRM_Activity_BAO_ActivityContact();
-          $assignment->activity_id = $activityId;
-          $assignment->record_type_id = $assigneeID;
-          $assignment->find(TRUE);
-
-          if ($assignment->contact_id != $params['assignee_contact_id']) {
-            $assignmentParams['id'] = $assignment->id;
-            $resultAssignment = CRM_Activity_BAO_ActivityContact::create($assignmentParams);
-          }
-        }
-        else {
-          $resultAssignment = CRM_Activity_BAO_ActivityContact::create($assignmentParams);
-        }
+    $activityContactApiValues = [];
+    foreach ($activityContacts as $recordTypeID => $contactIDs) {
+      foreach ($contactIDs as $contactID) {
+        $activityContactApiValues[] = ['record_type_id' => $recordTypeID, 'contact_id' => $contactID];
       }
     }
 
-    if (is_a($resultAssignment, 'CRM_Core_Error')) {
-      $transaction->rollback();
-      return $resultAssignment;
+    if (!empty($activityContactApiValues)) {
+      ActivityContact::save($params['check_permissions'] ?? FALSE)->addDefault('activity_id', $activityId)
+        ->setRecords($activityContactApiValues)->execute();
     }
 
-    // attempt to save activity targets
-    if (!empty($params['target_contact_id'])) {
-
-      $targetParams = ['activity_id' => $activityId];
-      if (is_array($params['target_contact_id'])) {
-
-        foreach ($params['target_contact_id'] as $tid) {
-          if ($tid) {
-            $targetContactParams = [
-              'activity_id' => $activityId,
-              'contact_id' => $tid,
-              'record_type_id' => $targetID,
-            ];
-            CRM_Activity_BAO_ActivityContact::create($targetContactParams);
-          }
-        }
-      }
-      else {
-        $targetParams['contact_id'] = $params['target_contact_id'];
-        $targetParams['record_type_id'] = $targetID;
-        if (!empty($params['id'])) {
-          $target = new CRM_Activity_BAO_ActivityContact();
-          $target->activity_id = $activityId;
-          $target->record_type_id = $targetID;
-          $target->find(TRUE);
-
-          if ($target->contact_id != $params['target_contact_id']) {
-            $targetParams['id'] = $target->id;
-            CRM_Activity_BAO_ActivityContact::create($targetParams);
-          }
-        }
-        else {
-          CRM_Activity_BAO_ActivityContact::create($targetParams);
-        }
-      }
-    }
+    // check and attach and files as needed
+    CRM_Core_BAO_File::processAttachment($params, 'civicrm_activity', $activityId);
 
     // write to changelog before transaction is committed/rolled
     // back (and prepare status to display)

From 7585cf5beb46010c1214d78845ea4d805370ee03 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Sep 2020 11:53:30 -0400
Subject: [PATCH 791/834] dev/core#1818 Upgrade AngularJS from 1.5.11 to 1.8

https://lab.civicrm.org/dev/core/-/issues/1818

The biggest breaking change between 1.5 and 1.8 was the default hashPrefix.
See https://github.com/angular/angular.js/blob/master/CHANGELOG.md#location-due-to-1

Our solution is to force crmApp to use the previous default. This ensures that existing modules
which rely on crmApp for routing (which is nearly all of them) will be unaffected.

New modules like Afform which use their own routing should use the new default recommended by Angular.
---
 ang/crmApp.js                             | 6 ++++++
 composer.json                             | 8 ++++----
 composer.lock                             | 2 +-
 ext/afform/docs/quickstart.md             | 2 +-
 ext/afform/gui/ang/afGuiList.aff.html     | 4 ++--
 ext/afform/html/ang/afHtmlEditor.aff.html | 2 +-
 ext/afform/html/ang/afHtmlList.aff.html   | 2 +-
 js/angular-crmResource/all.js             | 7 +++----
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ang/crmApp.js b/ang/crmApp.js
index c7bb81e29bc9..e3baceb971a6 100644
--- a/ang/crmApp.js
+++ b/ang/crmApp.js
@@ -3,6 +3,12 @@
   // crmApp should not provide any significant services, and no other
   // modules should depend on it.
   var crmApp = angular.module('crmApp', CRM.angular.modules);
+
+  // dev/core#1818 use angular 1.5 default of # instead of 1.6+ default of #!
+  crmApp.config(['$locationProvider', function($locationProvider) {
+    $locationProvider.hashPrefix("");
+  }]);
+
   crmApp.config(['$routeProvider',
     function($routeProvider) {
 
diff --git a/composer.json b/composer.json
index 8d2b9c1e6e30..00a283c7e28f 100644
--- a/composer.json
+++ b/composer.json
@@ -125,7 +125,7 @@
         "path": "bower_components/{$id}"
       },
       "angular": {
-        "url": "https://github.com/angular/bower-angular/archive/v1.5.11.zip"
+        "url": "https://github.com/angular/bower-angular/archive/v1.8.0.zip"
       },
       "angular-bootstrap": {
         "url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip"
@@ -138,13 +138,13 @@
         "url": "https://github.com/totten/angular-jquery-dialog-service/archive/v0.8.0-civicrm-1.0.zip"
       },
       "angular-mocks": {
-        "url": "https://github.com/angular/bower-angular-mocks/archive/v1.5.11.zip"
+        "url": "https://github.com/angular/bower-angular-mocks/archive/v1.8.0.zip"
       },
       "angular-route": {
-        "url": "https://github.com/angular/bower-angular-route/archive/v1.5.11.zip"
+        "url": "https://github.com/angular/bower-angular-route/archive/v1.8.0.zip"
       },
       "angular-sanitize": {
-        "url": "https://github.com/angular/bower-angular-sanitize/archive/v1.5.11.zip"
+        "url": "https://github.com/angular/bower-angular-sanitize/archive/v1.8.0.zip"
       },
       "angular-ui-sortable": {
         "url": "https://github.com/angular-ui/ui-sortable/archive/v0.19.0.zip"
diff --git a/composer.lock b/composer.lock
index ba2584e72445..14ceae4a827f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "197ce47c1897c60cbc5ce809f3d5cf14",
+    "content-hash": "1c717ea7ca80e806702967261c621e3a",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
diff --git a/ext/afform/docs/quickstart.md b/ext/afform/docs/quickstart.md
index 53000a16d677..37917d7724a4 100644
--- a/ext/afform/docs/quickstart.md
+++ b/ext/afform/docs/quickstart.md
@@ -31,7 +31,7 @@ from a local Drupal 7 site:
 ```
 $ cv url "civicrm/hello-world"
 "http://dmaster.localhost/civicrm/hello-world"
-$ cv url "civicrm/hello-world/#/?name=world"
+$ cv url "civicrm/hello-world/#!/?name=world"
 "http://dmaster.localhost/civicrm/hello-world/#/?name=world"
 ```
 
diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/gui/ang/afGuiList.aff.html
index 763ca8547f63..4fe9b37a137e 100644
--- a/ext/afform/gui/ang/afGuiList.aff.html
+++ b/ext/afform/gui/ang/afGuiList.aff.html
@@ -1,4 +1,4 @@
-<a href="#/?name=0" class="btn btn-default">
+<a href="#!/?name=0" class="btn btn-default">
   <i class="crm-i fa-plus"></i> {{ ts('New Form') }}
 </a>
 <div
@@ -22,7 +22,7 @@
     <tbody>
     <tr ng-repeat="availForm in listCtrl.result">
       <td>
-        <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
+        <a ng-href="#!/?name={{availForm.name}}">{{availForm.name}}</a>
       </td>
       <td>{{availForm.title}}</td>
       <td>
diff --git a/ext/afform/html/ang/afHtmlEditor.aff.html b/ext/afform/html/ang/afHtmlEditor.aff.html
index 7d474d44e5a5..0cbca87fd241 100644
--- a/ext/afform/html/ang/afHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afHtmlEditor.aff.html
@@ -8,7 +8,7 @@
     <div crm-ui-debug="resultForm"></div>
 
     <div>
-      <a ng-href="#/">{{ts('Back')}}</a>
+      <a ng-href="#!/">{{ts('Back')}}</a>
       |
       <a af-api4-action="['Afform', 'update', {layoutFormat: 'html', where: [['name', '=', resultForm.name]], values:resultForm}]">{{ts('Save')}}</a>
       <span ng-if="resultForm.server_route">
diff --git a/ext/afform/html/ang/afHtmlList.aff.html b/ext/afform/html/ang/afHtmlList.aff.html
index 4f70a552bccb..ad66cc579063 100644
--- a/ext/afform/html/ang/afHtmlList.aff.html
+++ b/ext/afform/html/ang/afHtmlList.aff.html
@@ -19,7 +19,7 @@
     <tbody>
     <tr ng-repeat="availForm in listCtrl.result">
       <td>
-        <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
+        <a ng-href="#!/?name={{availForm.name}}">{{availForm.name}}</a>
       </td>
       <td>{{availForm.title}}</td>
       <td>
diff --git a/js/angular-crmResource/all.js b/js/angular-crmResource/all.js
index e8eca721b59a..356a582407b9 100644
--- a/js/angular-crmResource/all.js
+++ b/js/angular-crmResource/all.js
@@ -34,9 +34,9 @@
 
     var moduleUrl = CRM.angular.bundleUrl;
     $http.get(moduleUrl)
-      .success(function httpSuccess(data) {
+      .then(function httpSuccess(response) {
         templates = [];
-        angular.forEach(data, function(module) {
+        angular.forEach(response.data, function(module) {
           if (module.partials) {
             angular.extend(templates, module.partials);
           }
@@ -45,8 +45,7 @@
           }
         });
         notify();
-      })
-      .error(function httpError() {
+      }, function httpError() {
         templates = [];
         notify();
       });

From df00c64d0dbd2d8cb9cee0dd98f4808b09667156 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Sep 2020 17:53:31 -0400
Subject: [PATCH 792/834] Remove problematic tests

This removes 2 tests that broke with the upgrade to Angular 1.8.
Neither test was covering much of anything useful.
---
 tests/karma/unit/crmCaseTypeSpec.js | 50 -----------------------------
 1 file changed, 50 deletions(-)

diff --git a/tests/karma/unit/crmCaseTypeSpec.js b/tests/karma/unit/crmCaseTypeSpec.js
index e63adf2f5f87..c378852a294e 100644
--- a/tests/karma/unit/crmCaseTypeSpec.js
+++ b/tests/karma/unit/crmCaseTypeSpec.js
@@ -726,34 +726,6 @@ describe('crmCaseType', function() {
     });
   });
 
-  describe('crmAddName', function () {
-    var element;
-
-    beforeEach(function() {
-      scope = $rootScope.$new();
-      scope.activityTypeOptions = [1, 2, 3];
-      element = '<span crm-add-name crm-options="activityTypeOptions"></span>';
-
-      spyOn(CRM.$.fn, 'crmSelect2').and.callThrough();
-
-      element = $compile(element)(scope);
-      scope.$digest();
-    });
-
-    describe('when initialized', function () {
-      var returnValue;
-
-      beforeEach (function () {
-        var dataFunction = CRM.$.fn.crmSelect2.calls.argsFor(0)[0].data;
-        returnValue = dataFunction();
-      });
-
-      it('updates the UI with updated value of scope variable', function () {
-        expect(returnValue).toEqual({ results: scope.activityTypeOptions });
-      });
-    });
-  });
-
   describe('crmEditableTabTitle', function () {
     var element, titleLabel, penIcon, saveButton, cancelButton;
 
@@ -1016,28 +988,6 @@ describe('crmCaseType', function() {
         });
       });
 
-      describe('when the case type cannot be delted', function() {
-        var error = { error_message: 'Error Message' };
-
-        beforeEach(function() {
-          var errorHandler;
-
-          crmApiSpy.and.returnValue($q.reject(error));
-          scope.caseTypes[caseType.id] = caseType;
-
-          spyOn(CRM, 'alert');
-          scope.deleteCaseType(caseType);
-          scope.$digest();
-
-          errorHandler = crmApiSpy.calls.mostRecent().args[3].error;
-          errorHandler(error);
-        });
-
-        it('displays the error message', function() {
-          expect(CRM.alert).toHaveBeenCalledWith(error.error_message, 'Error', 'error');
-        });
-      });
-
       describe('revertCaseType', function() {
         var caseType = {
           id: _.uniqueId(),

From 676a6ff47325458a34221f43b03c126488de3c7a Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 1 Oct 2020 18:44:49 +1300
Subject: [PATCH 793/834] [REF] Remove reference to second param returned from
 CRM_Contact_BAO_Query::apiQuery

---
 CRM/Contact/BAO/Group.php                   | 2 +-
 CRM/Contact/BAO/GroupContact.php            | 2 +-
 CRM/Core/BAO/MessageTemplate.php            | 4 ++--
 Civi/Token/TokenCompatSubscriber.php        | 2 +-
 tests/phpunit/CRM/Contact/BAO/QueryTest.php | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CRM/Contact/BAO/Group.php b/CRM/Contact/BAO/Group.php
index 4679168a39d5..96d94f478d84 100644
--- a/CRM/Contact/BAO/Group.php
+++ b/CRM/Contact/BAO/Group.php
@@ -118,7 +118,7 @@ public static function discard($id) {
    */
   public static function getGroupContacts($id) {
     $params = [['group', 'IN', [1 => $id], 0, 0]];
-    list($contacts, $_) = CRM_Contact_BAO_Query::apiQuery($params, ['contact_id']);
+    [$contacts] = CRM_Contact_BAO_Query::apiQuery($params, ['contact_id']);
     return $contacts;
   }
 
diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php
index 8e44e6aa4006..714ccf4ce09b 100644
--- a/CRM/Contact/BAO/GroupContact.php
+++ b/CRM/Contact/BAO/GroupContact.php
@@ -555,7 +555,7 @@ public static function isContactInGroup($contactID, $groupID) {
       ['group', 'IN', [$groupID], 0, 0],
       ['contact_id', '=', $contactID, 0, 0],
     ];
-    list($contacts, $_) = CRM_Contact_BAO_Query::apiQuery($params, ['contact_id']);
+    [$contacts] = CRM_Contact_BAO_Query::apiQuery($params, ['contact_id']);
 
     if (!empty($contacts)) {
       return TRUE;
diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php
index bc683a8ec047..e32ab9d4cabd 100644
--- a/CRM/Core/BAO/MessageTemplate.php
+++ b/CRM/Core/BAO/MessageTemplate.php
@@ -238,7 +238,7 @@ public static function sendReminder($contactId, $email, $messageTemplateID, $fro
       }
 
       $params = [['contact_id', '=', $contactId, 0, 0]];
-      list($contact, $_) = CRM_Contact_BAO_Query::apiQuery($params);
+      [$contact] = CRM_Contact_BAO_Query::apiQuery($params);
 
       //CRM-4524
       $contact = reset($contact);
@@ -581,7 +581,7 @@ public static function sendTemplate($params) {
 
     if ($params['toEmail']) {
       $contactParams = [['email', 'LIKE', $params['toEmail'], 0, 1]];
-      list($contact, $_) = CRM_Contact_BAO_Query::apiQuery($contactParams);
+      [$contact] = CRM_Contact_BAO_Query::apiQuery($contactParams);
 
       $prefs = array_pop($contact);
 
diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
index c4a07af5595c..bdfaa5994eb5 100644
--- a/Civi/Token/TokenCompatSubscriber.php
+++ b/Civi/Token/TokenCompatSubscriber.php
@@ -58,7 +58,7 @@ public function onEvaluate(TokenValueEvent $e) {
         $params = [
           ['contact_id', '=', $contactId, 0, 0],
         ];
-        list($contact, $_) = \CRM_Contact_BAO_Query::apiQuery($params);
+        [$contact] = \CRM_Contact_BAO_Query::apiQuery($params);
         //CRM-4524
         $contact = reset($contact);
         if (!$contact || is_a($contact, 'CRM_Core_Error')) {
diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
index e6ef3bd8b5b2..e3d02a668d75 100644
--- a/tests/phpunit/CRM/Contact/BAO/QueryTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
@@ -575,9 +575,9 @@ public function testCaseInsensitive() {
         $searchParams = [[$key, '=', strtolower($value), 0, 1]];
       }
 
-      $result = CRM_Contact_BAO_Query::apiQuery($searchParams);
-      $this->assertCount(1, $result[0], 'search for ' . $key);
-      $contact = reset($result[0]);
+      [$result] = CRM_Contact_BAO_Query::apiQuery($searchParams);
+      $this->assertCount(1, $result, 'search for ' . $key);
+      $contact = reset($result);
       $this->assertEquals('Minnie Mouse', $contact['display_name']);
       $this->assertEquals('BOb', $contact['current_employer']);
     }

From 4d385723bb75b15575799efc51f419081fa8bc44 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 2 Oct 2020 09:17:45 +1300
Subject: [PATCH 794/834] dev/core#2079 do not return never-used, query-wasting
 variable

The second value from apiQuery is calculated using an extraneous uncached query. This function
is the only function that calls that function AND puts that value into a variable. This change clarfies that
this function does not require thhe variable
---
 CRM/Utils/Token.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index 850a2516ac74..6cc3365cae92 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -1160,11 +1160,11 @@ public static function getReturnProperties(&$string) {
    *   Extra params.
    * @param array $tokens
    *   The list of tokens we've extracted from the content.
-   * @param null $className
-   * @param int $jobID
+   * @param string|null $className
+   * @param int|null $jobID
    *   The mailing list jobID - this is a legacy param.
    *
-   * @return array
+   * @return array - e.g [[1 => ['first_name' => 'bob'...], 34 => ['first_name' => 'fred'...]]]
    */
   public static function getTokenDetails(
     $contactIDs,
@@ -1227,8 +1227,7 @@ public static function getTokenDetails(
       }
     }
 
-    $details = CRM_Contact_BAO_Query::apiQuery($params, $returnProperties, NULL, NULL, 0, count($contactIDs), TRUE, FALSE, TRUE, CRM_Contact_BAO_Query::MODE_CONTACTS, NULL, TRUE);
-    $contactDetails = &$details[0];
+    [$contactDetails] = CRM_Contact_BAO_Query::apiQuery($params, $returnProperties, NULL, NULL, 0, count($contactIDs), TRUE, FALSE, TRUE, CRM_Contact_BAO_Query::MODE_CONTACTS, NULL, TRUE);
 
     foreach ($contactIDs as $contactID) {
       if (array_key_exists($contactID, $contactDetails)) {
@@ -1270,7 +1269,7 @@ public static function getTokenDetails(
       $tokens,
       $className
     );
-    return $details;
+    return [$contactDetails];
   }
 
   /**

From 9c9e7406468c557ee039d2d7235cd9e715862eab Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 1 Oct 2020 17:41:29 -0700
Subject: [PATCH 795/834] dev/core#1393 - distmaker - Skip new file
 "vendor/bin/cssmin"

Overview
----------------------------------------

This fixes the broken distmaker builds in `master`.

The file `vendor/bin/cssmin` was recently added by way of `composer-compile-lib => cssmin`.
We don't need it in the tarball, and it's a symlink, so trying to include breaks some
consumers (like in https://lab.civicrm.org/dev/core/-/issues/1393).

Technical Details
----------------------------------------

* Before (last release): `vendor/bin/cssmin` does not exist
* Before (current master): `vendor/bin/cssmin` is created as symlink, copied to tarball
* After (this commit): `vendor/bin/cssmin` is created on dev-builds but omitted from tarball
---
 distmaker/dists/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index dea909f5a2f0..e882e0a16d11 100644
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -209,7 +209,7 @@ function dm_install_vendor() {
   [ ! -d "$to" ] && mkdir "$to"
   ${DM_RSYNC:-rsync} -avC $excludes_rsync "$repo/./" "$to/./"
   ## We don't this use CLI script in production, and the symlink breaks D7/BD URL installs
-  dm_remove_files "$to" "bin/pscss"
+  dm_remove_files "$to" "bin/pscss" "bin/cssmin"
 }
 
 ##  usage: dm_install_wordpress <wp_repo_path> <to_path>

From 5e559a23afa0e5b9bcb6ae6bf9fd47d2b8c07039 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 2 Oct 2020 14:32:56 +1300
Subject: [PATCH 796/834] dev/core#2046 Fix blockDelete to delete while
 ensuring is_primary is valid

The del function on each of the location DAO ensures that after a delete at least one phone (etc) is
marked is_primary. This blockDelete does not do that & per the test it's possible to call this
in such a way that no addresses are primary. Whether this actually happens is a bit unknown.

However, this cleans up block delete in a way where we can demonstrate the tests work
---
 CRM/Core/BAO/Block.php                        | 11 +--
 .../CRM/Contact/Import/Parser/ContactTest.php | 88 +++++++++++++++++++
 2 files changed, 90 insertions(+), 9 deletions(-)

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 898b88360a27..10cff14b3f49 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -337,15 +337,8 @@ public static function blockDelete($blockName, $params) {
       $name = 'OpenID';
     }
 
-    $baoString = 'CRM_Core_DAO_' . $name;
-    $block = new $baoString();
-
-    $block->copyValues($params);
-
-    // CRM-11006 add call to pre and post hook for delete action
-    CRM_Utils_Hook::pre('delete', $name, $block->id, CRM_Core_DAO::$_nullArray);
-    $block->delete();
-    CRM_Utils_Hook::post('delete', $name, $block->id, $block);
+    $baoString = 'CRM_Core_BAO_' . $name;
+    $baoString::del($params['id']);
   }
 
   /**
diff --git a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
index d6e4ea58a2d2..fbfa8f9990b0 100644
--- a/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
@@ -255,6 +255,94 @@ public function testImportBillingAddress() {
     $this->callAPISuccess('Contact', 'delete', ['id' => $contact['id']]);
   }
 
+  /**
+   * Test that the not-really-encouraged way of creating locations via contact.create doesn't mess up primaries.
+   */
+  public function testContactLocationBlockHandling() {
+    $id = $this->individualCreate([
+      'phone' => [
+        1 => [
+          'location_type_id' => 1,
+          'phone' => '987654321',
+        ],
+        2 => [
+          'location_type_id' => 2,
+          'phone' => '456-7890',
+        ],
+      ],
+      'im' => [
+        1 => [
+          'location_type_id' => 1,
+          'name' => 'bob',
+        ],
+        2 => [
+          'location_type_id' => 2,
+          'name' => 'fred',
+        ],
+      ],
+      'openid' => [
+        1 => [
+          'location_type_id' => 1,
+          'openid' => 'bob',
+        ],
+        2 => [
+          'location_type_id' => 2,
+          'openid' => 'fred',
+        ],
+      ],
+      'email' => [
+        1 => [
+          'location_type_id' => 1,
+          'email' => 'bob@example.com',
+        ],
+        2 => [
+          'location_type_id' => 2,
+          'email' => 'fred@example.com',
+        ],
+      ],
+    ]);
+    $phones = $this->callAPISuccess('Phone', 'get', ['contact_id' => $id])['values'];
+    $emails = $this->callAPISuccess('Email', 'get', ['contact_id' => $id])['values'];
+    $openIDs = $this->callAPISuccess('OpenID', 'get', ['contact_id' => $id])['values'];
+    $ims = $this->callAPISuccess('IM', 'get', ['contact_id' => $id])['values'];
+    $this->assertCount(2, $phones);
+    $this->assertCount(2, $emails);
+    $this->assertCount(2, $ims);
+    $this->assertCount(2, $openIDs);
+
+    $this->assertLocationValidity();
+    $this->callAPISuccess('Contact', 'create', [
+      'id' => $id,
+      // This is secret code for 'delete this phone'.
+      'updateBlankLocInfo' => TRUE,
+      'phone' => [
+        1 => [
+          'id' => key($phones),
+        ],
+      ],
+      'email' => [
+        1 => [
+          'id' => key($emails),
+        ],
+      ],
+      'im' => [
+        1 => [
+          'id' => key($ims),
+        ],
+      ],
+      'openid' => [
+        1 => [
+          'id' => key($openIDs),
+        ],
+      ],
+    ]);
+    $this->assertLocationValidity();
+    $this->callAPISuccessGetCount('Phone', ['contact_id' => $id], 1);
+    $this->callAPISuccessGetCount('Email', ['contact_id' => $id], 1);
+    $this->callAPISuccessGetCount('OpenID', ['contact_id' => $id], 1);
+    $this->callAPISuccessGetCount('IM', ['contact_id' => $id], 1);
+  }
+
   /**
    * Test that the import parser adds the address to the primary location.
    *

From ae7397a3c848bf089ad037b80267846aec2f39db Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 2 Oct 2020 11:57:07 +1300
Subject: [PATCH 797/834] dev/core#2046 Migrate BAO_Address::create towards
 standardisation

Our standard expectation is that each BAO will have a create action that handles a single entity. For legacy
reasons Address.create has special handling for multiple addresses. This extracts that handling
into a separate function (legacyCreate) and updates the (very few) places currently calling create to
call that.

With this merged apis v3 & v4 can call Address.create  - currently v3 is hard coded to call add and
v4 bypasses the BAO altogher. The v4 api bypass means we are not managing is_primay integrity on v4 api calls
---
 CRM/Contact/Form/Inline/Address.php        |   2 +-
 CRM/Core/BAO/Address.php                   | 131 ++++++++++++---------
 CRM/Core/BAO/Location.php                  |   6 +-
 tests/phpunit/CRM/Core/BAO/AddressTest.php |   6 +-
 4 files changed, 80 insertions(+), 65 deletions(-)

diff --git a/CRM/Contact/Form/Inline/Address.php b/CRM/Contact/Form/Inline/Address.php
index e33118c9133f..4170a36f0bd1 100644
--- a/CRM/Contact/Form/Inline/Address.php
+++ b/CRM/Contact/Form/Inline/Address.php
@@ -169,7 +169,7 @@ public function postProcess() {
     }
 
     // save address changes
-    $address = CRM_Core_BAO_Address::create($params, TRUE);
+    $address = CRM_Core_BAO_Address::legacyCreate($params, TRUE);
 
     $this->log();
     $this->ajaxResponse['addressId'] = $address[0]->id;
diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
index 329940adbdf9..fdbf08fe6b38 100644
--- a/CRM/Core/BAO/Address.php
+++ b/CRM/Core/BAO/Address.php
@@ -29,69 +29,15 @@ class CRM_Core_BAO_Address extends CRM_Core_DAO_Address {
    *   True if you need to fix (format) address values.
    *                               before inserting in db
    *
-   * @return array|NULL
+   * @return array|NULL|self
    *   array of created address
    */
   public static function create(&$params, $fixAddress = TRUE) {
     if (!isset($params['address']) || !is_array($params['address'])) {
-      return NULL;
-    }
-    CRM_Core_BAO_Block::sortPrimaryFirst($params['address']);
-    $contactId = NULL;
-
-    $updateBlankLocInfo = CRM_Utils_Array::value('updateBlankLocInfo', $params, FALSE);
-    $contactId = $params['contact_id'];
-    //get all the addresses for this contact
-    $addresses = self::allAddress($contactId);
-
-    $isPrimary = $isBilling = TRUE;
-    $blocks = [];
-    foreach ($params['address'] as $key => $value) {
-      if (!is_array($value)) {
-        continue;
-      }
-
-      $addressExists = self::dataExists($value);
-      if (empty($value['id'])) {
-        if (!empty($addresses) && !empty($value['location_type_id']) && array_key_exists($value['location_type_id'], $addresses)) {
-          $value['id'] = $addresses[$value['location_type_id']];
-        }
-      }
-
-      // Note there could be cases when address info already exist ($value[id] is set) for a contact/entity
-      // BUT info is not present at this time, and therefore we should be really careful when deleting the block.
-      // $updateBlankLocInfo will help take appropriate decision. CRM-5969
-      if (isset($value['id']) && !$addressExists && $updateBlankLocInfo) {
-        //delete the existing record
-        CRM_Core_BAO_Block::blockDelete('Address', ['id' => $value['id']]);
-        continue;
-      }
-      elseif (!$addressExists) {
-        continue;
-      }
-
-      if ($isPrimary && !empty($value['is_primary'])) {
-        $isPrimary = FALSE;
-      }
-      else {
-        $value['is_primary'] = 0;
-      }
-
-      if ($isBilling && !empty($value['is_billing'])) {
-        $isBilling = FALSE;
-      }
-      else {
-        $value['is_billing'] = 0;
-      }
-
-      if (empty($value['manual_geo_code'])) {
-        $value['manual_geo_code'] = 0;
-      }
-      $value['contact_id'] = $contactId;
-      $blocks[] = self::add($value, $fixAddress);
+      return self::add($params, $fixAddress);
     }
-
-    return $blocks;
+    CRM_Core_Error::deprecatedFunctionWarning('Use legacyCreate if not doing a single crud action');
+    return self::legacyCreate($params, $fixAddress);
   }
 
   /**
@@ -1366,4 +1312,73 @@ public static function addGeocoderData(&$params) {
     return TRUE;
   }
 
+  /**
+   * Create multiple addresses using legacy methodology.
+   *
+   * @param array $params
+   * @param bool $fixAddress
+   *
+   * @return array|null
+   */
+  public static function legacyCreate(array $params, bool $fixAddress) {
+    if (!isset($params['address']) || !is_array($params['address'])) {
+      return NULL;
+    }
+    CRM_Core_BAO_Block::sortPrimaryFirst($params['address']);
+    $contactId = NULL;
+
+    $updateBlankLocInfo = CRM_Utils_Array::value('updateBlankLocInfo', $params, FALSE);
+    $contactId = $params['contact_id'];
+    //get all the addresses for this contact
+    $addresses = self::allAddress($contactId);
+
+    $isPrimary = $isBilling = TRUE;
+    $blocks = [];
+    foreach ($params['address'] as $key => $value) {
+      if (!is_array($value)) {
+        continue;
+      }
+
+      $addressExists = self::dataExists($value);
+      if (empty($value['id'])) {
+        if (!empty($addresses) && !empty($value['location_type_id']) && array_key_exists($value['location_type_id'], $addresses)) {
+          $value['id'] = $addresses[$value['location_type_id']];
+        }
+      }
+
+      // Note there could be cases when address info already exist ($value[id] is set) for a contact/entity
+      // BUT info is not present at this time, and therefore we should be really careful when deleting the block.
+      // $updateBlankLocInfo will help take appropriate decision. CRM-5969
+      if (isset($value['id']) && !$addressExists && $updateBlankLocInfo) {
+        //delete the existing record
+        CRM_Core_BAO_Block::blockDelete('Address', ['id' => $value['id']]);
+        continue;
+      }
+      elseif (!$addressExists) {
+        continue;
+      }
+
+      if ($isPrimary && !empty($value['is_primary'])) {
+        $isPrimary = FALSE;
+      }
+      else {
+        $value['is_primary'] = 0;
+      }
+
+      if ($isBilling && !empty($value['is_billing'])) {
+        $isBilling = FALSE;
+      }
+      else {
+        $value['is_billing'] = 0;
+      }
+
+      if (empty($value['manual_geo_code'])) {
+        $value['manual_geo_code'] = 0;
+      }
+      $value['contact_id'] = $contactId;
+      $blocks[] = self::add($value, $fixAddress);
+    }
+    return $blocks;
+  }
+
 }
diff --git a/CRM/Core/BAO/Location.php b/CRM/Core/BAO/Location.php
index 911862b8fc18..fd1545efe911 100644
--- a/CRM/Core/BAO/Location.php
+++ b/CRM/Core/BAO/Location.php
@@ -45,11 +45,11 @@ public static function create(&$params, $fixAddress = TRUE) {
 
     // create location blocks.
     foreach (self::$blocks as $block) {
-      if ($block != 'address') {
+      if ($block !== 'address') {
         $location[$block] = CRM_Core_BAO_Block::create($block, $params);
       }
-      else {
-        $location[$block] = CRM_Core_BAO_Address::create($params, $fixAddress);
+      elseif (is_array($params['address'] ?? NULL)) {
+        $location[$block] = CRM_Core_BAO_Address::legacyCreate($params, $fixAddress);
       }
     }
 
diff --git a/tests/phpunit/CRM/Core/BAO/AddressTest.php b/tests/phpunit/CRM/Core/BAO/AddressTest.php
index 8e8ddcfe7701..707df1e1489e 100644
--- a/tests/phpunit/CRM/Core/BAO/AddressTest.php
+++ b/tests/phpunit/CRM/Core/BAO/AddressTest.php
@@ -50,7 +50,7 @@ public function testCreate() {
 
     $fixAddress = TRUE;
 
-    CRM_Core_BAO_Address::create($params, $fixAddress);
+    CRM_Core_BAO_Address::legacyCreate($params, $fixAddress);
     $addressId = $this->assertDBNotNull('CRM_Core_DAO_Address', 'Oberoi Garden', 'id', 'street_address',
       'Database check for created address.'
     );
@@ -76,7 +76,7 @@ public function testCreate() {
     ];
     $params['contact_id'] = $contactId;
 
-    $block = CRM_Core_BAO_Address::create($params, $fixAddress);
+    $block = CRM_Core_BAO_Address::legacyCreate($params, $fixAddress);
 
     $this->assertDBNotNull('CRM_Core_DAO_Address', $contactId, 'id', 'contact_id',
       'Database check for updated address by contactId.'
@@ -253,7 +253,7 @@ public function testGetValues() {
 
     $fixAddress = TRUE;
 
-    CRM_Core_BAO_Address::create($params, $fixAddress);
+    CRM_Core_BAO_Address::legacyCreate($params, $fixAddress);
 
     $addressId = $this->assertDBNotNull('CRM_Core_DAO_Address', $contactId, 'id', 'contact_id',
       'Database check for created address.'

From 924d1dc88c0037a50ccb559f3af5a8449baca2e2 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 1 Oct 2020 17:16:44 -0700
Subject: [PATCH 798/834] (REF) Convert hidden function 'useRegion' to public
 'fillDefaults'

This mostly affects a hypothetical bundle defined outside of core's `Common.php`:

* Before: You cannot re-use `useRegion()`. You'd have to write it again.

* After: You can re-use and/or override `fillDefaults()`.
---
 CRM/Core/Resources/Bundle.php                 | 23 +++++++++++++++++++
 CRM/Core/Resources/Common.php                 | 23 +++----------------
 .../phpunit/CRM/Core/Resources/BundleTest.php | 16 +++++++++++++
 3 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/CRM/Core/Resources/Bundle.php b/CRM/Core/Resources/Bundle.php
index 62c1a0426958..7c89dd1aa3a6 100644
--- a/CRM/Core/Resources/Bundle.php
+++ b/CRM/Core/Resources/Bundle.php
@@ -38,4 +38,27 @@ public function __construct($name = NULL, $types = NULL) {
     $this->types = $types ?: ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl'];
   }
 
+  /**
+   * Fill in default values for the 'region' property.
+   *
+   * @return static
+   */
+  public function fillDefaults() {
+    $this->filter(function ($s) {
+      if (!isset($s['region'])) {
+        if ($s['type'] === 'settings') {
+          $s['region'] = NULL;
+        }
+        elseif (preg_match(';^(markup|template|callback);', $s['type'])) {
+          $s['region'] = 'page-header';
+        }
+        else {
+          $s['region'] = CRM_Core_Resources_Common::REGION;
+        }
+      }
+      return $s;
+    });
+    return $this;
+  }
+
 }
diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index c85abeaec0a1..44b36873760a 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -47,7 +47,7 @@ public static function createBootstrap3Bundle($name) {
     );
 
     CRM_Utils_Hook::alterBundle($bundle);
-    self::useRegion($bundle, self::REGION);
+    $bundle->fillDefaults();
     return $bundle;
   }
 
@@ -76,7 +76,7 @@ public static function createStyleBundle($name) {
     $bundle->addStyleFile('civicrm', 'css/crm-i.css', -101);
 
     CRM_Utils_Hook::alterBundle($bundle);
-    self::useRegion($bundle, self::REGION);
+    $bundle->fillDefaults();
     return $bundle;
   }
 
@@ -133,7 +133,7 @@ public static function createFullBundle($name) {
     ]);
 
     CRM_Utils_Hook::alterBundle($bundle);
-    self::useRegion($bundle, self::REGION);
+    $bundle->fillDefaults();
     return $bundle;
   }
 
@@ -273,21 +273,4 @@ protected static function coreResourceList($region) {
     return $items;
   }
 
-  /**
-   * Ensure that all elements of the bundle are in the same region.
-   *
-   * @param CRM_Core_Resources_Bundle $bundle
-   * @param string $region
-   * @return CRM_Core_Resources_Bundle
-   */
-  protected static function useRegion($bundle, $region) {
-    $bundle->filter(function ($s) use ($region) {
-      if ($s['type'] !== 'settings' && !isset($s['region'])) {
-        $s['region'] = $region;
-      }
-      return $s;
-    });
-    return $bundle;
-  }
-
 }
diff --git a/tests/phpunit/CRM/Core/Resources/BundleTest.php b/tests/phpunit/CRM/Core/Resources/BundleTest.php
index 87630bf0214f..08490b979471 100644
--- a/tests/phpunit/CRM/Core/Resources/BundleTest.php
+++ b/tests/phpunit/CRM/Core/Resources/BundleTest.php
@@ -56,4 +56,20 @@ public function testMergeIntoRegion() {
     $this->assertEquals('http://example.com/region.css', $region->get('http://example.com/region.css')['styleUrl']);
   }
 
+  /**
+   * Add some resources - sometimes forgetting to set a 'region'. Fill in missing regions.
+   */
+  public function testFillDefaults() {
+    $bundle = new CRM_Core_Resources_Bundle(__FUNCTION__, ['scriptUrl', 'styleUrl', 'markup']);
+    $bundle->addScriptUrl('http://example.com/myscript.js');
+    $bundle->addStyleUrl('http://example.com/yonder-style.css', ['region' => 'yonder']);
+    $bundle->addMarkup('<b>Cheese</b>', ['name' => 'cheese']);
+
+    $bundle->fillDefaults();
+
+    $this->assertEquals('html-header', $bundle->get('http://example.com/myscript.js')['region']);
+    $this->assertEquals('yonder', $bundle->get('http://example.com/yonder-style.css')['region']);
+    $this->assertEquals('page-header', $bundle->get('cheese')['region']);
+  }
+
 }

From 8eb00bd1322efa99ed9a7011b4cc81b54de1d264 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 1 Oct 2020 17:38:00 -0700
Subject: [PATCH 799/834] (DX) Resources - Add helper for creating new bundles

---
 CRM/Core/Resources/Bundle.php            | 15 ++++++++++++++-
 CRM/Core/Resources/Common.php            | 24 ++++++++++++++++++++++++
 tests/phpunit/CRM/Core/ResourcesTest.php | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/Resources/Bundle.php b/CRM/Core/Resources/Bundle.php
index 7c89dd1aa3a6..3c1124f54cfc 100644
--- a/CRM/Core/Resources/Bundle.php
+++ b/CRM/Core/Resources/Bundle.php
@@ -32,10 +32,23 @@ class CRM_Core_Resources_Bundle implements CRM_Core_Resources_CollectionInterfac
    * @param string|NULL $name
    * @param string[]|NULL $types
    *   List of resource-types to permit in this bundle. NULL for a default list.
+   *   Ex: ['styleFile', 'styleUrl']
+   *   The following aliases are allowed: '*all*', '*default*', '*script*', '*style*'
    */
   public function __construct($name = NULL, $types = NULL) {
     $this->name = $name;
-    $this->types = $types ?: ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl'];
+
+    $typeAliases = [
+      '*all*' => ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl', 'markup', 'template', 'callback'],
+      '*default*' => ['script', 'scriptFile', 'scriptUrl', 'settings', 'style', 'styleFile', 'styleUrl'],
+      '*style*' => ['style', 'styleFile', 'styleUrl'],
+      '*script*' => ['script', 'scriptFile', 'scriptUrl'],
+    ];
+    $mapType = function ($t) use ($typeAliases) {
+      return $typeAliases[$t] ?? [$t];
+    };
+    $types = $types ?: ['*default*'];
+    $this->types = array_unique(array_merge(...array_map($mapType, (array) $types)));
   }
 
   /**
diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index 44b36873760a..5e339a04e298 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -16,6 +16,30 @@ class CRM_Core_Resources_Common {
 
   const REGION = 'html-header';
 
+  /**
+   * A "basic" bundle has an
+   *
+   * @param string $name
+   *   Symbolic name of the bundle.
+   * @param callable|NULL $init
+   *   Optional initialization function. Populate default resources.
+   *   ie `function($bundle): void`
+   * @param string|string[] $types
+   *   List of resource-types to permit in this bundle. NULL for a default list.
+   *   Ex: ['styleFile', 'styleUrl']
+   *   The following aliases are allowed: '*all*', '*default*', '*script*', '*style*'
+   * @return CRM_Core_Resources_Bundle
+   */
+  public static function createBasicBundle($name, $init = NULL, $types = NULL) {
+    $bundle = new CRM_Core_Resources_Bundle($name, $types);
+    if ($init !== NULL) {
+      $init($bundle);
+    }
+    CRM_Utils_Hook::alterBundle($bundle);
+    $bundle->fillDefaults();
+    return $bundle;
+  }
+
   /**
    * The 'bundle.bootstrap3' service is a collection of resources which are
    * loaded when a page needs to support Boostrap CSS v3.
diff --git a/tests/phpunit/CRM/Core/ResourcesTest.php b/tests/phpunit/CRM/Core/ResourcesTest.php
index 93596d0c0fdc..4adb1aa1ab41 100644
--- a/tests/phpunit/CRM/Core/ResourcesTest.php
+++ b/tests/phpunit/CRM/Core/ResourcesTest.php
@@ -60,6 +60,25 @@ public function tearDown() {
     $_GET = $this->originalGet;
   }
 
+  public function testCreateBasicBundle() {
+    $hits = [];
+
+    $init = function(CRM_Core_Resources_Bundle $b) use (&$hits) {
+      $hits[] = 'init_' . $b->name;
+      $b->addScript('doStuff();');
+    };
+    $alter = function ($e) use (&$hits) {
+      $hits[] = 'alter_' . $e->bundle->name;
+      $e->bundle->addScript('alert();');
+    };
+
+    Civi::dispatcher()->addListener('hook_civicrm_alterBundle', $alter);
+    $b = CRM_Core_Resources_Common::createBasicBundle('cheese', $init);
+    $this->assertEquals('cheese', $b->name);
+    $this->assertEquals(['init_cheese', 'alter_cheese'], $hits);
+    $this->assertEquals(['doStuff();', 'alert();'], array_values(CRM_Utils_Array::collect('script', $b->getAll())));
+  }
+
   /**
    * Make two bundles (multi-regional). Add them to CRM_Core_Resources.
    * Ensure that the resources land in the right regions.

From b7edabe813db467aff6dd1ea083d798089198655 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 28 Sep 2020 14:41:10 +1300
Subject: [PATCH 800/834] dev/core#1790 - Contact Card - Email Links

Alternate to https://github.com/civicrm/civicrm-core/pull/17517

The current PR stalled on the issue that passing 'email' to the email task could load up
the wrong contact. This gets around that by doing a separate (but hopefully quick) lookup
to grab the email id. I also made it dependent on the url having is_show_email_task=1 in
it. I went back & forwards on that vs is_backoffice
---
 CRM/Contact/BAO/Contact/Utils.php             |  2 +-
 CRM/Profile/Page/Dynamic.php                  | 64 ++++++++++++++++++-
 CRM/Profile/Page/View.php                     | 10 ++-
 .../phpunit/CRM/Activity/Form/SearchTest.php  |  2 +-
 tests/phpunit/CRM/Financial/Page/AjaxTest.php |  2 +-
 .../CRM/Member/Selector/SearchTest.php        |  2 +-
 tests/phpunit/CRM/Pledge/Form/SearchTest.php  |  2 +-
 7 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
index 056f792c290f..7e5477e18e04 100644
--- a/CRM/Contact/BAO/Contact/Utils.php
+++ b/CRM/Contact/BAO/Contact/Utils.php
@@ -80,7 +80,7 @@ public static function getImage($contactType, $urlOnly = FALSE, $contactId = NUL
       }
 
       $profileURL = CRM_Utils_System::url('civicrm/profile/view',
-        "reset=1&gid={$summaryOverlayProfileId}&id={$contactId}&snippet=4"
+        "reset=1&gid={$summaryOverlayProfileId}&id={$contactId}&snippet=4&is_show_email_task=1"
       );
 
       $imageInfo[$contactType]['summary-link'] = '<a href="' . $profileURL . '" class="crm-summary-link">' . $imageInfo[$contactType]['image'] . '</a>';
diff --git a/CRM/Profile/Page/Dynamic.php b/CRM/Profile/Page/Dynamic.php
index 67f7edf0d508..7ce7eeef62bb 100644
--- a/CRM/Profile/Page/Dynamic.php
+++ b/CRM/Profile/Page/Dynamic.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Email;
+
 /**
  *
  * @package CRM
@@ -78,6 +80,13 @@ class CRM_Profile_Page_Dynamic extends CRM_Core_Page {
 
   protected $_recordId = NULL;
 
+  /**
+   * Should the primary email be converted into a link, if emailabe.
+   *
+   * @var bool
+   */
+  protected $isShowEmailTaskLink = FALSE;
+
   /**
    *
    * fetch multirecord as well as non-multirecord fields
@@ -97,15 +106,18 @@ class CRM_Profile_Page_Dynamic extends CRM_Core_Page {
    * @param bool $skipPermission
    * @param null $profileIds
    *
-   * @return \CRM_Profile_Page_Dynamic
+   * @param bool $isShowEmailTaskLink
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function __construct($id, $gid, $restrict, $skipPermission = FALSE, $profileIds = NULL) {
+  public function __construct($id, $gid, $restrict, $skipPermission = FALSE, $profileIds = NULL, $isShowEmailTaskLink = FALSE) {
     parent::__construct();
 
     $this->_id = $id;
     $this->_gid = $gid;
     $this->_restrict = $restrict;
     $this->_skipPermission = $skipPermission;
+    $this->isShowEmailTaskLink = $isShowEmailTaskLink;
 
     if (!array_key_exists('multiRecord', $_GET)) {
       $this->set('multiRecord', NULL);
@@ -315,6 +327,11 @@ public function run() {
         $labels[$index] = preg_replace('/\s+|\W+/', '_', $name);
       }
 
+      if ($this->isShowEmailTaskLink) {
+        foreach ($this->getEmailFields($fields) as $fieldName) {
+          $values[$fields[$fieldName]['title']] = $this->getLinkedEmail($values[$fields[$fieldName]['title']]);
+        }
+      }
       foreach ($values as $title => $value) {
         $profileFields[$labels[$title]] = [
           'label' => $title,
@@ -416,4 +433,47 @@ public function overrideExtraTemplateFileName() {
     return $fileName ? $fileName : parent::overrideExtraTemplateFileName();
   }
 
+  /**
+   * Get the email field as a task link, if not on hold or set to do_not_email.
+   *
+   * @param string $email
+   *
+   * @return string
+   * @throws \API_Exception
+   * @throws \Civi\API\Exception\UnauthorizedException
+   */
+  protected function getLinkedEmail($email): string {
+    if (!$email) {
+      return '';
+    }
+    $emailID = Email::get()->setOrderBy(['is_primary' => 'DESC'])->setWhere([['contact_id', '=', $this->_id], ['email', '=', $email], ['on_hold', '=', FALSE], ['contact.is_deceased', '=', FALSE], ['contact.is_deleted', '=', FALSE], ['contact.do_not_email', '=', FALSE]])->execute()->first()['id'];
+    if (!$emailID) {
+      return $email;
+    }
+    $emailPopupUrl = CRM_Utils_System::url('civicrm/activity/email/add', [
+      'action' => 'add',
+      'reset' => '1',
+      'email_id' => $emailID,
+    ], TRUE);
+
+    return '<a class="crm-popup" href="' . $emailPopupUrl . '">' . $email . '</a>';
+  }
+
+  /**
+   * Get the email fields from within the fields array.
+   *
+   * @param array $fields
+   */
+  protected function getEmailFields(array $fields): array {
+    $emailFields = [];
+    foreach (array_keys($fields) as $fieldName) {
+      if (substr($fieldName, 0, 6) === 'email-'
+          && (is_numeric(substr($fieldName, 6)) || substr($fieldName, 6) ===
+        'Primary')) {
+        $emailFields[] = $fieldName;
+      }
+    }
+    return $emailFields;
+  }
+
 }
diff --git a/CRM/Profile/Page/View.php b/CRM/Profile/Page/View.php
index 54f563d4e9e4..185980e8ed6f 100644
--- a/CRM/Profile/Page/View.php
+++ b/CRM/Profile/Page/View.php
@@ -35,6 +35,13 @@ class CRM_Profile_Page_View extends CRM_Core_Page {
    */
   protected $_gid;
 
+  /**
+   * Should the primary email be converted into a link, if emailabe.
+   *
+   * @var bool
+   */
+  protected $isShowEmailTaskLink = FALSE;
+
   /**
    * Heart of the viewing process. The runner gets all the meta data for
    * the contact and calls the appropriate type of page to view.
@@ -44,6 +51,7 @@ public function preProcess() {
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive',
       $this, FALSE
     );
+    $this->isShowEmailTaskLink = CRM_Utils_Request::retrieve('is_show_email_task', 'Positive', $this);
     if (!$this->_id) {
       $session = CRM_Core_Session::singleton();
       $this->_id = $session->get('userID');
@@ -77,7 +85,7 @@ public function preProcess() {
 
     $anyContent = TRUE;
     if ($this->_gid) {
-      $page = new CRM_Profile_Page_Dynamic($this->_id, $this->_gid, 'Profile', FALSE, $profileIds);
+      $page = new CRM_Profile_Page_Dynamic($this->_id, $this->_gid, 'Profile', FALSE, $profileIds, $this->isShowEmailTaskLink);
       $profileGroup = [];
       $profileGroup['title'] = NULL;
       $profileGroup['content'] = $page->run();
diff --git a/tests/phpunit/CRM/Activity/Form/SearchTest.php b/tests/phpunit/CRM/Activity/Form/SearchTest.php
index a976d2783914..de46b7eeebf1 100644
--- a/tests/phpunit/CRM/Activity/Form/SearchTest.php
+++ b/tests/phpunit/CRM/Activity/Form/SearchTest.php
@@ -38,7 +38,7 @@ public function testSearch() {
     $this->assertEquals([
       [
         'contact_id' => '3',
-        'contact_type' => '<a href="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4" class="crm-summary-link"><div class="icon crm-icon Individual-icon"></div></a>',
+        'contact_type' => '<a href="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4&amp;is_show_email_task=1" class="crm-summary-link"><div class="icon crm-icon Individual-icon"></div></a>',
         'sort_name' => 'Anderson, Anthony',
         'display_name' => 'Mr. Anthony Anderson II',
         'activity_id' => '1',
diff --git a/tests/phpunit/CRM/Financial/Page/AjaxTest.php b/tests/phpunit/CRM/Financial/Page/AjaxTest.php
index d6c349bc6130..edef40e678c9 100644
--- a/tests/phpunit/CRM/Financial/Page/AjaxTest.php
+++ b/tests/phpunit/CRM/Financial/Page/AjaxTest.php
@@ -33,7 +33,7 @@ public function testGetFinancialTransactionsList() {
     $_REQUEST['return'] = TRUE;
     $json = CRM_Financial_Page_AJAX::getFinancialTransactionsList();
     $json = str_replace(rtrim(CIVICRM_UF_BASEURL, '/'), 'http://FIX ME', $json);
-    $this->assertEquals($json, '{"sEcho": 1, "iTotalRecords": 1, "iTotalDisplayRecords": 1, "aaData": [ ["","<a href=\"/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4\" class=\"crm-summary-link\"><div'
+    $this->assertEquals($json, '{"sEcho": 1, "iTotalRecords": 1, "iTotalDisplayRecords": 1, "aaData": [ ["","<a href=\"/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4&amp;is_show_email_task=1\" class=\"crm-summary-link\"><div'
     . ' class=\"icon crm-icon Individual-icon\"></div></a>","<a href=/index.php?q=civicrm/contact/view&amp;reset=1&amp;cid=3>Anderson, Anthony</a>","$ 100.00","12345","' . CRM_Utils_Date::customFormat(date('Ymd')) . ' 12:00 AM","' . CRM_Utils_Date::customFormat(date('Ymd')) . ' 12:00 AM",'
     . '"Credit Card","Completed","Donation","<span><a href=\"/index.php?q=civicrm/contact/view/contribution&amp;reset=1&amp;id=1&amp;cid=3&amp;action=view&amp;context=contribution&amp;'
     . 'selectedChild=contribute\" class=\"action-item crm-hover-button\" title=\'View Contribution\' >View</a></span>"]] }');
diff --git a/tests/phpunit/CRM/Member/Selector/SearchTest.php b/tests/phpunit/CRM/Member/Selector/SearchTest.php
index 3eafc2979116..55e50139b67e 100644
--- a/tests/phpunit/CRM/Member/Selector/SearchTest.php
+++ b/tests/phpunit/CRM/Member/Selector/SearchTest.php
@@ -35,7 +35,7 @@ public function testSelectorGetRows() {
     $this->assertEquals([
       'contact_id' => $this->_contactID,
       'membership_id' => $membershipID,
-      'contact_type' => '<a href="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=' . $this->_contactID . '&amp;snippet=4" class="crm-summary-link"><div class="icon crm-icon Individual-icon"></div></a>',
+      'contact_type' => '<a href="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=' . $this->_contactID . '&amp;snippet=4&amp;is_show_email_task=1" class="crm-summary-link"><div class="icon crm-icon Individual-icon"></div></a>',
       'sort_name' => 'Anderson, Anthony',
       'membership_type' => 'General',
       'membership_join_date' => date('Y-m-d'),
diff --git a/tests/phpunit/CRM/Pledge/Form/SearchTest.php b/tests/phpunit/CRM/Pledge/Form/SearchTest.php
index 9e34d8099be0..d8bba2d71ce4 100644
--- a/tests/phpunit/CRM/Pledge/Form/SearchTest.php
+++ b/tests/phpunit/CRM/Pledge/Form/SearchTest.php
@@ -53,7 +53,7 @@ public function testSearch() {
       'pledge_status_name' => 'Pending Label**',
       'checkbox' => 'mark_x_1',
       'action' => '<span><a href="/index.php?q=civicrm/contact/view/pledge&amp;reset=1&amp;id=1&amp;cid=3&amp;action=view&amp;context=search&amp;selectedChild=pledge&amp;key=' . $qfKey . '" class="action-item crm-hover-button" title=' . "'" . 'View Pledge' . "'" . ' >View</a><a href="/index.php?q=civicrm/contact/view/pledge&amp;reset=1&amp;action=update&amp;id=1&amp;cid=3&amp;context=search&amp;key=' . $qfKey . '" class="action-item crm-hover-button" title=' . "'" . 'Edit Pledge' . "'" . ' >Edit</a></span><span class=' . "'" . 'btn-slide crm-hover-button' . "'" . '>more<ul class=' . "'" . 'panel' . "'" . '><li><a href="/index.php?q=civicrm/contact/view/pledge&amp;reset=1&amp;action=detach&amp;id=1&amp;cid=3&amp;context=search&amp;key=' . $qfKey . '" class="action-item crm-hover-button" title=' . "'" . 'Cancel Pledge' . "'" . ' onclick = "return confirm(' . "'" . 'Cancelling this pledge will also cancel any scheduled (and not completed) pledge payments. This action cannot be undone. Do you want to continue?' . "'" . ');">Cancel</a></li><li><a href="/index.php?q=civicrm/contact/view/pledge&amp;reset=1&amp;action=delete&amp;id=1&amp;cid=3&amp;context=search&amp;key=' . $qfKey . '" class="action-item crm-hover-button small-popup" title=' . "'" . 'Delete Pledge' . "'" . ' >Delete</a></li></ul></span>',
-      'contact_type' => '<a href="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4" class="crm-summary-link"><div class="icon crm-icon Individual-icon"></div></a>',
+      'contact_type' => '<a href="/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4&amp;is_show_email_task=1" class="crm-summary-link"><div class="icon crm-icon Individual-icon"></div></a>',
     ], $rows[0]);
   }
 

From 96622c8c36fb7f5cc1708e4574451e5f29ef96aa Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 2 Oct 2020 00:31:18 -0700
Subject: [PATCH 801/834] (NFC) Update docblock in CRM_Core_Resources_Common

---
 CRM/Core/Resources/Common.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/Resources/Common.php b/CRM/Core/Resources/Common.php
index 5e339a04e298..13b86a233dfe 100644
--- a/CRM/Core/Resources/Common.php
+++ b/CRM/Core/Resources/Common.php
@@ -17,16 +17,22 @@ class CRM_Core_Resources_Common {
   const REGION = 'html-header';
 
   /**
-   * A "basic" bundle has an
+   * Create a "basic" (generic) bundle.
+   *
+   * The bundle goes through some lifecycle events (like `hook_alterBundle`).
+   *
+   * To define default content for a basic bundle, you may either give an
+   * `$init` function or subscribe to `hook_alterBundle`.
    *
    * @param string $name
    *   Symbolic name of the bundle.
    * @param callable|NULL $init
    *   Optional initialization function. Populate default resources.
-   *   ie `function($bundle): void`
+   *   Signature: `function($bundle): void`
+   *   Example: `function myinit($b) { $b->addScriptFile(...)->addStyleFile(...); }`
    * @param string|string[] $types
    *   List of resource-types to permit in this bundle. NULL for a default list.
-   *   Ex: ['styleFile', 'styleUrl']
+   *   Example: ['styleFile', 'styleUrl']
    *   The following aliases are allowed: '*all*', '*default*', '*script*', '*style*'
    * @return CRM_Core_Resources_Bundle
    */

From 484d8c18ea9b409343abc0e69c1fa7aff9972e92 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 28 Sep 2020 16:17:16 -0400
Subject: [PATCH 802/834] Search ext: Ability to load saved searches by id

---
 ext/search/ang/search.module.js | 37 +++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/ext/search/ang/search.module.js b/ext/search/ang/search.module.js
index cec26c5d6ea0..1927554dd8b7 100644
--- a/ext/search/ang/search.module.js
+++ b/ext/search/ang/search.module.js
@@ -20,6 +20,7 @@
           // For paths like /create/Contact, return the stashed savedSearch if present
           savedSearch: function($route, $location, $timeout, crmApi4) {
             var retrievedSearch = savedSearch,
+              getParams,
               params = $route.current.params;
             savedSearch = undefined;
             switch (params.mode) {
@@ -27,23 +28,33 @@
                 return retrievedSearch;
 
               case 'load':
+                // Load savedSearch by `id` (the SavedSearch entity doesn't have `name`)
+                if (params.entity === 'SavedSearch' && /^\d+$/.test(params.name)) {
+                  getParams = {
+                    where: [['id', '=', params.name]]
+                  };
+                }
+                // Load attached entity (e.g. Smart Groups) with a join via saved_search_id
+                else if (params.entity === 'Group' && params.name) {
+                  getParams = {
+                    select: ['id', 'title', 'saved_search_id', 'saved_search.*'],
+                    where: [['name', '=', params.name]]
+                  };
+                }
                 // In theory savedSearches could be attached to something other than groups, but for now that's not supported
-                if (params.entity !== 'Group' || !params.name) {
+                else {
                   throw 'Failed to load ' + params.entity;
                 }
-                return crmApi4(params.entity, 'get', {
-                  select: ['id', 'title', 'saved_search_id', 'saved_search.api_entity', 'saved_search.api_params'],
-                  where: [['name', '=', params.name]]
-                }, 0).then(function(retrieved) {
-                  savedSearch = {
-                    type: params.entity,
-                    id: retrieved.id,
-                    title: retrieved.title,
-                    saved_search_id: retrieved.saved_search_id,
-                    api_params: retrieved['saved_search.api_params']
-                  };
+                return crmApi4(params.entity, 'get', getParams, 0).then(function(retrieved) {
+                  savedSearch = retrieved;
+                  savedSearch.type = params.entity;
+                  if (params.entity !== 'SavedSearch') {
+                    savedSearch.api_entity = retrieved['saved_search.api_entity'];
+                    savedSearch.api_params = retrieved['saved_search.api_params'];
+                    savedSearch.form_values = retrieved['saved_search.form_values'];
+                  }
                   $timeout(function() {
-                    $location.url('/create/' + retrieved['saved_search.api_entity']);
+                    $location.url('/create/' + savedSearch.api_entity);
                   });
                 });
             }

From 2175ca52c027c71ebbd7bf523bf77edf0d32972c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Sep 2020 16:22:50 -0400
Subject: [PATCH 803/834] Search ext: fix missing titles in multivalue custom
 entities

---
 ext/search/CRM/Search/Page/Ang.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index 82508a201bb2..c2619910c79b 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -84,7 +84,7 @@ private function getOperators() {
    */
   private function getSchema() {
     $schema = \Civi\Api4\Entity::get()
-      ->addSelect('name', 'titlePlural', 'description', 'icon')
+      ->addSelect('name', 'title', 'titlePlural', 'description', 'icon')
       ->addWhere('name', '!=', 'Entity')
       ->addOrderBy('titlePlural')
       ->setChain([
@@ -99,6 +99,8 @@ private function getSchema() {
         if ($loadOptions) {
           $entity['optionsLoaded'] = TRUE;
         }
+        // Because multivalue custom pseudo-entities don't have titlePlural
+        $entity['titlePlural'] = $entity['titlePlural'] ?? $entity['title'];
         $entity['fields'] = civicrm_api4($entity['name'], 'getFields', [
           'select' => $getFields,
           'where' => [['permission', 'IS NULL']],

From 73d7dbcd37687a6e5a971f48e443161dac02a84b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 29 Sep 2020 11:30:19 -0400
Subject: [PATCH 804/834] Search ext: Choose smart group contact column

---
 ext/search/CRM/Search/Page/Ang.php           |  2 +-
 ext/search/ang/search/SaveSmartGroup.ctrl.js | 42 +++++++++++++++++---
 ext/search/ang/search/crmSearch.component.js | 14 +++----
 ext/search/ang/search/saveSmartGroup.html    | 20 +++++++---
 4 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/ext/search/CRM/Search/Page/Ang.php b/ext/search/CRM/Search/Page/Ang.php
index c2619910c79b..0c9c228f2163 100644
--- a/ext/search/CRM/Search/Page/Ang.php
+++ b/ext/search/CRM/Search/Page/Ang.php
@@ -90,7 +90,7 @@ private function getSchema() {
       ->setChain([
         'get' => ['$name', 'getActions', ['where' => [['name', '=', 'get']]], ['params']],
       ])->execute();
-    $getFields = ['name', 'label', 'description', 'options', 'input_type', 'input_attrs', 'data_type', 'serialize'];
+    $getFields = ['name', 'label', 'description', 'options', 'input_type', 'input_attrs', 'data_type', 'serialize', 'fk_entity'];
     foreach ($schema as $entity) {
       // Skip if entity doesn't have a 'get' action or the user doesn't have permission to use get
       if ($entity['get']) {
diff --git a/ext/search/ang/search/SaveSmartGroup.ctrl.js b/ext/search/ang/search/SaveSmartGroup.ctrl.js
index 18b0298e96f7..ece503cf2879 100644
--- a/ext/search/ang/search/SaveSmartGroup.ctrl.js
+++ b/ext/search/ang/search/SaveSmartGroup.ctrl.js
@@ -1,13 +1,15 @@
 (function(angular, $, _) {
   "use strict";
 
-  angular.module('search').controller('SaveSmartGroup', function ($scope, $element, crmApi4, dialogService) {
+  angular.module('search').controller('SaveSmartGroup', function ($scope, $element, $timeout, crmApi4, dialogService, searchMeta) {
     var ts = $scope.ts = CRM.ts(),
-      model = $scope.model;
+      model = $scope.model,
+      joins = _.pluck((model.api_params.join || []), 0),
+      entityCount = {};
     $scope.groupEntityRefParams = {
       entity: 'Group',
       api: {
-        params: {is_hidden: 0, is_active: 1, 'saved_search_id.api_entity': model.entity},
+        params: {is_hidden: 0, is_active: 1, 'saved_search_id.api_entity': model.api_entity},
         extra: ['saved_search_id', 'description', 'visibility', 'group_type']
       },
       select: {
@@ -16,6 +18,36 @@
         placeholder: ts('Select existing group')
       }
     };
+    // Find all possible search columns that could serve as contact_id for the smart group
+    $scope.columns = _.transform([model.api_entity].concat(joins), function(columns, joinExpr) {
+      var joinName = joinExpr.split(' AS '),
+        entityName = joinName[0],
+        entity = searchMeta.getEntity(entityName),
+        prefix = joinName[1] ? joinName[1] + '.' : '';
+      _.each(entity.fields, function(field) {
+        if ((entityName === 'Contact' && field.name === 'id') || field.fk_entity === 'Contact') {
+          columns.push({
+            id: prefix + field.name,
+            text: entity.titlePlural + (entityCount[entityName] ? ' ' + entityCount[entityName] : '') + ': ' + field.label,
+            icon: entity.icon
+          });
+        }
+      });
+      entityCount[entityName] = 1 + (entityCount[entityName] || 1);
+    });
+
+    if (!$scope.columns.length) {
+      CRM.alert(ts('Cannot create smart group; search does not include any contacts.'), ts('Error'));
+      $timeout(function() {
+        dialogService.cancel('saveSearchDialog');
+      });
+      return;
+    }
+
+    // Pick the first applicable column for contact id
+    model.api_params.select[0] = _.intersection(model.api_params.select, _.pluck($scope.columns, 'id'))[0] || $scope.columns[0].name;
+    model.api_params.select.length = 1;
+
     if (!CRM.checkPerm('administer reserved groups')) {
       $scope.groupEntityRefParams.api.params.is_reserved = 0;
     }
@@ -45,8 +77,8 @@
       group.group_type = model.group_type;
       group.saved_search_id = '$id';
       var savedSearch = {
-        api_entity: model.entity,
-        api_params: model.params
+        api_entity: model.api_entity,
+        api_params: model.api_params
       };
       if (group.id) {
         savedSearch.id = model.saved_search_id;
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 88ba4c7b11d4..33ed7f3ca97b 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -558,21 +558,19 @@
       };
 
       $scope.saveGroup = function() {
-        var selectField = ctrl.entity === 'Contact' ? 'id' : 'contact_id';
-        if (ctrl.entity !== 'Contact' && !searchMeta.getField('contact_id')) {
-          CRM.alert(ts('Cannot create smart group from %1.', {1: searchMeta.getEntity(true).titlePlural}), ts('Missing contact_id'), 'error', {expires: 5000});
-          return;
-        }
         var model = {
           title: '',
           description: '',
           visibility: 'User and User Admin Only',
           group_type: [],
           id: ctrl.load ? ctrl.load.id : null,
-          entity: ctrl.entity,
-          params: angular.extend({}, ctrl.params, {version: 4})
+          api_entity: ctrl.entity,
+          api_params: _.cloneDeep(angular.extend({}, ctrl.params, {version: 4}))
         };
-        delete model.params.orderBy;
+        delete model.api_params.orderBy;
+        if (ctrl.load && ctrl.load.api_params) {
+          model.api_params.select = ctrl.load.api_params.select;
+        }
         var options = CRM.utils.adjustDialogDefaults({
           autoOpen: false,
           title: ts('Save smart group')
diff --git a/ext/search/ang/search/saveSmartGroup.html b/ext/search/ang/search/saveSmartGroup.html
index a0caf4af2c19..a2ef05604734 100644
--- a/ext/search/ang/search/saveSmartGroup.html
+++ b/ext/search/ang/search/saveSmartGroup.html
@@ -1,22 +1,30 @@
 <form id="bootstrap-theme">
   <div ng-controller="SaveSmartGroup">
+    <div crm-ui-debug="model"></div>
     <input class="form-control" id="api-save-search-select-group" ng-model="model.id" crm-entityref="groupEntityRefParams" >
     <label ng-show="!model.id">{{:: ts('Or') }}</label>
-    <input class="form-control" placeholder="Create new group" ng-model="model.title" ng-show="!model.id">
+    <input class="form-control" placeholder="{{:: ts('Create new group') }}" ng-model="model.title" ng-show="!model.id">
+    <hr />
+    <div class="form-inline">
+     <label for="api-save-search-select-column">{{:: ts('Contact Column:') }}</label>
+      <input id="api-save-search-select-column" ng-model="model.api_params.select[0]" class="form-control" crm-ui-select="{data: columns}"/>
+    </div>
     <hr />
     <label>{{:: ts('Description:') }}</label>
     <textarea class="form-control" ng-model="model.description"></textarea>
-    <label>{{:: ts('Group Type:') }}</label>
     <div class="form-inline">
-      <div class="checkbox" ng-repeat="option in groupFields.group_type.options track by option.id">
+      <label>{{:: ts('Group Type:') }} </label>
+      <div class="checkbox" ng-repeat="option in groupFields.group_type.options track by option.id">&nbsp;
         <label>
           <input type="checkbox" checklist-model="model.group_type" checklist-value="option.id">
           {{ option.label }}
-        </label>
+        </label>&nbsp;
       </div>
     </div>
-    <label>{{:: ts('Visibility:') }}</label>
-    <select class="form-control" ng-model="model.visibility" ng-options="item.id as item.label for item in groupFields.visibility.options track by item.id"></select>
+    <div class="form-inline">
+      <label>{{:: ts('Visibility:') }}</label>
+      <select class="form-control" ng-model="model.visibility" ng-options="item.id as item.label for item in groupFields.visibility.options track by item.id" crm-ui-select></select>
+    </div>
     <hr />
     <div class="buttons pull-right">
       <button type="button" ng-click="cancel()" class="btn btn-danger">{{:: ts('Cancel') }}</button>

From 23e56526739ee92501be045d801c0854fb544e28 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 30 Sep 2020 14:56:59 -0400
Subject: [PATCH 805/834] Search ext: Extend api4 smart groups to work with
 HAVING

---
 CRM/Contact/BAO/GroupContactCache.php         | 16 ++++++----
 CRM/Utils/API/HTMLInputCoder.php              |  2 ++
 ext/search/ang/search/SaveSmartGroup.ctrl.js  |  4 +--
 ext/search/ang/search/crmSearch.component.js  |  4 +--
 ext/search/ang/search/saveSmartGroup.html     |  1 -
 .../phpunit/api/v4/Entity/SavedSearchTest.php | 32 +++++++++++++++++++
 6 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php
index d4700184f81b..ce082757662b 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\Query\SqlExpression;
+
 /**
  *
  * @package CRM
@@ -701,16 +703,18 @@ public static function invalidateGroupContactCache($groupID) {
    */
   protected static function getApiSQL(array $savedSearch, string $addSelect, string $excludeClause) {
     $apiParams = $savedSearch['api_params'] + ['select' => ['id'], 'checkPermissions' => FALSE];
-    list($idField) = explode(' AS ', $apiParams['select'][0]);
-    $apiParams['select'] = [
-      $addSelect,
-      $idField,
-    ];
+    $idField = SqlExpression::convert($apiParams['select'][0], TRUE)->getAlias();
+    // Unless there's a HAVING clause, we don't care about other columns
+    if (empty($apiParams['having'])) {
+      $apiParams['select'] = array_slice($apiParams['select'], 0, 1);
+    }
     $api = \Civi\API\Request::create($savedSearch['api_entity'], 'get', $apiParams);
     $query = new \Civi\Api4\Query\Api4SelectQuery($api);
     $query->forceSelectId = FALSE;
     $query->getQuery()->having("$idField $excludeClause");
-    return $query->getSql();
+    $sql = $query->getSql();
+    // Place sql in a nested sub-query, otherwise HAVING is impossible on any field other than contact_id
+    return "SELECT $addSelect, `$idField` AS contact_id FROM ($sql) api_query";
   }
 
   /**
diff --git a/CRM/Utils/API/HTMLInputCoder.php b/CRM/Utils/API/HTMLInputCoder.php
index fa5de2b9643d..50634d22bc8d 100644
--- a/CRM/Utils/API/HTMLInputCoder.php
+++ b/CRM/Utils/API/HTMLInputCoder.php
@@ -109,6 +109,8 @@ public function getSkipFields() {
         'header',
         // https://lab.civicrm.org/dev/core/issues/1286
         'footer',
+        // SavedSearch entity
+        'api_params',
       ];
       $custom = CRM_Core_DAO::executeQuery('SELECT id FROM civicrm_custom_field WHERE html_type = "RichTextEditor"');
       while ($custom->fetch()) {
diff --git a/ext/search/ang/search/SaveSmartGroup.ctrl.js b/ext/search/ang/search/SaveSmartGroup.ctrl.js
index ece503cf2879..47837b2c8c10 100644
--- a/ext/search/ang/search/SaveSmartGroup.ctrl.js
+++ b/ext/search/ang/search/SaveSmartGroup.ctrl.js
@@ -45,8 +45,7 @@
     }
 
     // Pick the first applicable column for contact id
-    model.api_params.select[0] = _.intersection(model.api_params.select, _.pluck($scope.columns, 'id'))[0] || $scope.columns[0].name;
-    model.api_params.select.length = 1;
+    model.api_params.select.unshift(_.intersection(model.api_params.select, _.pluck($scope.columns, 'id'))[0] || $scope.columns[0].id);
 
     if (!CRM.checkPerm('administer reserved groups')) {
       $scope.groupEntityRefParams.api.params.is_reserved = 0;
@@ -76,6 +75,7 @@
       group.visibility = model.visibility;
       group.group_type = model.group_type;
       group.saved_search_id = '$id';
+      model.api_params.select = _.unique(model.api_params.select);
       var savedSearch = {
         api_entity: model.api_entity,
         api_params: model.api_params
diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index 33ed7f3ca97b..cda1af0d57d5 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -568,8 +568,8 @@
           api_params: _.cloneDeep(angular.extend({}, ctrl.params, {version: 4}))
         };
         delete model.api_params.orderBy;
-        if (ctrl.load && ctrl.load.api_params) {
-          model.api_params.select = ctrl.load.api_params.select;
+        if (ctrl.load && ctrl.load.api_params && ctrl.load.api_params.select && ctrl.load.api_params.select[0]) {
+          model.api_params.select.unshift(ctrl.load.api_params.select[0]);
         }
         var options = CRM.utils.adjustDialogDefaults({
           autoOpen: false,
diff --git a/ext/search/ang/search/saveSmartGroup.html b/ext/search/ang/search/saveSmartGroup.html
index a2ef05604734..3589ff223401 100644
--- a/ext/search/ang/search/saveSmartGroup.html
+++ b/ext/search/ang/search/saveSmartGroup.html
@@ -1,6 +1,5 @@
 <form id="bootstrap-theme">
   <div ng-controller="SaveSmartGroup">
-    <div crm-ui-debug="model"></div>
     <input class="form-control" id="api-save-search-select-group" ng-model="model.id" crm-entityref="groupEntityRefParams" >
     <label ng-show="!model.id">{{:: ts('Or') }}</label>
     <input class="form-control" placeholder="{{:: ts('Create new group') }}" ng-model="model.title" ng-show="!model.id">
diff --git a/tests/phpunit/api/v4/Entity/SavedSearchTest.php b/tests/phpunit/api/v4/Entity/SavedSearchTest.php
index 8b0b7ee4ed26..859e89f2d41c 100644
--- a/tests/phpunit/api/v4/Entity/SavedSearchTest.php
+++ b/tests/phpunit/api/v4/Entity/SavedSearchTest.php
@@ -83,4 +83,36 @@ public function testEmailSmartGroup() {
     $this->assertArrayNotHasKey($out['id'], $ins['values']);
   }
 
+  public function testSmartGroupWithHaving() {
+    $in = Contact::create(FALSE)->addValue('first_name', 'yes')->addValue('last_name', 'siree')->execute()->first();
+    $in2 = Contact::create(FALSE)->addValue('first_name', 'yessir')->addValue('last_name', 'ee')->execute()->first();
+    $out = Contact::create(FALSE)->addValue('first_name', 'yess')->execute()->first();
+
+    $savedSearch = civicrm_api4('SavedSearch', 'create', [
+      'values' => [
+        'api_entity' => 'Contact',
+        'api_params' => [
+          'version' => 4,
+          'select' => ['id', 'CONCAT(first_name, last_name) AS whole_name'],
+          'where' => [
+            ['id', '>=', $in['id']],
+          ],
+          'having' => [
+            ['whole_name', '=', 'yessiree'],
+          ],
+        ],
+      ],
+      'chain' => [
+        'group' => ['Group', 'create', ['values' => ['title' => 'Having Test', 'saved_search_id' => '$id']], 0],
+      ],
+    ])->first();
+
+    // Oops we don't have an api4 syntax yet for selecting contacts in a group.
+    $ins = civicrm_api3('Contact', 'get', ['group' => $savedSearch['group']['name'], 'options' => ['limit' => 0]]);
+    $this->assertCount(2, $ins['values']);
+    $this->assertArrayHasKey($in['id'], $ins['values']);
+    $this->assertArrayHasKey($in2['id'], $ins['values']);
+    $this->assertArrayNotHasKey($out['id'], $ins['values']);
+  }
+
 }

From 4f3a95d94f34caba5cad15c34d1638d32a8d9ef5 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 2 Oct 2020 20:44:43 -0400
Subject: [PATCH 806/834] Search ext: Fix column appearing in the aggregate
 list when it is used in GROUP_BY

The bug was that it wasn't recognizing the column name after a function was added to it.
---
 ext/search/ang/search/crmSearch.component.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/search/ang/search/crmSearch.component.js b/ext/search/ang/search/crmSearch.component.js
index cda1af0d57d5..9da0ffe8fabf 100644
--- a/ext/search/ang/search/crmSearch.component.js
+++ b/ext/search/ang/search/crmSearch.component.js
@@ -343,12 +343,12 @@
 
       // Is a column eligible to use an aggregate function?
       this.canAggregate = function(col) {
+        var info = searchMeta.parseExpr(col);
         // If the column is used for a groupBy, no
-        if (ctrl.params.groupBy.indexOf(col) > -1) {
+        if (ctrl.params.groupBy.indexOf(info.path) > -1) {
           return false;
         }
         // If the entity this column belongs to is being grouped by id, then also no
-        var info = searchMeta.parseExpr(col);
         return ctrl.params.groupBy.indexOf(info.prefix + 'id') < 0;
       };
 

From 64c57b7207e3af5c73ac4df38310c01e6d4754bc Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 3 Oct 2020 09:59:47 +1300
Subject: [PATCH 807/834] dev/core#2079 [REF] clean up call to apiQuery

    This fixes
    1) fixes apiQuery to be called statically as it is a static function
    2) casts results directly to detail

This is the copy & paste source of https://github.com/civicrm/civicrm-core/pull/18664 I guess....
---
 CRM/Contact/Form/Task/Label.php               | 19 +++++++------------
 .../Form/Task/PrintMailingLabelTest.php       | 14 +++++++++++---
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/CRM/Contact/Form/Task/Label.php b/CRM/Contact/Form/Task/Label.php
index 92252cad4b54..724b6ef78645 100644
--- a/CRM/Contact/Form/Task/Label.php
+++ b/CRM/Contact/Form/Task/Label.php
@@ -96,7 +96,6 @@ public function setDefaultValues() {
    */
   public function postProcess($params = NULL) {
     $fv = $params ?: $this->controller->exportValues($this->_name);
-    $config = CRM_Core_Config::singleton();
     $locName = NULL;
     //get the address format sequence from the config file
     $mailingFormat = Civi::settings()->get('mailing_format');
@@ -146,15 +145,12 @@ public function postProcess($params = NULL) {
       $returnProperties['last_name'] = 1;
     }
 
-    $individualFormat = FALSE;
-
     /*
      * CRM-8338: replace ids of household members with the id of their household
      * so we can merge labels by household.
      */
     if (isset($fv['merge_same_household'])) {
       $this->mergeContactIdsByHousehold();
-      $individualFormat = TRUE;
     }
 
     //get the contacts information
@@ -200,13 +196,12 @@ public function postProcess($params = NULL) {
 
     //get the total number of contacts to fetch from database.
     $numberofContacts = count($this->_contactIds);
-    $query = new CRM_Contact_BAO_Query($params, $returnProperties);
-    $details = $query->apiQuery($params, $returnProperties, NULL, NULL, 0, $numberofContacts, TRUE, FALSE, TRUE, CRM_Contact_BAO_Query::MODE_CONTACTS, NULL, $primaryLocationOnly);
+    [$details] = CRM_Contact_BAO_Query::apiQuery($params, $returnProperties, NULL, NULL, 0, $numberofContacts, TRUE, FALSE, TRUE, CRM_Contact_BAO_Query::MODE_CONTACTS, NULL, $primaryLocationOnly);
     $messageToken = CRM_Utils_Token::getTokens($mailingFormat);
 
-    // $details[0] is an array of [ contactID => contactDetails ]
+    // $details is an array of [ contactID => contactDetails ]
     // also get all token values
-    CRM_Utils_Hook::tokenValues($details[0],
+    CRM_Utils_Hook::tokenValues($details,
       $this->_contactIds,
       NULL,
       $messageToken,
@@ -224,11 +219,11 @@ public function postProcess($params = NULL) {
 
     foreach ($this->_contactIds as $value) {
       foreach ($custom as $cfID) {
-        if (isset($details[0][$value]["custom_{$cfID}"])) {
-          $details[0][$value]["custom_{$cfID}"] = CRM_Core_BAO_CustomField::displayValue($details[0][$value]["custom_{$cfID}"], $cfID);
+        if (isset($details[$value]["custom_{$cfID}"])) {
+          $details[$value]["custom_{$cfID}"] = CRM_Core_BAO_CustomField::displayValue($details[$value]["custom_{$cfID}"], $cfID);
         }
       }
-      $contact = $details['0'][$value] ?? NULL;
+      $contact = $details[$value] ?? NULL;
 
       if (is_a($contact, 'CRM_Core_Error')) {
         return NULL;
@@ -271,7 +266,7 @@ public function postProcess($params = NULL) {
                   'im',
                   'openid',
                 ])) {
-                  if ($k == 'im') {
+                  if ($k === 'im') {
                     $rows[$value][$k] = $v['1']['name'];
                   }
                   else {
diff --git a/tests/phpunit/CRM/Contact/Form/Task/PrintMailingLabelTest.php b/tests/phpunit/CRM/Contact/Form/Task/PrintMailingLabelTest.php
index 9c01a73a9d3f..e07f17c5d095 100644
--- a/tests/phpunit/CRM/Contact/Form/Task/PrintMailingLabelTest.php
+++ b/tests/phpunit/CRM/Contact/Form/Task/PrintMailingLabelTest.php
@@ -15,7 +15,7 @@
   */
 class CRM_Contact_Form_Task_PrintMailingLabelTest extends CiviUnitTestCase {
 
-  protected $_contactIds = NULL;
+  protected $_contactIds;
 
   protected function setUp() {
     parent::setUp();
@@ -25,6 +25,14 @@ protected function setUp() {
     ];
   }
 
+  /**
+   * Clean up after test.
+   */
+  protected function tearDown() {
+    unset($this->_contactIds);
+    parent::tearDown();
+  }
+
   /**
    * core/issue-1158: Test the mailing label rows contain the primary addresses when location_type_id = none (as primary) is chosen in form
    */
@@ -38,7 +46,7 @@ public function testMailingLabel() {
       // create the non-primary address first
       foreach (['non-primary', 'primary'] as $flag) {
         // @TODO: bug - this doesn't affect as if its the first and only address created for a contact then it always consider it as primary
-        $isPrimary = ($flag == 'primary');
+        $isPrimary = ($flag === 'primary');
         $streetName = substr(sha1(rand()), 0, 7);
         $addresses[$contactID][$flag] = $this->callAPISuccess('Address', 'create', [
           'street_name' => $streetName,
@@ -53,7 +61,7 @@ public function testMailingLabel() {
           'sequential' => 1,
         ])['values'][0];
 
-        if ($flag == 'non-primary') {
+        if ($flag === 'non-primary') {
           $addresses[$contactID][$flag] = $this->callAPISuccess('Address', 'create', [
             'is_primary' => $isPrimary,
             'id' => $addresses[$contactID][$flag]['id'],

From 146058dad1d0b7a4a791cba6cb09ebef797c3959 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sat, 3 Oct 2020 12:46:15 -0400
Subject: [PATCH 808/834] handle missing array member

---
 CRM/Activity/BAO/Activity.php                 |  2 +-
 .../phpunit/CRM/Activity/BAO/ActivityTest.php | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 60ffb77aa5db..8414c93660d9 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2566,7 +2566,7 @@ public static function getContactActivitySelector(&$params) {
             }
           }
         }
-        elseif (!$values['target_contact_name']) {
+        elseif (empty($values['target_contact_name'])) {
           $activity['target_contact_name'] = '<em>n/a</em>';
         }
 
diff --git a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
index 913728bc0869..b6a39ba499c7 100644
--- a/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
+++ b/tests/phpunit/CRM/Activity/BAO/ActivityTest.php
@@ -213,6 +213,35 @@ public function testTargetContactNotavaliable() {
     $this->cleanUpAfterACLs();
   }
 
+  /**
+   * Check for errors when viewing a contact's activity tab when there
+   * is an activity that doesn't have a target (With Contact).
+   */
+  public function testActivitySelectorNoTargets() {
+    $contact_id = $this->individualCreate([], 0, TRUE);
+    $activity = $this->callAPISuccess('activity', 'create', [
+      'source_contact_id' => $contact_id,
+      'activity_type_id' => 'Meeting',
+      'subject' => 'Lonely Meeting',
+      'details' => 'Here at this meeting all by myself and no other contacts.',
+    ]);
+    $input = [
+      '_raw_values' => [],
+      'offset' => 0,
+      'rp' => 25,
+      'page' => 1,
+      'context' => 'activity',
+      'contact_id' => $contact_id,
+    ];
+    $output = CRM_Activity_BAO_Activity::getContactActivitySelector($input);
+    $this->assertEquals($activity['id'], $output['data'][0]['DT_RowId']);
+    $this->assertEquals('<em>n/a</em>', $output['data'][0]['target_contact_name']);
+    $this->assertEquals('Lonely Meeting', $output['data'][0]['subject']);
+
+    $this->callAPISuccess('activity', 'delete', ['id' => $activity['id']]);
+    $this->callAPISuccess('contact', 'delete', ['id' => $contact_id]);
+  }
+
   /**
    * Test case for deleteActivity() method.
    *

From 4367e9641356b13764aceb289c46b6023c6c6bb8 Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Sat, 20 Jun 2020 13:14:42 -0400
Subject: [PATCH 809/834] Attributes for a form element should always be an
 array

---
 CRM/Admin/Form/Job.php                        |   2 +-
 CRM/Admin/Form/MessageTemplates.php           |   4 +-
 CRM/Admin/Form/PdfFormats.php                 |   2 +-
 CRM/Contact/Form/Task/EmailTrait.php          |   2 +-
 .../Form/ContributionPage/Premium.php         |   2 +-
 CRM/Contribute/Form/ManagePremiums.php        |   6 +-
 CRM/Core/BAO/CustomField.php                  | 143 +++++++++---------
 CRM/Core/Form.php                             |  11 +-
 CRM/Import/DataSource/SQL.php                 |   2 +-
 CRM/Price/Form/Field.php                      |   2 +-
 CRM/SMS/Form/Provider.php                     |   2 +-
 11 files changed, 91 insertions(+), 87 deletions(-)

diff --git a/CRM/Admin/Form/Job.php b/CRM/Admin/Form/Job.php
index dec88aeeab13..2738c1b49c17 100644
--- a/CRM/Admin/Form/Job.php
+++ b/CRM/Admin/Form/Job.php
@@ -101,7 +101,7 @@ public function buildQuickForm($check = FALSE) {
     $this->add('datepicker', 'scheduled_run_date', ts('Scheduled Run Date'), NULL, FALSE, ['minDate' => date('Y-m-d')]);
 
     $this->add('textarea', 'parameters', ts('Command parameters'),
-      "cols=50 rows=6"
+      ['cols' => 50, 'rows' => 6]
     );
 
     // is this job active ?
diff --git a/CRM/Admin/Form/MessageTemplates.php b/CRM/Admin/Form/MessageTemplates.php
index 5f809f25bedd..47567b474274 100644
--- a/CRM/Admin/Form/MessageTemplates.php
+++ b/CRM/Admin/Form/MessageTemplates.php
@@ -179,7 +179,7 @@ public function buildQuickForm() {
       )
     ) {
       $this->add('textarea', 'msg_html', ts('HTML Message'),
-        "cols=50 rows=6"
+        ['cols' => 50, 'rows' => 6]
       );
     }
     else {
@@ -194,7 +194,7 @@ public function buildQuickForm() {
     }
 
     $this->add('textarea', 'msg_text', ts('Text Message'),
-      "cols=50 rows=6"
+      ['cols' => 50, 'rows' => 6]
     );
 
     $this->add('select', 'pdf_format_id', ts('PDF Page Format'),
diff --git a/CRM/Admin/Form/PdfFormats.php b/CRM/Admin/Form/PdfFormats.php
index 0ec9042d5839..1f7c10a0f50c 100644
--- a/CRM/Admin/Form/PdfFormats.php
+++ b/CRM/Admin/Form/PdfFormats.php
@@ -67,7 +67,7 @@ public function buildQuickForm() {
       ['onChange' => "selectPaper( this.value );"]
     );
 
-    $this->add('static', 'paper_dimensions', NULL, ts('Width x Height'));
+    $this->add('static', 'paper_dimensions', ts('Width x Height'));
     $this->add('select', 'orientation', ts('Orientation'), CRM_Core_BAO_PdfFormat::getPageOrientations(), FALSE,
       ['onChange' => "updatePaperDimensions();"]
     );
diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
index c426d8d4bb19..67c06172d8e1 100644
--- a/CRM/Contact/Form/Task/EmailTrait.php
+++ b/CRM/Contact/Form/Task/EmailTrait.php
@@ -247,7 +247,7 @@ public function buildQuickForm() {
 
     $this->assign('totalSelectedContacts', count($this->_contactIds));
 
-    $this->add('text', 'subject', ts('Subject'), 'size=50 maxlength=254', TRUE);
+    $this->add('text', 'subject', ts('Subject'), ['size' => 50, 'maxlength' => 254], TRUE);
 
     $this->add('select', 'from_email_address', ts('From'), $this->_fromEmails, TRUE);
 
diff --git a/CRM/Contribute/Form/ContributionPage/Premium.php b/CRM/Contribute/Form/ContributionPage/Premium.php
index ba5b7863b777..7683f3d90015 100644
--- a/CRM/Contribute/Form/ContributionPage/Premium.php
+++ b/CRM/Contribute/Form/ContributionPage/Premium.php
@@ -52,7 +52,7 @@ public function buildQuickForm() {
 
     $this->addElement('text', 'premiums_intro_title', ts('Title'), $attributes['premiums_intro_title']);
 
-    $this->add('textarea', 'premiums_intro_text', ts('Introductory Message'), 'rows=5, cols=50');
+    $this->add('textarea', 'premiums_intro_text', ts('Introductory Message'), ['cols' => 50, 'rows' => 5]);
 
     $this->add('text', 'premiums_contact_email', ts('Contact Email') . ' ', $attributes['premiums_contact_email']);
 
diff --git a/CRM/Contribute/Form/ManagePremiums.php b/CRM/Contribute/Form/ManagePremiums.php
index 61da18d8f443..3a4a97e0ec21 100644
--- a/CRM/Contribute/Form/ManagePremiums.php
+++ b/CRM/Contribute/Form/ManagePremiums.php
@@ -81,7 +81,7 @@ public function buildQuickForm() {
     ]);
     $this->add('text', 'sku', ts('SKU'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'sku'));
 
-    $this->add('textarea', 'description', ts('Description'), 'rows=3, cols=60');
+    $this->add('textarea', 'description', ts('Description'), ['cols' => 60, 'rows' => 3]);
 
     $image['image'] = $this->createElement('radio', NULL, NULL, ts('Upload from my computer'), 'image', 'onclick="add_upload_file_block(\'image\');');
     $image['thumbnail'] = $this->createElement('radio', NULL, NULL, ts('Display image and thumbnail from these locations on the web:'), 'thumbnail', 'onclick="add_upload_file_block(\'thumbnail\');');
@@ -94,7 +94,7 @@ public function buildQuickForm() {
     $this->addElement('text', 'imageUrl', ts('Image URL'));
     $this->addElement('text', 'thumbnailUrl', ts('Thumbnail URL'));
 
-    $this->add('file', 'uploadFile', ts('Image File Name'), 'onChange="select_option();"');
+    $this->add('file', 'uploadFile', ts('Image File Name'), ['onChange' => 'select_option();']);
 
     $this->add('text', 'price', ts('Market Value'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'price'), TRUE);
     $this->addRule('price', ts('Please enter the Market Value for this product.'), 'money');
@@ -105,7 +105,7 @@ public function buildQuickForm() {
     $this->add('text', 'min_contribution', ts('Minimum Contribution Amount'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'min_contribution'), TRUE);
     $this->addRule('min_contribution', ts('Please enter a monetary value for the Minimum Contribution Amount.'), 'money');
 
-    $this->add('textarea', 'options', ts('Options'), 'rows=3, cols=60');
+    $this->add('textarea', 'options', ts('Options'), ['cols' => 60, 'rows' => 3]);
 
     $this->add('select', 'period_type', ts('Period Type'), [
       '' => '- select -',
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 41cc7fe7ba88..030c88b17c94 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -667,11 +667,13 @@ public static function addQuickFormElement(
     $element = NULL;
     $customFieldAttributes = [];
 
+    // DAO stores attributes as a string, but it's hard to manipulate and
+    // CRM_Core_Form::add() wants them as an array.
+    $fieldAttributes = self::attributesFromString($field->attributes);
+
     // Custom field HTML should indicate group+field name
     $groupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $field->custom_group_id);
-    $dataCrmCustomVal = $groupName . ':' . $field->name;
-    $dataCrmCustomAttr = 'data-crm-custom="' . $dataCrmCustomVal . '"';
-    $field->attributes .= $dataCrmCustomAttr;
+    $fieldAttributes['data-crm-custom'] = $groupName . ':' . $field->name;
 
     // Fixed for Issue CRM-2183
     if ($widget == 'TextArea' && $search) {
@@ -680,39 +682,34 @@ public static function addQuickFormElement(
 
     $placeholder = $search ? ts('- any -') : ($useRequired ? ts('- select -') : ts('- none -'));
 
-    $isSelect = (in_array($widget, [
+    if (in_array($widget, [
       'Select',
       'CheckBox',
       'Radio',
-    ]));
-
-    if ($isSelect) {
+    ])) {
       $options = $field->getOptions($search ? 'search' : 'create');
 
       // Consolidate widget types to simplify the below switch statement
-      if ($search || (strpos($widget, 'Select') !== FALSE)) {
+      if ($search) {
         $widget = 'Select';
       }
 
-      $customFieldAttributes['data-crm-custom'] = $dataCrmCustomVal;
-      $selectAttributes = ['class' => 'crm-select2'];
-
       // Search field is always multi-select
       if ($search || (self::isSerialized($field) && $widget === 'Select')) {
-        $selectAttributes['class'] .= ' huge';
-        $selectAttributes['multiple'] = 'multiple';
-        $selectAttributes['placeholder'] = $placeholder;
+        $fieldAttributes['class'] .= ltrim($fieldAttributes['class'] ?? '' . ' huge');
+        $fieldAttributes['multiple'] = 'multiple';
+        $fieldAttributes['placeholder'] = $placeholder;
       }
 
       // Add data for popup link. Normally this is handled by CRM_Core_Form->addSelect
       $canEditOptions = CRM_Core_Permission::check('administer CiviCRM');
-      if ($field->option_group_id && !$search && $isSelect && $canEditOptions) {
+      if ($field->option_group_id && !$search && $canEditOptions) {
         $customFieldAttributes += [
           'data-api-entity' => $field->getEntity(),
           'data-api-field' => 'custom_' . $field->id,
           'data-option-edit-path' => 'civicrm/admin/options/' . CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionGroup', $field->option_group_id),
         ];
-        $selectAttributes += $customFieldAttributes;
+        $fieldAttributes = array_merge($fieldAttributes, $customFieldAttributes);
       }
     }
 
@@ -728,50 +725,39 @@ public static function addQuickFormElement(
       case 'Text':
       case 'Link':
         if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
-          $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $field->attributes);
-          $qf->add('text', $elementName . '_to', ts('To'), $field->attributes);
+          $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
+          $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
         }
         else {
           if ($field->text_length) {
-            $field->attributes .= ' maxlength=' . $field->text_length;
+            $fieldAttributes['maxlength'] = $field->text_length;
             if ($field->text_length < 20) {
-              $field->attributes .= ' size=' . $field->text_length;
+              $fieldAttributes['size'] = $field->text_length;
             }
           }
           $element = $qf->add('text', $elementName, $label,
-            $field->attributes,
+            $fieldAttributes,
             $useRequired && !$search
           );
         }
         break;
 
       case 'TextArea':
-        $attributes = $dataCrmCustomAttr;
-        if ($field->note_rows) {
-          $attributes .= 'rows=' . $field->note_rows;
-        }
-        else {
-          $attributes .= 'rows=4';
-        }
-        if ($field->note_columns) {
-          $attributes .= ' cols=' . $field->note_columns;
-        }
-        else {
-          $attributes .= ' cols=60';
-        }
+        $fieldAttributes['rows'] = $field->note_rows ?? 4;
+        $fieldAttributes['cols'] = $field->note_columns ?? 60;
+
         if ($field->text_length) {
-          $attributes .= ' maxlength=' . $field->text_length;
+          $fieldAttributes['maxlength'] = $field->text_length;
         }
         $element = $qf->add('textarea',
           $elementName,
           $label,
-          $attributes,
+          $fieldAttributes,
           $useRequired && !$search
         );
         break;
 
       case 'Select Date':
-        $attr = ['data-crm-custom' => $dataCrmCustomVal];
         //CRM-18379: Fix for date range of 'Select Date' custom field when include in profile.
         $minYear = isset($field->start_date_years) ? (date('Y') - $field->start_date_years) : NULL;
         $maxYear = isset($field->end_date_years) ? (date('Y') + $field->end_date_years) : NULL;
@@ -784,40 +770,40 @@ public static function addQuickFormElement(
           'time' => $field->time_format ? $field->time_format * 12 : FALSE,
         ];
         if ($field->is_search_range && $search) {
-          $qf->add('datepicker', $elementName . '_from', $label, $attr + array('placeholder' => ts('From')), FALSE, $params);
-          $qf->add('datepicker', $elementName . '_to', NULL, $attr + array('placeholder' => ts('To')), FALSE, $params);
+          $qf->add('datepicker', $elementName . '_from', $label, $fieldAttributes + array('placeholder' => ts('From')), FALSE, $params);
+          $qf->add('datepicker', $elementName . '_to', NULL, $fieldAttributes + array('placeholder' => ts('To')), FALSE, $params);
         }
         else {
-          $element = $qf->add('datepicker', $elementName, $label, $attr, $useRequired && !$search, $params);
+          $element = $qf->add('datepicker', $elementName, $label, $fieldAttributes, $useRequired && !$search, $params);
         }
         break;
 
       case 'Radio':
         if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
-          $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $field->attributes);
-          $qf->add('text', $elementName . '_to', ts('To'), $field->attributes);
+          $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
+          $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
         }
         else {
-          parse_str($field->attributes, $radioAttributes);
-          $radioAttributes = array_merge($radioAttributes, $customFieldAttributes);
+          $fieldAttributes = array_merge($fieldAttributes, $customFieldAttributes);
           if ($search || empty($useRequired)) {
-            $radioAttributes['allowClear'] = TRUE;
+            $fieldAttributes['allowClear'] = TRUE;
           }
-          $qf->addRadio($elementName, $label, $options, $radioAttributes, NULL, $useRequired);
+          $qf->addRadio($elementName, $label, $options, $fieldAttributes, NULL, $useRequired);
         }
         break;
 
       // For all select elements
       case 'Select':
+        $fieldAttributes['class'] .= ltrim($fieldAttributes['class'] ?? '' . ' crm-select2');
         if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
-          $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $field->attributes);
-          $qf->add('text', $elementName . '_to', ts('To'), $field->attributes);
+          $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
+          $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
         }
         else {
-          if (empty($selectAttributes['multiple'])) {
+          if (empty($fieldAttributes['multiple'])) {
             $options = ['' => $placeholder] + $options;
           }
-          $element = $qf->add('select', $elementName, $label, $options, $useRequired && !$search, $selectAttributes);
+          $element = $qf->add('select', $elementName, $label, $options, $useRequired && !$search, $fieldAttributes);
 
           // Add and/or option for fields that store multiple values
           if ($search && self::isSerialized($field)) {
@@ -836,6 +822,9 @@ public static function addQuickFormElement(
       case 'CheckBox':
         $check = [];
         foreach ($options as $v => $l) {
+          // TODO: I'm not sure if this is supposed to exclude whatever might be
+          // in $field->attributes (available in array format as
+          // $fieldAttributes).  Leaving as-is for now.
           $check[] = &$qf->addElement('advcheckbox', $v, NULL, $l, $customFieldAttributes);
         }
 
@@ -859,44 +848,31 @@ public static function addQuickFormElement(
           strtolower($field->html_type),
           $elementName,
           $label,
-          $field->attributes,
+          $fieldAttributes,
           $useRequired && !$search
         );
         $qf->addUploadElement($elementName);
         break;
 
       case 'RichTextEditor':
-        $attributes = [
-          'rows' => $field->note_rows,
-          'cols' => $field->note_columns,
-          'data-crm-custom' => $dataCrmCustomVal,
-        ];
+        $fieldAttributes['rows'] = $field->note_rows;
+        $fieldAttributes['cols'] = $field->note_columns;
         if ($field->text_length) {
-          $attributes['maxlength'] = $field->text_length;
+          $fieldAttributes['maxlength'] = $field->text_length;
         }
-        $element = $qf->add('wysiwyg', $elementName, $label, $attributes, $useRequired && !$search);
+        $element = $qf->add('wysiwyg', $elementName, $label, $fieldAttributes, $useRequired && !$search);
         break;
 
       case 'Autocomplete-Select':
         static $customUrls = [];
-        // Fixme: why is this a string in the first place??
-        $attributes = [];
-        if ($field->attributes) {
-          foreach (explode(' ', $field->attributes) as $at) {
-            if (strpos($at, '=')) {
-              list($k, $v) = explode('=', $at);
-              $attributes[$k] = trim($v, ' "');
-            }
-          }
-        }
         if ($field->data_type == 'ContactReference') {
           // break if contact does not have permission to access ContactReference
           if (!CRM_Core_Permission::check('access contact reference fields')) {
             break;
           }
-          $attributes['class'] = (isset($attributes['class']) ? $attributes['class'] . ' ' : '') . 'crm-form-contact-reference huge';
-          $attributes['data-api-entity'] = 'Contact';
-          $element = $qf->add('text', $elementName, $label, $attributes, $useRequired && !$search);
+          $fieldAttributes['class'] = ltrim($fieldAttributes['class'] ?? '' . ' crm-form-contact-reference huge');
+          $fieldAttributes['data-api-entity'] = 'Contact';
+          $element = $qf->add('text', $elementName, $label, $fieldAttributes, $useRequired && !$search);
 
           $urlParams = "context=customfield&id={$field->id}";
           $idOfelement = $elementName;
@@ -915,7 +891,7 @@ public static function addQuickFormElement(
         }
         else {
           // FIXME: This won't work with customFieldOptions hook
-          $attributes += [
+          $fieldAttributes += [
             'entity' => 'OptionValue',
             'placeholder' => $placeholder,
             'multiple' => $search,
@@ -923,7 +899,7 @@ public static function addQuickFormElement(
               'params' => ['option_group_id' => $field->option_group_id, 'is_active' => 1],
             ],
           ];
-          $element = $qf->addEntityRef($elementName, $label, $attributes, $useRequired && !$search);
+          $element = $qf->addEntityRef($elementName, $label, $fieldAttributes, $useRequired && !$search);
         }
 
         $qf->assign('customUrls', $customUrls);
@@ -973,6 +949,27 @@ public static function addQuickFormElement(
     return $element;
   }
 
+  /**
+   * Take a string of HTML element attributes and turn it into an associative
+   * array.
+   *
+   * @param string $attrString
+   *   The attributes as a string, e.g. `rows=3 cols=40`.
+   *
+   * @return array
+   *   The attributes as an array, e.g. `['rows' => 3, 'cols' => 40]`.
+   */
+  public static function attributesFromString($attrString) {
+    $attributes = [];
+    foreach (explode(' ', $attrString) as $at) {
+      if (strpos($at, '=')) {
+        list($k, $v) = explode('=', $at);
+        $attributes[$k] = trim($v, ' "');
+      }
+    }
+    return $attributes;
+  }
+
   /**
    * Delete the Custom Field.
    *
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index fe06bb991528..f149bdecf31d 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -350,7 +350,7 @@ public function registerRules() {
    * @param string $type
    * @param string $name
    * @param string $label
-   * @param string|array $attributes (options for select elements)
+   * @param array $attributes (options for select elements)
    * @param bool $required
    * @param array $extra
    *   (attributes for select elements).
@@ -364,11 +364,18 @@ public function registerRules() {
    */
   public function &add(
     $type, $name, $label = '',
-    $attributes = '', $required = FALSE, $extra = NULL
+    $attributes = NULL, $required = FALSE, $extra = NULL
   ) {
     if ($type === 'radio') {
       CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_Form::addRadio');
     }
+
+    if ($attributes && !is_array($attributes)) {
+      // The $attributes param used to allow for strings and would default to an
+      // empty string.  However, now that the variable is heavily manipulated,
+      // we should expect it to always be an array.
+      Civi::log()->warning('Attributes passed to CRM_Core_Form::add() are not an array.', ['civi.tag' => 'deprecated']);
+    }
     // Fudge some extra types that quickform doesn't support
     $inputType = $type;
     if ($type == 'wysiwyg' || in_array($type, self::$html5Types)) {
diff --git a/CRM/Import/DataSource/SQL.php b/CRM/Import/DataSource/SQL.php
index 26d3e09faa1a..c1cbb61e1e4d 100644
--- a/CRM/Import/DataSource/SQL.php
+++ b/CRM/Import/DataSource/SQL.php
@@ -49,7 +49,7 @@ public function preProcess(&$form) {
    */
   public function buildQuickForm(&$form) {
     $form->add('hidden', 'hidden_dataSource', 'CRM_Import_DataSource_SQL');
-    $form->add('textarea', 'sqlQuery', ts('Specify SQL Query'), 'rows=10 cols=45', TRUE);
+    $form->add('textarea', 'sqlQuery', ts('Specify SQL Query'), ['rows' => 10, 'cols' => 45], TRUE);
     $form->addFormRule(['CRM_Import_DataSource_SQL', 'formRule'], $form);
   }
 
diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php
index a7f7420f9a14..96aaf3b55854 100644
--- a/CRM/Price/Form/Field.php
+++ b/CRM/Price/Form/Field.php
@@ -181,7 +181,7 @@ public function buildQuickForm() {
     $this->add('text', 'label', ts('Field Label'), CRM_Core_DAO::getAttribute('CRM_Price_DAO_PriceField', 'label'), TRUE);
 
     // html_type
-    $javascript = 'onchange="option_html_type(this.form)";';
+    $javascript = ['onchange' => 'option_html_type(this.form);'];
 
     $htmlTypes = CRM_Price_BAO_PriceField::htmlTypes();
 
diff --git a/CRM/SMS/Form/Provider.php b/CRM/SMS/Form/Provider.php
index 68e64de811b8..c78f55fcd4e5 100644
--- a/CRM/SMS/Form/Provider.php
+++ b/CRM/SMS/Form/Provider.php
@@ -94,7 +94,7 @@ public function buildQuickForm() {
     $this->add('text', 'api_url', ts('API Url'), $attributes['api_url'], TRUE);
 
     $this->add('textarea', 'api_params', ts('API Parameters'),
-      "cols=50 rows=6", TRUE
+      ['cols' => 50, 'rows' => 6], TRUE
     );
 
     $this->add('checkbox', 'is_active', ts('Is this provider active?'));

From 9ca69805338baab6882b8d1cc887903f4b16eceb Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Sat, 20 Jun 2020 14:00:33 -0400
Subject: [PATCH 810/834] Cleanup with ??

---
 CRM/Core/Form.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index f149bdecf31d..f15287eee95c 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -420,7 +420,7 @@ public function &add(
 
       $attributes['data-crm-datepicker'] = json_encode((array) $extra);
       if (!empty($attributes['aria-label']) || $label) {
-        $attributes['aria-label'] = CRM_Utils_Array::value('aria-label', $attributes, $label);
+        $attributes['aria-label'] = $attributes['aria-label'] ?? $label;
       }
       $type = "text";
     }
@@ -1211,12 +1211,7 @@ public function &addRadio($name, $title, $values, $attributes = [], $separator =
       $optAttributes = $attributes;
       if (!empty($optionAttributes[$key])) {
         foreach ($optionAttributes[$key] as $optAttr => $optVal) {
-          if (!empty($optAttributes[$optAttr])) {
-            $optAttributes[$optAttr] .= ' ' . $optVal;
-          }
-          else {
-            $optAttributes[$optAttr] = $optVal;
-          }
+          $optAttributes[$optAttr] = ltrim(($optAttributes[$optAttr] ?? '') . ' ' . $optVal);
         }
       }
       // We use a class here to avoid html5 issues with collapsed cutsomfield sets.
@@ -2067,7 +2062,7 @@ public function addEntityRef($name, $label = '', $props = [], $required = FALSE)
     // Default properties
     $props['api'] = CRM_Utils_Array::value('api', $props, []);
     $props['entity'] = CRM_Core_DAO_AllCoreTables::convertEntityNameToCamel(CRM_Utils_Array::value('entity', $props, 'Contact'));
-    $props['class'] = ltrim(CRM_Utils_Array::value('class', $props, '') . ' crm-form-entityref');
+    $props['class'] = ltrim(($props['class'] ?? '') . ' crm-form-entityref');
 
     if (array_key_exists('create', $props) && empty($props['create'])) {
       unset($props['create']);

From a2eb61520b685cf139a829d65015b2579caed27d Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Mon, 14 Sep 2020 14:38:27 -0400
Subject: [PATCH 811/834] Select placeholders should always say what kind of
 thing they select

---
 CRM/ACL/Form/ACL.php                   | 13 ++---
 CRM/ACL/Form/EntityRole.php            |  3 +-
 CRM/Activity/BAO/Query.php             |  2 +-
 CRM/Activity/Form/Activity.php         |  6 ++-
 CRM/Contribute/Form/ManagePremiums.php | 11 ++--
 CRM/Core/BAO/CustomField.php           | 10 ++--
 CRM/Core/BAO/UFGroup.php               | 71 ++++++++++----------------
 CRM/Core/Form.php                      | 47 +++++++++++++----
 CRM/SMS/Form/Provider.php              |  2 +-
 9 files changed, 89 insertions(+), 76 deletions(-)

diff --git a/CRM/ACL/Form/ACL.php b/CRM/ACL/Form/ACL.php
index de1665dcd466..1c7af2a0952f 100644
--- a/CRM/ACL/Form/ACL.php
+++ b/CRM/ACL/Form/ACL.php
@@ -96,11 +96,12 @@ public function buildQuickForm() {
 
     $this->add('text', 'name', ts('Description'), CRM_Core_DAO::getAttribute('CRM_ACL_DAO_ACL', 'name'), TRUE);
 
-    $operations = ['' => ts('- select -')] + CRM_ACL_BAO_ACL::operation();
     $this->add('select',
       'operation',
       ts('Operation'),
-      $operations, TRUE
+      CRM_ACL_BAO_ACL::operation(),
+      TRUE,
+      ['placeholder' => TRUE]
     );
 
     $objTypes = [
@@ -129,22 +130,22 @@ public function buildQuickForm() {
     $this->add('select', 'entity_id', $label, $role, TRUE);
 
     $group = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select group -'),
       '0' => ts('All Groups'),
     ] + CRM_Core_PseudoConstant::group();
 
     $customGroup = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select set of custom fields -'),
       '0' => ts('All Custom Groups'),
     ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_CustomField', 'custom_group_id');
 
     $ufGroup = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select profile -'),
       '0' => ts('All Profiles'),
     ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_UFField', 'uf_group_id');
 
     $event = [
-      '-1' => ts('- select -'),
+      '-1' => ts('- select event -'),
       '0' => ts('All Events'),
     ] + CRM_Event_PseudoConstant::event(NULL, FALSE, "( is_template IS NULL OR is_template != 1 )");
 
diff --git a/CRM/ACL/Form/EntityRole.php b/CRM/ACL/Form/EntityRole.php
index d12686fe433e..7d599deff475 100644
--- a/CRM/ACL/Form/EntityRole.php
+++ b/CRM/ACL/Form/EntityRole.php
@@ -26,9 +26,8 @@ public function buildQuickForm() {
       return;
     }
 
-    $aclRoles = ['' => ts('- select -')] + CRM_Core_OptionGroup::values('acl_role');
     $this->add('select', 'acl_role_id', ts('ACL Role'),
-      $aclRoles, TRUE
+      CRM_Core_OptionGroup::values('acl_role'), TRUE, ['placeholder' => TRUE]
     );
 
     $label = ts('Assigned to');
diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index d432467e8d40..0aa2df666a3f 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -478,7 +478,7 @@ public static function buildSearchForm(&$form) {
           'multiple' =>
           'multiple',
           'class' => 'crm-select2',
-          'placeholder' => ts('- select -'),
+          'placeholder' => ts('- select tags -'),
         ]
       );
     }
diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 4d457aafda3a..c6b07c4a397d 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -628,10 +628,11 @@ public function buildQuickForm() {
     $this->assign('suppressForm', FALSE);
 
     $element = $this->add('select', 'activity_type_id', ts('Activity Type'),
-      ['' => '- ' . ts('select') . ' -'] + $this->_fields['followup_activity_type_id']['attributes'],
+      $this->_fields['followup_activity_type_id']['attributes'],
       FALSE, [
         'onchange' => "CRM.buildCustomData( 'Activity', this.value, false, false, false, false, false, false, {$this->_currentlyViewedContactId});",
         'class' => 'crm-select2 required',
+        'placeholder' => TRUE,
       ]
     );
 
@@ -695,7 +696,8 @@ public function buildQuickForm() {
         $responseOptions = CRM_Campaign_BAO_Survey::getResponsesOptions($surveyId);
         if ($responseOptions) {
           $this->add('select', 'result', ts('Result'),
-            ['' => ts('- select -')] + array_combine($responseOptions, $responseOptions)
+            array_combine($responseOptions, $responseOptions),
+            FALSE, ['placeholder' => TRUE]
           );
         }
         $surveyTitle = NULL;
diff --git a/CRM/Contribute/Form/ManagePremiums.php b/CRM/Contribute/Form/ManagePremiums.php
index 3a4a97e0ec21..85b8ad03c9fb 100644
--- a/CRM/Contribute/Form/ManagePremiums.php
+++ b/CRM/Contribute/Form/ManagePremiums.php
@@ -108,18 +108,17 @@ public function buildQuickForm() {
     $this->add('textarea', 'options', ts('Options'), ['cols' => 60, 'rows' => 3]);
 
     $this->add('select', 'period_type', ts('Period Type'), [
-      '' => '- select -',
       'rolling' => 'Rolling',
       'fixed' => 'Fixed',
-    ]);
+    ], FALSE, ['placeholder' => TRUE]);
 
     $this->add('text', 'fixed_period_start_day', ts('Fixed Period Start Day'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'fixed_period_start_day'));
 
-    $this->add('Select', 'duration_unit', ts('Duration Unit'), ['' => '- select period -'] + CRM_Core_SelectValues::getPremiumUnits());
+    $this->add('Select', 'duration_unit', ts('Duration Unit'), CRM_Core_SelectValues::getPremiumUnits(), FALSE, ['placeholder' => ts('- select period -')]);
 
     $this->add('text', 'duration_interval', ts('Duration'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'duration_interval'));
 
-    $this->add('Select', 'frequency_unit', ts('Frequency Unit'), ['' => '- select period -'] + CRM_Core_SelectValues::getPremiumUnits());
+    $this->add('Select', 'frequency_unit', ts('Frequency Unit'), CRM_Core_SelectValues::getPremiumUnits(), FALSE, ['placeholder' => ts('- select period -')]);
 
     $this->add('text', 'frequency_interval', ts('Frequency'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_Product', 'frequency_interval'));
 
@@ -157,7 +156,9 @@ public function buildQuickForm() {
       'select',
       'financial_type_id',
       ts('Financial Type'),
-      ['' => ts('- select -')] + $financialType
+      $financialType,
+      FALSE,
+      ['placeholder' => TRUE]
     );
 
     $this->add('checkbox', 'is_active', ts('Enabled?'));
diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index 030c88b17c94..a8614578e2b2 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -667,6 +667,10 @@ public static function addQuickFormElement(
     $element = NULL;
     $customFieldAttributes = [];
 
+    if (!isset($label)) {
+      $label = $field->label;
+    }
+
     // DAO stores attributes as a string, but it's hard to manipulate and
     // CRM_Core_Form::add() wants them as an array.
     $fieldAttributes = self::attributesFromString($field->attributes);
@@ -680,7 +684,7 @@ public static function addQuickFormElement(
       $widget = 'Text';
     }
 
-    $placeholder = $search ? ts('- any -') : ($useRequired ? ts('- select -') : ts('- none -'));
+    $placeholder = $search ? ts('- any %1 -', [1 => $label]) : ts('- select %1 -', [1 => $label]);
 
     if (in_array($widget, [
       'Select',
@@ -715,10 +719,6 @@ public static function addQuickFormElement(
 
     $rangeDataTypes = ['Int', 'Float', 'Money'];
 
-    if (!isset($label)) {
-      $label = $field->label;
-    }
-
     // at some point in time we might want to split the below into small functions
 
     switch ($widget) {
diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index 88d84f04afa8..543560b96958 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -1869,7 +1869,7 @@ public static function buildProfile(
       }
     }
     elseif (substr($fieldName, 0, 7) === 'country') {
-      $form->add('select', $name, $title, ['' => ts('- select -')] + CRM_Core_PseudoConstant::country(), $required, $selectAttributes);
+      $form->add('select', $name, $title, CRM_Core_PseudoConstant::country(), $required, $selectAttributes);
       $config = CRM_Core_Config::singleton();
       if (!in_array($mode, [CRM_Profile_Form::MODE_EDIT, CRM_Profile_Form::MODE_SEARCH]) &&
         $config->defaultContactCountry
@@ -1895,16 +1895,12 @@ public static function buildProfile(
             $providerName = substr($name, 0, -1) . '-provider_id]';
           }
           $form->add('select', $providerName, NULL,
-            [
-              '' => ts('- select -'),
-            ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id'), $required
+            CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id'), $required
           );
         }
         else {
           $form->add('select', $name . '-provider_id', $title,
-            [
-              '' => ts('- select -'),
-            ] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id'), $required
+            CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id'), $required
           );
         }
 
@@ -1916,7 +1912,7 @@ public static function buildProfile(
     elseif (CRM_Utils_Array::value('name', $field) == 'membership_type') {
       list($orgInfo, $types) = CRM_Member_BAO_MembershipType::getMembershipTypeInfo();
       $sel = &$form->addElement('hierselect', $name, $title);
-      $select = ['' => ts('- select -')];
+      $select = ['' => ts('- select membership type -')];
       if (count($orgInfo) == 1 && $field['is_required']) {
         // we only have one org - so we should default to it. Not sure about defaulting to first type
         // as it could be missed - so adding a select
@@ -1932,9 +1928,7 @@ public static function buildProfile(
     }
     elseif (CRM_Utils_Array::value('name', $field) == 'membership_status') {
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'label'), $required
+        CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'label'), $required
       );
     }
     elseif (in_array($fieldName, ['gender_id', 'communication_style_id'])) {
@@ -1999,7 +1993,7 @@ public static function buildProfile(
         'contact_type' => $profileType,
         'greeting_type' => $fieldName,
       ];
-      $form->add('select', $name, $title, ['' => ts('- select -')] + CRM_Core_PseudoConstant::greeting($greeting), $required);
+      $form->add('select', $name, $title, CRM_Core_PseudoConstant::greeting($greeting), $required, ['placeholder' => TRUE]);
       // add custom greeting element
       $form->add('text', $fieldName . '_custom', ts('Custom %1', [1 => ucwords(str_replace('_', ' ', $fieldName))]),
         NULL, FALSE
@@ -2019,7 +2013,7 @@ public static function buildProfile(
       $form->add('select', $name, $title, CRM_Core_SelectValues::pmf());
     }
     elseif ($fieldName === 'preferred_language') {
-      $form->add('select', $name, $title, ['' => ts('- select -')] + CRM_Contact_BAO_Contact::buildOptions('preferred_language'), $required);
+      $form->add('select', $name, $title, CRM_Contact_BAO_Contact::buildOptions('preferred_language'), $required, ['placeholder' => TRUE]);
     }
     elseif ($fieldName == 'external_identifier') {
       $form->add('text', $name, $title, $attributes, $required);
@@ -2078,35 +2072,29 @@ public static function buildProfile(
     elseif ($fieldName === 'product_name') {
       list($products, $options) = CRM_Contribute_BAO_Premium::getPremiumProductInfo();
       $sel = &$form->addElement('hierselect', $name, $title);
-      $products = ['0' => ts('- select -')] + $products;
+      $products = ['0' => ts('- select %1 -', [1 => $title])] + $products;
       $sel->setOptions([$products, $options]);
     }
     elseif ($fieldName === 'payment_instrument') {
       $form->add('select', $name, $title,
-        ['' => ts('- select -')] + CRM_Contribute_PseudoConstant::paymentInstrument(), $required);
+        CRM_Contribute_PseudoConstant::paymentInstrument(), $required, ['placeholder' => TRUE]);
     }
     elseif ($fieldName === 'financial_type') {
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Contribute_PseudoConstant::financialType(), $required
+        CRM_Contribute_PseudoConstant::financialType(), $required, ['placeholder' => TRUE]
       );
     }
     elseif ($fieldName === 'contribution_status_id') {
       $contributionStatuses = CRM_Contribute_BAO_Contribution_Utils::getContributionStatuses();
 
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + $contributionStatuses, $required
+        $contributionStatuses, $required, ['placeholder' => TRUE]
       );
     }
     elseif ($fieldName === 'soft_credit_type') {
       $name = "soft_credit_type[$rowNumber]";
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Core_OptionGroup::values("soft_credit_type")
+        CRM_Core_OptionGroup::values("soft_credit_type"), ['placeholder' => TRUE]
       );
       //CRM-15350: choose SCT field default value as 'Gift' for membership use
       //else (for contribution), use configured SCT default value
@@ -2124,23 +2112,20 @@ public static function buildProfile(
     }
     elseif ($fieldName == 'contribution_page_id') {
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Contribute_PseudoConstant::contributionPage(), $required, 'class="big"'
+        CRM_Contribute_PseudoConstant::contributionPage(), $required, [
+          'class' => 'big',
+          'placeholder' => TRUE,
+        ]
       );
     }
     elseif ($fieldName == 'activity_status_id') {
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Core_PseudoConstant::activityStatus(), $required
+        CRM_Core_PseudoConstant::activityStatus(), $required, ['placeholder' => TRUE]
       );
     }
     elseif ($fieldName == 'activity_engagement_level') {
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Campaign_PseudoConstant::engagementLevel(), $required
+        CRM_Campaign_PseudoConstant::engagementLevel(), $required, ['placeholder' => TRUE]
       );
     }
     elseif ($fieldName == 'participant_status') {
@@ -2149,9 +2134,7 @@ public static function buildProfile(
         $cond = 'visibility_id = 1';
       }
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Event_PseudoConstant::participantStatus(NULL, $cond, 'label'), $required
+        CRM_Event_PseudoConstant::participantStatus(NULL, $cond, 'label'), $required, ['placeholder' => TRUE]
       );
     }
     elseif ($fieldName == 'participant_role') {
@@ -2160,9 +2143,7 @@ public static function buildProfile(
       }
       else {
         $form->add('select', $name, $title,
-          [
-            '' => ts('- select -'),
-          ] + CRM_Event_PseudoConstant::participantRole(), $required
+          CRM_Event_PseudoConstant::participantRole(), $required, ['placeholder' => TRUE]
         );
       }
     }
@@ -2181,9 +2162,11 @@ public static function buildProfile(
           $form->_componentCampaigns
         ));
         $form->add('select', $name, $title,
+          $campaigns, $required,
           [
-            '' => ts('- select -'),
-          ] + $campaigns, $required, 'class="crm-select2 big"'
+            'class' => 'crm-select2 big',
+            'placeholder' => TRUE,
+          ]
         );
       }
     }
@@ -2196,10 +2179,8 @@ public static function buildProfile(
     }
     elseif ($fieldName == 'case_status') {
       $form->add('select', $name, $title,
-        [
-          '' => ts('- select -'),
-        ] + CRM_Case_BAO_Case::buildOptions('case_status_id', 'create'),
-        $required
+        CRM_Case_BAO_Case::buildOptions('case_status_id', 'create'),
+        $required, ['placeholder' => TRUE]
       );
     }
     else {
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index f15287eee95c..2cd2c226b5db 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -436,7 +436,7 @@ public function &add(
       // Add placeholder option for select
       if (isset($extra['placeholder'])) {
         if ($extra['placeholder'] === TRUE) {
-          $extra['placeholder'] = $required ? ts('- select -') : ts('- none -');
+          $extra['placeholder'] = ts('- select %1 -', [1 => $label]);
         }
         if (($extra['placeholder'] || $extra['placeholder'] === '') && empty($extra['multiple']) && is_array($attributes) && !isset($attributes[''])) {
           $attributes = ['' => $extra['placeholder']] + $attributes;
@@ -1498,8 +1498,8 @@ public function addSelect($name, $props = [], $required = FALSE) {
       $info = civicrm_api3($props['entity'], 'getoptions', $props);
       $options = $info['values'];
     }
-    if (!array_key_exists('placeholder', $props)) {
-      $props['placeholder'] = $required ? ts('- select -') : (CRM_Utils_Array::value('context', $props) == 'search' ? ts('- any -') : ts('- none -'));
+    if (!array_key_exists('placeholder', $props) && $placeholder = self::selectOrAnyPlaceholder($props, $required)) {
+      $props['placeholder'] = $placeholder;
     }
     // Handle custom field
     if (strpos($name, 'custom_') === 0 && is_numeric($name[7])) {
@@ -1534,6 +1534,34 @@ public function addSelect($name, $props = [], $required = FALSE) {
     return $this->add('select', $name, $label, $options, $required, $props);
   }
 
+  /**
+   * Handles a repeated bit supplying a placeholder for entity selection
+   *
+   * @param string $props
+   *   The field properties, including the entity and context.
+   * @param bool $required
+   *   If the field is required.
+   * @return string
+   *   The placeholder text.
+   */
+  private static function selectOrAnyPlaceholder($props, $required) {
+    if (empty($props['entity'])) {
+      return NULL;
+    }
+    $daoToClass = CRM_Core_DAO_AllCoreTables::daoToClass();
+    if (array_key_exists($props['entity'], $daoToClass)) {
+      $daoClass = $daoToClass[$props['entity']];
+      $tsPlaceholder = $daoClass::getEntityTitle();
+    }
+    else {
+      $tsPlaceholder = ts('option');
+    }
+    if (($props['context'] ?? '') == 'search' && !$required) {
+      return ts('- any %1 -', [1 => $tsPlaceholder]);
+    }
+    return ts('- select %1 -', [1 => $tsPlaceholder]);
+  }
+
   /**
    * Adds a field based on metadata.
    *
@@ -1690,8 +1718,8 @@ public function addField($name, $props = [], $required = FALSE, $legacyDate = TR
       case 'Select':
       case 'Select2':
         $props['class'] = CRM_Utils_Array::value('class', $props, 'big') . ' crm-select2';
-        if (!array_key_exists('placeholder', $props)) {
-          $props['placeholder'] = $required ? ts('- select -') : ($context == 'search' ? ts('- any -') : ts('- none -'));
+        if (!array_key_exists('placeholder', $props) && $placeholder = self::selectOrAnyPlaceholder($props, $required)) {
+          $props['placeholder'] = $placeholder;
         }
         // TODO: Add and/or option for fields that store multiple values
         return $this->add(strtolower($widget), $name, $label, $options, $required, $props);
@@ -2061,14 +2089,14 @@ public function addCurrency(
   public function addEntityRef($name, $label = '', $props = [], $required = FALSE) {
     // Default properties
     $props['api'] = CRM_Utils_Array::value('api', $props, []);
-    $props['entity'] = CRM_Core_DAO_AllCoreTables::convertEntityNameToCamel(CRM_Utils_Array::value('entity', $props, 'Contact'));
+    $props['entity'] = CRM_Core_DAO_AllCoreTables::convertEntityNameToCamel($props['entity'] ?? 'Contact');
     $props['class'] = ltrim(($props['class'] ?? '') . ' crm-form-entityref');
 
     if (array_key_exists('create', $props) && empty($props['create'])) {
       unset($props['create']);
     }
 
-    $props['placeholder'] = CRM_Utils_Array::value('placeholder', $props, $required ? ts('- select %1 -', [1 => ts(str_replace('_', ' ', $props['entity']))]) : ts('- none -'));
+    $props['placeholder'] = $props['placeholder'] ?? self::selectOrAnyPlaceholder($props, $required);
 
     $defaults = [];
     if (!empty($props['multiple'])) {
@@ -2400,6 +2428,7 @@ public function setPageTitle($entityLabel) {
    * @return HTML_QuickForm_Element
    */
   public function addChainSelect($elementName, $settings = []) {
+    $label = strpos($elementName, 'rovince') ? CRM_Core_DAO_StateProvince::getEntityTitle() : CRM_Core_DAO_County::getEntityTitle();
     $props = $settings += [
       'control_field' => str_replace(['state_province', 'StateProvince', 'county', 'County'], [
         'country',
@@ -2408,12 +2437,12 @@ public function addChainSelect($elementName, $settings = []) {
         'StateProvince',
       ], $elementName),
       'data-callback' => strpos($elementName, 'rovince') ? 'civicrm/ajax/jqState' : 'civicrm/ajax/jqCounty',
-      'label' => strpos($elementName, 'rovince') ? ts('State/Province') : ts('County'),
+      'label' => $label,
       'data-empty-prompt' => strpos($elementName, 'rovince') ? ts('Choose country first') : ts('Choose state first'),
       'data-none-prompt' => ts('- N/A -'),
       'multiple' => FALSE,
       'required' => FALSE,
-      'placeholder' => empty($settings['required']) ? ts('- none -') : ts('- select -'),
+      'placeholder' => ts('- select %1 -', [1 => $label]),
     ];
     CRM_Utils_Array::remove($props, 'label', 'required', 'control_field', 'context');
     $props['class'] = (empty($props['class']) ? '' : "{$props['class']} ") . 'crm-select2';
diff --git a/CRM/SMS/Form/Provider.php b/CRM/SMS/Form/Provider.php
index c78f55fcd4e5..a9daf14057a7 100644
--- a/CRM/SMS/Form/Provider.php
+++ b/CRM/SMS/Form/Provider.php
@@ -70,7 +70,7 @@ public function buildQuickForm() {
     $providerNames = CRM_Core_OptionGroup::values('sms_provider_name', FALSE, FALSE, FALSE, NULL, 'label');
     $apiTypes = CRM_Core_OptionGroup::values('sms_api_type', FALSE, FALSE, FALSE, NULL, 'label');
 
-    $this->add('select', 'name', ts('Name'), ['' => '- select -'] + $providerNames, TRUE);
+    $this->add('select', 'name', ts('Name'), $providerNames, TRUE, ['placeholder' => TRUE]);
 
     $this->add('text', 'title', ts('Title'),
       $attributes['title'], TRUE

From 5ad66c4f15cb85b49056337a474dc95236c1b83a Mon Sep 17 00:00:00 2001
From: Andrew Hunt <andrew@aghstrategies.com>
Date: Mon, 14 Sep 2020 14:39:45 -0400
Subject: [PATCH 812/834] StateProvince DAO title should be State/Province

---
 CRM/Core/DAO/StateProvince.php    | 4 ++--
 xml/schema/Core/StateProvince.xml | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/DAO/StateProvince.php b/CRM/Core/DAO/StateProvince.php
index 7342cb6e69a6..e376f57c6555 100644
--- a/CRM/Core/DAO/StateProvince.php
+++ b/CRM/Core/DAO/StateProvince.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/StateProvince.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:ca396996ffd11fc0b89e34657679a9ad)
+ * (GenCodeChecksum:504a7092bbd803d38b7f0fb91756bede)
  */
 
 /**
@@ -73,7 +73,7 @@ public function __construct() {
    *   Whether to return the plural version of the title.
    */
   public static function getEntityTitle($plural = FALSE) {
-    return $plural ? ts('State Provinces') : ts('State Province');
+    return $plural ? ts('States/Provinces') : ts('State/Province');
   }
 
   /**
diff --git a/xml/schema/Core/StateProvince.xml b/xml/schema/Core/StateProvince.xml
index 53f7aba31fa2..9d7d94e8864b 100644
--- a/xml/schema/Core/StateProvince.xml
+++ b/xml/schema/Core/StateProvince.xml
@@ -5,6 +5,8 @@
   <class>StateProvince</class>
   <name>civicrm_state_province</name>
   <add>1.1</add>
+  <title>State/Province</title>
+  <titlePlural>States/Provinces</titlePlural>
   <field>
     <name>id</name>
     <title>State ID</title>

From aba124dc9531bcbdc85ee0f38e08d8a09ade05d6 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 3 Oct 2020 18:00:20 -0700
Subject: [PATCH 813/834] composer.json - Update composer-compile-lib

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 00a283c7e28f..e8a425716ee5 100644
--- a/composer.json
+++ b/composer.json
@@ -80,7 +80,7 @@
     "ext-intl": "*",
     "pear/mail_mime": "~1.10",
     "pear/db": "1.10",
-    "civicrm/composer-compile-lib": "~0.2 || ~1.0"
+    "civicrm/composer-compile-lib": "~0.3 || ~1.0"
   },
   "scripts": {
     "post-install-cmd": [

From 1696748b2325fa7312ef4d2eecd97385bf1c2ba1 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 3 Oct 2020 18:00:41 -0700
Subject: [PATCH 814/834] composer.lock - Update composer-compile-lib and
 composer-compile-plugin

---
 composer.lock | 183 +++++---------------------------------------------
 1 file changed, 17 insertions(+), 166 deletions(-)

diff --git a/composer.lock b/composer.lock
index 14ceae4a827f..392e957df2b6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1c717ea7ca80e806702967261c621e3a",
+    "content-hash": "2a5c933954791a798ec0f50db504c476",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -91,12 +91,6 @@
                 "brick",
                 "math"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-15T15:59:35+00:00"
         },
         {
@@ -143,12 +137,6 @@
                 "currency",
                 "money"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/money",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-31T14:17:02+00:00"
         },
         {
@@ -311,16 +299,16 @@
         },
         {
             "name": "civicrm/composer-compile-lib",
-            "version": "v0.2",
+            "version": "v0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-lib.git",
-                "reference": "ceed2f3abe500a8333470a1e916812391cd68261"
+                "reference": "980b26dcc3d51ecf47aa45c43564ab9b6dbac244"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-lib/zipball/ceed2f3abe500a8333470a1e916812391cd68261",
-                "reference": "ceed2f3abe500a8333470a1e916812391cd68261",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-lib/zipball/980b26dcc3d51ecf47aa45c43564ab9b6dbac244",
+                "reference": "980b26dcc3d51ecf47aa45c43564ab9b6dbac244",
                 "shasum": ""
             },
             "require": {
@@ -336,8 +324,12 @@
                     {
                         "title": "Generate <comment>CCL</comment> wrapper functions",
                         "run": [
-                            "@php-script src/StubsTpl.php"
+                            "@php-method \\CCL\\Tasks::template"
                         ],
+                        "tpl-file": "src/StubsTpl.php",
+                        "tpl-items": {
+                            "CCL.php": true
+                        },
                         "watch-files": [
                             "src/StubsTpl.php",
                             "src/Functions.php"
@@ -366,20 +358,20 @@
                 }
             ],
             "description": "Small library of compilation helpers",
-            "time": "2020-09-30T22:30:37+00:00"
+            "time": "2020-10-03T00:11:18+00:00"
         },
         {
             "name": "civicrm/composer-compile-plugin",
-            "version": "v0.10",
+            "version": "v0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/civicrm/composer-compile-plugin.git",
-                "reference": "2624473090698cf813d14545a70b422b48f263e8"
+                "reference": "5ed863f2276a445775900ba18e99d14b15402640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/2624473090698cf813d14545a70b422b48f263e8",
-                "reference": "2624473090698cf813d14545a70b422b48f263e8",
+                "url": "https://api.github.com/repos/civicrm/composer-compile-plugin/zipball/5ed863f2276a445775900ba18e99d14b15402640",
+                "reference": "5ed863f2276a445775900ba18e99d14b15402640",
                 "shasum": ""
             },
             "require": {
@@ -411,7 +403,7 @@
                 }
             ],
             "description": "Define a 'compile' event for all packages in the dependency-graph",
-            "time": "2020-09-30T21:14:46+00:00"
+            "time": "2020-10-04T00:13:46+00:00"
         },
         {
             "name": "civicrm/composer-downloads-plugin",
@@ -2434,20 +2426,6 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-12T14:33:46+00:00"
         },
         {
@@ -2519,20 +2497,6 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-13T09:33:40+00:00"
         },
         {
@@ -2596,20 +2560,6 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-03-15T09:38:08+00:00"
         },
         {
@@ -2660,20 +2610,6 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-12T16:54:01+00:00"
         },
         {
@@ -2781,20 +2717,6 @@
                 "polyfill",
                 "portable"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-12T16:14:59+00:00"
         },
         {
@@ -2854,20 +2776,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -2930,20 +2838,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -3003,20 +2897,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -3072,20 +2952,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -3135,20 +3001,6 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-12T14:33:46+00:00"
         },
         {
@@ -3741,6 +3593,5 @@
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.1"
-    },
-    "plugin-api-version": "1.1.0"
+    }
 }

From 79868cc2a719aca1fea526b9e02a8bd492963e8f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 2 Oct 2020 20:45:47 -0400
Subject: [PATCH 815/834] Updates for Angular 1.8 - fix premature access to
 component properties

Angular 1.8 doesn't seem to like it when you try to access component properties
before the init function.
---
 ext/search/ang/search/crmSearchActions.component.js  | 4 ++--
 ext/search/ang/search/crmSearchFunction.component.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/search/ang/search/crmSearchActions.component.js b/ext/search/ang/search/crmSearchActions.component.js
index 6711ea135ba7..73ed61a0923d 100644
--- a/ext/search/ang/search/crmSearchActions.component.js
+++ b/ext/search/ang/search/crmSearchActions.component.js
@@ -12,10 +12,10 @@
     templateUrl: '~/search/crmSearchActions.html',
     controller: function($scope, crmApi4, dialogService, searchMeta) {
       var ts = $scope.ts = CRM.ts(),
-        entityTitle = searchMeta.getEntity(this.entity).titlePlural,
         ctrl = this;
 
-      this.init = function() {
+      this.$onInit = function() {
+        var entityTitle = searchMeta.getEntity(ctrl.entity).titlePlural;
         if (!ctrl.actions) {
           var actions = _.transform(_.cloneDeep(CRM.vars.search.actions), function (actions, action) {
             if (_.includes(action.entities, ctrl.entity)) {
diff --git a/ext/search/ang/search/crmSearchFunction.component.js b/ext/search/ang/search/crmSearchFunction.component.js
index 9b7efce4b837..1b2c45832d85 100644
--- a/ext/search/ang/search/crmSearchFunction.component.js
+++ b/ext/search/ang/search/crmSearchFunction.component.js
@@ -10,9 +10,9 @@
     controller: function($scope, formatForSelect2, searchMeta) {
       var ts = $scope.ts = CRM.ts(),
         ctrl = this;
-      this.functions = formatForSelect2(_.where(CRM.vars.search.functions, {category: this.cat}), 'name', 'title');
 
       this.$onInit = function() {
+        ctrl.functions = formatForSelect2(_.where(CRM.vars.search.functions, {category: ctrl.cat}), 'name', 'title');
         var fieldInfo = searchMeta.parseExpr(ctrl.expr);
         ctrl.path = fieldInfo.path + fieldInfo.suffix;
         ctrl.field = fieldInfo.field;

From eafad194052191ec741356dabf968674892ca132 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Thu, 1 Oct 2020 11:41:10 +1000
Subject: [PATCH 816/834] [REF] Ensure that the crm-error class on the field is
 also remove when field is changed

Only handle crm-error class
---
 js/Common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/Common.js b/js/Common.js
index 881dda124d0a..8a1ee54a31b0 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -1322,7 +1322,7 @@ if (!CRM.vars) CRM.vars = {};
       setTimeout(function () {
         ele.one('change', function () {
           if (msg && msg.close) msg.close();
-          ele.removeClass('error');
+          ele.removeClass('crm-error');
           label.removeClass('crm-error');
         });
       }, 1000);

From 10e59978672d9b779ae7ada18130837717397b29 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Sat, 26 Sep 2020 10:25:12 -0400
Subject: [PATCH 817/834] avoid crash from recursion on exceptions

---
 CRM/Core/Error.php | 13 ++++---
 composer.json      |  1 +
 composer.lock      | 90 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 96 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/Error.php b/CRM/Core/Error.php
index aced775beedd..ec287600277d 100644
--- a/CRM/Core/Error.php
+++ b/CRM/Core/Error.php
@@ -529,11 +529,14 @@ public static function debug_var($variable_name, $variable, $print = TRUE, $log
         $out = "\$$variable_name = $out";
       }
       else {
-        // use var_dump
-        ob_start();
-        var_dump($variable);
-        $dump = ob_get_contents();
-        ob_end_clean();
+        // Use Symfony var-dumper to avoid circular references that exhaust
+        // memory when using var_dump().
+        // Use its CliDumper since if we use the simpler `dump()` then it
+        // comes out as some overly decorated html which is hard to read.
+        $dump = (new \Symfony\Component\VarDumper\Dumper\CliDumper('php://output'))
+          ->dump(
+            (new \Symfony\Component\VarDumper\Cloner\VarCloner())->cloneVar($variable),
+            TRUE);
         $out = "\n\$$variable_name = $dump";
       }
       // reset if it is an array
diff --git a/composer.json b/composer.json
index e8a425716ee5..41ae510b1562 100644
--- a/composer.json
+++ b/composer.json
@@ -52,6 +52,7 @@
     "symfony/event-dispatcher": "~3.0 || ~4.4",
     "symfony/filesystem": "~3.0 || ~4.4",
     "symfony/process": "~3.0 || ~4.4",
+    "symfony/var-dumper": "~3.0 || ~4.4",
     "psr/log": "~1.0",
     "symfony/finder": "~3.0 || ~4.4",
     "tecnickcom/tcpdf" : "6.3.*",
diff --git a/composer.lock b/composer.lock
index 392e957df2b6..de6cf6e6aedd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2a5c933954791a798ec0f50db504c476",
+    "content-hash": "5b823c420fc0d96c61731dd45a7d2e3e",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -242,7 +242,7 @@
                 {
                     "name": "Tobias Nyholm",
                     "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
+                    "homepage": "https://github.com/nyholm"
                 },
                 {
                     "name": "Nicolas Grekas",
@@ -3003,6 +3003,89 @@
             "homepage": "https://symfony.com",
             "time": "2020-04-12T14:33:46+00:00"
         },
+        {
+            "name": "symfony/var-dumper",
+            "version": "v3.4.44",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "3e31b82077039b1ea3b5a203ec1e3016606f4484"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/3e31b82077039b1ea3b5a203ec1e3016606f4484",
+                "reference": "3e31b82077039b1ea3b5a203ec1e3016606f4484",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+            },
+            "require-dev": {
+                "ext-iconv": "*",
+                "twig/twig": "~1.34|~2.4"
+            },
+            "suggest": {
+                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+                "ext-intl": "To show region name in time zone dump",
+                "ext-symfony_debug": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "Resources/functions/dump.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\VarDumper\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony mechanism for exploring and dumping PHP variables",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "debug",
+                "dump"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-08-17T07:27:37+00:00"
+        },
         {
             "name": "tecnickcom/tcpdf",
             "version": "6.3.5",
@@ -3593,5 +3676,6 @@
     "platform-dev": [],
     "platform-overrides": {
         "php": "7.1"
-    }
+    },
+    "plugin-api-version": "1.1.0"
 }

From 4c85c7b637df18f403765396c2a5e9a55f923678 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Sun, 4 Oct 2020 18:37:13 -0400
Subject: [PATCH 818/834] fix labels on new admin permissions

---
 CRM/Core/Permission.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/Permission.php b/CRM/Core/Permission.php
index 049984501c22..899440812e6b 100644
--- a/CRM/Core/Permission.php
+++ b/CRM/Core/Permission.php
@@ -903,11 +903,11 @@ public static function getCorePermissions() {
       ],
       'administer CiviCRM system' => [
         'label' => $prefix . ts('administer CiviCRM System'),
-        'description' => ts('Perform all system administration tasks in CiviCRM:'),
+        'description' => ts('Perform all system administration tasks in CiviCRM'),
       ],
       'administer CiviCRM data' => [
         'label' => $prefix . ts('administer CiviCRM Data'),
-        'description' => ts('Perform all system administration tasks in CiviCRM:'),
+        'description' => ts('Permit altering all restricted data options'),
       ],
     ];
     foreach (self::getImpliedPermissions() as $name => $includes) {

From 88f473e94db6cc139386b473cf80fdaeb7594dc8 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 5 Oct 2020 08:45:16 -0400
Subject: [PATCH 819/834] Search ext: rename to Search Kit, mark as beta

---
 ext/search/CRM/Search/Upgrader.php   |  6 +++---
 ext/search/README.md                 | 12 +++++++++---
 ext/search/ang/search/crmSearch.html |  2 +-
 ext/search/info.xml                  | 19 +++++++++----------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ext/search/CRM/Search/Upgrader.php b/ext/search/CRM/Search/Upgrader.php
index 7260e39813cf..667460ecba06 100644
--- a/ext/search/CRM/Search/Upgrader.php
+++ b/ext/search/CRM/Search/Upgrader.php
@@ -12,8 +12,8 @@ class CRM_Search_Upgrader extends CRM_Search_Upgrader_Base {
   public function enable() {
     \Civi\Api4\Navigation::create(FALSE)
       ->addValue('parent_id:name', 'Search')
-      ->addValue('label', E::ts('Create Search...'))
-      ->addValue('name', 'create_search')
+      ->addValue('label', E::ts('Search Kit'))
+      ->addValue('name', 'search_kit')
       ->addValue('url', 'civicrm/search')
       ->addValue('icon', 'crm-i fa-search-plus')
       ->addValue('has_separator', 2)
@@ -26,7 +26,7 @@ public function enable() {
    */
   public function disable() {
     \Civi\Api4\Navigation::delete(FALSE)
-      ->addWhere('name', '=', 'create_search')
+      ->addWhere('name', '=', 'search_kit')
       ->addWhere('domain_id', '=', 'current_domain')
       ->execute();
   }
diff --git a/ext/search/README.md b/ext/search/README.md
index 456e59f4f8e1..3bb1cbbf96c0 100644
--- a/ext/search/README.md
+++ b/ext/search/README.md
@@ -1,7 +1,13 @@
-# org.civicrm.search
+# CiviCRM Search Kit
 
-A core extension to create advanced searches.
+A core extension to create complex searches, reports & smart groups.
 
 ## Usage
 
-Once enabled, navigate to **Search > Create Search...** in the menu.
+Once enabled, navigate to **Search > Search Kit** in the menu.
+
+## Development
+
+https://chat.civicrm.org/civicrm/channels/search-improvements
+
+https://lab.civicrm.org/dev/report/-/issues
diff --git a/ext/search/ang/search/crmSearch.html b/ext/search/ang/search/crmSearch.html
index 3500ef31c7a8..5c6a010e37f5 100644
--- a/ext/search/ang/search/crmSearch.html
+++ b/ext/search/ang/search/crmSearch.html
@@ -1,5 +1,5 @@
 <div id="bootstrap-theme" class="crm-search">
-  <h1 crm-page-title>{{:: ts('Create Search for %1', {1: $ctrl.getEntity($ctrl.entity).titlePlural}) }}</h1>
+  <h1 crm-page-title>{{:: ts('Search for %1', {1: $ctrl.getEntity($ctrl.entity).titlePlural}) }}</h1>
 
   <!--This warning will show if bootstrap is unavailable. Normally it will be hidden by the bootstrap .collapse class.-->
   <div class="messages warning no-popup collapse">
diff --git a/ext/search/info.xml b/ext/search/info.xml
index 3908cea9763a..587477bff06c 100644
--- a/ext/search/info.xml
+++ b/ext/search/info.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0"?>
 <extension key="org.civicrm.search" type="module">
   <file>search</file>
-  <name>Search</name>
-  <description>Build searches for a wide variety of CiviCRM entities</description>
+  <name>Search Kit</name>
+  <description>Create searches for a wide variety of CiviCRM entities</description>
   <license>AGPL-3.0</license>
   <maintainer>
     <author>Coleman Watts</author>
     <email>coleman@civicrm.org</email>
   </maintainer>
   <urls>
+    <url desc="Chat">https://chat.civicrm.org/civicrm/channels/search-improvements</url>
+    <url desc="Issues">https://lab.civicrm.org/dev/report/-/issues</url>
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate>2020-07-08</releaseDate>
-  <version>1.0</version>
-  <tags>
-    <tag>mgmt:hidden</tag>
-  </tags>
-  <develStage>stable</develStage>
+  <releaseDate>2020-11-07</releaseDate>
+  <version>1.0.beta1</version>
+  <develStage>beta</develStage>
   <compatibility>
-    <ver>5.28</ver>
+    <ver>5.31</ver>
   </compatibility>
-  <comments>Distributed with CiviCRM core</comments>
+  <comments>This extension is still in beta. Click on the chat link above to discuss development, report problems or ask questions.</comments>
   <classloader>
     <psr4 prefix="Civi\" path="Civi"/>
   </classloader>

From f5a76937b51d534c26fd798615a69b7c49158a7f Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 5 Oct 2020 13:40:46 -0700
Subject: [PATCH 820/834] gitattributes - When exporting for composer-style
 tarball, exclude gitignore

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..05088657de17
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes export-ignore  
+.gitignore export-ignore

From 2fe04f0ed106572120f8b40ce0eef6137f1430ba Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 6 Oct 2020 09:50:57 +1100
Subject: [PATCH 821/834] [REF] Fix adding in the accessKey based on the button
 array

---
 templates/CRM/common/formButtons.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 10b848a154d2..355abcadc62f 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -12,7 +12,7 @@
 {* Loops through $linkButtons and assigns html "a" (link) buttons to the template. Used for additional entity functions such as "Move to Case" or "Renew Membership" *}
 {if $linkButtons}
   {foreach from=$linkButtons item=linkButton}
-    {if $linkButton.accesskey}
+    {if $linkButton.accessKey}
       {capture assign=accessKey}accesskey="{$linkButton.accessKey}"{/capture}
     {else}{assign var="accessKey" value=""}
     {/if}

From 2f43fd45d6bb537c611b473a8cd18529eb5a11d3 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 3 Oct 2020 11:07:37 +1300
Subject: [PATCH 822/834] dev/core#2087 move uf_match check above the primary
 check

the uf_match check will result in an early return more often than the other
---
 CRM/Core/BAO/UFMatch.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/BAO/UFMatch.php b/CRM/Core/BAO/UFMatch.php
index 9e61b990b3ce..9d0a58bbac35 100644
--- a/CRM/Core/BAO/UFMatch.php
+++ b/CRM/Core/BAO/UFMatch.php
@@ -340,6 +340,14 @@ public static function updateUFName($contactId) {
       return;
     }
 
+    // 1.do check for contact Id.
+    $ufmatch = new CRM_Core_DAO_UFMatch();
+    $ufmatch->contact_id = $contactId;
+    $ufmatch->domain_id = CRM_Core_Config::domainID();
+    if (!$ufmatch->find(TRUE)) {
+      return;
+    }
+
     $config = CRM_Core_Config::singleton();
     $ufName = CRM_Contact_BAO_Contact::getPrimaryEmail($contactId);
 
@@ -349,13 +357,6 @@ public static function updateUFName($contactId) {
 
     $update = FALSE;
 
-    // 1.do check for contact Id.
-    $ufmatch = new CRM_Core_DAO_UFMatch();
-    $ufmatch->contact_id = $contactId;
-    $ufmatch->domain_id = CRM_Core_Config::domainID();
-    if (!$ufmatch->find(TRUE)) {
-      return;
-    }
     if ($ufmatch->uf_name != $ufName) {
       $update = TRUE;
     }

From e9411afa61d310b34b3507131f172099524fba22 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sat, 3 Oct 2020 09:13:04 +1300
Subject: [PATCH 823/834] dev/core#2079 [REF] clean up call to apiQuery

This fixes a few things
1) fixes apiQuery to be called statically as it is a static function
2) casts results directly to detail
3) removes unnused variable
---
 CRM/Contact/Form/Task/LabelCommon.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/CRM/Contact/Form/Task/LabelCommon.php b/CRM/Contact/Form/Task/LabelCommon.php
index c0c561ff2648..8265c5a4e125 100644
--- a/CRM/Contact/Form/Task/LabelCommon.php
+++ b/CRM/Contact/Form/Task/LabelCommon.php
@@ -136,12 +136,9 @@ public static function getRows($contactIDs, $locationTypeID, $respectDoNotMail,
     $numberofContacts = count($contactIDs);
     //this does the same as calling civicrm_api3('contact, get, array('id' => array('IN' => $this->_contactIds)
     // except it also handles multiple locations
-    $query = new CRM_Contact_BAO_Query($params, $returnProperties);
-    $details = $query->apiQuery($params, $returnProperties, NULL, NULL, 0, $numberofContacts);
+    [$details] = CRM_Contact_BAO_Query::apiQuery($params, $returnProperties, NULL, NULL, 0, $numberofContacts);
 
-    $messageToken = CRM_Utils_Token::getTokens($mailingFormat);
-    // $details[0] is an array of [ contactID => contactDetails ]
-    $details = $details[0];
+    // $details is an array of [ contactID => contactDetails ]
     $tokenFields = CRM_Contact_Form_Task_LabelCommon::getTokenData($details);
 
     foreach ($contactIDs as $value) {

From e2c63777643f99ad5e4469ce8f6fd7e9e67feb7d Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 6 Oct 2020 12:23:50 +1100
Subject: [PATCH 824/834] [REF] Remove XML_Util dependancy within ewaysingle
 extension

---
 ext/ewaysingle/lib/XML/Util.php               | 921 ------------------
 .../lib/eWAY/eWAY_GatewayRequest.php          |  28 +-
 2 files changed, 24 insertions(+), 925 deletions(-)
 delete mode 100644 ext/ewaysingle/lib/XML/Util.php

diff --git a/ext/ewaysingle/lib/XML/Util.php b/ext/ewaysingle/lib/XML/Util.php
deleted file mode 100644
index cbef96ac831c..000000000000
--- a/ext/ewaysingle/lib/XML/Util.php
+++ /dev/null
@@ -1,921 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Util
- *
- * XML Utilities package
- *
- * PHP versions 4 and 5
- *
- * LICENSE:
- *
- * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The name of the author may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  XML
- * @package   XML_Util
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Util.php,v 1.38 2008/11/13 00:03:38 ashnazg Exp $
- * @link      http://pear.php.net/package/XML_Util
- */
-
-/**
- * error code for invalid chars in XML name
- */
-define('XML_UTIL_ERROR_INVALID_CHARS', 51);
-
-/**
- * error code for invalid chars in XML name
- */
-define('XML_UTIL_ERROR_INVALID_START', 52);
-
-/**
- * error code for non-scalar tag content
- */
-define('XML_UTIL_ERROR_NON_SCALAR_CONTENT', 60);
-
-/**
- * error code for missing tag name
- */
-define('XML_UTIL_ERROR_NO_TAG_NAME', 61);
-
-/**
- * replace XML entities
- */
-define('XML_UTIL_REPLACE_ENTITIES', 1);
-
-/**
- * embedd content in a CData Section
- */
-define('XML_UTIL_CDATA_SECTION', 5);
-
-/**
- * do not replace entitites
- */
-define('XML_UTIL_ENTITIES_NONE', 0);
-
-/**
- * replace all XML entitites
- * This setting will replace <, >, ", ' and &
- */
-define('XML_UTIL_ENTITIES_XML', 1);
-
-/**
- * replace only required XML entitites
- * This setting will replace <, " and &
- */
-define('XML_UTIL_ENTITIES_XML_REQUIRED', 2);
-
-/**
- * replace HTML entitites
- * @link http://www.php.net/htmlentities
- */
-define('XML_UTIL_ENTITIES_HTML', 3);
-
-/**
- * Collapse all empty tags.
- */
-define('XML_UTIL_COLLAPSE_ALL', 1);
-
-/**
- * Collapse only empty XHTML tags that have no end tag.
- */
-define('XML_UTIL_COLLAPSE_XHTML_ONLY', 2);
-
-/**
- * utility class for working with XML documents
- *
- *
- * @category  XML
- * @package   XML_Util
- * @author    Stephan Schmidt <schst@php.net>
- * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
- * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.2.1
- * @link      http://pear.php.net/package/XML_Util
- */
-class XML_Util {
-
-  /**
-   * return API version
-   *
-   * @return string $version API version
-   * @access public
-   * @static
-   */
-  public function apiVersion() {
-    return '1.1';
-  }
-
-  /**
-   * replace XML entities
-   *
-   * With the optional second parameter, you may select, which
-   * entities should be replaced.
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // replace XML entites:
-   * $string = XML_Util::replaceEntities('This string contains < & >.');
-   * </code>
-   *
-   * With the optional third parameter, you may pass the character encoding
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // replace XML entites in UTF-8:
-   * $string = XML_Util::replaceEntities(
-   *     'This string contains < & > as well as ä, ö, ß, à and ê',
-   *     XML_UTIL_ENTITIES_HTML,
-   *     'UTF-8'
-   * );
-   * </code>
-   *
-   * @param string $string          string where XML special chars
-   *                                should be replaced
-   * @param int $replaceEntities
-   *                                (one of XML_UTIL_ENTITIES_XML,
-   *                             XML_UTIL_ENTITIES_XML_REQUIRED,
-   *                             XML_UTIL_ENTITIES_HTML)
-   * @param string $encoding        encoding value (if any)...
-   *                                must be a valid encoding as determined
-   *                                by the htmlentities() function
-   *
-   * @return string string with replaced chars
-   * @access public
-   * @static
-   * @see reverseEntities()
-   */
-  public function replaceEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
-        $encoding = 'ISO-8859-1') {
-    switch ($replaceEntities) {
-      case XML_UTIL_ENTITIES_XML:
-        return strtr($string, array(
-          '&'  => '&amp;',
-          '>'  => '&gt;',
-          '<'  => '&lt;',
-          '"'  => '&quot;',
-          '\'' => '&apos;',
-        ));
-
-      break;
-      case XML_UTIL_ENTITIES_XML_REQUIRED:
-        return strtr($string, array(
-          '&' => '&amp;',
-          '<' => '&lt;',
-          '"' => '&quot;',
-        ));
-
-      break;
-      case XML_UTIL_ENTITIES_HTML:
-        return htmlentities($string, ENT_COMPAT, $encoding);
-
-      break;
-    }
-    return $string;
-  }
-
-  /**
-   * reverse XML entities
-   *
-   * With the optional second parameter, you may select, which
-   * entities should be reversed.
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // reverse XML entites:
-   * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
-   * </code>
-   *
-   * With the optional third parameter, you may pass the character encoding
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // reverse XML entites in UTF-8:
-   * $string = XML_Util::reverseEntities(
-   *     'This string contains &lt; &amp; &gt; as well as'
-   *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
-   *     XML_UTIL_ENTITIES_HTML,
-   *     'UTF-8'
-   * );
-   * </code>
-   *
-   * @param string $string          string where XML special chars
-   *                                should be replaced
-   * @param int $replaceEntities
-   *                                (one of XML_UTIL_ENTITIES_XML,
-   *                             XML_UTIL_ENTITIES_XML_REQUIRED,
-   *                             XML_UTIL_ENTITIES_HTML)
-   * @param string $encoding        encoding value (if any)...
-   *                                must be a valid encoding as determined
-   *                                by the html_entity_decode() function
-   *
-   * @return string string with replaced chars
-   * @access public
-   * @static
-   * @see replaceEntities()
-   */
-  public function reverseEntities($string, $replaceEntities = XML_UTIL_ENTITIES_XML,
-        $encoding = 'ISO-8859-1') {
-    switch ($replaceEntities) {
-      case XML_UTIL_ENTITIES_XML:
-        return strtr($string, array(
-          '&amp;'  => '&',
-          '&gt;'   => '>',
-          '&lt;'   => '<',
-          '&quot;' => '"',
-          '&apos;' => '\'',
-        ));
-
-      break;
-      case XML_UTIL_ENTITIES_XML_REQUIRED:
-        return strtr($string, array(
-          '&amp;'  => '&',
-          '&lt;'   => '<',
-          '&quot;' => '"',
-        ));
-
-      break;
-      case XML_UTIL_ENTITIES_HTML:
-        return html_entity_decode($string, ENT_COMPAT, $encoding);
-
-      break;
-    }
-    return $string;
-  }
-
-  /**
-   * build an xml declaration
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // get an XML declaration:
-   * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
-   * </code>
-   *
-   * @param string $version    xml version
-   * @param string $encoding   character encoding
-   * @param bool $standalone
-   *
-   * @return string xml declaration
-   * @access public
-   * @static
-   * @uses attributesToString() to serialize the attributes of the XML declaration
-   */
-  public function getXMLDeclaration($version = '1.0', $encoding = NULL,
-        $standalone = NULL) {
-    $attributes = array(
-      'version' => $version,
-    );
-    // add encoding
-    if ($encoding !== NULL) {
-      $attributes['encoding'] = $encoding;
-    }
-    // add standalone, if specified
-    if ($standalone !== NULL) {
-      $attributes['standalone'] = $standalone ? 'yes' : 'no';
-    }
-
-    return sprintf('<?xml%s?>',
-        XML_Util::attributesToString($attributes, FALSE));
-  }
-
-  /**
-   * build a document type declaration
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // get a doctype declaration:
-   * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
-   * </code>
-   *
-   * @param string $root        name of the root tag
-   * @param string $uri         uri of the doctype definition
-   *                            (or array with uri and public id)
-   * @param string $internalDtd internal dtd entries
-   *
-   * @return string doctype declaration
-   * @access public
-   * @static
-   * @since 0.2
-   */
-  public function getDocTypeDeclaration($root, $uri = NULL, $internalDtd = NULL) {
-    if (is_array($uri)) {
-      $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
-    }
-    elseif (!empty($uri)) {
-      $ref = sprintf(' SYSTEM "%s"', $uri);
-    }
-    else {
-      $ref = '';
-    }
-
-    if (empty($internalDtd)) {
-      return sprintf('<!DOCTYPE %s%s>', $root, $ref);
-    }
-    else {
-      return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
-    }
-  }
-
-  /**
-   * create string representation of an attribute list
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // build an attribute string
-   * $att = array(
-   *              'foo'   =>  'bar',
-   *              'argh'  =>  'tomato'
-   *            );
-   *
-   * $attList = XML_Util::attributesToString($att);
-   * </code>
-   *
-   * @param array $attributes
-   * @param bool|array $sort       sort attribute list alphabetically,
-   *                               may also be an assoc array containing
-   *                               the keys 'sort', 'multiline', 'indent',
-   *                               'linebreak' and 'entities'
-   * @param bool $multiline
-   *                               one attribute is given
-   * @param string $indent
-   *                               multiline attributes
-   * @param string $linebreak
-   *                               multiline attributes
-   * @param int $entities
-   *                               (one of XML_UTIL_ENTITIES_NONE,
-   *                        XML_UTIL_ENTITIES_XML,
-   *                        XML_UTIL_ENTITIES_XML_REQUIRED,
-   *                        XML_UTIL_ENTITIES_HTML)
-   *
-   * @return string string representation of the attributes
-   * @access public
-   * @static
-   * @uses replaceEntities() to replace XML entities in attribute values
-   * @todo allow sort also to be an options array
-   */
-  public function attributesToString($attributes, $sort = TRUE, $multiline = FALSE,
-        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML) {
-    /*
-     * second parameter may be an array
-     */
-    if (is_array($sort)) {
-      if (isset($sort['multiline'])) {
-        $multiline = $sort['multiline'];
-      }
-      if (isset($sort['indent'])) {
-        $indent = $sort['indent'];
-      }
-      if (isset($sort['linebreak'])) {
-        $multiline = $sort['linebreak'];
-      }
-      if (isset($sort['entities'])) {
-        $entities = $sort['entities'];
-      }
-      if (isset($sort['sort'])) {
-        $sort = $sort['sort'];
-      }
-      else {
-        $sort = TRUE;
-      }
-    }
-    $string = '';
-    if (is_array($attributes) && !empty($attributes)) {
-      if ($sort) {
-        ksort($attributes);
-      }
-      if (!$multiline || count($attributes) == 1) {
-        foreach ($attributes as $key => $value) {
-          if ($entities != XML_UTIL_ENTITIES_NONE) {
-            if ($entities === XML_UTIL_CDATA_SECTION) {
-              $entities = XML_UTIL_ENTITIES_XML;
-            }
-            $value = XML_Util::replaceEntities($value, $entities);
-          }
-          $string .= ' ' . $key . '="' . $value . '"';
-        }
-      }
-      else {
-        $first = TRUE;
-        foreach ($attributes as $key => $value) {
-          if ($entities != XML_UTIL_ENTITIES_NONE) {
-            $value = XML_Util::replaceEntities($value, $entities);
-          }
-          if ($first) {
-            $string .= ' ' . $key . '="' . $value . '"';
-            $first   = FALSE;
-          }
-          else {
-            $string .= $linebreak . $indent . $key . '="' . $value . '"';
-          }
-        }
-      }
-    }
-    return $string;
-  }
-
-  /**
-   * Collapses empty tags.
-   *
-   * @param string $xml  XML
-   * @param int $mode
-   *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
-   *
-   * @return string XML
-   * @access public
-   * @static
-   * @todo PEAR CS - unable to avoid "space after open parens" error
-   *       in the IF branch
-   */
-  public function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL) {
-    if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
-      return preg_replace(
-        '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
-        . 'param)([^>]*)><\/\\1>/s',
-        '<\\1\\2 />',
-        $xml);
-    }
-    else {
-      return preg_replace('/<(\w+)([^>]*)><\/\\1>/s', '<\\1\\2 />', $xml);
-    }
-  }
-
-  /**
-   * create a tag
-   *
-   * This method will call XML_Util::createTagFromArray(), which
-   * is more flexible.
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // create an XML tag:
-   * $tag = XML_Util::createTag('myNs:myTag',
-   *     array('foo' => 'bar'),
-   *     'This is inside the tag',
-   *     'http://www.w3c.org/myNs#');
-   * </code>
-   *
-   * @param string $qname           qualified tagname (including namespace)
-   * @param array $attributes
-   * @param mixed $content
-   * @param string $namespaceUri    URI of the namespace
-   * @param int $replaceEntities
-   *                                content, embedd it in a CData section
-   *                             or none of both
-   * @param bool $multiline
-   *                                each attribute gets written to a single line
-   * @param string $indent          string used to indent attributes
-   *                                (_auto indents attributes so they start
-   *                                at the same column)
-   * @param string $linebreak       string used for linebreaks
-   * @param bool $sortAttributes
-   *
-   * @return string XML tag
-   * @access public
-   * @static
-   * @see createTagFromArray()
-   * @uses createTagFromArray() to create the tag
-   */
-  public function createTag($qname, $attributes = array(), $content = NULL,
-        $namespaceUri = NULL, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
-        $multiline = FALSE, $indent = '_auto', $linebreak = "\n",
-        $sortAttributes = TRUE) {
-    $tag = array(
-      'qname'      => $qname,
-      'attributes' => $attributes,
-    );
-
-    // add tag content
-    if ($content !== NULL) {
-      $tag['content'] = $content;
-    }
-
-    // add namespace Uri
-    if ($namespaceUri !== NULL) {
-      $tag['namespaceUri'] = $namespaceUri;
-    }
-
-    return XML_Util::createTagFromArray($tag, $replaceEntities, $multiline,
-        $indent, $linebreak, $sortAttributes);
-  }
-
-  /**
-   * create a tag from an array
-   * this method awaits an array in the following format
-   * <pre>
-   * array(
-   *     // qualified name of the tag
-   *     'qname' => $qname
-   *
-   *     // namespace prefix (optional, if qname is specified or no namespace)
-   *     'namespace' => $namespace
-   *
-   *     // local part of the tagname (optional, if qname is specified)
-   *     'localpart' => $localpart,
-   *
-   *     // array containing all attributes (optional)
-   *     'attributes' => array(),
-   *
-   *     // tag content (optional)
-   *     'content' => $content,
-   *
-   *     // namespaceUri for the given namespace (optional)
-   *     'namespaceUri' => $namespaceUri
-   * )
-   * </pre>
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * $tag = array(
-   *     'qname'        => 'foo:bar',
-   *     'namespaceUri' => 'http://foo.com',
-   *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
-   *     'content'      => 'I\'m inside the tag',
-   * );
-   * // creating a tag with qualified name and namespaceUri
-   * $string = XML_Util::createTagFromArray($tag);
-   * </code>
-   *
-   * @param array $tag
-   * @param int $replaceEntities
-   *                                content, embedd it in a CData section
-   *                             or none of both
-   * @param bool $multiline
-   *                                attribute gets written to a single line
-   * @param string $indent          string used to indent attributes
-   *                                (_auto indents attributes so they start
-   *                                at the same column)
-   * @param string $linebreak       string used for linebreaks
-   * @param bool $sortAttributes
-   *
-   * @return string XML tag
-   * @access public
-   * @static
-   * @see createTag()
-   * @uses attributesToString() to serialize the attributes of the tag
-   * @uses splitQualifiedName() to get local part and namespace of a qualified name
-   * @uses createCDataSection()
-   * @uses raiseError()
-   */
-  public function createTagFromArray($tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
-        $multiline = FALSE, $indent = '_auto', $linebreak = "\n",
-        $sortAttributes = TRUE) {
-    if (isset($tag['content']) && !is_scalar($tag['content'])) {
-      return XML_Util::raiseError('Supplied non-scalar value as tag content',
-      XML_UTIL_ERROR_NON_SCALAR_CONTENT);
-    }
-
-    if (!isset($tag['qname']) && !isset($tag['localPart'])) {
-      return XML_Util::raiseError('You must either supply a qualified name '
-        . '(qname) or local tag name (localPart).',
-        XML_UTIL_ERROR_NO_TAG_NAME);
-    }
-
-    // if no attributes hav been set, use empty attributes
-    if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
-      $tag['attributes'] = array();
-    }
-
-    if (isset($tag['namespaces'])) {
-      foreach ($tag['namespaces'] as $ns => $uri) {
-        $tag['attributes']['xmlns:' . $ns] = $uri;
-      }
-    }
-
-    if (!isset($tag['qname'])) {
-      // qualified name is not given
-
-      // check for namespace
-      if (isset($tag['namespace']) && !empty($tag['namespace'])) {
-        $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
-      }
-      else {
-        $tag['qname'] = $tag['localPart'];
-      }
-    }
-    elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
-      // namespace URI is set, but no namespace
-
-      $parts = XML_Util::splitQualifiedName($tag['qname']);
-
-      $tag['localPart'] = $parts['localPart'];
-      if (isset($parts['namespace'])) {
-        $tag['namespace'] = $parts['namespace'];
-      }
-    }
-
-    if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
-      // is a namespace given
-      if (isset($tag['namespace']) && !empty($tag['namespace'])) {
-        $tag['attributes']['xmlns:' . $tag['namespace']] =
-                    $tag['namespaceUri'];
-      }
-      else {
-        // define this Uri as the default namespace
-        $tag['attributes']['xmlns'] = $tag['namespaceUri'];
-      }
-    }
-
-    // check for multiline attributes
-    if ($multiline === TRUE) {
-      if ($indent === '_auto') {
-        $indent = str_repeat(' ', (strlen($tag['qname']) + 2));
-      }
-    }
-
-    // create attribute list
-    $attList = XML_Util::attributesToString($tag['attributes'],
-        $sortAttributes, $multiline, $indent, $linebreak, $replaceEntities);
-    if (!isset($tag['content']) || (string) $tag['content'] == '') {
-      $tag = sprintf('<%s%s />', $tag['qname'], $attList);
-    }
-    else {
-      switch ($replaceEntities) {
-        case XML_UTIL_ENTITIES_NONE:
-          break;
-
-        case XML_UTIL_CDATA_SECTION:
-          $tag['content'] = XML_Util::createCDataSection($tag['content']);
-          break;
-
-        default:
-          $tag['content'] = XML_Util::replaceEntities($tag['content'],
-          $replaceEntities);
-          break;
-      }
-      $tag = sprintf('<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
-        $tag['qname']);
-    }
-    return $tag;
-  }
-
-  /**
-   * create a start element
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // create an XML start element:
-   * $tag = XML_Util::createStartElement('myNs:myTag',
-   *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
-   * </code>
-   *
-   * @param string $qname          qualified tagname (including namespace)
-   * @param array $attributes
-   * @param string $namespaceUri   URI of the namespace
-   * @param bool $multiline
-   *                               attribute gets written to a single line
-   * @param string $indent         string used to indent attributes (_auto indents
-   *                               attributes so they start at the same column)
-   * @param string $linebreak      string used for linebreaks
-   * @param bool $sortAttributes
-   *
-   * @return string XML start element
-   * @access public
-   * @static
-   * @see createEndElement()
-   * @see createTag()
-   */
-  public function createStartElement($qname, $attributes = array(), $namespaceUri = NULL,
-        $multiline = FALSE, $indent = '_auto', $linebreak = "\n",
-        $sortAttributes = TRUE) {
-    // if no attributes hav been set, use empty attributes
-    if (!isset($attributes) || !is_array($attributes)) {
-      $attributes = array();
-    }
-
-    if ($namespaceUri != NULL) {
-      $parts = XML_Util::splitQualifiedName($qname);
-    }
-
-    // check for multiline attributes
-    if ($multiline === TRUE) {
-      if ($indent === '_auto') {
-        $indent = str_repeat(' ', (strlen($qname) + 2));
-      }
-    }
-
-    if ($namespaceUri != NULL) {
-      // is a namespace given
-      if (isset($parts['namespace']) && !empty($parts['namespace'])) {
-        $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
-      }
-      else {
-        // define this Uri as the default namespace
-        $attributes['xmlns'] = $namespaceUri;
-      }
-    }
-
-    // create attribute list
-    $attList = XML_Util::attributesToString($attributes, $sortAttributes,
-        $multiline, $indent, $linebreak);
-    $element = sprintf('<%s%s>', $qname, $attList);
-    return $element;
-  }
-
-  /**
-   * create an end element
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // create an XML start element:
-   * $tag = XML_Util::createEndElement('myNs:myTag');
-   * </code>
-   *
-   * @param string $qname qualified tagname (including namespace)
-   *
-   * @return string XML end element
-   * @access public
-   * @static
-   * @see createStartElement()
-   * @see createTag()
-   */
-  public function createEndElement($qname) {
-    $element = sprintf('</%s>', $qname);
-    return $element;
-  }
-
-  /**
-   * create an XML comment
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // create an XML start element:
-   * $tag = XML_Util::createComment('I am a comment');
-   * </code>
-   *
-   * @param string $content content of the comment
-   *
-   * @return string XML comment
-   * @access public
-   * @static
-   */
-  public function createComment($content) {
-    $comment = sprintf('<!-- %s -->', $content);
-    return $comment;
-  }
-
-  /**
-   * create a CData section
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // create a CData section
-   * $tag = XML_Util::createCDataSection('I am content.');
-   * </code>
-   *
-   * @param string $data data of the CData section
-   *
-   * @return string CData section with content
-   * @access public
-   * @static
-   */
-  public function createCDataSection($data) {
-    return sprintf('<![CDATA[%s]]>',
-        preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data)));
-
-  }
-
-  /**
-   * split qualified name and return namespace and local part
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // split qualified tag
-   * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
-   * </code>
-   * the returned array will contain two elements:
-   * <pre>
-   * array(
-   *     'namespace' => 'xslt',
-   *     'localPart' => 'stylesheet'
-   * );
-   * </pre>
-   *
-   * @param string $qname     qualified tag name
-   * @param string $defaultNs default namespace (optional)
-   *
-   * @return array array containing namespace and local part
-   * @access public
-   * @static
-   */
-  public function splitQualifiedName($qname, $defaultNs = NULL) {
-    if (strstr($qname, ':')) {
-      $tmp = explode(':', $qname);
-      return array(
-        'namespace' => $tmp[0],
-        'localPart' => $tmp[1],
-      );
-    }
-    return array(
-      'namespace' => $defaultNs,
-      'localPart' => $qname,
-    );
-  }
-
-  /**
-   * check, whether string is valid XML name
-   *
-   * <p>XML names are used for tagname, attribute names and various
-   * other, lesser known entities.</p>
-   * <p>An XML name may only consist of alphanumeric characters,
-   * dashes, undescores and periods, and has to start with a letter
-   * or an underscore.</p>
-   *
-   * <code>
-   * require_once 'XML/Util.php';
-   *
-   * // verify tag name
-   * $result = XML_Util::isValidName('invalidTag?');
-   * if (is_a($result, 'PEAR_Error')) {
-   *    print 'Invalid XML name: ' . $result->getMessage();
-   * }
-   * </code>
-   *
-   * @param string $string string that should be checked
-   *
-   * @return mixed true, if string is a valid XML name, PEAR error otherwise
-   * @access public
-   * @static
-   * @todo support for other charsets
-   * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
-   */
-  public function isValidName($string) {
-    // check for invalid chars
-    if (!preg_match('/^[[:alpha:]_]$/', $string{0})) {
-      return XML_Util::raiseError('XML names may only start with letter '
-        . 'or underscore', XML_UTIL_ERROR_INVALID_START);
-    }
-
-    // check for invalid chars
-    if (!preg_match('/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?[[:alpha:]_]([[:alnum:]\_\-\.]+)?$/',
-        $string)
-    ) {
-      return XML_Util::raiseError('XML names may only contain alphanumeric '
-        . 'chars, period, hyphen, colon and underscores',
-        XML_UTIL_ERROR_INVALID_CHARS);
-    }
-    // XML name is valid
-    return TRUE;
-  }
-
-  /**
-   * replacement for XML_Util::raiseError
-   *
-   * Avoids the necessity to always require
-   * PEAR.php
-   *
-   * @param string $msg  error message
-   * @param int $code
-   *
-   * @return PEAR_Error
-   * @access public
-   * @static
-   * @todo PEAR CS - should this use include_once instead?
-   */
-  public function raiseError($msg, $code) {
-    require_once 'PEAR.php';
-    return PEAR::raiseError($msg, $code);
-  }
-
-}
diff --git a/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php b/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
index a3f5984e4b83..3b977ceb21a8 100644
--- a/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
+++ b/ext/ewaysingle/lib/eWAY/eWAY_GatewayRequest.php
@@ -205,11 +205,31 @@ public function ToXml() {
    *
    */
   public function CreateNode($NodeName, $NodeValue) {
-    require_once E::path('lib/XML/Util.php');
-
-    $xml = new XML_Util();
-    $node = "<" . $NodeName . ">" . $xml->replaceEntities($NodeValue) . "</" . $NodeName . ">";
+    $node = "<" . $NodeName . ">" . self::replaceEntities($NodeValue) . "</" . $NodeName . ">";
     return $node;
   }
 
+  /**
+   * replace XML entities
+   *
+   * <code>
+   * // replace XML entites:
+   * $string = self::replaceEntities('This string contains < & >.');
+   * </code>
+   *
+   * @param string $string          string where XML special chars
+   *                                should be replaced
+   *
+   * @return string string with replaced chars
+   */
+  public static function replaceEntities($string) {
+    return strtr($string, [
+      '&'  => '&amp;',
+      '>'  => '&gt;',
+      '<'  => '&lt;',
+      '"'  => '&quot;',
+      '\'' => '&apos;',
+    ]);
+  }
+
 }

From 362a820de3a9bb6874e84735f931cea949798d48 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 6 Oct 2020 12:11:38 +1300
Subject: [PATCH 825/834] Add supporting test

---
 CRM/Contact/Form/Task/LabelCommon.php         |  5 +-
 .../CRM/Member/Form/Task/LabelTest.php        | 53 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 tests/phpunit/CRM/Member/Form/Task/LabelTest.php

diff --git a/CRM/Contact/Form/Task/LabelCommon.php b/CRM/Contact/Form/Task/LabelCommon.php
index 8265c5a4e125..5b7a295e8736 100644
--- a/CRM/Contact/Form/Task/LabelCommon.php
+++ b/CRM/Contact/Form/Task/LabelCommon.php
@@ -30,7 +30,10 @@ class CRM_Contact_Form_Task_LabelCommon {
    * @param string $fileName
    *   The name of the file to save the label in.
    */
-  public static function createLabel(&$contactRows, &$format, $fileName = 'MailingLabels_CiviCRM.pdf') {
+  public static function createLabel($contactRows, $format, $fileName = 'MailingLabels_CiviCRM.pdf') {
+    if (CIVICRM_UF === 'UnitTests') {
+      throw new CRM_Core_Exception_PrematureExitException('civiExit called', ['rows' => $contactRows, 'format' => $format, 'file_name' => $fileName]);
+    }
     $pdf = new CRM_Utils_PDF_Label($format, 'mm');
     $pdf->Open();
     $pdf->AddPage();
diff --git a/tests/phpunit/CRM/Member/Form/Task/LabelTest.php b/tests/phpunit/CRM/Member/Form/Task/LabelTest.php
new file mode 100644
index 000000000000..2860d6e65795
--- /dev/null
+++ b/tests/phpunit/CRM/Member/Form/Task/LabelTest.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * @package CiviCRM_APIv3
+ * @subpackage API_Contribution
+ * @group headless
+ */
+class CRM_Member_Form_Task_LabelTest extends CiviUnitTestCase {
+
+  /**
+   * Test print label.
+   *
+   * This is a 'no error' test to support refactoring. It ensures no fatal is hit & lays
+   * the basis for more tests later.
+   */
+  public function testMembershipTokenReplacementInPDF() {
+    // First check tasks are there is some weird static caching that could mess us up.
+    $tasks = CRM_Member_Task::tasks();
+    $this->assertArrayHasKey(201, $tasks, print_r($tasks, TRUE));
+    $tasks = CRM_Member_Task::permissionedTaskTitles(CRM_Core_Permission::EDIT);
+    $this->assertArrayHasKey(201, $tasks);
+    $membershipID = $this->contactMembershipCreate(['contact_id' => $this->individualCreate()]);
+    /* @var CRM_Member_Form_Task_Label $form */
+    $form = $this->getFormObject('CRM_Member_Form_Task_Label', [
+      'task' => 201,
+      'radio_ts' => 'ts_sel',
+    ], 'Search');
+
+    $_SESSION['_' . $form->controller->_name . '_container']['values']['Label'] = [
+      'location_type_id' => NULL,
+      'label_name' => 3475,
+    ];
+    $form->preProcess();
+    $form->ids = [$membershipID => $membershipID];
+    $form->buildForm();
+    try {
+      $form->postProcess();
+    }
+    catch (CRM_Core_Exception_PrematureExitException $e) {
+      $this->assertEquals(3475, $e->errorData['format']);
+    }
+  }
+
+}

From 14abd3ea6cd04189989bf0b934b88927b9eea7d4 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 6 Oct 2020 17:52:19 +1300
Subject: [PATCH 826/834] Remove caching that messes with tests without any
 time saving

---
 CRM/Member/Task.php | 130 ++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
index ade20080e17c..5b298c1d1c84 100644
--- a/CRM/Member/Task.php
+++ b/CRM/Member/Task.php
@@ -40,78 +40,76 @@ class CRM_Member_Task extends CRM_Core_Task {
    *   the set of tasks for a group of contacts
    */
   public static function tasks() {
-    if (!self::$_tasks) {
-      self::$_tasks = [
-        self::TASK_DELETE => [
-          'title' => ts('Delete memberships'),
-          'class' => 'CRM_Member_Form_Task_Delete',
-          'result' => FALSE,
+    self::$_tasks = [
+      self::TASK_DELETE => [
+        'title' => ts('Delete memberships'),
+        'class' => 'CRM_Member_Form_Task_Delete',
+        'result' => FALSE,
+      ],
+      self::TASK_PRINT => [
+        'title' => ts('Print selected rows'),
+        'class' => 'CRM_Member_Form_Task_Print',
+        'result' => FALSE,
+      ],
+      self::TASK_EXPORT => [
+        'title' => ts('Export members'),
+        'class' => [
+          'CRM_Member_Export_Form_Select',
+          'CRM_Member_Export_Form_Map',
         ],
-        self::TASK_PRINT => [
-          'title' => ts('Print selected rows'),
-          'class' => 'CRM_Member_Form_Task_Print',
-          'result' => FALSE,
+        'result' => FALSE,
+      ],
+      self::TASK_EMAIL => [
+        'title' => ts('Email - send now (to %1 or less)', [
+          1 => Civi::settings()
+            ->get('simple_mail_limit'),
+        ]),
+        'class' => 'CRM_Member_Form_Task_Email',
+        'result' => TRUE,
+      ],
+      self::BATCH_UPDATE => [
+        'title' => ts('Update multiple memberships'),
+        'class' => [
+          'CRM_Member_Form_Task_PickProfile',
+          'CRM_Member_Form_Task_Batch',
         ],
-        self::TASK_EXPORT => [
-          'title' => ts('Export members'),
-          'class' => [
-            'CRM_Member_Export_Form_Select',
-            'CRM_Member_Export_Form_Map',
-          ],
-          'result' => FALSE,
+        'result' => TRUE,
+      ],
+      self::LABEL_MEMBERS => [
+        'title' => ts('Mailing labels - print'),
+        'class' => [
+          'CRM_Member_Form_Task_Label',
         ],
-        self::TASK_EMAIL => [
-          'title' => ts('Email - send now (to %1 or less)', [
-            1 => Civi::settings()
-              ->get('simple_mail_limit'),
-          ]),
-          'class' => 'CRM_Member_Form_Task_Email',
-          'result' => TRUE,
-        ],
-        self::BATCH_UPDATE => [
-          'title' => ts('Update multiple memberships'),
-          'class' => [
-            'CRM_Member_Form_Task_PickProfile',
-            'CRM_Member_Form_Task_Batch',
-          ],
-          'result' => TRUE,
-        ],
-        self::LABEL_MEMBERS => [
-          'title' => ts('Mailing labels - print'),
-          'class' => [
-            'CRM_Member_Form_Task_Label',
-          ],
-          'result' => TRUE,
-        ],
-        self::PDF_LETTER => [
-          'title' => ts('Print/merge document for memberships'),
-          'class' => 'CRM_Member_Form_Task_PDFLetter',
-          'result' => FALSE,
-        ],
-        self::SAVE_SEARCH => [
-          'title' => ts('Group - create smart group'),
-          'class' => 'CRM_Contact_Form_Task_SaveSearch',
-          'result' => TRUE,
-        ],
-        self::SAVE_SEARCH_UPDATE => [
-          'title' => ts('Group - update smart group'),
-          'class' => 'CRM_Contact_Form_Task_SaveSearch_Update',
-          'result' => TRUE,
-        ],
-      ];
-
-      //CRM-4418, check for delete
-      if (!CRM_Core_Permission::check('delete in CiviMember')) {
-        unset(self::$_tasks[self::TASK_DELETE]);
-      }
-      //CRM-12920 - check for edit permission
-      if (!CRM_Core_Permission::check('edit memberships')) {
-        unset(self::$_tasks[self::BATCH_UPDATE]);
-      }
+        'result' => TRUE,
+      ],
+      self::PDF_LETTER => [
+        'title' => ts('Print/merge document for memberships'),
+        'class' => 'CRM_Member_Form_Task_PDFLetter',
+        'result' => FALSE,
+      ],
+      self::SAVE_SEARCH => [
+        'title' => ts('Group - create smart group'),
+        'class' => 'CRM_Contact_Form_Task_SaveSearch',
+        'result' => TRUE,
+      ],
+      self::SAVE_SEARCH_UPDATE => [
+        'title' => ts('Group - update smart group'),
+        'class' => 'CRM_Contact_Form_Task_SaveSearch_Update',
+        'result' => TRUE,
+      ],
+    ];
 
-      parent::tasks();
+    //CRM-4418, check for delete
+    if (!CRM_Core_Permission::check('delete in CiviMember')) {
+      unset(self::$_tasks[self::TASK_DELETE]);
+    }
+    //CRM-12920 - check for edit permission
+    if (!CRM_Core_Permission::check('edit memberships')) {
+      unset(self::$_tasks[self::BATCH_UPDATE]);
     }
 
+    parent::tasks();
+
     return self::$_tasks;
   }
 

From f5e61d50ee6647733b2866bc281b82e24c2efbb6 Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Tue, 6 Oct 2020 11:48:01 +0100
Subject: [PATCH 827/834] change civicrm_price_set.min_amount to float

---
 CRM/Price/DAO/PriceSet.php                        | 12 ++++++++----
 CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl |  2 ++
 xml/schema/Price/PriceSet.xml                     |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CRM/Price/DAO/PriceSet.php b/CRM/Price/DAO/PriceSet.php
index 26fa13809836..3c62426ff712 100644
--- a/CRM/Price/DAO/PriceSet.php
+++ b/CRM/Price/DAO/PriceSet.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Price/PriceSet.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:c4db3cbda4900e01aeba098a4578b563)
+ * (GenCodeChecksum:98eebd80f22712ce0809cec244b6f92a)
  */
 
 /**
@@ -117,7 +117,7 @@ class CRM_Price_DAO_PriceSet extends CRM_Core_DAO {
   /**
    * Minimum Amount required for this set.
    *
-   * @var int
+   * @var float
    */
   public $min_amount;
 
@@ -382,11 +382,15 @@ public static function &fields() {
         ],
         'min_amount' => [
           'name' => 'min_amount',
-          'type' => CRM_Utils_Type::T_INT,
+          'type' => CRM_Utils_Type::T_MONEY,
           'title' => ts('Minimum Amount'),
           'description' => ts('Minimum Amount required for this set.'),
+          'precision' => [
+            20,
+            2,
+          ],
           'where' => 'civicrm_price_set.min_amount',
-          'default' => '0',
+          'default' => '0.0',
           'table_name' => 'civicrm_price_set',
           'entity' => 'PriceSet',
           'bao' => 'CRM_Price_BAO_PriceSet',
diff --git a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
index 3c5148fc51df..68d45857c9a3 100644
--- a/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.31.alpha1.mysql.tpl
@@ -41,3 +41,5 @@ INSERT IGNORE INTO civicrm_state_province (country_id, abbreviation, name) VALUE
 (@UKCountryId, "TOF", "Torfaen"),
 (@UKCountryId, "VGL", "Vale of Glamorgan, The"),
 (@UKCountryId, "WRX", "Wrexham");
+
+ALTER TABLE civicrm_price_set MODIFY COLUMN `min_amount` decimal(20,2) DEFAULT '0.00' COMMENT 'Minimum Amount required for this set.';
diff --git a/xml/schema/Price/PriceSet.xml b/xml/schema/Price/PriceSet.xml
index d84ac533927c..4e995b9b33e3 100644
--- a/xml/schema/Price/PriceSet.xml
+++ b/xml/schema/Price/PriceSet.xml
@@ -185,8 +185,8 @@
   <field>
     <name>min_amount</name>
     <title>Minimum Amount</title>
-    <type>int unsigned</type>
-    <default>0</default>
+    <type>decimal</type>
+    <default>0.0</default>
     <comment>Minimum Amount required for this set.</comment>
     <add>4.7</add>
     <html>

From 190240f0c6c6d6321976cd3ae7864a333f98be1b Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Tue, 6 Oct 2020 10:34:48 -0400
Subject: [PATCH 828/834] ltrim typos

---
 CRM/Core/BAO/CustomField.php                  |  6 ++--
 .../CRM/Contact/Form/IndividualTest.php       | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/CustomField.php b/CRM/Core/BAO/CustomField.php
index a8614578e2b2..d5a8e326c241 100644
--- a/CRM/Core/BAO/CustomField.php
+++ b/CRM/Core/BAO/CustomField.php
@@ -700,7 +700,7 @@ public static function addQuickFormElement(
 
       // Search field is always multi-select
       if ($search || (self::isSerialized($field) && $widget === 'Select')) {
-        $fieldAttributes['class'] .= ltrim($fieldAttributes['class'] ?? '' . ' huge');
+        $fieldAttributes['class'] = ltrim(($fieldAttributes['class'] ?? '') . ' huge');
         $fieldAttributes['multiple'] = 'multiple';
         $fieldAttributes['placeholder'] = $placeholder;
       }
@@ -794,7 +794,7 @@ public static function addQuickFormElement(
 
       // For all select elements
       case 'Select':
-        $fieldAttributes['class'] .= ltrim($fieldAttributes['class'] ?? '' . ' crm-select2');
+        $fieldAttributes['class'] = ltrim(($fieldAttributes['class'] ?? '') . ' crm-select2');
         if ($field->is_search_range && $search && in_array($field->data_type, $rangeDataTypes)) {
           $qf->add('text', $elementName . '_from', $label . ' ' . ts('From'), $fieldAttributes);
           $qf->add('text', $elementName . '_to', ts('To'), $fieldAttributes);
@@ -870,7 +870,7 @@ public static function addQuickFormElement(
           if (!CRM_Core_Permission::check('access contact reference fields')) {
             break;
           }
-          $fieldAttributes['class'] = ltrim($fieldAttributes['class'] ?? '' . ' crm-form-contact-reference huge');
+          $fieldAttributes['class'] = ltrim(($fieldAttributes['class'] ?? '') . ' crm-form-contact-reference huge');
           $fieldAttributes['data-api-entity'] = 'Contact';
           $element = $qf->add('text', $elementName, $label, $fieldAttributes, $useRequired && !$search);
 
diff --git a/tests/phpunit/CRM/Contact/Form/IndividualTest.php b/tests/phpunit/CRM/Contact/Form/IndividualTest.php
index dc0fea944237..234b32e5a691 100644
--- a/tests/phpunit/CRM/Contact/Form/IndividualTest.php
+++ b/tests/phpunit/CRM/Contact/Form/IndividualTest.php
@@ -35,4 +35,39 @@ public function testOpeningNewIndividualForm() {
     $this->assertStringContainsString('<label for="first_name">', $contents);
   }
 
+  /**
+   * This is the same as testOpeningNewIndividualForm but with a custom field
+   * defined. It maybe doesn't need to be a separate test but might make it
+   * easier to track down problems if one fails but not the other.
+   */
+  public function testOpeningNewIndividualFormWithCustomField() {
+    $custom_group = $this->customGroupCreate([]);
+    $custom_field1 = $this->customFieldCreate(['custom_group_id' => $custom_group['id']]);
+    $custom_field2 = $this->customFieldCreate([
+      'custom_group_id' => $custom_group['id'],
+      'label' => 'f2',
+      'html_type' => 'Select',
+      // being lazy, just re-use activity type choices
+      'option_group_id' => 'activity_type',
+    ]);
+    $custom_field3 = $this->customFieldCreate([
+      'custom_group_id' => $custom_group['id'],
+      'label' => 'f3',
+      'html_type' => 'Radio',
+      'option_group_id' => 'gender',
+    ]);
+    $form = new CRM_Contact_Form_Contact();
+    $form->controller = new CRM_Core_Controller_Simple('CRM_Contact_Form_Contact', 'New Individual');
+
+    $form->set('reset', '1');
+    $form->set('ct', 'Individual');
+
+    ob_start();
+    $form->controller->_actions['display']->perform($form, 'display');
+    $contents = ob_get_contents();
+    ob_end_clean();
+
+    $this->assertStringContainsString('<label for="first_name">', $contents);
+  }
+
 }

From 518417fd03e4f8a6a173c401b1705d54b57b5e34 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 7 Oct 2020 07:39:38 +1100
Subject: [PATCH 829/834] [REF] Fix compatability with Drupal 9 installing of
 var_dumper

---
 composer.json | 2 +-
 composer.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 41ae510b1562..37e4daed1884 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
     "symfony/event-dispatcher": "~3.0 || ~4.4",
     "symfony/filesystem": "~3.0 || ~4.4",
     "symfony/process": "~3.0 || ~4.4",
-    "symfony/var-dumper": "~3.0 || ~4.4",
+    "symfony/var-dumper": "~3.0 || ~4.4 || ~5.1",
     "psr/log": "~1.0",
     "symfony/finder": "~3.0 || ~4.4",
     "tecnickcom/tcpdf" : "6.3.*",
diff --git a/composer.lock b/composer.lock
index de6cf6e6aedd..fef79d4cd269 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5b823c420fc0d96c61731dd45a7d2e3e",
+    "content-hash": "5d304686f3edec04284e52a859321e0a",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",
@@ -242,7 +242,7 @@
                 {
                     "name": "Tobias Nyholm",
                     "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/nyholm"
+                    "homepage": "https://github.com/Nyholm"
                 },
                 {
                     "name": "Nicolas Grekas",

From 4f31fe0315aadc07e93e25b5f73e7c59295b9c8d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 7 Oct 2020 14:05:46 +1300
Subject: [PATCH 830/834] dev/core#2039 Call del directly - rather than
 now-deprecated blockDelete

blockDelete is now just wrapper for del so this is really NFC
---
 CRM/Core/BAO/Block.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 10cff14b3f49..18725f489be6 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -249,7 +249,7 @@ public static function create($blockName, $params) {
         }
       }
     }
-
+    $baoString = 'CRM_Core_BAO_' . $name;
     foreach ($params[$blockName] as $count => $value) {
       if (!is_array($value)) {
         continue;
@@ -289,7 +289,7 @@ public static function create($blockName, $params) {
       // $updateBlankLocInfo will help take appropriate decision. CRM-5969
       if (!empty($value['id']) && !$dataExists && $updateBlankLocInfo) {
         //delete the existing record
-        self::blockDelete($blockName, ['id' => $value['id']]);
+        $baoString::del($value['id']);
         continue;
       }
       elseif (!$dataExists) {
@@ -313,7 +313,6 @@ public static function create($blockName, $params) {
       }
 
       $blockFields = array_merge($value, $contactFields);
-      $baoString = 'CRM_Core_BAO_' . $name;
       $blocks[] = $baoString::create($blockFields);
     }
 
@@ -322,6 +321,7 @@ public static function create($blockName, $params) {
 
   /**
    * Delete block.
+   * @deprecated - just call the BAO / api directly.
    *
    * @param string $blockName
    *   Block name.

From d9164232d886908ae5a3a4bc1ccf4de14dde5563 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 7 Oct 2020 15:17:51 +1100
Subject: [PATCH 831/834] [REF] Fix error when creating new AB test mailing
 because domain_id is a required field

---
 ang/crmMailingAB/services.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ang/crmMailingAB/services.js b/ang/crmMailingAB/services.js
index 2e9fa9260bd0..a1d64b7da689 100644
--- a/ang/crmMailingAB/services.js
+++ b/ang/crmMailingAB/services.js
@@ -69,7 +69,6 @@
             mailing_id_a: null,
             mailing_id_b: null,
             mailing_id_c: null,
-            domain_id: null,
             testing_criteria: 'subject',
             winner_criteria: null,
             specific_url: '',

From 059738776bc227d72733752cb3755ddf5a732146 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 7 Oct 2020 16:42:25 +1100
Subject: [PATCH 832/834] [NFC] Update Checksum on CustomField DAO

---
 CRM/Core/DAO/CustomField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/DAO/CustomField.php b/CRM/Core/DAO/CustomField.php
index 6cae23bea076..698d34a4956d 100644
--- a/CRM/Core/DAO/CustomField.php
+++ b/CRM/Core/DAO/CustomField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/CustomField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:1acb9b3538bd3005b99e6af6d9ec062f)
+ * (GenCodeChecksum:4ded3c0d1a8e34502a5957ee74c4480a)
  */
 
 /**

From 993a642cb9f193cf4d551987865dde314df83198 Mon Sep 17 00:00:00 2001
From: Ivan <ivan@compucorp.co.uk>
Date: Mon, 17 Aug 2020 13:13:33 +0100
Subject: [PATCH 833/834] CATL-1614: Add new field to the mail account form -
 Do not create new contacts when filing emails

---
 CRM/Admin/Form/MailSettings.php               |  4 +
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php | 11 +++
 CRM/Utils/Mail/EmailProcessor.php             |  6 +-
 CRM/Utils/Mail/Incoming.php                   | 20 +++--
 templates/CRM/Admin/Form/MailSettings.tpl     | 77 +++++++++++--------
 .../CRM/Utils/Mail/EmailProcessorTest.php     | 33 ++++++++
 xml/schema/Core/MailSettings.xml              | 11 +++
 7 files changed, 118 insertions(+), 44 deletions(-)

diff --git a/CRM/Admin/Form/MailSettings.php b/CRM/Admin/Form/MailSettings.php
index 4de49fe41356..3ec4e11d0a52 100644
--- a/CRM/Admin/Form/MailSettings.php
+++ b/CRM/Admin/Form/MailSettings.php
@@ -70,6 +70,8 @@ public function buildQuickForm() {
     ];
     $this->add('select', 'is_default', ts('Used For?'), $usedfor);
     $this->addField('activity_status', ['placeholder' => FALSE]);
+
+    $this->add('checkbox', 'is_contact_creation_disabled_if_no_match', ts('Do not create new contacts when filing emails'));
   }
 
   /**
@@ -146,6 +148,7 @@ public function postProcess() {
       'is_ssl',
       'is_default',
       'activity_status',
+      'is_contact_creation_disabled_if_no_match',
     ];
 
     $params = [];
@@ -153,6 +156,7 @@ public function postProcess() {
       if (in_array($f, [
         'is_default',
         'is_ssl',
+        'is_contact_creation_disabled_if_no_match',
       ])) {
         $params[$f] = CRM_Utils_Array::value($f, $formValues, FALSE);
       }
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 8cbbaf1aaed9..52e7374b4ca5 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -67,6 +67,17 @@ public function upgrade_5_31_alpha1($rev) {
     $this->addTask('Activate core extension "Greenwich"', 'installGreenwich');
   }
 
+  /**
+   * Upgrade function.
+   *
+   * @param string $rev
+   */
+  public function upgrade_5_31_0($rev) {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addTask('Add is_contact_creation_disabled_if_no_match column to civicrm_mail_settings', 'addColumn',
+      'civicrm_mail_settings', 'is_contact_creation_disabled_if_no_match', "TINYINT DEFAULT 0 NOT NULL COMMENT 'If this option is enabled, CiviCRM will not create new contacts when filing emails'");
+  }
+
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
     $eWAYPaymentProcessorType = CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_payment_processor_type WHERE class_name = 'Payment_eWAY'");
     if ($eWAYPaymentProcessorType) {
diff --git a/CRM/Utils/Mail/EmailProcessor.php b/CRM/Utils/Mail/EmailProcessor.php
index a8be02ce0ac0..b1dcd2a6ff1f 100644
--- a/CRM/Utils/Mail/EmailProcessor.php
+++ b/CRM/Utils/Mail/EmailProcessor.php
@@ -157,7 +157,7 @@ public static function _process($civiMail, $dao, $is_create_activities) {
     try {
       $store = CRM_Mailing_MailStore::getStore($dao->name);
     }
-    catch (Exception$e) {
+    catch (Exception $e) {
       $message = ts('Could not connect to MailStore for ') . $dao->username . '@' . $dao->server . '<p>';
       $message .= ts('Error message: ');
       $message .= '<pre>' . $e->getMessage() . '</pre><p>';
@@ -226,7 +226,8 @@ public static function _process($civiMail, $dao, $is_create_activities) {
         if ($usedfor == 0 || $is_create_activities) {
           // if its the activities that needs to be processed ..
           try {
-            $mailParams = CRM_Utils_Mail_Incoming::parseMailingObject($mail);
+            $createContact = !($dao->is_contact_creation_disabled_if_no_match ?? FALSE);
+            $mailParams = CRM_Utils_Mail_Incoming::parseMailingObject($mail, $createContact, FALSE);
           }
           catch (Exception $e) {
             echo $e->getMessage();
@@ -241,6 +242,7 @@ public static function _process($civiMail, $dao, $is_create_activities) {
           if (!empty($dao->activity_status)) {
             $params['status_id'] = $dao->activity_status;
           }
+
           $result = civicrm_api('activity', 'create', $params);
 
           if ($result['is_error']) {
diff --git a/CRM/Utils/Mail/Incoming.php b/CRM/Utils/Mail/Incoming.php
index 1e2da042236b..a11961081250 100644
--- a/CRM/Utils/Mail/Incoming.php
+++ b/CRM/Utils/Mail/Incoming.php
@@ -322,10 +322,12 @@ public function &parse(&$file) {
 
   /**
    * @param $mail
+   * @param $createContact
+   * @param $requireContact
    *
    * @return array
    */
-  public static function parseMailingObject(&$mail) {
+  public static function parseMailingObject(&$mail, $createContact = TRUE, $requireContact = TRUE) {
 
     $config = CRM_Core_Config::singleton();
 
@@ -342,18 +344,18 @@ public static function parseMailingObject(&$mail) {
     }
 
     $params['from'] = [];
-    self::parseAddress($mail->from, $field, $params['from'], $mail);
+    self::parseAddress($mail->from, $field, $params['from'], $mail, $createContact);
 
     // we definitely need a contact id for the from address
     // if we dont have one, skip this email
-    if (empty($params['from']['id'])) {
+    if ($requireContact && empty($params['from']['id'])) {
       return NULL;
     }
 
     $emailFields = ['to', 'cc', 'bcc'];
     foreach ($emailFields as $field) {
       $value = $mail->$field;
-      self::parseAddresses($value, $field, $params, $mail);
+      self::parseAddresses($value, $field, $params, $mail, $createContact);
     }
 
     // define other parameters
@@ -396,8 +398,9 @@ public static function parseMailingObject(&$mail) {
    * @param array $params
    * @param $subParam
    * @param $mail
+   * @param $createContact
    */
-  public static function parseAddress(&$address, &$params, &$subParam, &$mail) {
+  public static function parseAddress(&$address, &$params, &$subParam, &$mail, $createContact = TRUE) {
     // CRM-9484
     if (empty($address->email)) {
       return;
@@ -408,7 +411,7 @@ public static function parseAddress(&$address, &$params, &$subParam, &$mail) {
 
     $contactID = self::getContactID($subParam['email'],
       $subParam['name'],
-      TRUE,
+      $createContact,
       $mail
     );
     $subParam['id'] = $contactID ? $contactID : NULL;
@@ -419,13 +422,14 @@ public static function parseAddress(&$address, &$params, &$subParam, &$mail) {
    * @param $token
    * @param array $params
    * @param $mail
+   * @param $createContact
    */
-  public static function parseAddresses(&$addresses, $token, &$params, &$mail) {
+  public static function parseAddresses(&$addresses, $token, &$params, &$mail, $createContact = TRUE) {
     $params[$token] = [];
 
     foreach ($addresses as $address) {
       $subParam = [];
-      self::parseAddress($address, $params, $subParam, $mail);
+      self::parseAddress($address, $params, $subParam, $mail, $createContact);
       $params[$token][] = $subParam;
     }
   }
diff --git a/templates/CRM/Admin/Form/MailSettings.tpl b/templates/CRM/Admin/Form/MailSettings.tpl
index 361ffe09e187..9185c54a18a9 100644
--- a/templates/CRM/Admin/Form/MailSettings.tpl
+++ b/templates/CRM/Admin/Form/MailSettings.tpl
@@ -9,62 +9,71 @@
 *}
 {* this template is used for adding/editing email settings.  *}
 <div class="crm-block crm-form-block crm-mail-settings-form-block">
-<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-{if $action eq 8}
-  <div class="messages status no-popup">
+  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
+  {if $action eq 8}
+    <div class="messages status no-popup">
       {icon icon="fa-info-circle"}{/icon}
-  {ts}WARNING: Deleting this option will result in the loss of mail settings data.{/ts} {ts}Do you want to continue?{/ts}
-  </div>
+      {ts}WARNING: Deleting this option will result in the loss of mail settings data.{/ts} {ts}Do you want to continue?{/ts}
+    </div>
     <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-{else}
+  {else}
     <table class="form-layout-compressed">
 
-  <tr class="crm-mail-settings-form-block-name"><td class="label">{$form.name.label}</td><td>{$form.name.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Name of this group of settings.{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-name"><td class="label">{$form.name.label}</td><td>{$form.name.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Name of this group of settings.{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-server"><td class="label">{$form.server.label}</td><td>{$form.server.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Name or IP address of mail server machine.{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-server"><td class="label">{$form.server.label}</td><td>{$form.server.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Name or IP address of mail server machine.{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-username"><td class="label">{$form.username.label}</td><td>{$form.username.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Username to use when polling (for IMAP and POP3).{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-username"><td class="label">{$form.username.label}</td><td>{$form.username.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Username to use when polling (for IMAP and POP3).{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-password"><td class="label">{$form.password.label}</td><td>{$form.password.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Password to use when polling (for IMAP and POP3).{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-password"><td class="label">{$form.password.label}</td><td>{$form.password.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Password to use when polling (for IMAP and POP3).{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-localpart"><td class="label">{$form.localpart.label}</td><td>{$form.localpart.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Optional local part (e.g., 'civimail+' for addresses like civimail+s.1.2@example.com).{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-localpart"><td class="label">{$form.localpart.label}</td><td>{$form.localpart.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Optional local part (e.g., 'civimail+' for addresses like civimail+s.1.2@example.com).{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-domain"><td class="label">{$form.domain.label}</td><td>{$form.domain.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Email address domain (the part after @).{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-domain"><td class="label">{$form.domain.label}</td><td>{$form.domain.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Email address domain (the part after @).{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-return_path"><td class="label">{$form.return_path.label}</td><td>{$form.return_path.html}</td><tr>
-        <tr><td class="label">&nbsp;</td><td class="description">{ts}Contents of the Return-Path header.{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-return_path"><td class="label">{$form.return_path.label}</td><td>{$form.return_path.html}</td><tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Contents of the Return-Path header.{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-protocol"><td class="label">{$form.protocol.label}</td><td>{$form.protocol.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Name of the protocol to use for polling.{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-protocol"><td class="label">{$form.protocol.label}</td><td>{$form.protocol.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Name of the protocol to use for polling.{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-source"><td class="label">{$form.source.label}</td><td>{$form.source.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Folder to poll from when using IMAP (will default to INBOX when empty), path to poll from when using Maildir, etc..{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-source"><td class="label">{$form.source.label}</td><td>{$form.source.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Folder to poll from when using IMAP (will default to INBOX when empty), path to poll from when using Maildir, etc..{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-is_ssl"><td class="label">{$form.is_ssl.label}</td><td>{$form.is_ssl.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}Whether to use SSL for IMAP and POP3 or not.{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-is_ssl"><td class="label">{$form.is_ssl.label}</td><td>{$form.is_ssl.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}Whether to use SSL for IMAP and POP3 or not.{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-is_default"><td class="label">{$form.is_default.label}</td><td>{$form.is_default.html}</td></tr>
-  <tr><td class="label">&nbsp;</td><td class="description">{ts}How this mail account will be used. Only one box may be used for bounce processing. It will also be used as the envelope email when sending mass mailings.{/ts}</td></tr>
+      <tr class="crm-mail-settings-form-block-is_default"><td class="label">{$form.is_default.label}</td><td>{$form.is_default.html}</td></tr>
+      <tr><td class="label">&nbsp;</td><td class="description">{ts}How this mail account will be used. Only one box may be used for bounce processing. It will also be used as the envelope email when sending mass mailings.{/ts}</td></tr>
 
-  <tr class="crm-mail-settings-form-block-activity_status"><td class="label">{$form.activity_status.label}</td><td>{$form.activity_status.html}</td></tr>
+      <tr class="crm-mail-settings-form-block-is_contact_creation_disabled_if_no_match"><td class="label">&nbsp;</td><td>{$form.is_contact_creation_disabled_if_no_match.html}{$form.is_contact_creation_disabled_if_no_match.label}</td></tr>
+
+      <tr class="crm-mail-settings-form-block-activity_status"><td class="label">&nbsp;</td><td>{$form.activity_status.label}<div>{$form.activity_status.html}</div></td></tr>
     </table>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-{/if}
+
+    <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
+  {/if}
 </div>
+
 {literal}
 <script type="text/javascript">
   CRM.$(function($) {
     var $form = $('form.{/literal}{$form.formClass}{literal}');
-    function showActivityStatus() {
-      $('.crm-mail-settings-form-block-activity_status', $form).toggle($(this).val() === '0');
+    function showActivityFields() {
+      var fields = [
+        '.crm-mail-settings-form-block-activity_status',
+        '.crm-mail-settings-form-block-is_contact_creation_disabled_if_no_match',
+      ];
+
+      $(fields.join(', '), $form).toggle($(this).val() === '0');
     }
-    $('select[name=is_default]').each(showActivityStatus).change(showActivityStatus);
+    $('select[name="is_default"]').each(showActivityFields).change(showActivityFields);
   });
 </script>
 {/literal}
diff --git a/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php b/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
index 13a25d78cc12..37efac4169d7 100644
--- a/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
+++ b/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
@@ -169,4 +169,37 @@ public function setUpMailing() {
     $this->eventQueue = $this->callAPISuccess('MailingEventQueue', 'get', ['api.MailingEventQueue.create' => ['hash' => 'aaaaaaaaaaaaaaaa']]);
   }
 
+  /**
+   * Set up mail account with 'Do not create new contacts when filing emails'
+   * option enabled.
+   */
+  public function setUpDoNotCreateContact() {
+    $this->callAPISuccess('MailSettings', 'get', [
+      'api.MailSettings.create' => [
+        'name' => 'mailbox',
+        'protocol' => 'Localdir',
+        'source' => __DIR__ . '/data/mail',
+        'domain' => 'example.com',
+        'is_default' => '0',
+        'is_contact_creation_disabled_if_no_match' => TRUE,
+      ],
+    ]);
+  }
+
+  /**
+   * Test case email processing when is_non_case_email_skipped is enabled.
+   */
+  public function testInboundProcessingDoNotCreateContact() {
+    $this->setUpDoNotCreateContact();
+    $mail = 'test_non_cases_email.eml';
+
+    copy(__DIR__ . '/data/inbound/' . $mail, __DIR__ . '/data/mail/' . $mail);
+    $this->callAPISuccess('job', 'fetch_activities', []);
+    $result = civicrm_api3('Contact', 'get', [
+      'sequential' => 1,
+      'email' => "from@test.test",
+    ]);
+    $this->assertEmpty($result['values']);
+  }
+
 }
diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml
index 0dea26c13b2a..e5f6db31076e 100644
--- a/xml/schema/Core/MailSettings.xml
+++ b/xml/schema/Core/MailSettings.xml
@@ -150,4 +150,15 @@
       <type>Select</type>
     </html>
   </field>
+  <field>
+    <name>is_contact_creation_disabled_if_no_match</name>
+    <type>boolean</type>
+    <title>Do not create new contacts when filing emails</title>
+    <default>0</default>
+    <html>
+      <type>CheckBox</type>
+    </html>
+    <description>If this option is enabled, CiviCRM will not create new contacts when filing emails.</description>
+    <add>5.31</add>
+  </field>
 </table>

From f945f0c4920f8453b2282642178d07fceae50dac Mon Sep 17 00:00:00 2001
From: Ivan <ivan@compucorp.co.uk>
Date: Thu, 13 Aug 2020 16:40:01 +0100
Subject: [PATCH 834/834] CATL-1613: Add new field to the mail account form -
 Skip emails which do not have a Case ID or Case token

---
 CRM/Admin/Form/MailSettings.php               |   5 +-
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php |   2 +
 CRM/Utils/Hook.php                            |  22 +++
 CRM/Utils/Mail/CaseMail.php                   | 127 ++++++++++++++++++
 CRM/Utils/Mail/EmailProcessor.php             |   9 ++
 templates/CRM/Admin/Form/MailSettings.tpl     |   6 +-
 templates/CRM/Admin/Page/MailSettings.hlp     |  30 +++++
 .../CRM/Utils/Mail/EmailProcessorTest.php     |  64 ++++++++-
 .../Mail/data/inbound/test_cases_email.eml    |  15 +++
 .../data/inbound/test_non_cases_email.eml     |  15 +++
 xml/schema/Core/MailSettings.xml              |  11 ++
 11 files changed, 301 insertions(+), 5 deletions(-)
 create mode 100644 CRM/Utils/Mail/CaseMail.php
 create mode 100644 templates/CRM/Admin/Page/MailSettings.hlp
 create mode 100644 tests/phpunit/CRM/Utils/Mail/data/inbound/test_cases_email.eml
 create mode 100644 tests/phpunit/CRM/Utils/Mail/data/inbound/test_non_cases_email.eml

diff --git a/CRM/Admin/Form/MailSettings.php b/CRM/Admin/Form/MailSettings.php
index 3ec4e11d0a52..70c227b1ede4 100644
--- a/CRM/Admin/Form/MailSettings.php
+++ b/CRM/Admin/Form/MailSettings.php
@@ -71,6 +71,7 @@ public function buildQuickForm() {
     $this->add('select', 'is_default', ts('Used For?'), $usedfor);
     $this->addField('activity_status', ['placeholder' => FALSE]);
 
+    $this->add('checkbox', 'is_non_case_email_skipped', ts('Skip emails which do not have a Case ID or Case hash'));
     $this->add('checkbox', 'is_contact_creation_disabled_if_no_match', ts('Do not create new contacts when filing emails'));
   }
 
@@ -148,6 +149,7 @@ public function postProcess() {
       'is_ssl',
       'is_default',
       'activity_status',
+      'is_non_case_email_skipped',
       'is_contact_creation_disabled_if_no_match',
     ];
 
@@ -156,6 +158,7 @@ public function postProcess() {
       if (in_array($f, [
         'is_default',
         'is_ssl',
+        'is_non_case_email_skipped',
         'is_contact_creation_disabled_if_no_match',
       ])) {
         $params[$f] = CRM_Utils_Array::value($f, $formValues, FALSE);
@@ -168,7 +171,7 @@ public function postProcess() {
     $params['domain_id'] = CRM_Core_Config::domainID();
 
     // assign id only in update mode
-    $status = ts('Your New  Email Settings have been saved.');
+    $status = ts('Your New Email Settings have been saved.');
     if ($this->_action & CRM_Core_Action::UPDATE) {
       $params['id'] = $this->_id;
       $status = ts('Your Email Settings have been updated.');
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 52e7374b4ca5..9b5a859dc0fa 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -74,6 +74,8 @@ public function upgrade_5_31_alpha1($rev) {
    */
   public function upgrade_5_31_0($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    $this->addTask('Add is_non_case_email_skipped column to civicrm_mail_settings', 'addColumn',
+      'civicrm_mail_settings', 'is_non_case_email_skipped', "TINYINT DEFAULT 0 NOT NULL COMMENT 'Skip emails which do not have a Case ID or Case hash'");
     $this->addTask('Add is_contact_creation_disabled_if_no_match column to civicrm_mail_settings', 'addColumn',
       'civicrm_mail_settings', 'is_contact_creation_disabled_if_no_match', "TINYINT DEFAULT 0 NOT NULL COMMENT 'If this option is enabled, CiviCRM will not create new contacts when filing emails'");
   }
diff --git a/CRM/Utils/Hook.php b/CRM/Utils/Hook.php
index 7a79fdbf0b9b..a987971774b4 100644
--- a/CRM/Utils/Hook.php
+++ b/CRM/Utils/Hook.php
@@ -1270,6 +1270,28 @@ public static function caseTypes(&$caseTypes) {
       ->invoke(['caseTypes'], $caseTypes, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_caseTypes');
   }
 
+  /**
+   * This hook is called when getting case email subject patterns.
+   *
+   * All emails related to cases have case hash/id in the subject, e.g:
+   * [case #ab12efg] Magic moment
+   * [case #1234] Magic is here
+   *
+   * Using this hook you can replace/enrich default list with some other
+   * patterns, e.g. include case type categories (see CiviCase extension) like:
+   * [(case|project|policy initiative) #hash]
+   * [(case|project|policy initiative) #id]
+   *
+   * @param array $subjectPatterns
+   *   Cases related email subject regexp patterns.
+   *
+   * @return mixed
+   */
+  public static function caseEmailSubjectPatterns(&$subjectPatterns) {
+    return self::singleton()
+      ->invoke(['caseEmailSubjectPatterns'], $subjectPatterns, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_caseEmailSubjectPatterns');
+  }
+
   /**
    * This hook is called soon after the CRM_Core_Config object has ben initialized.
    * You can use this hook to modify the config object and hence behavior of CiviCRM dynamically.
diff --git a/CRM/Utils/Mail/CaseMail.php b/CRM/Utils/Mail/CaseMail.php
new file mode 100644
index 000000000000..8b644ea65890
--- /dev/null
+++ b/CRM/Utils/Mail/CaseMail.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ *
+ * @package CRM
+ * @copyright CiviCRM LLC https://civicrm.org/licensing
+ */
+
+/**
+ * Class CRM_Utils_Mail_CaseMail.
+ */
+class CRM_Utils_Mail_CaseMail {
+
+  /**
+   * A word that is used for cases by default (in email subject).
+   *
+   * @var string
+   */
+  private $caseLabel = 'case';
+
+  /**
+   * Default cases related email subject regexp patterns.
+   *
+   * All emails related to cases have case hash/id in the subject, e.g:
+   * [case #ab12efg] Magic moment
+   * [case #1234] Magic is here
+   * This variable is defined in constructor.
+   *
+   * @var array|string[]
+   */
+  private $subjectPatterns = [];
+
+  /**
+   * Cases related email subject regexp patterns extended by hooks.
+   *
+   * @var array|string[]
+   */
+  private $subjectPatternsHooked = [];
+
+  /**
+   * CRM_Utils_Mail_CaseMail constructor.
+   */
+  public function __construct() {
+    $this->subjectPatterns = [
+      '/\[' . $this->caseLabel . ' #([0-9a-f]{7})\]/i',
+      '/\[' . $this->caseLabel . ' #(\d+)\]/i',
+    ];
+  }
+
+  /**
+   * Checks if email is related to cases.
+   *
+   * @param string $subject
+   *   Email subject.
+   *
+   * @return bool
+   *   TRUE if email subject contains case ID or case hash, FALSE otherwise.
+   */
+  public function isCaseEmail ($subject) {
+    $subject = trim($subject);
+    $patterns = $this->getSubjectPatterns();
+    $res = FALSE;
+
+    for ($i = 0; !$res && $i < count($patterns); $i++) {
+      $res = preg_match($patterns[$i], $subject) === 1;
+    }
+
+    return $res;
+  }
+
+  /**
+   * Returns cases related email subject patterns.
+   *
+   * These patterns could be used to check if email is related to cases.
+   *
+   * @return array|string[]
+   */
+  public function getSubjectPatterns() {
+    // Allow others to change patterns using hook.
+    if (empty($this->subjectPatternsHooked)) {
+      $patterns = $this->subjectPatterns;
+      CRM_Utils_Hook::caseEmailSubjectPatterns($patterns);
+      $this->subjectPatternsHooked = $patterns;
+    }
+
+    return !empty($this->subjectPatternsHooked)
+      ? $this->subjectPatternsHooked
+      : $this->subjectPatterns;
+  }
+
+  /**
+   * Returns value of some class property.
+   *
+   * @param string $name
+   *   Property name.
+   *
+   * @return mixed|null
+   *   Property value or null if property does not exist.
+   */
+  public function get($name) {
+    return $this->{$name} ?? NULL;
+  }
+
+  /**
+   * Sets value of some class property.
+   *
+   * @param string $name
+   *   Property name.
+   * @param mixed $value
+   *   New property value.
+   */
+  public function set($name, $value) {
+    if (isset($this->{$name})) {
+      $this->{$name} = $value;
+    }
+  }
+
+}
diff --git a/CRM/Utils/Mail/EmailProcessor.php b/CRM/Utils/Mail/EmailProcessor.php
index b1dcd2a6ff1f..fe24b02e0272 100644
--- a/CRM/Utils/Mail/EmailProcessor.php
+++ b/CRM/Utils/Mail/EmailProcessor.php
@@ -224,6 +224,15 @@ public static function _process($civiMail, $dao, $is_create_activities) {
 
         // preseve backward compatibility
         if ($usedfor == 0 || $is_create_activities) {
+          // Mail account may have 'Skip emails which do not have a Case ID
+          // or Case hash' option, if its enabled and email is not related
+          // to cases - then we need to put email to ignored folder.
+          $caseMailUtils = new CRM_Utils_Mail_CaseMail();
+          if (!empty($dao->is_non_case_email_skipped) && !$caseMailUtils->isCaseEmail($mail->subject)) {
+            $store->markIgnored($key);
+            continue;
+          }
+
           // if its the activities that needs to be processed ..
           try {
             $createContact = !($dao->is_contact_creation_disabled_if_no_match ?? FALSE);
diff --git a/templates/CRM/Admin/Form/MailSettings.tpl b/templates/CRM/Admin/Form/MailSettings.tpl
index 9185c54a18a9..d003ef89f9ba 100644
--- a/templates/CRM/Admin/Form/MailSettings.tpl
+++ b/templates/CRM/Admin/Form/MailSettings.tpl
@@ -52,7 +52,9 @@
       <tr class="crm-mail-settings-form-block-is_default"><td class="label">{$form.is_default.label}</td><td>{$form.is_default.html}</td></tr>
       <tr><td class="label">&nbsp;</td><td class="description">{ts}How this mail account will be used. Only one box may be used for bounce processing. It will also be used as the envelope email when sending mass mailings.{/ts}</td></tr>
 
-      <tr class="crm-mail-settings-form-block-is_contact_creation_disabled_if_no_match"><td class="label">&nbsp;</td><td>{$form.is_contact_creation_disabled_if_no_match.html}{$form.is_contact_creation_disabled_if_no_match.label}</td></tr>
+      <tr class="crm-mail-settings-form-block-is_non_case_email_skipped"><td class="label">&nbsp;</td><td>{$form.is_non_case_email_skipped.html}{$form.is_non_case_email_skipped.label} {help id='is_non_case_email_skipped'}</td></tr>
+
+      <tr class="crm-mail-settings-form-block-is_contact_creation_disabled_if_no_match"><td class="label">&nbsp;</td><td>{$form.is_contact_creation_disabled_if_no_match.html}{$form.is_contact_creation_disabled_if_no_match.label} {help id='is_contact_creation_disabled_if_no_match'}</td></tr>
 
       <tr class="crm-mail-settings-form-block-activity_status"><td class="label">&nbsp;</td><td>{$form.activity_status.label}<div>{$form.activity_status.html}</div></td></tr>
     </table>
@@ -68,9 +70,9 @@
     function showActivityFields() {
       var fields = [
         '.crm-mail-settings-form-block-activity_status',
+        '.crm-mail-settings-form-block-is_non_case_email_skipped',
         '.crm-mail-settings-form-block-is_contact_creation_disabled_if_no_match',
       ];
-
       $(fields.join(', '), $form).toggle($(this).val() === '0');
     }
     $('select[name="is_default"]').each(showActivityFields).change(showActivityFields);
diff --git a/templates/CRM/Admin/Page/MailSettings.hlp b/templates/CRM/Admin/Page/MailSettings.hlp
new file mode 100644
index 000000000000..fac9cf4bc610
--- /dev/null
+++ b/templates/CRM/Admin/Page/MailSettings.hlp
@@ -0,0 +1,30 @@
+{*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+*}
+
+{htxt id="is_non_case_email_skipped-title"}
+  {ts}Skip emails which do not have a Case ID or Case hash{/ts}
+{/htxt}
+
+{htxt id="is_non_case_email_skipped"}
+  <p>{ts}CiviCRM has functionality to file emails which contain the Case ID or Case Hash in the subject line in the format [case #1234] against a case record.{/ts}</p>
+  <p>{ts}Where the Case ID or Case Hash is not included CiviCRM will file the email against the contact record, by matching the email addresses on the email with any email addresses of Contact records in CiviCRM.{/ts}</p>
+  <p>{ts}Enabling this option will have CiviCRM skip any emails that do not have the Case ID or Case Hash so that the system will only process emails that can be placed on case records.{/ts}</p>
+  <p>{ts}Any emails that are not processed will be moved to the ignored folder.{/ts}</p>
+  <p>{ts}If email is skipped, no activities or contacts ("from"/"to"/"cc"/"bcc") will be created.{/ts}</p>
+{/htxt}
+
+{htxt id="is_contact_creation_disabled_if_no_match-title"}
+  {ts}Do not create new contacts when filing emails{/ts}
+{/htxt}
+
+{htxt id="is_contact_creation_disabled_if_no_match"}
+  <p>{ts}If this option is enabled, CiviCRM will not create new contacts ("from"/"to"/"cc"/"bcc") when filing emails.{/ts}</p>
+  <p>{ts}If the email subject contains a valid Case ID or Case hash, the email will be filed against the case.{/ts}</p>
+{/htxt}
diff --git a/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php b/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
index 37efac4169d7..b675125b7561 100644
--- a/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
+++ b/tests/phpunit/CRM/Utils/Mail/EmailProcessorTest.php
@@ -37,7 +37,19 @@ public function setUp() {
   public function tearDown() {
     CRM_Utils_File::cleanDir(__DIR__ . '/data/mail');
     parent::tearDown();
-    $this->quickCleanup(['civicrm_group', 'civicrm_group_contact', 'civicrm_mailing', 'civicrm_mailing_job', 'civicrm_mailing_event_bounce', 'civicrm_mailing_event_queue', 'civicrm_mailing_group', 'civicrm_mailing_recipients', 'civicrm_contact', 'civicrm_email']);
+    $this->quickCleanup([
+      'civicrm_group',
+      'civicrm_group_contact',
+      'civicrm_mailing',
+      'civicrm_mailing_job',
+      'civicrm_mailing_event_bounce',
+      'civicrm_mailing_event_queue',
+      'civicrm_mailing_group',
+      'civicrm_mailing_recipients',
+      'civicrm_contact',
+      'civicrm_email',
+      'civicrm_activity',
+    ]);
   }
 
   /**
@@ -139,7 +151,6 @@ public function testBounceProcessingDeletedEmail() {
   }
 
   /**
-   *
    * Wrapper to check for mailing bounces.
    *
    * Normally we would call $this->callAPISuccessGetCount but there is not one & there is resistance to
@@ -169,6 +180,55 @@ public function setUpMailing() {
     $this->eventQueue = $this->callAPISuccess('MailingEventQueue', 'get', ['api.MailingEventQueue.create' => ['hash' => 'aaaaaaaaaaaaaaaa']]);
   }
 
+  /**
+   * Set up mail account with 'Skip emails which do not have a Case ID or
+   * Case hash' option enabled.
+   */
+  public function setUpSkipNonCasesEmail() {
+    $this->callAPISuccess('MailSettings', 'get', [
+      'api.MailSettings.create' => [
+        'name' => 'mailbox',
+        'protocol' => 'Localdir',
+        'source' => __DIR__ . '/data/mail',
+        'domain' => 'example.com',
+        'is_default' => '0',
+        'is_non_case_email_skipped' => TRUE,
+      ],
+    ]);
+  }
+
+  /**
+   * Test case email processing when is_non_case_email_skipped is enabled.
+   */
+  public function testInboundProcessingCaseEmail() {
+    $this->setUpSkipNonCasesEmail();
+    $mail = 'test_cases_email.eml';
+
+    copy(__DIR__ . '/data/inbound/' . $mail, __DIR__ . '/data/mail/' . $mail);
+    $this->callAPISuccess('job', 'fetch_activities', []);
+    $result = civicrm_api3('Activity', 'get', [
+      'sequential' => 1,
+      'subject' => ['LIKE' => "%[case #214bf6d]%"],
+    ]);
+    $this->assertNotEmpty($result['values'][0]['id']);
+  }
+
+  /**
+   * Test non case email processing when is_non_case_email_skipped is enabled.
+   */
+  public function testInboundProcessingNonCaseEmail() {
+    $this->setUpSkipNonCasesEmail();
+    $mail = 'test_non_cases_email.eml';
+
+    copy(__DIR__ . '/data/inbound/' . $mail, __DIR__ . '/data/mail/' . $mail);
+    $this->callAPISuccess('job', 'fetch_activities', []);
+    $result = civicrm_api3('Activity', 'get', [
+      'sequential' => 1,
+      'subject' => ['LIKE' => "%Love letter%"],
+    ]);
+    $this->assertEmpty($result['values']);
+  }
+
   /**
    * Set up mail account with 'Do not create new contacts when filing emails'
    * option enabled.
diff --git a/tests/phpunit/CRM/Utils/Mail/data/inbound/test_cases_email.eml b/tests/phpunit/CRM/Utils/Mail/data/inbound/test_cases_email.eml
new file mode 100644
index 000000000000..6d8cccf7370d
--- /dev/null
+++ b/tests/phpunit/CRM/Utils/Mail/data/inbound/test_cases_email.eml
@@ -0,0 +1,15 @@
+Delivered-To: to@test.test
+Received: by 10.2.13.84 with SMTP id 1234567890;
+        Wed, 19 Dec 2018 10:01:11 +0100 (CET)
+Return-Path: <>
+Message-ID: <abc.def.fhi@test.test>
+Date: Wed, 19 Dec 2018 10:01:07 +0100
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline
+From: from@test.test
+To: to@test.test
+Subject: [case #214bf6d] Magic is here
+
+This test case is full of fun.
diff --git a/tests/phpunit/CRM/Utils/Mail/data/inbound/test_non_cases_email.eml b/tests/phpunit/CRM/Utils/Mail/data/inbound/test_non_cases_email.eml
new file mode 100644
index 000000000000..f5dad50c55af
--- /dev/null
+++ b/tests/phpunit/CRM/Utils/Mail/data/inbound/test_non_cases_email.eml
@@ -0,0 +1,15 @@
+Delivered-To: to@test.test
+Received: by 10.2.13.84 with SMTP id 1234567890;
+        Wed, 19 Dec 2018 10:01:11 +0100 (CET)
+Return-Path: <>
+Message-ID: <abc.def.fhi@test.test>
+Date: Wed, 19 Dec 2018 10:01:07 +0100
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: inline
+From: from@test.test
+To: to@test.test
+Subject: Love letter
+
+I love you unit test, because you are not related to cases.
diff --git a/xml/schema/Core/MailSettings.xml b/xml/schema/Core/MailSettings.xml
index e5f6db31076e..e55f0602c3cc 100644
--- a/xml/schema/Core/MailSettings.xml
+++ b/xml/schema/Core/MailSettings.xml
@@ -150,6 +150,17 @@
       <type>Select</type>
     </html>
   </field>
+  <field>
+    <name>is_non_case_email_skipped</name>
+    <title>Skip emails which do not have a Case ID or Case hash</title>
+    <type>boolean</type>
+    <default>0</default>
+    <html>
+      <type>CheckBox</type>
+    </html>
+    <comment>Enabling this option will have CiviCRM skip any emails that do not have the Case ID or Case Hash so that the system will only process emails that can be placed on case records. Any emails that are not processed will be moved to the ignored folder.</comment>
+    <add>5.31</add>
+  </field>
   <field>
     <name>is_contact_creation_disabled_if_no_match</name>
     <type>boolean</type>